Migrate to Django 5.0, change requirements and tests, remove ifnotequal, remove htcpcp and CAS Server, adapt Picker, fix alias (lookup) and logout, change URL to re_path

2025-06-21 18:08:21 +02:00 · 2024-07-11 13:05:43 +02:00
36 changed files with 341 additions and 417 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,25 +7,10 @@ stages:
 variables:
  GIT_SUBMODULE_STRATEGY: recursive

-# Debian Buster
-#  py37-django22:
-#   stage: test
-#   image: debian:buster-backports
-#   before_script:
-#     - >
-#         apt-get update &&
-#         apt-get install --no-install-recommends -t buster-backports -y
-#         python3-django python3-django-crispy-forms
-#         python3-django-extensions python3-django-filters python3-django-polymorphic
-#         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-#         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-#         python3-bs4 python3-setuptools tox texlive-xetex
-#   script: tox -e py37-django22
-
-# Ubuntu 20.04
-py38-django22:
+# Ubuntu 22.04
+py310-django50:
  stage: test
-  image: ubuntu:20.04
+  image: ubuntu:22.04
  before_script:
    # Fix tzdata prompt
    - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@ -37,12 +22,12 @@ py38-django22:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py38-django22
+  script: tox -e py310-django50

-# Debian Bullseye
-py39-django22:
+# Debian Bookworm
+py311-django50:
  stage: test
-  image: debian:bullseye
+  image: debian:bookworm
  before_script:
    - >
        apt-get update &&
@ -52,7 +37,7 @@ py39-django22:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py39-django22
+  script: tox -e py311-django50

 linters:
  stage: quality-assurance
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@ -1,6 +1,8 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

+from bootstrap_datepicker_plus.widgets import DateTimePickerInput
+
 from datetime import timedelta
 from random import shuffle

@ -10,7 +12,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
-from note_kfet.inputs import Autocomplete, DateTimePickerInput
+from note_kfet.inputs import Autocomplete
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend

--- a/apps/activity/templates/activity/activity_form.html
+++ b/apps/activity/templates/activity/activity_form.html
@ -23,19 +23,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <script>
  var date_end = document.getElementById("id_date_end");
  var date_start = document.getElementById("id_date_start");
-
+  
  function update_date_end (){
    if(date_end.value=="" || date_end.value<date_start.value){
      date_end.value = date_start.value;
    };
  };
-
+  
  function update_date_start (){
    if(date_start.value=="" || date_end.value<date_start.value){
      date_start.value = date_end.value;
    };
  };
-
+  
  date_start.addEventListener('focusout', update_date_end);
  date_end.addEventListener('focusout', update_date_start);
  
--- a/apps/activity/templates/activity/activity_list.html
+++ b/apps/activity/templates/activity/activity_list.html
@ -46,4 +46,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </h3>
    {% render_table table %}
 </div>
-{% endblock %}
+{% endblock %}
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -17,8 +17,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView, TemplateView, UpdateView
-from django.views.generic.list import ListView
-from django_tables2.views import MultiTableMixin, SingleTableMixin
+from django_tables2.views import SingleTableView
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
@ -58,36 +57,27 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
        return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk})


-class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
    """
    Displays all Activities, and classify if they are on-going or upcoming ones.
    """
    model = Activity
-    tables = [
-        lambda data: ActivityTable(data, prefix="all-"),
-        lambda data: ActivityTable(data, prefix="upcoming-"),
-    ]
+    table_class = ActivityTable
+    ordering = ('-date_start',)
    extra_context = {"title": _("Activities")}

    def get_queryset(self, **kwargs):
        return super().get_queryset(**kwargs).distinct()

-    def get_tables_data(self):
-        # first table = all activities, second table = upcoming
-        return [
-            self.get_queryset().order_by("-date_start"),
-            Activity.objects.filter(date_end__gt=timezone.now())
-                            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
-                            .distinct()
-                            .order_by("date_start")
-        ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

-        tables = context["tables"]
-        for name, table in zip(["table", "upcoming"], tables):
-            context[name] = table
+        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
+        context['upcoming'] = ActivityTable(
+            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")),
+            prefix='upcoming-',
+            order_by='date_start',
+        )

        started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
        context["started_activities"] = started_activities
@ -95,7 +85,7 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
        return context


-class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
+class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    Shows details about one activity. Add guest to context
    """
@ -103,16 +93,13 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMi
    context_object_name = "activity"
    extra_context = {"title": _("Activity detail")}

-    table_class = GuestTable
-    context_table_name = "guests"
-
-    def get_table_data(self):
-        return Guest.objects.filter(activity=self.object) \
-            .filter(PermissionBackend.filter_queryset(self.request, Guest, "view"))
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data()

+        table = GuestTable(data=Guest.objects.filter(activity=self.object)
+                           .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")))
+        context["guests"] = table
+
        context["activity_started"] = timezone.now() > timezone.localtime(self.object.date_start)

        return context
@ -171,14 +158,12 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
        return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})


-class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
+class ActivityEntryView(LoginRequiredMixin, TemplateView):
    """
    Manages entry to an activity
    """
    template_name = "activity/activity_entry.html"

-    table_class = EntryTable
-
    def dispatch(self, request, *args, **kwargs):
        """
        Don't display the entry interface if the user has no right to see it (no right to add an entry for itself),
@ -267,9 +252,15 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
            if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
        return note_qs

-    def get_table_data(self):
+    def get_context_data(self, **kwargs):
+        """
+        Query the list of Guest and Note to the activity and add information to makes entry with JS.
+        """
+        context = super().get_context_data(**kwargs)
+
        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
            .distinct().get(pk=self.kwargs["pk"])
+        context["activity"] = activity

        matched = []

@ -282,17 +273,8 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
            note.activity = activity
            matched.append(note)

-        return matched
-
-    def get_context_data(self, **kwargs):
-        """
-        Query the list of Guest and Note to the activity and add information to makes entry with JS.
-        """
-        context = super().get_context_data(**kwargs)
-
-        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
-            .distinct().get(pk=self.kwargs["pk"])
-        context["activity"] = activity
+        table = EntryTable(data=matched)
+        context["table"] = table

        context["entries"] = Entry.objects.filter(activity=activity)

@ -334,8 +316,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Paris
-X-LIC-LOCATION:Europe/Paris
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@ -357,10 +339,10 @@ END:VTIMEZONE
 DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
 UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
 SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_start)}
-DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
+DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
+DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
 LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + f"""
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
 -- {activity.organizer.name}
 END:VEVENT
 """
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
-from django.conf.urls import url, include
+from django.urls import include, re_path
 from rest_framework import routers

 from .views import UserInformationView
@ -47,7 +47,7 @@ app_name = 'api'
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    url('^', include(router.urls)),
-    url('^me/', UserInformationView.as_view()),
-    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    re_path('^', include(router.urls)),
+    re_path('^me/', UserInformationView.as_view()),
+    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@ -3,6 +3,7 @@

 import io

+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
@ -13,7 +14,7 @@ from django.forms import CheckboxSelectMultiple
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
-from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
+from note_kfet.inputs import Autocomplete, AmountInput
 from permission.models import PermissionMask, Role

 from .models import Profile, Club, Membership
@ -32,7 +33,7 @@ class UserForm(forms.ModelForm):
        # Django usernames can only contain letters, numbers, @, ., +, - and _.
        # We want to allow users to have uncommon and unpractical usernames:
        # That is their problem, and we have normalized aliases for us.
-        return super()._get_validation_exclusions() + ["username"]
+        return super()._get_validation_exclusions() | {"username"}

    class Meta:
        model = User
@ -138,9 +139,6 @@ class ImageForm(forms.Form):

        return cleaned_data

-    def is_valid(self):
-        return super().is_valid() or super().clean().get('image') is None
-

 class ClubForm(forms.ModelForm):
    def clean(self):
@ -154,7 +152,7 @@ class ClubForm(forms.ModelForm):

    class Meta:
        model = Club
-        exclude = ("add_registration_form",)
+        fields = '__all__'
        widgets = {
            "membership_fee_paid": AmountInput(),
            "membership_fee_unpaid": AmountInput(),
--- a/apps/member/migrations/0012_club_add_registration_form.py
+++ b/apps/member/migrations/0012_club_add_registration_form.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-07-15 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0011_profile_vss_charter_read'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='club',
-            name='add_registration_form',
-            field=models.BooleanField(default=False, verbose_name='add to registration form'),
-        ),
-    ]
--- a/apps/member/models.py
+++ b/apps/member/models.py
@ -259,11 +259,6 @@ class Club(models.Model):
        help_text=_('Maximal date of a membership, after which members must renew it.'),
    )

-    add_registration_form = models.BooleanField(
-        verbose_name=_("add to registration form"),
-        default=False,
-    )
-
    class Meta:
        verbose_name = _("club")
        verbose_name_plural = _("clubs")
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@ -14,9 +14,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
      <form method="post" enctype="multipart/form-data" id="formUpload">
        {% csrf_token %}
        {{ form |crispy }}
-        {% if user.note.display_image != "pic/default.png" %}
-          <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
-        {% endif %}
      </form>
    </div>
    <!-- MODAL TO CROP THE IMAGE -->
--- a/apps/member/tests/test_login.py
+++ b/apps/member/tests/test_login.py
@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)

    def test_logout(self):
-        response = self.client.get(reverse("logout"))
+        response = self.client.post(reverse("logout"))
        self.assertEqual(response.status_code, 200)

    def test_admin_index(self):
--- a/apps/member/views.py
+++ b/apps/member/views.py
@ -16,7 +16,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
-from django_tables2.views import MultiTableMixin, SingleTableMixin, SingleTableView
+from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
 from note.models import Alias, NoteClub, NoteUser, Trust
 from note.models.transactions import Transaction, SpecialTransaction
@ -165,8 +165,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
        # Display only the most recent membership
        club_list = club_list.distinct("club__name")\
            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_list
-        club_list_order_by = self.request.GET.getlist("membership-sort", ("club__name", "-date_start"))
-        membership_table = MembershipTable(data=club_list, prefix='membership-', order_by=club_list_order_by)
+        membership_table = MembershipTable(data=club_list, prefix='membership-')
        membership_table.paginate(per_page=10, page=self.request.GET.get("membership-page", 1))
        context['club_list'] = membership_table

@ -244,7 +243,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
        return context


-class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
+class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    View and manage user trust relationships
    """
@ -253,25 +252,13 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
    context_object_name = 'user_object'
    extra_context = {"title": _("Note friendships")}

-    tables = [
-        lambda data: TrustTable(data, prefix="trust-"),
-        lambda data: TrustedTable(data, prefix="trusted-"),
-    ]
-
-    def get_tables_data(self):
-        note = self.object.note
-        return [
-            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
-            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
-        ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
-
-        tables = context["tables"]
-        for name, table in zip(["trusting", "trusted_by"], tables):
-            context[name] = table
-
+        note = context['object'].note
+        context["trusting"] = TrustTable(
+            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
+        context["trusted_by"] = TrustedTable(
+            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
        context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
            trusting=context["object"].note,
            trusted=context["object"].note
@ -290,7 +277,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
        return context


-class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
+class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    View and manage user aliases.
    """
@ -299,15 +286,12 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixi
    context_object_name = 'user_object'
    extra_context = {"title": _("Note aliases")}

-    table_class = AliasTable
-    context_table_name = "aliases"
-
-    def get_table_data(self):
-        return self.object.note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct() \
-                                     .order_by('normalized_name')
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
+        note = context['object'].note
+        context["aliases"] = AliasTable(
+            note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
+            .order_by('normalized_name').all())
        context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
            note=context["object"].note,
            name="",
