diff --git a/beesdoo_shift/views/attendance_sheet.xml b/beesdoo_shift/views/attendance_sheet.xml index 699b576..fb58306 100644 --- a/beesdoo_shift/views/attendance_sheet.xml +++ b/beesdoo_shift/views/attendance_sheet.xml @@ -36,7 +36,7 @@ Expected Shifts List beesdoo.shift.sheet.expected - @@ -49,10 +49,10 @@ options="{'no_create': True, 'no_create_edit':True}"/> @@ -174,10 +174,9 @@ - + You will be able to write notes + about what you cannot encode here + when clicking on 'validate'. @@ -231,8 +230,8 @@ name="Daily attendance sheets" res_model="beesdoo.shift.sheet" view_mode="tree,form" - domain="[('end_time','>', datetime.now().replace(hour=00, minute=00, second=10)), - ('start_time','<', datetime.now().replace(hour=23, minute=59, second=59))]" + domain="[('end_time','>', datetime.datetime.now().replace(hour=00, minute=00, second=10)), + ('start_time','<', datetime.datetime.now().replace(hour=23, minute=59, second=59))]" /> diff --git a/beesdoo_shift/views/task.xml b/beesdoo_shift/views/task.xml index 4c803bb..4d597a9 100644 --- a/beesdoo_shift/views/task.xml +++ b/beesdoo_shift/views/task.xml @@ -29,14 +29,17 @@ + domain="[('super_coop_id', '=', uid)]" /> + name="my_shift" + domain="[('worker_id.user_ids', 'in', uid)]" /> - - + + @@ -55,13 +58,16 @@ - - - + context="{'group_by' : 'task_template_id'}" /> + + + @@ -140,22 +146,17 @@ - - - - - + + + + + - - - - Edit Shift - - + + + Edit Shift + diff --git a/beesdoo_shift/views/task_template.xml b/beesdoo_shift/views/task_template.xml index 8a7af01..13ab7c3 100644 --- a/beesdoo_shift/views/task_template.xml +++ b/beesdoo_shift/views/task_template.xml @@ -104,11 +104,10 @@ - - - + + +