Merge branch 'main' into family

2025-11-04 09:12:11 +01:00 · 2025-07-18 18:01:46 +02:00
parent f64138605d f03c13a4b8
commit ac56700705
40 changed files with 1576 additions and 2175 deletions
--- a/.env_example
+++ b/.env_example
@@ -21,3 +21,6 @@ EMAIL_PASSWORD=CHANGE_ME
 # Wiki configuration
 WIKI_USER=NoteKfet2020
 WIKI_PASSWORD=
+
+# OIDC
+OIDC_RSA_PRIVATE_KEY=CHANGE_ME
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
  GIT_SUBMODULE_STRATEGY: recursive

 # Ubuntu 22.04
-py310-django42:
+py310-django52:
  stage: test
  image: ubuntu:22.04
  before_script:
@@ -22,10 +22,10 @@ py310-django42:
        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 py310-django42
+  script: tox -e py310-django52

 # Debian Bookworm
-py311-django42:
+py311-django52:
  stage: test
  image: debian:bookworm
  before_script:
@@ -37,7 +37,7 @@ py311-django42:
        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 py311-django42
+  script: tox -e py311-django52

 linters:
  stage: quality-assurance
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ Bien que cela permette de créer une instance sur toutes les distributions,
 6. (Optionnel) **Création d'une clé privée OpenID Connect**

 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et copier la clé dans .env dans le champ
+`OIDC_RSA_PRIVATE_KEY`.

 7.  Enjoy :

@@ -237,8 +237,8 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 7. **Création d'une clé privée OpenID Connect**

 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner le champ
