Revision 92ce8fbd
Added by Serghei Mihai over 11 years ago
| calebasse/personnes/models.py | ||
|---|---|---|
| 341 | 341 |
services = None) \ |
| 342 | 342 |
| models.Q(worker__isnull=True, |
| 343 | 343 |
services__in = worker.services.all()) |
| 344 |
return self.filter(filter_query) |
|
| 344 |
return self.filter(filter_query).distinct()
|
|
| 345 | 345 |
|
| 346 | 346 |
def for_worker_id(self, worker_id): |
| 347 | 347 |
worker = None |
| ... | ... | |
| 405 | 405 |
verbose_name=u'Type de congé') |
| 406 | 406 |
worker = models.ForeignKey(Worker, blank=True, null=True, |
| 407 | 407 |
verbose_name=u"Personnel") |
| 408 |
services = models.ManyToManyField(Service, null = True, |
|
| 409 |
blank = True, verbose_name = u'Services') |
|
| 408 |
services = models.ManyToManyField(Service, blank = True, verbose_name = u'Services') |
|
| 410 | 409 |
start_date = models.DateField(verbose_name=u"Date de début", |
| 411 | 410 |
help_text=u'format: jj/mm/aaaa') |
| 412 | 411 |
end_date = models.DateField(verbose_name=u"Date de fin", |
Also available in: Unified diff
personnes: fixing the multiple holidays when using 'for_worker' manager.
The Holiday's 'services' attribute can't be empty and is initiated on holiday creation