@ -342,15 +326,12 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
        """Save image to note"""
        image = form.cleaned_data['image']

-        if image is None:
-            image = "pic/default.png"
+        # Rename as a PNG or GIF
+        extension = image.name.split(".")[-1]
+        if extension == "gif":
+            image.name = "{}_pic.gif".format(self.object.note.pk)
        else:
-            # Rename as a PNG or GIF
-            extension = image.name.split(".")[-1]
-            if extension == "gif":
-                image.name = "{}_pic.gif".format(self.object.note.pk)
-            else:
-                image.name = "{}_pic.png".format(self.object.note.pk)
+            image.name = "{}_pic.png".format(self.object.note.pk)

        # Save
        self.object.note.display_image = image
@ -467,8 +448,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
        managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club",
                                             date_start__lte=date.today(), date_end__gte=date.today())\
            .order_by('user__last_name').all()
-        managers_order_by = self.request.GET.getlist("managers-sort", ('user__last_name'))
-        context["managers"] = ClubManagerTable(data=managers, prefix="managers-", order_by=managers_order_by)
+        context["managers"] = ClubManagerTable(data=managers, prefix="managers-")
        # transaction history
        club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
            .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view"))\
@ -486,8 +466,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
        club_member = club_member.distinct("user__username")\
            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_member

-        membership_order_by = self.request.GET.getlist("membership-sort", ("user__username", "-date_start"))
-        membership_table = MembershipTable(data=club_member, prefix="membership-", order_by=membership_order_by)
+        membership_table = MembershipTable(data=club_member, prefix="membership-")
        membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
        context['member_list'] = membership_table

@ -528,7 +507,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
        return context


