diff --git a/apps/activity/__init__.py b/apps/activity/__init__.py
index 195d53023dbb2e82edfce87166c8373532cd3e77..efee956350feca02a14672944068b2d733bcdd23 100644
--- a/apps/activity/__init__.py
+++ b/apps/activity/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'activity.apps.ActivityConfig'
diff --git a/apps/activity/admin.py b/apps/activity/admin.py
index 257705eba7def9eb708d9d208e8ad83f1c64babf..d8fb61063ea0d23e9fef7889052b8ac54c442bf7 100644
--- a/apps/activity/admin.py
+++ b/apps/activity/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib import admin
diff --git a/apps/activity/api/serializers.py b/apps/activity/api/serializers.py
index d259324d1acbcad6c5e65e4e672c220097fb2251..5f0da651b845d61bad51251fab944fc877d9912f 100644
--- a/apps/activity/api/serializers.py
+++ b/apps/activity/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/activity/api/urls.py b/apps/activity/api/urls.py
index be76993254c03330d0873c7e65d434a92cb7a3d3..6680201fb039367043a2d946b9e53dc4e165e29d 100644
--- a/apps/activity/api/urls.py
+++ b/apps/activity/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet
diff --git a/apps/activity/api/views.py b/apps/activity/api/views.py
index 998c3ce4e1e52b2dd6514b35f053b6eecdc7d0dc..ae9347c7d906a89398676e5c7a1acbbc256767ad 100644
--- a/apps/activity/api/views.py
+++ b/apps/activity/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from api.viewsets import ReadProtectedModelViewSet
diff --git a/apps/activity/apps.py b/apps/activity/apps.py
index bb72947f861f74172ecba66202f39e6eef6e5057..e1f7ba7024171777135268fe680c093ca1d1ec26 100644
--- a/apps/activity/apps.py
+++ b/apps/activity/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/activity/forms.py b/apps/activity/forms.py
index cf9bc3fc1d807e70a5adebb00733b5883ece1323..60c1831147919c11f1a053432140cc4bd2d13209 100644
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import timedelta
diff --git a/apps/activity/models.py b/apps/activity/models.py
index 67b16466d4ab6e015db3b639bb74dfd59ef2e621..f8e5fab9e33fe41539787dba399db2c3d5fe1f07 100644
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import os
diff --git a/apps/activity/tables.py b/apps/activity/tables.py
index e1c4817cf584476c0f5469d440d2fa8f61fd04b8..a3189a79c214eb1650fa050e15e62641f9967c63 100644
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.utils import timezone
from django.utils.html import format_html
diff --git a/apps/activity/tests/test_activities.py b/apps/activity/tests/test_activities.py
index 15635a6b7ef37fd98e410b3b040a9873ee17a73b..1fcc7769f40d870c9645aeaf2921539388d9cf7c 100644
--- a/apps/activity/tests/test_activities.py
+++ b/apps/activity/tests/test_activities.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import timedelta
diff --git a/apps/activity/urls.py b/apps/activity/urls.py
index 155229d4e269f3d75662a45c15e999826fb8e166..73e4a385431c6a6c6414dff0e71d786463c82bfb 100644
--- a/apps/activity/urls.py
+++ b/apps/activity/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/activity/views.py b/apps/activity/views.py
index 4a152e07dbece8b2083d60de3ab3bd7ff91391fd..86914caf95e6063c562a6edb6dc10372350b4bb0 100644
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from hashlib import md5
diff --git a/apps/api/__init__.py b/apps/api/__init__.py
index 1b17aec62c98e038bdaf4d806f46da8fbaf1eca1..bfa0f07db77e592f5d13fed6661c867732c77d7d 100644
--- a/apps/api/__init__.py
+++ b/apps/api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'api.apps.APIConfig'
diff --git a/apps/api/apps.py b/apps/api/apps.py
index 11d78652eaddc30348c6ad273bed1c13ff123908..ebce358c6dbb94bf6f6a5cd9bd105498ac22bf0b 100644
--- a/apps/api/apps.py
+++ b/apps/api/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/api/serializers.py b/apps/api/serializers.py
index c5e6f2b30f0cd6f1b3ac814529fefb4cb11565aa..f91132d58d62d7d0f857e5a87cccd9684452bf6f 100644
--- a/apps/api/serializers.py
+++ b/apps/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/apps/api/tests.py b/apps/api/tests.py
index 9fa371e7cf511fb03d8c31dbce01131e61578a12..36de0658b3bb6ada772c14973ad85c61590f048d 100644
--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import json
diff --git a/apps/api/urls.py b/apps/api/urls.py
index 3e61d5876081e05dbac3ac8515ec8c033adc037b..5d8b8b98d12fe6be4519a98e5c0e3486f1e2b068 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/apps/api/viewsets.py b/apps/api/viewsets.py
index 88ee7f01f33d03dfe183304f55e723d2a3cc1fbf..25221cfcee4dcfd234c6089d97a716709181e4e5 100644
--- a/apps/api/viewsets.py
+++ b/apps/api/viewsets.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.contenttypes.models import ContentType
diff --git a/apps/logs/__init__.py b/apps/logs/__init__.py
index 58ee5b085c8efabe9785c69ef048e63030fc7a80..708d35dfc73343446f1acc77685a02264f2ce601 100644
--- a/apps/logs/__init__.py
+++ b/apps/logs/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'logs.apps.LogsConfig'
diff --git a/apps/logs/api/serializers.py b/apps/logs/api/serializers.py
index c76e3a5d8d43c0f52ef17f14971d88f864cb6580..f861bd2141cef7389993cf2a359b3f4de63eb890 100644
--- a/apps/logs/api/serializers.py
+++ b/apps/logs/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/logs/api/urls.py b/apps/logs/api/urls.py
index 9a0ceaa8cec01b81f5bf5646bec374ab16199a42..d0044c9ba8b62f98a909e2c03816ffb00c97ae28 100644
--- a/apps/logs/api/urls.py
+++ b/apps/logs/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import ChangelogViewSet
diff --git a/apps/logs/api/views.py b/apps/logs/api/views.py
index 5f28b71c83ec62485e376f42c34a3ba3d0a7292d..eab1f1e47a941cb9da72d9db447d20262138b032 100644
--- a/apps/logs/api/views.py
+++ b/apps/logs/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django_filters.rest_framework import DjangoFilterBackend
diff --git a/apps/logs/apps.py b/apps/logs/apps.py
index 239f86cf45cd58326ae68e2349b0c1e6421dd307..bdf52d5e55ff2727b78ea5e18c585699f2d659ea 100644
--- a/apps/logs/apps.py
+++ b/apps/logs/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/logs/models.py b/apps/logs/models.py
index 0077af72ed66d2043490dd2bf09032d95159589a..65a234860e60650fb366b669043548e283f7fba6 100644
--- a/apps/logs/models.py
+++ b/apps/logs/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/apps/logs/signals.py b/apps/logs/signals.py
index b0b4d2c2035fd9aea965a179c092670c15be38ba..862dbd751c9e5ca32394148b29c01482c194eeb3 100644
--- a/apps/logs/signals.py
+++ b/apps/logs/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.contenttypes.models import ContentType
diff --git a/apps/member/__init__.py b/apps/member/__init__.py
index 298d1dda62f47f954a4df4922cf24ed6f16598e8..ae68f6ce240942b7a01dd5add84bac8a5017a55b 100644
--- a/apps/member/__init__.py
+++ b/apps/member/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'member.apps.MemberConfig'
diff --git a/apps/member/admin.py b/apps/member/admin.py
index 7936f56425d1693b2cdddd621796dc8eeddfa215..b3352c1a2ab8d7b32768e3439e6fa557a630fc74 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib import admin
diff --git a/apps/member/api/serializers.py b/apps/member/api/serializers.py
index 19b2ff6778e2160cb88bffdb0a02ea58013679a7..ef1c586dd1ddc467106032c0862a462e1fb32616 100644
--- a/apps/member/api/serializers.py
+++ b/apps/member/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/member/api/urls.py b/apps/member/api/urls.py
index 5fa544727000f31f154cfecd1b4ae8db4869ef04..c55b096912c65aaa049bb2232fc6ad2b9372927b 100644
--- a/apps/member/api/urls.py
+++ b/apps/member/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import ProfileViewSet, ClubViewSet, MembershipViewSet
diff --git a/apps/member/api/views.py b/apps/member/api/views.py
index 69943c7f92edfb9178e72455579665cbe0dbf3de..4312750738606435dfdd7f6b5515a027e92f7505 100644
--- a/apps/member/api/views.py
+++ b/apps/member/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django_filters.rest_framework import DjangoFilterBackend
diff --git a/apps/member/apps.py b/apps/member/apps.py
index 83dfbc405c09191d1e5333f55f89c6c7aa36c694..1090c07295e0b827a2a5d0705741b9e487a8f206 100644
--- a/apps/member/apps.py
+++ b/apps/member/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/member/forms.py b/apps/member/forms.py
index 05940a06861f9da996b8a1edb64aadfcdcc41886..ab24ded62c2d72d6b30379089f74229dd33c6ca3 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import io
diff --git a/apps/member/hashers.py b/apps/member/hashers.py
index f7e4342f41f672b0d281c52a9c1d3cd008fcc7c2..99b2c30ee2771061e4ae3717c6134a95c1f233e2 100644
--- a/apps/member/hashers.py
+++ b/apps/member/hashers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import hashlib
diff --git a/apps/member/models.py b/apps/member/models.py
index e5fa23ef4a2df4372d1a2f0965ce58428072a31a..2564190ae770b6e49da24d285d35852df890b4ca 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import datetime
diff --git a/apps/member/signals.py b/apps/member/signals.py
index d590f44608895b0a543fabca85d51b2b065e13ec..197c64134a5d6b85e6579a907b62d855a1c07045 100644
--- a/apps/member/signals.py
+++ b/apps/member/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/apps/member/tables.py b/apps/member/tables.py
index a9676928cd9985619345c08992fc6baf4854df08..d97da7caaf020ed3a9e75dadb0defcc2fb7a9835 100644
--- a/apps/member/tables.py
+++ b/apps/member/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/member/templatetags/memberinfo.py b/apps/member/templatetags/memberinfo.py
index d2b4986a0a3528c46f75796d7d45da98530043f6..f528677ee1cdc1c058e7df1ff10bd39c94eb7ddc 100644
--- a/apps/member/templatetags/memberinfo.py
+++ b/apps/member/templatetags/memberinfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/member/tests/test_login.py b/apps/member/tests/test_login.py
index c9fabf82333a238502867c8acf1cdc1ce51c9ce1..b8873a1432b6bff41b40ea46375ce955fc8b61cd 100644
--- a/apps/member/tests/test_login.py
+++ b/apps/member/tests/test_login.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
from django.contrib.auth.models import User
diff --git a/apps/member/tests/test_memberships.py b/apps/member/tests/test_memberships.py
index 1bbae1c7540028fe5fd5166efe5f427369190976..2dc6dd41a46c26ea712270c4dc45ac8d50a612e3 100644
--- a/apps/member/tests/test_memberships.py
+++ b/apps/member/tests/test_memberships.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import hashlib
diff --git a/apps/member/urls.py b/apps/member/urls.py
index 359a88464f0f576bcdbb78a948d5a9f3a7e37e1a..b1c537d577ec3c392e0b02fb728ea39f960797bc 100644
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/member/views.py b/apps/member/views.py
index 57e4b1e05909f853ca52efd33bf33446fbff9786..514c0644acc4e141872c24b69a787b488536f65d 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import timedelta, date
@@ -625,9 +625,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
# Retrieve form data
credit_type = form.cleaned_data["credit_type"]
credit_amount = form.cleaned_data["credit_amount"]
- last_name = form.cleaned_data["last_name"]
- first_name = form.cleaned_data["first_name"]
- bank = form.cleaned_data["bank"]
soge = form.cleaned_data["soge"] and not user.profile.soge and (club.name == "BDE" or club.name == "Kfet")
if not credit_type:
@@ -658,8 +655,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
if club.name != "Kfet" and club.parent_club and not Membership.objects.filter(
user=form.instance.user,
club=club.parent_club,
- date_start__lte=timezone.now(),
- date_end__gte=club.parent_club.membership_end,
+ date_start__gte=club.parent_club.membership_start,
).exists():
form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
error = True
@@ -674,17 +670,9 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
.format(form.instance.club.membership_end))
error = True
- if credit_amount:
- if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
- if not last_name:
- form.add_error('last_name', _("This field is required."))
- error = True
- if not first_name:
- form.add_error('first_name', _("This field is required."))
- error = True
- if not bank and credit_type.special_type == "Chèque":
- form.add_error('bank', _("This field is required."))
- error = True
+ if credit_amount and not SpecialTransaction.validate_payment_form(form):
+ # Check that special information for payment are filled
+ error = True
return not error
diff --git a/apps/note/__init__.py b/apps/note/__init__.py
index f7c331b2dbe800989aa5662518bfaec1e54dbf81..d3b96f094a96591a5bff5900d84f7d14601941ea 100644
--- a/apps/note/__init__.py
+++ b/apps/note/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'note.apps.NoteConfig'
diff --git a/apps/note/admin.py b/apps/note/admin.py
index eee49feb0b92491d748fda1d94202aa1ca89a0ad..eb0f0f3c1d5dd0beb9fdf5887ebf1b8fa1cb410a 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib import admin
diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py
index 0f2a2d724a1b3bcf65ee0a1e83906d57d768582b..f4905103aee94a8f02cfd9aaf7a370dd7bcec4fc 100644
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/apps/note/api/urls.py b/apps/note/api/urls.py
index 2f3fd1a966d7418593688fd213b269cf1ca89474..bacf3d32f7586a1d69f46648c1c8c47b5179dc86 100644
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import NotePolymorphicViewSet, AliasViewSet, ConsumerViewSet, \
diff --git a/apps/note/api/views.py b/apps/note/api/views.py
index 517450c7eb51f1dee6eedc156fa4720d627ba737..594b2b9c54238f0adcf8685601da3d65a2cc2618 100644
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
@@ -74,7 +74,7 @@ class AliasViewSet(ReadProtectedModelViewSet):
serializer_class = self.serializer_class
if self.request.method in ['PUT', 'PATCH']:
# alias owner cannot be change once establish
- setattr(serializer_class.Meta, 'read_only_fields', ('note',))
+ serializer_class.Meta.read_only_fields = ('note',)
return serializer_class
def destroy(self, request, *args, **kwargs):
@@ -82,7 +82,7 @@ class AliasViewSet(ReadProtectedModelViewSet):
try:
self.perform_destroy(instance)
except ValidationError as e:
- return Response({e.code: e.message}, status.HTTP_400_BAD_REQUEST)
+ return Response({e.code: str(e)}, status.HTTP_400_BAD_REQUEST)
return Response(status=status.HTTP_204_NO_CONTENT)
def get_queryset(self):
diff --git a/apps/note/apps.py b/apps/note/apps.py
index af1dcc12922cda6219315f4dfb8e2ff1e02467d4..435fedf844d5ae6c6f4ea3b7cd68af9ba94ec2c2 100644
--- a/apps/note/apps.py
+++ b/apps/note/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/note/forms.py b/apps/note/forms.py
index e4e976e1da11108da5d91b4f71fbf0b2034557f5..791abb51c3ec06dd73f4fdc561d4155880e612e0 100644
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import datetime
diff --git a/apps/note/models/__init__.py b/apps/note/models/__init__.py
index e9c8a0a9f28d15f586e4398a0f29406bdf1aec01..07a1d6e0db973d8743c0e800494dba64ab4b19f1 100644
--- a/apps/note/models/__init__.py
+++ b/apps/note/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# 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
diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py
index 7b034d58c3a943ef4a6cab96bada0c8e1f53e4f9..f760882bd93fd9d5a473a637089450d86899119a 100644
--- a/apps/note/models/notes.py
+++ b/apps/note/models/notes.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import unicodedata
from django.conf import settings
-from django.conf.global_settings import DEFAULT_FROM_EMAIL
from django.core.exceptions import ValidationError
from django.core.mail import send_mail
from django.core.validators import RegexValidator
@@ -190,8 +189,8 @@ class NoteClub(Note):
def send_mail_negative_balance(self):
plain_text = render_to_string("note/mails/negative_balance.txt", dict(note=self))
html = render_to_string("note/mails/negative_balance.html", dict(note=self))
- send_mail("[Note Kfet] Passage en négatif (club {})".format(self.club.name), plain_text, DEFAULT_FROM_EMAIL,
- [self.club.email], html_message=html)
+ send_mail("[Note Kfet] Passage en négatif (club {})".format(self.club.name), plain_text,
+ settings.DEFAULT_FROM_EMAIL, [self.club.email], html_message=html)
class NoteSpecial(Note):
diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index ac236ffefbc3689fa44bb647f7e56ee922ef58fa..3c6b4c7ddc38419bb692fc098515a2ca9080e38d 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.core.exceptions import ValidationError
@@ -333,6 +333,36 @@ class SpecialTransaction(Transaction):
self.clean()
super().save(*args, **kwargs)
+ @staticmethod
+ def validate_payment_form(form):
+ """
+ Ensure that last name and first name are filled for a form that creates a SpecialTransaction,
+ and check that if the user pays with a check, then the bank field is filled.
+
+ Return True iff there is no error.
+ Whenever there is an error, they are inserted in the form errors.
+ """
+
+ credit_type = form.cleaned_data["credit_type"]
+ last_name = form.cleaned_data["last_name"]
+ first_name = form.cleaned_data["first_name"]
+ bank = form.cleaned_data["bank"]
+
+ error = False
+
+ if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
+ if not last_name:
+ form.add_error('last_name', _("This field is required."))
+ error = True
+ if not first_name:
+ form.add_error('first_name', _("This field is required."))
+ error = True
+ if not bank and credit_type.special_type == "Chèque":
+ form.add_error('bank', _("This field is required."))
+ error = True
+
+ return not error
+
class Meta:
verbose_name = _("Special transaction")
verbose_name_plural = _("Special transactions")
diff --git a/apps/note/signals.py b/apps/note/signals.py
index a04df634a2e1ebd775333c1ef024cf8d92c0ca85..1ef51476aeb5d617f5838d5c6d30b4a53768dc84 100644
--- a/apps/note/signals.py
+++ b/apps/note/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.utils import timezone
diff --git a/apps/note/static/note/js/consos.js b/apps/note/static/note/js/consos.js
index b149dafe1818020e8d7f1bdc609e53f94f7d7c6d..5999ffc35c9da869dd475c3a7f2dd24de90170b3 100644
--- a/apps/note/static/note/js/consos.js
+++ b/apps/note/static/note/js/consos.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+// Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
// SPDX-License-Identifier: GPL-3.0-or-later
// When a transaction is performed, lock the interface to prevent spam clicks.
@@ -28,7 +28,7 @@ $(document).ready(function () {
// Switching in double consumptions mode should update the layout
$('#double_conso').change(function () {
- $('#consos_list_div').removeClass('d-none')
+ document.getElementById('consos_list_div').classList.remove('d-none')
$('#infos_div').attr('class', 'col-sm-5 col-xl-6')
const note_list_obj = $('#note_list')
@@ -37,7 +37,7 @@ $(document).ready(function () {
note_list_obj.html('')
buttons.forEach(function (button) {
- $('#conso_button_' + button.id).click(function () {
+ document.getElementById(`conso_button_${button.id}`).addEventListener('click', () => {
if (LOCK) { return }
removeNote(button, 'conso_button', buttons, 'consos_list')()
})
@@ -46,7 +46,7 @@ $(document).ready(function () {
})
$('#single_conso').change(function () {
- $('#consos_list_div').addClass('d-none')
+ document.getElementById('consos_list_div').classList.add('d-none')
$('#infos_div').attr('class', 'col-sm-5 col-md-4')
const consos_list_obj = $('#consos_list')
@@ -68,9 +68,9 @@ $(document).ready(function () {
})
// Ensure we begin in single consumption. Fix issue with TurboLinks and BootstrapJS
- $("label[for='double_conso']").removeClass('active')
+ document.querySelector("label[for='double_conso']").classList.remove('active')
- $('#consume_all').click(consumeAll)
+ document.getElementById("consume_all").addEventListener('click', consumeAll)
})
notes = []
@@ -127,11 +127,10 @@ function addConso (dest, amount, type, category_id, category_name, template_id,
html += li('conso_button_' + button.id, button.name +
'<span class="badge badge-dark badge-pill">' + button.quantity + '</span>')
})
+ document.getElementById(list).innerHTML = html
- $('#' + list).html(html)
-
- buttons.forEach(function (button) {
- $('#conso_button_' + button.id).click(function () {
+ buttons.forEach((button) => {
+ document.getElementById(`conso_button_${button.id}`).addEventListener('click', () => {
if (LOCK) { return }
removeNote(button, 'conso_button', buttons, list)()
})
@@ -146,12 +145,13 @@ function reset () {
notes_display.length = 0
notes.length = 0
buttons.length = 0
- $('#note_list').html('')
- $('#consos_list').html('')
- $('#note').val('')
- $('#note').attr('data-original-title', '').tooltip('hide')
- $('#profile_pic').attr('src', '/static/member/img/default_picture.png')
- $('#profile_pic_link').attr('href', '#')
+ document.getElementById('note_list').innerHTML = ''
+ document.getElementById('consos_list').innerHTML = ''
+ document.getElementById('note').value = ''
+ document.getElementById('note').dataset.originTitle = ''
+ $('#note').tooltip('hide')
+ document.getElementById('profile_pic').src = '/static/member/img/default_picture.png'
+ document.getElementById('profile_pic_link').href = '#'
refreshHistory()
refreshBalance()
LOCK = false
@@ -168,7 +168,7 @@ function consumeAll () {
let error = false
if (notes_display.length === 0) {
- $('#note').addClass('is-invalid')
+ document.getElementById('note').classList.add('is-invalid')
$('#note_list').html(li('', '<strong>Ajoutez des émetteurs.</strong>', 'text-danger'))
error = true
}
diff --git a/apps/note/static/note/js/transfer.js b/apps/note/static/note/js/transfer.js
index cc2a7124479eaf8374c0a7b747ed6b2f7bd5163f..0ae765019dde67e1f1788cedcd8902b13fed683e 100644
--- a/apps/note/static/note/js/transfer.js
+++ b/apps/note/static/note/js/transfer.js
@@ -243,7 +243,7 @@ $('#btn_transfer').click(function () {
error = true
}
- const amount = Math.floor(100 * amount_field.val())
+ const amount = Math.round(100 * amount_field.val())
if (amount > 2147483647) {
amount_field.addClass('is-invalid')
$('#amount-required').html('<strong>' + gettext('The amount must stay under 21,474,836.47 €.') + '</strong>')
diff --git a/apps/note/tables.py b/apps/note/tables.py
index f05edc96bd7c7b73ffda9549eb7a3c26e85e0b7b..e98a9b0b1fb7f36fec15c074bd3301ca6449ae24 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import html
diff --git a/apps/note/templatetags/getenv.py b/apps/note/templatetags/getenv.py
index c133cb8ff4df0a1bfe11ec7726d604907ecde3d4..c00343d41bb38f1d7d5e16e3739cd05c27002cdc 100644
--- a/apps/note/templatetags/getenv.py
+++ b/apps/note/templatetags/getenv.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import template
diff --git a/apps/note/templatetags/pretty_money.py b/apps/note/templatetags/pretty_money.py
index c7050da82006643366f4940f021276061943e537..dcd581880d032b56cdfddcc705ed702a7c89e8eb 100644
--- a/apps/note/templatetags/pretty_money.py
+++ b/apps/note/templatetags/pretty_money.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import template
diff --git a/apps/note/tests/test_transactions.py b/apps/note/tests/test_transactions.py
index 0626c45368efaada9d8bb3d6ff990ae86858454f..4f5dd6c50d73d064dad1b91384534519998f1a62 100644
--- a/apps/note/tests/test_transactions.py
+++ b/apps/note/tests/test_transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from api.tests import TestAPI
diff --git a/apps/note/urls.py b/apps/note/urls.py
index c5662f2c98bbe7812503f81d2d830b88c13c0c99..29ee38c6ad3645fae6b516c0e2442c9ada1ccd26 100644
--- a/apps/note/urls.py
+++ b/apps/note/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/note/views.py b/apps/note/views.py
index 50fcd78de8d06c6e367e8d74b2665c9fa810fbf5..73e5a0842f5f26a53d8f67818c8e9057a79a740b 100644
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import json
diff --git a/apps/permission/__init__.py b/apps/permission/__init__.py
index 4e3eb6bc4345209790f736a4c6e4eb0f5ea685d5..201d81311f7e52ee6405e857708664be46d3b8a8 100644
--- a/apps/permission/__init__.py
+++ b/apps/permission/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'permission.apps.PermissionConfig'
diff --git a/apps/permission/admin.py b/apps/permission/admin.py
index bfe3dc881640bbea3874205b8bd46b61221b0961..d5ef8b4f7099324d23f7ddd82222ec524e9d9f33 100644
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-lateré
from django.contrib import admin
diff --git a/apps/permission/api/serializers.py b/apps/permission/api/serializers.py
index d0823e191f03a1c578c49c9256c48e880beb3745..4e98364ee790213f32beaef57ea494ede03569c7 100644
--- a/apps/permission/api/serializers.py
+++ b/apps/permission/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/permission/api/urls.py b/apps/permission/api/urls.py
index b1fdb19902e1a0889a85b5e4399bb39d7748513e..30651936aafd8996ab2fdab6c2ab33347fd6417e 100644
--- a/apps/permission/api/urls.py
+++ b/apps/permission/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import PermissionViewSet, RoleViewSet
diff --git a/apps/permission/api/views.py b/apps/permission/api/views.py
index e6cb0d5d733393ab9c6cfb368002d252e91e25df..2db14e007b01460ef9277f433a5a0ed3d9ea6f1d 100644
--- a/apps/permission/api/views.py
+++ b/apps/permission/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from api.viewsets import ReadOnlyProtectedModelViewSet
diff --git a/apps/permission/apps.py b/apps/permission/apps.py
index 2287fec42c5f08790bd0c548e3d84506a2c57ef6..58c30082b48278d51c949d7aa3fdd22930146930 100644
--- a/apps/permission/apps.py
+++ b/apps/permission/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index 4b044d80879c6aec3a642df8620fef7c197bd754..b43340f07ce3477133cb3721a8d44d04fbd9ac30 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py
index 11edac430d5e182efbb93d8c592bdd5a65dc5ec1..7f5b48b0936b04c54ef2db890a9c39ea7ad8f1ad 100644
--- a/apps/permission/decorators.py
+++ b/apps/permission/decorators.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import sys
from functools import lru_cache
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 6646029a9a355bb30254688955f0c399c0e5ad50..27df5b292aa94abc6fc7d9cc157e9a11020c0b54 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -1235,7 +1235,7 @@
"type": "view",
"mask": 1,
"field": "",
- "permanent": false,
+ "permanent": true,
"description": "Voir le dernier WEI"
}
},
@@ -1267,7 +1267,7 @@
"type": "add",
"mask": 1,
"field": "",
- "permanent": false,
+ "permanent": true,
"description": "M'inscrire au dernier WEI"
}
},
@@ -1331,7 +1331,7 @@
"type": "view",
"mask": 1,
"field": "",
- "permanent": false,
+ "permanent": true,
"description": "Voir ma propre inscription WEI"
}
},
@@ -1379,7 +1379,7 @@
"type": "change",
"mask": 1,
"field": "soge_credit",
- "permanent": false,
+ "permanent": true,
"description": "Indiquer si mon inscription WEI est payée par la Société générale tant qu'elle n'est pas validée"
}
},
@@ -1427,7 +1427,7 @@
"type": "change",
"mask": 1,
"field": "birth_date",
- "permanent": false,
+ "permanent": true,
"description": "Modifier la date de naissance de ma propre inscription WEI"
}
},
@@ -1459,7 +1459,7 @@
"type": "change",
"mask": 1,
"field": "gender",
- "permanent": false,
+ "permanent": true,
"description": "Modifier le genre de ma propre inscription WEI"
}
},
@@ -1491,7 +1491,7 @@
"type": "change",
"mask": 1,
"field": "health_issues",
- "permanent": false,
+ "permanent": true,
"description": "Modifier mes problèmes de santé de mon inscription WEI"
}
},
@@ -1523,7 +1523,7 @@
"type": "change",
"mask": 1,
"field": "emergency_contact_name",
- "permanent": false,
+ "permanent": true,
"description": "Modifier le nom du contact en cas d'urgence de mon inscription WEI"
}
},
@@ -1555,7 +1555,7 @@
"type": "change",
"mask": 1,
"field": "emergency_contact_phone",
- "permanent": false,
+ "permanent": true,
"description": "Modifier le téléphone du contact en cas d'urgence de mon inscription WEI"
}
},
@@ -1699,7 +1699,7 @@
"type": "add",
"mask": 3,
"field": "",
- "permanent": false,
+ "permanent": true,
"description": "Créer une adhésion WEI pour le dernier WEI"
}
},
@@ -2003,7 +2003,7 @@
"type": "change",
"mask": 1,
"field": "clothing_cut",
- "permanent": false,
+ "permanent": true,
"description": "Modifier ma coupe de vêtements de mon inscription WEI"
}
},
@@ -2035,7 +2035,7 @@
"type": "change",
"mask": 1,
"field": "clothing_size",
- "permanent": false,
+ "permanent": true,
"description": "Modifier la taille de vêtements de mon inscription WEI"
}
},
@@ -2243,7 +2243,7 @@
"type": "change",
"mask": 1,
"field": "information_json",
- "permanent": false,
+ "permanent": true,
"description": "Modifier mes préférences en terme de bus et d'équipe si mon inscription n'est pas validée et que je suis en 2A+"
}
},
@@ -3495,7 +3495,7 @@
"model": "permission.role",
"pk": 20,
"fields": {
- "for_club": 2,
+ "for_club": 1,
"name": "PC Kfet",
"permissions": [
6,
diff --git a/apps/permission/models.py b/apps/permission/models.py
index 9c1b2e6c4d22d265a9b257f62aa860d47aefc846..7ca309ca700300f7134e63e99d38cc538b0669c8 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import functools
diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py
index f2ca28f04883dc5bf1dfec4ab3b503b090cedc07..9a0c1e12e334a36a831aac0b2a5d349ab1da4cce 100644
--- a/apps/permission/permissions.py
+++ b/apps/permission/permissions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework.permissions import DjangoObjectPermissions
diff --git a/apps/permission/signals.py b/apps/permission/signals.py
index e738545a37dd06ee1775da1d2e9bef1add4f5829..b419ce090d5b4adf646301f47b0c761e1641bf3c 100644
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.core.exceptions import PermissionDenied
diff --git a/apps/permission/tables.py b/apps/permission/tables.py
index 42d62fb67d13674453b48f4987763f97898e9ecb..9e82fa8e58a46e54dc1a635c9d62c7056f6eed3b 100644
--- a/apps/permission/tables.py
+++ b/apps/permission/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import django_tables2 as tables
diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py
index 7841f4005dd0c833f2bd57b9dbbf48a1c488f0d1..2fb376d4e36f8e36d4051a8060bf6bcd344d9d46 100644
--- a/apps/permission/templatetags/perms.py
+++ b/apps/permission/templatetags/perms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.auth.models import AnonymousUser
diff --git a/apps/permission/tests/test_permission_denied.py b/apps/permission/tests/test_permission_denied.py
index 95cc14cd7d601a42ef405af1ca91e32a7281e310..1aa3e9e9a016e4a96f912295beddec47c653b89c 100644
--- a/apps/permission/tests/test_permission_denied.py
+++ b/apps/permission/tests/test_permission_denied.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import timedelta, date
diff --git a/apps/permission/tests/test_permission_queries.py b/apps/permission/tests/test_permission_queries.py
index 95b8b7b10ac3e5ec6452c577810ae0df0af55f4a..218c5a755317638eb5f948554c514480016463d5 100644
--- a/apps/permission/tests/test_permission_queries.py
+++ b/apps/permission/tests/test_permission_queries.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/permission/tests/test_rights_page.py b/apps/permission/tests/test_rights_page.py
index da80bf0951a65181459a47c81e20f995c73102dc..83e41cf3d885584036f4991cfd9821db1f662e1e 100644
--- a/apps/permission/tests/test_rights_page.py
+++ b/apps/permission/tests/test_rights_page.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.auth.models import User
diff --git a/apps/permission/urls.py b/apps/permission/urls.py
index c571c520e82fbbfd706f61f1cc7c3fead6c63596..0894ecf007122b25d59b7b632cb205ce7d4a0465 100644
--- a/apps/permission/urls.py
+++ b/apps/permission/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/permission/views.py b/apps/permission/views.py
index 9ff9b50d629996dd017493a1581c988edb93bdff..c48215a02702fbbbdaffb9237fd5b8c549a3e0cb 100644
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/registration/__init__.py b/apps/registration/__init__.py
index 700d9f003c8ed466ea22d3758e75eb74bf2f6fc9..5c37e986a9a9d547122694e67a1bd450cbe9f3df 100644
--- a/apps/registration/__init__.py
+++ b/apps/registration/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'registration.apps.RegistrationConfig'
diff --git a/apps/registration/apps.py b/apps/registration/apps.py
index dec89274d4cf962741a0645f0236ac37a859c8ca..9ea23dc2d076f189c3a4f83f2cb54886727aaf06 100644
--- a/apps/registration/apps.py
+++ b/apps/registration/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/registration/forms.py b/apps/registration/forms.py
index abb2aaacd9b16d51fa10d870a0ebf275485da8d0..17b89c33c0946eaac9d8cd72fc8b0f16a33baf03 100644
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import forms
@@ -101,14 +101,14 @@ class ValidationForm(forms.Form):
required=False,
)
- join_BDE = forms.BooleanField(
+ join_bde = forms.BooleanField(
label=_("Join BDE Club"),
required=False,
initial=True,
)
# The user can join the Kfet club at the inscription
- join_Kfet = forms.BooleanField(
+ join_kfet = forms.BooleanField(
label=_("Join Kfet Club"),
required=False,
initial=True,
diff --git a/apps/registration/tables.py b/apps/registration/tables.py
index 9b124ffa59caf17a1b22262aaa493cd83ba7229b..960866a65cf0018fb9b28dc7e209daa4ea7a2f3b 100644
--- a/apps/registration/tables.py
+++ b/apps/registration/tables.py
@@ -1,9 +1,8 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import django_tables2 as tables
from django.contrib.auth.models import User
-
from treasury.models import SogeCredit
diff --git a/apps/registration/templates/registration/future_profile_detail.html b/apps/registration/templates/registration/future_profile_detail.html
index d8f061c00029b50203e4b1e501cce372128a70e4..577ad21916bbce0766947fe7996fa397c49e2577 100644
--- a/apps/registration/templates/registration/future_profile_detail.html
+++ b/apps/registration/templates/registration/future_profile_detail.html
@@ -100,13 +100,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
bank.attr('disabled', true);
bank.val('Société générale');
- let join_BDE = $("#id_join_BDE");
- join_BDE.attr('disabled', true);
- join_BDE.attr('checked', 'checked');
+ let join_bde = $("#id_join_bde");
- let join_Kfet = $("#id_join_Kfet");
- join_Kfet.attr('disabled', true);
- join_Kfet.attr('checked', 'checked');
+ join_bde.attr('disabled', true);
+ join_bde.attr('checked', 'checked');
+
+ let join_kfet = $("#id_join_kfet");
+ join_kfet.attr('disabled', true);
+ join_kfet.attr('checked', 'checked');
}
soge_field.change(fillFields);
@@ -116,4 +117,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
fillFields();
{% endif %}
</script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/apps/registration/tests/test_registration.py b/apps/registration/tests/test_registration.py
index adb773f9dfbf0308f0d2eb72ea378376080b3e66..18cf16db9408c43303d6df9997eefc704c1cf331 100644
--- a/apps/registration/tests/test_registration.py
+++ b/apps/registration/tests/test_registration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.auth.models import User
@@ -196,8 +196,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=False,
- join_Kfet=False,
+ join_bde=False,
+ join_kfet=False,
))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context["form"].errors)
@@ -210,8 +210,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=False,
- join_Kfet=True,
+ join_bde=False,
+ join_kfet=True,
))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context["form"].errors)
@@ -224,8 +224,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="J'ai pas d'argent",
- join_BDE=True,
- join_Kfet=True,
+ join_bde=True,
+ join_kfet=True,
))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context["form"].errors)
@@ -238,8 +238,8 @@ class TestValidateRegistration(TestCase):
last_name="",
first_name="",
bank="",
- join_BDE=True,
- join_Kfet=True,
+ join_bde=True,
+ join_kfet=True,
))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context["form"].errors)
@@ -255,8 +255,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=True,
- join_Kfet=False,
+ join_bde=True,
+ join_kfet=False,
))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context["form"].errors)
@@ -281,8 +281,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=True,
- join_Kfet=False,
+ join_bde=True,
+ join_kfet=False,
))
self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
self.user.profile.refresh_from_db()
@@ -317,8 +317,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=True,
- join_Kfet=True,
+ join_bde=True,
+ join_kfet=True,
))
self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
self.user.profile.refresh_from_db()
@@ -353,8 +353,8 @@ class TestValidateRegistration(TestCase):
last_name="TOTO",
first_name="Toto",
bank="Société générale",
- join_BDE=True,
- join_Kfet=True,
+ join_bde=True,
+ join_kfet=True,
))
self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
self.user.profile.refresh_from_db()
diff --git a/apps/registration/tokens.py b/apps/registration/tokens.py
index 0e7b20a580ba98523ba189c32197e57af6d0dd89..ef8ddb02b97d13236df5127f411d023ccda660d8 100644
--- a/apps/registration/tokens.py
+++ b/apps/registration/tokens.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
# Copied from https://gitlab.crans.org/bombar/codeflix/-/blob/master/codeflix/codeflix/tokens.py
@@ -9,6 +9,7 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
"""
Create a unique token generator to confirm email addresses.
"""
+
def _make_hash_value(self, user, timestamp):
"""
Hash the user's primary key and some user state that's sure to change
@@ -23,9 +24,18 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
"""
# Truncate microseconds so that tokens are consistent even if the
# database doesn't support microseconds.
- login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
- return str(user.pk) + str(user.email) + str(user.profile.email_confirmed)\
- + str(login_timestamp) + str(timestamp)
+ login_timestamp = (
+ ""
+ if user.last_login is None
+ else user.last_login.replace(microsecond=0, tzinfo=None)
+ )
+ return (
+ str(user.pk)
+ + str(user.email)
+ + str(user.profile.email_confirmed)
+ + str(login_timestamp)
+ + str(timestamp)
+ )
email_validation_token = AccountActivationTokenGenerator()
diff --git a/apps/registration/urls.py b/apps/registration/urls.py
index 14678cbb521c3db57929f40a11178c90fd6a559f..fe7f1a1f5618e3739882ba3791849ef5392e4776 100644
--- a/apps/registration/urls.py
+++ b/apps/registration/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/registration/views.py b/apps/registration/views.py
index 3c2ea0a77c3286d7a24e77a92380f4ba1958a740..746c856bda0024fc4d94a84a03a9add4bb3cb5ed 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
@@ -248,9 +248,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
@transaction.atomic
def form_valid(self, form):
+ """
+ Finally validate the registration, with creating the membership.
+ """
user = self.get_object()
if Alias.objects.filter(normalized_name=Alias.normalize(user.username)).exists():
+ # Don't try to hack an existing account.
form.add_error(None, _("An alias with a similar name already exists."))
return self.form_invalid(form)
@@ -261,35 +265,36 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
last_name = form.cleaned_data["last_name"]
first_name = form.cleaned_data["first_name"]
bank = form.cleaned_data["bank"]
- join_BDE = form.cleaned_data["join_BDE"]
- join_Kfet = form.cleaned_data["join_Kfet"]
+ join_bde = form.cleaned_data["join_bde"]
+ join_kfet = form.cleaned_data["join_kfet"]
if soge:
- # If Société Générale pays the inscription, the user joins the two clubs
- join_BDE = True
- join_Kfet = True
+ # 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:
- form.add_error('join_BDE', _("You must join the BDE."))
+ if not join_bde:
+ # This software belongs to the BDE.
+ form.add_error('join_bde', _("You must join the BDE."))
return super().form_invalid(form)
+ # Calculate required registration fee
fee = 0
bde = Club.objects.get(name="BDE")
bde_fee = bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
- if join_BDE:
- fee += bde_fee
+ # This is mandatory.
+ fee += bde_fee if join_bde else 0
kfet = Club.objects.get(name="Kfet")
kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
- if join_Kfet:
- fee += kfet_fee
+ # Add extra fee for the full membership
+ fee += kfet_fee if join_kfet else 0
- if soge:
- # If the bank pays, then we don't credit now. Treasurers will validate the transaction
- # and credit the note later.
- credit_type = None
+ # 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 credit_type is None:
- credit_amount = 0
+ # If the user does not select any payment method, then no credit will be performed.
+ credit_amount = 0 if credit_type is None else credit_amount
if fee > credit_amount and not soge:
# Check if the user credits enough money
@@ -298,15 +303,9 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
.format(pretty_money(fee)))
return self.form_invalid(form)
- if credit_type is not None and credit_amount > 0:
- if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
- if not last_name:
- form.add_error('last_name', _("This field is required."))
- if not first_name:
- form.add_error('first_name', _("This field is required."))
- if not bank and credit_type.special_type == "Chèque":
- form.add_error('bank', _("This field is required."))
- return self.form_invalid(form)
+ # Check that payment information are filled, like last name and first name
+ if credit_type is not None and credit_amount > 0 and not SpecialTransaction.validate_payment_form(form):
+ return self.form_invalid(form)
# Save the user and finally validate the registration
# Saving the user creates the associated note
@@ -338,7 +337,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
valid=True,
)
- if join_BDE:
+ if join_bde:
# Create membership for the user to the BDE starting today
membership = Membership(
club=bde,
@@ -352,7 +351,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
membership.roles.add(Role.objects.get(name="Adhérent BDE"))
membership.save()
- if join_Kfet:
+ if join_kfet:
# Create membership for the user to the Kfet starting today
membership = Membership(
club=kfet,
diff --git a/apps/scripts b/apps/scripts
index 1e9d731715b9945a524aa8a4116936c9c2124ac7..7a022b9407bdcbe97a78bfc10b2812c9b0aaf314 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 1e9d731715b9945a524aa8a4116936c9c2124ac7
+Subproject commit 7a022b9407bdcbe97a78bfc10b2812c9b0aaf314
diff --git a/apps/treasury/__init__.py b/apps/treasury/__init__.py
index c9c6150edaa9526ab1476be7dc0e5c144ceabe1f..d14a7f6bfcb4fba149646b6b98bf11214c3ab3cf 100644
--- a/apps/treasury/__init__.py
+++ b/apps/treasury/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'treasury.apps.TreasuryConfig'
diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py
index 25b4f4cb32fbfac86786ae602fecaaa0998cc65f..5069e5356ebeb56d0999a7012590670e6b98a4d7 100644
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-lateré
from django.contrib import admin
diff --git a/apps/treasury/api/serializers.py b/apps/treasury/api/serializers.py
index 0acb0aa12ca6ec9fc0d9c9eb951637fc37a68159..bc15db889b3b235157cd7deb1d0d3ac389a1170f 100644
--- a/apps/treasury/api/serializers.py
+++ b/apps/treasury/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/treasury/api/urls.py b/apps/treasury/api/urls.py
index 70d81f77905063c39cbc2ef9b923a97feef1f965..90c9d33257f8570cb387f332c820d0778e11814d 100644
--- a/apps/treasury/api/urls.py
+++ b/apps/treasury/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import InvoiceViewSet, ProductViewSet, RemittanceViewSet, RemittanceTypeViewSet, SogeCreditViewSet
diff --git a/apps/treasury/api/views.py b/apps/treasury/api/views.py
index b0a47e0931e9b9a364b1885e54404dfccf53453d..e6ba9ced06c0df9bc79cc1f9d77d4f6bb143593c 100644
--- a/apps/treasury/api/views.py
+++ b/apps/treasury/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django_filters.rest_framework import DjangoFilterBackend
diff --git a/apps/treasury/apps.py b/apps/treasury/apps.py
index f3fbe09273f8bf43a834275dfe0fcdbb313c8cfe..fb0b09dbe2175ae7ef1d17011b5d094ef168a599 100644
--- a/apps/treasury/apps.py
+++ b/apps/treasury/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py
index b24dfa4853793d67e3ed4090a09f9a2fbafbca97..6c5bc353b294912900f04e9b0096e397a884c3aa 100644
--- a/apps/treasury/forms.py
+++ b/apps/treasury/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from crispy_forms.helper import FormHelper
diff --git a/apps/treasury/models.py b/apps/treasury/models.py
index a2a61d46988e06a0b4d88706dc47a8569fee124c..2e86245ffb8ce9135a60f630764ab1884bfa7ecb 100644
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
diff --git a/apps/treasury/signals.py b/apps/treasury/signals.py
index 5604b3c1568a45eb7178df7cd4b3aea9a13e6263..fc87b874b57875e59f22d864706cffa511406f79 100644
--- a/apps/treasury/signals.py
+++ b/apps/treasury/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from treasury.models import SpecialTransactionProxy, RemittanceType
diff --git a/apps/treasury/tables.py b/apps/treasury/tables.py
index 77d39a0e8fbab475f1e05736def06209b2bde9b1..f309c20faf0c359ebd05f2cc3b3f147b4899ca82 100644
--- a/apps/treasury/tables.py
+++ b/apps/treasury/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import django_tables2 as tables
diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py
index bd7009434ab8b439d0c82cc12a7195addba5e90d..9ecbb613e7b427e773a703c937b9275649dd7487 100644
--- a/apps/treasury/templatetags/escape_tex.py
+++ b/apps/treasury/templatetags/escape_tex.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import template
diff --git a/apps/treasury/tests/test_treasury.py b/apps/treasury/tests/test_treasury.py
index 98fb22499f0ddd0ec4025f7010e9c42102505dc6..798a960fa8dc578cdcda7c4abff24fe3a18fcfe4 100644
--- a/apps/treasury/tests/test_treasury.py
+++ b/apps/treasury/tests/test_treasury.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from api.tests import TestAPI
diff --git a/apps/treasury/urls.py b/apps/treasury/urls.py
index e7c0963931d41bd6882c7ec619fd07fb6fddf3f5..4fe87924bc46ab2f77a83f3d1bf3a8e1ae45264c 100644
--- a/apps/treasury/urls.py
+++ b/apps/treasury/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index 08f190c25c6e7ed4128c786a4f4302c0f8ecc8d4..47544cc1ae8eb6c0623b9bd5bfc5fb0685fef43d 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import os
@@ -210,7 +210,7 @@ class InvoiceRenderView(LoginRequiredMixin, View):
del tex
# The file has to be rendered twice
- for ignored in range(2):
+ for _ignored in range(2):
error = subprocess.Popen(
["/usr/bin/xelatex", "-interaction=nonstopmode", "invoice-{}.tex".format(pk)],
cwd=tmp_dir,
diff --git a/apps/wei/__init__.py b/apps/wei/__init__.py
index ad360dae2862a450ef1ddb799146f8bf9156c7c2..93dd4163dbbdd005cee1214378cfc15d81fd7c3f 100644
--- a/apps/wei/__init__.py
+++ b/apps/wei/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
default_app_config = 'wei.apps.WeiConfig'
diff --git a/apps/wei/admin.py b/apps/wei/admin.py
index f928a313705be37d352fea307c0d0dd902d439a5..63792b6b92384e78644970e4d9ce7affe73eb13d 100644
--- a/apps/wei/admin.py
+++ b/apps/wei/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from note_kfet.admin import admin_site
diff --git a/apps/wei/api/serializers.py b/apps/wei/api/serializers.py
index 69254b752043c2b874c215351888fba013fe7349..ee028a377520ae1f55149bfe135517756af97e95 100644
--- a/apps/wei/api/serializers.py
+++ b/apps/wei/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from rest_framework import serializers
diff --git a/apps/wei/api/urls.py b/apps/wei/api/urls.py
index 713f5c7f5f6899317a1a3903dd46fa2f46464e01..58dab39c6adea5168ca4d0ef6775298150c7823b 100644
--- a/apps/wei/api/urls.py
+++ b/apps/wei/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import WEIClubViewSet, BusViewSet, BusTeamViewSet, WEIRoleViewSet, WEIRegistrationViewSet, \
diff --git a/apps/wei/api/views.py b/apps/wei/api/views.py
index f267d09318cfb0273815e840c731dd155a58128f..bad8ff68f7d961ab1f35966de789f7d3e590c738 100644
--- a/apps/wei/api/views.py
+++ b/apps/wei/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django_filters.rest_framework import DjangoFilterBackend
diff --git a/apps/wei/apps.py b/apps/wei/apps.py
index 233512830d39daf7d22605379c5f29b8c1e3519d..6836a50f122227caaf177b93b72af9fccde88b9b 100644
--- a/apps/wei/apps.py
+++ b/apps/wei/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.apps import AppConfig
diff --git a/apps/wei/forms/__init__.py b/apps/wei/forms/__init__.py
index af948157e7299731585cf65beb269190325c18a2..ecec33d537dec5f461b50d34bc9be7fb0ac8e88a 100644
--- a/apps/wei/forms/__init__.py
+++ b/apps/wei/forms/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .registration import WEIForm, WEIRegistrationForm, WEIMembershipForm, BusForm, BusTeamForm
diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py
index 0e00705a18a197546f1561b453f98d0be677e30f..13e7b86bf387ce48c7bd39a2ee8e12ced107bcaa 100644
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import forms
@@ -138,7 +138,7 @@ class WEIMembershipForm(forms.ModelForm):
class BusForm(forms.ModelForm):
class Meta:
model = Bus
- exclude = ('information_json',)
+ fields = '__all__'
widgets = {
"wei": Autocomplete(
WEIClub,
diff --git a/apps/wei/forms/surveys/__init__.py b/apps/wei/forms/surveys/__init__.py
index 1e1dca56a7fc6502a220a69f79f82438e379c23c..f5172c4a3a712d8e39fbdc6f39dae446b22234eb 100644
--- a/apps/wei/forms/surveys/__init__.py
+++ b/apps/wei/forms/surveys/__init__.py
@@ -1,12 +1,12 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2020 import WEISurvey2020
+from .wei2021 import WEISurvey2021
__all__ = [
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
]
-CurrentSurvey = WEISurvey2020
+CurrentSurvey = WEISurvey2021
diff --git a/apps/wei/forms/surveys/base.py b/apps/wei/forms/surveys/base.py
index e8b0cbbaf639fb60248426cc206f42cd67ac10f8..ec0bc980eb7f4f6e786bc26776263e51c8aad7ff 100644
--- a/apps/wei/forms/surveys/base.py
+++ b/apps/wei/forms/surveys/base.py
@@ -1,12 +1,12 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
-from typing import Optional
+from typing import Optional, List
from django.db.models import QuerySet
from django.forms import Form
-from ...models import WEIClub, WEIRegistration, Bus
+from ...models import WEIClub, WEIRegistration, Bus, WEIMembership
class WEISurveyInformation:
@@ -50,6 +50,15 @@ class WEIBusInformation:
self.bus.information = d
self.bus.save()
+ def free_seats(self, surveys: List["WEISurvey"] = None):
+ size = self.bus.size
+ already_occupied = WEIMembership.objects.filter(bus=self.bus).count()
+ valid_surveys = sum(1 for survey in surveys if survey.information.valid) if surveys else 0
+ return size - already_occupied - valid_surveys
+
+ def has_free_seats(self, surveys=None):
+ return self.free_seats(surveys) > 0
+
class WEISurveyAlgorithm:
"""
@@ -83,7 +92,7 @@ class WEISurveyAlgorithm:
"""
Queryset of all buses of the associated wei.
"""
- return Bus.objects.filter(wei__year=cls.get_survey_class().get_year())
+ return Bus.objects.filter(wei__year=cls.get_survey_class().get_year(), size__gt=0)
@classmethod
def get_bus_information(cls, bus):
@@ -192,3 +201,11 @@ class WEISurvey:
self.information.selected_bus_pk = bus.pk
self.information.selected_bus_name = bus.name
self.information.valid = True
+
+ def free(self) -> None:
+ """
+ Unselect the select bus.
+ """
+ self.information.selected_bus_pk = None
+ self.information.selected_bus_name = None
+ self.information.valid = False
diff --git a/apps/wei/forms/surveys/wei2020.py b/apps/wei/forms/surveys/wei2020.py
deleted file mode 100644
index 48203fdf24a8fc77a9c362e85751d5bd838917cd..0000000000000000000000000000000000000000
--- a/apps/wei/forms/surveys/wei2020.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from random import choice
-
-from django import forms
-from django.db import transaction
-from django.utils.translation import gettext_lazy as _
-
-from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
-from ...models import Bus
-
-
-# TODO: Use new words
-WORDS = ['Rap', 'Retro', 'DJ', 'Rock', 'Jazz', 'Chansons Populaires', 'Chansons Paillardes', 'Pop', 'Fanfare',
- 'Biere', 'Pastis', 'Vodka', 'Cocktails', 'Eau', 'Sirop', 'Jus de fruit', 'Binge Drinking', 'Rhum',
- 'Eau de vie', 'Apéro', 'Morning beer', 'Huit-six', 'Jeux de societé', 'Jeux de cartes', 'Danse', 'Karaoké',
- 'Bière Pong', 'Poker', 'Loup Garou', 'Films', "Jeux d'alcool", 'Sport', 'Rangées de cul', 'Chips', 'BBQ',
- 'Kebab', 'Saucisse', 'Vegan', 'Vege', 'LGBTIQ+', 'Dab', 'Solitaire', 'Séducteur', 'Sociale', 'Chanteur',
- 'Se lacher', 'Chill', 'Débile', 'Beauf', 'Bon enfant']
-
-
-class WEISurveyForm2020(forms.Form):
- """
- Survey form for the year 2020.
- Members choose 20 words, from which we calculate the best associated bus.
- """
-
- word = forms.ChoiceField(
- label=_("Choose a word:"),
- widget=forms.RadioSelect(),
- )
-
- def set_registration(self, registration):
- """
- Filter the bus selector with the buses of the current WEI.
- """
- words = [choice(WORDS) for _ in range(10)]
- words = [(w, w) for w in words]
- if self.data:
- self.fields["word"].choices = [(w, w) for w in WORDS]
- if self.is_valid():
- return
- self.fields["word"].choices = words
-
-
-class WEIBusInformation2020(WEIBusInformation):
- """
- For each word, the bus has a score
- """
- def __init__(self, bus):
- for word in WORDS:
- setattr(self, word, 0.0)
- super().__init__(bus)
-
-
-class WEISurveyInformation2020(WEISurveyInformation):
- """
- We store the id of the selected bus. We store only the name, but is not used in the selection:
- that's only for humans that try to read data.
- """
- step = 0
-
- def __init__(self, registration):
- for i in range(1, 21):
- setattr(self, "word" + str(i), None)
- super().__init__(registration)
-
-
-class WEISurvey2020(WEISurvey):
- """
- Survey for the year 2020.
- """
-
- @classmethod
- def get_year(cls):
- return 2020
-
- @classmethod
- def get_survey_information_class(cls):
- return WEISurveyInformation2020
-
- def get_form_class(self):
- return WEISurveyForm2020
-
- def update_form(self, form):
- """
- Filter the bus selector with the buses of the WEI.
- """
- form.set_registration(self.registration)
-
- @transaction.atomic
- def form_valid(self, form):
- word = form.cleaned_data["word"]
- self.information.step += 1
- setattr(self.information, "word" + str(self.information.step), word)
- self.save()
-
- @classmethod
- def get_algorithm_class(cls):
- return WEISurveyAlgorithm2020
-
- def is_complete(self) -> bool:
- """
- The survey is complete once the bus is chosen.
- """
- return self.information.step == 20
-
-
-class WEISurveyAlgorithm2020(WEISurveyAlgorithm):
- """
- The algorithm class for the year 2020.
- For now, the algorithm is quite simple: the selected bus is the chosen bus.
- TODO: Improve this algorithm.
- """
-
- @classmethod
- def get_survey_class(cls):
- return WEISurvey2020
-
- @classmethod
- def get_bus_information_class(cls):
- return WEIBusInformation2020
-
- def run_algorithm(self):
- for registration in self.get_registrations():
- survey = self.get_survey_class()(registration)
- survey.select_bus(choice(Bus.objects.all()))
- survey.save()
diff --git a/apps/wei/forms/surveys/wei2021.py b/apps/wei/forms/surveys/wei2021.py
new file mode 100644
index 0000000000000000000000000000000000000000..49c1c628212f4bee02425f6c2d97fe860d694a2c
--- /dev/null
+++ b/apps/wei/forms/surveys/wei2021.py
@@ -0,0 +1,195 @@
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+import time
+from random import Random
+
+from django import forms
+from django.db import transaction
+from django.utils.translation import gettext_lazy as _
+
+from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
+
+WORDS = [
+ '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',
+]
+
+
+class WEISurveyForm2021(forms.Form):
+ """
+ Survey form for the year 2021.
+ Members choose 20 words, from which we calculate the best associated bus.
+ """
+
+ word = forms.ChoiceField(
+ label=_("Choose a word:"),
+ widget=forms.RadioSelect(),
+ )
+
+ def set_registration(self, registration):
+ """
+ Filter the bus selector with the buses of the current WEI.
+ """
+ information = WEISurveyInformation2021(registration)
+ if not information.seed:
+ information.seed = int(1000 * time.time())
+ information.save(registration)
+ registration.save()
+
+ rng = Random(information.seed)
+
+ words = []
+ for _ in range(information.step + 1):
+ # Generate N times words
+ words = [rng.choice(WORDS) for _ in range(10)]
+ words = [(w, w) for w in words]
+ if self.data:
+ self.fields["word"].choices = [(w, w) for w in WORDS]
+ if self.is_valid():
+ return
+ self.fields["word"].choices = words
+
+
+class WEIBusInformation2021(WEIBusInformation):
+ """
+ For each word, the bus has a score
+ """
+ scores: dict
+
+ def __init__(self, bus):
+ self.scores = {}
+ for word in WORDS:
+ self.scores[word] = 0.0
+ super().__init__(bus)
+
+
+class WEISurveyInformation2021(WEISurveyInformation):
+ """
+ We store the id of the selected bus. We store only the name, but is not used in the selection:
+ that's only for humans that try to read data.
+ """
+ # Random seed that is stored at the first time to ensure that words are generated only once
+ seed = 0
+ step = 0
+
+ def __init__(self, registration):
+ for i in range(1, 21):
+ setattr(self, "word" + str(i), None)
+ super().__init__(registration)
+
+
+class WEISurvey2021(WEISurvey):
+ """
+ Survey for the year 2021.
+ """
+
+ @classmethod
+ def get_year(cls):
+ return 2021
+
+ @classmethod
+ def get_survey_information_class(cls):
+ return WEISurveyInformation2021
+
+ def get_form_class(self):
+ return WEISurveyForm2021
+
+ def update_form(self, form):
+ """
+ Filter the bus selector with the buses of the WEI.
+ """
+ form.set_registration(self.registration)
+
+ @transaction.atomic
+ def form_valid(self, form):
+ word = form.cleaned_data["word"]
+ self.information.step += 1
+ setattr(self.information, "word" + str(self.information.step), word)
+ self.save()
+
+ @classmethod
+ def get_algorithm_class(cls):
+ return WEISurveyAlgorithm2021
+
+ def is_complete(self) -> bool:
+ """
+ The survey is complete once the bus is chosen.
+ """
+ return self.information.step == 20
+
+ def score(self, bus):
+ if not self.is_complete():
+ raise ValueError("Survey is not ended, can't calculate score")
+ bus_info = self.get_algorithm_class().get_bus_information(bus)
+ return sum(bus_info.scores[getattr(self.information, 'word' + str(i))] for i in range(1, 21)) / 20
+
+ def scores_per_bus(self):
+ return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
+
+ def ordered_buses(self):
+ values = list(self.scores_per_bus().items())
+ values.sort(key=lambda item: -item[1])
+ return values
+
+
+class WEISurveyAlgorithm2021(WEISurveyAlgorithm):
+ """
+ The algorithm class for the year 2021.
+ We use Gale-Shapley algorithm to attribute 1y students into buses.
+ """
+
+ @classmethod
+ def get_survey_class(cls):
+ return WEISurvey2021
+
+ @classmethod
+ def get_bus_information_class(cls):
+ return WEIBusInformation2021
+
+ def run_algorithm(self):
+ """
+ Gale-Shapley algorithm implementation.
+ We modify it to allow buses to have multiple "weddings".
+ """
+ surveys = list(self.get_survey_class()(r) for r in self.get_registrations()) # All surveys
+ free_surveys = [s for s in surveys if not s.information.valid] # Remaining surveys
+ while free_surveys: # Some students are not affected
+ survey = free_surveys[0]
+ buses = survey.ordered_buses() # Preferences of the student
+ for bus, _ in buses:
+ if self.get_bus_information(bus).has_free_seats(surveys):
+ # Selected bus has free places. Put student in the bus
+ survey.select_bus(bus)
+ survey.save()
+ free_surveys.remove(survey)
+ break
+ else:
+ # Current bus has not enough places. Remove the least preferred student from the bus if existing
+ current_score = survey.score(bus)
+ least_preferred_survey = None
+ least_score = -1
+ # Find the least student in the bus that has a lower score than the current student
+ for survey2 in surveys:
+ if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
+ continue
+ score2 = survey2.score(bus)
+ if current_score <= score2: # Ignore better students
+ continue
+ if least_preferred_survey is None or score2 < least_score:
+ least_preferred_survey = survey2
+ least_score = score2
+
+ if least_preferred_survey is not None:
+ # Remove the least student from the bus and put the current student in.
+ # If it does not exist, choose the next bus.
+ least_preferred_survey.free()
+ least_preferred_survey.save()
+ survey.select_bus(bus)
+ survey.save()
+ break
diff --git a/apps/wei/management/commands/export_wei_registrations.py b/apps/wei/management/commands/export_wei_registrations.py
index 2221e83f058dfaa4191fe047262f500702e9998b..a51f1c64864d467980f77a1986271e79976b5a78 100644
--- a/apps/wei/management/commands/export_wei_registrations.py
+++ b/apps/wei/management/commands/export_wei_registrations.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.core.management import BaseCommand, CommandError
diff --git a/apps/wei/management/commands/wei_algorithm.py b/apps/wei/management/commands/wei_algorithm.py
index 01640720fcc1e31a0c801c2ed779d0dedd036f86..152ca813f4f18a6a9879658620ed99985f27a2e2 100644
--- a/apps/wei/management/commands/wei_algorithm.py
+++ b/apps/wei/management/commands/wei_algorithm.py
@@ -1,15 +1,44 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
+from argparse import ArgumentParser, FileType
from django.core.management import BaseCommand
+from django.db import transaction
+
from wei.forms import CurrentSurvey
class Command(BaseCommand):
help = "Attribute to each first year member a bus for the WEI"
+ def add_arguments(self, parser: ArgumentParser):
+ parser.add_argument('--doit', '-d', action='store_true', help='Finally run the algorithm in non-dry mode.')
+ parser.add_argument('--output', '-o', nargs='?', type=FileType('w'), default=self.stdout,
+ help='Output file for the algorithm result. Default is standard output.')
+
+ @transaction.atomic
def handle(self, *args, **options):
"""
Run the WEI algorithm to attribute a bus to each first year member.
"""
- CurrentSurvey.get_algorithm_class()().run_algorithm()
+ sid = transaction.savepoint()
+
+ algorithm = CurrentSurvey.get_algorithm_class()()
+ algorithm.run_algorithm()
+
+ output = options['output']
+ registrations = algorithm.get_registrations()
+ per_bus = {bus: [r for r in registrations if r.information['selected_bus_pk'] == bus.pk]
+ for bus in algorithm.get_buses()}
+ for bus, members in per_bus.items():
+ output.write(bus.name + "\n")
+ output.write("=" * len(bus.name) + "\n")
+ for r in members:
+ output.write(r.user.username + "\n")
+ output.write("\n")
+
+ if not options['doit']:
+ self.stderr.write(self.style.WARNING("Running in dry mode. "
+ "Use --doit option to really execute the algorithm."))
+ transaction.savepoint_rollback(sid)
+ return
diff --git a/apps/wei/migrations/0003_bus_size.py b/apps/wei/migrations/0003_bus_size.py
new file mode 100644
index 0000000000000000000000000000000000000000..85c0939c855c4ddc3c8f81315a6e428fceaee08a
--- /dev/null
+++ b/apps/wei/migrations/0003_bus_size.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.19 on 2021-08-25 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wei', '0002_auto_20210313_1235'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='bus',
+ name='size',
+ field=models.IntegerField(default=50, verbose_name='seat count in the bus'),
+ ),
+ ]
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 0798fa4069c2d23b050c575779d3504acdbcf8a5..b59a0dfd7b0c22c0dd3fddce129e65253dcd00b9 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import json
@@ -66,6 +66,11 @@ class Bus(models.Model):
verbose_name=_("name"),
)
+ size = models.IntegerField(
+ verbose_name=_("seat count in the bus"),
+ default=50,
+ )
+
description = models.TextField(
blank=True,
default="",
@@ -91,7 +96,7 @@ class Bus(models.Model):
"""
Store information as a JSON string
"""
- self.information_json = json.dumps(information)
+ self.information_json = json.dumps(information, indent=2)
def __str__(self):
return self.name
@@ -255,7 +260,34 @@ class WEIRegistration(models.Model):
"""
Store information as a JSON string
"""
- self.information_json = json.dumps(information)
+ self.information_json = json.dumps(information, indent=2)
+
+ @property
+ def fee(self):
+ bde = Club.objects.get(pk=1)
+ kfet = Club.objects.get(pk=2)
+
+ kfet_member = Membership.objects.filter(
+ club_id=kfet.id,
+ user=self.user,
+ date_start__gte=kfet.membership_start,
+ ).exists()
+ bde_member = Membership.objects.filter(
+ club_id=bde.id,
+ user=self.user,
+ date_start__gte=bde.membership_start,
+ ).exists()
+
+ fee = self.wei.membership_fee_paid if self.user.profile.paid \
+ else self.wei.membership_fee_unpaid
+ if not kfet_member:
+ fee += kfet.membership_fee_paid if self.user.profile.paid \
+ else kfet.membership_fee_unpaid
+ if not bde_member:
+ fee += bde.membership_fee_paid if self.user.profile.paid \
+ else bde.membership_fee_unpaid
+
+ return fee
@property
def is_validated(self):
diff --git a/apps/wei/tables.py b/apps/wei/tables.py
index f0a7868eefb7b327bd795ff4118b7d0a6cbf8e6a..274e8dbd9eb01d40a39e6f0b8fa1de294bc0e86e 100644
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
@@ -43,6 +43,7 @@ class WEIRegistrationTable(tables.Table):
edit = tables.LinkColumn(
'wei:wei_update_registration',
+ orderable=False,
args=[A('pk')],
verbose_name=_("Edit"),
text=_("Edit"),
@@ -53,18 +54,14 @@ class WEIRegistrationTable(tables.Table):
}
}
)
- validate = tables.LinkColumn(
- 'wei:validate_registration',
- args=[A('pk')],
+
+ validate = tables.Column(
verbose_name=_("Validate"),
- text=_("Validate"),
+ orderable=False,
+ accessor=A('pk'),
attrs={
'th': {
'id': 'validate-membership-header'
- },
- 'a': {
- 'class': 'btn btn-success',
- 'data-type': 'validate-membership'
}
}
)
@@ -72,6 +69,7 @@ class WEIRegistrationTable(tables.Table):
delete = tables.LinkColumn(
'wei:wei_delete_registration',
args=[A('pk')],
+ orderable=False,
verbose_name=_("delete"),
text=_("Delete"),
attrs={
@@ -96,7 +94,20 @@ class WEIRegistrationTable(tables.Table):
registration=record,
)
)
- return _("Validate") if hasperm else format_html("<span class='no-perm'></span>")
+ if not hasperm:
+ return format_html("<span class='no-perm'></span>")
+
+ url = reverse_lazy('wei:validate_registration', args=(record.pk,))
+ text = _('Validate')
+ if record.fee > record.user.note.balance:
+ btn_class = 'btn-secondary'
+ tooltip = _("The user does not have enough money.")
+ else:
+ btn_class = 'btn-success'
+ tooltip = _("The user has enough money, you can validate the registration.")
+
+ return format_html(f"<a class=\"btn {btn_class}\" data-type='validate-membership' data-toggle=\"tooltip\" "
+ f"title=\"{tooltip}\" href=\"{url}\">{text}</a>")
def render_delete(self, record):
hasperm = PermissionBackend.check_perm(get_current_authenticated_user(), "wei.delete_weimembership", record)
@@ -108,7 +119,8 @@ class WEIRegistrationTable(tables.Table):
}
model = WEIRegistration
template_name = 'django_tables2/bootstrap4.html'
- fields = ('user', 'user__first_name', 'user__last_name', 'first_year',)
+ fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
+ 'edit', 'validate', 'delete',)
row_attrs = {
'class': 'table-row',
'id': lambda record: "row-" + str(record.pk),
@@ -147,7 +159,7 @@ class WEIMembershipTable(tables.Table):
model = WEIMembership
template_name = 'django_tables2/bootstrap4.html'
fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
- 'year', 'bus', 'team', )
+ 'year', 'bus', 'team', 'registration__caution_check', )
row_attrs = {
'class': 'table-row',
'id': lambda record: "row-" + str(record.pk),
diff --git a/apps/wei/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html
index 8e541d7acbae3c85fb7d2e094c614c49af80851f..fe9506b288db7638022125e6bd6f6ff0bf06e6b6 100644
--- a/apps/wei/templates/wei/weimembership_list.html
+++ b/apps/wei/templates/wei/weimembership_list.html
@@ -6,28 +6,32 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% load render_table from django_tables2 %}
{% block profile_content %}
- <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/bus/équipe ...">
- <hr>
-
- <div id="memberships_table">
- {% if table.data %}
- {% render_table table %}
- {% else %}
- <div class="alert alert-warning">
- {% trans "There is no membership found with this pattern." %}
- </div>
- {% endif %}
+ <div class="card">
+ <div class="card-body">
+ <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/bus/équipe ...">
+ <hr>
+
+ <div id="memberships_table">
+ {% if table.data %}
+ {% render_table table %}
+ {% else %}
+ <div class="alert alert-warning">
+ {% trans "There is no membership found with this pattern." %}
+ </div>
+ {% endif %}
+ </div>
</div>
- <a href="{% url 'wei:wei_registrations' pk=club.pk %}">
- <button class="btn btn-block btn-info">{% trans "View unvalidated registrations..." %}</button>
- </a>
-
- <hr>
-
- <a href="{% url 'wei:wei_memberships_pdf' wei_pk=club.pk %}" data-turbolinks="false">
- <button class="btn btn-block btn-danger"><i class="fa fa-file-pdf-o"></i> {% trans "View as PDF" %}</button>
- </a>
+ <div class="card-footer text-center">
+ <a href="{% url 'wei:wei_registrations' pk=club.pk %}">
+ <button class="btn btn-block btn-info">{% trans "View unvalidated registrations..." %}</button>
+ </a>
+ <hr>
+ <a href="{% url 'wei:wei_memberships_pdf' wei_pk=club.pk %}" data-turbolinks="false">
+ <button class="btn btn-block btn-danger"><i class="fa fa-file-pdf-o"></i> {% trans "View as PDF" %}</button>
+ </a>
+ </div>
+ </div>
{% endblock %}
{% block extrajavascript %}
diff --git a/apps/wei/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html
index 842696bbe8d1c4812f7f34061dab54585b3fc39b..c0c1e321e2cae1921250a999b261518f176f6bff 100644
--- a/apps/wei/templates/wei/weiregistration_list.html
+++ b/apps/wei/templates/wei/weiregistration_list.html
@@ -6,22 +6,28 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% load render_table from django_tables2 %}
{% block profile_content %}
- <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
- <hr>
-
- <div id="registrations_table">
- {% if table.data %}
- {% render_table table %}
- {% else %}
- <div class="alert alert-warning">
- {% trans "There is no pre-registration found with this pattern." %}
- </div>
- {% endif %}
+ <div class="card">
+ <div class="card-body">
+ <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
+ <hr>
+
+ <div id="registrations_table">
+ {% if table.data %}
+ {% render_table table %}
+ {% else %}
+ <div class="alert alert-warning">
+ {% trans "There is no pre-registration found with this pattern." %}
+ </div>
+ {% endif %}
+ </div>
</div>
- <a href="{% url 'wei:wei_memberships' pk=club.pk %}">
- <button class="btn btn-block btn-info">{% trans "View validated memberships..." %}</button>
- </a>
+ <div class="card-footer text-center">
+ <a href="{% url 'wei:wei_memberships' pk=club.pk %}">
+ <button class="btn btn-block btn-info">{% trans "View validated memberships..." %}</button>
+ </a>
+ </div>
+ </div>
{% endblock %}
{% block extrajavascript %}
diff --git a/apps/wei/tests/test_wei_registration.py b/apps/wei/tests/test_wei_registration.py
index 92ceb289569fd8d79a3f2ba184f362a1c2bc76b7..71eded3aed0adbc1fbddd46c29dc7240e77f014e 100644
--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@@ -1,8 +1,9 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import subprocess
from datetime import timedelta, date
+from unittest import skip
from api.tests import TestAPI
from django.conf import settings
@@ -188,7 +189,9 @@ class TestWEIRegistration(TestCase):
response = self.client.post(reverse("wei:add_bus", kwargs=dict(pk=self.wei.pk)), dict(
wei=self.wei.id,
name="Create Bus Test",
+ size=50,
description="This bus was created.",
+ information_json="{}",
))
qs = Bus.objects.filter(name="Create Bus Test")
self.assertTrue(qs.exists())
@@ -218,7 +221,9 @@ class TestWEIRegistration(TestCase):
response = self.client.post(reverse("wei:update_bus", kwargs=dict(pk=self.bus.pk)), dict(
name="Update Bus Test",
+ size=40,
description="This bus was updated.",
+ information_json="{}",
))
qs = Bus.objects.filter(name="Update Bus Test", id=self.bus.id)
self.assertRedirects(response, reverse("wei:manage_bus", kwargs=dict(pk=self.bus.pk)), 302, 200)
@@ -754,7 +759,7 @@ class TestDefaultWEISurvey(TestCase):
WEISurvey.update_form(None, None)
self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
- self.assertEqual(CurrentSurvey.get_year(), 2020)
+ self.assertEqual(CurrentSurvey.get_year(), 2021)
class TestWEISurveyAlgorithm(TestCase):
@@ -808,6 +813,7 @@ class TestWEISurveyAlgorithm(TestCase):
)
CurrentSurvey(self.registration).save()
+ @skip # FIXME Write good unit tests
def test_survey_algorithm(self):
CurrentSurvey.get_algorithm_class()().run_algorithm()
diff --git a/apps/wei/urls.py b/apps/wei/urls.py
index 7cf91a60c6862c25f4dc524b937b14f5e38ac0da..a7e8ca994872cec097e5ca1fc903af814f7a6ff5 100644
--- a/apps/wei/urls.py
+++ b/apps/wei/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.urls import path
diff --git a/apps/wei/views.py b/apps/wei/views.py
index bd7b3d49ea23393a9011cfbe87dd483afd00e5a6..04efe95452347ebb022c227c1ff051e36d7f5ccf 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import os
@@ -222,7 +222,7 @@ class WEIMembershipsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
| Q(team__name__iregex=pattern)
)
- return qs[:20]
+ return qs
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
@@ -256,7 +256,7 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
| Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
)
- return qs[:20]
+ return qs
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
@@ -344,6 +344,8 @@ class BusUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["club"] = self.object.wei
+ context["information"] = CurrentSurvey.get_algorithm_class().get_bus_information(self.object)
+ self.object.save()
return context
def get_form(self, form_class=None):
@@ -816,22 +818,13 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
date_start__gte=bde.membership_start,
).exists()
- fee = registration.wei.membership_fee_paid if registration.user.profile.paid \
- else registration.wei.membership_fee_unpaid
- if not context["kfet_member"]:
- fee += kfet.membership_fee_paid if registration.user.profile.paid \
- else kfet.membership_fee_unpaid
- if not context["bde_member"]:
- fee += bde.membership_fee_paid if registration.user.profile.paid \
- else bde.membership_fee_unpaid
-
- context["fee"] = fee
+ context["fee"] = registration.fee
form = context["form"]
if registration.soge_credit:
- form.fields["credit_amount"].initial = fee
+ form.fields["credit_amount"].initial = registration.fee
else:
- form.fields["credit_amount"].initial = max(0, fee - registration.user.note.balance)
+ form.fields["credit_amount"].initial = max(0, registration.fee - registration.user.note.balance)
return context
@@ -918,10 +911,6 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
if credit_type is None or registration.soge_credit:
credit_amount = 0
- if not registration.caution_check and not registration.first_year:
- form.add_error('bus', _("This user didn't give her/his caution check."))
- return super().form_invalid(form)
-
if not registration.soge_credit and user.note.balance + credit_amount < fee:
# Users must have money before registering to the WEI.
form.add_error('bus',
diff --git a/entrypoint.sh b/entrypoint.sh
index 1a5341c1ea1d2248209faa3b0c0d3e1d61a6586f..ddfcb00af7e8ddb82ee74c279242dfa7a21f785e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
if [ -z ${NOTE_URL+x} ]; then
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 067933287b956c01e1b35536fd417ce07e6650bc..46d60dc6d848fd40287649c0cc732e90d2c59c29 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2021-08-29 14:06+0200\n"
"PO-Revision-Date: 2020-11-16 20:02+0000\n"
"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
"Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20/de/>\n"
@@ -52,11 +52,11 @@ msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
#: 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:232 apps/note/models/transactions.py:26
-#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:300
-#: apps/permission/models.py:333
+#: 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
-#: apps/wei/models.py:66 apps/wei/models.py:118
+#: apps/wei/models.py:66 apps/wei/models.py:123
#: apps/wei/templates/wei/base.html:26
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "name"
@@ -90,8 +90,8 @@ msgstr "Vearnstaltungarte"
#: apps/activity/models.py:68
#: apps/activity/templates/activity/includes/activity_info.html:19
-#: apps/note/models/transactions.py:81 apps/permission/models.py:113
-#: apps/permission/models.py:192 apps/wei/models.py:72 apps/wei/models.py:129
+#: apps/note/models/transactions.py:81 apps/permission/models.py:110
+#: apps/permission/models.py:189 apps/wei/models.py:77 apps/wei/models.py:134
msgid "description"
msgstr "Beschreibung"
@@ -105,15 +105,14 @@ msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)."
#: apps/activity/models.py:83
#: apps/activity/templates/activity/includes/activity_info.html:22
-#: apps/note/models/notes.py:208 apps/note/models/transactions.py:66
-#: apps/permission/models.py:167
+#: apps/note/models/notes.py:207 apps/note/models/transactions.py:66
+#: apps/permission/models.py:164
msgid "type"
msgstr "Type"
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
-#: apps/note/models/notes.py:149 apps/treasury/models.py:278
-#: apps/treasury/templates/treasury/sogecredit_detail.html:14
-#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
+#: apps/note/models/notes.py:148 apps/treasury/models.py:283
+#: apps/wei/models.py:165 apps/wei/templates/wei/survey.html:15
msgid "user"
msgstr "User"
@@ -167,7 +166,7 @@ msgid "entry time"
msgstr "Eintrittzeit"
#: apps/activity/models.py:178 apps/note/apps.py:14
-#: apps/note/models/notes.py:78
+#: apps/note/models/notes.py:77
msgid "note"
msgstr "Note"
@@ -204,12 +203,14 @@ msgid "The balance is negative."
msgstr "Kontostand ist im Rot."
#: apps/activity/models.py:240
+#: apps/treasury/templates/treasury/sogecredit_detail.html:14
msgid "last name"
msgstr "Nachname"
#: apps/activity/models.py:245
#: apps/member/templates/member/includes/profile_info.html:4
#: apps/registration/templates/registration/future_profile_detail.html:16
+#: apps/treasury/templates/treasury/sogecredit_detail.html:17
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "first name"
msgstr "Vorname"
@@ -250,7 +251,7 @@ msgstr "Eingetreten um "
msgid "remove"
msgstr "entfernen"
-#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:193
+#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:197
msgid "Type"
msgstr "Type"
@@ -267,11 +268,11 @@ msgstr "Nachname"
msgid "First name"
msgstr "Vorname"
-#: apps/activity/tables.py:86 apps/note/models/notes.py:87
+#: apps/activity/tables.py:86 apps/note/models/notes.py:86
msgid "Note"
msgstr "Note"
-#: apps/activity/tables.py:88 apps/member/tables.py:46
+#: apps/activity/tables.py:88 apps/member/tables.py:49
msgid "Balance"
msgstr "Kontostand"
@@ -286,7 +287,7 @@ msgid "Guest deleted"
msgstr "Gastliste"
#: apps/activity/templates/activity/activity_entry.html:14
-#: apps/note/models/transactions.py:256
+#: apps/note/models/transactions.py:257
#: apps/note/templates/note/transaction_form.html:16
#: apps/note/templates/note/transaction_form.html:148
#: note_kfet/templates/base.html:73
@@ -294,13 +295,13 @@ msgid "Transfer"
msgstr "Ãœberweisen"
#: apps/activity/templates/activity/activity_entry.html:18
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:21
msgid "Credit"
msgstr "Kredit"
#: apps/activity/templates/activity/activity_entry.html:21
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:25
msgid "Debit"
msgstr "Soll"
@@ -439,7 +440,7 @@ msgstr "Logs"
msgid "IP Address"
msgstr "IP Adresse"
-#: apps/logs/models.py:36 apps/permission/models.py:137
+#: apps/logs/models.py:36 apps/permission/models.py:134
msgid "model"
msgstr "Model"
@@ -460,8 +461,8 @@ msgid "create"
msgstr "schaffen"
#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:201
-#: apps/permission/models.py:130 apps/treasury/tables.py:38
-#: apps/wei/tables.py:75
+#: apps/permission/models.py:127 apps/treasury/tables.py:38
+#: apps/wei/tables.py:73
msgid "delete"
msgstr "entfernen"
@@ -500,15 +501,15 @@ msgstr "Mitgliedschaftpreis (bezahlte Studenten)"
msgid "membership fee (unpaid students)"
msgstr "Mitgliedschaftpreis (unbezahlte Studenten)"
-#: apps/member/admin.py:65 apps/member/models.py:316
+#: apps/member/admin.py:65 apps/member/models.py:317
msgid "roles"
msgstr "Rollen"
-#: apps/member/admin.py:66 apps/member/models.py:330
+#: apps/member/admin.py:66 apps/member/models.py:331
msgid "fee"
msgstr "Preis"
-#: apps/member/apps.py:14 apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/member/apps.py:14 apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "member"
msgstr "Mitglied"
@@ -540,8 +541,8 @@ msgstr "Maximal Größe: 2MB"
msgid "This image cannot be loaded."
msgstr "Dieses Bild kann nicht geladen werden."
-#: apps/member/forms.py:141 apps/member/views.py:100
-#: apps/registration/forms.py:33 apps/registration/views.py:254
+#: apps/member/forms.py:141 apps/member/views.py:101
+#: apps/registration/forms.py:33 apps/registration/views.py:258
msgid "An alias with a similar name already exists."
msgstr "Ein ähnliches Alias ist schon benutzt."
@@ -587,14 +588,14 @@ msgid "Roles"
msgstr "Rollen"
#: apps/member/models.py:38
-#: apps/member/templates/member/includes/profile_info.html:34
+#: 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 "Telefonnummer"
#: apps/member/models.py:45
-#: apps/member/templates/member/includes/profile_info.html:28
+#: 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"
@@ -681,14 +682,14 @@ msgid "Year of entry to the school (None if not ENS student)"
msgstr "ENS Eintrittjahr (None wenn kein ENS Student)"
#: apps/member/models.py:83
-#: apps/member/templates/member/includes/profile_info.html:38
+#: 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:45
+#: apps/member/templates/member/includes/profile_info.html:46
#: apps/registration/templates/registration/future_profile_detail.html:43
#: apps/wei/templates/wei/weimembership_form.html:47
msgid "paid"
@@ -698,7 +699,7 @@ msgstr "bezahlt"
msgid "Tells if the user receive a salary."
msgstr "User ist bezahlt."
-#: apps/member/models.py:100 apps/treasury/tables.py:146
+#: apps/member/models.py:100 apps/treasury/tables.py:143
msgid "No"
msgstr "Nein"
@@ -760,7 +761,7 @@ msgstr "Ihre Note Kfet Konto bestätigen"
#: apps/member/models.py:204
#: apps/member/templates/member/includes/club_info.html:55
-#: apps/member/templates/member/includes/profile_info.html:31
+#: 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
@@ -810,7 +811,7 @@ msgstr ""
"Maximales Datum einer Mitgliedschaft, nach dem Mitglieder es erneuern müssen."
#: apps/member/models.py:286 apps/member/models.py:311
-#: apps/note/models/notes.py:177
+#: apps/note/models/notes.py:176
msgid "club"
msgstr "Club"
@@ -818,41 +819,41 @@ msgstr "Club"
msgid "clubs"
msgstr "Clubs"
-#: apps/member/models.py:321
+#: apps/member/models.py:322
msgid "membership starts on"
msgstr "Mitgliedschaft fängt an"
-#: apps/member/models.py:325
+#: apps/member/models.py:326
msgid "membership ends on"
msgstr "Mitgliedschaft endet am"
-#: apps/member/models.py:421
+#: apps/member/models.py:422
#, python-brace-format
msgid "The role {role} does not apply to the club {club}."
msgstr "Die Rolle {role} ist nicht erlaubt für das Club {club}."
-#: apps/member/models.py:430 apps/member/views.py:646
+#: apps/member/models.py:431 apps/member/views.py:651
msgid "User is already a member of the club"
msgstr "User ist schon ein Mitglied dieser club"
-#: apps/member/models.py:442 apps/member/views.py:656
+#: apps/member/models.py:443 apps/member/views.py:661
msgid "User is not a member of the parent club"
msgstr "User ist noch nicht Mitglied des Urclubs"
-#: apps/member/models.py:495
+#: apps/member/models.py:496
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Mitgliedschaft von {user} für das Club {club}"
-#: apps/member/models.py:498 apps/note/models/transactions.py:358
+#: apps/member/models.py:499 apps/note/models/transactions.py:389
msgid "membership"
msgstr "Mitgliedschaft"
-#: apps/member/models.py:499
+#: apps/member/models.py:500
msgid "memberships"
msgstr "Mitgliedschaften"
-#: apps/member/tables.py:121
+#: apps/member/tables.py:137
msgid "Renew"
msgstr "Erneuern"
@@ -963,8 +964,8 @@ msgstr ""
"erlaubt."
#: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:245
-#: apps/member/views.py:448
+#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:253
+#: apps/member/views.py:456
msgid "Note aliases"
msgstr "Note Aliases"
@@ -1002,7 +1003,7 @@ msgid "Filter roles:"
msgstr "Rollen filter:"
#: apps/member/templates/member/club_members.html:36
-#: apps/wei/templates/wei/weimembership_list.html:17
+#: apps/wei/templates/wei/weimembership_list.html:19
msgid "There is no membership found with this pattern."
msgstr "Keine Mitgliedschaft mit diesem pattern gefunden."
@@ -1020,8 +1021,8 @@ msgid "membership fee"
msgstr "Mitgliedsachftpreis"
#: apps/member/templates/member/includes/club_info.html:43
-#: apps/member/templates/member/includes/profile_info.html:42
-#: apps/treasury/templates/treasury/sogecredit_detail.html:18
+#: apps/member/templates/member/includes/profile_info.html:43
+#: apps/treasury/templates/treasury/sogecredit_detail.html:24
#: apps/wei/templates/wei/base.html:60
msgid "balance"
msgstr "Kontostand"
@@ -1039,6 +1040,7 @@ msgstr "Aliases bearbeiten"
#: apps/member/templates/member/includes/profile_info.html:7
#: apps/registration/templates/registration/future_profile_detail.html:19
+#: apps/treasury/templates/treasury/sogecredit_detail.html:20
#: apps/wei/templates/wei/weimembership_form.html:17
msgid "username"
msgstr "Username"
@@ -1051,7 +1053,7 @@ msgstr "Kennwort"
msgid "Change password"
msgstr "Kennword ändern"
-#: apps/member/templates/member/includes/profile_info.html:53
+#: apps/member/templates/member/includes/profile_info.html:55
msgid "API token"
msgstr "API token"
@@ -1103,43 +1105,43 @@ msgstr "Anmeldung"
msgid "This address must be valid."
msgstr "Diese Adresse muss gültig sein."
-#: apps/member/views.py:137
+#: apps/member/views.py:138
msgid "Profile detail"
msgstr "Profile detail"
-#: apps/member/views.py:204
+#: apps/member/views.py:205
msgid "Search user"
msgstr "User finden"
-#: apps/member/views.py:265
+#: apps/member/views.py:273
msgid "Update note picture"
msgstr "Notebild ändern"
-#: apps/member/views.py:311
+#: apps/member/views.py:319
msgid "Manage auth token"
msgstr "Auth token bearbeiten"
-#: apps/member/views.py:338
+#: apps/member/views.py:346
msgid "Create new club"
msgstr "Neue Club"
-#: apps/member/views.py:357
+#: apps/member/views.py:365
msgid "Search club"
msgstr "Club finden"
-#: apps/member/views.py:390
+#: apps/member/views.py:398
msgid "Club detail"
msgstr "Club Details"
-#: apps/member/views.py:471
+#: apps/member/views.py:479
msgid "Update club"
msgstr "Club bearbeiten"
-#: apps/member/views.py:505
+#: apps/member/views.py:513
msgid "Add new member to the club"
msgstr "Neue Mitglieder"
-#: apps/member/views.py:637 apps/wei/views.py:928
+#: apps/member/views.py:642 apps/wei/views.py:917
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -1147,20 +1149,14 @@ msgstr ""
"Diese User hat nicht genug Geld um Mitglied zu werden, und darf nich im Rot "
"sein."
-#: apps/member/views.py:660
+#: apps/member/views.py:665
msgid "The membership must start after {:%m-%d-%Y}."
msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen."
-#: apps/member/views.py:665
+#: apps/member/views.py:670
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen."
-#: apps/member/views.py:672 apps/member/views.py:674 apps/member/views.py:676
-#: apps/registration/views.py:304 apps/registration/views.py:306
-#: apps/registration/views.py:308 apps/wei/views.py:933 apps/wei/views.py:937
-msgid "This field is required."
-msgstr "Dies ist ein Pflichtfeld."
-
#: apps/member/views.py:816
msgid "Manage roles of an user in the club"
msgstr "Rollen in diesen Club bearbeiten"
@@ -1184,7 +1180,7 @@ msgid "amount"
msgstr "Anzahl"
#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
-#: apps/note/models/transactions.py:227
+#: apps/note/models/transactions.py:228
msgid ""
"The transaction can't be saved since the source note or the destination note "
"is not active."
@@ -1204,7 +1200,7 @@ msgstr "Empfänger"
msgid "Reason"
msgstr "Grund"
-#: apps/note/forms.py:79 apps/treasury/tables.py:139
+#: apps/note/forms.py:79 apps/treasury/tables.py:136
msgid "Valid"
msgstr "Gültig"
@@ -1224,35 +1220,35 @@ msgstr "Erschafft nacht"
msgid "Created before"
msgstr "Erschafft vor"
-#: apps/note/models/notes.py:32
+#: apps/note/models/notes.py:31
msgid "account balance"
msgstr "Kontostand"
-#: apps/note/models/notes.py:33
+#: apps/note/models/notes.py:32
msgid "in centimes, money credited for this instance"
msgstr "In Cent, der Anzahl Geld für diese Konto"
-#: apps/note/models/notes.py:38
+#: apps/note/models/notes.py:37
msgid "last negative date"
msgstr "letztes mal im Rot"
-#: apps/note/models/notes.py:39
+#: apps/note/models/notes.py:38
msgid "last time the balance was negative"
msgstr "letztes mal im Rot"
-#: apps/note/models/notes.py:45
+#: apps/note/models/notes.py:44
msgid "display image"
msgstr "Bild"
-#: apps/note/models/notes.py:54 apps/note/models/transactions.py:132
+#: apps/note/models/notes.py:53 apps/note/models/transactions.py:132
msgid "created at"
msgstr "erschafft am"
-#: apps/note/models/notes.py:59
+#: apps/note/models/notes.py:58
msgid "active"
msgstr "Aktiv"
-#: apps/note/models/notes.py:62
+#: apps/note/models/notes.py:61
msgid ""
"Designates whether this note should be treated as active. Unselect this "
"instead of deleting notes."
@@ -1260,7 +1256,7 @@ msgstr ""
"Designates whether this note should be treated as active. Unselect this "
"instead of deleting notes."
-#: apps/note/models/notes.py:69
+#: apps/note/models/notes.py:68
msgid ""
"The user blocked his/her note manually, eg. when he/she left the school for "
"holidays. It can be reactivated at any time."
@@ -1268,53 +1264,53 @@ msgstr ""
"The user blocked his/her note manually, eg. when he/she left the school for "
"holidays. It can be reactivated at any time."
-#: apps/note/models/notes.py:71
+#: apps/note/models/notes.py:70
msgid "The note is blocked by the the BDE and can't be manually reactivated."
msgstr "The note is blocked by the the BDE and can't be manually reactivated."
-#: apps/note/models/notes.py:79
+#: apps/note/models/notes.py:78
msgid "notes"
msgstr "Notes"
-#: apps/note/models/notes.py:133
+#: apps/note/models/notes.py:132
msgid "This alias is already taken."
msgstr "Dieses Alias ist schon benutzt."
-#: apps/note/models/notes.py:153
+#: apps/note/models/notes.py:152
msgid "one's note"
msgstr "Jemand Note"
-#: apps/note/models/notes.py:154
+#: apps/note/models/notes.py:153
msgid "users note"
msgstr "User Note"
-#: apps/note/models/notes.py:160
+#: apps/note/models/notes.py:159
#, python-format
msgid "%(user)s's note"
msgstr "%(user)s's note"
-#: apps/note/models/notes.py:181
+#: apps/note/models/notes.py:180
msgid "club note"
msgstr "Club Note"
-#: apps/note/models/notes.py:182
+#: apps/note/models/notes.py:181
msgid "clubs notes"
msgstr "Club Notes"
-#: apps/note/models/notes.py:188
+#: apps/note/models/notes.py:187
#, python-format
msgid "Note of %(club)s club"
msgstr "%(club)s Note"
-#: apps/note/models/notes.py:214
+#: apps/note/models/notes.py:213
msgid "special note"
msgstr "Sondernote"
-#: apps/note/models/notes.py:215
+#: apps/note/models/notes.py:214
msgid "special notes"
msgstr "Sondernoten"
-#: apps/note/models/notes.py:238
+#: apps/note/models/notes.py:237
msgid "Invalid alias"
msgstr "Unerlaublt Alias"
@@ -1391,7 +1387,7 @@ msgid "transaction"
msgstr "Transaktion"
#: apps/note/models/transactions.py:162
-#: apps/treasury/templates/treasury/sogecredit_detail.html:22
+#: apps/treasury/templates/treasury/sogecredit_detail.html:28
msgid "transactions"
msgstr "Transaktionen"
@@ -1412,34 +1408,34 @@ msgstr ""
"Die Notenguthaben müssen zwischen - 92 233 720 368 547 758,08 € und 92 233 "
"720 368 547 758,07 € liegen."
-#: apps/note/models/transactions.py:276
+#: apps/note/models/transactions.py:277
msgid ""
"The destination of this transaction must equal to the destination of the "
"template."
msgstr ""
"Der Empfänger dieser Transaktion muss dem Empfänger der Vorlage entsprechen."
-#: apps/note/models/transactions.py:286
+#: apps/note/models/transactions.py:287
msgid "Template"
msgstr "Vorlage"
-#: apps/note/models/transactions.py:289
+#: apps/note/models/transactions.py:290
msgid "recurrent transaction"
msgstr "wiederkehrende Transaktion"
-#: apps/note/models/transactions.py:290
+#: apps/note/models/transactions.py:291
msgid "recurrent transactions"
msgstr "wiederkehrende Transaktionen"
-#: apps/note/models/transactions.py:305
+#: apps/note/models/transactions.py:306
msgid "first_name"
msgstr "Vorname"
-#: apps/note/models/transactions.py:310
+#: apps/note/models/transactions.py:311
msgid "bank"
msgstr "Bank"
-#: apps/note/models/transactions.py:327
+#: apps/note/models/transactions.py:328
msgid ""
"A special transaction is only possible between a Note associated to a "
"payment method and a User or a Club"
@@ -1447,19 +1443,25 @@ msgstr ""
"Eine Sondertransaktion ist nur zwischen einer Note, die einer "
"Zahlungsmethode zugeordnet ist, und einem User oder einem Club möglich"
-#: apps/note/models/transactions.py:336
+#: apps/note/models/transactions.py:355 apps/note/models/transactions.py:358
+#: apps/note/models/transactions.py:361 apps/wei/views.py:922
+#: apps/wei/views.py:926
+msgid "This field is required."
+msgstr "Dies ist ein Pflichtfeld."
+
+#: apps/note/models/transactions.py:367
msgid "Special transaction"
msgstr "Sondertransaktion"
-#: apps/note/models/transactions.py:337
+#: apps/note/models/transactions.py:368
msgid "Special transactions"
msgstr "Sondertranskationen"
-#: apps/note/models/transactions.py:353
+#: apps/note/models/transactions.py:384
msgid "membership transaction"
msgstr "Mitgliedschafttransaktion"
-#: apps/note/models/transactions.py:354 apps/treasury/models.py:284
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:289
msgid "membership transactions"
msgstr "Mitgliedschaftttransaktionen"
@@ -1477,14 +1479,14 @@ msgstr "Kein Grund gegeben"
#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
-#: apps/treasury/templates/treasury/sogecredit_detail.html:59
-#: apps/wei/tables.py:76 apps/wei/tables.py:103
+#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/wei/tables.py:74 apps/wei/tables.py:114
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:31
msgid "Delete"
msgstr "Löschen"
#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
-#: apps/wei/tables.py:47 apps/wei/tables.py:48
+#: apps/wei/tables.py:48 apps/wei/tables.py:49
#: apps/wei/templates/wei/base.html:89
#: apps/wei/templates/wei/bus_detail.html:20
#: apps/wei/templates/wei/busteam_detail.html:20
@@ -1563,13 +1565,13 @@ msgstr "Aktion"
#: apps/note/templates/note/transaction_form.html:112
#: apps/treasury/forms.py:136 apps/treasury/tables.py:67
-#: apps/treasury/tables.py:135
+#: apps/treasury/tables.py:132
#: apps/treasury/templates/treasury/remittance_form.html:23
msgid "Amount"
msgstr "Anzahl"
#: apps/note/templates/note/transaction_form.html:128
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:52
msgid "Name"
msgstr "Name"
@@ -1649,53 +1651,53 @@ msgstr "Sie können keine Taste sehen."
msgid "Search transactions"
msgstr "Transaktion finden"
-#: apps/permission/models.py:92
+#: apps/permission/models.py:89
#, python-brace-format
msgid "Can {type} {model}.{field} in {query}"
msgstr "Kann {type} {model}.{field} in {query}"
-#: apps/permission/models.py:94
+#: apps/permission/models.py:91
#, python-brace-format
msgid "Can {type} {model} in {query}"
msgstr "Kann {type} {model} in {query}"
-#: apps/permission/models.py:107
+#: apps/permission/models.py:104
msgid "rank"
msgstr "Rank"
-#: apps/permission/models.py:120
+#: apps/permission/models.py:117
msgid "permission mask"
msgstr "Berechtigungsmaske"
-#: apps/permission/models.py:121
+#: apps/permission/models.py:118
msgid "permission masks"
msgstr "Berechtigungsmasken"
-#: apps/permission/models.py:127
+#: apps/permission/models.py:124
msgid "add"
msgstr "hinzufügen"
-#: apps/permission/models.py:128
+#: apps/permission/models.py:125
msgid "view"
msgstr "Schauen"
-#: apps/permission/models.py:129
+#: apps/permission/models.py:126
msgid "change"
msgstr "bearbeiten"
-#: apps/permission/models.py:161
+#: apps/permission/models.py:158
msgid "query"
msgstr "Abfrage"
-#: apps/permission/models.py:174
+#: apps/permission/models.py:171
msgid "mask"
msgstr "Maske"
-#: apps/permission/models.py:180
+#: apps/permission/models.py:177
msgid "field"
msgstr "Feld"
-#: apps/permission/models.py:185
+#: apps/permission/models.py:182
msgid ""
"Tells if the permission should be granted even if the membership of the user "
"is expired."
@@ -1703,28 +1705,28 @@ msgstr ""
"Gibt an, ob die Berechtigung auch erteilt werden soll, wenn die "
"Mitgliedschaft des Benutzers abgelaufen ist."
-#: apps/permission/models.py:186
+#: apps/permission/models.py:183
#: apps/permission/templates/permission/all_rights.html:89
msgid "permanent"
msgstr "permanent"
-#: apps/permission/models.py:197
+#: apps/permission/models.py:194
msgid "permission"
msgstr "Berechtigung"
-#: apps/permission/models.py:198 apps/permission/models.py:338
+#: apps/permission/models.py:195 apps/permission/models.py:335
msgid "permissions"
msgstr "Berechtigungen"
-#: apps/permission/models.py:203
+#: apps/permission/models.py:200
msgid "Specifying field applies only to view and change permission types."
msgstr "Angabefeld gilt nur zum Anzeigen und Ändern von Berechtigungstypen."
-#: apps/permission/models.py:343
+#: apps/permission/models.py:340
msgid "for club"
msgstr "Für Club"
-#: apps/permission/models.py:353 apps/permission/models.py:354
+#: apps/permission/models.py:350 apps/permission/models.py:351
msgid "role permissions"
msgstr "Berechtigung Rollen"
@@ -1737,7 +1739,7 @@ msgstr ""
"Sie haben nicht die Berechtigung, das Feld {field} in dieser Instanz von "
"Modell {app_label} zu ändern. {model_name}"
-#: apps/permission/signals.py:73 apps/permission/views.py:103
+#: apps/permission/signals.py:73 apps/permission/views.py:105
#, python-brace-format
msgid ""
"You don't have the permission to add an instance of model {app_label}."
@@ -1795,7 +1797,7 @@ msgstr "Abfrage:"
msgid "No associated permission"
msgstr "Keine zugehörige Berechtigung"
-#: apps/permission/views.py:70
+#: apps/permission/views.py:72
#, python-brace-format
msgid ""
"You don't have the permission to update this instance of the model "
@@ -1805,7 +1807,7 @@ msgstr ""
"diesen Parametern zu aktualisieren. Bitte korrigieren Sie Ihre Daten und "
"versuchen Sie es erneut."
-#: apps/permission/views.py:74
+#: apps/permission/views.py:76
#, python-brace-format
msgid ""
"You don't have the permission to create an instance of the model \"{model}\" "
@@ -1815,11 +1817,11 @@ msgstr ""
"diesen Parametern zu erstellen. Bitte korrigieren Sie Ihre Daten und "
"versuchen Sie es erneut."
-#: apps/permission/views.py:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:112 note_kfet/templates/base.html:109
msgid "Rights"
msgstr "Rechten"
-#: apps/permission/views.py:115
+#: apps/permission/views.py:117
msgid "All rights"
msgstr "Alle Rechten"
@@ -2009,18 +2011,18 @@ msgstr "Unregistrierte Users"
msgid "Registration detail"
msgstr "Registrierung Detailen"
-#: apps/registration/views.py:273
+#: apps/registration/views.py:278
msgid "You must join the BDE."
msgstr "Sie müssen die BDE beitreten."
-#: apps/registration/views.py:297
+#: apps/registration/views.py:302
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte "
"mindestens {} betragen"
-#: apps/registration/views.py:384
+#: apps/registration/views.py:383
msgid "Invalidate pre-registration"
msgstr "Ungültige Vorregistrierung"
@@ -2028,7 +2030,7 @@ msgstr "Ungültige Vorregistrierung"
msgid "Treasury"
msgstr "Quaestor"
-#: apps/treasury/forms.py:25 apps/treasury/models.py:90
+#: apps/treasury/forms.py:25 apps/treasury/models.py:91
#: apps/treasury/templates/treasury/invoice_form.html:22
msgid "This invoice is locked and can no longer be edited."
msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
@@ -2041,7 +2043,7 @@ msgstr "Ãœberweisung ist bereits geschlossen."
msgid "You can't change the type of the remittance."
msgstr "Sie können die Art der Überweisung nicht ändern."
-#: apps/treasury/forms.py:124 apps/treasury/models.py:260
+#: apps/treasury/forms.py:124 apps/treasury/models.py:265
#: 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
@@ -2053,120 +2055,120 @@ msgstr "Ãœberweisung"
msgid "No attached remittance"
msgstr "Keine beigefügte Überweisung"
-#: apps/treasury/models.py:23
+#: apps/treasury/models.py:24
msgid "Invoice identifier"
msgstr "Rechnungskennung"
-#: apps/treasury/models.py:37
+#: apps/treasury/models.py:38
msgid "BDE"
msgstr "BDE"
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:43
msgid "Object"
msgstr "Objekt"
-#: apps/treasury/models.py:46
+#: apps/treasury/models.py:47
msgid "Description"
msgstr "Beschreibung"
-#: apps/treasury/models.py:55
+#: apps/treasury/models.py:56
msgid "Address"
msgstr "Adresse"
-#: apps/treasury/models.py:60 apps/treasury/models.py:187
+#: apps/treasury/models.py:61 apps/treasury/models.py:191
msgid "Date"
msgstr "Datum"
-#: apps/treasury/models.py:64
+#: apps/treasury/models.py:65
msgid "Acquitted"
msgstr "Bezahlt"
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:70
msgid "Locked"
msgstr "Gesperrt"
-#: apps/treasury/models.py:70
+#: apps/treasury/models.py:71
msgid "An invoice can't be edited when it is locked."
msgstr "Eine Rechnung kann nicht bearbeitet werden, wenn sie gesperrt ist."
-#: apps/treasury/models.py:76
+#: apps/treasury/models.py:77
msgid "tex source"
msgstr "Tex Quelle"
-#: apps/treasury/models.py:110 apps/treasury/models.py:126
+#: apps/treasury/models.py:111 apps/treasury/models.py:127
msgid "invoice"
msgstr "Rechnung"
-#: apps/treasury/models.py:111
+#: apps/treasury/models.py:112
msgid "invoices"
msgstr "Rechnungen"
-#: apps/treasury/models.py:114
+#: apps/treasury/models.py:115
#, python-brace-format
msgid "Invoice #{id}"
msgstr "Rechnung #{id}"
-#: apps/treasury/models.py:131
+#: apps/treasury/models.py:132
msgid "Designation"
msgstr "Bezeichnung"
-#: apps/treasury/models.py:135
+#: apps/treasury/models.py:138
msgid "Quantity"
msgstr "Qualität"
-#: apps/treasury/models.py:139
+#: apps/treasury/models.py:143
msgid "Unit price"
msgstr "Einzelpreis"
-#: apps/treasury/models.py:155
+#: apps/treasury/models.py:159
msgid "product"
msgstr "Produkt"
-#: apps/treasury/models.py:156
+#: apps/treasury/models.py:160
msgid "products"
msgstr "Produkten"
-#: apps/treasury/models.py:176
+#: apps/treasury/models.py:180
msgid "remittance type"
msgstr "Ãœberweisungstyp"
-#: apps/treasury/models.py:177
+#: apps/treasury/models.py:181
msgid "remittance types"
msgstr "Ãœberweisungstypen"
-#: apps/treasury/models.py:198
+#: apps/treasury/models.py:202
msgid "Comment"
msgstr "Kommentar"
-#: apps/treasury/models.py:203
+#: apps/treasury/models.py:207
msgid "Closed"
msgstr "Geschlossen"
-#: apps/treasury/models.py:207
+#: apps/treasury/models.py:211
msgid "remittance"
msgstr "Ãœberweisung"
-#: apps/treasury/models.py:208
+#: apps/treasury/models.py:212
msgid "remittances"
msgstr "Ãœberweisungen"
-#: apps/treasury/models.py:241
+#: apps/treasury/models.py:245
msgid "Remittance #{:d}: {}"
msgstr "Ãœberweisung #{:d}:{}"
-#: apps/treasury/models.py:264
+#: apps/treasury/models.py:269
msgid "special transaction proxy"
msgstr "spezielle Transaktion Proxy"
-#: apps/treasury/models.py:265
+#: apps/treasury/models.py:270
msgid "special transaction proxies"
msgstr "spezielle Transaktion Proxies"
-#: apps/treasury/models.py:290
+#: apps/treasury/models.py:295
msgid "credit transaction"
msgstr "Kredit Transaktion"
-#: apps/treasury/models.py:374
+#: apps/treasury/models.py:379
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."
@@ -2174,16 +2176,16 @@ msgstr ""
"Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
"Note zu bezahlen."
-#: apps/treasury/models.py:389
+#: apps/treasury/models.py:399
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Kredit von der Société générale"
-#: apps/treasury/models.py:390
+#: apps/treasury/models.py:400
msgid "Credits from the Société générale"
msgstr "Krediten von der Société générale"
-#: apps/treasury/models.py:393
+#: apps/treasury/models.py:403
#, python-brace-format
msgid "Soge credit for {user}"
msgstr "Kredit von der Société générale für {user}"
@@ -2207,7 +2209,7 @@ msgstr "Transaktionanzahl"
msgid "View"
msgstr "Schauen"
-#: apps/treasury/tables.py:146
+#: apps/treasury/tables.py:143
msgid "Yes"
msgstr "Ja"
@@ -2312,11 +2314,11 @@ msgstr "Geschlossene Ãœberweisungen"
msgid "There is no closed remittance yet."
msgstr "Es gibt noch keine geschlossene Ãœberweisung."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:29
+#: apps/treasury/templates/treasury/sogecredit_detail.html:35
msgid "total amount"
msgstr "Totalanzahlt"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:35
+#: apps/treasury/templates/treasury/sogecredit_detail.html:41
msgid ""
"Warning: Validating this credit implies that all membership transactions "
"will be validated."
@@ -2324,7 +2326,7 @@ msgstr ""
"Achtung: Die Validierung dieses Guthabens bedeutet, dass alle "
"Mitgliedschaftstransaktionen validiert werden."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:36
+#: apps/treasury/templates/treasury/sogecredit_detail.html:42
msgid ""
"If you delete this credit, there all membership transactions will be also "
"validated, but no credit will be operated."
@@ -2332,7 +2334,7 @@ msgstr ""
"Wenn Sie dieses Kredit löschen, werden dort auch alle "
"Mitgliedschaftstransaktionen validiert, es wird jedoch kein Kredit betrieben."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:37
+#: apps/treasury/templates/treasury/sogecredit_detail.html:43
msgid ""
"If this credit is validated, then the user won't be able to ask for a credit "
"from the Société générale."
@@ -2340,17 +2342,17 @@ msgstr ""
"Wenn dieses Kredit validiert ist, kann der Benutzer bei der Société générale "
"kein Guthaben anfordern."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:38
+#: apps/treasury/templates/treasury/sogecredit_detail.html:44
msgid "If you think there is an error, please contact the \"respos info\"."
msgstr ""
"Wenn Sie glauben, dass ein Fehler vorliegt, wenden Sie sich bitte an die "
"\"respos info\"."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:44
+#: apps/treasury/templates/treasury/sogecredit_detail.html:50
msgid "This credit is already validated."
msgstr "Dieser Kredit ist bereits validiert."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:49
+#: apps/treasury/templates/treasury/sogecredit_detail.html:55
msgid ""
"Warning: if you don't validate this credit, the note of the user doesn't "
"have enough money to pay its memberships."
@@ -2358,18 +2360,18 @@ msgstr ""
"Achtung: Wenn Sie diese Kredit nicht bestätigen, die Note von dem Benutzer "
"nicht genug Geld hat, um seine Mitgliedschaft zu zahlen."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:50
+#: apps/treasury/templates/treasury/sogecredit_detail.html:56
msgid "Please ask the user to credit its note before deleting this credit."
msgstr ""
"Bitte bitten Sie den Benutzer, seine Note gutzuschreiben, bevor Sie diese "
"Kredit löschen."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:57
-#: apps/wei/tables.py:59 apps/wei/tables.py:60 apps/wei/tables.py:99
+#: apps/treasury/templates/treasury/sogecredit_detail.html:63
+#: apps/wei/tables.py:59 apps/wei/tables.py:101
msgid "Validate"
msgstr "Validieren"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/treasury/templates/treasury/sogecredit_detail.html:71
msgid "Return to credit list"
msgstr "Zurück zur Kreditlist"
@@ -2425,13 +2427,13 @@ msgid "Manage credits from the Société générale"
msgstr "Krediten von der Société générale handeln"
#: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
-#: apps/wei/models.py:61 apps/wei/models.py:167
+#: apps/wei/models.py:61 apps/wei/models.py:172
#: note_kfet/templates/base.html:103
msgid "WEI"
msgstr "WEI"
-#: apps/wei/forms/registration.py:51 apps/wei/models.py:113
-#: apps/wei/models.py:283
+#: apps/wei/forms/registration.py:51 apps/wei/models.py:118
+#: apps/wei/models.py:315
msgid "bus"
msgstr "Bus"
@@ -2457,7 +2459,7 @@ msgstr ""
"Buschef, freies Elektron)"
#: apps/wei/forms/registration.py:67 apps/wei/forms/registration.py:77
-#: apps/wei/models.py:148
+#: apps/wei/models.py:153
msgid "WEI Roles"
msgstr "WEI Rollen"
@@ -2469,7 +2471,7 @@ msgstr "Wählen Sie die Rollen aus, an denen Sie interessiert sind."
msgid "This team doesn't belong to the given bus."
msgstr "Dieses Team gehört nicht zum angegebenen Bus."
-#: apps/wei/forms/surveys/wei2020.py:30
+#: apps/wei/forms/surveys/wei2021.py:31
msgid "Choose a word:"
msgstr "Wählen Sie ein Wort:"
@@ -2485,103 +2487,109 @@ msgstr "Anfangsdatum"
msgid "date end"
msgstr "Abschlussdatum"
-#: apps/wei/models.py:77
+#: apps/wei/models.py:70
+#, fuzzy
+#| msgid "The user joined the bus"
+msgid "seat count in the bus"
+msgstr "Der Benutzer ist dem Bus beigetreten"
+
+#: apps/wei/models.py:82
msgid "survey information"
msgstr "Umfrage Infos"
-#: apps/wei/models.py:78
+#: apps/wei/models.py:83
msgid "Information about the survey for new members, encoded in JSON"
msgstr "Informationen zur Umfrage für neue Mitglieder, codiert in JSON"
-#: apps/wei/models.py:100
+#: apps/wei/models.py:105
msgid "Bus"
msgstr "Bus"
-#: apps/wei/models.py:101 apps/wei/templates/wei/weiclub_detail.html:51
+#: apps/wei/models.py:106 apps/wei/templates/wei/weiclub_detail.html:51
msgid "Buses"
msgstr "Buses"
-#: apps/wei/models.py:122
+#: apps/wei/models.py:127
msgid "color"
msgstr "Farbe"
-#: apps/wei/models.py:123
+#: apps/wei/models.py:128
msgid "The color of the T-Shirt, stored with its number equivalent"
msgstr "Die Farbe des T-Shirts, gespeichert mit der entsprechenden Nummer"
-#: apps/wei/models.py:137
+#: apps/wei/models.py:142
msgid "Bus team"
msgstr "Bus Team"
-#: apps/wei/models.py:138
+#: apps/wei/models.py:143
msgid "Bus teams"
msgstr "Bus Teams"
-#: apps/wei/models.py:147
+#: apps/wei/models.py:152
msgid "WEI Role"
msgstr "WEI Rolle"
-#: apps/wei/models.py:172
+#: apps/wei/models.py:177
msgid "Credit from Société générale"
msgstr "Kredit von der Société générale"
-#: apps/wei/models.py:177
+#: apps/wei/models.py:182
msgid "Caution check given"
msgstr "Caution check given"
-#: apps/wei/models.py:181 apps/wei/templates/wei/weimembership_form.html:64
+#: apps/wei/models.py:186 apps/wei/templates/wei/weimembership_form.html:64
msgid "birth date"
msgstr "Geburtsdatum"
-#: apps/wei/models.py:187 apps/wei/models.py:197
+#: apps/wei/models.py:192 apps/wei/models.py:202
msgid "Male"
msgstr "Männlich"
-#: apps/wei/models.py:188 apps/wei/models.py:198
+#: apps/wei/models.py:193 apps/wei/models.py:203
msgid "Female"
msgstr "Weiblich"
-#: apps/wei/models.py:189
+#: apps/wei/models.py:194
msgid "Non binary"
msgstr "Nicht binär"
-#: apps/wei/models.py:191 apps/wei/templates/wei/weimembership_form.html:55
+#: apps/wei/models.py:196 apps/wei/templates/wei/weimembership_form.html:55
msgid "gender"
msgstr "Geschlecht"
-#: apps/wei/models.py:200 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:205 apps/wei/templates/wei/weimembership_form.html:58
msgid "clothing cut"
msgstr "Kleidung Schnitt"
-#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:218 apps/wei/templates/wei/weimembership_form.html:61
msgid "clothing size"
msgstr "Kleidergröße"
-#: apps/wei/models.py:219 apps/wei/templates/wei/weimembership_form.html:67
+#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:67
msgid "health issues"
msgstr "Gesundheitsprobleme"
-#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:70
msgid "emergency contact name"
msgstr "Notfall-Kontakt"
-#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:73
msgid "emergency contact phone"
msgstr "Notfallkontakttelefon"
-#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:52
msgid "first year"
msgstr "Erste Jahr"
-#: apps/wei/models.py:235
+#: apps/wei/models.py:240
msgid "Tells if the user is new in the school."
msgstr "Gibt an, ob der USer neu in der Schule ist."
-#: apps/wei/models.py:240
+#: apps/wei/models.py:245
msgid "registration information"
msgstr "Registrierung Detailen"
-#: apps/wei/models.py:241
+#: apps/wei/models.py:246
msgid ""
"Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON"
@@ -2589,44 +2597,58 @@ msgstr ""
"Informationen zur Registrierung (Busse für alte Mitglieder, Umfrage für neue "
"Mitglieder), verschlüsselt in JSON"
-#: apps/wei/models.py:272
+#: apps/wei/models.py:304
msgid "WEI User"
msgstr "WEI User"
-#: apps/wei/models.py:273
+#: apps/wei/models.py:305
msgid "WEI Users"
msgstr "WEI Users"
-#: apps/wei/models.py:293
+#: apps/wei/models.py:325
msgid "team"
msgstr "Team"
-#: apps/wei/models.py:303
+#: apps/wei/models.py:335
msgid "WEI registration"
msgstr "WEI Registrierung"
-#: apps/wei/models.py:307
+#: apps/wei/models.py:339
msgid "WEI membership"
msgstr "WEI Mitgliedschaft"
-#: apps/wei/models.py:308
+#: apps/wei/models.py:340
msgid "WEI memberships"
msgstr "WEI Mitgliedschaften"
-#: apps/wei/tables.py:127
+#: apps/wei/tables.py:104
+msgid "The user does not have enough money."
+msgstr ""
+
+#: apps/wei/tables.py:107
+#, fuzzy
+#| msgid ""
+#| "The note has enough money (%(pretty_fee)s required), the registration is "
+#| "possible."
+msgid "The user has enough money, you can validate the registration."
+msgstr ""
+"Die Note hat genug Geld (%(pretty_fee)s erforderlich), die Registrierung ist "
+"möglich."
+
+#: apps/wei/tables.py:139
msgid "Year"
msgstr "Jahr"
-#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:32
+#: apps/wei/tables.py:177 apps/wei/templates/wei/bus_detail.html:32
#: apps/wei/templates/wei/busteam_detail.html:50
msgid "Teams"
msgstr "Teams"
-#: apps/wei/tables.py:174 apps/wei/tables.py:215
+#: apps/wei/tables.py:186 apps/wei/tables.py:227
msgid "Members count"
msgstr "Anzahl Mitgliedern"
-#: apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "members"
msgstr "Mitglieder"
@@ -2646,11 +2668,11 @@ msgstr "WEI Preis (unbezahlte Studenten)"
msgid "WEI list"
msgstr "WEI Liste"
-#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:508
+#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:510
msgid "Register 1A"
msgstr "1A Registrieren"
-#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:576
+#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:578
msgid "Register 2A+"
msgstr "2A+ Registrieren"
@@ -2673,14 +2695,14 @@ msgstr "Mitglied"
#: apps/wei/templates/wei/bus_detail.html:54
#: apps/wei/templates/wei/busteam_detail.html:60
-#: apps/wei/templates/wei/weimembership_list.html:29
+#: apps/wei/templates/wei/weimembership_list.html:31
msgid "View as PDF"
msgstr "Als PDF schauen"
#: apps/wei/templates/wei/survey.html:11
#: apps/wei/templates/wei/survey_closed.html:11
-#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:984
-#: apps/wei/views.py:1039 apps/wei/views.py:1049
+#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:973
+#: apps/wei/views.py:1028 apps/wei/views.py:1038
msgid "Survey WEI"
msgstr "WEI Umfrage"
@@ -2840,7 +2862,7 @@ msgstr ""
"Mitgliedschaft wird automatisch bearbeitet, die WEI-Registrierung beinhaltet "
"den Mitgliedsbeitrag."
-#: apps/wei/templates/wei/weimembership_list.html:23
+#: apps/wei/templates/wei/weimembership_list.html:27
msgid "View unvalidated registrations..."
msgstr "Nicht validierte Registrierungen anzeigen ..."
@@ -2858,11 +2880,11 @@ msgstr ""
"Möchten Sie die Registrierung von %(user)s für die WEI %(wei_name)s wirklich "
"löschen? Diese Aktion kann nicht rückgängig gemacht werden."
-#: apps/wei/templates/wei/weiregistration_list.html:17
+#: apps/wei/templates/wei/weiregistration_list.html:19
msgid "There is no pre-registration found with this pattern."
msgstr "Bei diesem Muster wurde keine Vorregistrierung gefunden."
-#: apps/wei/templates/wei/weiregistration_list.html:23
+#: apps/wei/templates/wei/weiregistration_list.html:27
msgid "View validated memberships..."
msgstr "Validierte Mitgliedschaften anzeigen ..."
@@ -2902,31 +2924,31 @@ msgstr "Neue Bus"
msgid "Update bus"
msgstr "Bus bearbeiten"
-#: apps/wei/views.py:364
+#: apps/wei/views.py:366
msgid "Manage bus"
msgstr "Bus ändern"
-#: apps/wei/views.py:391
+#: apps/wei/views.py:393
msgid "Create new team"
msgstr "Neue Bus Team"
-#: apps/wei/views.py:431
+#: apps/wei/views.py:433
msgid "Update team"
msgstr "Team bearbeiten"
-#: apps/wei/views.py:462
+#: apps/wei/views.py:464
msgid "Manage WEI team"
msgstr "WEI Team bearbeiten"
-#: apps/wei/views.py:484
+#: apps/wei/views.py:486
msgid "Register first year student to the WEI"
msgstr "Registrieren Sie den Erstsemester beim WEI"
-#: apps/wei/views.py:530 apps/wei/views.py:611
+#: apps/wei/views.py:532 apps/wei/views.py:613
msgid "This user is already registered to this WEI."
msgstr "Dieser Benutzer ist bereits bei dieser WEI registriert."
-#: apps/wei/views.py:535
+#: apps/wei/views.py:537
msgid ""
"This user can't be in her/his first year since he/she has already "
"participated to a WEI."
@@ -2934,47 +2956,43 @@ msgstr ""
"Dieser Benutzer kann nicht in seinem ersten Jahr sein, da er bereits an "
"einer WEI teilgenommen hat."
-#: apps/wei/views.py:552
+#: apps/wei/views.py:554
msgid "Register old student to the WEI"
msgstr "Registrieren Sie einen alten Studenten beim WEI"
-#: apps/wei/views.py:595 apps/wei/views.py:684
+#: apps/wei/views.py:597 apps/wei/views.py:686
msgid "You already opened an account in the Société générale."
msgstr "Sie haben bereits ein Konto in der Société générale eröffnet."
-#: apps/wei/views.py:641
+#: apps/wei/views.py:643
msgid "Update WEI Registration"
msgstr "WEI Registrierung aktualisieren"
-#: apps/wei/views.py:744
+#: apps/wei/views.py:746
msgid "Delete WEI registration"
msgstr "WEI Registrierung löschen"
-#: apps/wei/views.py:755
+#: apps/wei/views.py:757
msgid "You don't have the right to delete this WEI registration."
msgstr "Sie haben nicht das Recht, diese WEI-Registrierung zu löschen."
-#: apps/wei/views.py:774
+#: apps/wei/views.py:776
msgid "Validate WEI registration"
msgstr "Überprüfen Sie die WEI-Registrierung"
-#: apps/wei/views.py:922
-msgid "This user didn't give her/his caution check."
-msgstr "Dieser User hat seine / ihre Vorsicht nicht überprüft."
-
-#: note_kfet/settings/base.py:157
+#: note_kfet/settings/base.py:161
msgid "German"
msgstr "Deutsch"
-#: note_kfet/settings/base.py:158
+#: note_kfet/settings/base.py:162
msgid "English"
msgstr "English"
-#: note_kfet/settings/base.py:159
+#: note_kfet/settings/base.py:163
msgid "Spanish"
msgstr "Spanisch"
-#: note_kfet/settings/base.py:160
+#: note_kfet/settings/base.py:164
msgid "French"
msgstr "Französich"
@@ -3073,17 +3091,17 @@ msgstr "Registrieren"
msgid "Log in"
msgstr "Anmelden"
-#: note_kfet/templates/base.html:156
+#: 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."
msgstr ""
-#: note_kfet/templates/base.html:160
+#: note_kfet/templates/base.html:164
msgid "You are not a Kfet member, so you can't use your note account."
msgstr ""
-#: note_kfet/templates/base.html:166
+#: note_kfet/templates/base.html:170
msgid ""
"Your e-mail address is not validated. Please check your mail inbox and click "
"on the validation link."
@@ -3091,7 +3109,7 @@ msgstr ""
"Ihre E-Mail-Adresse ist nicht validiert. Bitte überprüfen Sie Ihren "
"Posteingang und klicken Sie auf den Validierungslink."
-#: note_kfet/templates/base.html:171
+#: note_kfet/templates/base.html:176
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 "
@@ -3100,7 +3118,7 @@ msgid ""
"you go to the end of the account creation."
msgstr ""
-#: note_kfet/templates/base.html:194
+#: note_kfet/templates/base.html:199
msgid "Contact us"
msgstr "Kontakt"
@@ -3225,6 +3243,9 @@ msgstr ""
"müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den "
"Sie erhalten haben."
+#~ msgid "This user didn't give her/his caution check."
+#~ msgstr "Dieser User hat seine / ihre Vorsicht nicht überprüft."
+
#~ msgid "Central Authentication Service"
#~ msgstr "Central Authentication Service"
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b726917df04bcc9ecf40222684241ef1ad756c92..e582dab071a131cb737984e247dd07158862fc79 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2021-08-29 14:06+0200\n"
"PO-Revision-Date: 2020-11-17 23:47+0100\n"
"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
"Language-Team: \n"
@@ -51,11 +51,11 @@ msgstr "Usted no puede invitar más de 3 persona a esta actividad."
#: 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:232 apps/note/models/transactions.py:26
-#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:300
-#: apps/permission/models.py:333
+#: 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
-#: apps/wei/models.py:66 apps/wei/models.py:118
+#: apps/wei/models.py:66 apps/wei/models.py:123
#: apps/wei/templates/wei/base.html:26
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "name"
@@ -89,8 +89,8 @@ msgstr "tipos de actividad"
#: apps/activity/models.py:68
#: apps/activity/templates/activity/includes/activity_info.html:19
-#: apps/note/models/transactions.py:81 apps/permission/models.py:113
-#: apps/permission/models.py:192 apps/wei/models.py:72 apps/wei/models.py:129
+#: apps/note/models/transactions.py:81 apps/permission/models.py:110
+#: apps/permission/models.py:189 apps/wei/models.py:77 apps/wei/models.py:134
msgid "description"
msgstr "descripción"
@@ -104,15 +104,14 @@ msgstr "Lugar donde se organiza la actividad, por ejemplo la Kfet."
#: apps/activity/models.py:83
#: apps/activity/templates/activity/includes/activity_info.html:22
-#: apps/note/models/notes.py:208 apps/note/models/transactions.py:66
-#: apps/permission/models.py:167
+#: apps/note/models/notes.py:207 apps/note/models/transactions.py:66
+#: apps/permission/models.py:164
msgid "type"
msgstr "tipo"
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
-#: apps/note/models/notes.py:149 apps/treasury/models.py:278
-#: apps/treasury/templates/treasury/sogecredit_detail.html:14
-#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
+#: apps/note/models/notes.py:148 apps/treasury/models.py:283
+#: apps/wei/models.py:165 apps/wei/templates/wei/survey.html:15
msgid "user"
msgstr "usuario"
@@ -166,7 +165,7 @@ msgid "entry time"
msgstr "hora de entrada"
#: apps/activity/models.py:178 apps/note/apps.py:14
-#: apps/note/models/notes.py:78
+#: apps/note/models/notes.py:77
msgid "note"
msgstr "note"
@@ -203,12 +202,14 @@ msgid "The balance is negative."
msgstr "El saldo es negativo."
#: apps/activity/models.py:240
+#: apps/treasury/templates/treasury/sogecredit_detail.html:14
msgid "last name"
msgstr "apellido"
#: apps/activity/models.py:245
#: apps/member/templates/member/includes/profile_info.html:4
#: apps/registration/templates/registration/future_profile_detail.html:16
+#: apps/treasury/templates/treasury/sogecredit_detail.html:17
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "first name"
msgstr "nombre"
@@ -249,7 +250,7 @@ msgstr "Entrado el "
msgid "remove"
msgstr "quitar"
-#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:193
+#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:197
msgid "Type"
msgstr "Tipo"
@@ -266,11 +267,11 @@ msgstr "Apellido"
msgid "First name"
msgstr "Nombre"
-#: apps/activity/tables.py:86 apps/note/models/notes.py:87
+#: apps/activity/tables.py:86 apps/note/models/notes.py:86
msgid "Note"
msgstr "Note"
-#: apps/activity/tables.py:88 apps/member/tables.py:46
+#: apps/activity/tables.py:88 apps/member/tables.py:49
msgid "Balance"
msgstr "Saldo de la cuenta"
@@ -283,7 +284,7 @@ msgid "Guest deleted"
msgstr "Invitados suprimidos"
#: apps/activity/templates/activity/activity_entry.html:14
-#: apps/note/models/transactions.py:256
+#: apps/note/models/transactions.py:257
#: apps/note/templates/note/transaction_form.html:16
#: apps/note/templates/note/transaction_form.html:148
#: note_kfet/templates/base.html:73
@@ -291,13 +292,13 @@ msgid "Transfer"
msgstr "Transferencia"
#: apps/activity/templates/activity/activity_entry.html:18
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:21
msgid "Credit"
msgstr "Crédito"
#: apps/activity/templates/activity/activity_entry.html:21
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:25
msgid "Debit"
msgstr "Débito"
@@ -436,7 +437,7 @@ msgstr "Logs"
msgid "IP Address"
msgstr "Dirección IP"
-#: apps/logs/models.py:36 apps/permission/models.py:137
+#: apps/logs/models.py:36 apps/permission/models.py:134
msgid "model"
msgstr "modelo"
@@ -457,8 +458,8 @@ msgid "create"
msgstr "crear"
#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:201
-#: apps/permission/models.py:130 apps/treasury/tables.py:38
-#: apps/wei/tables.py:75
+#: apps/permission/models.py:127 apps/treasury/tables.py:38
+#: apps/wei/tables.py:73
msgid "delete"
msgstr "suprimir"
@@ -497,15 +498,15 @@ msgstr "pago de afiliación (estudiantes pagados)"
msgid "membership fee (unpaid students)"
msgstr "pago de afiliación (estudiantes no pagados)"
-#: apps/member/admin.py:65 apps/member/models.py:316
+#: apps/member/admin.py:65 apps/member/models.py:317
msgid "roles"
msgstr "papel"
-#: apps/member/admin.py:66 apps/member/models.py:330
+#: apps/member/admin.py:66 apps/member/models.py:331
msgid "fee"
msgstr "pago"
-#: apps/member/apps.py:14 apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/member/apps.py:14 apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "member"
msgstr "miembro"
@@ -537,8 +538,8 @@ msgstr "Tamaño máximo : 2Mo"
msgid "This image cannot be loaded."
msgstr "Esta imagen no puede ser cargada."
-#: apps/member/forms.py:141 apps/member/views.py:100
-#: apps/registration/forms.py:33 apps/registration/views.py:254
+#: apps/member/forms.py:141 apps/member/views.py:101
+#: apps/registration/forms.py:33 apps/registration/views.py:258
msgid "An alias with a similar name already exists."
msgstr "Un alias similar ya existe."
@@ -584,14 +585,14 @@ msgid "Roles"
msgstr "Papeles"
#: apps/member/models.py:38
-#: apps/member/templates/member/includes/profile_info.html:34
+#: 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 "número de teléfono"
#: apps/member/models.py:45
-#: apps/member/templates/member/includes/profile_info.html:28
+#: 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"
@@ -678,14 +679,14 @@ msgid "Year of entry to the school (None if not ENS student)"
msgstr "Año de ingreso en la escuela (None si no un alumn@ ENS)"
#: apps/member/models.py:83
-#: apps/member/templates/member/includes/profile_info.html:38
+#: 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 "dirección"
#: apps/member/models.py:90
-#: apps/member/templates/member/includes/profile_info.html:45
+#: apps/member/templates/member/includes/profile_info.html:46
#: apps/registration/templates/registration/future_profile_detail.html:43
#: apps/wei/templates/wei/weimembership_form.html:47
msgid "paid"
@@ -695,7 +696,7 @@ msgstr "pagado"
msgid "Tells if the user receive a salary."
msgstr "Indica si el usuario percibe un salario."
-#: apps/member/models.py:100 apps/treasury/tables.py:146
+#: apps/member/models.py:100 apps/treasury/tables.py:143
msgid "No"
msgstr "No"
@@ -757,7 +758,7 @@ msgstr "Active su cuenta Note Kfet"
#: apps/member/models.py:204
#: apps/member/templates/member/includes/club_info.html:55
-#: apps/member/templates/member/includes/profile_info.html:31
+#: 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
@@ -806,7 +807,7 @@ msgstr ""
"prorrogarla."
#: apps/member/models.py:286 apps/member/models.py:311
-#: apps/note/models/notes.py:177
+#: apps/note/models/notes.py:176
msgid "club"
msgstr "club"
@@ -814,41 +815,41 @@ msgstr "club"
msgid "clubs"
msgstr "clubs"
-#: apps/member/models.py:321
+#: apps/member/models.py:322
msgid "membership starts on"
msgstr "afiliación empezá el"
-#: apps/member/models.py:325
+#: apps/member/models.py:326
msgid "membership ends on"
msgstr "afiliación termina el"
-#: apps/member/models.py:421
+#: apps/member/models.py:422
#, python-brace-format
msgid "The role {role} does not apply to the club {club}."
msgstr "El papel {role} no se encuentra en el club {club}."
-#: apps/member/models.py:430 apps/member/views.py:646
+#: apps/member/models.py:431 apps/member/views.py:651
msgid "User is already a member of the club"
msgstr "Usuario ya esta un miembro del club"
-#: apps/member/models.py:442 apps/member/views.py:656
+#: apps/member/models.py:443 apps/member/views.py:661
msgid "User is not a member of the parent club"
msgstr "Usuario no es un miembro del club pariente"
-#: apps/member/models.py:495
+#: apps/member/models.py:496
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Afiliación of {user} for the club {club}"
-#: apps/member/models.py:498 apps/note/models/transactions.py:358
+#: apps/member/models.py:499 apps/note/models/transactions.py:389
msgid "membership"
msgstr "afiliación"
-#: apps/member/models.py:499
+#: apps/member/models.py:500
msgid "memberships"
msgstr "afiliaciones"
-#: apps/member/tables.py:121
+#: apps/member/tables.py:137
msgid "Renew"
msgstr "Prorrogar"
@@ -956,8 +957,8 @@ msgstr ""
"nuevo posibles."
#: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:245
-#: apps/member/views.py:448
+#: 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"
@@ -995,7 +996,7 @@ msgid "Filter roles:"
msgstr "Filtrar los papeles :"
#: apps/member/templates/member/club_members.html:36
-#: apps/wei/templates/wei/weimembership_list.html:17
+#: apps/wei/templates/wei/weimembership_list.html:19
msgid "There is no membership found with this pattern."
msgstr "No hay afiliación encontrada con esta entrada."
@@ -1013,8 +1014,8 @@ msgid "membership fee"
msgstr "pago de afiliación"
#: apps/member/templates/member/includes/club_info.html:43
-#: apps/member/templates/member/includes/profile_info.html:42
-#: apps/treasury/templates/treasury/sogecredit_detail.html:18
+#: apps/member/templates/member/includes/profile_info.html:43
+#: apps/treasury/templates/treasury/sogecredit_detail.html:24
#: apps/wei/templates/wei/base.html:60
msgid "balance"
msgstr "saldo de la cuenta"
@@ -1032,6 +1033,7 @@ msgstr "Gestionar los alias"
#: apps/member/templates/member/includes/profile_info.html:7
#: apps/registration/templates/registration/future_profile_detail.html:19
+#: apps/treasury/templates/treasury/sogecredit_detail.html:20
#: apps/wei/templates/wei/weimembership_form.html:17
msgid "username"
msgstr "nombre de usuario"
@@ -1044,7 +1046,7 @@ msgstr "contraseña"
msgid "Change password"
msgstr "Cambiar la contraseña"
-#: apps/member/templates/member/includes/profile_info.html:53
+#: apps/member/templates/member/includes/profile_info.html:55
msgid "API token"
msgstr "Acceso API"
@@ -1096,43 +1098,43 @@ msgstr "Registraciones"
msgid "This address must be valid."
msgstr "Este correo tiene que ser valido."
-#: apps/member/views.py:137
+#: apps/member/views.py:138
msgid "Profile detail"
msgstr "Detalles del usuario"
-#: apps/member/views.py:204
+#: apps/member/views.py:205
msgid "Search user"
msgstr "Buscar un usuario"
-#: apps/member/views.py:265
+#: apps/member/views.py:273
msgid "Update note picture"
msgstr "Modificar la imagen de la note"
-#: apps/member/views.py:311
+#: apps/member/views.py:319
msgid "Manage auth token"
msgstr "Gestionar los token de autentificación"
-#: apps/member/views.py:338
+#: apps/member/views.py:346
msgid "Create new club"
msgstr "Crear un nuevo club"
-#: apps/member/views.py:357
+#: apps/member/views.py:365
msgid "Search club"
msgstr "Buscar un club"
-#: apps/member/views.py:390
+#: apps/member/views.py:398
msgid "Club detail"
msgstr "Detalles del club"
-#: apps/member/views.py:471
+#: apps/member/views.py:479
msgid "Update club"
msgstr "Modificar el club"
-#: apps/member/views.py:505
+#: apps/member/views.py:513
msgid "Add new member to the club"
msgstr "Añadir un nuevo miembro al club"
-#: apps/member/views.py:637 apps/wei/views.py:928
+#: apps/member/views.py:642 apps/wei/views.py:917
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -1140,20 +1142,14 @@ msgstr ""
"Este usuario no tiene suficiente dinero para unirse a este club, y no puede "
"tener un saldo negativo."
-#: apps/member/views.py:660
+#: apps/member/views.py:665
msgid "The membership must start after {:%m-%d-%Y}."
msgstr "La afiliación tiene que empezar después del {:%d-%m-%Y}."
-#: apps/member/views.py:665
+#: apps/member/views.py:670
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "La afiliación tiene que empezar antes del {:%d-%m-%Y}."
-#: apps/member/views.py:672 apps/member/views.py:674 apps/member/views.py:676
-#: apps/registration/views.py:304 apps/registration/views.py:306
-#: apps/registration/views.py:308 apps/wei/views.py:933 apps/wei/views.py:937
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
#: apps/member/views.py:816
msgid "Manage roles of an user in the club"
msgstr "Gestionar los papeles de un usuario en el club"
@@ -1177,7 +1173,7 @@ msgid "amount"
msgstr "monto"
#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
-#: apps/note/models/transactions.py:227
+#: apps/note/models/transactions.py:228
msgid ""
"The transaction can't be saved since the source note or the destination note "
"is not active."
@@ -1197,7 +1193,7 @@ msgstr "Destino"
msgid "Reason"
msgstr "Motivo"
-#: apps/note/forms.py:79 apps/treasury/tables.py:139
+#: apps/note/forms.py:79 apps/treasury/tables.py:136
msgid "Valid"
msgstr "Valido"
@@ -1217,35 +1213,35 @@ msgstr "Creado después"
msgid "Created before"
msgstr "Creado antes"
-#: apps/note/models/notes.py:32
+#: apps/note/models/notes.py:31
msgid "account balance"
msgstr "saldo de la cuenta"
-#: apps/note/models/notes.py:33
+#: apps/note/models/notes.py:32
msgid "in centimes, money credited for this instance"
msgstr "en céntimos, dinero acreditado por este instancia"
-#: apps/note/models/notes.py:38
+#: apps/note/models/notes.py:37
msgid "last negative date"
msgstr "última fecha en negativo"
-#: apps/note/models/notes.py:39
+#: apps/note/models/notes.py:38
msgid "last time the balance was negative"
msgstr "último momento en el cual el saldo estaba negativo"
-#: apps/note/models/notes.py:45
+#: apps/note/models/notes.py:44
msgid "display image"
msgstr "imagen mostrada"
-#: apps/note/models/notes.py:54 apps/note/models/transactions.py:132
+#: apps/note/models/notes.py:53 apps/note/models/transactions.py:132
msgid "created at"
msgstr "creada el"
-#: apps/note/models/notes.py:59
+#: apps/note/models/notes.py:58
msgid "active"
msgstr "activo"
-#: apps/note/models/notes.py:62
+#: apps/note/models/notes.py:61
msgid ""
"Designates whether this note should be treated as active. Unselect this "
"instead of deleting notes."
@@ -1253,7 +1249,7 @@ msgstr ""
"Indica si la note tiene que ser considerada como activa. Desmarcar en vez de "
"suprimir la note."
-#: apps/note/models/notes.py:69
+#: apps/note/models/notes.py:68
msgid ""
"The user blocked his/her note manually, eg. when he/she left the school for "
"holidays. It can be reactivated at any time."
@@ -1261,54 +1257,54 @@ msgstr ""
"El usuario bloqueó su note, por ejemplo cuando se fue de vacaciones. Puede "
"ser desbloqueada en cualquier momento."
-#: apps/note/models/notes.py:71
+#: apps/note/models/notes.py:70
msgid "The note is blocked by the the BDE and can't be manually reactivated."
msgstr ""
"La note esta bloqueada por el BDE y no puede ser desbloqueada por el usuario."
-#: apps/note/models/notes.py:79
+#: apps/note/models/notes.py:78
msgid "notes"
msgstr "notes"
-#: apps/note/models/notes.py:133
+#: apps/note/models/notes.py:132
msgid "This alias is already taken."
msgstr "Este alias ya esta utilizado."
-#: apps/note/models/notes.py:153
+#: apps/note/models/notes.py:152
msgid "one's note"
msgstr "note de un usuario"
-#: apps/note/models/notes.py:154
+#: apps/note/models/notes.py:153
msgid "users note"
msgstr "notes de los usuarios"
-#: apps/note/models/notes.py:160
+#: apps/note/models/notes.py:159
#, python-format
msgid "%(user)s's note"
msgstr "Note de %(user)s"
-#: apps/note/models/notes.py:181
+#: apps/note/models/notes.py:180
msgid "club note"
msgstr "note de un club"
-#: apps/note/models/notes.py:182
+#: apps/note/models/notes.py:181
msgid "clubs notes"
msgstr "notes de los clubs"
-#: apps/note/models/notes.py:188
+#: apps/note/models/notes.py:187
#, python-format
msgid "Note of %(club)s club"
msgstr "Note del club %(club)s"
-#: apps/note/models/notes.py:214
+#: apps/note/models/notes.py:213
msgid "special note"
msgstr "note especial"
-#: apps/note/models/notes.py:215
+#: apps/note/models/notes.py:214
msgid "special notes"
msgstr "notes especiales"
-#: apps/note/models/notes.py:238
+#: apps/note/models/notes.py:237
msgid "Invalid alias"
msgstr "Alias inválido"
@@ -1385,7 +1381,7 @@ msgid "transaction"
msgstr "transacción"
#: apps/note/models/transactions.py:162
-#: apps/treasury/templates/treasury/sogecredit_detail.html:22
+#: apps/treasury/templates/treasury/sogecredit_detail.html:28
msgid "transactions"
msgstr "transacciones"
@@ -1406,33 +1402,33 @@ msgstr ""
"El saldo de la note tiene que ser entre - 92 233 720 368 547 758.08 € y 92 "
"233 720 368 547 758.07 €."
-#: apps/note/models/transactions.py:276
+#: apps/note/models/transactions.py:277
msgid ""
"The destination of this transaction must equal to the destination of the "
"template."
msgstr ""
-#: apps/note/models/transactions.py:286
+#: apps/note/models/transactions.py:287
msgid "Template"
msgstr ""
-#: apps/note/models/transactions.py:289
+#: apps/note/models/transactions.py:290
msgid "recurrent transaction"
msgstr ""
-#: apps/note/models/transactions.py:290
+#: apps/note/models/transactions.py:291
msgid "recurrent transactions"
msgstr ""
-#: apps/note/models/transactions.py:305
+#: apps/note/models/transactions.py:306
msgid "first_name"
msgstr "nombre"
-#: apps/note/models/transactions.py:310
+#: apps/note/models/transactions.py:311
msgid "bank"
msgstr "banco"
-#: apps/note/models/transactions.py:327
+#: apps/note/models/transactions.py:328
msgid ""
"A special transaction is only possible between a Note associated to a "
"payment method and a User or a Club"
@@ -1440,19 +1436,25 @@ msgstr ""
"Una transacción especial solo esta disponible entre una note de un modo de "
"pago y un usuario o un club"
-#: apps/note/models/transactions.py:336
+#: apps/note/models/transactions.py:355 apps/note/models/transactions.py:358
+#: apps/note/models/transactions.py:361 apps/wei/views.py:922
+#: apps/wei/views.py:926
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: apps/note/models/transactions.py:367
msgid "Special transaction"
msgstr "Transacción especial"
-#: apps/note/models/transactions.py:337
+#: apps/note/models/transactions.py:368
msgid "Special transactions"
msgstr "Transacciones especiales"
-#: apps/note/models/transactions.py:353
+#: apps/note/models/transactions.py:384
msgid "membership transaction"
msgstr "transacción de afiliación"
-#: apps/note/models/transactions.py:354 apps/treasury/models.py:284
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:289
msgid "membership transactions"
msgstr "transacciones de afiliación"
@@ -1470,14 +1472,14 @@ msgstr "Ningún motivo dado"
#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
-#: apps/treasury/templates/treasury/sogecredit_detail.html:59
-#: apps/wei/tables.py:76 apps/wei/tables.py:103
+#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/wei/tables.py:74 apps/wei/tables.py:114
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:31
msgid "Delete"
msgstr "Suprimir"
#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
-#: apps/wei/tables.py:47 apps/wei/tables.py:48
+#: apps/wei/tables.py:48 apps/wei/tables.py:49
#: apps/wei/templates/wei/base.html:89
#: apps/wei/templates/wei/bus_detail.html:20
#: apps/wei/templates/wei/busteam_detail.html:20
@@ -1556,13 +1558,13 @@ msgstr "Acción"
#: apps/note/templates/note/transaction_form.html:112
#: apps/treasury/forms.py:136 apps/treasury/tables.py:67
-#: apps/treasury/tables.py:135
+#: apps/treasury/tables.py:132
#: apps/treasury/templates/treasury/remittance_form.html:23
msgid "Amount"
msgstr "Monto"
#: apps/note/templates/note/transaction_form.html:128
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:52
msgid "Name"
msgstr "Nombre"
@@ -1642,53 +1644,53 @@ msgstr "Usted no puede ver ningún botón."
msgid "Search transactions"
msgstr "Buscar transacciones"
-#: apps/permission/models.py:92
+#: apps/permission/models.py:89
#, python-brace-format
msgid "Can {type} {model}.{field} in {query}"
msgstr ""
-#: apps/permission/models.py:94
+#: apps/permission/models.py:91
#, python-brace-format
msgid "Can {type} {model} in {query}"
msgstr ""
-#: apps/permission/models.py:107
+#: apps/permission/models.py:104
msgid "rank"
msgstr "posición"
-#: apps/permission/models.py:120
+#: apps/permission/models.py:117
msgid "permission mask"
msgstr "antifaz de permisos"
-#: apps/permission/models.py:121
+#: apps/permission/models.py:118
msgid "permission masks"
msgstr "antifaces de permisos"
-#: apps/permission/models.py:127
+#: apps/permission/models.py:124
msgid "add"
msgstr "añadir"
-#: apps/permission/models.py:128
+#: apps/permission/models.py:125
msgid "view"
msgstr "ver"
-#: apps/permission/models.py:129
+#: apps/permission/models.py:126
msgid "change"
msgstr "cambiar"
-#: apps/permission/models.py:161
+#: apps/permission/models.py:158
msgid "query"
msgstr "consulta"
-#: apps/permission/models.py:174
+#: apps/permission/models.py:171
msgid "mask"
msgstr "antifaz"
-#: apps/permission/models.py:180
+#: apps/permission/models.py:177
msgid "field"
msgstr "campo"
-#: apps/permission/models.py:185
+#: apps/permission/models.py:182
msgid ""
"Tells if the permission should be granted even if the membership of the user "
"is expired."
@@ -1696,30 +1698,30 @@ msgstr ""
"Indica si el permiso tiene que ser dado aunque la afiliación del usuario "
"terminó."
-#: apps/permission/models.py:186
+#: apps/permission/models.py:183
#: apps/permission/templates/permission/all_rights.html:89
msgid "permanent"
msgstr "permanente"
-#: apps/permission/models.py:197
+#: apps/permission/models.py:194
msgid "permission"
msgstr "permiso"
-#: apps/permission/models.py:198 apps/permission/models.py:338
+#: apps/permission/models.py:195 apps/permission/models.py:335
msgid "permissions"
msgstr "permisos"
-#: apps/permission/models.py:203
+#: apps/permission/models.py:200
msgid "Specifying field applies only to view and change permission types."
msgstr ""
"Especifica el campo interesado, solo funciona para los permisos view y "
"change."
-#: apps/permission/models.py:343
+#: apps/permission/models.py:340
msgid "for club"
msgstr "interesa el club"
-#: apps/permission/models.py:353 apps/permission/models.py:354
+#: apps/permission/models.py:350 apps/permission/models.py:351
msgid "role permissions"
msgstr "permisos por papeles"
@@ -1732,7 +1734,7 @@ msgstr ""
"Usted no tiene permiso a cambiar el campo {field} on this instance of model "
"{app_label}.{model_name}."
-#: apps/permission/signals.py:73 apps/permission/views.py:103
+#: apps/permission/signals.py:73 apps/permission/views.py:105
#, python-brace-format
msgid ""
"You don't have the permission to add an instance of model {app_label}."
@@ -1792,25 +1794,25 @@ msgstr "Consulta :"
msgid "No associated permission"
msgstr "No hay permiso relacionado"
-#: apps/permission/views.py:70
+#: apps/permission/views.py:72
#, python-brace-format
msgid ""
"You don't have the permission to update this instance of the model "
"\"{model}\" with these parameters. Please correct your data and retry."
msgstr ""
-#: apps/permission/views.py:74
+#: apps/permission/views.py:76
#, python-brace-format
msgid ""
"You don't have the permission to create an instance of the model \"{model}\" "
"with these parameters. Please correct your data and retry."
msgstr ""
-#: apps/permission/views.py:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:112 note_kfet/templates/base.html:109
msgid "Rights"
msgstr "Permisos"
-#: apps/permission/views.py:115
+#: apps/permission/views.py:117
msgid "All rights"
msgstr "Todos los permisos"
@@ -1999,18 +2001,18 @@ msgstr "Usuarios con afiliación pendiente"
msgid "Registration detail"
msgstr "Detalles de la afiliación"
-#: apps/registration/views.py:273
+#: apps/registration/views.py:278
msgid "You must join the BDE."
msgstr "Usted tiene que afiliarse al BDE."
-#: apps/registration/views.py:297
+#: apps/registration/views.py:302
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"El monto dado no es suficiente para las afiliaciones, tiene que ser al menos "
"{}"
-#: apps/registration/views.py:384
+#: apps/registration/views.py:383
msgid "Invalidate pre-registration"
msgstr "Invalidar la afiliación"
@@ -2018,7 +2020,7 @@ msgstr "Invalidar la afiliación"
msgid "Treasury"
msgstr "TesorerÃa"
-#: apps/treasury/forms.py:25 apps/treasury/models.py:90
+#: apps/treasury/forms.py:25 apps/treasury/models.py:91
#: apps/treasury/templates/treasury/invoice_form.html:22
msgid "This invoice is locked and can no longer be edited."
msgstr "Esta factura esta bloqueada y no puede ser modificada."
@@ -2031,7 +2033,7 @@ msgstr "El descuento ya esta cerrado."
msgid "You can't change the type of the remittance."
msgstr "No puede cambiar el tipo de descuento."
-#: apps/treasury/forms.py:124 apps/treasury/models.py:260
+#: apps/treasury/forms.py:124 apps/treasury/models.py:265
#: 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
@@ -2043,120 +2045,120 @@ msgstr "Descuento"
msgid "No attached remittance"
msgstr "No hay descuento relacionado"
-#: apps/treasury/models.py:23
+#: apps/treasury/models.py:24
msgid "Invoice identifier"
msgstr "Numero de factura"
-#: apps/treasury/models.py:37
+#: apps/treasury/models.py:38
msgid "BDE"
msgstr "BDE"
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:43
msgid "Object"
msgstr "Asunto"
-#: apps/treasury/models.py:46
+#: apps/treasury/models.py:47
msgid "Description"
msgstr "Descripción"
-#: apps/treasury/models.py:55
+#: apps/treasury/models.py:56
msgid "Address"
msgstr "Dirección"
-#: apps/treasury/models.py:60 apps/treasury/models.py:187
+#: apps/treasury/models.py:61 apps/treasury/models.py:191
msgid "Date"
msgstr "Fecha"
-#: apps/treasury/models.py:64
+#: apps/treasury/models.py:65
msgid "Acquitted"
msgstr "Pagada"
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:70
msgid "Locked"
msgstr "Bloqueada"
-#: apps/treasury/models.py:70
+#: apps/treasury/models.py:71
msgid "An invoice can't be edited when it is locked."
msgstr "Une factura no puede ser modificada cuando esta bloqueada."
-#: apps/treasury/models.py:76
+#: apps/treasury/models.py:77
msgid "tex source"
msgstr "código fuente TeX"
-#: apps/treasury/models.py:110 apps/treasury/models.py:126
+#: apps/treasury/models.py:111 apps/treasury/models.py:127
msgid "invoice"
msgstr "factura"
-#: apps/treasury/models.py:111
+#: apps/treasury/models.py:112
msgid "invoices"
msgstr "facturas"
-#: apps/treasury/models.py:114
+#: apps/treasury/models.py:115
#, python-brace-format
msgid "Invoice #{id}"
msgstr "Factura n°{id}"
-#: apps/treasury/models.py:131
+#: apps/treasury/models.py:132
msgid "Designation"
msgstr "Designación"
-#: apps/treasury/models.py:135
+#: apps/treasury/models.py:138
msgid "Quantity"
msgstr "Cantidad"
-#: apps/treasury/models.py:139
+#: apps/treasury/models.py:143
msgid "Unit price"
msgstr "Precio unitario"
-#: apps/treasury/models.py:155
+#: apps/treasury/models.py:159
msgid "product"
msgstr "producto"
-#: apps/treasury/models.py:156
+#: apps/treasury/models.py:160
msgid "products"
msgstr "productos"
-#: apps/treasury/models.py:176
+#: apps/treasury/models.py:180
msgid "remittance type"
msgstr "tipo de descuento"
-#: apps/treasury/models.py:177
+#: apps/treasury/models.py:181
msgid "remittance types"
msgstr "tipos de descuentos"
-#: apps/treasury/models.py:198
+#: apps/treasury/models.py:202
msgid "Comment"
msgstr "Comentario"
-#: apps/treasury/models.py:203
+#: apps/treasury/models.py:207
msgid "Closed"
msgstr "Cerrada"
-#: apps/treasury/models.py:207
+#: apps/treasury/models.py:211
msgid "remittance"
msgstr "descuento"
-#: apps/treasury/models.py:208
+#: apps/treasury/models.py:212
msgid "remittances"
msgstr "descuentos"
-#: apps/treasury/models.py:241
+#: apps/treasury/models.py:245
msgid "Remittance #{:d}: {}"
msgstr "Descuento n°{:d} : {}"
-#: apps/treasury/models.py:264
+#: apps/treasury/models.py:269
msgid "special transaction proxy"
msgstr "proxy de transacción especial"
-#: apps/treasury/models.py:265
+#: apps/treasury/models.py:270
msgid "special transaction proxies"
msgstr "proxys de transacciones especiales"
-#: apps/treasury/models.py:290
+#: apps/treasury/models.py:295
msgid "credit transaction"
msgstr "transacción de crédito"
-#: apps/treasury/models.py:374
+#: apps/treasury/models.py:379
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."
@@ -2165,16 +2167,16 @@ msgstr ""
"afiliaciones. Por favor pÃdelo acreditar su note antes de invalidar este "
"crédito."
-#: apps/treasury/models.py:389
+#: apps/treasury/models.py:399
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Crédito de la Société Générale"
-#: apps/treasury/models.py:390
+#: apps/treasury/models.py:400
msgid "Credits from the Société générale"
msgstr "Créditos de la Société Générale"
-#: apps/treasury/models.py:393
+#: apps/treasury/models.py:403
#, python-brace-format
msgid "Soge credit for {user}"
msgstr "Crédito de la Société Générale para {user}"
@@ -2198,7 +2200,7 @@ msgstr "Cantidad de transacciones"
msgid "View"
msgstr "Ver"
-#: apps/treasury/tables.py:146
+#: apps/treasury/tables.py:143
msgid "Yes"
msgstr "SÃ"
@@ -2301,11 +2303,11 @@ msgstr "Descuentos cerrados"
msgid "There is no closed remittance yet."
msgstr "Por ahora no hay descuentos cerrados."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:29
+#: apps/treasury/templates/treasury/sogecredit_detail.html:35
msgid "total amount"
msgstr "monto total"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:35
+#: apps/treasury/templates/treasury/sogecredit_detail.html:41
msgid ""
"Warning: Validating this credit implies that all membership transactions "
"will be validated."
@@ -2313,7 +2315,7 @@ msgstr ""
"Cuidado : Validar este crédito implica que las transacciones de afiliación "
"serán validadas."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:36
+#: apps/treasury/templates/treasury/sogecredit_detail.html:42
msgid ""
"If you delete this credit, there all membership transactions will be also "
"validated, but no credit will be operated."
@@ -2321,7 +2323,7 @@ msgstr ""
"Si suprime este crédito, todas las transacciones de afiliación serán "
"validadas, pero ningún crédito tendrá lugar."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:37
+#: apps/treasury/templates/treasury/sogecredit_detail.html:43
msgid ""
"If this credit is validated, then the user won't be able to ask for a credit "
"from the Société générale."
@@ -2329,15 +2331,15 @@ msgstr ""
"Si este crédito es validado, pues el usuario no podrá pedir más crédito de "
"la Société Générale."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:38
+#: apps/treasury/templates/treasury/sogecredit_detail.html:44
msgid "If you think there is an error, please contact the \"respos info\"."
msgstr "Si usted cree que hay un error, por favor contacte un \"respo info\"."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:44
+#: apps/treasury/templates/treasury/sogecredit_detail.html:50
msgid "This credit is already validated."
msgstr "Este crédito ya fue validado."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:49
+#: apps/treasury/templates/treasury/sogecredit_detail.html:55
msgid ""
"Warning: if you don't validate this credit, the note of the user doesn't "
"have enough money to pay its memberships."
@@ -2345,17 +2347,17 @@ msgstr ""
"Cuidado : si no valida este crédito, la note del usuario no tiene suficiente "
"dinero para pagar sus afiliaciones."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:50
+#: apps/treasury/templates/treasury/sogecredit_detail.html:56
msgid "Please ask the user to credit its note before deleting this credit."
msgstr ""
"Por favor pide al usuario acreditar su note antes de suprimir este crédito."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:57
-#: apps/wei/tables.py:59 apps/wei/tables.py:60 apps/wei/tables.py:99
+#: apps/treasury/templates/treasury/sogecredit_detail.html:63
+#: apps/wei/tables.py:59 apps/wei/tables.py:101
msgid "Validate"
msgstr "Validar"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/treasury/templates/treasury/sogecredit_detail.html:71
msgid "Return to credit list"
msgstr "Regresar a la lista de los créditos"
@@ -2410,13 +2412,13 @@ msgid "Manage credits from the Société générale"
msgstr "Gestionar los créditos de la Société Générale"
#: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
-#: apps/wei/models.py:61 apps/wei/models.py:167
+#: apps/wei/models.py:61 apps/wei/models.py:172
#: note_kfet/templates/base.html:103
msgid "WEI"
msgstr "WEI"
-#: apps/wei/forms/registration.py:51 apps/wei/models.py:113
-#: apps/wei/models.py:283
+#: apps/wei/forms/registration.py:51 apps/wei/models.py:118
+#: apps/wei/models.py:315
msgid "bus"
msgstr "bus"
@@ -2442,7 +2444,7 @@ msgstr ""
"electrón libre)"
#: apps/wei/forms/registration.py:67 apps/wei/forms/registration.py:77
-#: apps/wei/models.py:148
+#: apps/wei/models.py:153
msgid "WEI Roles"
msgstr "Papeles en el WEI"
@@ -2454,7 +2456,7 @@ msgstr "Elegir los papeles que le interesa."
msgid "This team doesn't belong to the given bus."
msgstr "Este equipo no pertenece al bus dado."
-#: apps/wei/forms/surveys/wei2020.py:30
+#: apps/wei/forms/surveys/wei2021.py:31
msgid "Choose a word:"
msgstr "Elegir una palabra :"
@@ -2470,105 +2472,111 @@ msgstr "fecha de inicio"
msgid "date end"
msgstr "fecha de fin"
-#: apps/wei/models.py:77
+#: apps/wei/models.py:70
+#, fuzzy
+#| msgid "The user joined the bus"
+msgid "seat count in the bus"
+msgstr "El usuario se queda con el bus"
+
+#: apps/wei/models.py:82
msgid "survey information"
msgstr "informaciones sobre el cuestionario"
-#: apps/wei/models.py:78
+#: apps/wei/models.py:83
msgid "Information about the survey for new members, encoded in JSON"
msgstr ""
"Informaciones sobre el cuestionario para los nuevos miembros, registrado en "
"JSON"
-#: apps/wei/models.py:100
+#: apps/wei/models.py:105
msgid "Bus"
msgstr "Bus"
-#: apps/wei/models.py:101 apps/wei/templates/wei/weiclub_detail.html:51
+#: apps/wei/models.py:106 apps/wei/templates/wei/weiclub_detail.html:51
msgid "Buses"
msgstr "Bus"
-#: apps/wei/models.py:122
+#: apps/wei/models.py:127
msgid "color"
msgstr "color"
-#: apps/wei/models.py:123
+#: apps/wei/models.py:128
msgid "The color of the T-Shirt, stored with its number equivalent"
msgstr "El color de la camiseta, registrado con su número equivalente"
-#: apps/wei/models.py:137
+#: apps/wei/models.py:142
msgid "Bus team"
msgstr "Equipo de bus"
-#: apps/wei/models.py:138
+#: apps/wei/models.py:143
msgid "Bus teams"
msgstr "Equipos de bus"
-#: apps/wei/models.py:147
+#: apps/wei/models.py:152
msgid "WEI Role"
msgstr "Papeles en el WEI"
-#: apps/wei/models.py:172
+#: apps/wei/models.py:177
msgid "Credit from Société générale"
msgstr "Crédito de la Société Générale"
-#: apps/wei/models.py:177
+#: apps/wei/models.py:182
msgid "Caution check given"
msgstr "Cheque de garantÃa dado"
-#: apps/wei/models.py:181 apps/wei/templates/wei/weimembership_form.html:64
+#: apps/wei/models.py:186 apps/wei/templates/wei/weimembership_form.html:64
msgid "birth date"
msgstr "fecha de nacimiento"
-#: apps/wei/models.py:187 apps/wei/models.py:197
+#: apps/wei/models.py:192 apps/wei/models.py:202
msgid "Male"
msgstr "Hombre"
-#: apps/wei/models.py:188 apps/wei/models.py:198
+#: apps/wei/models.py:193 apps/wei/models.py:203
msgid "Female"
msgstr "Mujer"
-#: apps/wei/models.py:189
+#: apps/wei/models.py:194
msgid "Non binary"
msgstr "No binari@"
-#: apps/wei/models.py:191 apps/wei/templates/wei/weimembership_form.html:55
+#: apps/wei/models.py:196 apps/wei/templates/wei/weimembership_form.html:55
msgid "gender"
msgstr "género"
-#: apps/wei/models.py:200 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:205 apps/wei/templates/wei/weimembership_form.html:58
msgid "clothing cut"
msgstr "forma de ropa"
-#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:218 apps/wei/templates/wei/weimembership_form.html:61
msgid "clothing size"
msgstr "medida de ropa"
-#: apps/wei/models.py:219 apps/wei/templates/wei/weimembership_form.html:67
+#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:67
msgid "health issues"
msgstr "problemas de salud"
-#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:70
msgid "emergency contact name"
msgstr "nombre del contacto de emergencia"
-#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:73
msgid "emergency contact phone"
msgstr "teléfono del contacto de emergencia"
-#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:52
msgid "first year"
msgstr "primer año"
-#: apps/wei/models.py:235
+#: apps/wei/models.py:240
msgid "Tells if the user is new in the school."
msgstr "Indica si el usuario es nuevo en la escuela."
-#: apps/wei/models.py:240
+#: apps/wei/models.py:245
msgid "registration information"
msgstr "informaciones sobre la afiliación"
-#: apps/wei/models.py:241
+#: apps/wei/models.py:246
msgid ""
"Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON"
@@ -2576,44 +2584,58 @@ msgstr ""
"Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
"para los nuevos miembros), registrado en JSON"
-#: apps/wei/models.py:272
+#: apps/wei/models.py:304
msgid "WEI User"
msgstr "Participante WEI"
-#: apps/wei/models.py:273
+#: apps/wei/models.py:305
msgid "WEI Users"
msgstr "Participantes WEI"
-#: apps/wei/models.py:293
+#: apps/wei/models.py:325
msgid "team"
msgstr "equipo"
-#: apps/wei/models.py:303
+#: apps/wei/models.py:335
msgid "WEI registration"
msgstr "Apuntación al WEI"
-#: apps/wei/models.py:307
+#: apps/wei/models.py:339
msgid "WEI membership"
msgstr "Afiliación al WEI"
-#: apps/wei/models.py:308
+#: apps/wei/models.py:340
msgid "WEI memberships"
msgstr "Afiliaciones al WEI"
-#: apps/wei/tables.py:127
+#: apps/wei/tables.py:104
+msgid "The user does not have enough money."
+msgstr ""
+
+#: apps/wei/tables.py:107
+#, fuzzy
+#| msgid ""
+#| "The note has enough money (%(pretty_fee)s required), the registration is "
+#| "possible."
+msgid "The user has enough money, you can validate the registration."
+msgstr ""
+"La note tiene suficiente dinero (%(pretty_fee)s pedidos), la afiliación es "
+"posible."
+
+#: apps/wei/tables.py:139
msgid "Year"
msgstr "Año"
-#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:32
+#: apps/wei/tables.py:177 apps/wei/templates/wei/bus_detail.html:32
#: apps/wei/templates/wei/busteam_detail.html:50
msgid "Teams"
msgstr "Equipos"
-#: apps/wei/tables.py:174 apps/wei/tables.py:215
+#: apps/wei/tables.py:186 apps/wei/tables.py:227
msgid "Members count"
msgstr "Número de miembros"
-#: apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "members"
msgstr "miembros"
@@ -2633,11 +2655,11 @@ msgstr "Pago de entrada del WEI (estudiantes no pagados)"
msgid "WEI list"
msgstr "Lista de los WEI"
-#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:508
+#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:510
msgid "Register 1A"
msgstr "Apuntar un 1A"
-#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:576
+#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:578
msgid "Register 2A+"
msgstr "Apuntar un 2A+"
@@ -2660,14 +2682,14 @@ msgstr "Miembros"
#: apps/wei/templates/wei/bus_detail.html:54
#: apps/wei/templates/wei/busteam_detail.html:60
-#: apps/wei/templates/wei/weimembership_list.html:29
+#: apps/wei/templates/wei/weimembership_list.html:31
msgid "View as PDF"
msgstr "Descargar un PDF"
#: apps/wei/templates/wei/survey.html:11
#: apps/wei/templates/wei/survey_closed.html:11
-#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:984
-#: apps/wei/views.py:1039 apps/wei/views.py:1049
+#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:973
+#: apps/wei/views.py:1028 apps/wei/views.py:1038
msgid "Survey WEI"
msgstr "Cuestionario WEI"
@@ -2823,7 +2845,7 @@ msgstr ""
"Este usuario no es miembro del club Kfet por el año que viene. La afiliación "
"será hecha automáticamente, la afiliación al WEI incluye el pago de los dos."
-#: apps/wei/templates/wei/weimembership_list.html:23
+#: apps/wei/templates/wei/weimembership_list.html:27
msgid "View unvalidated registrations..."
msgstr "Ver las inscripciones no validadas..."
@@ -2840,11 +2862,11 @@ msgstr ""
"¿ Usted está seguro que quiere suprimir la inscripción de %(user)s para el "
"WEI %(wei_name)s ? Este acto es definitivo."
-#: apps/wei/templates/wei/weiregistration_list.html:17
+#: apps/wei/templates/wei/weiregistration_list.html:19
msgid "There is no pre-registration found with this pattern."
msgstr "No hay pre-inscripción encontrada con esta entrada."
-#: apps/wei/templates/wei/weiregistration_list.html:23
+#: apps/wei/templates/wei/weiregistration_list.html:27
msgid "View validated memberships..."
msgstr "Ver las inscripciones validadas..."
@@ -2884,77 +2906,73 @@ msgstr "Añadir un bus"
msgid "Update bus"
msgstr "Modificar el bus"
-#: apps/wei/views.py:364
+#: apps/wei/views.py:366
msgid "Manage bus"
msgstr "Gestionar el bus"
-#: apps/wei/views.py:391
+#: apps/wei/views.py:393
msgid "Create new team"
msgstr "Añadir un equipo"
-#: apps/wei/views.py:431
+#: apps/wei/views.py:433
msgid "Update team"
msgstr "Modificar el equipo"
-#: apps/wei/views.py:462
+#: apps/wei/views.py:464
msgid "Manage WEI team"
msgstr "Gestionar el equipo"
-#: apps/wei/views.py:484
+#: apps/wei/views.py:486
msgid "Register first year student to the WEI"
msgstr "Registrar un 1A al WEI"
-#: apps/wei/views.py:530 apps/wei/views.py:611
+#: apps/wei/views.py:532 apps/wei/views.py:613
msgid "This user is already registered to this WEI."
msgstr "Este usuario ya afilió a este WEI."
-#: apps/wei/views.py:535
+#: apps/wei/views.py:537
msgid ""
"This user can't be in her/his first year since he/she has already "
"participated to a WEI."
msgstr "Este usuario no puede ser un 1A porque ya participó en un WEI."
-#: apps/wei/views.py:552
+#: apps/wei/views.py:554
msgid "Register old student to the WEI"
msgstr "Registrar un 2A+ al WEI"
-#: apps/wei/views.py:595 apps/wei/views.py:684
+#: apps/wei/views.py:597 apps/wei/views.py:686
msgid "You already opened an account in the Société générale."
msgstr "Usted ya abrió una cuenta a la Société Générale."
-#: apps/wei/views.py:641
+#: apps/wei/views.py:643
msgid "Update WEI Registration"
msgstr "Modificar la inscripción WEI"
-#: apps/wei/views.py:744
+#: apps/wei/views.py:746
msgid "Delete WEI registration"
msgstr "Suprimir la inscripción WEI"
-#: apps/wei/views.py:755
+#: apps/wei/views.py:757
msgid "You don't have the right to delete this WEI registration."
msgstr "Usted no tiene derecho a suprimir esta inscripción WEI."
-#: apps/wei/views.py:774
+#: apps/wei/views.py:776
msgid "Validate WEI registration"
msgstr "Validar la inscripción WEI"
-#: apps/wei/views.py:922
-msgid "This user didn't give her/his caution check."
-msgstr "Este usuario no dio su cheque de garantÃa."
-
-#: note_kfet/settings/base.py:157
+#: note_kfet/settings/base.py:161
msgid "German"
msgstr "Alemán"
-#: note_kfet/settings/base.py:158
+#: note_kfet/settings/base.py:162
msgid "English"
msgstr "Ingles"
-#: note_kfet/settings/base.py:159
+#: note_kfet/settings/base.py:163
msgid "Spanish"
msgstr "Español"
-#: note_kfet/settings/base.py:160
+#: note_kfet/settings/base.py:164
msgid "French"
msgstr "Francés"
@@ -3051,7 +3069,7 @@ msgstr "Registrar"
msgid "Log in"
msgstr "Conectarse"
-#: note_kfet/templates/base.html:156
+#: 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."
@@ -3059,11 +3077,11 @@ msgstr ""
"Usted ya no está miembro del BDE. Por favor renueva su afiliación si quiere "
"usar la note."
-#: note_kfet/templates/base.html:160
+#: note_kfet/templates/base.html:164
msgid "You are not a Kfet member, so you can't use your note account."
msgstr "Usted no es un miembro de la Kfet, no puede usar su cuenta note."
-#: note_kfet/templates/base.html:166
+#: note_kfet/templates/base.html:170
msgid ""
"Your e-mail address is not validated. Please check your mail inbox and click "
"on the validation link."
@@ -3071,7 +3089,7 @@ msgstr ""
"Su correo electrónico no fue validado. Por favor mire en sus correos y haga "
"clic en el enlace de validación."
-#: note_kfet/templates/base.html:171
+#: note_kfet/templates/base.html:176
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 "
@@ -3084,7 +3102,7 @@ msgstr ""
"afiliación no está pagada. El proceso de convalidación puede durar unos "
"dÃas. Por favor comprueba que fue hasta el final de la creación de la cuenta."
-#: note_kfet/templates/base.html:194
+#: note_kfet/templates/base.html:199
msgid "Contact us"
msgstr "Contactarnos"
@@ -3204,6 +3222,9 @@ msgstr ""
"pagar su afiliación. Tambien tiene que validar su correo electronico con el "
"enlace que recibió."
+#~ msgid "This user didn't give her/his caution check."
+#~ msgstr "Este usuario no dio su cheque de garantÃa."
+
#~ msgid "Central Authentication Service"
#~ msgstr "Servicio Central de Autentificación"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 1e9036b37df60523b17e3fb7ce11d6a3f98692ca..f832c1484795ce54eaae586adf0d60542c86e507 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2021-08-29 14:06+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"
@@ -52,11 +52,11 @@ 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:232 apps/note/models/transactions.py:26
-#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:300
-#: apps/permission/models.py:333
+#: 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
-#: apps/wei/models.py:66 apps/wei/models.py:118
+#: apps/wei/models.py:66 apps/wei/models.py:123
#: apps/wei/templates/wei/base.html:26
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "name"
@@ -90,8 +90,8 @@ msgstr "types d'activité"
#: apps/activity/models.py:68
#: apps/activity/templates/activity/includes/activity_info.html:19
-#: apps/note/models/transactions.py:81 apps/permission/models.py:113
-#: apps/permission/models.py:192 apps/wei/models.py:72 apps/wei/models.py:129
+#: apps/note/models/transactions.py:81 apps/permission/models.py:110
+#: apps/permission/models.py:189 apps/wei/models.py:77 apps/wei/models.py:134
msgid "description"
msgstr "description"
@@ -105,15 +105,14 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
#: apps/activity/models.py:83
#: apps/activity/templates/activity/includes/activity_info.html:22
-#: apps/note/models/notes.py:208 apps/note/models/transactions.py:66
-#: apps/permission/models.py:167
+#: apps/note/models/notes.py:207 apps/note/models/transactions.py:66
+#: apps/permission/models.py:164
msgid "type"
msgstr "type"
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
-#: apps/note/models/notes.py:149 apps/treasury/models.py:278
-#: apps/treasury/templates/treasury/sogecredit_detail.html:14
-#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
+#: apps/note/models/notes.py:148 apps/treasury/models.py:283
+#: apps/wei/models.py:165 apps/wei/templates/wei/survey.html:15
msgid "user"
msgstr "utilisateur"
@@ -167,7 +166,7 @@ msgid "entry time"
msgstr "heure d'entrée"
#: apps/activity/models.py:178 apps/note/apps.py:14
-#: apps/note/models/notes.py:78
+#: apps/note/models/notes.py:77
msgid "note"
msgstr "note"
@@ -204,12 +203,14 @@ msgid "The balance is negative."
msgstr "La note est en négatif."
#: apps/activity/models.py:240
+#: apps/treasury/templates/treasury/sogecredit_detail.html:14
msgid "last name"
msgstr "nom de famille"
#: apps/activity/models.py:245
#: apps/member/templates/member/includes/profile_info.html:4
#: apps/registration/templates/registration/future_profile_detail.html:16
+#: apps/treasury/templates/treasury/sogecredit_detail.html:17
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "first name"
msgstr "prénom"
@@ -250,7 +251,7 @@ msgstr "Entré le "
msgid "remove"
msgstr "supprimer"
-#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:193
+#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:197
msgid "Type"
msgstr "Type"
@@ -267,11 +268,11 @@ msgstr "Nom de famille"
msgid "First name"
msgstr "Prénom"
-#: apps/activity/tables.py:86 apps/note/models/notes.py:87
+#: apps/activity/tables.py:86 apps/note/models/notes.py:86
msgid "Note"
msgstr "Note"
-#: apps/activity/tables.py:88 apps/member/tables.py:46
+#: apps/activity/tables.py:88 apps/member/tables.py:49
msgid "Balance"
msgstr "Solde du compte"
@@ -284,7 +285,7 @@ msgid "Guest deleted"
msgstr "Invité supprimé"
#: apps/activity/templates/activity/activity_entry.html:14
-#: apps/note/models/transactions.py:256
+#: apps/note/models/transactions.py:257
#: apps/note/templates/note/transaction_form.html:16
#: apps/note/templates/note/transaction_form.html:148
#: note_kfet/templates/base.html:73
@@ -292,13 +293,13 @@ msgid "Transfer"
msgstr "Virement"
#: apps/activity/templates/activity/activity_entry.html:18
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:21
msgid "Credit"
msgstr "Crédit"
#: apps/activity/templates/activity/activity_entry.html:21
-#: apps/note/models/transactions.py:316
+#: apps/note/models/transactions.py:317
#: apps/note/templates/note/transaction_form.html:25
msgid "Debit"
msgstr "Débit"
@@ -438,7 +439,7 @@ msgstr "Logs"
msgid "IP Address"
msgstr "Adresse IP"
-#: apps/logs/models.py:36 apps/permission/models.py:137
+#: apps/logs/models.py:36 apps/permission/models.py:134
msgid "model"
msgstr "modèle"
@@ -459,8 +460,8 @@ msgid "create"
msgstr "créer"
#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:201
-#: apps/permission/models.py:130 apps/treasury/tables.py:38
-#: apps/wei/tables.py:75
+#: apps/permission/models.py:127 apps/treasury/tables.py:38
+#: apps/wei/tables.py:73
msgid "delete"
msgstr "supprimer"
@@ -499,15 +500,15 @@ 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:316
+#: apps/member/admin.py:65 apps/member/models.py:317
msgid "roles"
msgstr "rôles"
-#: apps/member/admin.py:66 apps/member/models.py:330
+#: apps/member/admin.py:66 apps/member/models.py:331
msgid "fee"
msgstr "cotisation"
-#: apps/member/apps.py:14 apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/member/apps.py:14 apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "member"
msgstr "adhérent"
@@ -539,8 +540,8 @@ 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:100
-#: apps/registration/forms.py:33 apps/registration/views.py:254
+#: apps/member/forms.py:141 apps/member/views.py:101
+#: apps/registration/forms.py:33 apps/registration/views.py:258
msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà ."
@@ -586,14 +587,14 @@ msgid "Roles"
msgstr "Rôles"
#: apps/member/models.py:38
-#: apps/member/templates/member/includes/profile_info.html:34
+#: 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:28
+#: 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"
@@ -680,14 +681,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:38
+#: 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:45
+#: apps/member/templates/member/includes/profile_info.html:46
#: apps/registration/templates/registration/future_profile_detail.html:43
#: apps/wei/templates/wei/weimembership_form.html:47
msgid "paid"
@@ -697,7 +698,7 @@ msgstr "payé"
msgid "Tells if the user receive a salary."
msgstr "Indique si l'utilisateur perçoit un salaire."
-#: apps/member/models.py:100 apps/treasury/tables.py:146
+#: apps/member/models.py:100 apps/treasury/tables.py:143
msgid "No"
msgstr "Non"
@@ -759,7 +760,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:31
+#: 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
@@ -809,7 +810,7 @@ msgstr ""
"renouveler."
#: apps/member/models.py:286 apps/member/models.py:311
-#: apps/note/models/notes.py:177
+#: apps/note/models/notes.py:176
msgid "club"
msgstr "club"
@@ -817,41 +818,41 @@ msgstr "club"
msgid "clubs"
msgstr "clubs"
-#: apps/member/models.py:321
+#: apps/member/models.py:322
msgid "membership starts on"
msgstr "l'adhésion commence le"
-#: apps/member/models.py:325
+#: apps/member/models.py:326
msgid "membership ends on"
msgstr "l'adhésion finit le"
-#: apps/member/models.py:421
+#: apps/member/models.py:422
#, 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:430 apps/member/views.py:646
+#: apps/member/models.py:431 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:442 apps/member/views.py:656
+#: apps/member/models.py:443 apps/member/views.py:661
msgid "User is not a member of the parent club"
msgstr "L'utilisateur n'est pas membre du club parent"
-#: apps/member/models.py:495
+#: apps/member/models.py:496
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Adhésion de {user} pour le club {club}"
-#: apps/member/models.py:498 apps/note/models/transactions.py:358
+#: apps/member/models.py:499 apps/note/models/transactions.py:389
msgid "membership"
msgstr "adhésion"
-#: apps/member/models.py:499
+#: apps/member/models.py:500
msgid "memberships"
msgstr "adhésions"
-#: apps/member/tables.py:121
+#: apps/member/tables.py:137
msgid "Renew"
msgstr "Renouveler"
@@ -959,8 +960,8 @@ msgstr ""
"Ã nouveau possible."
#: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:245
-#: apps/member/views.py:448
+#: 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"
@@ -998,7 +999,7 @@ msgid "Filter roles:"
msgstr "Filtrer par rôle :"
#: apps/member/templates/member/club_members.html:36
-#: apps/wei/templates/wei/weimembership_list.html:17
+#: apps/wei/templates/wei/weimembership_list.html:19
msgid "There is no membership found with this pattern."
msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée."
@@ -1016,8 +1017,8 @@ 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:42
-#: apps/treasury/templates/treasury/sogecredit_detail.html:18
+#: apps/member/templates/member/includes/profile_info.html:43
+#: apps/treasury/templates/treasury/sogecredit_detail.html:24
#: apps/wei/templates/wei/base.html:60
msgid "balance"
msgstr "solde du compte"
@@ -1035,6 +1036,7 @@ msgstr "Gérer les alias"
#: apps/member/templates/member/includes/profile_info.html:7
#: apps/registration/templates/registration/future_profile_detail.html:19
+#: apps/treasury/templates/treasury/sogecredit_detail.html:20
#: apps/wei/templates/wei/weimembership_form.html:17
msgid "username"
msgstr "pseudo"
@@ -1047,7 +1049,7 @@ msgstr "mot de passe"
msgid "Change password"
msgstr "Changer le mot de passe"
-#: apps/member/templates/member/includes/profile_info.html:53
+#: apps/member/templates/member/includes/profile_info.html:55
msgid "API token"
msgstr "Accès API"
@@ -1099,43 +1101,43 @@ msgstr "Inscriptions"
msgid "This address must be valid."
msgstr "Cette adresse doit être valide."
-#: apps/member/views.py:137
+#: apps/member/views.py:138
msgid "Profile detail"
msgstr "Détails de l'utilisateur"
-#: apps/member/views.py:204
+#: apps/member/views.py:205
msgid "Search user"
msgstr "Chercher un utilisateur"
-#: apps/member/views.py:265
+#: apps/member/views.py:273
msgid "Update note picture"
msgstr "Modifier la photo de la note"
-#: apps/member/views.py:311
+#: apps/member/views.py:319
msgid "Manage auth token"
msgstr "Gérer les jetons d'authentification"
-#: apps/member/views.py:338
+#: apps/member/views.py:346
msgid "Create new club"
msgstr "Créer un nouveau club"
-#: apps/member/views.py:357
+#: apps/member/views.py:365
msgid "Search club"
msgstr "Chercher un club"
-#: apps/member/views.py:390
+#: apps/member/views.py:398
msgid "Club detail"
msgstr "Détails du club"
-#: apps/member/views.py:471
+#: apps/member/views.py:479
msgid "Update club"
msgstr "Modifier le club"
-#: apps/member/views.py:505
+#: apps/member/views.py:513
msgid "Add new member to the club"
msgstr "Ajouter un nouveau membre au club"
-#: apps/member/views.py:637 apps/wei/views.py:928
+#: apps/member/views.py:642 apps/wei/views.py:917
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -1143,20 +1145,14 @@ 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:660
+#: apps/member/views.py:665
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:665
+#: apps/member/views.py:670
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
-#: apps/member/views.py:672 apps/member/views.py:674 apps/member/views.py:676
-#: apps/registration/views.py:304 apps/registration/views.py:306
-#: apps/registration/views.py:308 apps/wei/views.py:933 apps/wei/views.py:937
-msgid "This field is required."
-msgstr "Ce champ est requis."
-
#: apps/member/views.py:816
msgid "Manage roles of an user in the club"
msgstr "Gérer les rôles d'un utilisateur dans le club"
@@ -1180,7 +1176,7 @@ msgid "amount"
msgstr "montant"
#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
-#: apps/note/models/transactions.py:227
+#: apps/note/models/transactions.py:228
msgid ""
"The transaction can't be saved since the source note or the destination note "
"is not active."
@@ -1200,7 +1196,7 @@ msgstr "Destination"
msgid "Reason"
msgstr "Raison"
-#: apps/note/forms.py:79 apps/treasury/tables.py:139
+#: apps/note/forms.py:79 apps/treasury/tables.py:136
msgid "Valid"
msgstr "Valide"
@@ -1220,42 +1216,42 @@ msgstr "Créé après"
msgid "Created before"
msgstr "Créé avant"
-#: apps/note/models/notes.py:32
+#: apps/note/models/notes.py:31
msgid "account balance"
msgstr "solde du compte"
-#: apps/note/models/notes.py:33
+#: apps/note/models/notes.py:32
msgid "in centimes, money credited for this instance"
msgstr "en centimes, argent crédité pour cette instance"
-#: apps/note/models/notes.py:38
+#: apps/note/models/notes.py:37
msgid "last negative date"
msgstr "dernier date de négatif"
-#: apps/note/models/notes.py:39
+#: apps/note/models/notes.py:38
msgid "last time the balance was negative"
msgstr "dernier instant où la note était en négatif"
-#: apps/note/models/notes.py:45
+#: apps/note/models/notes.py:44
msgid "display image"
msgstr "image affichée"
-#: apps/note/models/notes.py:54 apps/note/models/transactions.py:132
+#: apps/note/models/notes.py:53 apps/note/models/transactions.py:132
msgid "created at"
msgstr "créée le"
-#: apps/note/models/notes.py:59
+#: apps/note/models/notes.py:58
msgid "active"
msgstr "actif"
-#: apps/note/models/notes.py:62
+#: apps/note/models/notes.py:61
msgid ""
"Designates whether this note should be treated as active. Unselect this "
"instead of deleting notes."
msgstr ""
"Indique si la note est active. Désactiver cela plutôt que supprimer la note."
-#: apps/note/models/notes.py:69
+#: apps/note/models/notes.py:68
msgid ""
"The user blocked his/her note manually, eg. when he/she left the school for "
"holidays. It can be reactivated at any time."
@@ -1263,55 +1259,55 @@ msgstr ""
"La note a été bloquée manuellement, par exemple pour des raisons de "
"vacances. Elle peut être débloquée à tout moment."
-#: apps/note/models/notes.py:71
+#: apps/note/models/notes.py:70
msgid "The note is blocked by the the BDE and can't be manually reactivated."
msgstr ""
"La note est bloquée de force par le BDE et ne peut pas être débloquée par le "
"possesseur de la note."
-#: apps/note/models/notes.py:79
+#: apps/note/models/notes.py:78
msgid "notes"
msgstr "notes"
-#: apps/note/models/notes.py:133
+#: apps/note/models/notes.py:132
msgid "This alias is already taken."
msgstr "Cet alias est déjà pris."
-#: apps/note/models/notes.py:153
+#: apps/note/models/notes.py:152
msgid "one's note"
msgstr "note d'un utilisateur"
-#: apps/note/models/notes.py:154
+#: apps/note/models/notes.py:153
msgid "users note"
msgstr "notes des utilisateurs"
-#: apps/note/models/notes.py:160
+#: apps/note/models/notes.py:159
#, python-format
msgid "%(user)s's note"
msgstr "Note de %(user)s"
-#: apps/note/models/notes.py:181
+#: apps/note/models/notes.py:180
msgid "club note"
msgstr "note d'un club"
-#: apps/note/models/notes.py:182
+#: apps/note/models/notes.py:181
msgid "clubs notes"
msgstr "notes des clubs"
-#: apps/note/models/notes.py:188
+#: apps/note/models/notes.py:187
#, python-format
msgid "Note of %(club)s club"
msgstr "Note du club %(club)s"
-#: apps/note/models/notes.py:214
+#: apps/note/models/notes.py:213
msgid "special note"
msgstr "note spéciale"
-#: apps/note/models/notes.py:215
+#: apps/note/models/notes.py:214
msgid "special notes"
msgstr "notes spéciales"
-#: apps/note/models/notes.py:238
+#: apps/note/models/notes.py:237
msgid "Invalid alias"
msgstr "Alias invalide"
@@ -1388,7 +1384,7 @@ msgid "transaction"
msgstr "transaction"
#: apps/note/models/transactions.py:162
-#: apps/treasury/templates/treasury/sogecredit_detail.html:22
+#: apps/treasury/templates/treasury/sogecredit_detail.html:28
msgid "transactions"
msgstr "transactions"
@@ -1410,7 +1406,7 @@ msgstr ""
"€ et 92 233 720 368 547 758.07 €. Ne cherchez pas à capitaliser l'argent du "
"BDE."
-#: apps/note/models/transactions.py:276
+#: apps/note/models/transactions.py:277
msgid ""
"The destination of this transaction must equal to the destination of the "
"template."
@@ -1418,27 +1414,27 @@ msgstr ""
"Le destinataire de cette transaction doit être identique à celui du bouton "
"utilisé."
-#: apps/note/models/transactions.py:286
+#: apps/note/models/transactions.py:287
msgid "Template"
msgstr "Bouton"
-#: apps/note/models/transactions.py:289
+#: apps/note/models/transactions.py:290
msgid "recurrent transaction"
msgstr "transaction issue de bouton"
-#: apps/note/models/transactions.py:290
+#: apps/note/models/transactions.py:291
msgid "recurrent transactions"
msgstr "transactions issues de boutons"
-#: apps/note/models/transactions.py:305
+#: apps/note/models/transactions.py:306
msgid "first_name"
msgstr "prénom"
-#: apps/note/models/transactions.py:310
+#: apps/note/models/transactions.py:311
msgid "bank"
msgstr "banque"
-#: apps/note/models/transactions.py:327
+#: apps/note/models/transactions.py:328
msgid ""
"A special transaction is only possible between a Note associated to a "
"payment method and a User or a Club"
@@ -1446,19 +1442,25 @@ msgstr ""
"Une transaction spéciale n'est possible que entre une note associée à un "
"mode de paiement et un utilisateur ou un club"
-#: apps/note/models/transactions.py:336
+#: apps/note/models/transactions.py:355 apps/note/models/transactions.py:358
+#: apps/note/models/transactions.py:361 apps/wei/views.py:922
+#: apps/wei/views.py:926
+msgid "This field is required."
+msgstr "Ce champ est requis."
+
+#: apps/note/models/transactions.py:367
msgid "Special transaction"
msgstr "Transaction de crédit/retrait"
-#: apps/note/models/transactions.py:337
+#: apps/note/models/transactions.py:368
msgid "Special transactions"
msgstr "Transactions de crédit/retrait"
-#: apps/note/models/transactions.py:353
+#: apps/note/models/transactions.py:384
msgid "membership transaction"
msgstr "transaction d'adhésion"
-#: apps/note/models/transactions.py:354 apps/treasury/models.py:284
+#: apps/note/models/transactions.py:385 apps/treasury/models.py:289
msgid "membership transactions"
msgstr "transactions d'adhésion"
@@ -1476,14 +1478,14 @@ msgstr "Pas de motif spécifié"
#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
-#: apps/treasury/templates/treasury/sogecredit_detail.html:59
-#: apps/wei/tables.py:76 apps/wei/tables.py:103
+#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/wei/tables.py:74 apps/wei/tables.py:114
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:31
msgid "Delete"
msgstr "Supprimer"
#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
-#: apps/wei/tables.py:47 apps/wei/tables.py:48
+#: apps/wei/tables.py:48 apps/wei/tables.py:49
#: apps/wei/templates/wei/base.html:89
#: apps/wei/templates/wei/bus_detail.html:20
#: apps/wei/templates/wei/busteam_detail.html:20
@@ -1562,13 +1564,13 @@ msgstr "Action"
#: apps/note/templates/note/transaction_form.html:112
#: apps/treasury/forms.py:136 apps/treasury/tables.py:67
-#: apps/treasury/tables.py:135
+#: apps/treasury/tables.py:132
#: apps/treasury/templates/treasury/remittance_form.html:23
msgid "Amount"
msgstr "Montant"
#: apps/note/templates/note/transaction_form.html:128
-#: apps/treasury/models.py:51
+#: apps/treasury/models.py:52
msgid "Name"
msgstr "Nom"
@@ -1648,53 +1650,53 @@ msgstr "Vous ne pouvez pas voir le moindre bouton."
msgid "Search transactions"
msgstr "Rechercher des transactions"
-#: apps/permission/models.py:92
+#: apps/permission/models.py:89
#, python-brace-format
msgid "Can {type} {model}.{field} in {query}"
msgstr "Peut {type} {model}.{field} si {query}"
-#: apps/permission/models.py:94
+#: apps/permission/models.py:91
#, python-brace-format
msgid "Can {type} {model} in {query}"
msgstr "Peut {type} {model} si {query}"
-#: apps/permission/models.py:107
+#: apps/permission/models.py:104
msgid "rank"
msgstr "rang"
-#: apps/permission/models.py:120
+#: apps/permission/models.py:117
msgid "permission mask"
msgstr "masque de permissions"
-#: apps/permission/models.py:121
+#: apps/permission/models.py:118
msgid "permission masks"
msgstr "masques de permissions"
-#: apps/permission/models.py:127
+#: apps/permission/models.py:124
msgid "add"
msgstr "ajouter"
-#: apps/permission/models.py:128
+#: apps/permission/models.py:125
msgid "view"
msgstr "voir"
-#: apps/permission/models.py:129
+#: apps/permission/models.py:126
msgid "change"
msgstr "modifier"
-#: apps/permission/models.py:161
+#: apps/permission/models.py:158
msgid "query"
msgstr "requête"
-#: apps/permission/models.py:174
+#: apps/permission/models.py:171
msgid "mask"
msgstr "masque"
-#: apps/permission/models.py:180
+#: apps/permission/models.py:177
msgid "field"
msgstr "champ"
-#: apps/permission/models.py:185
+#: apps/permission/models.py:182
msgid ""
"Tells if the permission should be granted even if the membership of the user "
"is expired."
@@ -1702,30 +1704,30 @@ msgstr ""
"Indique si la permission doit être attribuée même si l'adhésion de "
"l'utilisateur est expirée."
-#: apps/permission/models.py:186
+#: apps/permission/models.py:183
#: apps/permission/templates/permission/all_rights.html:89
msgid "permanent"
msgstr "permanent"
-#: apps/permission/models.py:197
+#: apps/permission/models.py:194
msgid "permission"
msgstr "permission"
-#: apps/permission/models.py:198 apps/permission/models.py:338
+#: apps/permission/models.py:195 apps/permission/models.py:335
msgid "permissions"
msgstr "permissions"
-#: apps/permission/models.py:203
+#: apps/permission/models.py:200
msgid "Specifying field applies only to view and change permission types."
msgstr ""
"Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
"change."
-#: apps/permission/models.py:343
+#: apps/permission/models.py:340
msgid "for club"
msgstr "s'applique au club"
-#: apps/permission/models.py:353 apps/permission/models.py:354
+#: apps/permission/models.py:350 apps/permission/models.py:351
msgid "role permissions"
msgstr "permissions par rôles"
@@ -1738,7 +1740,7 @@ msgstr ""
"Vous n'avez pas la permission de modifier le champ {field} sur l'instance du "
"modèle {app_label}.{model_name}."
-#: apps/permission/signals.py:73 apps/permission/views.py:103
+#: apps/permission/signals.py:73 apps/permission/views.py:105
#, python-brace-format
msgid ""
"You don't have the permission to add an instance of model {app_label}."
@@ -1797,7 +1799,7 @@ msgstr "Requête :"
msgid "No associated permission"
msgstr "Pas de permission associée"
-#: apps/permission/views.py:70
+#: apps/permission/views.py:72
#, python-brace-format
msgid ""
"You don't have the permission to update this instance of the model "
@@ -1806,7 +1808,7 @@ msgstr ""
"Vous n'avez pas la permission de modifier cette instance du modèle « {model} "
"» avec ces paramètres. Merci de les corriger et de réessayer."
-#: apps/permission/views.py:74
+#: apps/permission/views.py:76
#, python-brace-format
msgid ""
"You don't have the permission to create an instance of the model \"{model}\" "
@@ -1815,11 +1817,11 @@ 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:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:112 note_kfet/templates/base.html:109
msgid "Rights"
msgstr "Droits"
-#: apps/permission/views.py:115
+#: apps/permission/views.py:117
msgid "All rights"
msgstr "Tous les droits"
@@ -2007,18 +2009,18 @@ msgstr "Utilisateurs en attente d'inscription"
msgid "Registration detail"
msgstr "Détails de l'inscription"
-#: apps/registration/views.py:273
+#: apps/registration/views.py:278
msgid "You must join the BDE."
msgstr "Vous devez adhérer au BDE."
-#: apps/registration/views.py:297
+#: apps/registration/views.py:302
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:384
+#: apps/registration/views.py:383
msgid "Invalidate pre-registration"
msgstr "Invalider l'inscription"
@@ -2026,7 +2028,7 @@ msgstr "Invalider l'inscription"
msgid "Treasury"
msgstr "Trésorerie"
-#: apps/treasury/forms.py:25 apps/treasury/models.py:90
+#: apps/treasury/forms.py:25 apps/treasury/models.py:91
#: 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."
@@ -2039,7 +2041,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:124 apps/treasury/models.py:260
+#: apps/treasury/forms.py:124 apps/treasury/models.py:265
#: 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
@@ -2051,120 +2053,120 @@ msgstr "Remise"
msgid "No attached remittance"
msgstr "Pas de remise associée"
-#: apps/treasury/models.py:23
+#: apps/treasury/models.py:24
msgid "Invoice identifier"
msgstr "Numéro de facture"
-#: apps/treasury/models.py:37
+#: apps/treasury/models.py:38
msgid "BDE"
msgstr "BDE"
-#: apps/treasury/models.py:42
+#: apps/treasury/models.py:43
msgid "Object"
msgstr "Objet"
-#: apps/treasury/models.py:46
+#: apps/treasury/models.py:47
msgid "Description"
msgstr "Description"
-#: apps/treasury/models.py:55
+#: apps/treasury/models.py:56
msgid "Address"
msgstr "Adresse"
-#: apps/treasury/models.py:60 apps/treasury/models.py:187
+#: apps/treasury/models.py:61 apps/treasury/models.py:191
msgid "Date"
msgstr "Date"
-#: apps/treasury/models.py:64
+#: apps/treasury/models.py:65
msgid "Acquitted"
msgstr "Acquittée"
-#: apps/treasury/models.py:69
+#: apps/treasury/models.py:70
msgid "Locked"
msgstr "Verrouillée"
-#: apps/treasury/models.py:70
+#: apps/treasury/models.py:71
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:76
+#: apps/treasury/models.py:77
msgid "tex source"
msgstr "fichier TeX source"
-#: apps/treasury/models.py:110 apps/treasury/models.py:126
+#: apps/treasury/models.py:111 apps/treasury/models.py:127
msgid "invoice"
msgstr "facture"
-#: apps/treasury/models.py:111
+#: apps/treasury/models.py:112
msgid "invoices"
msgstr "factures"
-#: apps/treasury/models.py:114
+#: apps/treasury/models.py:115
#, python-brace-format
msgid "Invoice #{id}"
msgstr "Facture n°{id}"
-#: apps/treasury/models.py:131
+#: apps/treasury/models.py:132
msgid "Designation"
msgstr "Désignation"
-#: apps/treasury/models.py:135
+#: apps/treasury/models.py:138
msgid "Quantity"
msgstr "Quantité"
-#: apps/treasury/models.py:139
+#: apps/treasury/models.py:143
msgid "Unit price"
msgstr "Prix unitaire"
-#: apps/treasury/models.py:155
+#: apps/treasury/models.py:159
msgid "product"
msgstr "produit"
-#: apps/treasury/models.py:156
+#: apps/treasury/models.py:160
msgid "products"
msgstr "produits"
-#: apps/treasury/models.py:176
+#: apps/treasury/models.py:180
msgid "remittance type"
msgstr "type de remise"
-#: apps/treasury/models.py:177
+#: apps/treasury/models.py:181
msgid "remittance types"
msgstr "types de remises"
-#: apps/treasury/models.py:198
+#: apps/treasury/models.py:202
msgid "Comment"
msgstr "Commentaire"
-#: apps/treasury/models.py:203
+#: apps/treasury/models.py:207
msgid "Closed"
msgstr "Fermée"
-#: apps/treasury/models.py:207
+#: apps/treasury/models.py:211
msgid "remittance"
msgstr "remise"
-#: apps/treasury/models.py:208
+#: apps/treasury/models.py:212
msgid "remittances"
msgstr "remises"
-#: apps/treasury/models.py:241
+#: apps/treasury/models.py:245
msgid "Remittance #{:d}: {}"
msgstr "Remise n°{:d} : {}"
-#: apps/treasury/models.py:264
+#: apps/treasury/models.py:269
msgid "special transaction proxy"
msgstr "proxy de transaction spéciale"
-#: apps/treasury/models.py:265
+#: apps/treasury/models.py:270
msgid "special transaction proxies"
msgstr "proxys de transactions spéciales"
-#: apps/treasury/models.py:290
+#: apps/treasury/models.py:295
msgid "credit transaction"
msgstr "transaction de crédit"
-#: apps/treasury/models.py:374
+#: apps/treasury/models.py:379
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."
@@ -2172,16 +2174,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:389
+#: apps/treasury/models.py:399
#: 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:390
+#: apps/treasury/models.py:400
msgid "Credits from the Société générale"
msgstr "Crédits de la Société générale"
-#: apps/treasury/models.py:393
+#: apps/treasury/models.py:403
#, python-brace-format
msgid "Soge credit for {user}"
msgstr "Crédit de la société générale pour l'utilisateur {user}"
@@ -2205,7 +2207,7 @@ msgstr "Nombre de transactions"
msgid "View"
msgstr "Voir"
-#: apps/treasury/tables.py:146
+#: apps/treasury/tables.py:143
msgid "Yes"
msgstr "Oui"
@@ -2309,11 +2311,11 @@ msgstr "Remises fermées"
msgid "There is no closed remittance yet."
msgstr "Il n'y a pas encore de remise fermée."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:29
+#: apps/treasury/templates/treasury/sogecredit_detail.html:35
msgid "total amount"
msgstr "montant total"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:35
+#: apps/treasury/templates/treasury/sogecredit_detail.html:41
msgid ""
"Warning: Validating this credit implies that all membership transactions "
"will be validated."
@@ -2321,7 +2323,7 @@ msgstr ""
"Attention : Valider ce crédit implique que les transactions d'adhésion "
"seront validées."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:36
+#: apps/treasury/templates/treasury/sogecredit_detail.html:42
msgid ""
"If you delete this credit, there all membership transactions will be also "
"validated, but no credit will be operated."
@@ -2330,7 +2332,7 @@ msgstr ""
"d'adhésion seront aussi validées, mais il n'y aura pas de transaction de "
"crédit créée."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:37
+#: apps/treasury/templates/treasury/sogecredit_detail.html:43
msgid ""
"If this credit is validated, then the user won't be able to ask for a credit "
"from the Société générale."
@@ -2338,15 +2340,15 @@ msgstr ""
"Si ce crédit est validé, alors l'utilisateur ne pourra plus demander d'être "
"crédité par la Société générale à l'avenir."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:38
+#: apps/treasury/templates/treasury/sogecredit_detail.html:44
msgid "If you think there is an error, please contact the \"respos info\"."
msgstr "Si vous pensez qu'il y a une erreur, merci de contacter un respo info."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:44
+#: apps/treasury/templates/treasury/sogecredit_detail.html:50
msgid "This credit is already validated."
msgstr "Ce crédit a déjà été validé."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:49
+#: apps/treasury/templates/treasury/sogecredit_detail.html:55
msgid ""
"Warning: if you don't validate this credit, the note of the user doesn't "
"have enough money to pay its memberships."
@@ -2354,18 +2356,18 @@ msgstr ""
"Attention : si vous ne validez pas ce crédit, la note de l'utilisateur n'a "
"pas assez d'argent pour payer les adhésions."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:50
+#: apps/treasury/templates/treasury/sogecredit_detail.html:56
msgid "Please ask the user to credit its note before deleting this credit."
msgstr ""
"Merci de demander à l'utilisateur de recharger sa note avant de supprimer la "
"demande de crédit."
-#: apps/treasury/templates/treasury/sogecredit_detail.html:57
-#: apps/wei/tables.py:59 apps/wei/tables.py:60 apps/wei/tables.py:99
+#: apps/treasury/templates/treasury/sogecredit_detail.html:63
+#: apps/wei/tables.py:59 apps/wei/tables.py:101
msgid "Validate"
msgstr "Valider"
-#: apps/treasury/templates/treasury/sogecredit_detail.html:65
+#: apps/treasury/templates/treasury/sogecredit_detail.html:71
msgid "Return to credit list"
msgstr "Retour à la liste des crédits"
@@ -2421,13 +2423,13 @@ msgid "Manage credits from the Société générale"
msgstr "Gérer les crédits de la Société générale"
#: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
-#: apps/wei/models.py:61 apps/wei/models.py:167
+#: apps/wei/models.py:61 apps/wei/models.py:172
#: note_kfet/templates/base.html:103
msgid "WEI"
msgstr "WEI"
-#: apps/wei/forms/registration.py:51 apps/wei/models.py:113
-#: apps/wei/models.py:283
+#: apps/wei/forms/registration.py:51 apps/wei/models.py:118
+#: apps/wei/models.py:315
msgid "bus"
msgstr "bus"
@@ -2453,7 +2455,7 @@ msgstr ""
"bus ou électron libre)"
#: apps/wei/forms/registration.py:67 apps/wei/forms/registration.py:77
-#: apps/wei/models.py:148
+#: apps/wei/models.py:153
msgid "WEI Roles"
msgstr "Rôles au WEI"
@@ -2465,7 +2467,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/wei2020.py:30
+#: apps/wei/forms/surveys/wei2021.py:31
msgid "Choose a word:"
msgstr "Choisissez un mot :"
@@ -2481,105 +2483,109 @@ msgstr "début"
msgid "date end"
msgstr "fin"
-#: apps/wei/models.py:77
+#: apps/wei/models.py:70
+msgid "seat count in the bus"
+msgstr "nombre de sièges dans le bus"
+
+#: apps/wei/models.py:82
msgid "survey information"
msgstr "informations sur le questionnaire"
-#: apps/wei/models.py:78
+#: apps/wei/models.py:83
msgid "Information about the survey for new members, encoded in JSON"
msgstr ""
"Informations sur le sondage pour les nouveaux membres, encodées en JSON"
-#: apps/wei/models.py:100
+#: apps/wei/models.py:105
msgid "Bus"
msgstr "Bus"
-#: apps/wei/models.py:101 apps/wei/templates/wei/weiclub_detail.html:51
+#: apps/wei/models.py:106 apps/wei/templates/wei/weiclub_detail.html:51
msgid "Buses"
msgstr "Bus"
-#: apps/wei/models.py:122
+#: apps/wei/models.py:127
msgid "color"
msgstr "couleur"
-#: apps/wei/models.py:123
+#: apps/wei/models.py:128
msgid "The color of the T-Shirt, stored with its number equivalent"
msgstr ""
"La couleur du T-Shirt, stocké sous la forme de son équivalent numérique"
-#: apps/wei/models.py:137
+#: apps/wei/models.py:142
msgid "Bus team"
msgstr "Équipe de bus"
-#: apps/wei/models.py:138
+#: apps/wei/models.py:143
msgid "Bus teams"
msgstr "Équipes de bus"
-#: apps/wei/models.py:147
+#: apps/wei/models.py:152
msgid "WEI Role"
msgstr "Rôle au WEI"
-#: apps/wei/models.py:172
+#: apps/wei/models.py:177
msgid "Credit from Société générale"
msgstr "Crédit de la Société générale"
-#: apps/wei/models.py:177
+#: apps/wei/models.py:182
msgid "Caution check given"
msgstr "Chèque de caution donné"
-#: apps/wei/models.py:181 apps/wei/templates/wei/weimembership_form.html:64
+#: apps/wei/models.py:186 apps/wei/templates/wei/weimembership_form.html:64
msgid "birth date"
msgstr "date de naissance"
-#: apps/wei/models.py:187 apps/wei/models.py:197
+#: apps/wei/models.py:192 apps/wei/models.py:202
msgid "Male"
msgstr "Homme"
-#: apps/wei/models.py:188 apps/wei/models.py:198
+#: apps/wei/models.py:193 apps/wei/models.py:203
msgid "Female"
msgstr "Femme"
-#: apps/wei/models.py:189
+#: apps/wei/models.py:194
msgid "Non binary"
msgstr "Non-binaire"
-#: apps/wei/models.py:191 apps/wei/templates/wei/weimembership_form.html:55
+#: apps/wei/models.py:196 apps/wei/templates/wei/weimembership_form.html:55
msgid "gender"
msgstr "genre"
-#: apps/wei/models.py:200 apps/wei/templates/wei/weimembership_form.html:58
+#: apps/wei/models.py:205 apps/wei/templates/wei/weimembership_form.html:58
msgid "clothing cut"
msgstr "coupe de vêtement"
-#: apps/wei/models.py:213 apps/wei/templates/wei/weimembership_form.html:61
+#: apps/wei/models.py:218 apps/wei/templates/wei/weimembership_form.html:61
msgid "clothing size"
msgstr "taille de vêtement"
-#: apps/wei/models.py:219 apps/wei/templates/wei/weimembership_form.html:67
+#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:67
msgid "health issues"
msgstr "problèmes de santé"
-#: apps/wei/models.py:224 apps/wei/templates/wei/weimembership_form.html:70
+#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:70
msgid "emergency contact name"
msgstr "nom du contact en cas d'urgence"
-#: apps/wei/models.py:229 apps/wei/templates/wei/weimembership_form.html:73
+#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:73
msgid "emergency contact phone"
msgstr "téléphone du contact en cas d'urgence"
-#: apps/wei/models.py:234 apps/wei/templates/wei/weimembership_form.html:52
+#: apps/wei/models.py:239 apps/wei/templates/wei/weimembership_form.html:52
msgid "first year"
msgstr "première année"
-#: apps/wei/models.py:235
+#: apps/wei/models.py:240
msgid "Tells if the user is new in the school."
msgstr "Indique si l'utilisateur est nouveau dans l'école."
-#: apps/wei/models.py:240
+#: apps/wei/models.py:245
msgid "registration information"
msgstr "informations sur l'inscription"
-#: apps/wei/models.py:241
+#: apps/wei/models.py:246
msgid ""
"Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON"
@@ -2587,44 +2593,52 @@ msgstr ""
"Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
"1A), encodées en JSON"
-#: apps/wei/models.py:272
+#: apps/wei/models.py:304
msgid "WEI User"
msgstr "Participant au WEI"
-#: apps/wei/models.py:273
+#: apps/wei/models.py:305
msgid "WEI Users"
msgstr "Participants au WEI"
-#: apps/wei/models.py:293
+#: apps/wei/models.py:325
msgid "team"
msgstr "équipe"
-#: apps/wei/models.py:303
+#: apps/wei/models.py:335
msgid "WEI registration"
msgstr "Inscription au WEI"
-#: apps/wei/models.py:307
+#: apps/wei/models.py:339
msgid "WEI membership"
msgstr "Adhésion au WEI"
-#: apps/wei/models.py:308
+#: apps/wei/models.py:340
msgid "WEI memberships"
msgstr "Adhésions au WEI"
-#: apps/wei/tables.py:127
+#: apps/wei/tables.py:104
+msgid "The user does not have enough money."
+msgstr "L'utilisateur n'a pas assez d'argent."
+
+#: apps/wei/tables.py:107
+msgid "The user has enough money, you can validate the registration."
+msgstr "L'utilisateur a assez d'argent, l'inscription est possible."
+
+#: apps/wei/tables.py:139
msgid "Year"
msgstr "Année"
-#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:32
+#: apps/wei/tables.py:177 apps/wei/templates/wei/bus_detail.html:32
#: apps/wei/templates/wei/busteam_detail.html:50
msgid "Teams"
msgstr "Équipes"
-#: apps/wei/tables.py:174 apps/wei/tables.py:215
+#: apps/wei/tables.py:186 apps/wei/tables.py:227
msgid "Members count"
msgstr "Nombre de membres"
-#: apps/wei/tables.py:181 apps/wei/tables.py:212
+#: apps/wei/tables.py:193 apps/wei/tables.py:224
msgid "members"
msgstr "adhérents"
@@ -2644,11 +2658,11 @@ msgstr "Prix du WEI (étudiants)"
msgid "WEI list"
msgstr "Liste des WEI"
-#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:508
+#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:510
msgid "Register 1A"
msgstr "Inscrire un 1A"
-#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:576
+#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:578
msgid "Register 2A+"
msgstr "Inscrire un 2A+"
@@ -2671,14 +2685,14 @@ msgstr "Membres"
#: apps/wei/templates/wei/bus_detail.html:54
#: apps/wei/templates/wei/busteam_detail.html:60
-#: apps/wei/templates/wei/weimembership_list.html:29
+#: apps/wei/templates/wei/weimembership_list.html:31
msgid "View as PDF"
msgstr "Télécharger au format PDF"
#: apps/wei/templates/wei/survey.html:11
#: apps/wei/templates/wei/survey_closed.html:11
-#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:984
-#: apps/wei/views.py:1039 apps/wei/views.py:1049
+#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:973
+#: apps/wei/views.py:1028 apps/wei/views.py:1038
msgid "Survey WEI"
msgstr "Questionnaire WEI"
@@ -2835,7 +2849,7 @@ msgstr ""
"L'adhésion va être faite automatiquement, l'inscription au WEI inclut le "
"coût d'adhésion."
-#: apps/wei/templates/wei/weimembership_list.html:23
+#: apps/wei/templates/wei/weimembership_list.html:27
msgid "View unvalidated registrations..."
msgstr "Voir les inscriptions non validées ..."
@@ -2852,11 +2866,11 @@ msgstr ""
"Êtes-vous sûr de vouloir supprimer l'inscription de %(user)s pour le WEI "
"%(wei_name)s ? Cette action ne pourra pas être annulée."
-#: apps/wei/templates/wei/weiregistration_list.html:17
+#: apps/wei/templates/wei/weiregistration_list.html:19
msgid "There is no pre-registration found with this pattern."
msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée."
-#: apps/wei/templates/wei/weiregistration_list.html:23
+#: apps/wei/templates/wei/weiregistration_list.html:27
msgid "View validated memberships..."
msgstr "Voir les adhésions validées ..."
@@ -2896,31 +2910,31 @@ msgstr "Ajouter un nouveau bus"
msgid "Update bus"
msgstr "Modifier le bus"
-#: apps/wei/views.py:364
+#: apps/wei/views.py:366
msgid "Manage bus"
msgstr "Gérer le bus"
-#: apps/wei/views.py:391
+#: apps/wei/views.py:393
msgid "Create new team"
msgstr "Créer une nouvelle équipe"
-#: apps/wei/views.py:431
+#: apps/wei/views.py:433
msgid "Update team"
msgstr "Modifier l'équipe"
-#: apps/wei/views.py:462
+#: apps/wei/views.py:464
msgid "Manage WEI team"
msgstr "Gérer l'équipe WEI"
-#: apps/wei/views.py:484
+#: apps/wei/views.py:486
msgid "Register first year student to the WEI"
msgstr "Inscrire un 1A au WEI"
-#: apps/wei/views.py:530 apps/wei/views.py:611
+#: apps/wei/views.py:532 apps/wei/views.py:613
msgid "This user is already registered to this WEI."
msgstr "Cette personne est déjà inscrite au WEI."
-#: apps/wei/views.py:535
+#: apps/wei/views.py:537
msgid ""
"This user can't be in her/his first year since he/she has already "
"participated to a WEI."
@@ -2928,47 +2942,43 @@ msgstr ""
"Cet utilisateur ne peut pas être en première année puisqu'il a déjà "
"participé à un WEI."
-#: apps/wei/views.py:552
+#: apps/wei/views.py:554
msgid "Register old student to the WEI"
msgstr "Inscrire un 2A+ au WEI"
-#: apps/wei/views.py:595 apps/wei/views.py:684
+#: apps/wei/views.py:597 apps/wei/views.py:686
msgid "You already opened an account in the Société générale."
msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
-#: apps/wei/views.py:641
+#: apps/wei/views.py:643
msgid "Update WEI Registration"
msgstr "Modifier l'inscription WEI"
-#: apps/wei/views.py:744
+#: apps/wei/views.py:746
msgid "Delete WEI registration"
msgstr "Supprimer l'inscription WEI"
-#: apps/wei/views.py:755
+#: apps/wei/views.py:757
msgid "You don't have the right to delete this WEI registration."
msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
-#: apps/wei/views.py:774
+#: apps/wei/views.py:776
msgid "Validate WEI registration"
msgstr "Valider l'inscription WEI"
-#: apps/wei/views.py:922
-msgid "This user didn't give her/his caution check."
-msgstr "Cet utilisateur n'a pas donné son chèque de caution."
-
-#: note_kfet/settings/base.py:157
+#: note_kfet/settings/base.py:161
msgid "German"
msgstr "Allemand"
-#: note_kfet/settings/base.py:158
+#: note_kfet/settings/base.py:162
msgid "English"
msgstr "Anglais"
-#: note_kfet/settings/base.py:159
+#: note_kfet/settings/base.py:163
msgid "Spanish"
msgstr "Espagnol"
-#: note_kfet/settings/base.py:160
+#: note_kfet/settings/base.py:164
msgid "French"
msgstr "Français"
@@ -3068,7 +3078,7 @@ msgstr "Inscription"
msgid "Log in"
msgstr "Se connecter"
-#: note_kfet/templates/base.html:156
+#: 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."
@@ -3076,13 +3086,13 @@ 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:160
+#: note_kfet/templates/base.html:164
msgid "You are not a Kfet member, so you can't use your note account."
msgstr ""
"Vous n'êtes pas adhérent Kfet, vous ne pouvez par conséquent pas utiliser "
"votre compte note."
-#: note_kfet/templates/base.html:166
+#: note_kfet/templates/base.html:170
msgid ""
"Your e-mail address is not validated. Please check your mail inbox and click "
"on the validation link."
@@ -3090,7 +3100,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:176
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 "
@@ -3105,7 +3115,7 @@ msgstr ""
"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:199
msgid "Contact us"
msgstr "Nous contacter"
@@ -3228,19 +3238,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 "Central Authentication Service"
-#~ msgstr "Service Central d'Authentification"
-
-#, python-format
-#~ msgid ""
-#~ "A new version of the application is available. This instance runs "
-#~ "%(VERSION)s and the last version is %(LAST_VERSION)s. Please consider "
-#~ "upgrading."
-#~ msgstr ""
-#~ "Une nouvelle version de l'application est disponible. Cette instance "
-#~ "utilise la version %(VERSION)s et la dernière version est "
-#~ "%(LAST_VERSION)s. Merci de vous mettre à jour."
-
-#~ msgid "Check this case is the Société Générale paid the inscription."
-#~ msgstr "Cochez cette case si la Société Générale a payé l'inscription."
diff --git a/note_kfet/admin.py b/note_kfet/admin.py
index 06543102f096da773d5ae99badd09073beaa46bd..375122d830d6d5de19ed0cf2ea5cf1bfafcc84c2 100644
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py
index df5fc068ec7f24308a779343078680f4272f8b75..6e729c470e167e83619184cf3f0ae64b6a9a0a87 100644
--- a/note_kfet/inputs.py
+++ b/note_kfet/inputs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from json import dumps as json_dumps
diff --git a/note_kfet/middlewares.py b/note_kfet/middlewares.py
index cf99c99fbb6c0eaed6adf31f19c9b383f71dc18a..fcb84c9dfd6f7c7a786430b6d347219abb4fd273 100644
--- a/note_kfet/middlewares.py
+++ b/note_kfet/middlewares.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/note_kfet/settings/__init__.py b/note_kfet/settings/__init__.py
index 3aa115f902551d9361543b2f37497d1509055d92..0710212b18d5141bf24d3591dd64630a24d867eb 100644
--- a/note_kfet/settings/__init__.py
+++ b/note_kfet/settings/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.utils.translation import gettext_lazy as _
diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py
index 67948f09a9c4d8a05308a557f3199391ae1f39df..6cb068a5c8398fdf94e997cba1b5ff0b94e6e74f 100644
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
# This file implements sane defaults to use in production.
diff --git a/note_kfet/settings/development.py b/note_kfet/settings/development.py
index e4fc882605e7a28c10f41d05354bf943c897d515..7fa4da86a87a60d09b444f7c8643bdb68e743e0e 100644
--- a/note_kfet/settings/development.py
+++ b/note_kfet/settings/development.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
########################
diff --git a/note_kfet/settings/secrets_example.py b/note_kfet/settings/secrets_example.py
index 61d92359c3e05702559f28f99a0c50f55436e422..5b69c10f5ef5be8e721e05f7ea87ae4ca3944968 100644
--- a/note_kfet/settings/secrets_example.py
+++ b/note_kfet/settings/secrets_example.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
OPTIONAL_APPS = [
diff --git a/note_kfet/static/js/base.js b/note_kfet/static/js/base.js
index d7772a5a6aa4f83b80e0c535ec670633f032855d..1afc858c4d997243f7c8b25d62c085aee3808e06 100644
--- a/note_kfet/static/js/base.js
+++ b/note_kfet/static/js/base.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+// Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
// SPDX-License-Identifier: GPL-3.0-or-later
/**
@@ -7,8 +7,8 @@
* @returns {string}
*/
function pretty_money (value) {
- if (value % 100 === 0) { return (value < 0 ? '- ' : '') + Math.floor(Math.abs(value) / 100) + ' €' } else {
- return (value < 0 ? '- ' : '') + Math.floor(Math.abs(value) / 100) + '.' +
+ if (value % 100 === 0) { return (value < 0 ? '- ' : '') + Math.round(Math.abs(value) / 100) + ' €' } else {
+ return (value < 0 ? '- ' : '') + Math.round(Math.abs(value) / 100) + '.' +
(Math.abs(value) % 100 < 10 ? '0' : '') + (Math.abs(value) % 100) + ' €'
}
}
diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html
index cd902d329a7d86e6156d42cdb3cbcc75e195d845..09ede8c649c27d42fb188d1feba8ade79b5b2e55 100644
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@@ -159,10 +159,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="alert alert-danger">
{% trans "You are not a BDE member anymore. Please renew your membership if you want to use the note." %}
</div>
- {% elif not user|is_member:"Kfet" %}
- <div class="alert alert-warning">
- {% trans "You are not a Kfet member, so you can't use your note account." %}
- </div>
{% endif %}
{% if not user.profile.email_confirmed %}
diff --git a/note_kfet/urls.py b/note_kfet/urls.py
index ab19d763396a7dd94dd31785941b1763f3bce81f..9981df99572bc8ed130cdd4149450dfa926a6596 100644
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
diff --git a/note_kfet/views.py b/note_kfet/views.py
index bd2b24241257f8a1893d7cf3412f82eca139cf4e..797de4efbe5733b48fd8c726c06a7ac025cd0204 100644
--- a/note_kfet/views.py
+++ b/note_kfet/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib.auth.mixins import LoginRequiredMixin
diff --git a/tox.ini b/tox.ini
index c900d5242a749c7266612ad7ea096d7091b52723..73e80b3724f3c310e2bc7f70a0104fcf8f21ed2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,7 @@ commands =
[testenv:linters]
deps =
flake8
+ flake8-bugbear
flake8-colors
flake8-django
flake8-import-order
@@ -31,7 +32,7 @@ deps =
pep8-naming
pyflakes
commands =
- flake8 apps/activity apps/api apps/logs apps/member apps/note apps/permission apps/treasury apps/wei
+ flake8 apps --extend-exclude apps/scripts
[flake8]
ignore = W503, I100, I101