Revert "missing comma"

This reverts commit 1ca4246cbd.

.gitignore

@@ -48,6 +48,7 @@ backups/
 env/
 venv/
 db.sqlite3
+shell.nix
 
 # ansibles customs host
 ansible/host_vars/*.yaml

apps/api/pagination.py

@@ -1,5 +1,5 @@
 from rest_framework.pagination import PageNumberPagination
 
-
 class CustomPagination(PageNumberPagination):
     page_size_query_param = 'page_size'
+

apps/member/models.py

@@ -263,7 +263,7 @@ class Club(models.Model):
 
         today = datetime.date.today()
 
-        while (today - self.membership_start).days >= 365:
+        if (today - self.membership_start).days >= 365:
             if self.membership_start:
                 self.membership_start = datetime.date(self.membership_start.year + 1,
                                                       self.membership_start.month, self.membership_start.day)

apps/member/tests/test_memberships.py

@@ -183,7 +183,7 @@ class TestMemberships(TestCase):
                 club = Club.objects.get(name="Kfet")
             else:
                 club = Club.objects.create(
-                    name="Second club without BDE",
+                    name="Second club " + ("with BDE" if bde_parent else "without BDE"),
                     parent_club=None,
                     email="newclub@example.com",
                     require_memberships=True,

apps/member/views.py

@@ -753,10 +753,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
             club = old_membership.club
             user = old_membership.user
 
-        # Update club membership date
-        if PermissionBackend.check_perm(self.request, "member.change_club_membership_start", club):
-            club.update_membership_dates()
-
         form.instance.club = club
 
         # Get form data

apps/note/models/transactions.py

@@ -325,8 +325,8 @@ class SpecialTransaction(Transaction):
     def clean(self):
         # SpecialTransaction are only possible with NoteSpecial object
         if self.is_credit() == self.is_debit():
-            raise ValidationError(_("A special transaction is only possible between a"
-                                    " Note associated to a payment method and a User or a Club"))
+            raise(ValidationError(_("A special transaction is only possible between a"
+                                    " Note associated to a payment method and a User or a Club")))
 
     @transaction.atomic
     def save(self, *args, **kwargs):

apps/registration/forms.py

@@ -5,7 +5,6 @@ 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
 
@@ -45,14 +44,14 @@ class SignUpForm(UserCreationForm):
         fields = ('first_name', 'last_name', 'username', 'email', )
 
 
-# class DeclareSogeAccountOpenedForm(forms.Form):
-#     soge_account = forms.BooleanField(
-#         label=_("I declare that I opened or I will open soon a bank account in the Société générale with the BDE "
-#                 "partnership."),
-#         help_text=_("Warning: this engages you to open your bank account. If you finally decides to don't open your "
-#                     "account, you will have to pay the BDE membership."),
-#         required=False,
-#     )
+class DeclareSogeAccountOpenedForm(forms.Form):
+    soge_account = forms.BooleanField(
+        label=_("I declare that I opened or I will open soon a bank account in the Société générale with the BDE "
+                "partnership."),
+        help_text=_("Warning: this engages you to open your bank account. If you finally decides to don't open your "
+                    "account, you will have to pay the BDE membership."),
+        required=False,
+    )
 
 
 class WEISignupForm(forms.Form):
@@ -68,11 +67,11 @@ class ValidationForm(forms.Form):
     """
     Validate the inscription of the new users and pay memberships.
     """
-#    soge = forms.BooleanField(
-#        label=_("Inscription paid by Société Générale"),
-#        required=False,
-#        help_text=_("Check this case if the Société Générale paid the inscription."),
-#    )
+    soge = forms.BooleanField(
+        label=_("Inscription paid by Société Générale"),
+        required=False,
+        help_text=_("Check this case if the Société Générale paid the inscription."),
+    )
 
     credit_type = forms.ModelChoiceField(
         queryset=NoteSpecial.objects,
@@ -115,12 +114,3 @@ 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=False,
-        )

apps/registration/templates/registration/future_profile_detail.html

@@ -57,13 +57,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <h4> {% trans "Validate account" %}</h4>
                     </div>
 
-                    {% comment "Soge not for membership (only WEI)" %}
                     {% if declare_soge_account %}
                         <div class="alert alert-info">
                         {% trans "The user declared that he/she opened a bank account in the Société générale." %}
                         </div>
                     {% endif %}
-                    {% endcomment %}
 
                     <div class="card-body" id="profile_infos">
                         {% csrf_token %}
@@ -78,7 +76,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </div>
 {% endblock %}
 
-{% comment "Soge not for membership (only WEI)" %}
 {% block extrajavascript %}
     <script>
         soge_field = $("#id_soge");
@@ -121,4 +118,3 @@ SPDX-License-Identifier: GPL-3.0-or-later
         {% endif %}
     </script>
 {% endblock %}
-{% endcomment %}

apps/registration/tests/test_registration.py

@@ -190,7 +190,7 @@ class TestValidateRegistration(TestCase):
 
         # BDE Membership is mandatory
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
             credit_amount=4200,
             last_name="TOTO",
@@ -204,7 +204,7 @@ class TestValidateRegistration(TestCase):
 
         # Same
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type="",
             credit_amount=0,
             last_name="TOTO",
@@ -218,7 +218,7 @@ class TestValidateRegistration(TestCase):
 
         # The BDE membership is not free
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
             credit_amount=0,
             last_name="TOTO",
@@ -232,7 +232,7 @@ class TestValidateRegistration(TestCase):
 
         # Last and first names are required for a credit
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
             credit_amount=4000,
             last_name="",
@@ -249,7 +249,7 @@ class TestValidateRegistration(TestCase):
         self.user.username = "admïntoto"
         self.user.save()
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
             credit_amount=500,
             last_name="TOTO",
@@ -275,7 +275,7 @@ class TestValidateRegistration(TestCase):
         self.user.profile.save()
 
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
             credit_amount=500,
             last_name="TOTO",
@@ -290,7 +290,6 @@ class TestValidateRegistration(TestCase):
         self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
         self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
         self.assertFalse(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
-        self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
         self.assertFalse(SogeCredit.objects.filter(user=self.user).exists())
         self.assertEqual(Transaction.objects.filter(
             Q(source=self.user.note) | Q(destination=self.user.note)).count(), 2)
@@ -312,7 +311,7 @@ class TestValidateRegistration(TestCase):
         self.user.profile.save()
 
         response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-            # soge=False,
+            soge=False,
             credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
             credit_amount=4000,
             last_name="TOTO",
@@ -327,7 +326,6 @@ class TestValidateRegistration(TestCase):
         self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
         self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
         self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
-        self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
         self.assertFalse(SogeCredit.objects.filter(user=self.user).exists())
         self.assertEqual(Transaction.objects.filter(
             Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
@@ -335,43 +333,42 @@ class TestValidateRegistration(TestCase):
         response = self.client.get(self.user.profile.get_absolute_url())
         self.assertEqual(response.status_code, 200)
 
-#    def test_validate_kfet_registration_with_soge(self):
-#        """
-#        The user joins the BDE and the Kfet, but the membership is paid by the Société générale.
-#        """
-#        response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,)))
-#        self.assertEqual(response.status_code, 200)
-#
-#        response = self.client.get(self.user.profile.get_absolute_url())
-#        self.assertEqual(response.status_code, 404)
-#
-#        self.user.profile.email_confirmed = True
-#        self.user.profile.save()
-#
-#        response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
-#            soge=True,
-#            credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
-#            credit_amount=4000,
-#            last_name="TOTO",
-#            first_name="Toto",
-#            bank="Société générale",
-#            join_bde=True,
-#            join_kfet=True,
-#        ))
-#        self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
-#        self.user.profile.refresh_from_db()
-#        self.assertTrue(self.user.profile.registration_valid)
-#        self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
-#        self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
-#        self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
-#        self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
-#        self.assertTrue(SogeCredit.objects.filter(user=self.user).exists())
-#        self.assertEqual(Transaction.objects.filter(
-#            Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
-#        self.assertFalse(Transaction.objects.filter(valid=True).exists())
-#
-#        response = self.client.get(self.user.profile.get_absolute_url())
-#        self.assertEqual(response.status_code, 200)
+    def test_validate_kfet_registration_with_soge(self):
+        """
+        The user joins the BDE and the Kfet, but the membership is paid by the Société générale.
+        """
+        response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.get(self.user.profile.get_absolute_url())
+        self.assertEqual(response.status_code, 404)
+
+        self.user.profile.email_confirmed = True
+        self.user.profile.save()
+
+        response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
+            soge=True,
+            credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
+            credit_amount=4000,
+            last_name="TOTO",
+            first_name="Toto",
+            bank="Société générale",
+            join_bde=True,
+            join_kfet=True,
+        ))
+        self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
+        self.user.profile.refresh_from_db()
+        self.assertTrue(self.user.profile.registration_valid)
+        self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
+        self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
+        self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
+        self.assertTrue(SogeCredit.objects.filter(user=self.user).exists())
+        self.assertEqual(Transaction.objects.filter(
+            Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
+        self.assertFalse(Transaction.objects.filter(valid=True).exists())
+
+        response = self.client.get(self.user.profile.get_absolute_url())
+        self.assertEqual(response.status_code, 200)
 
     def test_invalidate_registration(self):
         """

apps/registration/views.py

@@ -24,8 +24,7 @@ from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 from treasury.models import SogeCredit
 
-# from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm
-from .forms import SignUpForm, ValidationForm
+from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm
 from .tables import FutureUserTable
 from .tokens import email_validation_token
 
@@ -43,7 +42,7 @@ class UserCreateView(CreateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["profile_form"] = self.second_form(self.request.POST if self.request.POST else None)
-#        context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None)
+        context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None)
         del context["profile_form"].fields["section"]
         del context["profile_form"].fields["report_frequency"]
         del context["profile_form"].fields["last_report"]
@@ -76,12 +75,12 @@ class UserCreateView(CreateView):
 
         user.profile.send_email_validation_link()
 
-#        soge_form = DeclareSogeAccountOpenedForm(self.request.POST)
-#        if "soge_account" in soge_form.data and soge_form.data["soge_account"]:
-#            # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers
-#            soge_credit = SogeCredit(user=user)
-#            soge_credit._force_save = True
-#            soge_credit.save()
+        soge_form = DeclareSogeAccountOpenedForm(self.request.POST)
+        if "soge_account" in soge_form.data and soge_form.data["soge_account"]:
+            # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers
+            soge_credit = SogeCredit(user=user)
+            soge_credit._force_save = True
+            soge_credit.save()
 
         return super().form_valid(form)
 
@@ -238,12 +237,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
-        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()
+        ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
 
         return ctx
 
@@ -266,13 +262,8 @@ 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"]
+        soge = form.cleaned_data["soge"]
         credit_type = form.cleaned_data["credit_type"]
         credit_amount = form.cleaned_data["credit_amount"]
         last_name = form.cleaned_data["last_name"]
@@ -280,13 +271,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
         bank = form.cleaned_data["bank"]
         join_bde = form.cleaned_data["join_bde"]
         join_kfet = form.cleaned_data["join_kfet"]
-        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.
-#            join_bde = True
-#            join_kfet = True
+        if soge:
+            # If Société Générale pays the inscription, the user automatically joins the two clubs.
+            join_bde = True
+            join_kfet = True
 
         if not join_bde:
             # This software belongs to the BDE.
@@ -303,21 +292,15 @@ 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
-        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.
-#        credit_type = None if soge else credit_type
+        # If the bank pays, then we don't credit now. Treasurers will validate the transaction
+        # and credit the note later.
+        credit_type = None if soge else credit_type
 
         # If the user does not select any payment method, then no credit will be performed.
         credit_amount = 0 if credit_type is None else credit_amount
 
-#        if fee > credit_amount and not soge:
-        if fee > credit_amount:
+        if fee > credit_amount and not soge:
             # Check if the user credits enough money
             form.add_error('credit_type',
                            _("The entered amount is not enough for the memberships, should be at least {}")
@@ -337,12 +320,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
         user.profile.save()
         user.refresh_from_db()
 
-#        if not soge and SogeCredit.objects.filter(user=user).exists():
-#            # If the user declared that a bank account was opened but in the validation form the SoGé case was
-#            # unchecked, delete the associated credit
-#            soge_credit = SogeCredit.objects.get(user=user)
-#            soge_credit._force_delete = True
-#            soge_credit.delete()
+        if not soge and SogeCredit.objects.filter(user=user).exists():
+            # If the user declared that a bank account was opened but in the validation form the SoGé case was
+            # unchecked, delete the associated credit
+            soge_credit = SogeCredit.objects.get(user=user)
+            soge_credit._force_delete = True
+            soge_credit.delete()
 
         if credit_type is not None and credit_amount > 0:
             # Credit the note
@@ -351,8 +334,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
                 destination=user.note,
                 quantity=1,
                 amount=credit_amount,
-                reason="Crédit " + credit_type.special_type + " (Inscription)",
-                # reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)",
+                reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)",
                 last_name=last_name,
                 first_name=first_name,
                 bank=bank,
@@ -366,8 +348,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
                 user=user,
                 fee=bde_fee,
             )
-#            if soge:
-#                membership._soge = True
+            if soge:
+                membership._soge = True
             membership.save()
             membership.refresh_from_db()
             membership.roles.add(Role.objects.get(name="Adhérent BDE"))
@@ -380,29 +362,17 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
                 user=user,
                 fee=kfet_fee,
             )
-#            if soge:
-#                membership._soge = True
+            if soge:
+                membership._soge = True
             membership.save()
             membership.refresh_from_db()
             membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
             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)
-#            # Update the credit transaction amount
-#            soge_credit.save()
+        if soge:
+            soge_credit = SogeCredit.objects.get(user=user)
+            # Update the credit transaction amount
+            soge_credit.save()
 
         return ret
 

apps/treasury/migrations/0006_auto_20230414_1651.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-04-14 14:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0005_auto_20230129_2348'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='bde',
-            field=models.CharField(choices=[('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='SecretStorlist', max_length=32, verbose_name='BDE'),
-        ),
-    ]

apps/treasury/models.py

@@ -1,5 +1,6 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
+import datetime
 from datetime import date
 
 from django.conf import settings
@@ -11,8 +12,7 @@ from django.db.models import Q
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-# from member.models import Club, Membership # Club unused because of disabled soge
-from member.models import Membership
+from member.models import Club, Membership
 from note.models import NoteSpecial, SpecialTransaction, MembershipTransaction, NoteUser
 
 
@@ -28,10 +28,9 @@ class Invoice(models.Model):
 
     bde = models.CharField(
         max_length=32,
-        default='SecretStorlist',
+        default='TotalistSpies',
         choices=(
-            ('SecretStorlist', 'SecretStor[list]'),
-            ('TotalistSpies', 'Tota[list]Spies'),
+	    ('TotalistSpies', 'Tota[list]Spies'),
             ('Saperlistpopette', 'Saper[list]popette'),
             ('Finalist', 'Fina[list]'),
             ('Listorique', '[List]orique'),
@@ -326,12 +325,12 @@ class SogeCredit(models.Model):
         if self.valid or not self.pk:
             return
 
-# Soge do not pay BDE and kfet memberships since 2022
-#        bde = Club.objects.get(name="BDE")
-#        kfet = Club.objects.get(name="Kfet")
-#        bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
-#        kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
+        bde = Club.objects.get(name="BDE")
+        kfet = Club.objects.get(name="Kfet")
+        bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
+        kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
 
+## Soge do not pay BDE and kfet memberships this year (2022-2023)
 #        if bde_qs.exists():
 #            m = bde_qs.get()
 #            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
@@ -388,6 +387,7 @@ class SogeCredit(models.Model):
         for tr in self.transactions.all():
             tr.valid = True
             tr._force_save = True
+            tr.created_at = timezone.now()
             tr.save()
 
     @transaction.atomic
@@ -436,11 +436,12 @@ class SogeCredit(models.Model):
         for tr in self.transactions.all():
             tr._force_save = True
             tr.valid = True
+            tr.created_at = timezone.now()
             tr.save()
         if self.credit_transaction:
             # If the soge credit is deleted while the user is not validated yet,
             # there is not credit transaction.
-            # There is a credit transaction if the user declares that no bank account
+            # There is a credit transaction iff the user declares that no bank account
             # was opened after the validation of the account.
             self.credit_transaction.valid = False
             self.credit_transaction.reason += " (invalide)"

apps/treasury/templates/treasury/invoice_sample.tex

@@ -105,8 +105,8 @@
 
 \renewcommand{\headrulewidth}{0pt}
 \cfoot{
-    \small{\MonNom  ~--~ \MonAdresseRue ~ \MonAdresseVille ~--~ Téléphone : +33(0)7 78 17 22 34\newline
-     Site web : bde.ens-cachan.fr ~--~ E-mail : tresorerie.bde@lists.crans.org \newline Numéro SIRET : 399 485 838 00029
+    \small{\MonNom  ~--~ \MonAdresseRue ~ \MonAdresseVille ~--~ Téléphone : +33(0)6 89 88 56 50\newline
+     Site web : bde.ens-cachan.fr ~--~ E-mail : tresorerie.bde@lists.crans.org \newline Numéro SIRET : 399 485 838 00011
     }
 }
 

apps/wei/forms/registration.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django import forms
@@ -38,7 +38,7 @@ class WEIRegistrationForm(forms.ModelForm):
 
     class Meta:
         model = WEIRegistration
-        exclude = ('wei', 'clothing_cut')
+        exclude = ('wei', )
         widgets = {
             "user": Autocomplete(
                 User,

apps/wei/forms/surveys/__init__.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2023 import WEISurvey2023
+from .wei2022 import WEISurvey2022
 
 
 __all__ = [
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]
 
-CurrentSurvey = WEISurvey2023
+CurrentSurvey = WEISurvey2022

apps/wei/forms/surveys/wei2022.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2022 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import time
@@ -14,17 +14,17 @@ from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInf
 from ...models import WEIMembership
 
 WORDS = [
-    'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
-    'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
-    'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
-    'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
-    'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
-    'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
-    'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
-    'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
-    'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
-    'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
-    'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
+	'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
+	'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
+	'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
+	'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
+	'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
+	'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
+	'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
+	'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
+	'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
+	'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
+	'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
 ]
 
 

apps/wei/forms/surveys/wei2023.py

@@ -1,296 +0,0 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import time
-from functools import lru_cache
-from random import Random
-
-from django import forms
-from django.db import transaction
-from django.db.models import Q
-from django.utils.translation import gettext_lazy as _
-
-from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
-from ...models import WEIMembership
-
-WORDS = [
-    'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
-    'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
-    'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
-    'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
-    'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
-    'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
-    'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
-    'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
-    'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
-    'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
-    'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
-]
-
-
-class WEISurveyForm2023(forms.Form):
-    """
-    Survey form for the year 2023.
-    Members choose 20 words, from which we calculate the best associated bus.
-    """
-
-    word = forms.ChoiceField(
-        label=_("Choose a word:"),
-        widget=forms.RadioSelect(),
-    )
-
-    def set_registration(self, registration):
-        """
-        Filter the bus selector with the buses of the current WEI.
-        """
-        information = WEISurveyInformation2023(registration)
-        if not information.seed:
-            information.seed = int(1000 * time.time())
-            information.save(registration)
-            registration._force_save = True
-            registration.save()
-
-        if self.data:
-            self.fields["word"].choices = [(w, w) for w in WORDS]
-            if self.is_valid():
-                return
-
-        rng = Random((information.step + 1) * information.seed)
-
-        words = None
-
-        buses = WEISurveyAlgorithm2023.get_buses()
-        informations = {bus: WEIBusInformation2023(bus) for bus in buses}
-        scores = sum((list(informations[bus].scores.values()) for bus in buses), [])
-        average_score = sum(scores) / len(scores)
-
-        preferred_words = {bus: [word for word in WORDS
-                                 if informations[bus].scores[word] >= average_score]
-                           for bus in buses}
-        while words is None or len(set(words)) != len(words):
-            # Ensure that there is no the same word 2 times
-            words = [rng.choice(words) for _ignored2, words in preferred_words.items()]
-        rng.shuffle(words)
-        words = [(w, w) for w in words]
-        self.fields["word"].choices = words
-
-
-class WEIBusInformation2023(WEIBusInformation):
-    """
-    For each word, the bus has a score
-    """
-    scores: dict
-
-    def __init__(self, bus):
-        self.scores = {}
-        for word in WORDS:
-            self.scores[word] = 0.0
-        super().__init__(bus)
-
-
-class WEISurveyInformation2023(WEISurveyInformation):
-    """
-    We store the id of the selected bus. We store only the name, but is not used in the selection:
-    that's only for humans that try to read data.
-    """
-    # Random seed that is stored at the first time to ensure that words are generated only once
-    seed = 0
-    step = 0
-
-    def __init__(self, registration):
-        for i in range(1, 21):
-            setattr(self, "word" + str(i), None)
-        super().__init__(registration)
-
-
-class WEISurvey2023(WEISurvey):
-    """
-    Survey for the year 2023.
-    """
-
-    @classmethod
-    def get_year(cls):
-        return 2023
-
-    @classmethod
-    def get_survey_information_class(cls):
-        return WEISurveyInformation2023
-
-    def get_form_class(self):
-        return WEISurveyForm2023
-
-    def update_form(self, form):
-        """
-        Filter the bus selector with the buses of the WEI.
-        """
-        form.set_registration(self.registration)
-
-    @transaction.atomic
-    def form_valid(self, form):
-        word = form.cleaned_data["word"]
-        self.information.step += 1
-        setattr(self.information, "word" + str(self.information.step), word)
-        self.save()
-
-    @classmethod
-    def get_algorithm_class(cls):
-        return WEISurveyAlgorithm2023
-
-    def is_complete(self) -> bool:
-        """
-        The survey is complete once the bus is chosen.
-        """
-        return self.information.step == 20
-
-    @classmethod
-    @lru_cache()
-    def word_mean(cls, word):
-        """
-        Calculate the mid-score given by all buses.
-        """
-        buses = cls.get_algorithm_class().get_buses()
-        return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()
-
-    @lru_cache()
-    def score(self, bus):
-        if not self.is_complete():
-            raise ValueError("Survey is not ended, can't calculate score")
-
-        bus_info = self.get_algorithm_class().get_bus_information(bus)
-        # Score is the given score by the bus subtracted to the mid-score of the buses.
-        s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
-                - self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 21)) / 20
-        return s
-
-    @lru_cache()
-    def scores_per_bus(self):
-        return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
-
-    @lru_cache()
-    def ordered_buses(self):
-        values = list(self.scores_per_bus().items())
-        values.sort(key=lambda item: -item[1])
-        return values
-
-    @classmethod
-    def clear_cache(cls):
-        cls.word_mean.cache_clear()
-        return super().clear_cache()
-
-
-class WEISurveyAlgorithm2023(WEISurveyAlgorithm):
-    """
-    The algorithm class for the year 2023.
-    We use Gale-Shapley algorithm to attribute 1y students into buses.
-    """
-
-    @classmethod
-    def get_survey_class(cls):
-        return WEISurvey2023
-
-    @classmethod
-    def get_bus_information_class(cls):
-        return WEIBusInformation2023
-
-    def run_algorithm(self, display_tqdm=False):
-        """
-        Gale-Shapley algorithm implementation.
-        We modify it to allow buses to have multiple "weddings".
-        """
-        surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
-        surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
-        # Don't manage hardcoded people
-        surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
-
-        # Reset previous algorithm run
-        for survey in surveys:
-            survey.free()
-            survey.save()
-
-        non_men = [s for s in surveys if s.registration.gender != 'male']
-        men = [s for s in surveys if s.registration.gender == 'male']
-
-        quotas = {}
-        registrations = self.get_registrations()
-        non_men_total = registrations.filter(~Q(gender='male')).count()
-        for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
-            # Remove hardcoded people
-            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
-                                                       registration__information_json__icontains="hardcoded").count()
-            quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
-
-        tqdm_obj = None
-        if display_tqdm:
-            from tqdm import tqdm
-            tqdm_obj = tqdm(total=len(non_men), desc="Non-hommes")
-
-        # Repartition for non men people first
-        self.make_repartition(non_men, quotas, tqdm_obj=tqdm_obj)
-
-        quotas = {}
-        for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
-            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
-            # Remove hardcoded people
-            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
-                                                       registration__information_json__icontains="hardcoded").count()
-            quotas[bus] = free_seats
-
-        if display_tqdm:
-            tqdm_obj.close()
-
-            from tqdm import tqdm
-            tqdm_obj = tqdm(total=len(men), desc="Hommes")
-
-        self.make_repartition(men, quotas, tqdm_obj=tqdm_obj)
-
-        if display_tqdm:
-            tqdm_obj.close()
-
-        # Clear cache information after running algorithm
-        WEISurvey2023.clear_cache()
-
-    def make_repartition(self, surveys, quotas=None, tqdm_obj=None):
-        free_surveys = surveys.copy()  # Remaining surveys
-        while free_surveys:  # Some students are not affected
-            survey = free_surveys[0]
-            buses = survey.ordered_buses()  # Preferences of the student
-            for bus, current_score in buses:
-                if self.get_bus_information(bus).has_free_seats(surveys, quotas):
-                    # Selected bus has free places. Put student in the bus
-                    survey.select_bus(bus)
-                    survey.save()
-                    free_surveys.remove(survey)
-                    break
-                else:
-                    # Current bus has not enough places. Remove the least preferred student from the bus if existing
-                    least_preferred_survey = None
-                    least_score = -1
-                    # Find the least student in the bus that has a lower score than the current student
-                    for survey2 in surveys:
-                        if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
-                            continue
-                        score2 = survey2.score(bus)
-                        if current_score <= score2:  # Ignore better students
-                            continue
-                        if least_preferred_survey is None or score2 < least_score:
-                            least_preferred_survey = survey2
-                            least_score = score2
-
-                    if least_preferred_survey is not None:
-                        # Remove the least student from the bus and put the current student in.
-                        # If it does not exist, choose the next bus.
-                        least_preferred_survey.free()
-                        least_preferred_survey.save()
-                        free_surveys.append(least_preferred_survey)
-                        survey.select_bus(bus)
-                        survey.save()
-                        free_surveys.remove(survey)
-                        break
-            else:
-                raise ValueError(f"User {survey.registration.user} has no free seat")
-
-            if tqdm_obj is not None:
-                tqdm_obj.n = len(surveys) - len(free_surveys)
-                tqdm_obj.refresh()

apps/wei/migrations/0006_unisex_clothing_cut.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-07-09 09:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0005_auto_20230128_1850'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiregistration',
-            name='clothing_cut',
-            field=models.CharField(choices=[('male', 'Male'), ('female', 'Female'), ('unisex', 'Unisex')], default='unisex', max_length=16, verbose_name='clothing cut'),
-        ),
-    ]

apps/wei/migrations/0007_help_text_emergency_contact.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-07-09 12:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0006_unisex_clothing_cut'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiregistration',
-            name='emergency_contact_name',
-            field=models.CharField(help_text='The emergency contact must not be a WEI participant', max_length=255, verbose_name='emergency contact name'),
-        ),
-    ]

apps/wei/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
@@ -209,9 +209,7 @@ class WEIRegistration(models.Model):
         choices=(
             ('male', _("Male")),
             ('female', _("Female")),
-            ('unisex', _("Unisex")),
         ),
-        default='unisex',
         verbose_name=_("clothing cut"),
     )
 
@@ -237,7 +235,6 @@ class WEIRegistration(models.Model):
     emergency_contact_name = models.CharField(
         max_length=255,
         verbose_name=_("emergency contact name"),
-        help_text=_("The emergency contact must not be a WEI participant")
     )
 
     emergency_contact_phone = PhoneNumberField(

apps/wei/templates/wei/weimembership_form.html

@@ -56,7 +56,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <dd class="col-xl-6">{{ registration.get_gender_display }}</dd>
 
                 <dt class="col-xl-6">{% trans 'clothing cut'|capfirst %}</dt>
-                <dd class="col-xl-6">{{ registration.get_clothing_cut_display }}</dd>
+                <dd class="col-xl-6">{{ registration.clothing_cut }}</dd>
 
                 <dt class="col-xl-6">{% trans 'clothing size'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.clothing_size }}</dd>

apps/wei/tests/test_wei_algorithm_2023.py

@@ -1,110 +0,0 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import random
-
-from django.contrib.auth.models import User
-from django.test import TestCase
-
-from ..forms.surveys.wei2023 import WEIBusInformation2023, WEISurvey2023, WORDS, WEISurveyInformation2023
-from ..models import Bus, WEIClub, WEIRegistration
-
-
-class TestWEIAlgorithm(TestCase):
-    """
-    Run some tests to ensure that the WEI algorithm is working well.
-    """
-    fixtures = ('initial',)
-
-    def setUp(self):
-        """
-        Create some test data, with one WEI and 10 buses with random score attributions.
-        """
-        self.wei = WEIClub.objects.create(
-            name="WEI 2023",
-            email="wei2023@example.com",
-            date_start='2023-09-16',
-            date_end='2023-09-18',
-            year=2023,
-        )
-
-        self.buses = []
-        for i in range(10):
-            bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
-            self.buses.append(bus)
-            information = WEIBusInformation2023(bus)
-            for word in WORDS:
-                information.scores[word] = random.randint(0, 101)
-            information.save()
-            bus.save()
-
-    def test_survey_algorithm_small(self):
-        """
-        There are only a few people in each bus, ensure that each person has its best bus
-        """
-        # Add a few users
-        for i in range(10):
-            user = User.objects.create(username=f"user{i}")
-            registration = WEIRegistration.objects.create(
-                user=user,
-                wei=self.wei,
-                first_year=True,
-                birth_date='2000-01-01',
-            )
-            information = WEISurveyInformation2023(registration)
-            for j in range(1, 21):
-                setattr(information, f'word{j}', random.choice(WORDS))
-            information.step = 20
-            information.save(registration)
-            registration.save()
-
-        # Run algorithm
-        WEISurvey2023.get_algorithm_class()().run_algorithm()
-
-        # Ensure that everyone has its first choice
-        for r in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey = WEISurvey2023(r)
-            preferred_bus = survey.ordered_buses()[0][0]
-            chosen_bus = survey.information.get_selected_bus()
-            self.assertEqual(preferred_bus, chosen_bus)
-
-    def test_survey_algorithm_full(self):
-        """
-        Buses are full of first year people, ensure that they are happy
-        """
-        # Add a lot of users
-        for i in range(95):
-            user = User.objects.create(username=f"user{i}")
-            registration = WEIRegistration.objects.create(
-                user=user,
-                wei=self.wei,
-                first_year=True,
-                birth_date='2000-01-01',
-            )
-            information = WEISurveyInformation2023(registration)
-            for j in range(1, 21):
-                setattr(information, f'word{j}', random.choice(WORDS))
-            information.step = 20
-            information.save(registration)
-            registration.save()
-
-        # Run algorithm
-        WEISurvey2023.get_algorithm_class()().run_algorithm()
-
-        penalty = 0
-        # Ensure that everyone seems to be happy
-        # We attribute a penalty for each user that didn't have its first choice
-        # The penalty is the square of the distance between the score of the preferred bus
-        # and the score of the attributed bus
-        # We consider it acceptable if the mean of this distance is lower than 5 %
-        for r in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey = WEISurvey2023(r)
-            chosen_bus = survey.information.get_selected_bus()
-            buses = survey.ordered_buses()
-            score = min(v for bus, v in buses if bus == chosen_bus)
-            max_score = buses[0][1]
-            penalty += (max_score - score) ** 2
-
-            self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
-
-        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %

apps/wei/tests/test_wei_registration.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import subprocess
@@ -782,7 +782,7 @@ class TestDefaultWEISurvey(TestCase):
         WEISurvey.update_form(None, None)
 
         self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
-        self.assertEqual(CurrentSurvey.get_year(), 2023)
+        self.assertEqual(CurrentSurvey.get_year(), 2022)
 
 
 class TestWeiAPI(TestAPI):

docs/api/wei.rst

@@ -448,10 +448,6 @@ Options
                           "value": "female",
                           "display_name": "Femme"
                       }
-                      {
-                          "value": "unisex",
-                          "display_name": "Unisexe"
-                      },
                   ]
               },
               "clothing_size": {

locale/de/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-09 14:46+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
 "PO-Revision-Date: 2020-11-16 20:02+0000\n"
-"Last-Translator: bleizi <bleizi@crans.org>\n"
+"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
 "Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -115,7 +115,7 @@ msgid "type"
 msgstr "Type"
 
 #: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:307
-#: apps/note/models/notes.py:148 apps/treasury/models.py:287
+#: apps/note/models/notes.py:148 apps/treasury/models.py:285
 #: apps/wei/models.py:173 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
 msgid "user"
@@ -258,19 +258,19 @@ msgstr "Eingetreten um "
 msgid "remove"
 msgstr "entfernen"
 
-#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:201
+#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:199
 msgid "Type"
 msgstr "Type"
 
 #: apps/activity/tables.py:84 apps/member/forms.py:186
-#: apps/registration/forms.py:92 apps/treasury/forms.py:131
+#: apps/registration/forms.py:91 apps/treasury/forms.py:131
 #: apps/wei/forms/registration.py:104
 msgid "Last name"
 msgstr "Nachname"
 
 #: apps/activity/tables.py:86 apps/member/forms.py:191
 #: apps/note/templates/note/transaction_form.html:138
-#: apps/registration/forms.py:97 apps/treasury/forms.py:133
+#: apps/registration/forms.py:96 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
 msgid "First name"
 msgstr "Vorname"
@@ -549,24 +549,24 @@ msgid "This image cannot be loaded."
 msgstr "Dieses Bild kann nicht geladen werden."
 
 #: apps/member/forms.py:141 apps/member/views.py:103
-#: apps/registration/forms.py:34 apps/registration/views.py:266
+#: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Ein ähnliches Alias ist schon benutzt."
 
-#: apps/member/forms.py:165
+#: apps/member/forms.py:165 apps/registration/forms.py:71
 msgid "Inscription paid by Société Générale"
 msgstr "Mitgliedschaft von der Société Générale bezahlt"
 
-#: apps/member/forms.py:167
+#: apps/member/forms.py:167 apps/registration/forms.py:73
 msgid "Check this case if the Société Générale paid the inscription."
 msgstr "Die Société Générale die Mitgliedschaft bezahlt."
 
-#: apps/member/forms.py:172 apps/registration/forms.py:79
+#: apps/member/forms.py:172 apps/registration/forms.py:78
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Kredittype"
 
-#: apps/member/forms.py:173 apps/registration/forms.py:80
+#: apps/member/forms.py:173 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "Kein Kredit"
@@ -575,13 +575,13 @@ msgstr "Kein Kredit"
 msgid "You can credit the note of the user."
 msgstr "Sie dûrfen diese Note kreditieren."
 
-#: apps/member/forms.py:179 apps/registration/forms.py:85
+#: apps/member/forms.py:179 apps/registration/forms.py:84
 #: apps/wei/forms/registration.py:97
 msgid "Credit amount"
 msgstr "Kreditanzahl"
 
 #: apps/member/forms.py:196 apps/note/templates/note/transaction_form.html:144
-#: apps/registration/forms.py:102 apps/treasury/forms.py:135
+#: apps/registration/forms.py:101 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Bank"
@@ -1193,7 +1193,7 @@ msgstr "Speichern"
 msgid "Registrations"
 msgstr "Anmeldung"
 
-#: apps/member/views.py:73 apps/registration/forms.py:24
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Diese Adresse muss gültig sein."
 
@@ -1249,11 +1249,11 @@ msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen."
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen."
 
-#: apps/member/views.py:880
+#: apps/member/views.py:876
 msgid "Manage roles of an user in the club"
 msgstr "Rollen in diesen Club bearbeiten"
 
-#: apps/member/views.py:905
+#: apps/member/views.py:901
 msgid "Members of the club"
 msgstr "Mitlglieder dieses Club"
 
@@ -1570,7 +1570,7 @@ msgstr "Sondertranskationen"
 msgid "membership transaction"
 msgstr "Mitgliedschafttransaktion"
 
-#: apps/note/models/transactions.py:385 apps/treasury/models.py:294
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:292
 msgid "membership transactions"
 msgstr "Mitgliedschaftttransaktionen"
 
@@ -1689,7 +1689,7 @@ msgid "Amount"
 msgstr "Anzahl"
 
 #: apps/note/templates/note/transaction_form.html:132
-#: apps/treasury/models.py:56
+#: apps/treasury/models.py:54
 msgid "Name"
 msgstr "Name"
 
@@ -1982,15 +1982,29 @@ msgstr "Alle Rechten"
 msgid "registration"
 msgstr "Anmeldung"
 
-#: apps/registration/forms.py:40
+#: apps/registration/forms.py:39
 msgid "This email address is already used."
 msgstr "Diese email adresse ist schon benutzt."
 
-#: apps/registration/forms.py:60
+#: apps/registration/forms.py:49
+#, fuzzy
+#| msgid "You already opened an account in the Société générale."
+msgid ""
+"I declare that I opened or I will open soon a bank account in the Société "
+"générale with the BDE partnership."
+msgstr "Sie haben bereits ein Konto in der Société générale eröffnet."
+
+#: apps/registration/forms.py:51
+msgid ""
+"Warning: this engages you to open your bank account. If you finally decides "
+"to don't open your account, you will have to pay the BDE membership."
+msgstr ""
+
+#: apps/registration/forms.py:59
 msgid "Register to the WEI"
 msgstr "Zu WEI anmelden"
 
-#: apps/registration/forms.py:62
+#: apps/registration/forms.py:61
 msgid ""
 "Check this case if you want to register to the WEI. If you hesitate, you "
 "will be able to register later, after validating your account in the Kfet."
@@ -1999,18 +2013,14 @@ msgstr ""
 "falls Zweifel, können Sie sich später nach Bestätigung Ihres Kontos im Kfet "
 "registrieren."
 
-#: apps/registration/forms.py:107
+#: apps/registration/forms.py:106
 msgid "Join BDE Club"
 msgstr "BDE Mitglieder werden"
 
-#: apps/registration/forms.py:114
+#: apps/registration/forms.py:113
 msgid "Join Kfet Club"
 msgstr "Kfet Mitglieder werden"
 
-#: apps/registration/forms.py:123
-msgid "Join BDA Club"
-msgstr "BDA Mitglieder werden"
-
 #: apps/registration/templates/registration/email_validation_complete.html:15
 msgid "Your email have successfully been validated."
 msgstr "Ihre E-Mail wurde erfolgreich validiert."
@@ -2059,14 +2069,14 @@ msgstr "Registrierung löschen"
 msgid "Validate account"
 msgstr "Konto validieren"
 
-#: apps/registration/templates/registration/future_profile_detail.html:63
+#: apps/registration/templates/registration/future_profile_detail.html:62
 #, fuzzy
 #| msgid "You already opened an account in the Société générale."
 msgid ""
 "The user declared that he/she opened a bank account in the Société générale."
 msgstr "Sie haben bereits ein Konto in der Société générale eröffnet."
 
-#: apps/registration/templates/registration/future_profile_detail.html:73
+#: apps/registration/templates/registration/future_profile_detail.html:71
 #: apps/wei/templates/wei/weimembership_form.html:127
 #: apps/wei/templates/wei/weimembership_form.html:186
 msgid "Validate registration"
@@ -2118,54 +2128,54 @@ msgstr "Danke"
 msgid "The Note Kfet team."
 msgstr "Die NoteKfet Team."
 
-#: apps/registration/views.py:41
+#: apps/registration/views.py:40
 msgid "Register new user"
 msgstr "Neuen User registrieren"
 
-#: apps/registration/views.py:99
+#: apps/registration/views.py:98
 msgid "Email validation"
 msgstr "Email validierung"
 
-#: apps/registration/views.py:101
+#: apps/registration/views.py:100
 msgid "Validate email"
 msgstr "Email validieren"
 
-#: apps/registration/views.py:145
+#: apps/registration/views.py:144
 msgid "Email validation unsuccessful"
 msgstr "Email validierung unerfolgreich"
 
-#: apps/registration/views.py:156
+#: apps/registration/views.py:155
 msgid "Email validation email sent"
 msgstr "Validierungsemail wurde gesendet"
 
-#: apps/registration/views.py:164
+#: apps/registration/views.py:163
 msgid "Resend email validation link"
 msgstr "E-Mail-Validierungslink erneut senden"
 
-#: apps/registration/views.py:182
+#: apps/registration/views.py:181
 msgid "Pre-registered users list"
 msgstr "Vorregistrierte Userliste"
 
-#: apps/registration/views.py:206
+#: apps/registration/views.py:205
 msgid "Unregistered users"
 msgstr "Unregistrierte Users"
 
-#: apps/registration/views.py:219
+#: apps/registration/views.py:218
 msgid "Registration detail"
 msgstr "Registrierung Detailen"
 
-#: apps/registration/views.py:293
+#: apps/registration/views.py:282
 msgid "You must join the BDE."
 msgstr "Sie müssen die BDE beitreten."
 
-#: apps/registration/views.py:323
+#: apps/registration/views.py:306
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte "
 "mindestens {} betragen"
 
-#: apps/registration/views.py:417
+#: apps/registration/views.py:387
 msgid "Invalidate pre-registration"
 msgstr "Ungültige Vorregistrierung"
 
@@ -2173,7 +2183,7 @@ msgstr "Ungültige Vorregistrierung"
 msgid "Treasury"
 msgstr "Quaestor"
 
-#: apps/treasury/forms.py:26 apps/treasury/models.py:95
+#: apps/treasury/forms.py:26 apps/treasury/models.py:93
 #: apps/treasury/templates/treasury/invoice_form.html:22
 msgid "This invoice is locked and can no longer be edited."
 msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
@@ -2186,7 +2196,7 @@ msgstr "Überweisung ist bereits geschlossen."
 msgid "You can't change the type of the remittance."
 msgstr "Sie können die Art der Überweisung nicht ändern."
 
-#: apps/treasury/forms.py:125 apps/treasury/models.py:269
+#: apps/treasury/forms.py:125 apps/treasury/models.py:267
 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105
 #: apps/treasury/templates/treasury/invoice_list.html:16
 #: apps/treasury/templates/treasury/remittance_list.html:16
@@ -2202,116 +2212,116 @@ msgstr "Keine beigefügte Überweisung"
 msgid "Invoice identifier"
 msgstr "Rechnungskennung"
 
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:40
 msgid "BDE"
 msgstr "BDE"
 
-#: apps/treasury/models.py:47
+#: apps/treasury/models.py:45
 msgid "Object"
 msgstr "Objekt"
 
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:49
 msgid "Description"
 msgstr "Beschreibung"
 
-#: apps/treasury/models.py:60
+#: apps/treasury/models.py:58
 msgid "Address"
 msgstr "Adresse"
 
-#: apps/treasury/models.py:65 apps/treasury/models.py:195
+#: apps/treasury/models.py:63 apps/treasury/models.py:193
 msgid "Date"
 msgstr "Datum"
 
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:67
 msgid "Acquitted"
 msgstr "Bezahlt"
 
-#: apps/treasury/models.py:74
+#: apps/treasury/models.py:72
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: apps/treasury/models.py:75
+#: apps/treasury/models.py:73
 msgid "An invoice can't be edited when it is locked."
 msgstr "Eine Rechnung kann nicht bearbeitet werden, wenn sie gesperrt ist."
 
-#: apps/treasury/models.py:81
+#: apps/treasury/models.py:79
 msgid "tex source"
 msgstr "Tex Quelle"
 
-#: apps/treasury/models.py:115 apps/treasury/models.py:131
+#: apps/treasury/models.py:113 apps/treasury/models.py:129
 msgid "invoice"
 msgstr "Rechnung"
 
-#: apps/treasury/models.py:116
+#: apps/treasury/models.py:114
 msgid "invoices"
 msgstr "Rechnungen"
 
-#: apps/treasury/models.py:119
+#: apps/treasury/models.py:117
 #, python-brace-format
 msgid "Invoice #{id}"
 msgstr "Rechnung #{id}"
 
-#: apps/treasury/models.py:136
+#: apps/treasury/models.py:134
 msgid "Designation"
 msgstr "Bezeichnung"
 
-#: apps/treasury/models.py:142
+#: apps/treasury/models.py:140
 msgid "Quantity"
 msgstr "Qualität"
 
-#: apps/treasury/models.py:147
+#: apps/treasury/models.py:145
 msgid "Unit price"
 msgstr "Einzelpreis"
 
-#: apps/treasury/models.py:163
+#: apps/treasury/models.py:161
 msgid "product"
 msgstr "Produkt"
 
-#: apps/treasury/models.py:164
+#: apps/treasury/models.py:162
 msgid "products"
 msgstr "Produkten"
 
-#: apps/treasury/models.py:184
+#: apps/treasury/models.py:182
 msgid "remittance type"
 msgstr "Überweisungstyp"
 
-#: apps/treasury/models.py:185
+#: apps/treasury/models.py:183
 msgid "remittance types"
 msgstr "Überweisungstypen"
 
-#: apps/treasury/models.py:206
+#: apps/treasury/models.py:204
 msgid "Comment"
 msgstr "Kommentar"
 
-#: apps/treasury/models.py:211
+#: apps/treasury/models.py:209
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: apps/treasury/models.py:215
+#: apps/treasury/models.py:213
 msgid "remittance"
 msgstr "Überweisung"
 
-#: apps/treasury/models.py:216
+#: apps/treasury/models.py:214
 msgid "remittances"
 msgstr "Überweisungen"
 
-#: apps/treasury/models.py:249
+#: apps/treasury/models.py:247
 msgid "Remittance #{:d}: {}"
 msgstr "Überweisung #{:d}:{}"
 
-#: apps/treasury/models.py:273
+#: apps/treasury/models.py:271
 msgid "special transaction proxy"
 msgstr "spezielle Transaktion Proxy"
 
-#: apps/treasury/models.py:274
+#: apps/treasury/models.py:272
 msgid "special transaction proxies"
 msgstr "spezielle Transaktion Proxies"
 
-#: apps/treasury/models.py:300
+#: apps/treasury/models.py:298
 msgid "credit transaction"
 msgstr "Kredit Transaktion"
 
-#: apps/treasury/models.py:432
+#: apps/treasury/models.py:430
 msgid ""
 "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."
@@ -2319,16 +2329,16 @@ msgstr ""
 "Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
 "Note zu bezahlen."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Kredit von der Société générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Krediten von der Société générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Kredit von der Société générale für {user}"
@@ -2592,7 +2602,7 @@ msgid "The selected user is not validated. Please validate its account first"
 msgstr ""
 
 #: apps/wei/forms/registration.py:59 apps/wei/models.py:126
-#: apps/wei/models.py:326
+#: apps/wei/models.py:323
 msgid "bus"
 msgstr "Bus"
 
@@ -2630,7 +2640,7 @@ msgstr "Wählen Sie die Rollen aus, an denen Sie interessiert sind."
 msgid "This team doesn't belong to the given bus."
 msgstr "Dieses Team gehört nicht zum angegebenen Bus."
 
-#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Wählen Sie ein Wort:"
 
@@ -2717,48 +2727,40 @@ msgstr "Nicht binär"
 msgid "gender"
 msgstr "Geschlecht"
 
-#: apps/wei/models.py:212
-msgid "Unisex"
-msgstr "Unisex"
-
-#: apps/wei/models.py:215 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:58
 msgid "clothing cut"
 msgstr "Kleidung Schnitt"
 
-#: apps/wei/models.py:228 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:226 apps/wei/templates/wei/weimembership_form.html:61
 msgid "clothing size"
 msgstr "Kleidergröße"
 
-#: apps/wei/models.py:234 apps/wei/templates/wei/attribute_bus_1A.html:28
+#: apps/wei/models.py:232 apps/wei/templates/wei/attribute_bus_1A.html:28
 #: apps/wei/templates/wei/weimembership_form.html:67
 msgid "health issues"
 msgstr "Gesundheitsprobleme"
 
-#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:70
 msgid "emergency contact name"
 msgstr "Notfall-Kontakt"
 
-#: apps/wei/models.py:240
-msgid "The emergency contact must not be a WEI participant"
-msgstr "Der Notfallkontakt darf kein WEI-Teilnehmer sein"
-
-#: apps/wei/models.py:245 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:73
 msgid "emergency contact phone"
 msgstr "Notfallkontakttelefon"
 
-#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:247 apps/wei/templates/wei/weimembership_form.html:52
 msgid "first year"
 msgstr "Erste Jahr"
 
-#: apps/wei/models.py:251
+#: apps/wei/models.py:248
 msgid "Tells if the user is new in the school."
 msgstr "Gibt an, ob der USer neu in der Schule ist."
 
-#: apps/wei/models.py:256
+#: apps/wei/models.py:253
 msgid "registration information"
 msgstr "Registrierung Detailen"
 
-#: apps/wei/models.py:257
+#: apps/wei/models.py:254
 msgid ""
 "Information about the registration (buses for old members, survey for the "
 "new members), encoded in JSON"
@@ -2766,27 +2768,27 @@ msgstr ""
 "Informationen zur Registrierung (Busse für alte Mitglieder, Umfrage für neue "
 "Mitglieder), verschlüsselt in JSON"
 
-#: apps/wei/models.py:315
+#: apps/wei/models.py:312
 msgid "WEI User"
 msgstr "WEI User"
 
-#: apps/wei/models.py:316
+#: apps/wei/models.py:313
 msgid "WEI Users"
 msgstr "WEI Users"
 
-#: apps/wei/models.py:336
+#: apps/wei/models.py:333
 msgid "team"
 msgstr "Team"
 
-#: apps/wei/models.py:346
+#: apps/wei/models.py:343
 msgid "WEI registration"
 msgstr "WEI Registrierung"
 
-#: apps/wei/models.py:350
+#: apps/wei/models.py:347
 msgid "WEI membership"
 msgstr "WEI Mitgliedschaft"
 
-#: apps/wei/models.py:351
+#: apps/wei/models.py:348
 msgid "WEI memberships"
 msgstr "WEI Mitgliedschaften"
 
@@ -3359,10 +3361,6 @@ msgstr "Kontakt"
 msgid "Technical Support"
 msgstr ""
 
-#: note_kfet/templates/base.html:198
-msgid "FAQ (FR)"
-msgstr "FAQ (FR)"
-
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Suche nach Attributen wie Name…"
@@ -3610,16 +3608,10 @@ msgstr ""
 "müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den "
 "Sie erhalten haben."
 
-#, fuzzy
-#~| msgid "You already opened an account in the Société générale."
-#~ msgid ""
-#~ "I declare that I opened or I will open soon a bank account in the Société "
-#~ "générale with the BDE partnership."
-#~ msgstr "Sie haben bereits ein Konto in der Société générale eröffnet."
-
 #~ msgid "This user didn't give her/his caution check."
 #~ msgstr "Dieser User hat seine / ihre Vorsicht nicht überprüft."
 
+#, python-format
 #~ msgid ""
 #~ "A new version of the application is available. This instance runs "
 #~ "%(VERSION)s and the last version is %(LAST_VERSION)s. Please consider "

locale/es/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-09 14:46+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
 "PO-Revision-Date: 2022-04-11 23:12+0200\n"
-"Last-Translator: bleizi <bleizi@crans.org>\n"
+"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -114,7 +114,7 @@ msgid "type"
 msgstr "tipo"
 
 #: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:307
-#: apps/note/models/notes.py:148 apps/treasury/models.py:287
+#: apps/note/models/notes.py:148 apps/treasury/models.py:285
 #: apps/wei/models.py:173 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
 msgid "user"
@@ -257,19 +257,19 @@ msgstr "Entrado el "
 msgid "remove"
 msgstr "quitar"
 
-#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:201
+#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:199
 msgid "Type"
 msgstr "Tipo"
 
 #: apps/activity/tables.py:84 apps/member/forms.py:186
-#: apps/registration/forms.py:92 apps/treasury/forms.py:131
+#: apps/registration/forms.py:91 apps/treasury/forms.py:131
 #: apps/wei/forms/registration.py:104
 msgid "Last name"
 msgstr "Apellido"
 
 #: apps/activity/tables.py:86 apps/member/forms.py:191
 #: apps/note/templates/note/transaction_form.html:138
-#: apps/registration/forms.py:97 apps/treasury/forms.py:133
+#: apps/registration/forms.py:96 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
 msgid "First name"
 msgstr "Nombre"
@@ -546,24 +546,24 @@ msgid "This image cannot be loaded."
 msgstr "Esta imagen no puede ser cargada."
 
 #: apps/member/forms.py:141 apps/member/views.py:103
-#: apps/registration/forms.py:34 apps/registration/views.py:266
+#: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Un alias similar ya existe."
 
-#: apps/member/forms.py:165
+#: apps/member/forms.py:165 apps/registration/forms.py:71
 msgid "Inscription paid by Société Générale"
 msgstr "Registración pagadas por Société Générale"
 
-#: apps/member/forms.py:167
+#: apps/member/forms.py:167 apps/registration/forms.py:73
 msgid "Check this case if the Société Générale paid the inscription."
 msgstr "Marcar esta casilla si Société Générale pagó la registración."
 
-#: apps/member/forms.py:172 apps/registration/forms.py:79
+#: apps/member/forms.py:172 apps/registration/forms.py:78
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Tipo de crédito"
 
-#: apps/member/forms.py:173 apps/registration/forms.py:80
+#: apps/member/forms.py:173 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "No crédito"
@@ -572,13 +572,13 @@ msgstr "No crédito"
 msgid "You can credit the note of the user."
 msgstr "Usted puede acreditar la note del usuario."
 
-#: apps/member/forms.py:179 apps/registration/forms.py:85
+#: apps/member/forms.py:179 apps/registration/forms.py:84
 #: apps/wei/forms/registration.py:97
 msgid "Credit amount"
 msgstr "Valor del crédito"
 
 #: apps/member/forms.py:196 apps/note/templates/note/transaction_form.html:144
-#: apps/registration/forms.py:102 apps/treasury/forms.py:135
+#: apps/registration/forms.py:101 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Banco"
@@ -1180,7 +1180,7 @@ msgstr "Guardar cambios"
 msgid "Registrations"
 msgstr "Registraciones"
 
-#: apps/member/views.py:73 apps/registration/forms.py:24
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Este correo tiene que ser valido."
 
@@ -1236,11 +1236,11 @@ msgstr "La afiliación tiene que empezar después del {:%d-%m-%Y}."
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "La afiliación tiene que empezar antes del {:%d-%m-%Y}."
 
-#: apps/member/views.py:880
+#: apps/member/views.py:876
 msgid "Manage roles of an user in the club"
 msgstr "Gestionar los papeles de un usuario en el club"
 
-#: apps/member/views.py:905
+#: apps/member/views.py:901
 msgid "Members of the club"
 msgstr "Miembros del club"
 
@@ -1557,7 +1557,7 @@ msgstr "Transacciones especiales"
 msgid "membership transaction"
 msgstr "transacción de afiliación"
 
-#: apps/note/models/transactions.py:385 apps/treasury/models.py:294
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:292
 msgid "membership transactions"
 msgstr "transacciones de afiliación"
 
@@ -1676,7 +1676,7 @@ msgid "Amount"
 msgstr "Monto"
 
 #: apps/note/templates/note/transaction_form.html:132
-#: apps/treasury/models.py:56
+#: apps/treasury/models.py:54
 msgid "Name"
 msgstr "Nombre"
 
@@ -1963,15 +1963,31 @@ msgstr "Todos los permisos"
 msgid "registration"
 msgstr "afiliación"
 
-#: apps/registration/forms.py:40
+#: apps/registration/forms.py:39
 msgid "This email address is already used."
 msgstr "Este correo electrónico ya esta utilizado."
 
-#: apps/registration/forms.py:60
+#: apps/registration/forms.py:49
+msgid ""
+"I declare that I opened or I will open soon a bank account in the Société "
+"générale with the BDE partnership."
+msgstr ""
+"Declaro que ya abrió una cuenta a la Société Générale en colaboración con el "
+"BDE."
+
+#: apps/registration/forms.py:51
+msgid ""
+"Warning: this engages you to open your bank account. If you finally decides "
+"to don't open your account, you will have to pay the BDE membership."
+msgstr ""
+"Cuidado : esto le obliga abrir su cuenta bancaria. Si cambia de idea y no "
+"abre su cuenta bancaria, tendrá que pagar su afiliación al BDE."
+
+#: apps/registration/forms.py:59
 msgid "Register to the WEI"
 msgstr "Registrarse en el WEI"
 
-#: apps/registration/forms.py:62
+#: apps/registration/forms.py:61
 msgid ""
 "Check this case if you want to register to the WEI. If you hesitate, you "
 "will be able to register later, after validating your account in the Kfet."
@@ -1979,18 +1995,14 @@ msgstr ""
 "Marcar esta casilla si usted quiere registrarse en el WEI. Si duda, podrá "
 "registrarse más tarde, después de validar su cuenta Note Kfet."
 
-#: apps/registration/forms.py:107
+#: apps/registration/forms.py:106
 msgid "Join BDE Club"
 msgstr "Afiliarse al club BDE"
 
-#: apps/registration/forms.py:114
+#: apps/registration/forms.py:113
 msgid "Join Kfet Club"
 msgstr "Afiliarse al club Kfet"
 
-#: apps/registration/forms.py:123
-msgid "Join BDA Club"
-msgstr "Afiliarse al club BDA"
-
 #: apps/registration/templates/registration/email_validation_complete.html:15
 msgid "Your email have successfully been validated."
 msgstr "Su correo electrónico fue validado con éxito."
@@ -2039,12 +2051,12 @@ msgstr "Suprimir afiliación"
 msgid "Validate account"
 msgstr "Validar la cuenta"
 
-#: apps/registration/templates/registration/future_profile_detail.html:63
+#: apps/registration/templates/registration/future_profile_detail.html:62
 msgid ""
 "The user declared that he/she opened a bank account in the Société générale."
 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/registration/templates/registration/future_profile_detail.html:71
 #: apps/wei/templates/wei/weimembership_form.html:127
 #: apps/wei/templates/wei/weimembership_form.html:186
 msgid "Validate registration"
@@ -2096,54 +2108,54 @@ msgstr "Gracias"
 msgid "The Note Kfet team."
 msgstr "El equipo Note Kfet."
 
-#: apps/registration/views.py:41
+#: apps/registration/views.py:40
 msgid "Register new user"
 msgstr "Registrar un nuevo usuario"
 
-#: apps/registration/views.py:99
+#: apps/registration/views.py:98
 msgid "Email validation"
 msgstr "Validación del correo electrónico"
 
-#: apps/registration/views.py:101
+#: apps/registration/views.py:100
 msgid "Validate email"
 msgstr "Validar el correo electrónico"
 
-#: apps/registration/views.py:145
+#: apps/registration/views.py:144
 msgid "Email validation unsuccessful"
 msgstr "La validación del correo electrónico fracasó"
 
-#: apps/registration/views.py:156
+#: apps/registration/views.py:155
 msgid "Email validation email sent"
 msgstr "Correo de validación enviado"
 
-#: apps/registration/views.py:164
+#: apps/registration/views.py:163
 msgid "Resend email validation link"
 msgstr "Reenviar el enlace de validación"
 
-#: apps/registration/views.py:182
+#: apps/registration/views.py:181
 msgid "Pre-registered users list"
 msgstr "Lista de los usuarios con afiliación pendiente"
 
-#: apps/registration/views.py:206
+#: apps/registration/views.py:205
 msgid "Unregistered users"
 msgstr "Usuarios con afiliación pendiente"
 
-#: apps/registration/views.py:219
+#: apps/registration/views.py:218
 msgid "Registration detail"
 msgstr "Detalles de la afiliación"
 
-#: apps/registration/views.py:293
+#: apps/registration/views.py:282
 msgid "You must join the BDE."
 msgstr "Usted tiene que afiliarse al BDE."
 
-#: apps/registration/views.py:323
+#: apps/registration/views.py:306
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "El monto dado no es suficiente para las afiliaciones, tiene que ser al menos "
 "{}"
 
-#: apps/registration/views.py:417
+#: apps/registration/views.py:387
 msgid "Invalidate pre-registration"
 msgstr "Invalidar la afiliación"
 
@@ -2151,7 +2163,7 @@ msgstr "Invalidar la afiliación"
 msgid "Treasury"
 msgstr "Tesorería"
 
-#: apps/treasury/forms.py:26 apps/treasury/models.py:95
+#: apps/treasury/forms.py:26 apps/treasury/models.py:93
 #: apps/treasury/templates/treasury/invoice_form.html:22
 msgid "This invoice is locked and can no longer be edited."
 msgstr "Esta factura esta bloqueada y no puede ser modificada."
@@ -2164,7 +2176,7 @@ msgstr "El descuento ya esta cerrado."
 msgid "You can't change the type of the remittance."
 msgstr "No puede cambiar el tipo de descuento."
 
-#: apps/treasury/forms.py:125 apps/treasury/models.py:269
+#: apps/treasury/forms.py:125 apps/treasury/models.py:267
 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105
 #: apps/treasury/templates/treasury/invoice_list.html:16
 #: apps/treasury/templates/treasury/remittance_list.html:16
@@ -2180,116 +2192,116 @@ msgstr "No hay descuento relacionado"
 msgid "Invoice identifier"
 msgstr "Numero de factura"
 
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:40
 msgid "BDE"
 msgstr "BDE"
 
-#: apps/treasury/models.py:47
+#: apps/treasury/models.py:45
 msgid "Object"
 msgstr "Asunto"
 
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:49
 msgid "Description"
 msgstr "Descripción"
 
-#: apps/treasury/models.py:60
+#: apps/treasury/models.py:58
 msgid "Address"
 msgstr "Dirección"
 
-#: apps/treasury/models.py:65 apps/treasury/models.py:195
+#: apps/treasury/models.py:63 apps/treasury/models.py:193
 msgid "Date"
 msgstr "Fecha"
 
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:67
 msgid "Acquitted"
 msgstr "Pagada"
 
-#: apps/treasury/models.py:74
+#: apps/treasury/models.py:72
 msgid "Locked"
 msgstr "Bloqueada"
 
-#: apps/treasury/models.py:75
+#: apps/treasury/models.py:73
 msgid "An invoice can't be edited when it is locked."
 msgstr "Une factura no puede ser modificada cuando esta bloqueada."
 
-#: apps/treasury/models.py:81
+#: apps/treasury/models.py:79
 msgid "tex source"
 msgstr "código fuente TeX"
 
-#: apps/treasury/models.py:115 apps/treasury/models.py:131
+#: apps/treasury/models.py:113 apps/treasury/models.py:129
 msgid "invoice"
 msgstr "factura"
 
-#: apps/treasury/models.py:116
+#: apps/treasury/models.py:114
 msgid "invoices"
 msgstr "facturas"
 
-#: apps/treasury/models.py:119
+#: apps/treasury/models.py:117
 #, python-brace-format
 msgid "Invoice #{id}"
 msgstr "Factura n°{id}"
 
-#: apps/treasury/models.py:136
+#: apps/treasury/models.py:134
 msgid "Designation"
 msgstr "Designación"
 
-#: apps/treasury/models.py:142
+#: apps/treasury/models.py:140
 msgid "Quantity"
 msgstr "Cantidad"
 
-#: apps/treasury/models.py:147
+#: apps/treasury/models.py:145
 msgid "Unit price"
 msgstr "Precio unitario"
 
-#: apps/treasury/models.py:163
+#: apps/treasury/models.py:161
 msgid "product"
 msgstr "producto"
 
-#: apps/treasury/models.py:164
+#: apps/treasury/models.py:162
 msgid "products"
 msgstr "productos"
 
-#: apps/treasury/models.py:184
+#: apps/treasury/models.py:182
 msgid "remittance type"
 msgstr "tipo de descuento"
 
-#: apps/treasury/models.py:185
+#: apps/treasury/models.py:183
 msgid "remittance types"
 msgstr "tipos de descuentos"
 
-#: apps/treasury/models.py:206
+#: apps/treasury/models.py:204
 msgid "Comment"
 msgstr "Comentario"
 
-#: apps/treasury/models.py:211
+#: apps/treasury/models.py:209
 msgid "Closed"
 msgstr "Cerrada"
 
-#: apps/treasury/models.py:215
+#: apps/treasury/models.py:213
 msgid "remittance"
 msgstr "descuento"
 
-#: apps/treasury/models.py:216
+#: apps/treasury/models.py:214
 msgid "remittances"
 msgstr "descuentos"
 
-#: apps/treasury/models.py:249
+#: apps/treasury/models.py:247
 msgid "Remittance #{:d}: {}"
 msgstr "Descuento n°{:d} : {}"
 
-#: apps/treasury/models.py:273
+#: apps/treasury/models.py:271
 msgid "special transaction proxy"
 msgstr "proxy de transacción especial"
 
-#: apps/treasury/models.py:274
+#: apps/treasury/models.py:272
 msgid "special transaction proxies"
 msgstr "proxys de transacciones especiales"
 
-#: apps/treasury/models.py:300
+#: apps/treasury/models.py:298
 msgid "credit transaction"
 msgstr "transacción de crédito"
 
-#: apps/treasury/models.py:432
+#: apps/treasury/models.py:430
 msgid ""
 "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."
@@ -2298,16 +2310,16 @@ msgstr ""
 "afiliaciones. Por favor pídelo acreditar su note antes de invalidar este "
 "crédito."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Crédito de la Société Générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Créditos de la Société Générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Crédito de la Société Générale para {user}"
@@ -2562,7 +2574,7 @@ msgstr ""
 "El usuario seleccionado no ha sido validado. Validar esta cuenta primero"
 
 #: apps/wei/forms/registration.py:59 apps/wei/models.py:126
-#: apps/wei/models.py:326
+#: apps/wei/models.py:323
 msgid "bus"
 msgstr "bus"
 
@@ -2600,7 +2612,7 @@ msgstr "Elegir los papeles que le interesa."
 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/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Elegir una palabra :"
 
@@ -2687,48 +2699,40 @@ msgstr "No binari@"
 msgid "gender"
 msgstr "género"
 
-#: apps/wei/models.py:212
-msgid "Unisex"
-msgstr "Unisex"
-
-#: apps/wei/models.py:215 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:58
 msgid "clothing cut"
 msgstr "forma de ropa"
 
-#: apps/wei/models.py:228 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:226 apps/wei/templates/wei/weimembership_form.html:61
 msgid "clothing size"
 msgstr "medida de ropa"
 
-#: apps/wei/models.py:234 apps/wei/templates/wei/attribute_bus_1A.html:28
+#: apps/wei/models.py:232 apps/wei/templates/wei/attribute_bus_1A.html:28
 #: apps/wei/templates/wei/weimembership_form.html:67
 msgid "health issues"
 msgstr "problemas de salud"
 
-#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:70
 msgid "emergency contact name"
 msgstr "nombre del contacto de emergencia"
 
-#: apps/wei/models.py:240
-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:245 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:73
 msgid "emergency contact phone"
 msgstr "teléfono del contacto de emergencia"
 
-#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:247 apps/wei/templates/wei/weimembership_form.html:52
 msgid "first year"
 msgstr "primer año"
 
-#: apps/wei/models.py:251
+#: apps/wei/models.py:248
 msgid "Tells if the user is new in the school."
 msgstr "Indica si el usuario es nuevo en la escuela."
 
-#: apps/wei/models.py:256
+#: apps/wei/models.py:253
 msgid "registration information"
 msgstr "informaciones sobre la afiliación"
 
-#: apps/wei/models.py:257
+#: apps/wei/models.py:254
 msgid ""
 "Information about the registration (buses for old members, survey for the "
 "new members), encoded in JSON"
@@ -2736,27 +2740,27 @@ msgstr ""
 "Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
 "para los nuevos miembros), registrado en JSON"
 
-#: apps/wei/models.py:315
+#: apps/wei/models.py:312
 msgid "WEI User"
 msgstr "Participante WEI"
 
-#: apps/wei/models.py:316
+#: apps/wei/models.py:313
 msgid "WEI Users"
 msgstr "Participantes WEI"
 
-#: apps/wei/models.py:336
+#: apps/wei/models.py:333
 msgid "team"
 msgstr "equipo"
 
-#: apps/wei/models.py:346
+#: apps/wei/models.py:343
 msgid "WEI registration"
 msgstr "Apuntación al WEI"
 
-#: apps/wei/models.py:350
+#: apps/wei/models.py:347
 msgid "WEI membership"
 msgstr "Afiliación al WEI"
 
-#: apps/wei/models.py:351
+#: apps/wei/models.py:348
 msgid "WEI memberships"
 msgstr "Afiliaciones al WEI"
 
@@ -3312,10 +3316,6 @@ msgstr "Contactarnos"
 msgid "Technical Support"
 msgstr "Soporte técnico"
 
-#: note_kfet/templates/base.html:198
-msgid "FAQ (FR)"
-msgstr "FAQ (FR)"
-
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Buscar con atributo, como el nombre…"
@@ -3537,21 +3537,6 @@ msgstr ""
 "pagar su afiliación. Tambien tiene que validar su correo electronico con el "
 "enlace que recibió."
 
-#~ msgid ""
-#~ "I declare that I opened or I will open soon a bank account in the Société "
-#~ "générale with the BDE partnership."
-#~ msgstr ""
-#~ "Declaro que ya abrió una cuenta a la Société Générale en colaboración con "
-#~ "el BDE."
-
-#~ msgid ""
-#~ "Warning: this engages you to open your bank account. If you finally "
-#~ "decides to don't open your account, you will have to pay the BDE "
-#~ "membership."
-#~ msgstr ""
-#~ "Cuidado : esto le obliga abrir su cuenta bancaria. Si cambia de idea y no "
-#~ "abre su cuenta bancaria, tendrá que pagar su afiliación al BDE."
-
 #~ msgid "You are not a Kfet member, so you can't use your note account."
 #~ msgstr "Usted no es un miembro de la Kfet, no puede usar su cuenta note."
 

locale/fr/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-09 14:46+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
 "PO-Revision-Date: 2022-04-11 22:05+0200\n"
-"Last-Translator: bleizi <bleizi@crans.org>\n"
+"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -115,7 +115,7 @@ msgid "type"
 msgstr "type"
 
 #: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:307
-#: apps/note/models/notes.py:148 apps/treasury/models.py:287
+#: apps/note/models/notes.py:148 apps/treasury/models.py:285
 #: apps/wei/models.py:173 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
 msgid "user"
@@ -258,19 +258,19 @@ msgstr "Entré le "
 msgid "remove"
 msgstr "supprimer"
 
-#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:201
+#: apps/activity/tables.py:82 apps/note/forms.py:68 apps/treasury/models.py:199
 msgid "Type"
 msgstr "Type"
 
 #: apps/activity/tables.py:84 apps/member/forms.py:186
-#: apps/registration/forms.py:92 apps/treasury/forms.py:131
+#: apps/registration/forms.py:91 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:191
 #: apps/note/templates/note/transaction_form.html:138
-#: apps/registration/forms.py:97 apps/treasury/forms.py:133
+#: apps/registration/forms.py:96 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
 msgid "First name"
 msgstr "Prénom"
@@ -548,24 +548,24 @@ msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."
 
 #: apps/member/forms.py:141 apps/member/views.py:103
-#: apps/registration/forms.py:34 apps/registration/views.py:266
+#: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
 
-#: apps/member/forms.py:165
+#: apps/member/forms.py:165 apps/registration/forms.py:71
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"
 
-#: apps/member/forms.py:167
+#: apps/member/forms.py:167 apps/registration/forms.py:73
 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:172 apps/registration/forms.py:79
+#: apps/member/forms.py:172 apps/registration/forms.py:78
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Type de rechargement"
 
-#: apps/member/forms.py:173 apps/registration/forms.py:80
+#: apps/member/forms.py:173 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "Pas de rechargement"
@@ -574,13 +574,13 @@ msgstr "Pas de rechargement"
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utilisateur avant l'adhésion."
 
-#: apps/member/forms.py:179 apps/registration/forms.py:85
+#: apps/member/forms.py:179 apps/registration/forms.py:84
 #: apps/wei/forms/registration.py:97
 msgid "Credit amount"
 msgstr "Montant à créditer"
 
 #: apps/member/forms.py:196 apps/note/templates/note/transaction_form.html:144
-#: apps/registration/forms.py:102 apps/treasury/forms.py:135
+#: apps/registration/forms.py:101 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Banque"
@@ -1183,7 +1183,7 @@ msgstr "Sauvegarder les changements"
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: apps/member/views.py:73 apps/registration/forms.py:24
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
@@ -1239,11 +1239,11 @@ msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:880
+#: apps/member/views.py:876
 msgid "Manage roles of an user in the club"
 msgstr "Gérer les rôles d'un utilisateur dans le club"
 
-#: apps/member/views.py:905
+#: apps/member/views.py:901
 msgid "Members of the club"
 msgstr "Membres du club"
 
@@ -1563,7 +1563,7 @@ msgstr "Transactions de crédit/retrait"
 msgid "membership transaction"
 msgstr "transaction d'adhésion"
 
-#: apps/note/models/transactions.py:385 apps/treasury/models.py:294
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:292
 msgid "membership transactions"
 msgstr "transactions d'adhésion"
 
@@ -1682,7 +1682,7 @@ msgid "Amount"
 msgstr "Montant"
 
 #: apps/note/templates/note/transaction_form.html:132
-#: apps/treasury/models.py:56
+#: apps/treasury/models.py:54
 msgid "Name"
 msgstr "Nom"
 
@@ -1972,15 +1972,31 @@ msgstr "Tous les droits"
 msgid "registration"
 msgstr "inscription"
 
-#: apps/registration/forms.py:40
+#: apps/registration/forms.py:39
 msgid "This email address is already used."
 msgstr "Cet email est déjà pris."
 
-#: apps/registration/forms.py:60
+#: apps/registration/forms.py:49
+msgid ""
+"I declare that I opened or I will open soon a bank account in the Société "
+"générale with the BDE partnership."
+msgstr ""
+"Je déclare avoir ouvert ou ouvrir prochainement un compte à la société "
+"générale avec le partenariat du BDE."
+
+#: apps/registration/forms.py:51
+msgid ""
+"Warning: this engages you to open your bank account. If you finally decides "
+"to don't open your account, you will have to pay the BDE membership."
+msgstr ""
+"Attention : cocher cette case vous engage à ouvrir votre compte. Si vous "
+"décidez de ne pas le faire, vous devrez payer l'adhésion au BDE."
+
+#: apps/registration/forms.py:59
 msgid "Register to the WEI"
 msgstr "S'inscrire au WEI"
 
-#: apps/registration/forms.py:62
+#: apps/registration/forms.py:61
 msgid ""
 "Check this case if you want to register to the WEI. If you hesitate, you "
 "will be able to register later, after validating your account in the Kfet."
@@ -1989,18 +2005,14 @@ msgstr ""
 "pourrez toujours vous inscrire plus tard, après avoir validé votre compte à "
 "la Kfet."
 
-#: apps/registration/forms.py:107
+#: apps/registration/forms.py:106
 msgid "Join BDE Club"
 msgstr "Adhérer au club BDE"
 
-#: apps/registration/forms.py:114
+#: apps/registration/forms.py:113
 msgid "Join Kfet Club"
 msgstr "Adhérer au club Kfet"
 
-#: apps/registration/forms.py:123
-msgid "Join BDA Club"
-msgstr "Adhérer au club BDA"
-
 #: apps/registration/templates/registration/email_validation_complete.html:15
 msgid "Your email have successfully been validated."
 msgstr "Votre adresse e-mail a bien été validée."
@@ -2049,12 +2061,12 @@ msgstr "Supprimer l'inscription"
 msgid "Validate account"
 msgstr "Valider le compte"
 
-#: apps/registration/templates/registration/future_profile_detail.html:63
+#: apps/registration/templates/registration/future_profile_detail.html:62
 msgid ""
 "The user declared that he/she opened a bank account in the Société générale."
 msgstr "L'utilisateur a déclaré avoir ouvert un compte à la société générale."
 
-#: apps/registration/templates/registration/future_profile_detail.html:73
+#: apps/registration/templates/registration/future_profile_detail.html:71
 #: apps/wei/templates/wei/weimembership_form.html:127
 #: apps/wei/templates/wei/weimembership_form.html:186
 msgid "Validate registration"
@@ -2104,54 +2116,54 @@ msgstr "Merci"
 msgid "The Note Kfet team."
 msgstr "L'équipe de la Note Kfet."
 
-#: apps/registration/views.py:41
+#: apps/registration/views.py:40
 msgid "Register new user"
 msgstr "Enregistrer un nouvel utilisateur"
 
-#: apps/registration/views.py:99
+#: apps/registration/views.py:98
 msgid "Email validation"
 msgstr "Validation de l'adresse mail"
 
-#: apps/registration/views.py:101
+#: apps/registration/views.py:100
 msgid "Validate email"
 msgstr "Valider l'adresse e-mail"
 
-#: apps/registration/views.py:145
+#: apps/registration/views.py:144
 msgid "Email validation unsuccessful"
 msgstr "La validation de l'adresse mail a échoué"
 
-#: apps/registration/views.py:156
+#: apps/registration/views.py:155
 msgid "Email validation email sent"
 msgstr "L'email de vérification de l'adresse email a bien été envoyé"
 
-#: apps/registration/views.py:164
+#: apps/registration/views.py:163
 msgid "Resend email validation link"
 msgstr "Renvoyer le lien de validation"
 
-#: apps/registration/views.py:182
+#: apps/registration/views.py:181
 msgid "Pre-registered users list"
 msgstr "Liste des utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:206
+#: apps/registration/views.py:205
 msgid "Unregistered users"
 msgstr "Utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:219
+#: apps/registration/views.py:218
 msgid "Registration detail"
 msgstr "Détails de l'inscription"
 
-#: apps/registration/views.py:293
+#: apps/registration/views.py:282
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."
 
-#: apps/registration/views.py:323
+#: apps/registration/views.py:306
 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:417
+#: apps/registration/views.py:387
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"
 
@@ -2159,7 +2171,7 @@ msgstr "Invalider l'inscription"
 msgid "Treasury"
 msgstr "Trésorerie"
 
-#: apps/treasury/forms.py:26 apps/treasury/models.py:95
+#: apps/treasury/forms.py:26 apps/treasury/models.py:93
 #: apps/treasury/templates/treasury/invoice_form.html:22
 msgid "This invoice is locked and can no longer be edited."
 msgstr "Cette facture est verrouillée et ne peut plus être éditée."
@@ -2172,7 +2184,7 @@ msgstr "La remise est déjà fermée."
 msgid "You can't change the type of the remittance."
 msgstr "Vous ne pouvez pas changer le type de la remise."
 
-#: apps/treasury/forms.py:125 apps/treasury/models.py:269
+#: apps/treasury/forms.py:125 apps/treasury/models.py:267
 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105
 #: apps/treasury/templates/treasury/invoice_list.html:16
 #: apps/treasury/templates/treasury/remittance_list.html:16
@@ -2188,116 +2200,116 @@ msgstr "Pas de remise associée"
 msgid "Invoice identifier"
 msgstr "Numéro de facture"
 
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:40
 msgid "BDE"
 msgstr "BDE"
 
-#: apps/treasury/models.py:47
+#: apps/treasury/models.py:45
 msgid "Object"
 msgstr "Objet"
 
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:49
 msgid "Description"
 msgstr "Description"
 
-#: apps/treasury/models.py:60
+#: apps/treasury/models.py:58
 msgid "Address"
 msgstr "Adresse"
 
-#: apps/treasury/models.py:65 apps/treasury/models.py:195
+#: apps/treasury/models.py:63 apps/treasury/models.py:193
 msgid "Date"
 msgstr "Date"
 
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:67
 msgid "Acquitted"
 msgstr "Acquittée"
 
-#: apps/treasury/models.py:74
+#: apps/treasury/models.py:72
 msgid "Locked"
 msgstr "Verrouillée"
 
-#: apps/treasury/models.py:75
+#: apps/treasury/models.py:73
 msgid "An invoice can't be edited when it is locked."
 msgstr "Une facture ne peut plus être modifiée si elle est verrouillée."
 
-#: apps/treasury/models.py:81
+#: apps/treasury/models.py:79
 msgid "tex source"
 msgstr "fichier TeX source"
 
-#: apps/treasury/models.py:115 apps/treasury/models.py:131
+#: apps/treasury/models.py:113 apps/treasury/models.py:129
 msgid "invoice"
 msgstr "facture"
 
-#: apps/treasury/models.py:116
+#: apps/treasury/models.py:114
 msgid "invoices"
 msgstr "factures"
 
-#: apps/treasury/models.py:119
+#: apps/treasury/models.py:117
 #, python-brace-format
 msgid "Invoice #{id}"
 msgstr "Facture n°{id}"
 
-#: apps/treasury/models.py:136
+#: apps/treasury/models.py:134
 msgid "Designation"
 msgstr "Désignation"
 
-#: apps/treasury/models.py:142
+#: apps/treasury/models.py:140
 msgid "Quantity"
 msgstr "Quantité"
 
-#: apps/treasury/models.py:147
+#: apps/treasury/models.py:145
 msgid "Unit price"
 msgstr "Prix unitaire"
 
-#: apps/treasury/models.py:163
+#: apps/treasury/models.py:161
 msgid "product"
 msgstr "produit"
 
-#: apps/treasury/models.py:164
+#: apps/treasury/models.py:162
 msgid "products"
 msgstr "produits"
 
-#: apps/treasury/models.py:184
+#: apps/treasury/models.py:182
 msgid "remittance type"
 msgstr "type de remise"
 
-#: apps/treasury/models.py:185
+#: apps/treasury/models.py:183
 msgid "remittance types"
 msgstr "types de remises"
 
-#: apps/treasury/models.py:206
+#: apps/treasury/models.py:204
 msgid "Comment"
 msgstr "Commentaire"
 
-#: apps/treasury/models.py:211
+#: apps/treasury/models.py:209
 msgid "Closed"
 msgstr "Fermée"
 
-#: apps/treasury/models.py:215
+#: apps/treasury/models.py:213
 msgid "remittance"
 msgstr "remise"
 
-#: apps/treasury/models.py:216
+#: apps/treasury/models.py:214
 msgid "remittances"
 msgstr "remises"
 
-#: apps/treasury/models.py:249
+#: apps/treasury/models.py:247
 msgid "Remittance #{:d}: {}"
 msgstr "Remise n°{:d} : {}"
 
-#: apps/treasury/models.py:273
+#: apps/treasury/models.py:271
 msgid "special transaction proxy"
 msgstr "proxy de transaction spéciale"
 
-#: apps/treasury/models.py:274
+#: apps/treasury/models.py:272
 msgid "special transaction proxies"
 msgstr "proxys de transactions spéciales"
 
-#: apps/treasury/models.py:300
+#: apps/treasury/models.py:298
 msgid "credit transaction"
 msgstr "transaction de crédit"
 
-#: apps/treasury/models.py:432
+#: apps/treasury/models.py:430
 msgid ""
 "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."
@@ -2305,16 +2317,16 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa "
 "note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Crédit de la Société générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Crédits de la Société générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Crédit de la société générale pour l'utilisateur {user}"
@@ -2574,7 +2586,7 @@ msgstr ""
 "compte"
 
 #: apps/wei/forms/registration.py:59 apps/wei/models.py:126
-#: apps/wei/models.py:326
+#: apps/wei/models.py:323
 msgid "bus"
 msgstr "bus"
 
@@ -2612,7 +2624,7 @@ msgstr "Sélectionnez les rôles qui vous intéressent."
 msgid "This team doesn't belong to the given bus."
 msgstr "Cette équipe n'appartient pas à ce bus."
 
-#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Choisissez un mot :"
 
@@ -2699,48 +2711,40 @@ msgstr "Non-binaire"
 msgid "gender"
 msgstr "genre"
 
-#: apps/wei/models.py:212
-msgid "Unisex"
-msgstr "Unisexe"
-
-#: apps/wei/models.py:215 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:58
 msgid "clothing cut"
 msgstr "coupe de vêtement"
 
-#: apps/wei/models.py:228 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:226 apps/wei/templates/wei/weimembership_form.html:61
 msgid "clothing size"
 msgstr "taille de vêtement"
 
-#: apps/wei/models.py:234 apps/wei/templates/wei/attribute_bus_1A.html:28
+#: apps/wei/models.py:232 apps/wei/templates/wei/attribute_bus_1A.html:28
 #: apps/wei/templates/wei/weimembership_form.html:67
 msgid "health issues"
 msgstr "problèmes de santé"
 
-#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:70
 msgid "emergency contact name"
 msgstr "nom du contact en cas d'urgence"
 
-#: apps/wei/models.py:240
-msgid "The emergency contact must not be a WEI participant"
-msgstr "Le contact en cas d'urgence ne doit pas être une personne qui participe au WEI"
-
-#: apps/wei/models.py:245 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:73
 msgid "emergency contact phone"
 msgstr "téléphone du contact en cas d'urgence"
 
-#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:247 apps/wei/templates/wei/weimembership_form.html:52
 msgid "first year"
 msgstr "première année"
 
-#: apps/wei/models.py:251
+#: apps/wei/models.py:248
 msgid "Tells if the user is new in the school."
 msgstr "Indique si l'utilisateur est nouveau dans l'école."
 
-#: apps/wei/models.py:256
+#: apps/wei/models.py:253
 msgid "registration information"
 msgstr "informations sur l'inscription"
 
-#: apps/wei/models.py:257
+#: apps/wei/models.py:254
 msgid ""
 "Information about the registration (buses for old members, survey for the "
 "new members), encoded in JSON"
@@ -2748,27 +2752,27 @@ msgstr ""
 "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
 "1A), encodées en JSON"
 
-#: apps/wei/models.py:315
+#: apps/wei/models.py:312
 msgid "WEI User"
 msgstr "Participant au WEI"
 
-#: apps/wei/models.py:316
+#: apps/wei/models.py:313
 msgid "WEI Users"
 msgstr "Participants au WEI"
 
-#: apps/wei/models.py:336
+#: apps/wei/models.py:333
 msgid "team"
 msgstr "équipe"
 
-#: apps/wei/models.py:346
+#: apps/wei/models.py:343
 msgid "WEI registration"
 msgstr "Inscription au WEI"
 
-#: apps/wei/models.py:350
+#: apps/wei/models.py:347
 msgid "WEI membership"
 msgstr "Adhésion au WEI"
 
-#: apps/wei/models.py:351
+#: apps/wei/models.py:348
 msgid "WEI memberships"
 msgstr "Adhésions au WEI"
 
@@ -3331,10 +3335,6 @@ msgstr "Nous contacter"
 msgid "Technical Support"
 msgstr "Support technique"
 
-#: note_kfet/templates/base.html:198
-msgid "FAQ (FR)"
-msgstr "FAQ (FR)"
-
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Chercher par un attribut tel que le nom …"
@@ -3562,18 +3562,3 @@ msgstr ""
 "vous connecter. Vous devez vous rendre à la Kfet et payer les frais "
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."
-
-#~ msgid ""
-#~ "I declare that I opened or I will open soon a bank account in the Société "
-#~ "générale with the BDE partnership."
-#~ msgstr ""
-#~ "Je déclare avoir ouvert ou ouvrir prochainement un compte à la société "
-#~ "générale avec le partenariat du BDE."
-
-#~ msgid ""
-#~ "Warning: this engages you to open your bank account. If you finally "
-#~ "decides to don't open your account, you will have to pay the BDE "
-#~ "membership."
-#~ msgstr ""
-#~ "Attention : cocher cette case vous engage à ouvrir votre compte. Si vous "
-#~ "décidez de ne pas le faire, vous devrez payer l'adhésion au BDE."

note.cron

@@ -18,7 +18,7 @@ MAILTO=notekfet2020@lists.crans.org
 # Spammer les gens en négatif
  00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 # Envoyer le rapport mensuel aux trésoriers et respos info
- 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
+ 00  8     6   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
 # Envoyer les rapports aux gens
  55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 # Mettre à jour les boutons mis en avant

note_kfet/templates/base.html

@@ -194,8 +194,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                            class="text-muted">{% trans "Contact us" %}</a> &mdash;
                         <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}"
                            class="text-muted">{% trans "Technical Support" %}</a> &mdash;
-			<a href="https://note.crans.org/doc/faq/"
-                           class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
                     </span>
                     {% csrf_token %}
                     <select title="language" name="language"

requirements.txt

@@ -17,3 +17,6 @@ django-tables2~=2.3.1
 python-memcached~=1.59
 phonenumbers~=8.9.10
 Pillow>=5.4.1
+oauthlib<3.2.1
+lxml<4.9.2
+zipp>=2.0.0,<2.0.1

shell-static.nix

@@ -1,34 +0,0 @@
-# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
-# 
-# The nk20 javascript static location are hardcoded for imperative system.
-# This make ./manage.py collectstatic hard to use with nixos.
-# 
-# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
-# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
-# The regular shell.nix should be enough for other configurations.
-#
-# Warning, you are still supposed to use pip package with a venv !
-{ pkgs ? import <nixpkgs> {} }:
-(pkgs.buildFHSUserEnv {
-  name = "pipzone";
-  targetPkgs = pkgs: (with pkgs;
-  let
-    fhs-static = stdenv.mkDerivation {
-      name = "fhs-static";
-      buildCommand = ''
-      mkdir -p $out/share/javascript/bootstrap4
-      mkdir -p $out/share/javascript/jquery
-      ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
-      ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
-    '';
-    };
-  in [
-    fhs-static
-    python39
-    gettext
-    python39Packages.pip
-    python39Packages.virtualenv
-    python39Packages.setuptools
-  ]);
-  runScript = "bash";
-}).env

shell.nix

@@ -1,23 +0,0 @@
-# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
-#
-# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
-#
-# Please check shell-static.nix for running ./manage.py collectstatics.
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    python39
-    python39Packages.pip
-    python39Packages.setuptools
-    gettext
-
-  ];
-  shellHook = ''
-    # Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
-    # See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
-    export PIP_PREFIX=$(pwd)/_build/pip_packages
-    export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
-    export PATH="$PIP_PREFIX/bin:$PATH"
-    unset SOURCE_DATE_EPOCH
-  '';
-}

tox.ini

@@ -16,7 +16,7 @@ skipsdist = True
 sitepackages = True
 deps =
     -r{toxinidir}/requirements.txt
-    coverage
+    coverage<6.5.0
 commands =
     coverage run --omit='apps/scripts*,*_example.py,note_kfet/wsgi.py' --source=apps,note_kfet ./manage.py test apps/
     coverage report -m
@@ -35,7 +35,7 @@ commands =
     flake8 apps --extend-exclude apps/scripts
 
 [flake8]
-ignore = W503, I100, I101, B019
+ignore = W503, I100, I101
 exclude =
     .tox,
     .git,