From 5d30b0e8198620bb5cc7f8b20e83a6bd7ebe1456 Mon Sep 17 00:00:00 2001
From: test <korenstin@crans.org>
Date: Sun, 26 May 2024 15:46:50 +0200
Subject: [PATCH 1/4] charte info

---
 apps/activity/templates/activity/activity_form.html | 3 +++
 locale/fr/LC_MESSAGES/django.po                     | 4 ++++
 note_kfet/templates/base.html                       | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/apps/activity/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html
index 757b47b0..8032faae 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/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 46e6aa0a..c6ca48b0 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 979d6e2c..63d0ddfe 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> &mdash;
                         <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}"
                            class="text-muted">{% trans "Technical Support" %}</a> &mdash;
+                        <a href="https://perso.crans.org/club-bde/charte_informatique.pdf"
+                           class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                         <a href="https://note.crans.org/doc/faq/"
                            class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
                     </span>

From 0218d43a1752c16f732237ebb8d92187ad4d6b3b Mon Sep 17 00:00:00 2001
From: korenstin <korenstin@crans.org>
Date: Sun, 26 May 2024 16:00:26 +0200
Subject: [PATCH 2/4] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97110ecd..1a3cf02b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,19 +8,19 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 # Debian Buster
-py37-django22:
-  stage: test
-  image: debian:buster-backports
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -t buster-backports -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py37-django22
+#  py37-django22:
+#   stage: test
+#   image: debian:buster-backports
+#   before_script:
+#     - >
+#         apt-get update &&
+#         apt-get install --no-install-recommends -t buster-backports -y
+#         python3-django python3-django-crispy-forms
+#         python3-django-extensions python3-django-filters python3-django-polymorphic
+#         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
+#         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
+#         python3-bs4 python3-setuptools tox texlive-xetex
+#   script: tox -e py37-django22
 
 # Ubuntu 20.04
 py38-django22:

From 989905ea64ba8e0d04b96564d31654923fa8d311 Mon Sep 17 00:00:00 2001
From: korenstin <korenstin@crans.org>
Date: Sun, 26 May 2024 18:41:49 +0200
Subject: [PATCH 3/4] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a3cf02b..33ce0cd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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

From 10a01c5bc2c519b78b125fbdc99f5c38c3b94e10 Mon Sep 17 00:00:00 2001
From: korenstin <korenstin@crans.org>
Date: Thu, 30 May 2024 20:21:56 +0200
Subject: [PATCH 4/4] linters

---
 apps/member/views.py                 | 2 +-
 apps/note/api/views.py               | 2 +-
 apps/note/tests/test_transactions.py | 2 +-
 apps/treasury/api/views.py           | 2 +-
 apps/treasury/urls.py                | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/member/views.py b/apps/member/views.py
index 7c72d3d4..ad0cc79f 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 39b9b270..0aba9adc 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 a11a1962..574e3575 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 c7bf68e6..9b1825d1 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 2759358f..6e2517b3 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'