From b4c7fd1b66b5c9a0b131614c8ea0bd0c6c9a3db9 Mon Sep 17 00:00:00 2001
From: Elouan Le Bars <elouan@coopiteasy.be>
Date: Mon, 27 Jan 2020 15:22:18 +0100
Subject: [PATCH] [MIG] b_shift : fix views to fit 12.0 requirements

---
 beesdoo_shift/views/attendance_sheet.xml | 38 +++++++++---------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/beesdoo_shift/views/attendance_sheet.xml b/beesdoo_shift/views/attendance_sheet.xml
index fb58306..e7c4800 100644
--- a/beesdoo_shift/views/attendance_sheet.xml
+++ b/beesdoo_shift/views/attendance_sheet.xml
@@ -137,19 +137,15 @@
             <form create="false" delete="false">
                 <field name="_barcode_scanned" widget="barcode_handler"/>
                 <header>
-                    <div>
-                        <field name="state" widget="statusbar" readonly="True" class="oe_inline"/>
-                        <button type="object"
-                                name="validate_with_checks"
-                                string="Validate Sheet"
-                                confirm="Beware : a validated sheet cannot be edited anymore
-                                and you won't be able to add any latecomers.
-                                The counters of those who didn't attend will be updated
-                                and they will get warning emails."
-                                attrs="{'invisible': [('state', '=', 'validated')]}"
-                        />
-                    </div>
-                    <div class="oe_clear" />
+                    <field name="state" widget="statusbar" readonly="True"/>
+                    <button type="object"
+                            name="validate_with_checks"
+                            string="Validate Sheet"
+                            confirm="Beware : a validated sheet cannot be edited anymore
+                            and you won't be able to add any latecomers.
+                            The counters of those who didn't attend will be updated
+                            and they will get warning emails."
+                    />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
@@ -171,28 +167,22 @@
                             <field name="time_slot" />
                         </h1>
                     </div>
-                        <group>
-                            <field name="max_worker_no" />
-                        </group>
                         You will be able to write notes
                         about what you cannot encode here
-                        when clicking on 'validate'.
+                        when clicking on 'validate'.<br/><br/>
+                        <label for="max_worker_no" />
+                        <field name="max_worker_no" />
                         <separator string="Added workers" />
                         <field name="added_shift_ids"/>
                         <separator string="Expected workers" />
                         <field name="expected_shift_ids" />
                         <br/>
-                        <group col="1" string="Feedback"
+                        <group string="Feedback"
                                groups="beesdoo_shift.group_cooperative_admin">
                             <field name="notes" />
-                            <br/>
                             <field name="feedback" />
-                            <br/>
                             <field name="worker_nb_feedback" />
-                            <br/>
-                            <group>
-                                <field name="validated_by" readonly="True"/>
-                            </group>
+                            <field name="validated_by" readonly="True"/>
                         </group>
                 </sheet>
                 <div class="oe_chatter">