|
@ -140,16 +140,23 @@ class TaskTemplate(models.Model): |
|
|
tasks = self.env['beesdoo.shift.shift'] |
|
|
tasks = self.env['beesdoo.shift.shift'] |
|
|
for rec in self: |
|
|
for rec in self: |
|
|
for i in xrange(0, rec.worker_nb): |
|
|
for i in xrange(0, rec.worker_nb): |
|
|
worker_id = rec.worker_ids[i].id if len(rec.worker_ids) > i else False |
|
|
|
|
|
|
|
|
worker_id = rec.worker_ids[i] if len(rec.worker_ids) > i else False |
|
|
|
|
|
#remove worker in holiday |
|
|
|
|
|
if worker_id and worker_id.cooperative_status_ids: |
|
|
|
|
|
status = worker_id.cooperative_status_ids[0] |
|
|
|
|
|
if status.holiday_start_time and status.holiday_end_time and \ |
|
|
|
|
|
status.holiday_start_time <= rec.start_date[:10] and status.holiday_end_time >= rec.end_date[:10]: |
|
|
|
|
|
worker_id = False |
|
|
tasks |= tasks.create({ |
|
|
tasks |= tasks.create({ |
|
|
'name' : "%s %s (%s - %s) [%s]" % (rec.name, rec.day_nb_id.name, float_to_time(rec.start_time), float_to_time(rec.end_time), i), |
|
|
'name' : "%s %s (%s - %s) [%s]" % (rec.name, rec.day_nb_id.name, float_to_time(rec.start_time), float_to_time(rec.end_time), i), |
|
|
'task_template_id' : rec.id, |
|
|
'task_template_id' : rec.id, |
|
|
'task_type_id' : rec.task_type_id.id, |
|
|
'task_type_id' : rec.task_type_id.id, |
|
|
'super_coop_id': rec.super_coop_id.id, |
|
|
'super_coop_id': rec.super_coop_id.id, |
|
|
'worker_id' : worker_id, |
|
|
|
|
|
|
|
|
'worker_id' : worker_id and worker_id.id or False, |
|
|
'is_regular': True if worker_id else False, |
|
|
'is_regular': True if worker_id else False, |
|
|
'start_time' : rec.start_date, |
|
|
'start_time' : rec.start_date, |
|
|
'end_time' : rec.end_date, |
|
|
'end_time' : rec.end_date, |
|
|
'stage_id': self.env.ref('beesdoo_shift.open').id, |
|
|
'stage_id': self.env.ref('beesdoo_shift.open').id, |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
return tasks |
|
|
return tasks |