include only subscribed users and their direct relations in the galaxy

club/forms.py

@@ -252,7 +252,7 @@ class ClubAddMemberForm(ClubMemberForm):
         Board members can attribute roles lower than their own.
         Other users cannot attribute roles with this form
         """
-        if self.request_user.has_perm("club.add_membership"):
+        if self.request_user.has_perm("club.add_subscription"):
             return settings.SITH_CLUB_ROLES_ID["President"]
         membership = self.request_user_membership
         if membership is None or membership.role <= settings.SITH_MAXIMUM_FREE_ROLE:

club/views.py

@@ -31,7 +31,11 @@ from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
 from django.core.paginator import InvalidPage, Paginator
 from django.db.models import Q, Sum
-from django.http import Http404, HttpResponseRedirect, StreamingHttpResponse
+from django.http import (
+    Http404,
+    HttpResponseRedirect,
+    StreamingHttpResponse,
+)
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
@@ -51,7 +55,12 @@ from club.forms import (
     MailingForm,
     SellingsForm,
 )
-from club.models import Club, Mailing, MailingSubscription, Membership
+from club.models import (
+    Club,
+    Mailing,
+    MailingSubscription,
+    Membership,
+)
 from com.models import Poster
 from com.views import (
     PosterCreateBaseView,
@@ -59,7 +68,9 @@ from com.views import (
     PosterEditBaseView,
     PosterListBaseView,
 )
-from core.auth.mixins import CanEditMixin
+from core.auth.mixins import (
+    CanEditMixin,
+)
 from core.models import PageRev
 from core.views import DetailFormView, PageEditViewBase, UseFragmentsMixin
 from core.views.mixins import FragmentMixin, FragmentRenderer, TabedViewMixin

core/static/bundled/alpine-index.js

@@ -1,9 +1,9 @@
-import { alpinePlugin as notificationPlugin } from "#core:utils/notifications";
+import { alpinePlugin } from "#core:utils/notifications";
 import sort from "@alpinejs/sort";
 import Alpine from "alpinejs";
 
 Alpine.plugin(sort);
-Alpine.magic("notifications", notificationPlugin);
+Alpine.magic("notifications", alpinePlugin);
 window.Alpine = Alpine;
 
 window.addEventListener("DOMContentLoaded", () => {

core/static/core/forms.scss

@@ -154,9 +154,11 @@ form {
     margin-bottom: 1rem;
   }
 
-  .row > label {
+  .row {
+    label {
       margin: unset;
     }
+  }
 
   // ------------- LABEL
   label, legend {

core/static/core/style.scss

@@ -503,10 +503,6 @@ th {
   text-align: center;
   padding: 5px 10px;
 
-  >input[type="checkbox"] {
-    padding: unset;
-  }
-
   >ul {
     margin-top: 0;
   }

core/templates/core/base/notifications.jinja

@@ -13,10 +13,10 @@
              }"
      @quick-notification-add="(e) => messages.push(e?.detail)"
      @quick-notification-delete="messages = []">
-  <template x-for="(message, index) in messages">
-    <div class="alert" :class="`alert-${message.tag}`" x-transition>
+  <template x-for="message in messages">
+    <div x-data="{show: true}" class="alert" :class="`alert-${message.tag}`" x-show="show" x-transition>
       <span class="alert-main" x-text="message.text"></span>
-      <span class="clickable" @click="messages = messages.filter((item, i) => i !== index)">
+      <span class="clickable" @click="show = false">
         <i class="fa fa-close"></i>
       </span>
     </div>

core/templates/core/macros.jinja

@@ -245,26 +245,3 @@
   <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
   <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
 {% endmacro %}
-
-{% macro update_notifications(messages, clear) %}
-  {# Update notification area from new messages sent by django backend
-     This is useful when performing fragment swaps to keep messages up to date
-     Without this, the fragment would need to take control of the notification area and
-     this would be an issue when having more than one fragment
-
-     Parameters:
-      messages: messages from django.contrib
-      clear   : optional boolean that controls if notifications should be cleared first. True is the default
-  #}
-  {% set clear = clear|default(true) %}
-  {% if messages %}
-    <div x-init="() => {
-                 {% if clear %}
-                   $notifications.clear()
-                 {% endif %}
-                 {% for message in messages %}
-                   $notifications.{{ message.tags }}('{{ message }}')
-                 {% endfor %}
-                 }"></div>
-  {% endif %}
-{% endmacro %}

core/views/forms.py

@@ -115,7 +115,7 @@ class SelectUser(TextInput):
 
 def validate_future_timestamp(value: date | datetime):
     if value <= now():
-        raise ValidationError(_("Ensure this timestamp is set in the future"))
+        raise ValueError(_("Ensure this timestamp is set in the future"))
 
 
 class FutureDateTimeField(forms.DateTimeField):

counter/admin.py

@@ -22,7 +22,6 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
-    InvoiceCall,
     Permanency,
     Product,
     ProductType,
@@ -161,11 +160,3 @@ class CashRegisterSummaryAdmin(SearchModelAdmin):
 class EticketAdmin(SearchModelAdmin):
     list_display = ("product", "event_date", "event_title")
     search_fields = ("product__name", "event_title")
-
-
-@admin.register(InvoiceCall)
-class InvoiceCallAdmin(SearchModelAdmin):
-    list_display = ("club", "month", "is_validated")
-    search_fields = ("club__name",)
-    list_filter = (("club", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "month"

counter/forms.py

@@ -1,26 +1,13 @@
-import json
 import math
-import uuid
-from datetime import date
 
-from dateutil.relativedelta import relativedelta
 from django import forms
-from django.db.models import Exists, OuterRef, Q
-from django.forms import BaseModelFormSet
-from django.utils.timezone import now
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from django_celery_beat.models import ClockedSchedule
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
-from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
 from core.models import User
-from core.views.forms import (
-    FutureDateTimeField,
-    NFCTextInput,
-    SelectDate,
-    SelectDateTime,
-)
+from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
     AutoCompleteSelectMultipleGroup,
@@ -32,14 +19,10 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
-    InvoiceCall,
     Product,
     Refilling,
     ReturnableProduct,
-    ScheduledProductAction,
-    Selling,
     StudentCard,
-    get_product_actions,
 )
 from counter.widgets.ajax_select import (
     AutoCompleteSelectMultipleCounter,
@@ -175,101 +158,7 @@ class CounterEditForm(forms.ModelForm):
         }
 
 
-class ScheduledProductActionForm(forms.ModelForm):
-    """Form for automatic product archiving.
-
-    The `save` method will update or create tasks using celery-beat.
-    """
-
-    required_css_class = "required"
-    prefix = "scheduled"
-
-    class Meta:
-        model = ScheduledProductAction
-        fields = ["task"]
-        widgets = {"task": forms.RadioSelect(choices=get_product_actions)}
-        labels = {"task": _("Action")}
-        help_texts = {"task": ""}
-
-    trigger_at = FutureDateTimeField(
-        label=_("Date and time of action"), widget=SelectDateTime
-    )
-    counters = forms.ModelMultipleChoiceField(
-        label=_("New counters"),
-        help_text=_("The selected counters will replace the current ones"),
-        required=False,
-        widget=AutoCompleteSelectMultipleCounter,
-        queryset=Counter.objects.all(),
-    )
-
-    def __init__(self, *args, product: Product, **kwargs):
-        self.product = product
-        super().__init__(*args, **kwargs)
-        if not self.instance._state.adding:
-            self.fields["trigger_at"].initial = self.instance.clocked.clocked_time
-            self.fields["counters"].initial = json.loads(self.instance.kwargs).get(
-                "counters"
-            )
-
-    def clean(self):
-        if not self.changed_data or "trigger_at" in self.errors:
-            return super().clean()
-        if "trigger_at" in self.changed_data:
-            if not self.instance.clocked_id:
-                self.instance.clocked = ClockedSchedule(
-                    clocked_time=self.cleaned_data["trigger_at"]
-                )
-            else:
-                self.instance.clocked.clocked_time = self.cleaned_data["trigger_at"]
-            self.instance.clocked.save()
-        task_kwargs = {"product_id": self.product.id}
-        if (
-            self.cleaned_data["task"] == "counter.tasks.change_counters"
-            and "counters" in self.changed_data
-        ):
-            task_kwargs["counters"] = [c.id for c in self.cleaned_data["counters"]]
-        self.instance.product = self.product
-        self.instance.kwargs = json.dumps(task_kwargs)
-        self.instance.name = (
-            f"{self.cleaned_data['task']} - {self.product} - {uuid.uuid4()}"
-        )
-        return super().clean()
-
-
-class BaseScheduledProductActionFormSet(BaseModelFormSet):
-    def __init__(self, *args, product: Product, **kwargs):
-        if product.id:
-            queryset = (
-                product.scheduled_actions.filter(
-                    enabled=True, clocked__clocked_time__gt=now()
-                )
-                .order_by("clocked__clocked_time")
-                .select_related("clocked")
-            )
-        else:
-            queryset = ScheduledProductAction.objects.none()
-        form_kwargs = {"product": product}
-        super().__init__(*args, queryset=queryset, form_kwargs=form_kwargs, **kwargs)
-
-    def delete_existing(self, obj: ScheduledProductAction, commit: bool = True):  # noqa FBT001
-        clocked = obj.clocked
-        super().delete_existing(obj, commit=commit)
-        if commit:
-            clocked.delete()
-
-
-ScheduledProductActionFormSet = forms.modelformset_factory(
-    ScheduledProductAction,
-    ScheduledProductActionForm,
-    formset=BaseScheduledProductActionFormSet,
-    absolute_max=None,
-    can_delete=True,
-    can_delete_extra=False,
-    extra=2,
-)
-
-
-class ProductForm(forms.ModelForm):
+class ProductEditForm(forms.ModelForm):
     error_css_class = "error"
     required_css_class = "required"
 
@@ -310,21 +199,22 @@ class ProductForm(forms.ModelForm):
         queryset=Counter.objects.all(),
     )
 
-    def __init__(self, *args, instance=None, **kwargs):
-        super().__init__(*args, instance=instance, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
-        self.action_formset = ScheduledProductActionFormSet(
-            *args, product=self.instance, **kwargs
-        )
-
-    def is_valid(self):
-        return super().is_valid() and self.action_formset.is_valid()
 
     def save(self, *args, **kwargs):
         ret = super().save(*args, **kwargs)
-        self.instance.counters.set(self.cleaned_data["counters"])
-        self.action_formset.save()
+        if self.fields["counters"].initial:
+            # Remove the product from all counter it was added to
+            # It will then only be added to selected counters
+            for counter in self.fields["counters"].initial:
+                counter.products.remove(self.instance)
+                counter.save()
+        for counter in self.cleaned_data["counters"]:
+            counter.products.add(self.instance)
+            counter.save()
         return ret
 
 
@@ -376,7 +266,7 @@ class CloseCustomerAccountForm(forms.Form):
     )
 
 
-class BasketProductForm(forms.Form):
+class ProductForm(forms.Form):
     quantity = forms.IntegerField(min_value=1, required=True)
     id = forms.IntegerField(min_value=0, required=True)
 
@@ -481,50 +371,5 @@ class BaseBasketForm(forms.BaseFormSet):
 
 
 BasketForm = forms.formset_factory(
-    BasketProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
-)
-
-
-class InvoiceCallForm(forms.Form):
-    def __init__(self, *args, month: date, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.month = month
-        self.clubs = list(
-            Club.objects.filter(
-                Exists(
-                    Selling.objects.filter(
-                        club=OuterRef("pk"),
-                        date__gte=month,
-                        date__lte=month + relativedelta(months=1),
-                    )
-                )
-            ).annotate(
-                validated_invoice=Exists(
-                    InvoiceCall.objects.filter(
-                        club=OuterRef("pk"), month=month, is_validated=True
-                    )
-                )
-            )
-        )
-        self.fields = {
-            str(club.id): forms.BooleanField(
-                required=False, initial=club.validated_invoice
-            )
-            for club in self.clubs
-        }
-
-    def save(self):
-        invoice_calls = [
-            InvoiceCall(
-                month=self.month,
-                club_id=club.id,
-                is_validated=self.cleaned_data.get(str(club.id), False),
-            )
-            for club in self.clubs
-        ]
-        InvoiceCall.objects.bulk_create(
-            invoice_calls,
-            update_conflicts=True,
-            update_fields=["is_validated"],
-            unique_fields=["month", "club"],
+    ProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
 )

counter/migrations/0032_scheduledproductaction.py

@@ -1,40 +0,0 @@
-# Generated by Django 5.2.3 on 2025-09-14 11:29
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("counter", "0031_alter_counter_options"),
-        ("django_celery_beat", "0019_alter_periodictasks_options"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="ScheduledProductAction",
-            fields=[
-                (
-                    "periodictask_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="django_celery_beat.periodictask",
-                    ),
-                ),
-                (
-                    "product",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="scheduled_actions",
-                        to="counter.product",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "Product scheduled action"},
-            bases=("django_celery_beat.periodictask",),
-        ),
-    ]

counter/migrations/0033_invoicecall.py

@@ -1,51 +0,0 @@
-# Generated by Django 5.2.3 on 2025-10-15 21:54
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-import counter.models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("club", "0014_alter_club_options_rename_unix_name_club_slug_name_and_more"),
-        ("counter", "0032_scheduledproductaction"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="InvoiceCall",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "is_validated",
-                    models.BooleanField(default=False, verbose_name="is validated"),
-                ),
-                ("month", counter.models.MonthField(verbose_name="invoice date")),
-                (
-                    "club",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="club.club"
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Invoice call",
-                "verbose_name_plural": "Invoice calls",
-                "constraints": [
-                    models.UniqueConstraint(
-                        fields=("club", "month"),
-                        name="counter_invoicecall_unique_club_month",
-                    )
-                ],
-            },
-        ),
-    ]

counter/models.py

@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 import base64
-import contextlib
 import os
 import random
 import string
@@ -35,7 +34,6 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
-from django_celery_beat.models import PeriodicTask
 from django_countries.fields import CountryField
 from ordered_model.models import OrderedModel
 from phonenumber_field.modelfields import PhoneNumberField
@@ -447,8 +445,7 @@ class Product(models.Model):
         buying_groups = list(self.buying_groups.all())
         if not buying_groups:
             return True
-        res = any(user.is_in_group(pk=group.id) for group in buying_groups)
-        return res
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
 
     @property
     def profit(self):
@@ -482,7 +479,7 @@ class CounterQuerySet(models.QuerySet):
         return self.annotate(has_annotated_barman=Exists(subquery))
 
     def annotate_is_open(self) -> Self:
-        """Annotate the queryset with the `is_open` field.
+        """Annotate tue queryset with the `is_open` field.
 
         For each counter, if `is_open=True`, then the counter is currently opened.
         Else the counter is closed.
@@ -1360,85 +1357,3 @@ class ReturnableProductBalance(models.Model):
             f"return balance of {self.customer} "
             f"for {self.returnable.product_id} : {self.balance}"
         )
-
-
-def get_product_actions():
-    return [
-        ("counter.tasks.archive_product", _("Archiving")),
-        ("counter.tasks.change_counters", _("Counters change")),
-    ]
-
-
-class ScheduledProductAction(PeriodicTask):
-    """Extension of celery-beat tasks dedicated to perform actions on Product."""
-
-    product = models.ForeignKey(
-        Product, related_name="scheduled_actions", on_delete=models.CASCADE
-    )
-
-    class Meta:
-        verbose_name = _("Product scheduled action")
-
-    def __init__(self, *args, **kwargs):
-        self._meta.get_field("task").choices = get_product_actions()
-        super().__init__(*args, **kwargs)
-
-    def full_clean(self, *args, **kwargs):
-        self.one_off = True  # A product action should occur one time only
-        return super().full_clean(*args, **kwargs)
-
-    def clean_clocked(self):
-        if not self.clocked:
-            raise ValidationError(_("Product actions must declare a clocked schedule."))
-
-    def validate_unique(self, *args, **kwargs):
-        # The checks done in PeriodicTask.validate_unique aren't
-        # adapted in the case of scheduled product action,
-        # so we skip it and execute directly Model.validate_unique
-        return super(PeriodicTask, self).validate_unique(*args, **kwargs)
-
-
-class MonthField(models.DateField):
-    description = _("Year + month field (day forced to 1)")
-    default_error_messages = {
-        "invalid": _(
-            "“%(value)s” value has an invalid date format. It must be "
-            "in YYYY-MM format."
-        ),
-        "invalid_date": _(
-            "“%(value)s” value has the correct format (YYYY-MM) "
-            "but it is an invalid date."
-        ),
-    }
-
-    def to_python(self, value):
-        if isinstance(value, str):
-            with contextlib.suppress(ValueError):
-                # If the string is given as YYYY-mm, try to parse it.
-                # If it fails, it means that the string may be in the form YYYY-mm-dd
-                # or in an invalid format.
-                # Whatever the case, we let Django deal with it
-                # and raise an error if needed
-                value = datetime.strptime(value, "%Y-%m")
-        value = super().to_python(value)
-        if value is None:
-            return None
-        return value.replace(day=1)
-
-
-class InvoiceCall(models.Model):
-    is_validated = models.BooleanField(verbose_name=_("is validated"), default=False)
-    club = models.ForeignKey(Club, on_delete=models.CASCADE)
-    month = MonthField(verbose_name=_("invoice date"))
-
-    class Meta:
-        verbose_name = _("Invoice call")
-        verbose_name_plural = _("Invoice calls")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["club", "month"], name="counter_invoicecall_unique_club_month"
-            )
-        ]
-
-    def __str__(self):
-        return f"invoice call of {self.month} made by {self.club}"

counter/tasks.py

@@ -1,19 +0,0 @@
-# Create your tasks here
-
-from celery import shared_task
-
-from counter.models import Counter, Product
-
-
-@shared_task
-def archive_product(*, product_id: int, **kwargs):
-    product = Product.objects.get(id=product_id)
-    product.archived = True
-    product.save()
-
-
-@shared_task
-def change_counters(*, product_id: int, counters: list[int], **kwargs):
-    product = Product.objects.get(id=product_id)
-    counters = Counter.objects.filter(id__in=counters)
-    product.counters.set(counters)

counter/templates/counter/invoices_call.jinja

@@ -4,49 +4,35 @@
   {% trans %}Invoices call{% endtrans %}
 {% endblock %}
 
-{% block notifications %}{# Notifications are moved below #}{% endblock %}
-
 {% block content %}
   <h3>{% trans date=start_date|date("F Y") %}Invoices call for {{ date }}{% endtrans %}</h3>
+  <p>{% trans %}Choose another month: {% endtrans %}</p>
   <form method="get" action="">
-    <label for="id_form_other_month">{% trans %}Choose another month: {% endtrans %}</label>
-    <select name="month" id="id_form_other_month">
+    <select name="month">
       {% for m in months %}
         <option value="{{ m|date("Y-m") }}">{{ m|date("Y-m") }}</option>
       {% endfor %}
     </select>
     <input type="submit" value="{% trans %}Go{% endtrans %}" />
   </form>
-
   <br>
   <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
   <br>
-
-  {% include "core/base/notifications.jinja" %}
-
-  <form method="post" action="">
-    {% csrf_token %}
   <table>
     <thead>
-        <tr>
       <td>{% trans %}Club{% endtrans %}</td>
       <td>{% trans %}Sum{% endtrans %}</td>
-          <td>{% trans %}Validated{% endtrans %}</td>
-        </tr>
     </thead>
     <tbody>
-        {% for invoice in invoices %}
+      {% for i in sums %}
         <tr>
-            <td>{{ invoice.club__name }}</td>
-            <td>{{ "%.2f"|format(invoice.selling_sum) }} €</td>
-            <td>
-              {{ form[invoice.club_id|string] }}
-            </td>
+          <td>{{ i['club__name'] }}</td>
+          <td>{{ i['selling_sum'] }} €</td>
         </tr>
       {% endfor %}
     </tbody>
   </table>
-    <input type="hidden" name="month" value="{{ start_date|date('Y-m') }}">
-    <button type="submit">{% trans %}Save{% endtrans %}</button>
-  </form>
 {% endblock %}
+
+
+

counter/templates/counter/product_form.jinja

@@ -1,56 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-  {% if object %}
-    <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
-  {% else %}
-    <h2>{% trans %}Product creation{% endtrans %}</h2>
-  {% endif %}
-  <form method="post">
-    {% csrf_token %}
-    {{ form.as_p() }}
-
-    <br />
-
-    <h3>{% trans %}Automatic actions{% endtrans %}</h3>
-
-    <p class="margin-bottom">
-      <em>
-        {%- trans trimmed -%}
-          Automatic actions allows to schedule product changes
-          ahead of time.
-        {%- endtrans -%}
-      </em>
-    </p>
-
-    {{ form.action_formset.management_form }}
-    {%- for action_form in form.action_formset.forms -%}
-      <fieldset x-data="{action: '{{ action_form.task.initial }}'}">
-        {{ action_form.non_field_errors() }}
-        <div class="row gap-2x margin-bottom">
-          <div>
-            {{ action_form.task.errors }}
-            {{ action_form.task.label_tag() }}
-            {{ action_form.task|add_attr("x-model=action") }}
-          </div>
-          <div>{{ action_form.trigger_at.as_field_group() }}</div>
-        </div>
-        <div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
-          {{ action_form.counters.as_field_group() }}
-        </div>
-        {%- if action_form.DELETE -%}
-          <div class="row gap">
-            {{ action_form.DELETE.as_field_group() }}
-          </div>
-        {%- endif -%}
-        {%- for field in action_form.hidden_fields() -%}
-          {{ field }}
-        {%- endfor -%}
-      </fieldset>
-      {%- if not loop.last -%}
-        <hr class="margin-bottom">
-      {%- endif -%}
-    {%- endfor -%}
-    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-  </form>
-{% endblock %}

counter/tests/test_auto_actions.py

@@ -1,116 +0,0 @@
-import json
-from datetime import timedelta
-
-import pytest
-from django.conf import settings
-from django.test import Client
-from django.urls import reverse
-from django.utils.timezone import now
-from django_celery_beat.models import ClockedSchedule
-from model_bakery import baker
-
-from core.models import Group, User
-from counter.baker_recipes import counter_recipe, product_recipe
-from counter.forms import ScheduledProductActionForm, ScheduledProductActionFormSet
-from counter.models import ScheduledProductAction
-
-
-@pytest.mark.django_db
-def test_edit_product(client: Client):
-    client.force_login(
-        baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
-    )
-    product = product_recipe.make()
-    url = reverse("counter:product_edit", kwargs={"product_id": product.id})
-    res = client.get(url)
-    assert res.status_code == 200
-
-    res = client.post(url, data={})
-    # This is actually a failure, but we just want to check that
-    # we don't have a 403 or a 500.
-    # The actual behaviour will be tested directly on the form.
-    assert res.status_code == 200
-
-
-@pytest.mark.django_db
-class TestProductActionForm:
-    def test_single_form_archive(self):
-        product = product_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        form = ScheduledProductActionForm(
-            product=product,
-            data={
-                "scheduled-task": "counter.tasks.archive_product",
-                "scheduled-trigger_at": trigger_at,
-            },
-        )
-        assert form.is_valid()
-        instance = form.save()
-        assert instance.clocked.clocked_time == trigger_at
-        assert instance.enabled is True
-        assert instance.one_off is True
-        assert instance.task == "counter.tasks.archive_product"
-        assert instance.kwargs == json.dumps({"product_id": product.id})
-
-    def test_single_form_change_counters(self):
-        product = product_recipe.make()
-        counter = counter_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        form = ScheduledProductActionForm(
-            product=product,
-            data={
-                "scheduled-task": "counter.tasks.change_counters",
-                "scheduled-trigger_at": trigger_at,
-                "scheduled-counters": [counter.id],
-            },
-        )
-        assert form.is_valid()
-        instance = form.save()
-        instance.refresh_from_db()
-        assert instance.clocked.clocked_time == trigger_at
-        assert instance.enabled is True
-        assert instance.one_off is True
-        assert instance.task == "counter.tasks.change_counters"
-        assert instance.kwargs == json.dumps(
-            {"product_id": product.id, "counters": [counter.id]}
-        )
-
-    def test_delete(self):
-        product = product_recipe.make()
-        clocked = baker.make(ClockedSchedule, clocked_time=now() + timedelta(minutes=2))
-        task = baker.make(
-            ScheduledProductAction,
-            product=product,
-            one_off=True,
-            clocked=clocked,
-            task="counter.tasks.archive_product",
-        )
-        formset = ScheduledProductActionFormSet(product=product)
-        formset.delete_existing(task)
-        assert not ScheduledProductAction.objects.filter(id=task.id).exists()
-        assert not ClockedSchedule.objects.filter(id=clocked.id).exists()
-
-
-@pytest.mark.django_db
-class TestProductActionFormSet:
-    def test_ok(self):
-        product = product_recipe.make()
-        counter = counter_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        formset = ScheduledProductActionFormSet(
-            product=product,
-            data={
-                "form-TOTAL_FORMS": "2",
-                "form-INITIAL_FORMS": "0",
-                "form-0-task": "counter.tasks.archive_product",
-                "form-0-trigger_at": trigger_at,
-                "form-1-task": "counter.tasks.change_counters",
-                "form-1-trigger_at": trigger_at,
-                "form-1-counters": [counter.id],
-            },
-        )
-        assert formset.is_valid()
-        formset.save()
-        assert ScheduledProductAction.objects.filter(product=product).count() == 2

counter/tests/test_invoices.py

@@ -1,76 +0,0 @@
-from datetime import date, datetime
-
-import pytest
-from dateutil.relativedelta import relativedelta
-from django.contrib.auth.models import Permission
-from django.core.exceptions import ValidationError
-from django.test import Client
-from django.urls import reverse
-from django.utils.timezone import localdate
-from model_bakery import baker
-from pytest_django.asserts import assertRedirects
-
-from club.models import Club
-from core.models import User
-from counter.baker_recipes import sale_recipe
-from counter.forms import InvoiceCallForm
-from counter.models import Customer, InvoiceCall, Selling
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "month", [date(2025, 10, 20), "2025-10", datetime(2025, 10, 15, 12, 30)]
-)
-def test_invoice_date_with_date(month: date | datetime | str):
-    club = baker.make(Club)
-    invoice = InvoiceCall.objects.create(club=club, month=month)
-    invoice.refresh_from_db()
-    assert not invoice.is_validated
-    assert invoice.month == date(2025, 10, 1)
-
-
-@pytest.mark.django_db
-def test_invoice_call_invalid_month_string():
-    club = baker.make(Club)
-
-    with pytest.raises(ValidationError):
-        InvoiceCall.objects.create(club=club, month="2025-13")
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize("query", [None, {"month": "2025-08"}])
-def test_invoice_call_view(client: Client, query: dict | None):
-    user = baker.make(
-        User,
-        user_permissions=[
-            *Permission.objects.filter(
-                codename__in=["view_invoicecall", "change_invoicecall"]
-            )
-        ],
-    )
-    client.force_login(user)
-    url = reverse("counter:invoices_call", query=query)
-    assert client.get(url).status_code == 200
-    assertRedirects(client.post(url), url)
-
-
-@pytest.mark.django_db
-def test_invoice_call_form():
-    Selling.objects.all().delete()
-    month = localdate() - relativedelta(months=1)
-    clubs = baker.make(Club, _quantity=2)
-    recipe = sale_recipe.extend(date=month, customer=baker.make(Customer, amount=10000))
-    recipe.make(club=clubs[0], quantity=2, unit_price=200)
-    recipe.make(club=clubs[0], quantity=3, unit_price=5)
-    recipe.make(club=clubs[1], quantity=20, unit_price=10)
-    form = InvoiceCallForm(
-        month=month, data={str(clubs[0].id): True, str(clubs[1].id): False}
-    )
-    assert form.is_valid()
-    form.save()
-    assert InvoiceCall.objects.filter(
-        club=clubs[0], month=month, is_validated=True
-    ).exists()
-    assert InvoiceCall.objects.filter(
-        club=clubs[1], month=month, is_validated=False
-    ).exists()

counter/tests/test_product.py

@@ -6,16 +6,14 @@ import pytest
 from django.conf import settings
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import Client, TestCase
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from PIL import Image
-from pytest_django.asserts import assertNumQueries, assertRedirects
+from pytest_django.asserts import assertNumQueries
 
-from club.models import Club
 from core.baker_recipes import board_user, subscriber_user
 from core.models import Group, User
-from counter.forms import ProductForm
 from counter.models import Product, ProductType
 
 
@@ -86,49 +84,3 @@ def test_fetch_product_nb_queries(client: Client):
         # - 1 for the actual request
         # - 1 to prefetch the related buying_groups
         client.get(reverse("api:search_products_detailed"))
-
-
-class TestCreateProduct(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.product_type = baker.make(ProductType)
-        cls.club = baker.make(Club)
-        cls.data = {
-            "name": "foo",
-            "description": "bar",
-            "product_type": cls.product_type.id,
-            "club": cls.club.id,
-            "code": "FOO",
-            "purchase_price": 1.0,
-            "selling_price": 1.0,
-            "special_selling_price": 1.0,
-            "limit_age": 0,
-            "form-TOTAL_FORMS": 0,
-            "form-INITIAL_FORMS": 0,
-        }
-
-    def test_form(self):
-        form = ProductForm(data=self.data)
-        assert form.is_valid()
-        instance = form.save()
-        assert instance.club == self.club
-        assert instance.product_type == self.product_type
-        assert instance.name == "foo"
-        assert instance.selling_price == 1.0
-
-    def test_view(self):
-        self.client.force_login(
-            baker.make(
-                User,
-                groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
-            )
-        )
-        url = reverse("counter:new_product")
-        response = self.client.get(url)
-        assert response.status_code == 200
-        response = self.client.post(url, data=self.data)
-        assertRedirects(response, reverse("counter:product_list"))
-        product = Product.objects.last()
-        assert product.name == "foo"
-        assert product.club == self.club
-        assert product.product_type == self.product_type

counter/views/admin.py

@@ -32,7 +32,7 @@ from core.utils import get_semester_code, get_start_of_semester
 from counter.forms import (
     CloseCustomerAccountForm,
     CounterEditForm,
-    ProductForm,
+    ProductEditForm,
     ReturnableProductForm,
 )
 from counter.models import (
@@ -146,8 +146,8 @@ class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = Product
-    form_class = ProductForm
-    template_name = "counter/product_form.jinja"
+    form_class = ProductEditForm
+    template_name = "core/create.jinja"
     current_tab = "products"
 
 
@@ -155,9 +155,9 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = Product
-    form_class = ProductForm
+    form_class = ProductEditForm
     pk_url_kwarg = "product_id"
-    template_name = "counter/product_form.jinja"
+    template_name = "core/edit.jinja"
     current_tab = "products"
 
 

counter/views/invoice.py

@@ -12,81 +12,77 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from datetime import datetime
-from urllib.parse import urlencode
+from datetime import datetime, timedelta
+from datetime import timezone as tz
 
-from dateutil.relativedelta import relativedelta
-from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.contrib.messages.views import SuccessMessageMixin
-from django.db.models import F, Sum
-from django.utils.timezone import localdate, make_aware
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import FormView
+from django.db.models import F
+from django.utils import timezone
+from django.views.generic import TemplateView
 
-from counter.forms import InvoiceCallForm
+from counter.fields import CurrencyField
 from counter.models import Refilling, Selling
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
-class InvoiceCallView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, SuccessMessageMixin, FormView
-):
+class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
     template_name = "counter/invoices_call.jinja"
     current_tab = "invoices_call"
-    permission_required = ["counter.view_invoicecall", "counter.change_invoicecall"]
-    form_class = InvoiceCallForm
-    success_message = _("Invoice calls status has been updated.")
-
-    def get_month(self):
-        kwargs = self.request.GET or self.request.POST
-        if "month" in kwargs:
-            return make_aware(datetime.strptime(kwargs["month"], "%Y-%m"))
-        return localdate().replace(day=1) - relativedelta(months=1)
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"month": self.get_month()}
-
-    def form_valid(self, form):
-        form.save()
-        return super().form_valid(form)
-
-    def get_success_url(self):
-        # redirect to the month from which the request is originated
-        url = self.request.path
-        kwargs = self.request.GET or self.request.POST
-        if "month" in kwargs:
-            query = urlencode({"month": kwargs["month"]})
-            url += f"?{query}"
-        return url
 
     def get_context_data(self, **kwargs):
         """Add sums to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["months"] = Selling.objects.datetimes("date", "month", order="DESC")