-class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
+class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    Manage aliases of a club.
    """
@ -537,16 +516,11 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin,
    context_object_name = 'club'
    extra_context = {"title": _("Note aliases")}

-    table_class = AliasTable
-    context_table_name = "aliases"
-
-    def get_table_data(self):
-        return self.object.note.alias.filter(
-            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
-
+        note = context['object'].note
+        context["aliases"] = AliasTable(note.alias.filter(
+            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct().all())
        context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
            note=context["object"].note,
            name="",
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@ -13,7 +13,7 @@ def register_note_urls(router, path):
    router.register(path + '/note', NotePolymorphicViewSet)
    router.register(path + '/alias', AliasViewSet)
    router.register(path + '/trust', TrustViewSet)
-    router.register(path + '/consumer', ConsumerViewSet)
+    router.register(path + '/consumer', ConsumerViewSet, basename="consumer")

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
    router.register(path + '/transaction/transaction', TransactionViewSet)
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@ -179,19 +179,10 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
            # We match first an alias if it is matched without normalization,
            # then if the normalized pattern matches a normalized alias.
            queryset = queryset.filter(
-                **{f'name{suffix}': alias_prefix + alias}
-            ).union(
-                queryset.filter(
-                    Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
-                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
-                ),
-                all=True).union(
-                queryset.filter(
-                    Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
-                    & ~Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
-                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
-                ),
-                all=True)
+                Q(**{f'name{suffix}': alias_prefix + alias})
+                | Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                | Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+            )

        queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
            else queryset.order_by("name")
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@ -1,13 +1,15 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 from datetime import datetime

+from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms import CheckboxSelectMultiple
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
-from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput
+from note_kfet.inputs import Autocomplete, AmountInput

 from .models import TransactionTemplate, NoteClub, Alias

--- a/apps/note/migrations/0002_create_special_notes.py
+++ b/apps/note/migrations/0002_create_special_notes.py
@ -18,6 +18,7 @@ def create_special_notes(apps, schema_editor):
 class Migration(migrations.Migration):
    dependencies = [
        ('note', '0001_initial'),
+        ('logs', '0001_initial'),
    ]

    operations = [
--- a/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
+++ b/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
@ -0,0 +1,25 @@
+# Generated by Django 5.0.7 on 2024-07-11 09:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('note', '0006_trust'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='note',
+            name='polymorphic_ctype',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
+        ),
+        migrations.AlterField(
+            model_name='transaction',
+            name='polymorphic_ctype',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
+        ),
+    ]
--- a/apps/note/templates/note/amount_input.html
+++ b/apps/note/templates/note/amount_input.html
@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           name="{{ widget.name }}"
           {# Other attributes are loaded  #}
           {% for name, value in widget.attrs.items %}
-                {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
+                {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
            {% endfor %}>
    <div class="input-group-append">
        <span class="input-group-text">€</span>
--- a/apps/note/templates/note/mails/negative_balance.html
+++ b/apps/note/templates/note/mails/negative_balance.html
@ -23,7 +23,7 @@

 <p>
    Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde
-    est inférieur à 0 €.
+    est inférieur à 0 € depuis plus de 24h.
 </p>

 <p>
@ -43,4 +43,4 @@
    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 </p>
 </body>
-</html>
+</html>
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@ -2591,12 +2591,12 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]",
 			"type": "add",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Créer une transaction quelconque tant que la source reste positive s'il s'agit d'alcool, sinon au-dessus de -20€"
+			"description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €"
 		}
 	},
 	{
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@ -12,7 +12,6 @@ from django.forms import HiddenInput
 from django.http import Http404
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import UpdateView, TemplateView, CreateView
-from django_tables2 import MultiTableMixin
 from member.models import Membership

 from .backends import PermissionBackend
@ -108,31 +107,10 @@ class ProtectedCreateView(LoginRequiredMixin, CreateView):
        return super().dispatch(request, *args, **kwargs)


-class RightsView(MultiTableMixin, TemplateView):
+class RightsView(TemplateView):
    template_name = "permission/all_rights.html"
    extra_context = {"title": _("Rights")}

-    tables = [
-        lambda data: RightsTable(data, prefix="clubs-"),
-        lambda data: SuperuserTable(data, prefix="superusers-"),
-    ]
-
-    def get_tables_data(self):
-        special_memberships = Membership.objects.filter(
-            date_start__lte=date.today(),
-            date_end__gte=date.today(),
-        ).filter(roles__in=Role.objects.filter((~(Q(name="Adhérent BDE")
-                                                  | Q(name="Adhérent Kfet")
-                                                  | Q(name="Membre de club")
-                                                  | Q(name="Bureau de club"))
-                                                & Q(weirole__isnull=True))))\
-            .order_by("club__name", "user__last_name")\
-            .distinct().all()
-        return [
-            special_memberships,
-            User.objects.filter(is_superuser=True).order_by("last_name"),
-        ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

@ -150,9 +128,19 @@ class RightsView(MultiTableMixin, TemplateView):
            role.clubs = [membership.club for membership in active_memberships if role in membership.roles.all()]

        if self.request.user.is_authenticated:
-            tables = context["tables"]
-            for name, table in zip(["special_memberships_table", "superusers"], tables):
-                context[name] = table
+            special_memberships = Membership.objects.filter(
+                date_start__lte=date.today(),
+                date_end__gte=date.today(),
+            ).filter(roles__in=Role.objects.filter((~(Q(name="Adhérent BDE")
+                                                      | Q(name="Adhérent Kfet")
+                                                      | Q(name="Membre de club")
+                                                      | Q(name="Bureau de club"))
+                                                    & Q(weirole__isnull=True))))\
+                .order_by("club__name", "user__last_name")\
+                .distinct().all()
+            context["special_memberships_table"] = RightsTable(special_memberships, prefix="clubs-")
+            context["superusers"] = SuperuserTable(User.objects.filter(is_superuser=True).order_by("last_name").all(),
+                                                   prefix="superusers-")

        return context

--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@ -5,6 +5,7 @@ from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
+# from member.models import Club
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import AmountInput

@ -114,3 +115,12 @@ class ValidationForm(forms.Form):
        required=False,
        initial=True,
    )
+
+#     If the bda exists
+#     if Club.objects.filter(name__iexact="bda").exists():
+#         The user can join the bda club at the inscription
+#         join_bda = forms.BooleanField(
+#             label=_("Join BDA Club"),
+#             required=False,
+#             initial=True,
+#         )
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@ -1,7 +1,6 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from django import forms
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
@ -239,8 +238,9 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
        kfet = Club.objects.get(name="Kfet")
        fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
-        for club in Club.objects.filter(add_registration_form=True):
-            fee += club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
+        if Club.objects.filter(name__iexact="BDA").exists():
+            bda = Club.objects.get(name__iexact="BDA")
+            fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
        ctx["total_fee"] = "{:.02f}".format(fee / 100, )

 #        ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
@ -249,16 +249,6 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,

    def get_form(self, form_class=None):
        form = super().get_form(form_class)
-
-        # add clubs that are in registration form
-        for club in Club.objects.filter(add_registration_form=True).order_by("name"):
-            form_join_club = forms.BooleanField(
-                label=_("Join %(club)s Club") % {'club': club.name},
-                required=False,
-                initial=False,
-            )
-            form.fields.update({f"join_{club.id}": form_join_club})
-
        user = self.get_object()
        form.fields["last_name"].initial = user.last_name
        form.fields["first_name"].initial = user.first_name
@ -276,6 +266,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            form.add_error(None, _("An alias with a similar name already exists."))
            return self.form_invalid(form)

+        # Check if BDA exist to propose membership at regisration
+        bda_exists = False
+        if Club.objects.filter(name__iexact="BDA").exists():
+            bda_exists = True
+
        # Get form data
 #        soge = form.cleaned_data["soge"]
        credit_type = form.cleaned_data["credit_type"]
@ -285,9 +280,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        bank = form.cleaned_data["bank"]
        join_bde = form.cleaned_data["join_bde"]
        join_kfet = form.cleaned_data["join_kfet"]
-
-        clubs_registration = Club.objects.filter(add_registration_form=True).order_by("name")
-        join_clubs = [(club, form.cleaned_data[f"join_{club.id}"]) for club in clubs_registration]
+        if bda_exists:
+            join_bda = form.cleaned_data["join_bda"]

 #        if soge:
 #            # If Société Générale pays the inscription, the user automatically joins the two clubs.
@ -309,12 +303,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
        # Add extra fee for the full membership
        fee += kfet_fee if join_kfet else 0
-        clubs_fee = dict()
-        for club, join_club in join_clubs:
-            club_fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
-            # Add extra fee for the club membership
-            clubs_fee[club] = club_fee
-            fee += club_fee if join_club else 0
+        if bda_exists:
+            bda = Club.objects.get(name__iexact="BDA")
+            bda_fee = bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
+            # Add extra fee for the bda membership
+            fee += bda_fee if join_bda else 0

 #        # If the bank pays, then we don't credit now. Treasurers will validate the transaction
 #        # and credit the note later.
@ -394,18 +387,17 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
            membership.save()

-        for club, join_club in join_clubs:
-            if join_club:
-                # Create membership for the user to the BDA starting today
-                membership = Membership(
-                    club=club,
-                    user=user,
-                    fee=clubs_fee[club],
-                )
-                membership.save()
-                membership.refresh_from_db()
-                membership.roles.add(Role.objects.get(name="Membre de club"))
-                membership.save()
+        if bda_exists and join_bda:
+            # Create membership for the user to the BDA starting today
+            membership = Membership(
+                club=bda,
+                user=user,
+                fee=bda_fee,
+            )
+            membership.save()
+            membership.refresh_from_db()
+            membership.roles.add(Role.objects.get(name="Membre de club"))
+            membership.save()

 #        if soge:
 #            soge_credit = SogeCredit.objects.get(user=user)
--- a/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
+++ b/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-07-11 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('note', '0007_alter_note_polymorphic_ctype_and_more'),
+        ('treasury', '0008_auto_20240322_0045'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sogecredit',
+            name='transactions',
+            field=models.ManyToManyField(blank=True, related_name='+', to='note.membershiptransaction', verbose_name='membership transactions'),
+        ),
+    ]
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@ -19,7 +19,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import UpdateView, DetailView
 from django.views.generic.base import View, TemplateView
 from django.views.generic.edit import BaseFormView, DeleteView
-from django_tables2 import MultiTableMixin, SingleTableMixin, SingleTableView
+from django_tables2 import SingleTableView
 from note.models import SpecialTransaction, NoteSpecial, Alias
 from note_kfet.settings.base import BASE_DIR
 from permission.backends import PermissionBackend
@ -251,26 +251,21 @@ class RemittanceCreateView(ProtectQuerysetMixin, ProtectedCreateView):
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

+        context["table"] = RemittanceTable(
+            data=Remittance.objects.filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all())
        context["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none())

        return context


-class RemittanceListView(LoginRequiredMixin, MultiTableMixin, TemplateView):
+class RemittanceListView(LoginRequiredMixin, TemplateView):
    """
    List existing Remittances
    """
    template_name = "treasury/remittance_list.html"
    extra_context = {"title": _("Remittances list")}

-    tables = [
-        lambda data: RemittanceTable(data, prefix="opened-remittances-"),
-        lambda data: RemittanceTable(data, prefix="closed-remittances-"),
-        lambda data: SpecialTransactionTable(data, prefix="no-remittance-", exclude=('remittance_remove', )),
-        lambda data: SpecialTransactionTable(data, prefix="with-remittance-", exclude=('remittance_add', )),
-    ]
-    paginate_by = 10     # number of rows in tables
-
    def dispatch(self, request, *args, **kwargs):
        # Check that the user is authenticated
        if not request.user.is_authenticated:
@ -280,37 +275,49 @@ class RemittanceListView(LoginRequiredMixin, MultiTableMixin, TemplateView):
            raise PermissionDenied(_("You are not able to see the treasury interface."))
        return super().dispatch(request, *args, **kwargs)

-    def get_tables_data(self):
-        return [
-            Remittance.objects.filter(closed=False).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
-            Remittance.objects.filter(closed=True).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
-            SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
-                                              specialtransactionproxy__remittance=None).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
-            SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
-                                              specialtransactionproxy__remittance__closed=False).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
-        ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

-        tables = context["tables"]
-        names = [
-            "opened_remittances",
-            "closed_remittances",
-            "special_transactions_no_remittance",
-            "special_transactions_with_remittance",
-        ]
-        for name, table in zip(names, tables):
-            context[name] = table
+        opened_remittances = RemittanceTable(
+            data=Remittance.objects.filter(closed=False).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
+            prefix="opened-remittances-",
+        )
+        opened_remittances.paginate(page=self.request.GET.get("opened-remittances-page", 1), per_page=10)
+        context["opened_remittances"] = opened_remittances
+
+        closed_remittances = RemittanceTable(
+            data=Remittance.objects.filter(closed=True).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
+            prefix="closed-remittances-",
+        )
+        closed_remittances.paginate(page=self.request.GET.get("closed-remittances-page", 1), per_page=10)
+        context["closed_remittances"] = closed_remittances
+
+        no_remittance_tr = SpecialTransactionTable(
+            data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
+                                                   specialtransactionproxy__remittance=None).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
+            exclude=('remittance_remove', ),
+            prefix="no-remittance-",
+        )
+        no_remittance_tr.paginate(page=self.request.GET.get("no-remittance-page", 1), per_page=10)
+        context["special_transactions_no_remittance"] = no_remittance_tr
+
+        with_remittance_tr = SpecialTransactionTable(
+            data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
+                                                   specialtransactionproxy__remittance__closed=False).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
+            exclude=('remittance_add', ),
+            prefix="with-remittance-",
+        )
+        with_remittance_tr.paginate(page=self.request.GET.get("with-remittance-page", 1), per_page=10)
+        context["special_transactions_with_remittance"] = with_remittance_tr

        return context


-class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, UpdateView):
+class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
    """
    Update Remittance
    """
@ -318,18 +325,19 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
    form_class = RemittanceForm
    extra_context = {"title": _("Update a remittance")}

-    table_class = SpecialTransactionTable
-    context_table_name = "special_transactions"
-
    def get_success_url(self):
        return reverse_lazy('treasury:remittance_list')

-    def get_table_data(self):
-        return SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter(
-            PermissionBackend.filter_queryset(self.request, Remittance, "view"))
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)

-    def get_table_kwargs(self):
-        return {"exclude": ('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )}
+        data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter(
+            PermissionBackend.filter_queryset(self.request, Remittance, "view")).all()
+        context["special_transactions"] = SpecialTransactionTable(
+            data=data,
+            exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', ))
+
+        return context


 class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@ -1,13 +1,14 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
-from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
+from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget

 from ..models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership, WEIRole

--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@ -439,7 +439,7 @@ class TestWEIRegistration(TestCase):
            emergency_contact_phone='+33123456789',
        ))
        self.assertEqual(response.status_code, 200)
-        self.assertTrue("This user can&#39;t be in her/his first year since he/she has already participated to a WEI."
+        self.assertTrue("This user can&#x27;t be in her/his first year since he/she has already participated to a WEI."
                        in str(response.context["form"].errors))

        # Check that if the WEI is started, we can't register anyone
@ -635,7 +635,7 @@ class TestWEIRegistration(TestCase):
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["form"].is_valid())
-        self.assertTrue("This team doesn&#39;t belong to the given bus." in str(response.context["form"].errors))
+        self.assertTrue("This team doesn&#x27;t belong to the given bus." in str(response.context["form"].errors))

        response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
            roles=[WEIRole.objects.get(name="GC WEI").id],
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@ -22,7 +22,7 @@ from django.views import View
 from django.views.generic import DetailView, UpdateView, RedirectView, TemplateView
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.edit import BaseFormView, DeleteView
-from django_tables2 import SingleTableView, MultiTableMixin
+from django_tables2 import SingleTableView
 from member.models import Membership, Club
 from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
 from note.tables import HistoryTable
@ -100,7 +100,7 @@ class WEICreateView(ProtectQuerysetMixin, ProtectedCreateView):
        return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.pk})


-class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
+class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    View WEI information
    """
