Browse Source

Revert "[FIX] b_shift: Too late shift validation"

This reverts commit 351a107a65.

This commit try to fix with a naive approach that doesn't work in every
case.

A better fix must be done in the future.
pull/80/head
Rémy Taymans 6 years ago
parent
commit
d2ca6c789d
  1. 2
      beesdoo_shift/__openerp__.py
  2. 10
      beesdoo_shift/models/task.py

2
beesdoo_shift/__openerp__.py

@ -13,7 +13,7 @@
'website': "https://github.com/beescoop/Obeesdoo",
'category': 'Cooperative management',
'version': '9.0.1.0.1',
'version': '0.1',
'depends': ['beesdoo_base'],

10
beesdoo_shift/models/task.py

@ -203,16 +203,8 @@ class Task(models.Model):
elif self.worker_id.working_mode == 'irregular':
status = self.worker_id.cooperative_status_ids[0]
alert_start_time = fields.Date.from_string(
self.worker_id.cooperative_status_ids[0].alert_start_time
)
start_time = fields.Date.from_string(self.start_time)
sr = self.worker_id.cooperative_status_ids[0].sr
if new_stage == DONE or new_stage == NECESSITY:
if start_time <= alert_start_time and sr >= -2:
data['sr'] = 2
else:
data['sr'] = 1
data['sr'] = 1
data['irregular_absence_date'] = False
data['irregular_absence_counter'] = 1 if status.irregular_absence_counter < 0 else 0
if new_stage == ABSENT or new_stage == EXCUSED:

Loading…
Cancel
Save