Added a first pass for automatically entering an activity with a qrcode

remove useless comment
Insecable space for more clarity
2025-06-30 13:11:09 +02:00 · 2023-10-11 18:01:51 +02:00 · 2022-03-22 15:06:04 +01:00 · 2022-03-22 15:04:41 +01:00 · 2022-03-22 14:59:01 +01:00 · 2022-03-22 14:58:26 +01:00
46 changed files with 1117 additions and 2366 deletions
--- a/.gitignore
+++ b/.gitignore
@ -42,7 +42,6 @@ map.json
 backups/
 /static/
 /media/
-/tmp/

 # Virtualenv
 env/
--- a/apps/activity/templates/activity/activity_entry.html
+++ b/apps/activity/templates/activity/activity_entry.html
@ -38,6 +38,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </a>

 <input id="alias" type="text" class="form-control" placeholder="Nom/note ...">
+<button id="trigger" class="btn btn-secondary">Click me !</button>

 <hr>

@ -63,15 +64,46 @@ SPDX-License-Identifier: GPL-3.0-or-later
        refreshBalance();
    }

+    function process_qrcode() {
+        let name = alias_obj.val();
+        $.get("/api/note/note?search=" + name + "&format=json").done(
+            function (res) {
+                let note = res.results[0];
+                $.post("/api/activity/entry/?format=json", {
+                    csrfmiddlewaretoken: CSRF_TOKEN,
+                    activity: {{ activity.id }},
+                    note: note.id,
+                    guest: null
+                }).done(function () {
+                    addMsg(interpolate(gettext(
+                        "Entry made for %s whose balance is %s €"),
+                        [note.name, note.balance / 100]), "success", 4000);
+                    reloadTable(true);
+                }).fail(function (xhr) {
+                    errMsg(xhr.responseJSON, 4000);
+                });
+            }).fail(function (xhr) {
+                errMsg(xhr.responseJSON, 4000);
+            });
+    }
+
    alias_obj.keyup(function(event) {
        let code = event.originalEvent.keyCode
        if (65 <= code <= 122 || code === 13) {
            debounce(reloadTable)()
        }
+        if (code === 0)
+            process_qrcode();
    });

    $(document).ready(init);

+    alias_obj2 = document.getElementById("alias");
+    $("#trigger").click(function (e) {
+        addMsg("Clicked", "success", 1000);
+        alias_obj.val(alias_obj.val() + "\0");
+        alias_obj2.dispatchEvent(new KeyboardEvent('keyup'));
+    })
    function init() {
        $(".table-row").click(function (e) {
            let target = e.target.parentElement;
@ -168,4 +200,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
        });
    }
 </script>
