diff --git a/beesdoo_shift/models/attendance_sheet.py b/beesdoo_shift/models/attendance_sheet.py
index c33558a..9c1e1d5 100644
--- a/beesdoo_shift/models/attendance_sheet.py
+++ b/beesdoo_shift/models/attendance_sheet.py
@@ -88,6 +88,11 @@ class AttendanceSheetShiftExpected(models.Model):
         ],
     )
 
+    @api.onchange("replacement_worker_id")
+    def on_change_replacement_worker(self):
+        if self.replacement_worker_id:
+            self.state = "done"
+
     @api.onchange("state")
     def on_change_state(self):
         if not self.state or self.state == "done":
@@ -551,6 +556,10 @@ class AttendanceSheet(models.Model):
 
         # Open a validation wizard only if not admin
         if self.env.user.has_group("beesdoo_shift.group_cooperative_admin"):
+            if not self.worker_nb_feedback:
+                raise UserError(
+                    _("Please give your feedback about the number of workers.")
+                )
             self._validate(self.env.user.partner_id)
             return
         return {
diff --git a/beesdoo_shift/views/attendance_sheet.xml b/beesdoo_shift/views/attendance_sheet.xml
index 579b076..bf21c84 100644
--- a/beesdoo_shift/views/attendance_sheet.xml
+++ b/beesdoo_shift/views/attendance_sheet.xml
@@ -21,6 +21,9 @@
                 <group expand="1" string="Group By">
                     <filter string="Day" name="gb_day"
                             context="{'group_by' : 'start_time:day'}" />
+                    <filter string="Feedback on number of workers"
+                            name="gb_worker_nb_feedback"
+                            context="{'group_by' : 'worker_nb_feedback'}" />
                 </group>
             </search>
         </field>