@ -108,40 +108,34 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
    context_object_name = "club"
    extra_context = {"title": _("WEI Detail")}

-    tables = [
-        lambda data: HistoryTable(data, prefix="history-"),
-        lambda data: WEIMembershipTable(data, prefix="membership-"),
-        lambda data: WEIRegistrationTable(data, prefix="pre-registration-"),
-        lambda data: BusTable(data, prefix="bus-"),
-    ]
-    paginate_by = 20   # number of rows in tables
-
-    def get_tables_data(self):
-        club = self.object
-        club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note)) \
-            .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view")) \
-            .order_by('-created_at', '-id')
-        club_member = WEIMembership.objects.filter(
-            club=club,
-            date_end__gte=date.today(),
-        ).filter(PermissionBackend.filter_queryset(self.request, WEIMembership, "view"))
-        pre_registrations = WEIRegistration.objects.filter(
-            PermissionBackend.filter_queryset(self.request, WEIRegistration, "view")).filter(
-            membership=None,
-            wei=club
-        )
-        buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
-            .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
-        return [club_transactions, club_member, pre_registrations, buses, ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

        club = context["club"]

-        tables = context["tables"]
-        for name, table in zip(["history_list", "member_list", "pre_registrations", "buses"], tables):
-            context[name] = table
+        club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note)) \
+            .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view")) \
+            .order_by('-created_at', '-id')
+        history_table = HistoryTable(club_transactions, prefix="history-")
+        history_table.paginate(per_page=20, page=self.request.GET.get('history-page', 1))
+        context['history_list'] = history_table
+
+        club_member = WEIMembership.objects.filter(
+            club=club,
+            date_end__gte=date.today(),
+        ).filter(PermissionBackend.filter_queryset(self.request, WEIMembership, "view"))
+        membership_table = WEIMembershipTable(data=club_member, prefix="membership-")
+        membership_table.paginate(per_page=20, page=self.request.GET.get('membership-page', 1))
+        context['member_list'] = membership_table
+
+        pre_registrations = WEIRegistration.objects.filter(
+            PermissionBackend.filter_queryset(self.request, WEIRegistration, "view")).filter(
+            membership=None,
+            wei=club
+        )
+        pre_registrations_table = WEIRegistrationTable(data=pre_registrations, prefix="pre-registration-")
+        pre_registrations_table.paginate(per_page=20, page=self.request.GET.get('pre-registration-page', 1))
+        context['pre_registrations'] = pre_registrations_table

        my_registration = WEIRegistration.objects.filter(wei=club, user=self.request.user)
        if my_registration.exists():