-{% endblock %}
+{% endblock %}
--- a/apps/api/pagination.py
+++ b/apps/api/pagination.py
@ -1,5 +0,0 @@
-from rest_framework.pagination import PageNumberPagination
-
-class CustomPagination(PageNumberPagination):
-    page_size_query_param = 'page_size'
-
--- a/apps/member/migrations/0009_auto_20220904_2325.py
+++ b/apps/member/migrations/0009_auto_20220904_2325.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.26 on 2022-09-04 21:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0008_auto_20211005_1544'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2022, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]
--- a/apps/member/models.py
+++ b/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)
--- a/apps/member/static/member/js/trust.js
+++ b/apps/member/static/member/js/trust.js
@ -1,53 +0,0 @@
-/**
- * On form submit, create a new friendship
- */
-function create_trust (e) {
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.getJSON('/api/note/alias/'+formData.get('trusted') + '/',
-    function (trusted_alias) {
-      if ((trusted_alias.note == formData.get('trusting')))
-      {
-         addMsg(gettext("You can't add yourself as a friend"), "danger")
-         return
-      }
-      $.post('/api/note/trust/', {
-        csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
-        trusting: formData.get('trusting'),
-        trusted: trusted_alias.note
-      }).done(function () {
-        // Reload table
-        $('#trust_table').load(location.pathname + ' #trust_table')
-        addMsg(gettext('Friendship successfully added'), 'success')
-      }).fail(function (xhr, _textStatus, _error) {
-        errMsg(xhr.responseJSON)
-      })
-    }).fail(function (xhr, _textStatus, _error) {
-        errMsg(xhr.responseJSON)
-    })
-}
-
-/**
- * On click of "delete", delete the alias
- * @param button_id:Integer Alias id to remove
- */
-function delete_button (button_id) {
-  $.ajax({
-    url: '/api/note/trust/' + button_id + '/',
-    method: 'DELETE',
-    headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
-  }).done(function () {
-    addMsg(gettext('Friendship successfully deleted'), 'success')
-    $('#trust_table').load(location.pathname + ' #trust_table')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-$(document).ready(function () {
-  // Attach event
-  document.getElementById('form_trust').addEventListener('submit', create_trust)
-})
--- a/apps/member/templates/member/includes/profile_info.html
+++ b/apps/member/templates/member/includes/profile_info.html
@ -25,14 +25,6 @@
        </a>
    </dd>

-    <dt class="col-xl-6">{% trans 'friendships'|capfirst %}</dt>
-    <dd class="col-xl-6">
-        <a class="badge badge-secondary" href="{% url 'member:user_trust' user_object.pk %}">
-            <i class="fa fa-edit"></i>
-            {% trans 'Manage friendships' %} ({{ user_object.note.trusting.all|length }})
-        </a>
-    </dd>
-
    {% if "member.view_profile"|has_perm:user_object.profile %}
        <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
        <dd class="col-xl-6">{{ user_object.profile.section }}</dd>
@ -60,7 +52,10 @@
 {% if user_object.pk == user.pk %}
    <div class="text-center">
        <a class="small badge badge-secondary" href="{% url 'member:auth_token' %}">
-            <i class="fa fa-cogs"></i>{% trans 'API token' %}
+            <i class="fa fa-cogs"></i>&nbsp;{% trans 'API token' %}
+        </a>
+        <a class="small badge badge-secondary" href="{% url 'member:qr_code' user_object.pk %}">
+            <i class="fa fa-qrcode"></i>&nbsp;{% trans 'QR Code' %}
        </a>
    </div>
 {% endif %}
--- a/apps/member/templates/member/profile_trust.html
+++ b/apps/member/templates/member/profile_trust.html
@ -1,41 +0,0 @@
-{% extends "member/base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load static django_tables2 i18n %}
-
-{% block profile_content %}
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-        {% trans "Note friendships" %}
-    </h3>
-    <div class="card-body">
-        {% if can_create %}
-            <form class="input-group" method="POST" id="form_trust">
-                {% csrf_token %}
-                <input type="hidden" name="trusting" value="{{ object.note.pk }}">
-                {%include "autocomplete_model.html" %}
-                <div class="input-group-append">
-                    <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
-                </div>
-            </form>
-        {% endif %}
-    </div>
-    {% render_table trusting %}
-</div>
-
-<div class="alert alert-warning card">
-    {% blocktrans trimmed %}
-        Adding someone as a friend enables them to initiate transactions coming
-        from your account (while keeping your balance positive). This is
-        designed to simplify using note kfet transfers to transfer money between
-        users. The intent is that one person can make all transfers for a group of
-        friends without needing additional rights among them.
-    {% endblocktrans %}
-</div>
-{% endblock %}
-
-{% block extrajavascript %}
-<script src="{% static "member/js/trust.js" %}"></script>
-<script src="{% static "js/autocomplete_model.js" %}"></script>
-{% endblock%}
--- a/apps/member/templates/member/qr_code.html
+++ b/apps/member/templates/member/qr_code.html
@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+
+{% block content %}
+<div class="card bg-light">
+  	<h3 class="card-header text-center">
+		{% trans "QR Code for" %} {{ user_object.username }} ({{ user_object.first_name }} {{user_object.last_name }})
+  	</h3>
+  	<div class="text-center" id="qrcode">
+  	</div>
+</div>
+
+
+{% endblock %}
+
+{% block extrajavascript %}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js" integrity="sha512-CNgIRecGo7nphbeZ04Sc13ka07paqdeTu0WR1IM4kNcpmBAUSHSQX0FslNhTDadL4O5SAGapGt4FodqL8My0mA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+	var qrc = new QRCode(document.getElementById("qrcode"), {
+		text: "{{ user_object.pk }}\0",
+		width: 1024,
+		height: 1024
+	});
+</script>
+{% endblock %}
+
+{% block extracss %}
+<style>
+img {
+    width: 100%
+}
+</style>
+{% endblock %}
--- a/apps/member/tests/test_memberships.py
+++ b/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,
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@ -23,6 +23,6 @@ urlpatterns = [
    path('user/<int:pk>/update/', views.UserUpdateView.as_view(), name="user_update_profile"),
    path('user/<int:pk>/update_pic/', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"),
    path('user/<int:pk>/aliases/', views.ProfileAliasView.as_view(), name="user_alias"),
-    path('user/<int:pk>/trust', views.ProfileTrustView.as_view(), name="user_trust"),
    path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
+    path('user/<int:pk>/qr_code/', views.QRCodeView.as_view(), name='qr_code'),
 ]
--- a/apps/member/views.py
+++ b/apps/member/views.py
@ -8,7 +8,6 @@ from django.contrib.auth import logout
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.contrib.auth.views import LoginView
-from django.contrib.contenttypes.models import ContentType
 from django.db import transaction
 from django.db.models import Q, F
 from django.shortcuts import redirect
@ -19,9 +18,9 @@ from django.views.generic import DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
 from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
-from note.models import Alias, NoteClub, NoteUser, Trust
+from note.models import Alias, NoteUser, NoteClub
 from note.models.transactions import Transaction, SpecialTransaction
-from note.tables import HistoryTable, AliasTable, TrustTable
+from note.tables import HistoryTable, AliasTable
 from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
@ -244,39 +243,6 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
        return context


-class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    View and manage user trust relationships
-    """
-    model = User
-    template_name = 'member/profile_trust.html'
-    context_object_name = 'user_object'
-    extra_context = {"title": _("Note friendships")}
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        note = context['object'].note
-        context["trusting"] = TrustTable(
-            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
-        context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
-            trusting=context["object"].note,
-            trusted=context["object"].note
-        ))
-        context["widget"] = {
-            "name": "trusted",
-            "attrs": {
-                "model_pk": ContentType.objects.get_for_model(Alias).pk,
-                "class": "autocomplete form-control",
-                "id": "trusted",
-                "resetable": True,
-                "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
-                "name_field": "name",
-                "placeholder": ""
-            }
-        }
-        return context
-
-
 class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
    """
    View and manage user aliases.
@ -365,6 +331,14 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
        context['token'] = Token.objects.get_or_create(user=self.request.user)[0]
        return context

+class QRCodeView(LoginRequiredMixin, DetailView):
+    """
+    Affiche le QR Code
+    """
+    model = User
+    context_object_name = "user_object"
+    template_name = "member/qr_code.html"
+    extra_context = {"title": _("QR Code")}

 # ******************************* #
 #              CLUB               #
@ -753,10 +727,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
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@ -12,7 +12,7 @@ from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend
 from rest_framework.utils import model_meta

-from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, Trust
+from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias
 from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \
    RecurrentTransaction, SpecialTransaction

@ -77,22 +77,6 @@ class NoteUserSerializer(serializers.ModelSerializer):
        return str(obj)


-class TrustSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Trusts.
-    The djangorestframework plugin will analyse the model `Trust` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = Trust
-        fields = '__all__'
-
-    def validate(self, attrs):
-        instance = Trust(**attrs)
-        instance.clean()
-        return attrs
-
-
 class AliasSerializer(serializers.ModelSerializer):
    """
    REST API Serializer for Aliases.
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@ -2,8 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import NotePolymorphicViewSet, AliasViewSet, ConsumerViewSet, \
-    TemplateCategoryViewSet, TransactionViewSet, TransactionTemplateViewSet, \
-    TrustViewSet
+    TemplateCategoryViewSet, TransactionViewSet, TransactionTemplateViewSet


 def register_note_urls(router, path):
@ -12,7 +11,6 @@ def register_note_urls(router, path):
    """
    router.register(path + '/note', NotePolymorphicViewSet)
    router.register(path + '/alias', AliasViewSet)
-    router.register(path + '/trust', TrustViewSet)
    router.register(path + '/consumer', ConsumerViewSet)

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@ -14,9 +14,8 @@ from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSe
 from permission.backends import PermissionBackend

 from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\
-    TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer, \
-    TrustSerializer
-from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial, Trust
+    TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer
+from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial
 from ..models.transactions import TransactionTemplate, Transaction, TemplateCategory


@ -57,41 +56,11 @@ class NotePolymorphicViewSet(ReadProtectedModelViewSet):
        return queryset.order_by("id")


-class TrustViewSet(ReadProtectedModelViewSet):
-    """
-    REST Trust View set.
-    The djangorestframework plugin will get all `Trust` objects, serialize it to JSON with the given serializer,
-    then render it on /api/note/trust/
-    """
-    queryset = Trust.objects
-    serializer_class = TrustSerializer
-    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
-    search_fields = ['$trusting__alias__name', '$trusting__alias__normalized_name',
-                     '$trusted__alias__name', '$trusted__alias__normalized_name']
-    filterset_fields = ['trusting', 'trusting__noteuser__user', 'trusted', 'trusted__noteuser__user']
-    ordering_fields = ['trusting', 'trusted', ]
-
-    def get_serializer_class(self):
-        serializer_class = self.serializer_class
-        if self.request.method in ['PUT', 'PATCH']:
-            # trust relationship can't change people involved
-            serializer_class.Meta.read_only_fields = ('trusting', 'trusting',)
-        return serializer_class
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        try:
-            self.perform_destroy(instance)
-        except ValidationError as e:
-            return Response({e.code: str(e)}, status.HTTP_400_BAD_REQUEST)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class AliasViewSet(ReadProtectedModelViewSet):
    """
    REST API View set.
    The djangorestframework plugin will get all `Alias` objects, serialize it to JSON with the given serializer,
-    then render it on /api/note/aliases/
+    then render it on /api/aliases/
    """
    queryset = Alias.objects
    serializer_class = AliasSerializer
--- a/apps/note/migrations/0006_trust.py
+++ b/apps/note/migrations/0006_trust.py
@ -1,27 +0,0 @@
-# Generated by Django 2.2.24 on 2021-09-05 19:16
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0005_auto_20210313_1235'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Trust',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('trusted', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trusted', to='note.Note', verbose_name='trusted')),
-                ('trusting', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trusting', to='note.Note', verbose_name='trusting')),
-            ],
-            options={
-                'verbose_name': 'frienship',
-                'verbose_name_plural': 'friendships',
-                'unique_together': {('trusting', 'trusted')},
-            },
-        ),
-    ]
--- a/apps/note/models/init.py
+++ b/apps/note/models/init.py
@ -1,13 +1,13 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, Trust
+from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
 from .transactions import MembershipTransaction, Transaction, \
    TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction

 __all__ = [
    # Notes
-    'Alias', 'Trust', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser',
+    'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser',
    # Transactions
    'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate',
    'RecurrentTransaction', 'SpecialTransaction',
--- a/apps/note/models/notes.py
+++ b/apps/note/models/notes.py
@ -217,38 +217,6 @@ class NoteSpecial(Note):
        return self.special_type


-class Trust(models.Model):
-    """
-    A one-sided trust relationship bertween two users
-
-    If another user considers you as your friend, you can transfer money from
-    them
-    """
-
-    trusting = models.ForeignKey(
-        Note,
-        on_delete=models.CASCADE,
-        related_name='trusting',
-        verbose_name=_('trusting')
-    )
-
-    trusted = models.ForeignKey(
-        Note,
-        on_delete=models.CASCADE,
-        related_name='trusted',
-        verbose_name=_('trusted')
-    )
-
-    class Meta:
-        verbose_name = _("frienship")
-        verbose_name_plural = _("friendships")
-        unique_together = ("trusting", "trusted")
-
-    def __str__(self):
-        return _("Friendship between {trusting} and {trusted}").format(
-            trusting=str(self.trusting), trusted=str(self.trusted))
-
-
 class Alias(models.Model):
    """
    points toward  a :model:`note.NoteUser` or :model;`note.NoteClub` instance.
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend

-from .models.notes import Alias, Trust
+from .models.notes import Alias
 from .models.transactions import Transaction, TransactionTemplate
 from .templatetags.pretty_money import pretty_money

@ -148,31 +148,6 @@ DELETE_TEMPLATE = """
 """


-class TrustTable(tables.Table):
-    class Meta:
-        attrs = {
-            'class': 'table table condensed table-striped',
-            'id': "trust_table"
-        }
-        model = Trust
-        fields = ("trusted",)
-        template_name = 'django_tables2/bootstrap4.html'
-
-    show_header = False
-    trusted = tables.Column(attrs={'td': {'class': 'text_center'}})
-
-    delete_col = tables.TemplateColumn(
-        template_code=DELETE_TEMPLATE,
-        extra_context={"delete_trans": _('delete')},
-        attrs={
-            'td': {
-                'class': lambda record: 'col-sm-1'
-                + (' d-none' if not PermissionBackend.check_perm(
-                    get_current_request(), "note.delete_trust", record)
-                   else '')}},
-        verbose_name=_("Delete"),)
-
-
 class AliasTable(tables.Table):
    class Meta:
        attrs = {
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@ -1967,7 +1967,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]]",
+			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]]",
 			"type": "change",
 			"mask": 2,
 			"field": "valid",
@ -2607,7 +2607,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
 			"type": "change",
 			"mask": 2,
 			"field": "valid",
@ -2623,7 +2623,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
 			"type": "change",
 			"mask": 2,
 			"field": "invalidity_reason",
@ -2967,118 +2967,6 @@
 			"description": "Supprimer une application OAuth2"
 		}
 	},
-	{
-		"model": "permission.permission",
-		"pk": 190,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusting\": [\"user\", \"note\"]}",
-			"type": "delete",
-			"mask": 1,
-			"field": "",
-			"permanent": false,
-			"description": "Supprimer une amitié à sa note"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 191,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusting\": [\"user\", \"note\"]}",
-			"type": "add",
-			"mask": 1,
-			"field": "",
-			"permanent": false,
-			"description": "Ajouter une amitié à sa note"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 192,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusting__is_active\": true}",
-			"type": "add",
-			"mask": 1,
-			"field": "",
-			"permanent": false,
-			"description": "Ajouter une amitié à une note non bloquée"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 193,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusting__is_active\": true}",
-			"type": "delete",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Supprimer une amitié à une note non bloquée"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 194,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{}",
-			"type": "view",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Voir toutes les amitiés, y compris celles des non adhérents"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 195,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusting__noteuser__user\": [\"user\"]}",
-			"type": "view",
-			"mask": 1,
-			"field": "",
-			"permanent": true,
-			"description": "Voir ses propres amitiés, pour toujours"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 196,
-		"fields": {
-			"model": [
-				"note",
-				"transaction"
-			],
-			"query": "[\"AND\", {\"source__trusting__trusted\": [\"user\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]]}}, {\"valid\": false}]]",
-			"type": "add",
-			"mask": 1,
-			"field": "",
-			"permanent": false,
-			"description": "Transférer de l'argent depuis une note amie en restant positif"
-		}
-	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@ -3113,11 +3001,7 @@
 				186,
 				187,
 				188,
-				189,
-                190,
-                191,
-                195,
-                196
+				189
 			]
 		}
 	},
@ -3158,9 +3042,7 @@
 				158,
 				159,
 				160,
-				179,
-                189,
-                190
+				179
 			]
 		}
 	},
@ -3310,10 +3192,7 @@
 				176,
 				177,
 				178,
-                188,
-				183,
-                186,
-                187
+				183
 			]
 		}
 	},
@ -3507,14 +3386,7 @@
 				186,
 				187,
 				188,
-				189,
-                190,
-                191,
-                192,
-                193,
-                194,
-                195,
-                196
+				189
 			]
 		}
 	},
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@ -5,10 +5,10 @@ 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

+
 class SignUpForm(UserCreationForm):
    """
    Pre-register users with all information
@ -44,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):
@ -67,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,
@ -114,13 +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,
-        )
-
--- a/apps/registration/templates/registration/future_profile_detail.html
+++ b/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 %}
--- a/apps/registration/tests/test_registration.py
+++ b/apps/registration/tests/test_registration.py
@ -1,8 +1,6 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from datetime import date, timedelta
-
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.test import TestCase
@ -192,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",
@ -206,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",
@ -220,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",
@ -234,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="",
@ -251,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",
@ -277,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",
@ -292,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)
@ -314,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",
@ -329,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)
@ -337,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):
        """
--- a/apps/registration/views.py
+++ b/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:
-#        if fee > credit_amount and not soge:
+        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

--- a/apps/scripts
+++ b/apps/scripts
--- a/apps/treasury/migrations/0005_auto_20230129_2348.py
+++ b/apps/treasury/migrations/0005_auto_20230129_2348.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-01-29 22:48
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0004_auto_20211005_1544'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='bde',
-            field=models.CharField(choices=[('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='TotalistSpies', max_length=32, verbose_name='BDE'),
-        ),
-    ]
--- a/apps/treasury/migrations/0006_auto_20230414_1651.py
+++ b/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'),
-        ),
-    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -28,10 +28,8 @@ class Invoice(models.Model):

    bde = models.CharField(
        max_length=32,
-        default='SecretStorlist',
+        default='Saperlistpopette',
        choices=(
-            ('SecretStorlist', 'SecretStor[list]'),
-            ('TotalistSpies', 'Tota[list]Spies'),
            ('Saperlistpopette', 'Saper[list]popette'),
            ('Finalist', 'Fina[list]'),
            ('Listorique', '[List]orique'),
@ -97,7 +95,7 @@ class Invoice(models.Model):
        products = self.products.all()

        self.place = "Gif-sur-Yvette"
-        self.my_name = "BDE ENS Paris Saclay"
+        self.my_name = "BDE ENS Cachan"
        self.my_address_street = "4 avenue des Sciences"
        self.my_city = "91190 Gif-sur-Yvette"
        self.bank_code = 30003
@ -312,8 +310,8 @@ class SogeCredit(models.Model):
        amount = sum(transaction.total for transaction in self.transactions.all())
        if 'wei' in settings.INSTALLED_APPS:
            from wei.models import WEIMembership
-            if not WEIMembership.objects\
-                    .filter(club__weiclub__year=self.credit_transaction.created_at.year, user=self.user).exists():
+            if not WEIMembership.objects.filter(club__weiclub__year=datetime.date.today().year, user=self.user)\
+                    .exists():
                # 80 € for people that don't go to WEI
                amount += 8000
        return amount
@ -331,18 +329,17 @@ class SogeCredit(models.Model):
        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
-#                if m.transaction not in self.transactions.all():
-#                    self.transactions.add(m.transaction)
-#
-#        if kfet_qs.exists():
-#            m = kfet_qs.get()
-#            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-#                if m.transaction not in self.transactions.all():
-#                    self.transactions.add(m.transaction)
+        if bde_qs.exists():
+            m = bde_qs.get()
+            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
+                if m.transaction not in self.transactions.all():
+                    self.transactions.add(m.transaction)
+
+        if kfet_qs.exists():
+            m = kfet_qs.get()
+            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
+                if m.transaction not in self.transactions.all():
+                    self.transactions.add(m.transaction)

        if 'wei' in settings.INSTALLED_APPS:
            from wei.models import WEIClub
--- a/apps/treasury/static/img/SecretStorlist.png
+++ b/apps/treasury/static/img/SecretStorlist.png
--- a/apps/treasury/static/img/SecretStorlist_bg.jpg
+++ b/apps/treasury/static/img/SecretStorlist_bg.jpg
--- a/apps/treasury/static/img/TotalistSpies.png
+++ b/apps/treasury/static/img/TotalistSpies.png
--- a/apps/treasury/static/img/TotalistSpies_bg.jpg
+++ b/apps/treasury/static/img/TotalistSpies_bg.jpg
--- a/apps/treasury/templates/treasury/invoice_sample.tex
+++ b/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
    }
 }

--- a/apps/wei/forms/surveys/wei2022.py
+++ b/apps/wei/forms/surveys/wei2022.py
@ -14,17 +14,14 @@ 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'
+    '13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
+    'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
+    'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
+    'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
+    'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
+    'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
+    'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
+    'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
 ]


--- a/apps/wei/migrations/0004_auto_20220904_2325.py
+++ b/apps/wei/migrations/0004_auto_20220904_2325.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.26 on 2022-09-04 21:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0003_bus_size'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiclub',
-            name='year',
-            field=models.PositiveIntegerField(default=2022, unique=True, verbose_name='year'),
-        ),
-    ]
--- a/apps/wei/migrations/0005_auto_20230128_1850.py
+++ b/apps/wei/migrations/0005_auto_20230128_1850.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-01-28 17:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0004_auto_20220904_2325'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiclub',
-            name='year',
-            field=models.PositiveIntegerField(default=2023, unique=True, verbose_name='year'),
-        ),
-    ]
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-07 21:25+0200\n"
-"PO-Revision-Date: 2022-04-11 22:05+0200\n"
-"Last-Translator: bleizi <bleizi@crans.org>\n"
+"POT-Creation-Date: 2021-10-07 22:55+0200\n"
+"PO-Revision-Date: 2020-11-16 20:02+0000\n"
+"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Weblate 4.3.2\n"

 #: apps/activity/apps.py:10 apps/activity/models.py:151
 #: apps/activity/models.py:167
@ -56,7 +56,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 #: apps/member/models.py:199
 #: apps/member/templates/member/includes/club_info.html:4
 #: apps/member/templates/member/includes/profile_info.html:4
-#: apps/note/models/notes.py:263 apps/note/models/transactions.py:26
+#: apps/note/models/notes.py:231 apps/note/models/transactions.py:26
 #: apps/note/models/transactions.py:46 apps/note/models/transactions.py:301
 #: apps/permission/models.py:330
 #: apps/registration/templates/registration/future_profile_detail.html:16
@ -114,8 +114,8 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
 msgid "type"
 msgstr "type"

-#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:307
-#: apps/note/models/notes.py:148 apps/treasury/models.py:287
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
+#: 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,7 +258,7 @@ 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"

@ -295,7 +295,7 @@ msgstr "Invité supprimé"
 #: apps/note/models/transactions.py:257
 #: apps/note/templates/note/transaction_form.html:17
 #: apps/note/templates/note/transaction_form.html:152
-#: note_kfet/templates/base.html:72
+#: note_kfet/templates/base.html:73
 msgid "Transfer"
 msgstr "Virement"

@ -388,7 +388,7 @@ msgid "validate"
 msgstr "valider"

 #: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:64 apps/note/tables.py:220
+#: apps/logs/models.py:64 apps/note/tables.py:195
 msgid "edit"
 msgstr "modifier"

@ -400,7 +400,7 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

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

@ -466,9 +466,9 @@ msgstr "nouvelles données"
 msgid "create"
 msgstr "créer"

-#: apps/logs/models.py:65 apps/note/tables.py:166 apps/note/tables.py:190
-#: apps/note/tables.py:237 apps/permission/models.py:127
-#: apps/treasury/tables.py:38 apps/wei/tables.py:74
+#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:211
+#: apps/permission/models.py:127 apps/treasury/tables.py:38
+#: apps/wei/tables.py:74
 msgid "delete"
 msgstr "supprimer"

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

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

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

@ -547,16 +547,16 @@ msgstr "Taille maximale : 2 Mo"
 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:33 apps/registration/views.py:266
+#: apps/member/forms.py:141 apps/member/views.py:102
+#: 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."

@ -610,14 +610,14 @@ msgid "hash"
 msgstr "haché"

 #: apps/member/models.py:38
-#: apps/member/templates/member/includes/profile_info.html:43
+#: apps/member/templates/member/includes/profile_info.html:35
 #: apps/registration/templates/registration/future_profile_detail.html:40
 #: apps/wei/templates/wei/weimembership_form.html:44
 msgid "phone number"
 msgstr "numéro de téléphone"

 #: apps/member/models.py:45
-#: apps/member/templates/member/includes/profile_info.html:37
+#: apps/member/templates/member/includes/profile_info.html:29
 #: apps/registration/templates/registration/future_profile_detail.html:34
 #: apps/wei/templates/wei/weimembership_form.html:38
 msgid "section"
@ -705,14 +705,14 @@ msgid "Year of entry to the school (None if not ENS student)"
 msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)"

 #: apps/member/models.py:83
-#: apps/member/templates/member/includes/profile_info.html:47
+#: apps/member/templates/member/includes/profile_info.html:39
 #: apps/registration/templates/registration/future_profile_detail.html:37
 #: apps/wei/templates/wei/weimembership_form.html:41
 msgid "address"
 msgstr "adresse"

 #: apps/member/models.py:90
-#: apps/member/templates/member/includes/profile_info.html:50
+#: apps/member/templates/member/includes/profile_info.html:42
 #: apps/registration/templates/registration/future_profile_detail.html:43
 #: apps/wei/templates/wei/weimembership_form.html:47
 msgid "paid"
@ -784,7 +784,7 @@ msgstr "Activez votre compte Note Kfet"

 #: apps/member/models.py:204
 #: apps/member/templates/member/includes/club_info.html:55
-#: apps/member/templates/member/includes/profile_info.html:40
+#: apps/member/templates/member/includes/profile_info.html:32
 #: apps/registration/templates/registration/future_profile_detail.html:22
 #: apps/wei/templates/wei/base.html:70
 #: apps/wei/templates/wei/weimembership_form.html:20
@ -833,46 +833,46 @@ msgstr ""
 "Date maximale d'une fin d'adhésion, après laquelle les adhérents doivent la "
 "renouveler."

-#: apps/member/models.py:288 apps/member/models.py:313
+#: apps/member/models.py:286 apps/member/models.py:311
 #: apps/note/models/notes.py:176
 msgid "club"
 msgstr "club"

-#: apps/member/models.py:289
+#: apps/member/models.py:287
 msgid "clubs"
 msgstr "clubs"

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

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

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

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

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

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

-#: apps/member/models.py:507 apps/note/models/transactions.py:389
+#: apps/member/models.py:505 apps/note/models/transactions.py:389
 msgid "membership"
 msgstr "adhésion"

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

@ -924,7 +924,7 @@ msgid "Account #"
 msgstr "Compte n°"

 #: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:60
+#: apps/member/templates/member/base.html:62 apps/member/views.py:59
 #: apps/registration/templates/registration/future_profile_detail.html:48
 #: apps/wei/templates/wei/weimembership_form.html:117
 msgid "Update Profile"
@ -985,14 +985,13 @@ msgstr ""
 "seront à nouveau possible."

 #: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:287
-#: apps/member/views.py:517
+#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:253
+#: apps/member/views.py:456
 msgid "Note aliases"
 msgstr "Alias de la note"

 #: apps/member/templates/member/club_alias.html:20
 #: apps/member/templates/member/profile_alias.html:19
-#: apps/member/templates/member/profile_trust.html:19
 #: apps/treasury/tables.py:99
 #: apps/treasury/templates/treasury/sogecredit_list.html:34
 #: apps/treasury/templates/treasury/sogecredit_list.html:73
@ -1045,7 +1044,7 @@ msgid "membership fee"
 msgstr "cotisation pour adhérer"

 #: apps/member/templates/member/includes/club_info.html:43
-#: apps/member/templates/member/includes/profile_info.html:55
+#: apps/member/templates/member/includes/profile_info.html:47
 #: apps/treasury/templates/treasury/sogecredit_detail.html:24
 #: apps/wei/templates/wei/base.html:60
 msgid "balance"
@ -1053,7 +1052,7 @@ msgstr "solde du compte"

 #: apps/member/templates/member/includes/club_info.html:47
 #: apps/member/templates/member/includes/profile_info.html:20
-#: apps/note/models/notes.py:287 apps/wei/templates/wei/base.html:66
+#: apps/note/models/notes.py:255 apps/wei/templates/wei/base.html:66
 msgid "aliases"
 msgstr "alias"

@ -1077,16 +1076,7 @@ msgstr "mot de passe"
 msgid "Change password"
 msgstr "Changer le mot de passe"

-#: apps/member/templates/member/includes/profile_info.html:28
-#: apps/note/models/notes.py:244
-msgid "friendships"
-msgstr "amitiés"
-
-#: apps/member/templates/member/includes/profile_info.html:32
-msgid "Manage friendships"
-msgstr "Gérer les amitiés"
-
-#: apps/member/templates/member/includes/profile_info.html:63
+#: apps/member/templates/member/includes/profile_info.html:55
 msgid "API token"
 msgstr "Accès API"

@ -1158,23 +1148,6 @@ msgstr "Cliquez ici pour renvoyer un lien de validation."
 msgid "View my memberships"
 msgstr "Voir mes adhésions"

-#: apps/member/templates/member/profile_trust.html:10 apps/member/views.py:254
-msgid "Note friendships"
-msgstr "Amitiés note"
-
-#: apps/member/templates/member/profile_trust.html:28
-msgid ""
-"Adding someone as a friend enables them to initiate transactions coming from "
-"your account (while keeping your balance positive). This is designed to "
-"simplify using note kfet transfers to transfer money between users. The "
-"intent is that one person can make all transfers for a group of friends "
-"without needing additional rights among them."
-msgstr ""
-"Ajouter quelqu'un⋅e en ami⋅e lui permet de me prélever de l'argent (tant que "
-"ma note reste positive). Ceci sert à simplifier les remboursements entre "
-"ami⋅es via note. En effet, une personne peut effectuer tous les transferts "
-"sans posséder de droits supplémentaires."
-
 #: apps/member/templates/member/profile_update.html:18
 msgid "Save Changes"
 msgstr "Sauvegarder les changements"
@ -1183,47 +1156,47 @@ msgstr "Sauvegarder les changements"
 msgid "Registrations"
 msgstr "Inscriptions"

-#: apps/member/views.py:73 apps/registration/forms.py:23
+#: apps/member/views.py:72 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."

-#: apps/member/views.py:140
+#: apps/member/views.py:139
 msgid "Profile detail"
 msgstr "Détails de l'utilisateur"

-#: apps/member/views.py:206
+#: apps/member/views.py:205
 msgid "Search user"
 msgstr "Chercher un utilisateur"

-#: apps/member/views.py:308
+#: apps/member/views.py:273
 msgid "Update note picture"
 msgstr "Modifier la photo de la note"

-#: apps/member/views.py:354
+#: apps/member/views.py:319
 msgid "Manage auth token"
 msgstr "Gérer les jetons d'authentification"

-#: apps/member/views.py:381
+#: apps/member/views.py:346
 msgid "Create new club"
 msgstr "Créer un nouveau club"

-#: apps/member/views.py:400
+#: apps/member/views.py:365
 msgid "Search club"
 msgstr "Chercher un club"

-#: apps/member/views.py:433
+#: apps/member/views.py:398
 msgid "Club detail"
 msgstr "Détails du club"

-#: apps/member/views.py:540
+#: apps/member/views.py:479
 msgid "Update club"
 msgstr "Modifier le club"

-#: apps/member/views.py:574
+#: apps/member/views.py:513
 msgid "Add new member to the club"
 msgstr "Ajouter un nouveau membre au club"

-#: apps/member/views.py:703 apps/wei/views.py:973
+#: apps/member/views.py:642 apps/wei/views.py:973
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@ -1231,19 +1204,19 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."

-#: apps/member/views.py:725
+#: apps/member/views.py:664
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."

-#: apps/member/views.py:730
+#: apps/member/views.py:669
 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:815
 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:840
 msgid "Members of the club"
 msgstr "Membres du club"

@ -1261,7 +1234,7 @@ msgstr "destination"
 msgid "amount"
 msgstr "montant"

-#: apps/note/api/serializers.py:199 apps/note/api/serializers.py:205
+#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
 #: apps/note/models/transactions.py:228
 msgid ""
 "The transaction can't be saved since the source note or the destination note "
@ -1393,47 +1366,30 @@ msgstr "note spéciale"
 msgid "special notes"
 msgstr "notes spéciales"

-#: apps/note/models/notes.py:232
-msgid "trusting"
-msgstr "note"
-
-#: apps/note/models/notes.py:239
-msgid "trusted"
-msgstr "ami"
-
-#: apps/note/models/notes.py:243
-msgid "frienship"
-msgstr "amitié"
-
-#: apps/note/models/notes.py:248
-#, python-brace-format
-msgid "Friendship between {trusting} and {trusted}"
-msgstr "Amitié entre {trusting} et {trusted}"
-
-#: apps/note/models/notes.py:269
+#: apps/note/models/notes.py:237
 msgid "Invalid alias"
 msgstr "Alias invalide"

-#: apps/note/models/notes.py:286
+#: apps/note/models/notes.py:254
 msgid "alias"
 msgstr "alias"

-#: apps/note/models/notes.py:310
+#: apps/note/models/notes.py:278
 msgid "Alias is too long."
 msgstr "L'alias est trop long."

-#: apps/note/models/notes.py:313
+#: apps/note/models/notes.py:281
 msgid ""
 "This alias contains only complex character. Please use a more simple alias."
 msgstr ""
 "Cet alias ne contient que des caractères complexes. Merci d'utiliser un "
 "alias plus simple."

-#: apps/note/models/notes.py:317
+#: apps/note/models/notes.py:285
 msgid "An alias with a similar name already exists: {} "
 msgstr "Un alias avec un nom similaire existe déjà : {} "

-#: apps/note/models/notes.py:331
+#: apps/note/models/notes.py:299
 msgid "You can't delete your main alias."
 msgstr "Vous ne pouvez pas supprimer votre alias principal."

@ -1563,7 +1519,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"

@ -1579,8 +1535,7 @@ msgstr "Cliquez pour valider"
 msgid "No reason specified"
 msgstr "Pas de motif spécifié"

-#: apps/note/tables.py:173 apps/note/tables.py:194 apps/note/tables.py:239
-#: apps/treasury/tables.py:39
+#: apps/note/tables.py:169 apps/note/tables.py:213 apps/treasury/tables.py:39
 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
 #: apps/treasury/templates/treasury/sogecredit_detail.html:65
 #: apps/wei/tables.py:75 apps/wei/tables.py:118
@ -1591,7 +1546,7 @@ msgstr "Pas de motif spécifié"
 msgid "Delete"
 msgstr "Supprimer"

-#: apps/note/tables.py:222 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
 #: apps/wei/tables.py:49 apps/wei/tables.py:50
 #: apps/wei/templates/wei/base.html:89
 #: apps/wei/templates/wei/bus_detail.html:20
@ -1601,7 +1556,7 @@ msgstr "Supprimer"
 msgid "Edit"
 msgstr "Éditer"

-#: apps/note/tables.py:226 apps/note/tables.py:253
+#: apps/note/tables.py:201 apps/note/tables.py:224
 msgid "Hide/Show"
 msgstr "Afficher/Masquer"

@ -1682,7 +1637,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"

@ -1762,7 +1717,7 @@ msgstr "Chercher un bouton"
 msgid "Update button"
 msgstr "Modifier le bouton"

-#: apps/note/views.py:151 note_kfet/templates/base.html:66
+#: apps/note/views.py:151 note_kfet/templates/base.html:67
 msgid "Consumptions"
 msgstr "Consommations"

@ -1960,7 +1915,7 @@ msgstr ""
 "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
 "avec ces paramètres. Merci de les corriger et de réessayer."

-#: apps/permission/views.py:112 note_kfet/templates/base.html:108
+#: apps/permission/views.py:112 note_kfet/templates/base.html:109
 msgid "Rights"
 msgstr "Droits"

@ -1976,6 +1931,22 @@ msgstr "inscription"
 msgid "This email address is already used."
 msgstr "Cet email est déjà pris."

+#: 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"
@ -1997,10 +1968,6 @@ msgstr "Adhérer au club BDE"
 msgid "Join Kfet Club"
 msgstr "Adhérer au club Kfet"

-#: apps/registration/forms.py:122
-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 +2016,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,62 +2071,62 @@ 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"

-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:96
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:97
 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 +2139,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 +2155,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:433
+#: 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 +2272,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:454
+#: 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:455
+#: 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:458
+#: 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}"
@ -2563,7 +2530,7 @@ msgstr "Gérer les crédits de la Société générale"

 #: apps/wei/apps.py:10 apps/wei/models.py:50 apps/wei/models.py:51
 #: apps/wei/models.py:62 apps/wei/models.py:180
-#: note_kfet/templates/base.html:102
+#: note_kfet/templates/base.html:103
 msgid "WEI"
 msgstr "WEI"

@ -2571,7 +2538,7 @@ msgstr "WEI"
 msgid "The selected user is not validated. Please validate its account first"
 msgstr ""
 "L'utilisateur sélectionné n'est pas validé. Merci de d'abord valider son "
-"compte"
+"compte."

 #: apps/wei/forms/registration.py:59 apps/wei/models.py:126
 #: apps/wei/models.py:323
@ -2612,7 +2579,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
 msgid "Choose a word:"
 msgstr "Choisissez un mot :"

@ -3173,19 +3140,19 @@ msgstr "Répartir les 1A dans les bus"
 msgid "Attribute bus"
 msgstr "Attribuer un bus"

-#: note_kfet/settings/base.py:172
+#: note_kfet/settings/base.py:161
 msgid "German"
 msgstr "Allemand"

-#: note_kfet/settings/base.py:173
+#: note_kfet/settings/base.py:162
 msgid "English"
 msgstr "Anglais"

-#: note_kfet/settings/base.py:174
+#: note_kfet/settings/base.py:163
 msgid "Spanish"
 msgstr "Espagnol"

-#: note_kfet/settings/base.py:175
+#: note_kfet/settings/base.py:164
 msgid "French"
 msgstr "Français"

@ -3242,7 +3209,7 @@ msgstr ""
 "erreur, qui sera corrigée rapidement. Vous pouvez désormais aller boire une "
 "bière."

-#: note_kfet/templates/autocomplete_model.html:15
+#: note_kfet/templates/autocomplete_model.html:14
 msgid "Reset"
 msgstr "Réinitialiser"

@ -3250,34 +3217,34 @@ msgstr "Réinitialiser"
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "La note du BDE de l'ENS Paris-Saclay."

-#: note_kfet/templates/base.html:78
+#: note_kfet/templates/base.html:79
 msgid "Users"
 msgstr "Utilisateurs"

-#: note_kfet/templates/base.html:84
+#: note_kfet/templates/base.html:85
 msgid "Clubs"
 msgstr "Clubs"

-#: note_kfet/templates/base.html:113
+#: note_kfet/templates/base.html:114
 msgid "Admin"
 msgstr "Admin"

-#: note_kfet/templates/base.html:127
+#: note_kfet/templates/base.html:128
 msgid "My account"
 msgstr "Mon compte"

-#: note_kfet/templates/base.html:130
+#: note_kfet/templates/base.html:131
 msgid "Log out"
 msgstr "Se déconnecter"

-#: note_kfet/templates/base.html:138
+#: note_kfet/templates/base.html:139
 #: note_kfet/templates/registration/signup.html:6
 #: note_kfet/templates/registration/signup.html:11
 #: note_kfet/templates/registration/signup.html:28
 msgid "Sign up"
 msgstr "Inscription"

-#: note_kfet/templates/base.html:145
+#: note_kfet/templates/base.html:146
 #: note_kfet/templates/registration/login.html:6
 #: note_kfet/templates/registration/login.html:15
 #: note_kfet/templates/registration/login.html:38
@ -3285,7 +3252,7 @@ msgstr "Inscription"
 msgid "Log in"
 msgstr "Se connecter"

-#: note_kfet/templates/base.html:159
+#: note_kfet/templates/base.html:160
 msgid ""
 "You are not a BDE member anymore. Please renew your membership if you want "
 "to use the note."
@ -3293,7 +3260,7 @@ msgstr ""
 "Vous n'êtes plus adhérent BDE. Merci de réadhérer si vous voulez profiter de "
 "la note."

-#: note_kfet/templates/base.html:165
+#: note_kfet/templates/base.html:166
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@ -3301,7 +3268,7 @@ msgstr ""
 "Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail "
 "et de cliquer sur le lien de validation."

-#: note_kfet/templates/base.html:171
+#: note_kfet/templates/base.html:172
 msgid ""
 "You declared that you opened a bank account in the Société générale. The "
 "bank did not validate the creation of the account to the BDE, so the "
@ -3315,18 +3282,14 @@ msgstr ""
 "vérification peut durer quelques jours. Merci de vous assurer de bien aller "
 "au bout de vos démarches."

-#: note_kfet/templates/base.html:194
+#: note_kfet/templates/base.html:195
 msgid "Contact us"
 msgstr "Nous contacter"

-#: note_kfet/templates/base.html:196
+#: note_kfet/templates/base.html:197
 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 …"
@ -3554,18 +3517,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."
--- a/note.cron
+++ b/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
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -252,7 +252,7 @@ REST_FRAMEWORK = {
        'rest_framework.authentication.TokenAuthentication',
        'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
    ],
-    'DEFAULT_PAGINATION_CLASS': 'apps.api.pagination.CustomPagination',
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
    'PAGE_SIZE': 20,
 }

--- a/note_kfet/static/css/custom.css
+++ b/note_kfet/static/css/custom.css
@ -65,10 +65,7 @@ mark {

 /* Last BDE colors */
 .bg-primary {
-/*    background-color: rgb(18, 67, 4) !important; */
-/* MODE VIEUXCON=ON */
-/*    background-color: rgb(166, 0, 2) !important; */
-    background-color: rgb(0, 0, 0) !important;
+    background-color: rgb(18, 67, 4) !important;
 }

 html {
@ -83,15 +80,15 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-   color:  rgb(241, 229, 52);
-    background-color: rgb(228, 35, 132);
-    border-color: rgb(228, 35, 132);
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }

 .btn-outline-primary {
-    color: #fff;
-    background-color: #000;
-    border-color: #464647;
+    color: rgb(18, 67, 46);
+    background-color: rgba(248, 249, 250, 0.9);
+    border-color: rgb(18, 67, 46);
 }

 .turbolinks-progress-bar {
@ -101,63 +98,36 @@ body {
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color:  rgb(241, 229, 52);
-    background-color: rgb(228, 35, 132);
-    border-color: rgb(228, 35, 132);
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }

 .btn-primary {
-    color:  #fff; 
-    background-color: #000;
-    border-color: #adb5bd;
+    color: rgba(248, 249, 250, 0.9); 
+    background-color: rgb(28, 114, 10);
+    border-color: rgb(18, 67, 46);
 }

 .border-primary {
-    border-color: rgb(228, 35, 132) !important; 
+    border-color: rgb(28, 114, 10) !important; 
 }

-.btn-secondary {
-    color:  #fff;
-    background-color: #000;
-    border-color: #adb5bd;
-}
-
-.btn-secondary:hover,
-.btn-secondary:not(:disabled):not(.disabled).active,
-.btn-secondary:not(:disabled):not(.disabled):active {
-    color:  rgb(241, 229, 52);
-    background-color: rgb(228, 35, 132);
-    border-color: rgb(228, 35, 132);
-}
-
-
-.btn-outline-dark {
-    color: #343a40;
-    border-color: #343a40;
-}
-
-.btn-outline-dark:hover,
-.btn-outline-dark:not(:disabled):not(.disabled).active,
-.btn-outline-dark:not(:disabled):not(.disabled):active {
-    color:  rgb(241, 229, 52);
-    background-color: rgb(228, 35, 132);
-    border-color: rgb(228, 35, 132);
-}
-
-
 a {
-    color: rgb(228, 35, 132);
+    color: rgb(28, 114, 10);
 }

 a:hover {
-    color: rgb(228, 35, 132);
+    color: rgb(122, 163, 75);
 }

 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
-    border-color: rgb(228, 35, 132);
+    box-shadow: 0 0 0 0.25rem rgba(122, 163, 75, 0.25);
+    border-color: rgb(122, 163, 75);
 }

 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);
+  box-shadow: 0 0 0 0.25rem rgba(122, 163, 75, 0.5);
 }
+
+
--- a/note_kfet/static/js/autocomplete_model.js
+++ b/note_kfet/static/js/autocomplete_model.js
@ -13,29 +13,21 @@ $(document).ready(function () {
    $('#' + prefix + '_reset').removeClass('d-none')

    $.getJSON(api_url + (api_url.includes('?') ? '&' : '?') + 'format=json&search=^' + input + api_url_suffix, function (objects) {
-      let html = '<ul class="list-group list-group-flush" id="' + prefix + '_list">'
+      let html = ''

      objects.results.forEach(function (obj) {
        html += li(prefix + '_' + obj.id, obj[name_field])
      })
-      html += '</ul>'

-      target.tooltip({
-        html: true,
-        placement: 'bottom',
-        trigger: 'manual',
-        container: target.parent(),
-        fallbackPlacement: 'clockwise'
-      })
-
-      target.attr("data-original-title", html).tooltip("show")
+      const results_list = $('#' + prefix + '_list')
+      results_list.html(html)

      objects.results.forEach(function (obj) {
        $('#' + prefix + '_' + obj.id).click(function () {
          target.val(obj[name_field])
          $('#' + prefix + '_pk').val(obj.id)

-          target.tooltip("hide")
+          results_list.html('')
          target.removeClass('is-invalid')
          target.addClass('is-valid')

@ -45,8 +37,8 @@ $(document).ready(function () {
        if (input === obj[name_field]) { $('#' + prefix + '_pk').val(obj.id) }
      })

-      if (objects.results.length === 1 && e.originalEvent.keyCode >= 32) {
-        $('#' + prefix + '_' + objects.results[0].id).trigger('click')
+      if (results_list.children().length === 1 && e.originalEvent.keyCode >= 32) {
+        results_list.children().first().trigger('click')
      }
    })
  })
--- a/note_kfet/templates/autocomplete_model.html
+++ b/note_kfet/templates/autocomplete_model.html
@ -9,9 +9,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
   name="{{ widget.name }}_name" autocomplete="off"
    {% for name, value in widget.attrs.items %}
        {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
-    {% endfor %}
-    aria-describedby="{{widget.attrs.id}}_tooltip">
+    {% endfor %}>
    {% if widget.resetable %}
        <a id="{{ widget.attrs.id }}_reset" class="btn btn-light autocomplete-reset{% if not widget.value %} d-none{% endif %}">{% trans "Reset" %}</a>
    {% endif %}
-
+<ul class="list-group list-group-flush" id="{{ widget.attrs.id }}_list">
+</ul>
--- a/note_kfet/templates/base.html
+++ b/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"
--- a/note_kfet/templates/registration/signup.html
+++ b/note_kfet/templates/registration/signup.html
@ -23,11 +23,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
            {% csrf_token %}
            {{ form|crispy }}
            {{ profile_form|crispy }}
-            {% comment "Soge not for membership (only WEI)" %} {{ soge_form|crispy }} {% endcomment %}
+            {{ soge_form|crispy }}
            <button class="btn btn-success" type="submit">
                {% trans "Sign up" %}
            </button>
        </form>
    </div>
 </div>
-{% endblock %}
+{% endblock %}
Author	SHA1	Message	Date
Nicolas Margulies	e6f3084588	Added a first pass for automatically entering an activity with a qrcode	2023-10-11 18:01:51 +02:00
otthorn	145e55da75	remove useless comment	2022-03-22 15:06:04 +01:00
otthorn	d3ba95cdca	Insecable space for more clarity	2022-03-22 15:04:41 +01:00
otthorn	8ffb0ebb56	Use DetailView	2022-03-22 14:59:01 +01:00
otthorn	5038af9e34	Final html template	2022-03-22 14:58:26 +01:00
otthorn	819b4214c9	Add QRCode View, URL and test template	2022-03-22 12:26:44 +01:00
otthorn	b8a93b0b75	Add link to QR code	2022-03-19 16:25:15 +01:00