From 4bb09505b05aa51f3f3fd570a0b605ab76b8fb07 Mon Sep 17 00:00:00 2001
From: Philippe Wauthy <phwa@odoo.com>
Date: Fri, 30 Sep 2022 12:57:46 +0000
Subject: [PATCH] [FIX] resource: move "Switch to 1 or 2 weeks calendar"
 buttons

The "Switch to 1 or 2 weeks calendar" are breaking the layout by
being placed just before attendances_ids on the Working Hours sheet.

With this commit, the buttons are moved in the header of the form.

task-2996235

closes odoo/odoo#102711

X-original-commit: e81e03e6511c4d975bd7da4748f11747faf38251
Related: odoo/enterprise#32539
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: phwa-odoo <phwa@odoo.com>
---
 addons/resource/views/resource_views.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml
index f1b87e3bb42..3a3874acefa 100644
--- a/addons/resource/views/resource_views.xml
+++ b/addons/resource/views/resource_views.xml
@@ -262,6 +262,11 @@
         <field name="model">resource.calendar</field>
         <field name="arch" type="xml">
             <form string="Working Time">
+                <field name="two_weeks_calendar" invisible="1"/>
+                <header>
+                    <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', True)]}" string="Switch to 2 weeks calendar" type="object" confirm="Are you sure you want to switch this calendar to 2 weeks calendar ? All entries will be lost"/>
+                    <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', False)]}" string="Switch to 1 week calendar" type="object" confirm="Are you sure you want to switch this calendar to 1 week calendar ? All entries will be lost"/>
+                </header>
                 <sheet string="Working Time">
                     <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_button_box" name="button_box">
@@ -288,13 +293,7 @@
                     </group>
                     <notebook>
                         <page string="Working Hours" name="working_hours">
-                        <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', True)]}" string="Switch to 2 weeks calendar" type="object" confirm="Are you sure you want to switch this calendar to 2 weeks calendar ? All entries will be lost"/>
-                        <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', False)]}" string="Switch to 1 week calendar" type="object" confirm="Are you sure you want to switch this calendar to 1 week calendar ? All entries will be lost"/>
-                        <field name="two_weeks_calendar" invisible="1"/>
-
-                        <group attrs="{'invisible':[('two_weeks_calendar', '=', False)]}">
-                            <field name="two_weeks_explanation" nolabel="1"/>
-                        </group>
+                            <field name="two_weeks_explanation" attrs="{'invisible':[('two_weeks_calendar', '=', False)]}"/>
                             <field name="attendance_ids" widget="section_one2many"/>
                         </page>
                     </notebook>