diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f05f873229ad6e9db77c36dd9863d720043b6902..33ce0cd800cc37cb53ae9443b85e31d6db10599d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive # Debian Buster -# py37-django22: +# py37-django22: # stage: test # image: debian:buster-backports # before_script: @@ -56,7 +56,7 @@ py39-django22: linters: stage: quality-assurance - image: debian:buster-backports + image: debian:bullseye before_script: - apt-get update && apt-get install -y tox script: tox -e linters diff --git a/apps/activity/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html index 757b47b02863918f19cc6ed8cbd2f5752b4010e2..8032faaecb3c22f80fc262450fb5396ebd421248 100644 --- a/apps/activity/templates/activity/activity_form.html +++ b/apps/activity/templates/activity/activity_form.html @@ -17,6 +17,9 @@ SPDX-License-Identifier: GPL-3.0-or-later </form> </div> </div> +{% endblock %} + +{% block extrajavascript %} <script> var date_end = document.getElementById("id_date_end"); var date_start = document.getElementById("id_date_start"); diff --git a/apps/member/views.py b/apps/member/views.py index 7c72d3d4367fd41fb73f0b151cce8ffa415c7fba..ad0cc79f031be672563025594fd39742cd4a93e1 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -26,7 +26,7 @@ from permission.backends import PermissionBackend from permission.models import Role from permission.views import ProtectQuerysetMixin, ProtectedCreateView -from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\ +from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \ CustomAuthenticationForm, MembershipRolesForm from .models import Club, Membership from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable diff --git a/apps/note/api/views.py b/apps/note/api/views.py index 39b9b270dd387fb7c3574f585113c28dcdeca253..0aba9adccf5fb3c88fc7be0c1693d8b9647bde43 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -13,7 +13,7 @@ from rest_framework import status from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet from permission.backends import PermissionBackend -from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\ +from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer, \ TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer, \ TrustSerializer from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial, Trust diff --git a/apps/note/tests/test_transactions.py b/apps/note/tests/test_transactions.py index a11a1962d4c8c124a7f4eb8a139e66508fb8dadc..574e3575522f073961ca37d31e81e7c6cde20bf1 100644 --- a/apps/note/tests/test_transactions.py +++ b/apps/note/tests/test_transactions.py @@ -10,7 +10,7 @@ from django.urls import reverse from django.utils import timezone from permission.models import Role -from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet,\ +from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet, \ TransactionTemplateViewSet, TransactionViewSet from ..models import NoteUser, Transaction, TemplateCategory, TransactionTemplate, RecurrentTransaction, \ MembershipTransaction, SpecialTransaction, NoteSpecial, Alias, Note diff --git a/apps/treasury/api/views.py b/apps/treasury/api/views.py index c7bf68e6a02f36fc00e87a9a670c1f351479bb27..9b1825d13aec04fbfaae744e2b56f0e9ef731131 100644 --- a/apps/treasury/api/views.py +++ b/apps/treasury/api/views.py @@ -5,7 +5,7 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework.filters import SearchFilter from api.viewsets import ReadProtectedModelViewSet -from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer,\ +from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer, \ SogeCreditSerializer from ..models import Invoice, Product, RemittanceType, Remittance, SogeCredit diff --git a/apps/treasury/urls.py b/apps/treasury/urls.py index 2759358f711a636cac17b7989c326dec0602c3bd..6e2517b3ccae7603affd579cda7954e74f48ec02 100644 --- a/apps/treasury/urls.py +++ b/apps/treasury/urls.py @@ -3,8 +3,8 @@ from django.urls import path -from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView,\ - RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView,\ +from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView, \ + RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView, \ UnlinkTransactionToRemittanceView, SogeCreditListView, SogeCreditManageView app_name = 'treasury' diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 46e6aa0a72909d3fa934c9a4a33d0128abf928cf..c6ca48b0f008a3599d3b4c38ff0e8a5d15b46474 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3388,6 +3388,10 @@ msgstr "Support technique" msgid "FAQ (FR)" msgstr "FAQ (FR)" +#: note_kfet/templates/base.html:200 +msgid "Charte Info (FR)" +msgstr "Charte Info (FR)" + #: note_kfet/templates/base_search.html:15 msgid "Search by attribute such as name…" msgstr "Chercher par un attribut tel que le nom …" diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index 979d6e2cf7cd08eb65ffca602a7661eed46aa864..63d0ddfe5a6c2e8f69d3a8805316e9aaf8b2ed1d 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -194,6 +194,8 @@ SPDX-License-Identifier: GPL-3.0-or-later class="text-muted">{% trans "Contact us" %}</a> — <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}" class="text-muted">{% trans "Technical Support" %}</a> — + <a href="https://perso.crans.org/club-bde/charte_informatique.pdf" + class="text-muted">{% trans "Charte Info (FR)" %}</a> — <a href="https://note.crans.org/doc/faq/" class="text-muted">{% trans "FAQ (FR)" %}</a> — </span>