[PATCH] Upstream patch - 26102023

addons/account/views/account_menuitem.xml

@@ -58,7 +58,7 @@
             </menuitem>
             <menuitem id="account_banks_menu" name="Banks" groups="account.group_account_manager" sequence="2">
                 <menuitem id="menu_action_account_bank_journal_form" action="action_new_bank_setting" groups="account.group_account_manager" sequence="1"/>
-                <menuitem id="action_account_reconcile_model_menu" action="account.action_account_reconcile_model" sequence="3" />
+                <menuitem id="action_account_reconcile_model_menu" action="account.action_account_reconcile_model" sequence="3" groups="account.group_account_user"/>
             </menuitem>
             <menuitem id="account_account_menu" name="Accounting" groups="account.group_account_manager" sequence="3">
                 <menuitem id="menu_action_account_form" action="action_account_form" groups="account.group_account_readonly" sequence="1"/>

addons/website/static/src/js/editor/snippets.options.js

@@ -697,21 +697,6 @@ options.Class.include({
         const enableXmlIDs = xmlID.split(/\s*,\s*/);
         const disableXmlIDs = allXmlIDs.filter(xmlID => !enableXmlIDs.includes(xmlID));
 
-        if (params.name === 'header_sidebar_opt') {
-            // When the user selects sidebar as header, make sure that the
-            // header position is regular.
-            // TODO we should avoid having that `if` in the generic option
-            // class (maybe simply use data-trigger but the header template
-            // option as no associated data-js to hack). To adapt in master.
-            await new Promise(resolve => {
-                this.trigger_up('action_demand', {
-                    actionName: 'toggle_page_option',
-                    params: [{name: 'header_overlay', value: false}],
-                    onSuccess: () => resolve(),
-                });
-            });
-        }
-
         return this._rpc({
             route: '/website/theme_customize',
             params: {

addons/website/static/src/scss/website.scss

@@ -1241,7 +1241,7 @@ header {
 }
 
 #wrapwrap.o_header_overlay {
-    > header:not(.o_header_affixed):not(.o_top_menu_collapse_shown) {
+    > header:not(.o_header_affixed):not(.o_top_menu_collapse_shown):not(.o_header_sidebar) {
         @include o-position-absolute(0, 0, auto, 0);
         z-index: 1000;