@ -150,6 +144,11 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
            my_registration = None
        context["my_registration"] = my_registration

+        buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
+            .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
+        bus_table = BusTable(data=buses, prefix="bus-")
+        context['buses'] = bus_table
+
        random_user = User.objects.filter(~Q(wei__wei__in=[club])).first()

        if random_user is None:
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -114,7 +114,7 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
 msgid "type"
 msgstr "type"

-#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:318
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:313
 #: apps/note/models/notes.py:148 apps/treasury/models.py:293
 #: apps/wei/models.py:171 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
@ -247,7 +247,6 @@ msgid "The validation of the activity is pending."
 msgstr "La validation de cette activité est en attente."

 #: apps/activity/tables.py:43 apps/treasury/tables.py:107
-#: apps/member/templates/member/picture_update.html:18
 msgid "Remove"
 msgstr "Supprimer"

@ -263,13 +262,13 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"

-#: apps/activity/tables.py:84 apps/member/forms.py:196
+#: apps/activity/tables.py:84 apps/member/forms.py:193
 #: apps/registration/forms.py:92 apps/treasury/forms.py:131
 #: apps/wei/forms/registration.py:104
 msgid "Last name"
 msgstr "Nom de famille"

-#: apps/activity/tables.py:86 apps/member/forms.py:201
+#: apps/activity/tables.py:86 apps/member/forms.py:198
 #: apps/note/templates/note/transaction_form.html:138
 #: apps/registration/forms.py:97 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
@ -401,37 +400,37 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

-#: apps/activity/views.py:68 note_kfet/templates/base.html:90
+#: apps/activity/views.py:67 note_kfet/templates/base.html:90
 msgid "Activities"
 msgstr "Activités"

-#: apps/activity/views.py:108
+#: apps/activity/views.py:93
 msgid "Activity detail"
 msgstr "Détails de l'activité"

-#: apps/activity/views.py:128
+#: apps/activity/views.py:113
 msgid "Update activity"
 msgstr "Modifier l'activité"

-#: apps/activity/views.py:155
+#: apps/activity/views.py:140
 msgid "Invite guest to the activity \"{}\""
 msgstr "Invitation pour l'activité « {} »"

-#: apps/activity/views.py:193
+#: apps/activity/views.py:178
 msgid "You are not allowed to display the entry interface for this activity."
 msgstr ""
 "Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
 "activité."

-#: apps/activity/views.py:196
+#: apps/activity/views.py:181
 msgid "This activity does not support activity entries."
 msgstr "Cette activité ne requiert pas d'entrées."

-#: apps/activity/views.py:199
+#: apps/activity/views.py:184
 msgid "This activity is closed."
 msgstr "Cette activité est fermée."

-#: apps/activity/views.py:295
+#: apps/activity/views.py:280
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"

