Fr translation (treasury summary)

Inclusif, admin and migrations (treasury summary)
treasury summary
2025-06-21 01:48:21 +02:00 · 2024-08-07 20:01:22 +02:00 · 2024-08-07 19:24:23 +02:00 · 2024-08-02 01:35:13 +02:00 · 2024-07-18 18:17:06 +02:00 · 2024-07-18 18:02:43 +02:00
42 changed files with 577 additions and 812 deletions
--- 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:
@ -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
--- 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");
--- a/apps/activity/templates/activity/activity_list.html
+++ b/apps/activity/templates/activity/activity_list.html
@ -46,4 +46,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </h3>
    {% render_table table %}
 </div>
-{% endblock %}
+{% endblock %}
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -17,7 +17,8 @@ from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView, TemplateView, UpdateView
-from django_tables2.views import SingleTableView
+from django.views.generic.list import ListView
+from django_tables2.views import MultiTableMixin
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
@ -57,27 +58,40 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
        return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk})


-class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
+class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
    """
    Displays all Activities, and classify if they are on-going or upcoming ones.
    """
    model = Activity
-    table_class = ActivityTable
-    ordering = ('-date_start',)
+    tables = [ActivityTable, ActivityTable]
    extra_context = {"title": _("Activities")}

    def get_queryset(self, **kwargs):
        return super().get_queryset(**kwargs).distinct()

+    def get_tables(self):
+        tables = super().get_tables()
+
+        tables[0].prefix = "all-"
+        tables[1].prefix = "upcoming-"
+        return tables
+
+    def get_tables_data(self):
+        # first table = all activities, second table = upcoming
+        return [
+            self.get_queryset().order_by("-date_start"),
+            Activity.objects.filter(date_end__gt=timezone.now())
+                            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
+                            .distinct()
+                            .order_by("date_start")
+        ]
+
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

-        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
-        context['upcoming'] = ActivityTable(
-            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")),
-            prefix='upcoming-',
-            order_by='date_start',
-        )
+        tables = context["tables"]
+        for name, table in zip(["table", "upcoming"], tables):
+            context[name] = table

        started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
        context["started_activities"] = started_activities
