|
@@ -148,11 +148,8 @@ class LoanQuerySet(models.QuerySet):
|
|
if at_date is None:
|
|
if at_date is None:
|
|
at_date = timezone.now()
|
|
at_date = timezone.now()
|
|
else:
|
|
else:
|
|
- # todo : change by default timezone in settings ?
|
|
|
|
- at_date = pytz.timezone('Europe/Paris').localize(datetime.strptime(at_date, "%Y-%m-%d"))
|
|
|
|
|
|
+ at_date = timezone.make_aware(datetime.strptime(at_date, "%Y-%m-%d"))
|
|
return (
|
|
return (
|
|
- # avant : prêt dont la date de fin > aujourd'hui | null
|
|
|
|
- # maintenant : prêt dont la date de début est < date donnée
|
|
|
|
models.Q(loan_date_end__gt=timezone.now()) |
|
|
models.Q(loan_date_end__gt=timezone.now()) |
|
|
models.Q(loan_date_end__isnull=True) &
|
|
models.Q(loan_date_end__isnull=True) &
|
|
models.Q(loan_date__lt=at_date))
|
|
models.Q(loan_date__lt=at_date))
|