@ -508,11 +507,11 @@ msgstr "cotisation pour adhérer (normalien·ne élève)"
 msgid "membership fee (unpaid students)"
 msgstr "cotisation pour adhérer (normalien·ne étudiant·e)"

-#: apps/member/admin.py:65 apps/member/models.py:330
+#: apps/member/admin.py:65 apps/member/models.py:325
 msgid "roles"
 msgstr "rôles"

-#: apps/member/admin.py:66 apps/member/models.py:344
+#: apps/member/admin.py:66 apps/member/models.py:339
 msgid "fee"
 msgstr "cotisation"

@ -564,29 +563,29 @@ msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."

 #: apps/member/forms.py:148 apps/member/views.py:102
-#: apps/registration/forms.py:34 apps/registration/views.py:276
+#: apps/registration/forms.py:34 apps/registration/views.py:266
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."

-#: apps/member/forms.py:175
+#: apps/member/forms.py:172
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"

-#: apps/member/forms.py:177
+#: apps/member/forms.py:174
 msgid "Check this case if the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."

-#: apps/member/forms.py:182 apps/registration/forms.py:79
+#: apps/member/forms.py:179 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Type de rechargement"

-#: apps/member/forms.py:183 apps/registration/forms.py:80
+#: apps/member/forms.py:180 apps/registration/forms.py:80
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "Pas de rechargement"

-#: apps/member/forms.py:185
+#: apps/member/forms.py:182
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."

@ -595,17 +594,17 @@ msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
 msgid "Credit amount"
 msgstr "Montant à créditer"

-#: apps/member/forms.py:206 apps/note/templates/note/transaction_form.html:144
+#: apps/member/forms.py:203 apps/note/templates/note/transaction_form.html:144
 #: apps/registration/forms.py:102 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Banque"

-#: apps/member/forms.py:233
+#: apps/member/forms.py:230
 msgid "User"
 msgstr "Utilisateur·ice"

-#: apps/member/forms.py:247
+#: apps/member/forms.py:244
 msgid "Roles"
 msgstr "Rôles"

@ -853,50 +852,46 @@ msgstr ""
 "Date maximale d'une fin d'adhésion, après laquelle les adhérent·e·s doivent la "
 "renouveler."

-#: apps/member/models.py:263
-msgid "add to registration form"
-msgstr "ajouter au formulaire d'inscription"
-
-#: apps/member/models.py:268 apps/member/models.py:324
+#: apps/member/models.py:263 apps/member/models.py:319
 #: apps/note/models/notes.py:176
 msgid "club"
 msgstr "club"

-#: apps/member/models.py:269
+#: apps/member/models.py:264
 msgid "clubs"
 msgstr "clubs"

-#: apps/member/models.py:335
+#: apps/member/models.py:330
 msgid "membership starts on"
 msgstr "l'adhésion commence le"

-#: apps/member/models.py:339
+#: apps/member/models.py:334
 msgid "membership ends on"
 msgstr "l'adhésion finit le"

-#: apps/member/models.py:348 apps/note/models/transactions.py:385
+#: apps/member/models.py:343 apps/note/models/transactions.py:385
 msgid "membership"
 msgstr "adhésion"

-#: apps/member/models.py:349
+#: apps/member/models.py:344
 msgid "memberships"
 msgstr "adhésions"

-#: apps/member/models.py:353
+#: apps/member/models.py:348
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr "Adhésion de {user} pour le club {club}"

-#: apps/member/models.py:372
+#: apps/member/models.py:367
 #, python-brace-format
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."

-#: apps/member/models.py:381 apps/member/views.py:712
+#: apps/member/models.py:376 apps/member/views.py:712
 msgid "User is already a member of the club"
 msgstr "L'utilisateur·ice est déjà membre du club"

-#: apps/member/models.py:393 apps/member/views.py:721
+#: apps/member/models.py:388 apps/member/views.py:721
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur·ice n'est pas membre du club parent"

@ -1158,11 +1153,11 @@ msgstr "Introspection :"
 msgid "Show my applications"
 msgstr "Voir mes applications"

-#: apps/member/templates/member/picture_update.html:38
+#: apps/member/templates/member/picture_update.html:35
 msgid "Nevermind"
 msgstr "Annuler"

-#: apps/member/templates/member/picture_update.html:39
+#: apps/member/templates/member/picture_update.html:36
 msgid "Crop and upload"
 msgstr "Recadrer et envoyer"

@ -2188,23 +2183,18 @@ msgstr "Utilisateur·ice·s en attente d'inscription"
 msgid "Registration detail"
 msgstr "Détails de l'inscription"

-#: apps/registration/views.py:256
-#, python-format
-msgid "Join %(club)s Club"
-msgstr "Adhérer au club %(club)s"
-
-#: apps/registration/views.py:299
+#: apps/registration/views.py:293
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."

-#: apps/registration/views.py:330
+#: apps/registration/views.py:323
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"

-#: apps/registration/views.py:425
+#: apps/registration/views.py:417
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"

@ -3630,6 +3620,9 @@ msgstr ""
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."

+#~ msgid "Join BDA Club"
+#~ msgstr "Adhérer au club BDA"
+
 #, fuzzy
 #~| msgid "People having you as a friend"
 #~ msgid "You already have that person as a friend"
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@ -25,19 +25,13 @@ admin_site.register(Site, SiteAdmin)

 # Add external apps model
 if "oauth2_provider" in settings.INSTALLED_APPS:
-    from oauth2_provider.admin import Application, ApplicationAdmin, Grant, \
-        GrantAdmin, AccessToken, AccessTokenAdmin, RefreshToken, RefreshTokenAdmin
+    from oauth2_provider.admin import ApplicationAdmin, GrantAdmin, AccessTokenAdmin, RefreshTokenAdmin
+    from oauth2_provider.models import Application, Grant, AccessToken, RefreshToken
    admin_site.register(Application, ApplicationAdmin)
    admin_site.register(Grant, GrantAdmin)
    admin_site.register(AccessToken, AccessTokenAdmin)
    admin_site.register(RefreshToken, RefreshTokenAdmin)