+`OIDC_RSA_PRIVATE_KEY` dans le .env (par défaut `/var/secrets/oidc.key`).

 8.  *Enjoy \o/*

--- a/apps/food/forms.py
+++ b/apps/food/forms.py
@@ -145,7 +145,7 @@ class AddIngredientForms(forms.ModelForm):
            polymorphic_ctype__model="transformedfood",
            is_ready=False,
            end_of_life='',
-        ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
+        ).filter(PermissionBackend.filter_queryset(get_current_request(), Food, "change")).exclude(pk=pk)

    class Meta:
        model = TransformedFood
--- a/apps/food/templates/food/food_detail.html
+++ b/apps/food/templates/food/food_detail.html
@@ -12,18 +12,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
  </h3>
  <div class="card-body">
    <ul>
+      {% if QR_code %}
+      <li> {{QR_code}} </li>
+      {% endif %}
      {% for field, value in fields %}
      <li> {{ field }} : {{ value }}</li>
      {% endfor %}
      {% if meals %}
-      <li> {% trans "Contained in" %} : 
+      <li> {% trans "Contained in" %} :
      {% for meal in meals %}
-      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %} 
+      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %}
      {% endfor %}
      </li>
      {% endif %}
      {% if foods %}
-      <li> {% trans "Contain" %} : 
+      <li> {% trans "Contain" %} :
      {% for food in foods %}
        <a href="{% url "food:food_view" pk=food.pk %}">{{ food.name }}</a>{% if not forloop.last %},{% endif %}
      {% endfor %}
@@ -31,23 +34,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
      {% endif %}
    </ul>
      {% if update %}
-	<a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
-	  {% trans "Update" %}
-	</a>
+        <a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
+          {% trans "Update" %}
+        </a>
      {% endif %}
      {% if add_ingredient %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
-	  {% trans "Add to a meal" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
+          {% trans "Add to a meal" %}
+        </a>
      {% endif %}
      {% if manage_ingredients %}
        <a class="btn btn-sm btn-secondary" href="{% url "food:manage_ingredients" pk=food.pk %}">
-	  {% trans "Manage ingredients" %}
-	</a>
+          {% trans "Manage ingredients" %}
+        </a>
      {% endif %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
-	  {% trans "Return to the food list" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
+          {% trans "Return to the food list" %}
+        </a>
  </div>
 </div>
-{% endblock %}
+{% endblock %}
--- a/apps/food/templates/food/food_list.html
+++ b/apps/food/templates/food/food_list.html
@@ -7,7 +7,52 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n %}

 {% block content %}
-{{ block.super }}
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+      {{ title }}
+  </h3>
+  <div class="card-body">
+    <style>
+      input[type=number]::-webkit-inner-spin-button,
+      input[type=number]::-webkit-outer-spin-button {
+          -webkit-appearance: none;
+          margin: 0;
+      }
+      input[type=number] {
+          appearance: textfield;
+          padding: 6px;
+          border: 1px solid #ccc;
+          border-radius: 4px;
+          width: 100px;
+      }
+    </style>
+    <div class="d-flex align-items-center" style="max-width: 300px;">
+      <form method="get" action="{% url 'food:redirect_view' %}" class="d-flex w-100">
+        <input type="number" name="slug" placeholder="QR-code" required class="form-control form-control-sm" style="max-width: 120px;">
+        <button type="submit" class="btn btn-sm btn-primary">{% trans "View food" %}</button>
+      </form>
+    </div>
+  </div>
+  <div class="card-body">
+      <input id="searchbar" type="text" class="form-control"
+          placeholder="{% trans "Search by attribute such as name..." %}">
+  </div>
+
+  {% block extra_inside_card %}
+  {% endblock %}
+
+  <div id="dynamic-table">
+      {% if table.data %}
+      {% render_table table %}
+      {% else %}
+      <div class="card-body">
+          <div class="alert alert-warning">
+              {% trans "There is no results." %}
+          </div>
+      </div>
+      {% endif %}
+  </div>
+</div>
 <br>
 <div class="card bg-light mb-3">
  <h3 class="card-header text-center">
@@ -68,4 +113,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
  {% endfor %}
  {% endif %}
 </div>
-{% endblock %}
+
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+      document.getElementById('goButton').addEventListener('click', function(event) {
+          event.preventDefault();
+          const slug = document.getElementById('slugInput').value;
+          if (slug && !isNaN(slug)) {
+              window.location.href = `/food/${slug}/`;
+          } else {
+              alert("Veuillez entrer un nombre valide.");
+          }
+      });
+  });
+  </script>
+
+{% endblock %}
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@@ -18,4 +18,5 @@ urlpatterns = [
    path('detail/basic/<int:pk>', views.BasicFoodDetailView.as_view(), name='basicfood_view'),
    path('detail/transformed/<int:pk>', views.TransformedFoodDetailView.as_view(), name='transformedfood_view'),
    path('add/ingredient/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
+    path('redirect/', views.QRCodeRedirectView.as_view(), name='redirect_view'),
 ]
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -10,6 +10,7 @@ from django.db.models import Q
 from django.http import HttpResponseRedirect, Http404
 from django.views.generic import DetailView, UpdateView, CreateView
 from django.views.generic.list import ListView
+from django.views.generic.base import RedirectView
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -63,7 +64,8 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li
            valid_regex = is_regex(pattern)
            suffix = '__iregex' if valid_regex else '__istartswith'
            prefix = '^' if valid_regex else ''
-            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern}))
+            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern})
+                           | Q(**{f'owner__name{suffix}': prefix + pattern}))
        else:
            qs = qs.none()
        search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view'))
@@ -453,6 +455,8 @@ class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
        context["fields"] = [(
            Food._meta.get_field(field).verbose_name.capitalize(),
            value) for field, value in fields.items()]
+        if self.object.QR_code.exists():
+            context["QR_code"] = self.object.QR_code.first()
        context["meals"] = self.object.transformed_ingredient_inv.all()
        context["update"] = PermissionBackend.check_perm(self.request, "food.change_food")
        context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))
@@ -506,3 +510,14 @@ class TransformedFoodDetailView(FoodDetailView):
        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
        return super().get(*args, **kwargs)
+
+
+class QRCodeRedirectView(RedirectView):
+    """
+    Redirects to the QR code creation page from Food List
+    """
+    def get_redirect_url(self, *args, **kwargs):
+        slug = self.request.GET.get('slug')
+        if slug:
+            return reverse_lazy('food:qrcode_create', kwargs={'slug': slug})
+        return reverse_lazy('food:list')
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -438,8 +438,6 @@ class Membership(models.Model):
            )
            if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
                new_membership._force_renew_parent = True
-            if hasattr(self, '_soge') and self._soge:
-                new_membership._soge = True
            if hasattr(self, '_force_save') and self._force_save:
                new_membership._force_save = True
            new_membership.save()
@@ -458,8 +456,6 @@ class Membership(models.Model):
            # Renew the previous membership of the parent club
            parent_membership = parent_membership.first()
            parent_membership._force_renew_parent = True
-            if hasattr(self, '_soge'):
-                parent_membership._soge = True
            if hasattr(self, '_force_save'):
                parent_membership._force_save = True
            parent_membership.renew()
@@ -471,8 +467,6 @@ class Membership(models.Model):
                date_start=self.date_start,
            )
            parent_membership._force_renew_parent = True
-            if hasattr(self, '_soge'):
-                parent_membership._soge = True
            if hasattr(self, '_force_save'):
                parent_membership._force_save = True
            parent_membership.save()
--- 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/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='alias2')

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
    router.register(path + '/transaction/transaction', TransactionViewSet)
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -4810,18 +4810,6 @@
            ]
        }
    },
-    {
-        "model": "permission.role",
-        "pk": 16,
-        "fields": {
-            "for_club": null,
-            "name": "\u00c9lectron libre (avec perm)",
-            "permissions": [
-                22,
-                84
-            ]
-        }
-    },
    {
        "model": "permission.role",
        "pk": 17,
@@ -5093,11 +5081,6 @@
        "pk": 15,
        "fields": {}
    },
-    {
-        "model": "wei.weirole",
-        "pk": 16,
-        "fields": {}
-    },
    {
        "model": "wei.weirole",
        "pk": 17,
--- a/apps/permission/scopes.py
+++ b/apps/permission/scopes.py
@@ -1,8 +1,10 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
 from member.models import Club
+from note.models import Alias
 from note_kfet.middlewares import get_current_request

 from .backends import PermissionBackend
@@ -16,26 +18,58 @@ class PermissionScopes(BaseScopes):
    and can be useful to make queries through the API with limited privileges.
    """

-    def get_all_scopes(self):
-        return {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
-                for p in Permission.objects.all() for club in Club.objects.all()}
+    def get_all_scopes(self, **kwargs):
+        scopes = {}
+        if 'scopes' in kwargs:
+            for scope in kwargs['scopes']:
+                if scope == 'openid':
+                    scopes['openid'] = "OpenID Connect"
+                else:
+                    p = Permission.objects.get(id=scope.split('_')[0])
+                    club = Club.objects.get(id=scope.split('_')[1])
+                    scopes[scope] = f"{p.description} (club {club.name})"
+            return scopes
+
+        scopes = {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
+                  for p in Permission.objects.all() for club in Club.objects.all()}
+        scopes['openid'] = "OpenID Connect"
+        return scopes

    def get_available_scopes(self, application=None, request=None, *args, **kwargs):
        if not application:
            return []
-        return [f"{p.id}_{p.membership.club.id}"
-                for t in Permission.PERMISSION_TYPES
-                for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
+        scopes = [f"{p.id}_{p.membership.club.id}"
+                  for t in Permission.PERMISSION_TYPES
+                  for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
+        scopes.append('openid')
+        return scopes

    def get_default_scopes(self, application=None, request=None, *args, **kwargs):
        if not application:
            return []
-        return [f"{p.id}_{p.membership.club.id}"
-                for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
+        scopes = [f"{p.id}_{p.membership.club.id}"
+                  for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
+        scopes.append('openid')
+        return scopes


 class PermissionOAuth2Validator(OAuth2Validator):
-    oidc_claim_scope = None  # fix breaking change of django-oauth-toolkit 2.0.0
+    oidc_claim_scope = OAuth2Validator.oidc_claim_scope
+    oidc_claim_scope.update({"name": 'openid',
+                             "normalized_name": 'openid',
+                             "email": 'openid',
+                             })
+
+    def get_additional_claims(self, request):
+        return {
+            "name": request.user.username,
+            "normalized_name": Alias.normalize(request.user.username),
+            "email": request.user.email,
+        }
+
+    def get_discovery_claims(self, request):
+        claims = super().get_discovery_claims(self)
+        return claims + ["name", "normalized_name", "email"]

    def validate_scopes(self, client_id, scopes, client, request, *args, **kwargs):
        """
@@ -54,6 +88,8 @@ class PermissionOAuth2Validator(OAuth2Validator):
                if scope in scopes:
                    valid_scopes.add(scope)

-        request.scopes = valid_scopes
+        if 'openid' in scopes:
+            valid_scopes.add('openid')

+        request.scopes = valid_scopes
        return valid_scopes
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -13,12 +13,14 @@ EXCLUDED = [
    'cas_server.serviceticket',
    'cas_server.user',
    'cas_server.userattributes',
+    'constance.constance',
    'contenttypes.contenttype',
    'logs.changelog',
    'migrations.migration',
    'oauth2_provider.accesstoken',
    'oauth2_provider.grant',
    'oauth2_provider.refreshtoken',
+    'oauth2_provider.idtoken',
    'sessions.session',
 ]

--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -164,14 +164,24 @@ class ScopesView(LoginRequiredMixin, TemplateView):
        from oauth2_provider.models import Application
        from .scopes import PermissionScopes

-        scopes = PermissionScopes()
+        oidc = False
        context["scopes"] = {}
-        all_scopes = scopes.get_all_scopes()
        for app in Application.objects.filter(user=self.request.user).all():
-            available_scopes = scopes.get_available_scopes(app)
+            available_scopes = PermissionScopes().get_available_scopes(app)
            context["scopes"][app] = OrderedDict()
-            items = [(k, v) for (k, v) in all_scopes.items() if k in available_scopes]
+            all_scopes = PermissionScopes().get_all_scopes(scopes=available_scopes)
+            scopes = {}
+            for scope in available_scopes:
+                scopes[scope] = all_scopes[scope]
+            # remove OIDC scope for sort
+            if 'openid' in scopes:
+                del scopes['openid']
+                oidc = True
+            items = [(k, v) for (k, v) in scopes.items()]
            items.sort(key=lambda x: (int(x[0].split("_")[1]), int(x[0].split("_")[0])))
+            # add oidc if necessary
+            if oidc:
+                items.append(('openid', PermissionScopes().get_all_scopes(scopes=['openid'])['openid']))
            for k, v in items:
                context["scopes"][app][k] = v

--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@@ -353,7 +353,7 @@ class SogeCredit(models.Model):
    def amount(self):
        if self.valid:
            return self.credit_transaction.total
-        amount = sum(transaction.total for transaction in self.transactions.all())
+        amount = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all())
        if 'wei' in settings.INSTALLED_APPS:
            from wei.models import WEIMembership
            if not WEIMembership.objects\
@@ -441,7 +441,7 @@ class SogeCredit(models.Model):
        With Great Power Comes Great Responsibility...
        """

-        total_fee = sum(transaction.total for transaction in self.transactions.all() if not transaction.valid)
+        total_fee = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all() if not transaction.valid)
        if self.user.note.balance < total_fee:
            raise ValidationError(_("This user doesn't have enough money to pay the memberships with its note. "
                                    "Please ask her/him to credit the note before invalidating this credit."))
--- a/apps/wei/api/views.py
+++ b/apps/wei/api/views.py
@@ -77,7 +77,7 @@ class WEIRegistrationViewSet(ReadProtectedModelViewSet):
    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
    filterset_fields = ['user', 'user__username', 'user__first_name', 'user__last_name', 'user__email',
                        'user__note__alias__name', 'user__note__alias__normalized_name', 'wei', 'wei__name',
-                        'wei__email', 'wei__year', 'soge_credit', 'caution_check', 'birth_date', 'gender',
+                        'wei__email', 'wei__year', 'soge_credit', 'deposit_check', 'birth_date', 'gender',
                        'clothing_cut', 'clothing_size', 'first_year', 'emergency_contact_name',
                        'emergency_contact_phone', ]
    search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email',
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -5,7 +5,7 @@ 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.forms import CheckboxSelectMultiple, RadioSelect
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
 from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
@@ -24,7 +24,8 @@ class WEIForm(forms.ModelForm):
            "membership_end": DatePickerInput(),
            "date_start": DatePickerInput(),
            "date_end": DatePickerInput(),
-            "caution_amount": AmountInput(),
+            "deposit_amount": AmountInput(),
+            "fee_soge_credit": AmountInput(),
        }


@@ -43,7 +44,7 @@ class WEIRegistrationForm(forms.ModelForm):
        fields = [
            'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
            'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
-            'first_year', 'information_json', 'caution_check'
+            'first_year', 'information_json', 'deposit_check'
        ]
        widgets = {
            "user": Autocomplete(
@@ -58,7 +59,7 @@ class WEIRegistrationForm(forms.ModelForm):
                'minDate': '1900-01-01',
                'maxDate': '2100-01-01'
            }),
-            "caution_check": forms.BooleanField(
+            "deposit_check": forms.BooleanField(
                required=False,
            ),
        }
@@ -66,10 +67,10 @@ class WEIRegistrationForm(forms.ModelForm):

 class WEIRegistration2AForm(WEIRegistrationForm):
    class Meta(WEIRegistrationForm.Meta):
-        fields = WEIRegistrationForm.Meta.fields + ['caution_type']
+        fields = WEIRegistrationForm.Meta.fields + ['deposit_type']
        widgets = WEIRegistrationForm.Meta.widgets.copy()
        widgets.update({
-            "caution_type": forms.RadioSelect(),
+            "deposit_type": forms.RadioSelect(),
        })


@@ -99,7 +100,7 @@ class WEIChooseBusForm(forms.Form):
        queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
        label=_("WEI Roles"),
        help_text=_("Select the roles that you are interested in."),
-        initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
+        initial=WEIRole.objects.filter(Q(name="Adhérent⋅e WEI") | Q(name="\u00c9lectron libre")).all(),
        widget=CheckboxSelectMultiple(),
    )

@@ -140,6 +141,19 @@ class WEIMembershipForm(forms.ModelForm):
        required=False,
    )

+    def __init__(self, *args, wei=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if 'bus' in self.fields:
+            if wei is not None:
+                self.fields['bus'].queryset = Bus.objects.filter(wei=wei)
+            else:
+                self.fields['bus'].queryset = Bus.objects.none()
+        if 'team' in self.fields:
+            if wei is not None:
+                self.fields['team'].queryset = BusTeam.objects.filter(bus__wei=wei)
+            else:
+                self.fields['team'].queryset = BusTeam.objects.none()
+
    def clean(self):
        cleaned_data = super().clean()
        if 'team' in cleaned_data and cleaned_data["team"] is not None \
@@ -151,21 +165,8 @@ class WEIMembershipForm(forms.ModelForm):
        model = WEIMembership
        fields = ('roles', 'bus', 'team',)
        widgets = {
-            "bus": Autocomplete(
-                Bus,
-                attrs={
-                    'api_url': '/api/wei/bus/',
-                    'placeholder': 'Bus ...',
-                }
-            ),
-            "team": Autocomplete(
-                BusTeam,
-                attrs={
-                    'api_url': '/api/wei/team/',
-                    'placeholder': 'Équipe ...',
-                },
-                resetable=True,
-            ),
+            "bus": RadioSelect(),
+            "team": RadioSelect(),
        }


@@ -173,7 +174,7 @@ class WEIMembership1AForm(WEIMembershipForm):
    """
    Used to confirm registrations of first year members without choosing a bus now.
    """
-    caution_check = None
+    deposit_check = None
    roles = None

    def clean(self):
--- a/apps/wei/migrations/0014_weiclub_fee_soge_credit.py
+++ b/apps/wei/migrations/0014_weiclub_fee_soge_credit.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-07-15 14:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0013_weiclub_caution_amount_weiregistration_caution_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weiclub',
+            name='fee_soge_credit',
+            field=models.PositiveIntegerField(default=2000, verbose_name='fee soge credit'),
+        ),
+    ]
--- a/apps/wei/migrations/0015_remove_weiclub_caution_amount_and_more.py
+++ b/apps/wei/migrations/0015_remove_weiclub_caution_amount_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 4.2.23 on 2025-07-15 16:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0014_weiclub_fee_soge_credit'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weiclub',
+            name='caution_amount',
+        ),
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='caution_check',
+        ),
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='caution_type',
+        ),
+        migrations.AddField(
+            model_name='weiclub',
+            name='deposit_amount',
+            field=models.PositiveIntegerField(default=0, verbose_name='deposit amount'),
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='deposit_check',
+            field=models.BooleanField(default=False, verbose_name='Deposit check given'),
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='deposit_type',
+            field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='deposit type'),
+        ),
+    ]
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -33,11 +33,16 @@ class WEIClub(Club):
        verbose_name=_("date end"),
    )

-    caution_amount = models.PositiveIntegerField(
-        verbose_name=_("caution amount"),
+    deposit_amount = models.PositiveIntegerField(
+        verbose_name=_("deposit amount"),
        default=0,
    )

+    fee_soge_credit = models.PositiveIntegerField(
+        verbose_name=_("membership fee (soge credit)"),
+        default=2000,
+    )
+
    class Meta:
        verbose_name = _("WEI")
        verbose_name_plural = _("WEI")
@@ -197,19 +202,19 @@ class WEIRegistration(models.Model):
        verbose_name=_("Credit from Société générale"),
    )

-    caution_check = models.BooleanField(
+    deposit_check = models.BooleanField(
        default=False,
-        verbose_name=_("Caution check given")
+        verbose_name=_("Deposit check given")
    )

-    caution_type = models.CharField(
+    deposit_type = models.CharField(
        max_length=16,
        choices=(
            ('check', _("Check")),
            ('note', _("Note transaction")),
        ),
        default='check',
-        verbose_name=_("caution type"),
+        verbose_name=_("deposit type"),
    )

    birth_date = models.DateField(
@@ -319,7 +324,8 @@ class WEIRegistration(models.Model):
            date_start__gte=bde.membership_start,
        ).exists()

-        fee = self.wei.membership_fee_paid if self.user.profile.paid \
+        fee = self.wei.fee_soge_credit if self.soge_credit \
+            else self.wei.membership_fee_paid if self.user.profile.paid \
            else self.wei.membership_fee_unpaid
        if not kfet_member:
            fee += kfet.membership_fee_paid if self.user.profile.paid \
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -123,7 +123,7 @@ class WEIRegistrationTable(tables.Table):
        }
        model = WEIRegistration
        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
+        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_check',
                  'edit', 'validate', 'delete',)
        row_attrs = {
            'class': 'table-row',
@@ -163,7 +163,7 @@ class WEIMembershipTable(tables.Table):
        model = WEIMembership
        template_name = 'django_tables2/bootstrap4.html'
        fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
-                  'year', 'bus', 'team', 'registration__caution_check', )
+                  'year', 'bus', 'team', 'registration__deposit_check', )
        row_attrs = {
            'class': 'table-row',
            'id': lambda record: "row-" + str(record.pk),
--- a/apps/wei/templates/wei/base.html
+++ b/apps/wei/templates/wei/base.html
@@ -49,9 +49,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endif %}
                    {% endif %}

-                    {% if club.caution_amount > 0 %}
-                    <dt class="col-xl-6">{% trans 'Caution amount'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.caution_amount|pretty_money }}</dd>
+                    {% if club.deposit_amount > 0 %}
+                    <dt class="col-xl-6">{% trans 'Deposit amount'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.deposit_amount|pretty_money }}</dd>
                    {% endif %}

                    {% if "note.view_note"|has_perm:club.note %}
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -95,8 +95,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
                        <dd class="col-xl-6"><em>{% trans "The algorithm didn't run." %}</em></dd>
                    {% endif %}
                {% else %}
-                    <dt class="col-xl-6">{% trans 'caution check given'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ registration.caution_check|yesno }}</dd>
+                    <dt class="col-xl-6">{% trans 'Deposit check given'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ registration.deposit_check|yesno }}</dd>

                    {% with information=registration.information %}
                        <dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
@@ -137,41 +137,37 @@ SPDX-License-Identifier: GPL-3.0-or-later
                {% if registration.soge_credit %}
                    <div class="alert alert-warning">
                        {% blocktrans trimmed %}
-                            The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
+                            The WEI will partially be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
                            The membership transaction will be created but will be invalid. You will have to validate it once the bank
                            validated the creation of the account, or to change the payment method.
                        {% endblocktrans %}
                    </div>
-                {% else %}
-                    <div class="alert {% if registration.user.note.balance < fee %}alert-danger{% else %}alert-success{% endif %}">
-                        <h5>{% trans "Required payments:" %}</h5>
-                        <ul>
-                            <li>{% blocktrans trimmed with amount=fee|pretty_money %}
-                                Membership fees: {{ amount }}
-                            {% endblocktrans %}</li>
-                            {% if registration.caution_type == 'note' %}
-                                <li>{% blocktrans trimmed with amount=club.caution_amount|pretty_money %}
-                                    Deposit (by Note transaction): {{ amount }}
-                                {% endblocktrans %}</li>
-                                <li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
-                                    Total needed: {{ total }}
-                                {% endblocktrans %}</strong></li>
-                            {% else %}
-                                <li>{% blocktrans trimmed with amount=club.caution_amount|pretty_money %}
-                                    Deposit (by check): {{ amount }}
-                                {% endblocktrans %}</li>
-                                <li><strong>{% blocktrans trimmed with total=fee|pretty_money %}
-                                    Total needed: {{ total }}
-                                {% endblocktrans %}</strong></li>
-                            {% endif %}
-                        </ul>
-                        <p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
-                            Current balance: {{ balance }}
-                        {% endblocktrans %}</p>
-                    </div>
                {% endif %}
+                <div class="alert {% if registration.user.note.balance < fee %}alert-danger{% else %}alert-success{% endif %}">
+                    <h5>{% trans "Required payments:" %}</h5>
+                    <ul>
+                        <li>{% blocktrans trimmed with amount=fee|pretty_money %}
+                            Membership fees: {{ amount }}
+                        {% endblocktrans %}</li>
+                        {% if registration.deposit_type == 'note' %}
+                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
+                                Deposit (by Note transaction): {{ amount }}
+                            {% endblocktrans %}</li>
+                        {% else %}
+                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
+                                Deposit (by check): {{ amount }}
+                            {% endblocktrans %}</li>
+                        {% endif %}
+                        <li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
+                            Total needed: {{ total }}
+                        {% endblocktrans %}</strong></li>
+                    </ul>
+                    <p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
+                        Current balance: {{ balance }}
+                    {% endblocktrans %}</p>
+                    </div>

-                {% if not registration.caution_check and not registration.first_year and registration.caution_type == 'check' %}
+                {% if not registration.deposit_check and not registration.first_year and registration.caution_type == 'check' %}
                    <div class="alert alert-danger">
                        {% trans "The user didn't give her/his caution check." %}
                    </div>
@@ -210,4 +206,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
            }
        }
    </script>
+    <script>
+        $(document).ready(function () {
+            function refreshTeams() {
+                let buses = [];
+                $("input[name='bus']:checked").each(function (ignored) {
+                    buses.push($(this).parent().text().trim());
+                });
+                console.log(buses);
+                $("input[name='team']").each(function () {
+                    let label = $(this).parent();
+                    $(this).parent().addClass('d-none');
+                    buses.forEach(function (bus) {
+                        if (label.text().includes(bus))
+                            label.removeClass('d-none');
+                    });
+                });
+            }
+    
+            $("input[name='bus']").change(refreshTeams);
+    
+            refreshTeams();
+        });
+    </script>
 {% endblock %}
--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@@ -101,7 +101,7 @@ class TestWEIRegistration(TestCase):
            user_id=self.user.id,
            wei_id=self.wei.id,
            soge_credit=True,
-            caution_check=True,
+            deposit_check=True,
            birth_date=date(2000, 1, 1),
            gender="nonbinary",
            clothing_cut="male",
@@ -121,12 +121,13 @@ class TestWEIRegistration(TestCase):
            email="gc.wei@example.com",
            membership_fee_paid=12500,
            membership_fee_unpaid=5500,
+            fee_soge_credit=2000,
            membership_start=str(self.year + 1) + "-08-01",
            membership_end=str(self.year + 1) + "-09-30",
            year=self.year + 1,
            date_start=str(self.year + 1) + "-09-01",
            date_end=str(self.year + 1) + "-09-03",
-            caution_amount=12000,
+            deposit_amount=12000,
        ))
        qs = WEIClub.objects.filter(name="Create WEI Test", year=self.year + 1)
        self.assertTrue(qs.exists())
@@ -157,11 +158,12 @@ class TestWEIRegistration(TestCase):
            email="wei-updated@example.com",
            membership_fee_paid=0,
            membership_fee_unpaid=0,
+            fee_soge_credit=0,
            membership_start="2000-08-01",
            membership_end="2000-09-30",
            date_start="2000-09-01",
            date_end="2000-09-03",
-            caution_amount=12000,
+            deposit_amount=12000,
        ))
        qs = WEIClub.objects.filter(name="Update WEI Test", id=self.wei.id)
        self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=self.wei.pk)), 302, 200)
@@ -320,7 +322,7 @@ class TestWEIRegistration(TestCase):
            bus=[],
            team=[],
            roles=[],
-            caution_type='check'
+            deposit_type='check'
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["membership_form"].is_valid())
@@ -338,7 +340,7 @@ class TestWEIRegistration(TestCase):
            bus=[self.bus.id],
            team=[self.team.id],
            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
-            caution_type='check'
+            deposit_type='check'
        ))
        qs = WEIRegistration.objects.filter(user_id=user.id)
        self.assertTrue(qs.exists())
@@ -358,7 +360,7 @@ class TestWEIRegistration(TestCase):
            bus=[self.bus.id],
            team=[self.team.id],
            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
-            caution_type='check'
+            deposit_type='check'
        ))
        self.assertEqual(response.status_code, 200)
        self.assertTrue("This user is already registered to this WEI." in str(response.context["form"].errors))
@@ -511,7 +513,7 @@ class TestWEIRegistration(TestCase):
                team=[self.team.id],
                roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                information_json=self.registration.information_json,
-                caution_type='check'
+                deposit_type='check'
            )
        )
        qs = WEIRegistration.objects.filter(user_id=self.user.id, soge_credit=False, clothing_size="M")
@@ -566,7 +568,7 @@ class TestWEIRegistration(TestCase):
                team=[self.team.id],
                roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                information_json=self.registration.information_json,
-                caution_type='check'
+                deposit_type='check'
            )
        )
        qs = WEIRegistration.objects.filter(user_id=self.user.id, clothing_size="L")
@@ -590,7 +592,7 @@ class TestWEIRegistration(TestCase):
                team=[],
                roles=[],
                information_json=self.registration.information_json,
-                caution_type='check'
+                deposit_type='check'
            )
        )
        self.assertFalse(response.context["membership_form"].is_valid())
@@ -640,7 +642,7 @@ class TestWEIRegistration(TestCase):
            last_name="admin",
            first_name="admin",
            bank="Société générale",
-            caution_check=True,
+            deposit_check=True,
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["form"].is_valid())
@@ -655,7 +657,7 @@ class TestWEIRegistration(TestCase):
            last_name="admin",
            first_name="admin",
            bank="Société générale",
-            caution_check=True,
+            deposit_check=True,
        ))
        self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)

@@ -678,11 +680,7 @@ class TestWEIRegistration(TestCase):
            self.assertTrue(soge_credit.exists())
            soge_credit = soge_credit.get()
            self.assertTrue(membership.transaction in soge_credit.transactions.all())
-            self.assertTrue(kfet_membership.transaction in soge_credit.transactions.all())
-            self.assertTrue(bde_membership.transaction in soge_credit.transactions.all())
            self.assertFalse(membership.transaction.valid)
-            self.assertFalse(kfet_membership.transaction.valid)
-            self.assertFalse(bde_membership.transaction.valid)

        # Check that if the WEI is started, we can't update a wei
        self.wei.date_start = date(2000, 1, 1)
@@ -815,7 +813,7 @@ class TestWeiAPI(TestAPI):
            user_id=self.user.id,
            wei_id=self.wei.id,
            soge_credit=True,
-            caution_check=True,
+            deposit_check=True,
            birth_date=date(2000, 1, 1),
            gender="nonbinary",
            clothing_cut="male",
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -27,7 +27,7 @@ from django.views.generic.edit import BaseFormView, DeleteView
 from django_tables2 import SingleTableView, MultiTableMixin
 from api.viewsets import is_regex
 from member.models import Membership, Club
-from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
+from note.models import Transaction, NoteClub, Alias, SpecialTransaction
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
@@ -560,13 +560,15 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
        # Cacher les champs pendant l'inscription initiale
        if "first_year" in form.fields:
            del form.fields["first_year"]
-        if "caution_check" in form.fields:
-            del form.fields["caution_check"]
+        if "deposit_check" in form.fields:
+            del form.fields["deposit_check"]
        if "information_json" in form.fields:
            del form.fields["information_json"]
-        if "caution_type" in form.fields:
-            del form.fields["caution_type"]
+        if "deposit_type" in form.fields:
+            del form.fields["deposit_type"]

+        if "soge_credit" in form.fields:
+            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
        return form

    @transaction.atomic
@@ -658,6 +660,9 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
    def get_form(self, form_class=None):
        form = super().get_form(form_class)
        form.fields["user"].initial = self.request.user
+        if "soge_credit" in form.fields:
+            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
+
        if "myself" in self.request.path and self.request.user.profile.soge:
            form.fields["soge_credit"].disabled = True
            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
@@ -665,16 +670,16 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
        # Cacher les champs pendant l'inscription initiale
        if "first_year" in form.fields:
            del form.fields["first_year"]
-        if "caution_check" in form.fields:
-            del form.fields["caution_check"]
+        if "deposit_check" in form.fields:
+            del form.fields["deposit_check"]
        if "information_json" in form.fields:
            del form.fields["information_json"]

-        # S'assurer que le champ caution_type est obligatoire
-        if "caution_type" in form.fields:
-            form.fields["caution_type"].required = True
-            form.fields["caution_type"].help_text = _("Choose how you want to pay the deposit")
-            form.fields["caution_type"].widget = forms.RadioSelect(choices=form.fields["caution_type"].choices)
+        # S'assurer que le champ deposit_type est obligatoire
+        if "deposit_type" in form.fields:
+            form.fields["deposit_type"].required = True
+            form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
+            form.fields["deposit_type"].widget = forms.RadioSelect(choices=form.fields["deposit_type"].choices)

        return form

@@ -703,7 +708,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
        form.instance.information = information

        # Sauvegarder le type de caution
-        form.instance.caution_type = form.cleaned_data["caution_type"]
+        form.instance.deposit_type = form.cleaned_data["deposit_type"]
        form.instance.save()

        if 'treasury' in settings.INSTALLED_APPS:
@@ -773,22 +778,23 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
        form = super().get_form(form_class)
        form.fields["user"].disabled = True
        # The auto-json-format may cause issues with the default field remove
-        if not PermissionBackend.check_perm(self.request, 'wei.change_weiregistration_information_json', self.object):
+        if "information_json" in form.fields:
            del form.fields["information_json"]
-        # Masquer le champ caution_check pour tout le monde dans le formulaire de modification
-        if "caution_check" in form.fields:
-            del form.fields["caution_check"]
+        # Masquer le champ deposit_check pour tout le monde dans le formulaire de modification
+        if "deposit_check" in form.fields:
+            del form.fields["deposit_check"]

-        # S'assurer que le champ caution_type est obligatoire pour les 2A+
-        if not self.object.first_year and "caution_type" in form.fields:
-            form.fields["caution_type"].required = True
-            form.fields["caution_type"].help_text = _("Choose how you want to pay the deposit")
-            form.fields["caution_type"].widget = forms.RadioSelect(choices=form.fields["caution_type"].choices)
+        # S'assurer que le champ deposit_type est obligatoire pour les 2A+
+        if not self.object.first_year and "deposit_type" in form.fields:
+            form.fields["deposit_type"].required = True
+            form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
+            form.fields["deposit_type"].widget = forms.RadioSelect(choices=form.fields["deposit_type"].choices)

        return form

    def get_membership_form(self, data=None, instance=None):
-        membership_form = WEIMembershipForm(data if data else None, instance=instance)
+        registration = self.get_object()
+        membership_form = WEIMembershipForm(data if data else None, instance=instance, wei=registration.wei)
        del membership_form.fields["credit_type"]
        del membership_form.fields["credit_amount"]
        del membership_form.fields["first_name"]
@@ -844,8 +850,8 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
            form.instance.information = information

            # Sauvegarder le type de caution pour les 2A+
-            if "caution_type" in form.cleaned_data:
-                form.instance.caution_type = form.cleaned_data["caution_type"]
+            if "deposit_type" in form.cleaned_data:
+                form.instance.deposit_type = form.cleaned_data["deposit_type"]
            form.instance.save()

        return super().form_valid(form)
@@ -951,8 +957,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):

        # Calculer le montant total nécessaire (frais + caution si transaction)
        total_needed = fee
-        if registration.caution_type == 'note':
-            total_needed += registration.wei.caution_amount
+        if registration.deposit_type == 'note':
+            total_needed += registration.wei.deposit_amount
        context["total_needed"] = total_needed

        form = context["form"]
@@ -969,40 +975,38 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
            return WEIMembership1AForm
        return WEIMembershipForm

+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
+        wei = registration.wei
+        kwargs['wei'] = wei
+        return kwargs
+
    def get_form(self, form_class=None):
        form = super().get_form(form_class)
        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
        form.fields["last_name"].initial = registration.user.last_name
        form.fields["first_name"].initial = registration.user.first_name

-        # Ajouter le champ caution_check uniquement pour les non-première année et le rendre obligatoire
+        # Ajouter le champ deposit_check uniquement pour les non-première année et le rendre obligatoire
        if not registration.first_year:
-            if registration.caution_type == 'check':
-                form.fields["caution_check"] = forms.BooleanField(
+            if registration.deposit_type == 'check':
+                form.fields["deposit_check"] = forms.BooleanField(
                    required=True,
-                    initial=registration.caution_check,
-                    label=_("Caution check given"),
+                    initial=registration.deposit_check,
+                    label=_("Deposit check given"),
                    help_text=_("Please make sure the check is given before validating the registration")
                )
            else:
-                form.fields["caution_check"] = forms.BooleanField(
+                form.fields["deposit_check"] = forms.BooleanField(
                    required=True,
                    initial=False,
                    label=_("Create deposit transaction"),
                    help_text=_("A transaction of %(amount).2f€ will be created from the user's Note account") % {
-                        'amount': registration.wei.caution_amount / 100
+                        'amount': registration.wei.deposit_amount / 100
                    }
                )

-        if registration.soge_credit:
-            form.fields["credit_type"].disabled = True
-            form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
-            form.fields["credit_amount"].disabled = True
-            form.fields["last_name"].disabled = True
-            form.fields["first_name"].disabled = True
-            form.fields["bank"].disabled = True
-            form.fields["bank"].initial = "Société générale"
-
        if 'bus' in form.fields:
            # For 2A+ and hardcoded 1A
            form.fields["bus"].widget.attrs["api_url"] = "/api/wei/bus/?wei=" + str(registration.wei.pk)
@@ -1035,8 +1039,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        club = registration.wei
        user = registration.user

-        if "caution_check" in form.data:
-            registration.caution_check = form.data["caution_check"] == "on"
+        if "deposit_check" in form.data:
+            registration.deposit_check = form.data["deposit_check"] == "on"
            registration.save()
        membership = form.instance
        membership.user = user
@@ -1047,6 +1051,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        membership._force_renew_parent = True

        fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
+        if registration.soge_credit:
+            fee = 2000

        kfet = club.parent_club
        bde = kfet.parent_club
@@ -1073,16 +1079,16 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        first_name = form.cleaned_data["first_name"]
        bank = form.cleaned_data["bank"]

-        if credit_type is None or registration.soge_credit:
+        if credit_type is None:
            credit_amount = 0

        # Calculer le montant total nécessaire (frais + caution si transaction)
        total_needed = fee
-        if registration.caution_type == 'note':
-            total_needed += club.caution_amount
+        if registration.deposit_type == 'note':
+            total_needed += club.deposit_amount

        # Vérifier que l'utilisateur a assez d'argent pour tout payer
-        if not registration.soge_credit and user.note.balance + credit_amount < total_needed:
+        if user.note.balance + credit_amount < total_needed:
            form.add_error('credit_type',
                           _("This user doesn't have enough money to join this club and pay the deposit. "
                               "Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€") % {
@@ -1130,14 +1136,14 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        membership.roles.add(WEIRole.objects.get(name="Adhérent⋅e WEI"))

        # Créer la transaction de caution si nécessaire
-        if registration.caution_type == 'note':
+        if registration.deposit_type == 'note':
            from note.models import Transaction
            Transaction.objects.create(
                source=user.note,
                destination=club.note,
                quantity=1,
-                amount=club.caution_amount,
-                reason=_("Caution %(name)s") % {'name': club.name},
+                amount=club.deposit_amount,
+                reason=_("Deposit %(name)s") % {'name': club.name},
                valid=True,
            )

--- a/docs/scripts.rst
+++ b/docs/scripts.rst
@@ -136,7 +136,7 @@ de diffusion utiles.
   Faîtes attention, donc où la sortie est stockée.


-Il prend 2 options :
+Il prend 4 options :

 * ``--type``, qui prend en argument ``members`` (défaut), ``clubs``, ``events``, ``art``,
  ``sport``, qui permet respectivement de sortir la liste des adresses mails des adhérent⋅es
@@ -149,7 +149,10 @@ Il prend 2 options :
  pour la ML Adhérents, pour exporter les mails des adhérents au BDE pendant n'importe 
  laquelle des ``n+1`` dernières années. 

-Le script sort sur la sortie standard la liste des adresses mails à inscrire.
+* ``--email``, qui prend en argument une chaine de caractère contenant une adresse email.
+  
+Si aucun email n'est renseigné, le script sort sur la sortie standard la liste des adresses mails à inscrire.
+Dans le cas contraire, la liste est envoyée à l'adresse passée en argument.

 Attention : il y a parfois certains cas particuliers à prendre en compte, il n'est
 malheureusement pas aussi simple que de simplement supposer que ces listes sont exhaustives.
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-20 14:02+0200\n"
+"POT-Creation-Date: 2025-07-15 18:18+0200\n"
 "PO-Revision-Date: 2022-04-11 23:12+0200\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: \n"
@@ -65,7 +65,7 @@ msgstr "Usted no puede invitar más de 3 persona a esta actividad."
 #: apps/note/models/transactions.py:46 apps/note/models/transactions.py:299
 #: apps/permission/models.py:329
 #: apps/registration/templates/registration/future_profile_detail.html:16
-#: apps/wei/models.py:72 apps/wei/models.py:145 apps/wei/tables.py:282
+#: apps/wei/models.py:77 apps/wei/models.py:150 apps/wei/tables.py:282
 #: apps/wei/templates/wei/base.html:26
 #: apps/wei/templates/wei/weimembership_form.html:14 apps/wrapped/models.py:16
 msgid "name"
@@ -100,7 +100,7 @@ msgstr "tipos de actividad"
 #: apps/activity/models.py:68
 #: apps/activity/templates/activity/includes/activity_info.html:19
 #: apps/note/models/transactions.py:82 apps/permission/models.py:109
-#: apps/permission/models.py:188 apps/wei/models.py:92 apps/wei/models.py:156
+#: apps/permission/models.py:188 apps/wei/models.py:97 apps/wei/models.py:161
 msgid "description"
 msgstr "descripción"

@@ -121,7 +121,7 @@ msgstr "tipo"

 #: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325
 #: apps/note/models/notes.py:148 apps/treasury/models.py:294
-#: apps/wei/models.py:185 apps/wei/templates/wei/attribute_bus_1A.html:13
+#: apps/wei/models.py:190 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
 msgid "user"
 msgstr "usuario"
@@ -1297,7 +1297,7 @@ msgid "add to registration form"
 msgstr "Validar la afiliación"

 #: apps/member/models.py:268 apps/member/models.py:331
-#: apps/note/models/notes.py:176 apps/wei/models.py:86
+#: apps/note/models/notes.py:176 apps/wei/models.py:91
 msgid "club"
 msgstr "club"

@@ -2017,8 +2017,8 @@ msgstr ""
 "pago y un usuario o un club"

 #: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
-#: apps/note/models/transactions.py:363 apps/wei/views.py:1097
-#: apps/wei/views.py:1101
+#: apps/note/models/transactions.py:363 apps/wei/views.py:1103
+#: apps/wei/views.py:1107
 msgid "This field is required."
 msgstr "Este campo es obligatorio."

@@ -2515,7 +2515,7 @@ msgstr "El usuario declara que ya abrió una cuenta a la Société Générale."

 #: apps/registration/templates/registration/future_profile_detail.html:73
 #: apps/wei/templates/wei/weimembership_form.html:127
-#: apps/wei/templates/wei/weimembership_form.html:196
+#: apps/wei/templates/wei/weimembership_form.html:192
 msgid "Validate registration"
 msgstr "Validar la afiliación"

@@ -3043,8 +3043,8 @@ msgstr "Lista de los créditos de la Société Générale"
 msgid "Manage credits from the Société générale"
 msgstr "Gestionar los créditos de la Société Générale"

-#: apps/wei/apps.py:10 apps/wei/models.py:42 apps/wei/models.py:43
-#: apps/wei/models.py:67 apps/wei/models.py:192
+#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
+#: apps/wei/models.py:72 apps/wei/models.py:197
 #: note_kfet/templates/base.html:108
 msgid "WEI"
 msgstr "WEI"
@@ -3054,8 +3054,8 @@ msgid "The selected user is not validated. Please validate its account first"
 msgstr ""
 "El usuario seleccionado no ha sido validado. Validar esta cuenta primero"

-#: apps/wei/forms/registration.py:84 apps/wei/models.py:140
-#: apps/wei/models.py:348
+#: apps/wei/forms/registration.py:84 apps/wei/models.py:145
+#: apps/wei/models.py:354
 msgid "bus"
 msgstr "bus"

@@ -3081,7 +3081,7 @@ msgstr ""
 "electrón libre)"

 #: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110
-#: apps/wei/models.py:174
+#: apps/wei/models.py:179
 msgid "WEI Roles"
 msgstr "Papeles en el WEI"

@@ -3089,14 +3089,19 @@ msgstr "Papeles en el WEI"
 msgid "Select the roles that you are interested in."
 msgstr "Elegir los papeles que le interesa."

-#: apps/wei/forms/registration.py:147
+#: apps/wei/forms/registration.py:160
 msgid "This team doesn't belong to the given bus."
 msgstr "Este equipo no pertenece al bus dado."

 #: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2025.py:36
 msgid "Choose a word:"
 msgstr "Elegir una palabra :"

+#: apps/wei/forms/surveys/wei2025.py:123
+msgid "Rate between 0 and 5."
+msgstr ""
+
 #: apps/wei/models.py:25 apps/wei/templates/wei/base.html:36
 msgid "year"
 msgstr "año"
@@ -3113,138 +3118,147 @@ msgstr "fecha de fin"

 #: apps/wei/models.py:37
 #, fuzzy
-#| msgid "total amount"
-msgid "caution amount"
-msgstr "monto total"
+#| msgid "Credit amount"
+msgid "deposit amount"
+msgstr "Valor del crédito"

-#: apps/wei/models.py:76 apps/wei/tables.py:305
+#: apps/wei/models.py:42
+#, fuzzy
+#| msgid "No credit"
+msgid "membership fee (soge credit)"
+msgstr "No crédito"
+
+#: apps/wei/models.py:81 apps/wei/tables.py:305
 msgid "seat count in the bus"
 msgstr "cantidad de asientos en el bus"

-#: apps/wei/models.py:97
+#: apps/wei/models.py:102
 msgid "survey information"
 msgstr "informaciones sobre el cuestionario"

-#: apps/wei/models.py:98
+#: apps/wei/models.py:103
 msgid "Information about the survey for new members, encoded in JSON"
 msgstr ""
 "Informaciones sobre el cuestionario para los nuevos miembros, registrado en "
 "JSON"

-#: apps/wei/models.py:102
+#: apps/wei/models.py:107
 msgid "Bus"
 msgstr "Bus"

-#: apps/wei/models.py:103 apps/wei/templates/wei/weiclub_detail.html:51
+#: apps/wei/models.py:108 apps/wei/templates/wei/weiclub_detail.html:51
 msgid "Buses"
 msgstr "Bus"

-#: apps/wei/models.py:149
+#: apps/wei/models.py:154
 msgid "color"
 msgstr "color"

-#: apps/wei/models.py:150
+#: apps/wei/models.py:155
 msgid "The color of the T-Shirt, stored with its number equivalent"
 msgstr "El color de la camiseta, registrado con su número equivalente"

-#: apps/wei/models.py:161
+#: apps/wei/models.py:166
 msgid "Bus team"
 msgstr "Equipo de bus"

-#: apps/wei/models.py:162
+#: apps/wei/models.py:167
 msgid "Bus teams"
 msgstr "Equipos de bus"

-#: apps/wei/models.py:173
+#: apps/wei/models.py:178
 msgid "WEI Role"
 msgstr "Papeles en el WEI"

-#: apps/wei/models.py:197
+#: apps/wei/models.py:202
 msgid "Credit from Société générale"
 msgstr "Crédito de la Société Générale"

-#: apps/wei/models.py:202 apps/wei/views.py:984
-msgid "Caution check given"
+#: apps/wei/models.py:207 apps/wei/templates/wei/weimembership_form.html:98
+#: apps/wei/views.py:997
+#, fuzzy
+#| msgid "Caution check given"
+msgid "Deposit check given"
 msgstr "Cheque de garantía dado"

-#: apps/wei/models.py:208
+#: apps/wei/models.py:213
 msgid "Check"
 msgstr ""

-#: apps/wei/models.py:209
+#: apps/wei/models.py:214
 #, fuzzy
 #| msgid "transactions"
 msgid "Note transaction"
 msgstr "Transacción"

-#: apps/wei/models.py:212
+#: apps/wei/models.py:217
 #, fuzzy
-#| msgid "created at"
-msgid "caution type"
-msgstr "tipo de fianza"
+#| msgid "Credit type"
+msgid "deposit type"
+msgstr "Tipo de crédito"

-#: apps/wei/models.py:216 apps/wei/templates/wei/weimembership_form.html:64
+#: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
 msgid "birth date"
 msgstr "fecha de nacimiento"

-#: apps/wei/models.py:222 apps/wei/models.py:232
+#: apps/wei/models.py:227 apps/wei/models.py:237
 msgid "Male"
 msgstr "Hombre"

-#: apps/wei/models.py:223 apps/wei/models.py:233
+#: apps/wei/models.py:228 apps/wei/models.py:238
 msgid "Female"
 msgstr "Mujer"

-#: apps/wei/models.py:224
+#: apps/wei/models.py:229
 msgid "Non binary"
 msgstr "No binari@"

-#: apps/wei/models.py:226 apps/wei/templates/wei/attribute_bus_1A.html:22
+#: apps/wei/models.py:231 apps/wei/templates/wei/attribute_bus_1A.html:22
 #: apps/wei/templates/wei/weimembership_form.html:55
 msgid "gender"
 msgstr "género"

-#: apps/wei/models.py:234
+#: apps/wei/models.py:239
 msgid "Unisex"
 msgstr "Unisex"

-#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:58
 msgid "clothing cut"
 msgstr "forma de ropa"

-#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:255 apps/wei/templates/wei/weimembership_form.html:61
 msgid "clothing size"
 msgstr "medida de ropa"

-#: apps/wei/models.py:256
+#: apps/wei/models.py:261
 msgid "health issues"
 msgstr "problemas de salud"

-#: apps/wei/models.py:261 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:266 apps/wei/templates/wei/weimembership_form.html:70
 msgid "emergency contact name"
 msgstr "nombre del contacto de emergencia"

-#: apps/wei/models.py:262
+#: apps/wei/models.py:267
 msgid "The emergency contact must not be a WEI participant"
 msgstr "El contacto de emergencia no debe ser un participante de WEI"

-#: apps/wei/models.py:267 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:73
 msgid "emergency contact phone"
 msgstr "teléfono del contacto de emergencia"

-#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:277 apps/wei/templates/wei/weimembership_form.html:52
 msgid "first year"
 msgstr "primer año"

-#: apps/wei/models.py:273
+#: apps/wei/models.py:278
 msgid "Tells if the user is new in the school."
 msgstr "Indica si el usuario es nuevo en la escuela."

-#: apps/wei/models.py:278
+#: apps/wei/models.py:283
 msgid "registration information"
 msgstr "informaciones sobre la afiliación"

-#: apps/wei/models.py:279
+#: apps/wei/models.py:284
 msgid ""
 "Information about the registration (buses for old members, survey for the "
 "new members), encoded in JSON"
@@ -3252,27 +3266,27 @@ msgstr ""
 "Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
 "para los nuevos miembros), registrado en JSON"

-#: apps/wei/models.py:285
+#: apps/wei/models.py:290
 msgid "WEI User"
 msgstr "Participante WEI"

-#: apps/wei/models.py:286
+#: apps/wei/models.py:291
 msgid "WEI Users"
 msgstr "Participantes WEI"

-#: apps/wei/models.py:358
+#: apps/wei/models.py:364
 msgid "team"
 msgstr "equipo"

-#: apps/wei/models.py:368
+#: apps/wei/models.py:374
 msgid "WEI registration"
 msgstr "Apuntación al WEI"

-#: apps/wei/models.py:372
+#: apps/wei/models.py:378
 msgid "WEI membership"
 msgstr "Afiliación al WEI"

-#: apps/wei/models.py:373
+#: apps/wei/models.py:379
 msgid "WEI memberships"
 msgstr "Afiliaciones al WEI"

@@ -3300,7 +3314,7 @@ msgstr "Año"
 msgid "preferred bus"
 msgstr "bus preferido"

-#: apps/wei/tables.py:210 apps/wei/templates/wei/bus_detail.html:36
+#: apps/wei/tables.py:210 apps/wei/templates/wei/bus_detail.html:38
 #: apps/wei/templates/wei/busteam_detail.html:52
 msgid "Teams"
 msgstr "Equipos"
@@ -3372,9 +3386,9 @@ msgstr "Pago de entrada del WEI (estudiantes no pagados)"

 #: apps/wei/templates/wei/base.html:53
 #, fuzzy
-#| msgid "total amount"
-msgid "Caution amount"
-msgstr "monto total"
+#| msgid "Credit amount"
+msgid "Deposit amount"
+msgstr "Valor del crédito"

 #: apps/wei/templates/wei/base.html:74
 msgid "WEI list"
@@ -3384,7 +3398,7 @@ msgstr "Lista de los WEI"
 msgid "Register 1A"
 msgstr "Apuntar un 1A"

-#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:644
+#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:646
 msgid "Register 2A+"
 msgstr "Apuntar un 2A+"

@@ -3401,15 +3415,21 @@ msgid "View club"
 msgstr "Ver club"

 #: apps/wei/templates/wei/bus_detail.html:26
+#, fuzzy
+#| msgid "survey information"
+msgid "Edit information"
+msgstr "informaciones sobre el cuestionario"
+
+#: apps/wei/templates/wei/bus_detail.html:28
 #: apps/wei/templates/wei/busteam_detail.html:24
 msgid "Add team"
 msgstr "Añadir un equipo"

-#: apps/wei/templates/wei/bus_detail.html:49
+#: apps/wei/templates/wei/bus_detail.html:51
 msgid "Members"
 msgstr "Miembros"

-#: apps/wei/templates/wei/bus_detail.html:58
+#: apps/wei/templates/wei/bus_detail.html:60
 #: apps/wei/templates/wei/busteam_detail.html:62
 #: apps/wei/templates/wei/weimembership_list.html:31
 msgid "View as PDF"
@@ -3417,8 +3437,8 @@ msgstr "Descargar un PDF"

 #: apps/wei/templates/wei/survey.html:11
 #: apps/wei/templates/wei/survey_closed.html:11
-#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1159
-#: apps/wei/views.py:1214 apps/wei/views.py:1261
+#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1165
+#: apps/wei/views.py:1220 apps/wei/views.py:1267
 msgid "Survey WEI"
 msgstr "Cuestionario WEI"

@@ -3494,10 +3514,6 @@ msgstr "Informaciones crudas del cuestionario"
 msgid "The algorithm didn't run."
 msgstr "El algoritmo no funcionó."

-#: apps/wei/templates/wei/weimembership_form.html:98
-msgid "caution check given"
-msgstr "cheque de garantía dado"
-
 #: apps/wei/templates/wei/weimembership_form.html:105
 msgid "preferred team"
 msgstr "equipo preferido"
@@ -3532,11 +3548,18 @@ msgid "with the following roles:"
 msgstr "con los papeles :"

 #: apps/wei/templates/wei/weimembership_form.html:139
+#, fuzzy
+#| msgid ""
+#| "The WEI will be paid by Société générale. The membership will be created "
+#| "even if the bank didn't pay the BDE yet. The membership transaction will "
+#| "be created but will be invalid. You will have to validate it once the "
+#| "bank validated the creation of the account, or to change the payment "
+#| "method."
 msgid ""
-"The WEI will be paid by Société générale. The membership will be created "
-"even if the bank didn't pay the BDE yet. The membership transaction will be "
-"created but will be invalid. You will have to validate it once the bank "
-"validated the creation of the account, or to change the payment method."
+"The WEI will partially be paid by Société générale. The membership will be "
+"created even if the bank didn't pay the BDE yet. The membership transaction "
+"will be created but will be invalid. You will have to validate it once the "
+"bank validated the creation of the account, or to change the payment method."
 msgstr ""
 "El WEI será pagado por la Société Générale. La afiliación será creada aunque "
 "el banco no pago el BDE ya. La transacción de afiliación será creada pero "
@@ -3558,27 +3581,26 @@ msgstr "Pagos de afiliación (estudiantes pagados)"
 msgid "Deposit (by Note transaction): %(amount)s"
 msgstr "Fianza (transacción) : %(amount)s"

-#: apps/wei/templates/wei/weimembership_form.html:156
-#: apps/wei/templates/wei/weimembership_form.html:163
-#, python-format
-msgid "Total needed: %(total)s"
-msgstr "Total necesario : %(total)s"
-
-#: apps/wei/templates/wei/weimembership_form.html:160
+#: apps/wei/templates/wei/weimembership_form.html:157
 #, python-format
 msgid "Deposit (by check): %(amount)s"
 msgstr "Fianza (cheque) : %(amount)s"

-#: apps/wei/templates/wei/weimembership_form.html:168
+#: apps/wei/templates/wei/weimembership_form.html:161
+#, python-format
+msgid "Total needed: %(total)s"
+msgstr "Total necesario : %(total)s"
+
+#: apps/wei/templates/wei/weimembership_form.html:165
 #, python-format
 msgid "Current balance: %(balance)s"
 msgstr "Saldo actual : %(balance)s"

-#: apps/wei/templates/wei/weimembership_form.html:176
+#: apps/wei/templates/wei/weimembership_form.html:172
 msgid "The user didn't give her/his caution check."
 msgstr "El usuario no dio su cheque de garantía."

-#: apps/wei/templates/wei/weimembership_form.html:184
+#: apps/wei/templates/wei/weimembership_form.html:180
 msgid ""
 "This user is not a member of the Kfet club for the coming year. The "
 "membership will be processed automatically, the WEI registration includes "
@@ -3668,110 +3690,109 @@ msgstr "Gestionar el equipo"
 msgid "Register first year student to the WEI"
 msgstr "Registrar un 1A al WEI"

-#: apps/wei/views.py:580 apps/wei/views.py:689
+#: apps/wei/views.py:571 apps/wei/views.py:664
+#, fuzzy
+#| msgid "Check this case if the Société Générale paid the inscription."
+msgid "Check if you will open a Société Générale account"
+msgstr "Marcar esta casilla si Société Générale pagó la registración."
+
+#: apps/wei/views.py:582 apps/wei/views.py:694
 msgid "This user is already registered to this WEI."
 msgstr "Este usuario ya afilió a este WEI."

-#: apps/wei/views.py:585
+#: apps/wei/views.py:587
 msgid ""
 "This user can't be in her/his first year since he/she has already "
 "participated to a WEI."
 msgstr "Este usuario no puede ser un 1A porque ya participó en un WEI."

-#: apps/wei/views.py:608
+#: apps/wei/views.py:610
 msgid "Register old student to the WEI"
 msgstr "Registrar un 2A+ al WEI"

-#: apps/wei/views.py:663 apps/wei/views.py:768
+#: apps/wei/views.py:668 apps/wei/views.py:773
 msgid "You already opened an account in the Société générale."
 msgstr "Usted ya abrió una cuenta a la Société Générale."

-#: apps/wei/views.py:676 apps/wei/views.py:785
+#: apps/wei/views.py:681 apps/wei/views.py:790
 msgid "Choose how you want to pay the deposit"
 msgstr ""

-#: apps/wei/views.py:728
+#: apps/wei/views.py:733
 msgid "Update WEI Registration"
 msgstr "Modificar la inscripción WEI"

-#: apps/wei/views.py:810
+#: apps/wei/views.py:816
 #, fuzzy
 #| msgid "The BDE membership is included in the WEI registration."
 msgid "No membership found for this registration"
 msgstr "La afiliación al BDE esta incluida en la afiliación WEI."

-#: apps/wei/views.py:819
-#| msgid ""
-#| "You don't have the permission to add an instance of model {app_label}."
-#| "{model_name}."
+#: apps/wei/views.py:825
 msgid "You don't have the permission to update memberships"
 msgstr ""
 "Usted no tiene permiso a añadir una instancia al modelo {app_label}."
 "{model_name}."

-#: apps/wei/views.py:825
+#: apps/wei/views.py:831
 #, python-format
-#| msgid ""
-#| "You don't have the permission to delete this instance of model "
-#| "{app_label}.{model_name}."
 msgid "You don't have the permission to update the field %(field)s"
 msgstr "Usted no tiene permiso a modificar el campo %(field)s"

-#: apps/wei/views.py:870
+#: apps/wei/views.py:876
 msgid "Delete WEI registration"
 msgstr "Suprimir la inscripción WEI"

-#: apps/wei/views.py:881
+#: apps/wei/views.py:887
 msgid "You don't have the right to delete this WEI registration."
 msgstr "Usted no tiene derecho a suprimir esta inscripción WEI."

-#: apps/wei/views.py:899
+#: apps/wei/views.py:905
 msgid "Validate WEI registration"
 msgstr "Validar la inscripción WEI"

-#: apps/wei/views.py:985
+#: apps/wei/views.py:998
 msgid "Please make sure the check is given before validating the registration"
 msgstr ""
 "Por favor asegúrese de que el cheque se entrega antes de validar el registro"

-#: apps/wei/views.py:991
-#| msgid "credit transaction"
+#: apps/wei/views.py:1004
 msgid "Create deposit transaction"
 msgstr "Crear transacción de crédito"

-#: apps/wei/views.py:992
+#: apps/wei/views.py:1005
 #, python-format
 msgid ""
 "A transaction of %(amount).2f€ will be created from the user's Note account"
 msgstr ""

-#: apps/wei/views.py:1087
-#, python-format
+#: apps/wei/views.py:1093
+#, fuzzy, python-format
 #| msgid ""
-#| "This user don't have enough money to join this club, and can't have a "
-#| "negative balance."
+#| "This user doesn't have enough money. Current balance: %(balance)d€, "
+#| "credit: %(credit)d€, needed: %(needed)d€"
 msgid ""
-"This user doesn't have enough money. "
+"This user doesn't have enough money to join this club and pay the deposit. "
 "Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€"
 msgstr ""
-"Este usuario no tiene suficiente dinero. "
-"Saldo actual : %(balance)d€, crédito: %(credit)d€, requerido: %(needed)d€"
+"Este usuario no tiene suficiente dinero. Saldo actual : %(balance)d€, "
+"crédito: %(credit)d€, requerido: %(needed)d€"

-#: apps/wei/views.py:1140
-#, python-format
-#| msgid "created at"
-msgid "Caution %(name)s"
+#: apps/wei/views.py:1146
+#, fuzzy, python-format
+#| msgid "Caution %(name)s"
+msgid "Deposit %(name)s"
 msgstr "Fianza %(name)s"

-#: apps/wei/views.py:1354
+#: apps/wei/views.py:1360
 msgid "Attribute buses to first year members"
 msgstr "Repartir los primer años en los buses"

-#: apps/wei/views.py:1379
+#: apps/wei/views.py:1386
 msgid "Attribute bus"
 msgstr "Repartir en un bus"

-#: apps/wei/views.py:1419
+#: apps/wei/views.py:1426
 msgid ""
 "No first year student without a bus found. Either all of them have a bus, or "
 "none has filled the survey yet."
@@ -4337,6 +4358,24 @@ msgstr ""
 "pagar su afiliación. Tambien tiene que validar su correo electronico con el "
 "enlace que recibió."

+#, fuzzy
+#~| msgid "total amount"
+#~ msgid "caution amount"
+#~ msgstr "monto total"
+
+#, fuzzy
+#~| msgid "created at"
+#~ msgid "caution type"
+#~ msgstr "tipo de fianza"
+
+#, fuzzy
+#~| msgid "total amount"
+#~ msgid "Caution amount"
+#~ msgstr "monto total"
+
+#~ msgid "caution check given"
+#~ msgstr "cheque de garantía dado"
+
 #, fuzzy
 #~| msgid "Invitation"
 #~ msgid "Syndication"
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
--- a/note.cron
+++ b/note.cron
@@ -27,5 +27,6 @@ MAILTO=notekfet2020@lists.crans.org
 # Vider les tokens Oauth2
 00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 # Envoyer la liste des abonnés à la NL BDA
- 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
- 
+ 00  10    *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
+# Envoyer la liste de la bouffe au club et aux GCKs
+ 00  8     *   *   1     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_for_food --report --club
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@@ -56,3 +56,8 @@ if "cas_server" in settings.INSTALLED_APPS:
    from cas_server.models import *
    admin_site.register(ServicePattern, ServicePatternAdmin)
    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
+
+if "constance" in settings.INSTALLED_APPS:
+    from constance.admin import *
+    from constance.models import *
+    admin_site.register([Config], ConstanceAdmin)
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -39,7 +39,9 @@ SECURE_HSTS_PRELOAD = True
 INSTALLED_APPS = [
    # External apps
    'bootstrap_datepicker_plus',
+    'cas_server',
    'colorfield',
+    'constance',
    'crispy_bootstrap4',
    'crispy_forms',
 #    'django_htcpcp_tea',
@@ -112,6 +114,7 @@ TEMPLATES = [
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
+                'constance.context_processors.config',
                'django.template.context_processors.debug',
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
@@ -308,6 +311,30 @@ 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'
+CAS_LOGIN_TEMPLATE = 'cas/login.html'
+CAS_LOGOUT_TEMPLATE = 'cas/logout.html'
+CAS_WARN_TEMPLATE = 'cas/warn.html'
+CAS_LOGGED_TEMPLATE = 'cas/logged.html'

 # Default field for primary key
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+# Constance settings
+CONSTANCE_ADDITIONAL_FIELDS = {
+    'banner_type': ['django.forms.fields.ChoiceField', {
+        'widget': 'django.forms.Select',
+        'choices': (('info', 'Info'), ('success', 'Success'), ('warning', 'Warning'), ('danger', 'Danger'))
+    }],
+}
+CONSTANCE_CONFIG = {
+    'BANNER_MESSAGE': ('', 'Some message', str),
+    'BANNER_TYPE': ('info', 'Banner type', 'banner_type'),
+    'MAINTENANCE': (False, 'check for mainteance mode', bool),
+    'MAINTENANCE_MESSAGE': ('', 'Some maintenance message', str),
+}
+CONSTANCE_CONFIG_FIELDSETS = {
+    'Maintenance': ('MAINTENANCE_MESSAGE', 'MAINTENANCE'),
+    'Banner': ('BANNER_MESSAGE', 'BANNER_TYPE'),
+}
+CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
+CONSTANCE_SUPERUSER_ONLY = True
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@@ -5,6 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="position-relative h-100">
+{% if not config.MAINTENANCE %}
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -145,9 +146,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' %}">
-                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-                                </a>
+				<form method="post" action="{% url 'logout' %}">
+				    {% csrf_token %}
+				    <button class="dropdown-item" type=submit">
+					<i class="fa fa-sign-out"></i> {% trans "Log out" %}
+				    </button>
+                                </form>
                            </div>
                        </li>
                    {% else %}
@@ -195,7 +199,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endblocktrans %}
                </div>
            {% endif %}
-            {# TODO Add banners #}
+	    {% if config.BANNER_MESSAGE and user.is_authenticated %}
+	    <div class="alert alert-{{ config.BANNER_TYPE }}">
+	      {{ config.BANNER_MESSAGE }}
+	    </div>
+	    {% endif %}
        </div>
        {% block content %}
            <p>Default content...</p>
@@ -217,6 +225,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                           class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                        <a href="https://note.crans.org/doc/faq/"
                           class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
+		   	<a href="https://bde.ens-cachan.fr"
+			   class="text-muted">{% trans "Managed by BDE" %}</a> &mdash;
+		   	<a href="https://crans.org"
+			   class="text-muted">{% trans "Hosted by Cr@ns" %}</a> &mdash;
                    </span>
                    {% csrf_token %}
                    <select title="language" name="language"
@@ -253,4 +265,15 @@ SPDX-License-Identifier: GPL-3.0-or-later

 {% block extrajavascript %}{% endblock %}
 </body>
+{% endif %}
+{% if config.MAINTENANCE %}
+<body>
+  <div style="text-align:center">
+    <br />
+    {% trans "The note is not available for now" %}<br /><br />
+    {{ config.MAINTENANCE_MESSAGE }}<br /><br />
+    {% trans "Thank you for your understanding -- The Respos Info of BDE" %}
+  </div>
+</body>
+{% endif %}
 </html>
--- a/note_kfet/templates/cas/logged.html
+++ b/note_kfet/templates/cas/logged.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+{% block content %}
+<div class="alert alert-success" role="alert">{% blocktrans %}<h3>Log In Successful</h3>You have successfully logged into the Central Authentication Service.<br/>For security reasons, please Log Out and Exit your web browser when you are done accessing services that require authentication!{% endblocktrans %}</div>
+<div class="card bg-light mx-auto" style="max-width:30rem;">
+  <div class="card-body">
+    <form class="form-signin" method="get" action="logout">
+      <div class="checkbox">
+	<label>
+	  <input type="checkbox" name="all" value="1">{% trans "Log me out from all my sessions" %}
+	</label>
+      </div>
+      {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %}
+      <div class="checkbox">
+	<label>
+	  <input type="checkbox" name="forget_provider" value="1">{% trans "Forget the identity provider" %}
+	</label>
+      </div>
+      {% endif %}
+      <button class="btn btn-danger btn-block btn-lg" type="submit">{% trans "Logout" %}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}
--- a/note_kfet/templates/cas/login.html
+++ b/note_kfet/templates/cas/login.html
@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+
+{% block ante_messages %}
+  {% if auto_submit %}<noscript>{% endif %}
+  <div class="card-header text-center">
+    <h2 class="form-signin-heading">{% trans "Please log in" %}</h2>
+  </div>
+  {% if auto_submit %}</noscript>{% endif %}
+{% endblock %}
+
+{% block content %}
+  <div class="card bg-light mx-auto" style="max-width: 30rem;">
+    <div class="card-body">
+	<form class="form-signin" method="post" id="login_form"{% if post_url %} action="{{post_url}}"{% endif %}>
+	  {% csrf_token %}
+	  {% include "cas_server/bs4/form.html" %}
+	  {% if auto_submit %}<noscript>{% endif %}
+	  <button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Login" %}</button>
+	  {% if auto_submit %}</noscript>{% endif %}
+	</div>
+      </form>
+    </div>
+  </div>
+{% endblock %}
+
+{% block javascript_inline %}
+jQuery(function( $ ){
+  $("#id_warn").click(function(e){
+    if($("#id_warn").is(':checked')){
+      createCookie("warn", "on", 10 * 365);
+    } else {
+      eraseCookie("warn");
+    }
+  });
+});
+{% if auto_submit %}document.getElementById('login_form').submit(); // SUBMIT FORM{% endif %}
+{% endblock %}
--- a/note_kfet/templates/cas/logout.html
+++ b/note_kfet/templates/cas/logout.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n static %}
+{% block content %}
+    <div class="alert alert-success" role="alert">{{ logout_msg }}</div>
+{% endblock %}
+  
--- a/note_kfet/templates/cas/warn.html
+++ b/note_kfet/templates/cas/warn.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n static %}
+
+{% block content %}
+  <div class="card bg-light mx-auto" style="max-width: 30rem;">
+    <div class="card-body">
+      <form class="form-signin" method="post">
+	{% csrf_token %}
+	{% include "cas_server/bs4/form.html" %}
+	<button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Connect to the service" %}</button>
+      </form>
+    </div>
+  </div>
+{% endblock %}
+  
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,21 @@
-beautifulsoup4~=4.12.3
-crispy-bootstrap4~=2023.1
-Django~=4.2.9
+beautifulsoup4~=4.13.4
+crispy-bootstrap4~=2025.6
+Django~=5.2.4
 django-bootstrap-datepicker-plus~=5.0.5
-#django-cas-server~=2.0.0
-django-colorfield~=0.11.0
-django-crispy-forms~=2.1.0
-django-extensions>=3.2.3
-django-filter~=23.5
+django-cas-server~=3.1.0
+django-colorfield~=0.14.0
+django-constance~=4.3.2
+django-crispy-forms~=2.4.0
+django-extensions>=4.1.0
+django-filter~=25.1
 #django-htcpcp-tea~=0.8.1
-django-mailer~=2.3.1
-django-oauth-toolkit~=2.3.0
-django-phonenumber-field~=7.3.0
+django-mailer~=2.3.2
+django-oauth-toolkit~=3.0.1
+django-phonenumber-field~=8.1.0
 django-polymorphic~=3.1.0
-djangorestframework~=3.14.0
+djangorestframework~=3.16.0
 django-rest-polymorphic~=0.1.10
-django-tables2~=2.7.0
+django-tables2~=2.7.5
 python-memcached~=1.62
-phonenumbers~=8.13.28
-Pillow>=10.2.0
+phonenumbers~=9.0.8
+Pillow>=11.3.0
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 envlist =
    # Ubuntu 22.04 Python
-    py310-django42
+    py310-django52

    # Debian Bookworm Python
-    py311-django42
+    py311-django52

    # Ubuntu 24.04 Python
-    py312-django42
+    py312-django52

    linters
 skipsdist = True
@@ -32,8 +32,7 @@ deps =
    pep8-naming
    pyflakes
 commands =
-    flake8 apps --extend-exclude apps/scripts,apps/wrapped/management/commands
-    flake8 apps/wrapped/management/commands --extend-ignore=C901
+    flake8 apps --extend-exclude apps/scripts

 [flake8]
 ignore = W503, I100, I101, B019