--- a/apps/food/init.py
+++ b/apps/food/init.py
--- a/apps/food/admin.py
+++ b/apps/food/admin.py
@ -1,32 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.contrib import admin
-from note_kfet.admin import admin_site
-
-from .models import QR_code, BasicFood, TransformedFood, Allergen
-
-
-@admin.register(QR_code, site = admin_site)
-class QR_codeAdmin(admin.ModelAdmin):
-    """
-    TEMPORARY
-    """
-
-@admin.register(BasicFood, site = admin_site)
-class Basic_foodAdmin(admin.ModelAdmin):
-    """
-    TEMPORARY
-    """
-
-@admin.register(TransformedFood, site = admin_site)
-class Transformed_foodAdmin(admin.ModelAdmin):
-    """
-    TEMPORARY
-    """
-
-@admin.register(Allergen, site = admin_site)
-class AllergenAdmin(admin.ModelAdmin):
-    """
-    TEMPORARY
-    """
--- a/apps/food/apps.py
+++ b/apps/food/apps.py
@ -1,10 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-from django.apps import AppConfig
-
-
-class FoodkfetConfig(AppConfig):
-    name = 'food'
-    verbose_name = _('food')
--- a/apps/food/forms.py
+++ b/apps/food/forms.py
@ -1,92 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from random import shuffle
-
-from django import forms
-from django.utils.translation import gettext_lazy as _
-from django.utils import timezone
-from member.models import Club
-from note_kfet.inputs import Autocomplete, DatePickerInput, DateTimePickerInput
-from note_kfet.middlewares import get_current_request
-from permission.backends import PermissionBackend
-
-from .models import QR_code, Allergen, BasicFood, TransformedFood
-
-
-class BasicFoodForms(forms.ModelForm):
-    """
-    Form for add non-transformed food
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
-        self.fields['name'].required = True
-        self.fields['owner'].required = True
-        self.fields['label'].help_text = _('The lot number must be contained in the picture')
-
-        # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("pasta")})
-        clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
-        shuffle(clubs)
-        self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-    def clean_dlm_or_dlc(self):
-        is_dlc = self.cleaned_data["is_DLC"]
-        is_ddm = self.cleaned_data["is_DDM"]
-        if is_dlc and is_ddm:
-            self.add_error("is_ddm", _("the product cannot be a DLC and a DDM"))
-        return is_ddm
-
-    class Meta:
-        model = BasicFood
-        fields = ('name', 'owner', 'is_DLC', 'is_DDM', 'expiry_date', 'label')        
-        widgets = {
-            "owner": Autocomplete(
-                model = Club,
-                attrs = {"api_url": "/api/members/club/"},
-            ),
-            'expiry_date': DatePickerInput(),
-        }
-
-
-
-class TransformedFoodForms(forms.ModelForm):
-    """
-    Form for add transformed food
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
-        self.fields['name'].required = True
-        self.fields['owner'].required = True
-        self.fields['creation_date'].required = True
-        self.fields['creation_date'].initial = timezone.now
-        self.fields['is_active'].initial = True
-
-        # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("lasagna")})
-        clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
-        shuffle(clubs)
-        self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-
-    
-    class Meta:
-        model = TransformedFood
-        fields = ('name', 'creation_date', 'owner', 'is_active',)
-        widgets = {
-            "owner": Autocomplete(
-                model = Club,
-                attrs = {"api_url": "/api/members/club/"},
-            ),
-            'creation_date': DateTimePickerInput(),
-        }
-class AllergenForms(forms.ModelForm):
-    """
-    Form for allergen
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-    
-    class Meta:
-        model = Allergen
-        exclude = ['basic_food', 'transformed_food']
--- a/apps/food/migrations/0001_initial.py
+++ b/apps/food/migrations/0001_initial.py
@ -1,97 +0,0 @@
-# Generated by Django 2.2.28 on 2024-05-25 20:32
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('member', '0011_profile_vss_charter_read'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='BasicFood',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('is_DLC', models.BooleanField(default=False, verbose_name='is DLC')),
-                ('is_DDM', models.BooleanField(default=False, verbose_name='is DDM')),
-                ('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')),
-                ('expiry_date', models.DateTimeField(blank=True, null=True, verbose_name='expiry date')),
-                ('label', models.ImageField(max_length=255, upload_to='label/', verbose_name='food label')),
-                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
-            ],
-            options={
-                'verbose_name': 'Basic food',
-                'verbose_name_plural': 'Basic foods',
-            },
-        ),
-        migrations.CreateModel(
-            name='TransformedFood',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('creation_date', models.DateTimeField(verbose_name='creation date')),
-                ('expiry_date', models.DateTimeField(verbose_name='expiry date')),
-                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
-                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
-                ('transformed_ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.TransformedFood', verbose_name='transformed ingredient')),
-            ],
-            options={
-                'verbose_name': 'Transformed food',
-                'verbose_name_plural': 'Transformed foods',
-            },
-        ),
-        migrations.CreateModel(
-            name='QR_code',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('qr_code_number', models.PositiveIntegerField(verbose_name='QR-code number')),
-                ('basic_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.BasicFood', verbose_name='basic food')),
-                ('transformed_food_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.TransformedFood', verbose_name='transformed food container')),
-            ],
-            options={
-                'verbose_name': 'QR-code',
-                'verbose_name_plural': 'QR-codes',
-            },
-        ),
-        migrations.AddField(
-            model_name='basicfood',
-            name='transformed_food',
-            field=models.ManyToManyField(blank=True, related_name='BasicFood', to='food.TransformedFood', verbose_name='transformed food'),
-        ),
-        migrations.CreateModel(
-            name='Allergen',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('gluten', models.BooleanField(default=False, verbose_name='gluten')),
-                ('nut', models.BooleanField(default=False, verbose_name='nut')),
-                ('crustecean', models.BooleanField(default=False, verbose_name='crustacean')),
-                ('celery', models.BooleanField(default=False, verbose_name='celery')),
-                ('egg', models.BooleanField(default=False, verbose_name='egg')),
-                ('mustard', models.BooleanField(default=False, verbose_name='mustard')),
-                ('fish', models.BooleanField(default=False, verbose_name='fish')),
-                ('soy', models.BooleanField(default=False, verbose_name='soy')),
-                ('milk', models.BooleanField(default=False, verbose_name='milk')),
-                ('sulphite', models.BooleanField(default=False, verbose_name='sulphite')),
-                ('lupine', models.BooleanField(default=False, verbose_name='lupine')),
-                ('mollusc', models.BooleanField(default=False, verbose_name='mollusc')),
-                ('groundnut', models.BooleanField(default=False, verbose_name='groundnut')),
-                ('sesame', models.BooleanField(default=False, verbose_name='sesame')),
-                ('alcohol', models.BooleanField(default=False, verbose_name='alcohol')),
-                ('basic_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Allergen', to='food.BasicFood', verbose_name='basic food')),
-                ('transformed_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Allergen', to='food.TransformedFood', verbose_name='transformed food')),
-            ],
-            options={
-                'verbose_name': 'Allergen',
-                'verbose_name_plural': 'Allergens',
-            },
-        ),
-    ]
--- a/apps/food/migrations/init.py
+++ b/apps/food/migrations/init.py
--- a/apps/food/models.py
+++ b/apps/food/models.py
@ -1,289 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date
-
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.exceptions import ValidationError
-from django.core.validators import MinValueValidator
-from django.db import models, transaction
-from django.db.models import Q
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-from member.models import Club
-
-#################################################################
-# TO DO
-# - link allergen with one food (basic or transformed) with check
-# - check on basic food
-# - check on transformed food
-#################################################################
-
-class QR_code(models.Model):
-    """
-    An QR_code model
-    """
-    qr_code_number = models.PositiveIntegerField(
-        verbose_name=_("QR-code number"),
-    )
-
-    transformed_food_container = models.ForeignKey(
-        'TransformedFood',
-        on_delete = models.PROTECT,
-        related_name = 'QR_code',
-        null = True,
-        blank = True,
-        verbose_name = _('transformed food container'),
-    )
-    
-    basic_food = models.ForeignKey(
-        'BasicFood',
-        on_delete = models.PROTECT,
-        related_name = 'QR_code',
-        null = True,
-        blank = True,
-        verbose_name = _('basic food'),
-    )
-
-    class Meta:
-        verbose_name = _("QR-code")
-        verbose_name_plural = _("QR-codes")
-
-    def __str__(self):
-        return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number)
-
-class Allergen(models.Model):
-    """
-    A list of allergen and alimentary restrictions
-    """
-
-    gluten = models.BooleanField(
-        default = False,
-        verbose_name = _('gluten'),
-    )
-
-    nut = models.BooleanField(
-        default = False,
-        verbose_name = _('nut'),
-    )
-
-    crustecean = models.BooleanField(
-        default = False,
-        verbose_name = _('crustacean'),
-    )
-
-    celery = models.BooleanField(
-        default = False,
-        verbose_name = _('celery'),
-    )
-
-    egg = models.BooleanField(
-        default = False,
-        verbose_name = _('egg'),
-    )
-
-    mustard = models.BooleanField(
-        default = False,
-        verbose_name = _('mustard'),
-    )
-
-    fish = models.BooleanField(
-        default = False,
-        verbose_name = _('fish'),
-    )
-
-    soy = models.BooleanField(
-        default = False,
-        verbose_name = _('soy'),
-    )
-
-    milk = models.BooleanField(
-        default = False,
-        verbose_name = _('milk'),
-    )
-
-    sulphite = models.BooleanField(
-        default = False,
-        verbose_name = _('sulphite'),
-    )
-
-    lupine = models.BooleanField(
-        default = False,
-        verbose_name = _('lupine'),
-    )
-
-    mollusc = models.BooleanField(
-        default = False,
-        verbose_name = _('mollusc'),
-    )
-
-    groundnut = models.BooleanField(
-        default = False,
-        verbose_name = _('groundnut'),
-    )
-
-    sesame = models.BooleanField(
-        default = False,
-        verbose_name = _('sesame'),
-    )
-
-    alcohol = models.BooleanField(
-        default = False,
-        verbose_name = _('alcohol'),
-    )
-
-    transformed_food = models.ForeignKey(
-        'TransformedFood',
-        on_delete = models.CASCADE,
-        related_name = 'Allergen',
-        blank = True,
-        null = True,
-        verbose_name = _('transformed food'),
-    )
-
-    basic_food = models.ForeignKey(
-        'BasicFood',
-        on_delete = models.CASCADE,
-        related_name = 'Allergen',
-        blank = True,
-        null = True,
-        verbose_name = _('basic food'),
-    )
-
-    class Meta:
-        verbose_name = _('Allergen')
-        verbose_name_plural = _('Allergens')
-
-    def __str__(self):
-        return _('Allergens of #{id}').format(id=self.id)
-
-        
-
-
-class BasicFood(models.Model):
-    """
-    Food which has been directly buy on supermarket
-    """
-    name = models.CharField(
-        verbose_name=_('name'),
-        max_length=255,
-    )
-
-    is_DLC = models.BooleanField(
-        verbose_name=_("is DLC"),
-        default=False,
-    )
-
-    is_DDM = models.BooleanField(
-        verbose_name=_("is DDM"),
-        default=False,
-    )
-
-    arrival_date = models.DateTimeField(
-        verbose_name=_('arrival date'),
-        default=timezone.now,
-    )
-    
-    expiry_date = models.DateTimeField(
-        verbose_name=_('expiry date'),
-        blank=True,
-        null = True,
-    )
-    
-    owner = models.ForeignKey(
-        Club,
-        on_delete=models.PROTECT,
-        related_name= '+',
-        verbose_name=_('owner'),
-    )
-
-    label = models.ImageField(
-        verbose_name=_('food label'),
-        max_length=255,
-        blank=False,
-        null=False,
-        upload_to='label/',
-    )
-
-    was_eaten = models.BooleanField(
-        verbose_name=_('was eaten'),
-        default = False,
-    )
-
-    transformed_food = models.ManyToManyField(
-        'TransformedFood',
-        related_name= 'BasicFood',
-        blank = True,
-        verbose_name = _('transformed food'),
-    )
-
-
-    class Meta:
-        verbose_name=_('Basic food')
-        verbose_name_plural=_('Basic foods')
-
-    def __str__(self):
-        return  self.name
-
-    @transaction.atomic 
-    def save(self, force_insert=False, force_update=False, using= None, update_fields=None):
-        # Check if is_DLC and is DDM are not both True
-        if self.is_DLC and self.is_DDM:
-            raise ValidationError("The product cannot be a DLC and a DDM")
-        return super().save(force_insert, force_update, using, update_fields)
-
-
-class TransformedFood(models.Model):
-    """
-    Transformed food  are a mix between basic food and meal
-    """
-    name = models.CharField(
-        max_length = 255,
-        verbose_name =_('name'),
-    )
-
-    creation_date = models.DateTimeField(
-        verbose_name =_('creation date'),
-    )
-
-    expiry_date = models.DateTimeField(
-        verbose_name =_('expiry date'),
-    )
-
-    owner = models.ForeignKey(
-        Club,
-        on_delete = models.PROTECT,
-        related_name = '+',
-        verbose_name =_('owner'),
-    )
-    
-    transformed_ingredient = models.ManyToManyField(
-        "self",
-        blank = True,
-        symmetrical = False,
-        related_name = 'transformed_ingredient_inv',
-        verbose_name = _('transformed ingredient'),
-    )
-    
-    is_active = models.BooleanField(
-        default = True,
-        verbose_name = _('is active'),
-    )
-
-    was_eaten = models.BooleanField(
-        default = False,
-        verbose_name = _('was eaten'),
-    )
-
-
-    class Meta:
-        verbose_name = _('Transformed food')
-        verbose_name_plural = _('Transformed foods')
-
-    def __str__(self):
-        return self.name
-
-    @transaction.atomic
-    def save(self, force_insert=False, force_update=False, using= None, update_fields=None):
-        return super().save(force_insert, force_update, using, update_fields)
--- a/apps/food/templates/food/basic_food_form.html
+++ b/apps/food/templates/food/basic_food_form.html
@ -1,22 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    HTML not finished <br>
-    {{ title }}
-  </h3>
-  <div class="card-body">
-    <form method="post">
-      {% csrf_token %}
-      {{ form|crispy }}
-      {{ allergenform|crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}
--- a/apps/food/templates/food/transformed_food_form.html
+++ b/apps/food/templates/food/transformed_food_form.html
@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    HTML not finished <br>
-    {{ title }}
-  </h3>
-  <div class="card-body">
-    <form method="post">
-      {%  csrf_token %}
-      {{ form|crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}
--- a/apps/food/tests.py
+++ b/apps/food/tests.py
@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@ -1,19 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.urls import path
-
-from . import views
-
-###############################
-# TO DO
-# - name url correctly, thinking about the scheme of the app
-###############################
-
-app_name = 'food'
-
-urlpatterns = [
-    path('0', views.BasicFoodCreateView.as_view(), name = 'basic_food'),
-    path('1', views.TransformedFoodCreateView.as_view(), name = 'transformed_food'),
-]
-
--- a/apps/food/views.py
+++ b/apps/food/views.py
@ -1,104 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.urls import reverse_lazy
-from django.db import transaction
-from django.utils.translation import gettext_lazy as _
-from django.utils import timezone
-from datetime import timedelta
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-from django.shortcuts import render
-
-from .forms import BasicFoodForms, TransformedFoodForms, AllergenForms
-from .models import BasicFood, TransformedFood, Allergen
-
-
-class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-#####################################################################
-# TO DO
-# - fix picture save
-# - implement solution crop and convert image (reuse or recode ImageForm from members apps
-# - implement AllergenForms
-# - redirect to another view after the poll is submitted
-#####################################################################
-    """
-    A view to add a basic food
-    """
-    model = BasicFood
-    form_class = BasicFoodForms
-    template_name = 'food/basic_food_form.html'
-    extra_context = {"title": _("Add a new aliment")}
-    
-    def get_sample_object(self):
-        return BasicFood(
-            name="",
-            is_DLC=False,
-            is_DDM=False,
-            expiry_date=timezone.now(),
-            label='pic/default.png',
-        )
-    
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        basic_food_form = BasicFoodForms(data=self.request.POST)
-        allergen_form = AllergenForms(data=self.request.POST)
-        if not basic_food_form.is_valid() or not allergen_form.is_valid():
-            return self.form_invalid(form)
-
-        # Save the aliment and the allergens associed
-        basic_food = form.save(commit=False)
-        # We assume the date of labeling and the same as the date of arrival
-        basic_food.arrival_date = timezone.now
-        basic_food._force_save = True
-        basic_food.save()
-        basic_food.refresh_from_db()
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        # TEMPORARY, I create a fonctionnal view before
-        # return reverse_lazy('food:basicfood', kwargs={"pk": self.object.pk})
-        return '0'
-
-class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-###############################################
-# TO DO
-# -redirect to another view after submit
-###############################################
-    """
-    A view to add a tranformed food
-    """
-    model = TransformedFood
-    template_name = 'food/transformed_food_form.html'
-    form_class = TransformedFoodForms
-    extra_context = {"title": _("Add a new meal")}
-    
-    def get_sample_object(self):
-        return TransformedFood(
-            name="",
-            creation_date=timezone.now(),
-        )
-    
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        transformed_food_form = TransformedFoodForms(data=self.request.POST)
-        if not transformed_food_form.is_valid():
-            return self.form_invalid(form)
-
-        # Save the aliment and allergens associated
-        transformed_food = form.save(commit=False)
-        # Without microbiological analyzes, the storage time is 3 days
-        transformed_food.expiry_date = transformed_food.creation_date + timedelta(days = 3)
-        transformed_food._force_save =  True
-        transformed_food.save()
-        transformed_food.refresh_from_db()
-        return super().form_valid(form)
-
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        # TEMPORARY, I create a fonctionnal view before
-        # return reverse_lazy('food:tranformed_food', kwargs={"pk": self.object.pk})
-        return '1'
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@ -138,6 +138,9 @@ class ImageForm(forms.Form):

        return cleaned_data

+    def is_valid(self):
+        return super().is_valid() or super().clean().get('image') is None
+

 class ClubForm(forms.ModelForm):
    def clean(self):
@ -151,7 +154,7 @@ class ClubForm(forms.ModelForm):

    class Meta:
        model = Club
-        fields = '__all__'
+        exclude = ("add_registration_form",)
        widgets = {
            "membership_fee_paid": AmountInput(),
            "membership_fee_unpaid": AmountInput(),
--- a/apps/member/migrations/0012_club_add_registration_form.py
+++ b/apps/member/migrations/0012_club_add_registration_form.py
@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2024-07-15 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0011_profile_vss_charter_read'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='club',
+            name='add_registration_form',
+            field=models.BooleanField(default=False, verbose_name='add to registration form'),
+        ),
+    ]
--- a/apps/member/migrations/0013_auto_20240807_1409.py
+++ b/apps/member/migrations/0013_auto_20240807_1409.py
@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2024-08-07 12:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0012_club_add_registration_form'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='promotion',
+            field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
+        ),
+    ]
--- a/apps/member/models.py
+++ b/apps/member/models.py
@ -259,6 +259,11 @@ class Club(models.Model):
        help_text=_('Maximal date of a membership, after which members must renew it.'),
    )

+    add_registration_form = models.BooleanField(
+        verbose_name=_("add to registration form"),
+        default=False,
+    )
+
    class Meta:
        verbose_name = _("club")
        verbose_name_plural = _("clubs")
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@ -14,6 +14,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
      <form method="post" enctype="multipart/form-data" id="formUpload">
        {% csrf_token %}
        {{ form |crispy }}
+        {% if user.note.display_image != "pic/default.png" %}
+          <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
+        {% endif %}
      </form>
    </div>
    <!-- MODAL TO CROP THE IMAGE -->
--- 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
@ -326,12 +326,15 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
        """Save image to note"""
        image = form.cleaned_data['image']

-        # Rename as a PNG or GIF
-        extension = image.name.split(".")[-1]
-        if extension == "gif":
-            image.name = "{}_pic.gif".format(self.object.note.pk)
+        if image is None:
+            image = "pic/default.png"
        else:
-            image.name = "{}_pic.png".format(self.object.note.pk)
+            # Rename as a PNG or GIF
+            extension = image.name.split(".")[-1]
+            if extension == "gif":
+                image.name = "{}_pic.gif".format(self.object.note.pk)
+            else:
+                image.name = "{}_pic.png".format(self.object.note.pk)

        # Save
        self.object.note.display_image = image
--- 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
--- a/apps/note/templates/note/mails/negative_balance.html
+++ b/apps/note/templates/note/mails/negative_balance.html
@ -23,7 +23,7 @@

 <p>
    Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde
-    est inférieur à 0 € depuis plus de 24h.
+    est inférieur à 0 €.
 </p>

 <p>
@ -43,4 +43,4 @@
    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 </p>
 </body>
-</html>
+</html>
--- a/apps/note/templates/note/mails/summary_notes_report.html
+++ b/apps/note/templates/note/mails/summary_notes_report.html
@ -0,0 +1,65 @@
+{% load pretty_money %}
+{% load i18n %}
+
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset="UTF-8">
+    <title>[Note Kfet] Récapitulatif de trésorerie</title>
+</head>
+<body>
+<h1>
+  Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
+</h1>
+
+<h2>
+  Tous les utilisateur⋅rices :
+</h2>
+<ul>
+  <li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €</li>
+  <li>Neutres : {{ summary.total_zero_user }}</li>
+  <li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €</li>
+</ul>
+
+<h2>
+  Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
+</h2>
+<ul>
+  <li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €</li>
+  <li>Neutres : {{ summary.total_zero_user_bde }}</li>
+  <li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde / 100 }} €</li>
+</ul>
+
+<h2>
+  Clubs :
+</h2>
+<ul>
+  <li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €</li>
+  <li>Neutres : {{ summary.total_zero_club }}</li>
+  <li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €</li>
+</ul>
+
+<h2>
+  Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
+</h2>
+<ul>
+  <li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €</li>
+  <li>Neutres : {{ summary.total_zero_club_nbde }}</li>
+  <li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €</li>
+</ul>
+
+<h2>
+  Progression :
+</h2>
+<ul>
+  <li>Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices</li>
+  <li>Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs</li>
+</ul>
+
+--
+<p>
+    Le BDE<br>
+    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
+</p>
+</body>
+</html>
--- a/apps/note/templates/note/mails/summary_notes_report.txt
+++ b/apps/note/templates/note/mails/summary_notes_report.txt
@ -0,0 +1,33 @@
+{% load pretty_money %}
+{% load i18n %}
+
+Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
+
+Tous les utilisateur⋅rices :
+  - Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €
+  - Neutres : {{ summary.total_zero_user }}
+  - Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €
+
+Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
+  - Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €
+  - Neutres : {{ summary.total_zero_user_bde }}
+  - Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde /100 }} €
+
+Clubs :
+  - Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €
+  - Neutres : {{ summary.total_zero_club }}
+  - Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €
+
+Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
+  - Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €
+  - Neutres : {{ summary.total_zero_club_nbde }}
+  - Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €
+
+Progression :
+  - Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices
+  - Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs
+
+--
+Le BDE
+
+{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
--- 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
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@ -2591,12 +2591,12 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]",
+			"query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]",
 			"type": "add",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €"
+			"description": "Créer une transaction quelconque tant que la source reste positive s'il s'agit d'alcool, sinon au-dessus de -20€"
 		}
 	},
 	{
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@ -5,7 +5,6 @@ from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
-# from member.models import Club
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import AmountInput

@ -115,12 +114,3 @@ class ValidationForm(forms.Form):
        required=False,
        initial=True,
    )
-
-#     If the bda exists
-#     if Club.objects.filter(name__iexact="bda").exists():
-#         The user can join the bda club at the inscription
-#         join_bda = forms.BooleanField(
-#             label=_("Join BDA Club"),
-#             required=False,
-#             initial=True,
-#         )
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@ -1,6 +1,7 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

+from django import forms
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
@ -238,9 +239,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
        kfet = Club.objects.get(name="Kfet")
        fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
-        if Club.objects.filter(name__iexact="BDA").exists():
-            bda = Club.objects.get(name__iexact="BDA")
-            fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
+        for club in Club.objects.filter(add_registration_form=True):
+            fee += club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
        ctx["total_fee"] = "{:.02f}".format(fee / 100, )

 #        ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
@ -249,6 +249,16 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,

    def get_form(self, form_class=None):
        form = super().get_form(form_class)
+
+        # add clubs that are in registration form
+        for club in Club.objects.filter(add_registration_form=True).order_by("name"):
+            form_join_club = forms.BooleanField(
+                label=_("Join %(club)s Club") % {'club': club.name},
+                required=False,
+                initial=False,
+            )
+            form.fields.update({f"join_{club.id}": form_join_club})
+
        user = self.get_object()
        form.fields["last_name"].initial = user.last_name
        form.fields["first_name"].initial = user.first_name
@ -266,11 +276,6 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            form.add_error(None, _("An alias with a similar name already exists."))
            return self.form_invalid(form)

-        # Check if BDA exist to propose membership at regisration
-        bda_exists = False
-        if Club.objects.filter(name__iexact="BDA").exists():
-            bda_exists = True
-
        # Get form data
 #        soge = form.cleaned_data["soge"]
        credit_type = form.cleaned_data["credit_type"]
@ -280,8 +285,9 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        bank = form.cleaned_data["bank"]
        join_bde = form.cleaned_data["join_bde"]
        join_kfet = form.cleaned_data["join_kfet"]
-        if bda_exists:
-            join_bda = form.cleaned_data["join_bda"]
+
+        clubs_registration = Club.objects.filter(add_registration_form=True).order_by("name")
+        join_clubs = [(club, form.cleaned_data[f"join_{club.id}"]) for club in clubs_registration]

 #        if soge:
 #            # If Société Générale pays the inscription, the user automatically joins the two clubs.
@ -303,11 +309,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
        # Add extra fee for the full membership
        fee += kfet_fee if join_kfet else 0
-        if bda_exists:
-            bda = Club.objects.get(name__iexact="BDA")
-            bda_fee = bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
-            # Add extra fee for the bda membership
-            fee += bda_fee if join_bda else 0
+        clubs_fee = dict()
+        for club, join_club in join_clubs:
+            club_fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
+            # Add extra fee for the club membership
+            clubs_fee[club] = club_fee
+            fee += club_fee if join_club else 0

 #        # If the bank pays, then we don't credit now. Treasurers will validate the transaction
 #        # and credit the note later.
@ -387,17 +394,18 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
            membership.save()

-        if bda_exists and join_bda:
-            # Create membership for the user to the BDA starting today
-            membership = Membership(
-                club=bda,
-                user=user,
-                fee=bda_fee,
-            )
-            membership.save()
-            membership.refresh_from_db()
-            membership.roles.add(Role.objects.get(name="Membre de club"))
-            membership.save()
+        for club, join_club in join_clubs:
+            if join_club:
+                # Create membership for the user to the BDA starting today
+                membership = Membership(
+                    club=club,
+                    user=user,
+                    fee=clubs_fee[club],
+                )
+                membership.save()
+                membership.refresh_from_db()
+                membership.roles.add(Role.objects.get(name="Membre de club"))
+                membership.save()

 #        if soge:
 #            soge_credit = SogeCredit.objects.get(user=user)
--- a/apps/scripts
+++ b/apps/scripts
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@ -5,13 +5,13 @@ from django.contrib import admin
 from note_kfet.admin import admin_site

 from .forms import ProductForm
-from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
+from .models import Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit


@admin.register(RemittanceType, site=admin_site)
 class RemittanceTypeAdmin(admin.ModelAdmin):
    """