-if "django_htcpcp_tea" in settings.INSTALLED_APPS:
-    from django_htcpcp_tea.admin import *
-    from django_htcpcp_tea.models import *
-    admin_site.register(Pot, PotAdmin)
-    admin_site.register(TeaType, TeaTypeAdmin)
-    admin_site.register(Addition, AdditionAdmin)

 if "mailer" in settings.INSTALLED_APPS:
    from mailer.admin import *
@ -50,9 +44,3 @@ if "rest_framework" in settings.INSTALLED_APPS:
    from rest_framework.authtoken.admin import *
    from rest_framework.authtoken.models import *
    admin_site.register(Token, TokenAdmin)
-
-if "cas_server" in settings.INSTALLED_APPS:
-    from cas_server.admin import *
-    from cas_server.models import *
-    admin_site.register(ServicePattern, ServicePatternAdmin)
-    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -41,7 +41,7 @@ INSTALLED_APPS = [
    'bootstrap_datepicker_plus',
    'colorfield',
    'crispy_forms',
-    'django_htcpcp_tea',
+    'crispy_bootstrap4',
    'django_tables2',
    'mailer',
    'phonenumber_field',
@ -90,7 +90,6 @@ MIDDLEWARE = [
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.locale.LocaleMiddleware',
    'django.contrib.sites.middleware.CurrentSiteMiddleware',
-    'django_htcpcp_tea.middleware.HTCPCPTeaMiddleware',
    'note_kfet.middlewares.SessionMiddleware',
    'note_kfet.middlewares.LoginByIPMiddleware',
    'note_kfet.middlewares.TurbolinksMiddleware',
@ -295,3 +294,6 @@ PHONENUMBER_DEFAULT_REGION = 'FR'

 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
+
+# Default field for primary key
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
--- a/note_kfet/templates/autocomplete_model.html
+++ b/note_kfet/templates/autocomplete_model.html
@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
   {% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
   name="{{ widget.name }}_name" autocomplete="off"
    {% for name, value in widget.attrs.items %}
-        {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
+        {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
    {% endfor %}
    aria-describedby="{{widget.attrs.id}}_tooltip">
    {% if widget.resetable %}
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -126,9 +126,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                    <i class="fa fa-user"></i> {% trans "My account" %}
                                </a>
-                                <a class="dropdown-item" href="{% url 'logout' %}">
+                                <form method="post" action="{% url 'logout' %}">
+                                  {% csrf_token %}
+                                  <button class="dropdown-item" type="submit">
                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-                                </a>
+                                  </button>
+                                </form>
                            </div>
                        </li>
                    {% else %}
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@ -30,9 +30,6 @@ urlpatterns = [
    path('accounts/', include('django.contrib.auth.urls')),
    path('api/', include('api.urls')),
    path('permission/', include('permission.urls')),
-
-    # Make coffee
-    path('coffee/', include('django_htcpcp_tea.urls')),
 ]

 # During development, serve static and media files
@ -46,11 +43,6 @@ if "oauth2_provider" in settings.INSTALLED_APPS:
        path('o/', include('oauth2_provider.urls', namespace='oauth2_provider'))
    )

-if "cas_server" in settings.INSTALLED_APPS:
-    urlpatterns.append(
-        path('cas/', include('cas_server.urls', namespace='cas_server'))
-    )
-
 if "debug_toolbar" in settings.INSTALLED_APPS:
    import debug_toolbar
    urlpatterns = [
--- a/requirements.txt
+++ b/requirements.txt
@ -1,19 +1,17 @@
-beautifulsoup4~=4.7.1
-Django~=2.2.15
-django-bootstrap-datepicker-plus~=3.0.5
-django-cas-server~=1.2.0
-django-colorfield~=0.3.2
-django-crispy-forms~=1.7.2
-django-extensions>=2.1.4
-django-filter~=2.1
-django-htcpcp-tea~=0.3.1
-django-mailer~=2.0.1
-django-oauth-toolkit~=1.3.3
-django-phonenumber-field~=5.0.0
-django-polymorphic>=2.0.3,<3.0.0
-djangorestframework>=3.9.0,<3.13.0
-django-rest-polymorphic~=0.1.9
-django-tables2~=2.3.1
-python-memcached~=1.59
-phonenumbers~=8.9.10
+beautifulsoup4~=4.12.3
+crispy-bootstrap4~=2024.1
+Django~=5.0.7
+django-bootstrap-datepicker-plus~=5.0.5
+django-colorfield~=0.11.0
+django-crispy-forms~=2.2
+django-extensions~=3.2.3
+django-filter~=24.2
+django-mailer~=2.3.2
+django-oauth-toolkit~=2.4.0
+django-phonenumber-field~=8.0.0
+django-polymorphic~=3.1.0
+django-rest-polymorphic~=0.1.10
+django-tables2~=2.7.0
+djangorestframework~=3.15.2
+phonenumbers~=8.13.40
 Pillow>=5.4.1
--- a/tox.ini
+++ b/tox.ini
@ -1,13 +1,10 @@
 [tox]
 envlist =
-    # Debian Buster Python
-    py37-django22
-
    # Ubuntu 20.04 Python
-    py38-django22
+    py310-django50

    # Debian Bullseye Python
-    py39-django22
+    py311-django50

    linters
 skipsdist = True
@ -51,4 +48,4 @@ max-complexity = 15
 max-line-length = 160
 import-order-style = google
 application-import-names = flake8
-format = %(cyan)s%(path)s%(reset)s:%(yellow)s%(bold)s%(row)d%(reset)s:%(green)s%(bold)s%(col)d%(reset)s: %(red)s%(bold)s%(code)s%(reset)s %(text)s
+format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s