diff --git a/apps/member/views.py b/apps/member/views.py index 3375927a56142e1d2a0eac911ec5cbc35a354c7d..869f060de2ea28b38db34de71cf63b0372963029 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -385,8 +385,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): empty_membership = Membership( club=club, user=User.objects.first(), - date_start=datetime.now().date(), - date_end=datetime.now().date(), + date_start=date.today(), + date_end=date.today(), fee=0, ) context["can_add_members"] = PermissionBackend()\ @@ -601,8 +601,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, ProtectedCreat if user.note.balance + credit_amount < fee and not Membership.objects.filter( club__name="Kfet", user=user, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), + date_start__lte=date.today(), + date_end__gte=date.today(), ).exists(): # Users without a valid Kfet membership can't have a negative balance. # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 461e250d06c103d9d99d33cebf2035ad544a5024..3d37548e767b4fabdc1eb44e82e19fe5185a0216 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -1,8 +1,8 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later + from django.core.exceptions import ValidationError from django.db import models, transaction -from django.db.models import F from django.urls import reverse from django.utils import timezone from django.utils.translation import gettext_lazy as _ diff --git a/apps/wei/management/commands/extract_ml_registrations.py b/apps/wei/management/commands/extract_ml_registrations.py index 6d48093e7a230e943c6743dd28fca6bfff9360c3..9bc82418adafdb623d5567f19de8dfc536fad981 100644 --- a/apps/wei/management/commands/extract_ml_registrations.py +++ b/apps/wei/management/commands/extract_ml_registrations.py @@ -5,7 +5,6 @@ from datetime import date from django.core.management import BaseCommand from django.db.models import Q - from member.models import Membership, Club from wei.models import WEIClub