-    Admin customisation for RemiitanceType
+    Admin customisation for RemittanceType
    """
    list_display = ('note', )

@ -55,3 +55,19 @@ class InvoiceAdmin(admin.ModelAdmin):
    """
    list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
    inlines = (ProductInline,)
+
+
+@admin.register(NoteSummary, site=admin_site)
+class NoteSummaryAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for NoteSummary
+    """
+    list_display = (
+        'date', 'total_positive_user', 'balance_positive_user', 'total_positive_user_bde',
+        'balance_positive_user_bde', 'total_zero_user', 'total_zero_user_bde', 'total_negative_user',
+        'balance_negative_user', 'total_negative_user_bde', 'balance_negative_user_bde',
+        'total_vnegative_user', 'balance_vnegative_user', 'total_vnegative_user_bde',
+        'balance_vnegative_user_bde', 'total_positive_club', 'balance_positive_club',
+        'total_positive_club_nbde', 'balance_positive_club_nbde', 'total_zero_club', 'total_zero_club_nbde',
+        'total_negative_club', 'balance_negative_club', 'total_negative_club_nbde', 'balance_negative_club_nbde',
+    )
--- 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

--- a/apps/treasury/migrations/0009_notesummary.py
+++ b/apps/treasury/migrations/0009_notesummary.py
@ -0,0 +1,49 @@
+# Generated by Django 2.2.28 on 2024-08-07 12:09
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('treasury', '0008_auto_20240322_0045'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NoteSummary',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
+                ('total_positive_user', models.PositiveIntegerField(verbose_name='Total positive user')),
+                ('balance_positive_user', models.PositiveIntegerField(verbose_name='Balance positive user')),
+                ('total_positive_user_bde', models.PositiveIntegerField(verbose_name='Total positive user BDE')),
+                ('balance_positive_user_bde', models.PositiveIntegerField(verbose_name='Balance positive user BDE')),
+                ('total_zero_user', models.PositiveIntegerField(verbose_name='Total zero user')),
+                ('total_zero_user_bde', models.PositiveIntegerField(verbose_name='Total zero user BDE')),
+                ('total_negative_user', models.PositiveIntegerField(verbose_name='Total negative user')),
+                ('balance_negative_user', models.PositiveIntegerField(verbose_name='Balance negative user')),
+                ('total_negative_user_bde', models.PositiveIntegerField(verbose_name='Total negative user BDE')),
+                ('balance_negative_user_bde', models.PositiveIntegerField(verbose_name='Balance negative user BDE')),
+                ('total_vnegative_user', models.PositiveIntegerField(verbose_name='Total very negative user')),
+                ('balance_vnegative_user', models.PositiveIntegerField(verbose_name='Balance very negative user')),
+                ('total_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Total very negative user BDE')),
+                ('balance_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Balance very negative user BDE')),
+                ('total_positive_club', models.PositiveIntegerField(verbose_name='Total positive club')),
+                ('balance_positive_club', models.PositiveIntegerField(verbose_name='Balance positive club')),
+                ('total_positive_club_nbde', models.PositiveIntegerField(verbose_name='Total positive club nbde')),
+                ('balance_positive_club_nbde', models.PositiveIntegerField(verbose_name='Balance positive club nbde')),
+                ('total_zero_club', models.PositiveIntegerField(verbose_name='Total zero club')),
+                ('total_zero_club_nbde', models.PositiveIntegerField(verbose_name='Total zero club nbde')),
+                ('total_negative_club', models.PositiveIntegerField(verbose_name='Total negative club')),
+                ('balance_negative_club', models.PositiveIntegerField(verbose_name='Balance negative club')),
+                ('total_negative_club_nbde', models.PositiveIntegerField(verbose_name='Total negative club nbde')),
+                ('balance_negative_club_nbde', models.PositiveIntegerField(verbose_name='Balance negative club nbde')),
+            ],
+            options={
+                'verbose_name': 'Summary',
+                'verbose_name_plural': 'Summaries',
+            },
+        ),
+    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -460,3 +460,117 @@ class SogeCredit(models.Model):
            self.credit_transaction._force_save = True
            self.credit_transaction.save()
        super().delete(**kwargs)
+
+
+class NoteSummary(models.Model):
+    """
+    Summary of every notes
+    """
+
+    date = models.DateField(
+        default=date.today,
+        verbose_name=_("Date"),
+    )
+
+    total_positive_user = models.PositiveIntegerField(
+        verbose_name=_("Total positive user"),
+    )
+
+    balance_positive_user = models.PositiveIntegerField(
+        verbose_name=_("Balance positive user"),
+    )
+
+    total_positive_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Total positive user BDE"),
+    )
+
+    balance_positive_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Balance positive user BDE"),
+    )
+
+    total_zero_user = models.PositiveIntegerField(
+        verbose_name=_("Total zero user"),
+    )
+
+    total_zero_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Total zero user BDE"),
+    )
+
+    total_negative_user = models.PositiveIntegerField(
+        verbose_name=_("Total negative user"),
+    )
+
+    balance_negative_user = models.PositiveIntegerField(
+        verbose_name=_("Balance negative user"),
+    )
+
+    total_negative_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Total negative user BDE"),
+    )
+
+    balance_negative_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Balance negative user BDE"),
+    )
+
+    total_vnegative_user = models.PositiveIntegerField(
+        verbose_name=_("Total very negative user"),
+    )
+
+    balance_vnegative_user = models.PositiveIntegerField(
+        verbose_name=_("Balance very negative user"),
+    )
+
+    total_vnegative_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Total very negative user BDE"),
+    )
+
+    balance_vnegative_user_bde = models.PositiveIntegerField(
+        verbose_name=_("Balance very negative user BDE"),
+    )
+
+    total_positive_club = models.PositiveIntegerField(
+        verbose_name=_("Total positive club"),
+    )
+
+    balance_positive_club = models.PositiveIntegerField(
+        verbose_name=_("Balance positive club"),
+    )
+
+    total_positive_club_nbde = models.PositiveIntegerField(
+        verbose_name=_("Total positive club nbde"),
+    )
+
+    balance_positive_club_nbde = models.PositiveIntegerField(
+        verbose_name=_("Balance positive club nbde"),
+    )
+
+    total_zero_club = models.PositiveIntegerField(
+        verbose_name=_("Total zero club"),
+    )
+
+    total_zero_club_nbde = models.PositiveIntegerField(
+        verbose_name=_("Total zero club nbde"),
+    )
+
+    total_negative_club = models.PositiveIntegerField(
+        verbose_name=_("Total negative club"),
+    )
+
+    balance_negative_club = models.PositiveIntegerField(
+        verbose_name=_("Balance negative club"),
+    )
+
+    total_negative_club_nbde = models.PositiveIntegerField(
+        verbose_name=_("Total negative club nbde"),
+    )
+
+    balance_negative_club_nbde = models.PositiveIntegerField(
+        verbose_name=_("Balance negative club nbde"),
+    )
+
+    class Meta:
+        verbose_name = _("Summary")
+        verbose_name_plural = _("Summaries")
+
+    def __str__(self):
+        return "Note summary of {date}".format(date=self.date)
--- 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'
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -114,7 +114,7 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
 msgid "type"
 msgstr "type"

-#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:313
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:318
 #: apps/note/models/notes.py:148 apps/treasury/models.py:293
 #: apps/wei/models.py:171 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
@ -247,6 +247,7 @@ msgid "The validation of the activity is pending."
 msgstr "La validation de cette activité est en attente."

 #: apps/activity/tables.py:43 apps/treasury/tables.py:107
+#: apps/member/templates/member/picture_update.html:18
 msgid "Remove"
 msgstr "Supprimer"

@ -262,13 +263,13 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"

-#: apps/activity/tables.py:84 apps/member/forms.py:193
+#: apps/activity/tables.py:84 apps/member/forms.py:196
 #: apps/registration/forms.py:92 apps/treasury/forms.py:131
 #: apps/wei/forms/registration.py:104
 msgid "Last name"
 msgstr "Nom de famille"

-#: apps/activity/tables.py:86 apps/member/forms.py:198
+#: apps/activity/tables.py:86 apps/member/forms.py:201
 #: apps/note/templates/note/transaction_form.html:138
 #: apps/registration/forms.py:97 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
@ -400,37 +401,37 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

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

-#: apps/activity/views.py:93
+#: apps/activity/views.py:108
 msgid "Activity detail"
 msgstr "Détails de l'activité"

-#: apps/activity/views.py:113
+#: apps/activity/views.py:128
 msgid "Update activity"
 msgstr "Modifier l'activité"

-#: apps/activity/views.py:140
+#: apps/activity/views.py:155
 msgid "Invite guest to the activity \"{}\""
 msgstr "Invitation pour l'activité « {} »"

-#: apps/activity/views.py:178
+#: apps/activity/views.py:193
 msgid "You are not allowed to display the entry interface for this activity."
 msgstr ""
 "Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
 "activité."

-#: apps/activity/views.py:181
+#: apps/activity/views.py:196
 msgid "This activity does not support activity entries."
 msgstr "Cette activité ne requiert pas d'entrées."

-#: apps/activity/views.py:184
+#: apps/activity/views.py:199
 msgid "This activity is closed."
 msgstr "Cette activité est fermée."

-#: apps/activity/views.py:280
+#: apps/activity/views.py:295
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"

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

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

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

@ -563,29 +564,29 @@ msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."

 #: apps/member/forms.py:148 apps/member/views.py:102
-#: apps/registration/forms.py:34 apps/registration/views.py:266
+#: apps/registration/forms.py:34 apps/registration/views.py:276
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."

-#: apps/member/forms.py:172
+#: apps/member/forms.py:175
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"

-#: apps/member/forms.py:174
+#: apps/member/forms.py:177
 msgid "Check this case if the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."

-#: apps/member/forms.py:179 apps/registration/forms.py:79
+#: apps/member/forms.py:182 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Type de rechargement"

-#: apps/member/forms.py:180 apps/registration/forms.py:80
+#: apps/member/forms.py:183 apps/registration/forms.py:80
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "Pas de rechargement"

-#: apps/member/forms.py:182
+#: apps/member/forms.py:185
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."

@ -594,17 +595,17 @@ msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
 msgid "Credit amount"
 msgstr "Montant à créditer"

-#: apps/member/forms.py:203 apps/note/templates/note/transaction_form.html:144
+#: apps/member/forms.py:206 apps/note/templates/note/transaction_form.html:144
 #: apps/registration/forms.py:102 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Banque"

-#: apps/member/forms.py:230
+#: apps/member/forms.py:233
 msgid "User"
 msgstr "Utilisateur·ice"

-#: apps/member/forms.py:244
+#: apps/member/forms.py:247
 msgid "Roles"
 msgstr "Rôles"

@ -852,46 +853,50 @@ msgstr ""
 "Date maximale d'une fin d'adhésion, après laquelle les adhérent·e·s doivent la "
 "renouveler."

-#: apps/member/models.py:263 apps/member/models.py:319
+#: apps/member/models.py:263
+msgid "add to registration form"
+msgstr "ajouter au formulaire d'inscription"
+
+#: apps/member/models.py:268 apps/member/models.py:324
 #: apps/note/models/notes.py:176
 msgid "club"
 msgstr "club"

-#: apps/member/models.py:264
+#: apps/member/models.py:269
 msgid "clubs"
 msgstr "clubs"

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

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

-#: apps/member/models.py:343 apps/note/models/transactions.py:385
+#: apps/member/models.py:348 apps/note/models/transactions.py:385
 msgid "membership"
 msgstr "adhésion"

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

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

-#: apps/member/models.py:367
+#: apps/member/models.py:372
 #, 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:376 apps/member/views.py:712
+#: apps/member/models.py:381 apps/member/views.py:712
 msgid "User is already a member of the club"
 msgstr "L'utilisateur·ice est déjà membre du club"

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

@ -1153,11 +1158,11 @@ msgstr "Introspection :"
 msgid "Show my applications"
 msgstr "Voir mes applications"

-#: apps/member/templates/member/picture_update.html:35
+#: apps/member/templates/member/picture_update.html:38
 msgid "Nevermind"
 msgstr "Annuler"

-#: apps/member/templates/member/picture_update.html:36
+#: apps/member/templates/member/picture_update.html:39
 msgid "Crop and upload"
 msgstr "Recadrer et envoyer"

@ -1696,6 +1701,8 @@ msgstr "Historique des transactions récentes"
 #: apps/note/templates/note/mails/negative_balance.txt:25
 #: apps/note/templates/note/mails/negative_notes_report.html:46
 #: apps/note/templates/note/mails/negative_notes_report.txt:13
+#: apps/note/templates/note/mails/summary_notes_report.html:62
+#: apps/note/templates/note/mails/summary_ntoes_report.txt:33
 #: apps/note/templates/note/mails/weekly_report.html:51
 #: apps/note/templates/note/mails/weekly_report.txt:32
 #: apps/registration/templates/registration/mails/email_validation_email.html:40
@ -2183,18 +2190,23 @@ msgstr "Utilisateur·ice·s en attente d'inscription"
 msgid "Registration detail"
 msgstr "Détails de l'inscription"

-#: apps/registration/views.py:293
+#: apps/registration/views.py:256
+#, python-format
+msgid "Join %(club)s Club"
+msgstr "Adhérer au club %(club)s"
+
+#: apps/registration/views.py:299
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."

-#: apps/registration/views.py:323
+#: apps/registration/views.py:330
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"

-#: apps/registration/views.py:417
+#: apps/registration/views.py:425
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"

@ -2252,6 +2264,7 @@ msgid "Address"
 msgstr "Adresse"

 #: apps/treasury/models.py:69 apps/treasury/models.py:202
+#: apps/treasury/models.py:472
 msgid "Date"
 msgstr "Date"

@ -2370,6 +2383,102 @@ msgstr ""
 "Cet·te utilisateur·ice 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:476
+msgid "Total positive user"
+msgstr "Nombre d'utilisateur⋅rices en positif"
+
+#: apps/treasury/models.py:480
+msgid "Balance positive user"
+msgstr "Solde des utilisateur⋅rices en positif"
+
+#: apps/treasury/models.py:484
+msgid "Total positive user BDE"
+msgstr "Nombre d'adhérent⋅es au BDE en positif"
+
+#: apps/treasury/models.py:488
+msgid "Balance positive user BDE"
+msgstr "Solde des adhérent⋅es au BDE en positif"
+
+#: apps/treasury/models.py:492
+msgid "Total zero user"
+msgstr "Nombre d'utilisateur⋅rices à zéro"
+
+#: apps/treasury/models.py:496
+msgid "Total zero user BDE"
+msgstr "Nombre d'adhérent⋅es au BDE à zéro"
+
+#: apps/treasury/models.py:500
+msgid "Total negative user"
+msgstr "Nombre d'utilisateur⋅rices en négatif"
+
+#: apps/treasury/models.py:504
+msgid "Balance negative user"
+msgstr "Solde des utilisateur⋅rices en négatif"
+
+#: apps/treasury/models.py:508
+msgid "Total negative user BDE"
+msgstr "Nombre d'adhérent⋅es au BDE en négatif"
+
+#: apps/treasury/models.py:512
+msgid "Balance negative user BDE"
+msgstr "Solde des adhérent⋅es au BDE en négatif"
+
+#: apps/treasury/models.py:516
+msgid "Total very negative user"
+msgstr "Nombre d'utilisateur⋅rices en négatif sévère"
+
+#: apps/treasury/models.py:520
+msgid "Balance very negative user"
+msgstr "Solde des utilisateur⋅rices en négatif sévère"
+
+#: apps/treasury/models.py:524
+msgid "Total very negative user BDE"
+msgstr "Nombre d'adhérent⋅es au BDE en négatif sévère"
+
+#: apps/treasury/models.py:528
+msgid "Balance very negative user BDE"
+msgstr "Solde des adhérent⋅es au BDE en négatif sévère"
+
+#: apps/treasury/models.py:532
+msgid "Total positive club"
+msgstr "Nombre de clubs en positif"
+
+#: apps/treasury/models.py:536
+msgid "Balance positive club"
+msgstr "Solde des clubs en positif"
+
+#: apps/treasury/models.py:540
+msgid "Total positive club nbde"
+msgstr "Nombre de clubs non-BDE en positif"
+
+#: apps/treasury/models.py:544
+msgid "Balance positive club nbde"
+msgstr "Solde des clubs non-BDE en positif"
+
+#: apps/treasury/models.py:548
+msgid "Total zero club"
+msgstr "Nombre de clubs à zéro"
+
+#: apps/treasury/models.py:552
+msgid "Total zero club nbde"
+msgstr "Nombre de clubs non-BDE à zéro"
+
+#: apps/treasury/models.py:556
+msgid "Total negative club"
+msgstr "Nombre de clubs en négatif"
+
+#: apps/treasury/models.py:560
+msgid "Balance negative club"
+msgstr "Solde des clubs en négatif"
+
+#: apps/treasury/models.py:564
+msgid "Total negative club nbde"
+msgstr "Nombre de clubs non-BDE en négatif"
+
+#: apps/treasury/models.py:568
+msgid "Balance negative club nbde"
+msgstr "Solde des clubs non-BDE en négatif"
+
 #: apps/treasury/tables.py:20
 msgid "Invoice #{:d}"
 msgstr "Facture n°{:d}"
@ -3388,6 +3497,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 …"
@ -3616,9 +3729,6 @@ msgstr ""
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."

-#~ msgid "Join BDA Club"
-#~ msgstr "Adhérer au club BDA"
-
 #, fuzzy
 #~| msgid "People having you as a friend"
 #~ msgid "You already have that person as a friend"
--- a/note.cron
+++ b/note.cron
@ -19,6 +19,8 @@ MAILTO=notekfet2020@lists.crans.org
 00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 # Envoyer le rapport mensuel aux trésoriers et respos info
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
+# Envoyer le recap de tresorerie
+ 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
 # Envoyer les rapports aux gens
 55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 # Mettre à jour les boutons mis en avant
--- a/note_kfet/fixtures/initial.json
+++ b/note_kfet/fixtures/initial.json
@ -4,7 +4,7 @@
        "pk": 1,
        "fields": {
            "domain": "note.crans.org",
-            "name": "La Note Kfet \ud83c\udf7b"
+            "name": "La Note Kfet 🍪"
        }
    }
 ]
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -77,7 +77,6 @@ INSTALLED_APPS = [
    'scripts',
    'treasury',
    'wei',
-    'food',
 ]

 MIDDLEWARE = [
--- 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>
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@ -21,7 +21,6 @@ urlpatterns = [
    path('activity/', include('activity.urls')),
    path('treasury/', include('treasury.urls')),
    path('wei/', include('wei.urls')),
-    path('food/',include('food.urls')),

    # Include Django Contrib and Core routers
    path('i18n/', include('django.conf.urls.i18n')),
Author	SHA1	Message	Date
korenstin	5a0fe7a6f0	Fr translation (treasury summary)	2024-08-07 20:01:22 +02:00
korenstin	eda8460014	Inclusif, admin and migrations (treasury summary)	2024-08-07 19:24:23 +02:00
Hugo	15c71ad31a	treasury summary	2024-08-02 01:35:13 +02:00
korenstin	b8f81048a5	Merge branch 'fix_ActivityList' into 'main' Allow to order the 2 tables and to fix the bug of several activities See merge request bde/nk20!252	2024-07-18 18:17:06 +02:00
korenstin	af819f45a1	Merge branch 'remove_picture' into 'main' Allow you to delete the profile picture See merge request bde/nk20!250	2024-07-18 18:02:43 +02:00
korenstin	076d065ffa	Merge branch 'main' into 'remove_picture' # Conflicts: # locale/fr/LC_MESSAGES/django.po	2024-07-18 17:52:22 +02:00
korenstin	2da77d9c17	Merge branch 'fix_join_bda' into 'main' Fix #126 (join_bda) Closes #126 See merge request bde/nk20!251	2024-07-18 17:14:23 +02:00
korenstin	01584d6330	Merge branch 'modif_perm' into 'main' Modif perm See merge request bde/nk20!249	2024-07-18 16:54:23 +02:00
korenstin	4c0a5922c4	Allow to order the 2 tables and to fix the bug of several activities	2024-07-15 22:06:11 +02:00
korenstin	f90b28fc7c	Fix #126 (join_bda)	2024-07-15 14:30:46 +02:00
korenstin	925e0f26f5	Allow you to delete the profile picture	2024-07-13 17:37:19 +02:00
quark	c912383f86	oups la virgule oublié	2024-06-24 22:36:22 +02:00
quark	32830e43fd	Modify permission for negative	2024-06-24 21:21:22 +02:00
korenstin	11c6a6fa7a	modifications permissions consommation pc kfet (Alcool)	2024-06-24 16:57:39 +02:00
korenstin	201d6b114a	Merge branch 'new_logo' into 'main' New logo See merge request bde/nk20!247	2024-06-03 22:00:03 +02:00
korenstin	19e77df299	Merge branch 'main' into 'new_logo' # Conflicts: # .gitlab-ci.yml	2024-06-03 21:59:44 +02:00
korenstin	5fd6ec5668	Merge branch 'charte_info' into 'main' Charte info See merge request bde/nk20!248	2024-06-03 21:53:01 +02:00
korenstin	10a01c5bc2	linters	2024-05-30 20:21:56 +02:00
korenstin	989905ea64	Update .gitlab-ci.yml	2024-05-26 18:41:49 +02:00
korenstin	0218d43a17	Update .gitlab-ci.yml	2024-05-26 16:00:26 +02:00
test	5d30b0e819	charte info	2024-05-26 15:46:50 +02:00
korenstin	ec759dd3c0	error py37-django22	2024-05-23 22:38:09 +02:00
korenstin	2eb965291d	new_logo	2024-05-23 21:46:01 +02:00