-        start_date = self.get_month()
-        end_date = start_date + relativedelta(months=1)
+        if "month" in self.request.GET:
+            start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
+        else:
+            start_date = datetime(
+                year=timezone.now().year,
+                month=(timezone.now().month + 10) % 12 + 1,
+                day=1,
+            )
+        start_date = start_date.replace(tzinfo=tz.utc)
+        end_date = (start_date + timedelta(days=32)).replace(
+            day=1, hour=0, minute=0, microsecond=0
+        )
+        from django.db.models import Case, Sum, When
 
-        kwargs["sum_cb"] = Refilling.objects.filter(
-            payment_method="CARD",
-            is_validated=True,
-            date__gte=start_date,
-            date__lte=end_date,
-        ).aggregate(res=Sum("amount", default=0))["res"]
-        kwargs["sum_cb"] += (
-            Selling.objects.filter(
+        kwargs["sum_cb"] = sum(
+            [
+                r.amount
+                for r in Refilling.objects.filter(
                     payment_method="CARD",
                     is_validated=True,
                     date__gte=start_date,
                     date__lte=end_date,
                 )
-            .annotate(amount=F("unit_price") * F("quantity"))
-            .aggregate(res=Sum("amount", default=0))["res"]
+            ]
+        )
+        kwargs["sum_cb"] += sum(
+            [
+                s.quantity * s.unit_price
+                for s in Selling.objects.filter(
+                    payment_method="CARD",
+                    is_validated=True,
+                    date__gte=start_date,
+                    date__lte=end_date,
+                )
+            ]
         )
         kwargs["start_date"] = start_date
-        kwargs["invoices"] = (
-            Selling.objects.filter(date__gte=start_date, date__lt=end_date)
-            .values("club_id", "club__name")
-            .annotate(selling_sum=Sum(F("unit_price") * F("quantity")))
+        kwargs["sums"] = (
+            Selling.objects.values("club__name")
+            .annotate(
+                selling_sum=Sum(
+                    Case(
+                        When(
+                            date__gte=start_date,
+                            date__lt=end_date,
+                            then=F("unit_price") * F("quantity"),
+                        ),
+                        output_field=CurrencyField(),
+                    )
+                )
+            )
             .exclude(selling_sum=None)
             .order_by("-selling_sum")
         )

eboutic/templates/eboutic/eboutic_billing_info.jinja

@@ -1,5 +1,3 @@
-{% from 'core/macros.jinja' import update_notifications %}
-
 <div id=billing-infos-fragment>
   <div
     class="collapse"
@@ -31,6 +29,7 @@
       >
     </form>
   </div>
+
   <br>
-  {{ update_notifications(messages) }}
+  {% include "core/base/notifications.jinja" %}
 </div>

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block notifications %}
-  {# Notifications are moved under the billing form #}
+  {# Notifications are moved inside the billing info fragment #}
 {% endblock %}
 
 {% block title %}
@@ -60,7 +60,6 @@
       <div @htmx:after-request="fill">
         {{ billing_infos_form }}
       </div>
-      {% include "core/base/notifications.jinja" %}
       <form
         method="post"
         action="{{ settings.SITH_EBOUTIC_ET_URL }}"

eboutic/views.py

@@ -48,7 +48,7 @@ from django_countries.fields import Country
 
 from core.auth.mixins import CanViewMixin
 from core.views.mixins import FragmentMixin, UseFragmentsMixin
-from counter.forms import BaseBasketForm, BasketProductForm, BillingInfoForm
+from counter.forms import BaseBasketForm, BillingInfoForm, ProductForm
 from counter.models import (
     BillingInfo,
     Customer,
@@ -78,7 +78,7 @@ class BaseEbouticBasketForm(BaseBasketForm):
 
 
 EbouticBasketForm = forms.formset_factory(
-    BasketProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
+    ProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
 )
 
 

galaxy/management/commands/rule_galaxy.py

@@ -45,8 +45,9 @@ class Command(BaseCommand):
                 "verbosity level should be between 0 and 2 included", stacklevel=2
             )
 
-        if options["verbosity"] == 2:
+        if options["verbosity"] >= 2:
             logger.setLevel(logging.DEBUG)
+            logging.getLogger("django.db.backends").setLevel(logging.DEBUG)
         elif options["verbosity"] == 1:
             logger.setLevel(logging.INFO)
         else:
@@ -59,6 +60,3 @@ class Command(BaseCommand):
         Galaxy.objects.filter(state__isnull=True).delete()
 
         logger.info("Ruled the galaxy in {} queries.".format(len(connection.queries)))
-        if options["verbosity"] > 2:
-            for q in connection.queries:
-                logger.debug(q)

galaxy/models.py

@@ -31,13 +31,14 @@ from collections import defaultdict
 from typing import NamedTuple, TypedDict
 
 from django.db import models
-from django.db.models import Count, F, Q, QuerySet
-from django.utils.timezone import localdate
+from django.db.models import Count, Exists, F, OuterRef, Q, QuerySet
+from django.utils.timezone import localdate, now
 from django.utils.translation import gettext_lazy as _
 
 from club.models import Membership
 from core.models import User
 from sas.models import PeoplePictureRelation, Picture
+from subscription.models import Subscription
 
 
 class GalaxyStar(models.Model):
@@ -198,8 +199,16 @@ class Galaxy(models.Model):
         cls, picture_count_threshold: int = DEFAULT_PICTURE_COUNT_THRESHOLD
     ) -> QuerySet[User]:
         return (
-            User.objects.exclude(subscriptions=None)
-            .annotate(pictures_count=Count("pictures"))
+            User.objects.filter(is_subscriber_viewable=True)
+            .exclude(subscriptions=None)
+            .annotate(
+                pictures_count=Count("pictures"),
+                is_active_in_galaxy=Exists(
+                    Subscription.objects.filter(
+                        member=OuterRef("id"), subscription_end__gt=now()
+                    )
+                ),
+            )
             .filter(pictures_count__gt=picture_count_threshold)
             .distinct()
         )
@@ -290,9 +299,9 @@ class Galaxy(models.Model):
         31/12/2022 (also two years, but with an offset of one year), then their
         club score is 365.
         """
-        memberships = user.memberships.only("start_date", "end_date", "club_id")
+        memberships = user.memberships.values("start_date", "end_date", "club_id")
         result = defaultdict(int)
-        now = localdate()
+        today = localdate()
         for membership in memberships:
             # This is a N+1 query, but 92% of galaxy users have less than 10 memberships.
             # Only 5 users have more than 30 memberships.
@@ -300,23 +309,23 @@ class Galaxy(models.Model):
                 Membership.objects.exclude(user=user)
                 .filter(
                     Q(  # start2 <= start1 <= end2
-                        start_date__lte=membership.start_date,
-                        end_date__gte=membership.start_date,
+                        start_date__lte=membership["start_date"],
+                        end_date__gte=membership["start_date"],
                     )
-                    | Q(  # start2 <= start1 <= now
-                        start_date__lte=membership.start_date, end_date=None
+                    | Q(  # start2 <= start1 <= today
+                        start_date__lte=membership["start_date"], end_date=None
                     )
                     | Q(  # start1 <= start2 <= end2
-                        start_date__gte=membership.start_date,
-                        start_date__lte=membership.end_date or now,
+                        start_date__gte=membership["start_date"],
+                        start_date__lte=membership["end_date"] or today,
                     ),
-                    club_id=membership.club_id,
+                    club_id=membership["club_id"],
                 )
                 .only("start_date", "end_date", "user_id")
             )
             for other in common_memberships:
-                start = max(membership.start_date, other.start_date)
-                end = min(membership.end_date or now, other.end_date or now)
+                start = max(membership["start_date"], other.start_date)
+                end = min(membership["end_date"] or today, other.end_date or today)
                 result[other.user_id] += (end - start).days * cls.CLUBS_POINTS
         return result
 
@@ -382,18 +391,22 @@ class Galaxy(models.Model):
         # this is memory expensive but prevents a lot of db hits, therefore
         # is far more time efficient
 
-        rulable_users = list(self.get_rulable_users(picture_count_threshold))
-        rulable_users_count = len(rulable_users)
+        rulable_users_qs = self.get_rulable_users(picture_count_threshold)
+        active_users_count = rulable_users_qs.filter(is_active_in_galaxy=True).count()
+        rulable_users = list(rulable_users_qs)
         user1_count = 0
         self.logger.info(
-            f"{rulable_users_count} citizen have been listed. Starting to rule."
+            f" {len(rulable_users)} citizens (with {active_users_count} active ones) "
+            f"have been listed. Starting to rule."
         )
 
         self.logger.info("Creating stars for all citizen")
         individual_scores = self.compute_individual_scores()
         GalaxyStar.objects.bulk_create(
             [
-                GalaxyStar(owner=user, galaxy=self, mass=individual_scores[user.id])
+                GalaxyStar(
+                    owner_id=user.id, galaxy=self, mass=individual_scores[user.id]
+                )
                 for user in rulable_users
             ]
         )
@@ -405,9 +418,9 @@ class Galaxy(models.Model):
         t_global_start = time.time()
         while len(rulable_users) > 0:
             user1 = rulable_users.pop()
+            if not user1.is_active_in_galaxy:
+                continue
             user1_count += 1
-            rulable_users_count2 = len(rulable_users)
-
             star1 = stars[user1.id]
 
             lanes = []
@@ -448,17 +461,20 @@ class Galaxy(models.Model):
                 self.logger.info("")
                 self.logger.info(f" Ruling of {self} ".center(60, "#"))
                 self.logger.info(
-                    f"Progression: {user1_count}/{rulable_users_count} "
-                    f"citizen -- {rulable_users_count - user1_count} remaining"
+                    f"Progression: {user1_count}/{active_users_count} "
+                    f"citizen -- {active_users_count - user1_count} remaining"
                 )
                 self.logger.info(f"Speed: {global_avg_speed:.2f} citizen per second")
-                eta = rulable_users_count2 // global_avg_speed
+                eta = len(rulable_users) // global_avg_speed
                 self.logger.info(
                     f"ETA: {int(eta // 60 % 60)} minutes {int(eta % 60)} seconds"
                 )
                 self.logger.info("#" * 60)
             t_global_start = time.time()
 
+        count, _ = self.stars.filter(Q(lanes1=None) & Q(lanes2=None)).delete()
+        self.logger.info(f"{count} orphan stars have been trimmed.")
+
         # Here, we get the IDs of the old galaxies that we'll need to delete. In normal operation, only one galaxy
         # should be returned, and we can't delete it yet, as it's the one still displayed by the Sith.
         old_galaxies_pks = list(

galaxy/tests.py

@@ -122,7 +122,7 @@ class TestGalaxyModel(TestCase):
             self.com,
         ]
 
-        with self.assertNumQueries(44):
+        with self.assertNumQueries(38):
             while len(users) > 0:
                 user1 = users.pop(0)
                 family_scores = Galaxy.compute_user_family_score(user1)
@@ -150,7 +150,7 @@ class TestGalaxyModel(TestCase):
         that the number of queries to rule the galaxy is stable.
         """
         galaxy = Galaxy.objects.create()
-        with self.assertNumQueries(39):
+        with self.assertNumQueries(36):
             galaxy.rule(0)  # We want everybody here
 
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-17 13:41+0200\n"
+"POT-Creation-Date: 2025-09-26 17:36+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -117,7 +117,7 @@ msgstr "S'abonner"
 msgid "Remove"
 msgstr "Retirer"
 
-#: club/forms.py counter/forms.py pedagogy/templates/pedagogy/moderation.jinja
+#: club/forms.py pedagogy/templates/pedagogy/moderation.jinja
 msgid "Action"
 msgstr "Action"
 
@@ -556,8 +556,6 @@ msgstr ""
 #: core/templates/core/user_godfathers_tree.jinja
 #: core/templates/core/user_preferences.jinja
 #: counter/templates/counter/cash_register_summary.jinja
-#: counter/templates/counter/invoices_call.jinja
-#: counter/templates/counter/product_form.jinja
 #: forum/templates/forum/reply.jinja
 #: subscription/templates/subscription/fragments/creation_form.jinja
 #: trombi/templates/trombi/comment.jinja
@@ -690,15 +688,15 @@ msgstr "Vente"
 msgid "Mailing list"
 msgstr "Listes de diffusion"
 
-#: club/views.py
-msgid "You are now a member of this club."
-msgstr "Vous êtes maintenant membre de ce club."
-
 #: club/views.py
 #, python-format
 msgid "%(user)s has been added to club."
 msgstr "%(user)s a été ajouté au club."
 
+#: club/views.py
+msgid "You are now a member of this club."
+msgstr "Vous êtes maintenant membre de ce club."
+
 #: com/forms.py
 msgid "Format: 16:9 | Resolution: 1920x1080"
 msgstr "Format : 16:9 | Résolution : 1920x1080"
@@ -2957,18 +2955,6 @@ msgstr "Cet UID est invalide"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: counter/forms.py
-msgid "Date and time of action"
-msgstr "Date et heure de l'action"
-
-#: counter/forms.py
-msgid "New counters"
-msgstr "Nouveaux comptoirs"
-
-#: counter/forms.py
-msgid "The selected counters will replace the current ones"
-msgstr "Les comptoirs sélectionnés remplaceront les comptoirs actuels"
-
 #: counter/forms.py
 msgid ""
 "Describe the product. If it's an event's click, give some insights about it, "
@@ -3303,52 +3289,6 @@ msgid "The returnable product cannot be the same as the returned one"
 msgstr ""
 "Le produit consigné ne peut pas être le même que le produit de déconsigne"
 
-#: counter/models.py
-msgid "Archiving"
-msgstr "Archivage"
-
-#: counter/models.py
-msgid "Counters change"
-msgstr "Changement des comptoirs"
-
-#: counter/models.py
-msgid "Product scheduled action"
-msgstr "Actions sur produit planifiées"
-
-#: counter/models.py
-msgid "Product actions must declare a clocked schedule."
-msgstr "Les actions sur les produits doivent avoir un horaire planifié."
-
-#: counter/models.py
-msgid "Year + month field (day forced to 1)"
-msgstr "Champ Année + mois (jour forcé à 1)"
-
-#: counter/models.py
-#, python-format
-msgid ""
-"“%(value)s” value has an invalid date format. It must be in YYYY-MM format."
-msgstr ""
-"La valeur « %(value)s » a un format de date invalide. Ce doit être au format "
-"YYYY-MM."
-
-#: counter/models.py
-#, python-format
-msgid ""
-"“%(value)s” value has the correct format (YYYY-MM) but it is an invalid date."
-msgstr "La valeur « %(value)s » a le bon format, mais est une date invalide."
-
-#: counter/models.py
-msgid "invoice date"
-msgstr "date de la facture"
-
-#: counter/models.py
-msgid "Invoice call"
-msgstr "Appel à facture"
-
-#: counter/models.py
-msgid "Invoice calls"
-msgstr "Appels à facture"
-
 #: counter/templates/counter/activity.jinja
 #, python-format
 msgid "%(counter_name)s activity"
@@ -3579,10 +3519,6 @@ msgstr "Payements en Carte Bancaire"
 msgid "Sum"
 msgstr "Somme"
 
-#: counter/templates/counter/invoices_call.jinja
-msgid "Validated"
-msgstr "Validé"
-
 #: counter/templates/counter/last_ops.jinja
 #, python-format
 msgid "%(counter_name)s last operations"
@@ -3671,25 +3607,6 @@ msgstr ""
 "votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
 "aucune conséquence autre que le retrait de l'argent de votre compte."
 
-#: counter/templates/counter/product_form.jinja
-#, python-format
-msgid "Edit product %(name)s"
-msgstr "Édition du produit %(name)s"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Product creation"
-msgstr "Création de produit"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Automatic actions"
-msgstr "Actions automatiques"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Automatic actions allows to schedule product changes ahead of time."
-msgstr ""
-"Les actions automatiques vous permettent de planifier des modifications du "
-"produit à l'avance."
-
 #: counter/templates/counter/product_list.jinja
 msgid "Product list"
 msgstr "Liste des produits"
@@ -3872,10 +3789,6 @@ msgstr "L'utilisateur n'est pas barman."
 msgid "Bad location, someone is already logged in somewhere else"
 msgstr "Mauvais comptoir, quelqu'un est déjà connecté ailleurs"
 
-#: counter/views/invoice.py
-msgid "Invoice calls status has been updated."
-msgstr "Le statut des appels à facture a été mis à jour."
-
 #: counter/views/mixins.py
 msgid "Cash summary"
 msgstr "Relevé de caisse"

pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "django>=5.2.1,<6.0.0",
     "django-ninja<2.0.0,>=1.4.0",
     "django-ninja-extra<1.0.0,>=0.22.9",
-    "Pillow>=11.1.0,<13.0.0",
+    "Pillow<12.0.0,>=11.1.0",
     "mistune<4.0.0,>=3.1.3",
     "django-jinja<3.0.0,>=2.11.0",
     "cryptography>=45.0.3,<46.0.0",

sas/static/bundled/sas/user/pictures-index.ts

@@ -7,7 +7,6 @@ import {
 
 interface PagePictureConfig {
   userId: number;
-  nbPictures?: number;
 }
 
 interface Album {
@@ -21,27 +20,11 @@ document.addEventListener("alpine:init", () => {
     loading: true,
     albums: [] as Album[],
 
-    async fetchPictures(): Promise<PictureSchema[]> {
-      const localStorageKey = `user${config.userId}Pictures`;
-      const localStorageInvalidationKey = `user${config.userId}PicturesNumber`;
-      const lastCachedNumber = localStorage.getItem(localStorageInvalidationKey);
-      if (
-        lastCachedNumber !== null &&
-        Number.parseInt(lastCachedNumber) === config.nbPictures
-      ) {
-        return JSON.parse(localStorage.getItem(localStorageKey));
-      }
+    async init() {
       const pictures = await paginated(picturesFetchPictures, {
         // biome-ignore lint/style/useNamingConvention: from python api
         query: { users_identified: [config.userId] },
       } as PicturesFetchPicturesData);
-      localStorage.setItem(localStorageInvalidationKey, config.nbPictures.toString());
-      localStorage.setItem(localStorageKey, JSON.stringify(pictures));
-      return pictures;
-    },
-
-    async init() {
-      const pictures = await this.fetchPictures();
       const groupedAlbums = Object.groupBy(pictures, (i: PictureSchema) => i.album.id);
       this.albums = Object.values(groupedAlbums).map((pictures: PictureSchema[]) => {
         return {

sas/templates/sas/user_pictures.jinja

@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block content %}
-  <main x-data="user_pictures({ userId: {{ object.id }}, nbPictures: {{ object.nb_pictures }} })">
+  <main x-data="user_pictures({ userId: {{ object.id }} })">
     {% if user.id == object.id %}
       {{ download_button(_("Download all my pictures")) }}
     {% endif %}

sas/views.py

@@ -16,7 +16,6 @@ from typing import Any
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.db.models import Count, OuterRef, Subquery
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
@@ -37,7 +36,7 @@ from sas.forms import (
     PictureModerationRequestForm,
     PictureUploadForm,
 )
-from sas.models import Album, PeoplePictureRelation, Picture
+from sas.models import Album, Picture
 
 
 class AlbumCreateFragment(FragmentMixin, CreateView):
@@ -179,13 +178,6 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
     context_object_name = "profile"
     template_name = "sas/user_pictures.jinja"
     current_tab = "pictures"
-    queryset = User.objects.annotate(
-        nb_pictures=Subquery(
-            PeoplePictureRelation.objects.filter(user=OuterRef("id"))
-            .values("user_id")
-            .values(count=Count("*"))
-        )
-    ).all()
 
 
 # Admin views