Bump marshmallow from 4.1.0 to 4.1.2

Bumps [marshmallow](https://github.com/marshmallow-code/marshmallow) from 4.1.0 to 4.1.2.
- [Changelog](https://github.com/marshmallow-code/marshmallow/blob/dev/CHANGELOG.rst)
- [Commits](https://github.com/marshmallow-code/marshmallow/compare/4.1.0...4.1.2)

---
updated-dependencies:
- dependency-name: marshmallow
  dependency-version: 4.1.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

club/templates/club/club_sellings.jinja

@@ -35,7 +35,7 @@ TODO : rewrite the pagination used in this template an Alpine one
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
-    <p><input type="submit" value="{% trans %}Download as CSV{% endtrans %}" formaction="{{ url('club:sellings_csv', club_id=object.id) }}"/></p>
+    <p><input type="submit" value="{% trans %}Download as cvs{% endtrans %}" formaction="{{ url('club:sellings_csv', club_id=object.id) }}"/></p>
   </form>
   <p>
     {% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}<br/>

core/management/commands/populate_more.py

@@ -12,7 +12,7 @@ from django.utils.timezone import localdate, make_aware, now
 from faker import Faker
 
 from club.models import Club, Membership
-from core.models import Group, User, UserBan
+from core.models import Group, User
 from counter.models import (
     Counter,
     Customer,
@@ -40,7 +40,6 @@ class Command(BaseCommand):
 
         self.stdout.write("Creating users...")
         users = self.create_users()
-        self.create_bans(random.sample(users, k=len(users) // 200))  # 0.5% of users
         subscribers = random.sample(users, k=int(0.8 * len(users)))
         self.stdout.write("Creating subscriptions...")
         self.create_subscriptions(subscribers)
@@ -89,8 +88,6 @@ class Command(BaseCommand):
         self.stdout.write("Done")
 
     def create_users(self) -> list[User]:
-        # Create a single password hash for all users to make it faster.
-        # It's insecure as hell, but it's ok since it's only for dev purposes.
         password = make_password("plop")
         users = [
             User(
@@ -117,33 +114,14 @@ class Command(BaseCommand):
         public_group.users.add(*users)
         return users
 
-    def create_bans(self, users: list[User]):
-        ban_groups = [
-            settings.SITH_GROUP_BANNED_COUNTER_ID,
-            settings.SITH_GROUP_BANNED_SUBSCRIPTION_ID,
-            settings.SITH_GROUP_BANNED_ALCOHOL_ID,
-        ]
-        UserBan.objects.bulk_create(
-            [
-                UserBan(
-                    user=user,
-                    ban_group_id=i,
-                    reason=self.faker.sentence(),
-                    expires_at=make_aware(self.faker.future_datetime("+1y")),
-                )
-                for user in users
-                for i in random.sample(ban_groups, k=random.randint(1, len(ban_groups)))
-            ]
-        )
-
     def create_subscriptions(self, users: list[User]):
         def prepare_subscription(_user: User, start_date: date) -> Subscription:
             payment_method = random.choice(settings.SITH_SUBSCRIPTION_PAYMENT_METHOD)[0]
             duration = random.randint(1, 4)
-            s = Subscription(member=_user, payment_method=payment_method)
-            s.subscription_start = s.compute_start(d=start_date, duration=duration)
-            s.subscription_end = s.compute_end(duration)
-            return s
+            sub = Subscription(member=_user, payment_method=payment_method)
+            sub.subscription_start = sub.compute_start(d=start_date, duration=duration)
+            sub.subscription_end = sub.compute_end(duration)
+            return sub
 
         subscriptions = []
         customers = []

counter/admin.py

@@ -39,9 +39,8 @@ class ProductAdmin(SearchModelAdmin):
         "code",
         "product_type",
         "selling_price",
+        "profit",
         "archived",
-        "created_at",
-        "updated_at",
     )
     list_select_related = ("product_type",)
     search_fields = ("name", "code")

counter/migrations/0036_product_created_at_product_updated_at.py

@@ -1,67 +0,0 @@
-# Generated by Django 5.2.8 on 2026-02-10 15:40
-from operator import attrgetter
-
-import django.utils.timezone
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-from django.db.models import OuterRef, Subquery
-
-from counter.models import Selling
-
-
-def apply_product_history_dates(apps: StateApps, schema_editor):
-    """Approximate a posteriori the value of created_at and updated_at."""
-    Product = apps.get_model("counter", "Product")
-    sales_subquery = Selling.objects.filter(product=OuterRef("pk")).values("date")
-
-    # for products that have an associated sale, we set the creation date
-    # to the one of the first sale, and the update date to the one of the last sale
-    products = list(
-        Product.objects.exclude(sellings=None)
-        .annotate(
-            new_created_at=Subquery(sales_subquery.order_by("date")[:1]),
-            new_updated_at=Subquery(sales_subquery.order_by("-date")[:1]),
-        )
-        .only("id")
-    )
-    for product in products:
-        product.created_at = product.new_created_at
-        product.updated_at = product.new_updated_at
-
-    # For the remaining products (those without sale),
-    # they are given the creation and update date of the previous product having sales.
-    products_without_sale = list(Product.objects.filter(sellings=None).only("id"))
-    for product in products_without_sale:
-        previous_product = max(
-            (p for p in products if p.id < product.id), key=attrgetter("id")
-        )
-        product.created_at = previous_product.created_at
-        product.updated_at = previous_product.updated_at
-    products.extend(products_without_sale)
-
-    Product.objects.bulk_update(products, fields=["created_at", "updated_at"])
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0035_remove_selling_is_validated_and_more")]
-
-    operations = [
-        migrations.AddField(
-            model_name="product",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True,
-                default=django.utils.timezone.now,
-                verbose_name="created at",
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="product",
-            name="updated_at",
-            field=models.DateTimeField(auto_now=True, verbose_name="updated at"),
-        ),
-        migrations.RunPython(
-            apply_product_history_dates, reverse_code=migrations.RunPython.noop
-        ),
-    ]

counter/models.py

@@ -399,8 +399,6 @@ class Product(models.Model):
         Group, related_name="products", verbose_name=_("buying groups"), blank=True
     )
     archived = models.BooleanField(_("archived"), default=False)
-    created_at = models.DateTimeField(_("created at"), auto_now_add=True)
-    updated_at = models.DateTimeField(_("updated at"), auto_now=True)
 
     class Meta:
         verbose_name = _("product")

counter/templates/counter/product_form.jinja

@@ -3,8 +3,6 @@
 {% block content %}
   {% if object %}
     <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
-    <p><i>{% trans %}Creation date{% endtrans %} : {{ object.created_at|date }}</i></p>
-    <p><i>{% trans %}Last update{% endtrans %} : {{ object.updated_at|date }}</i></p>
   {% else %}
     <h2>{% trans %}Product creation{% endtrans %}</h2>
   {% endif %}

counter/templates/counter/product_list.jinja

@@ -89,7 +89,7 @@
         :disabled="csvLoading"
         :aria-busy="csvLoading"
       >
-        {% trans %}Download as CSV{% endtrans %} <i class="fa fa-file-arrow-down"></i>
+        {% trans %}Download as cvs{% endtrans %} <i class="fa fa-file-arrow-down"></i>
       </button>
     </div>
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-02-14 15:21+0100\n"
+"POT-Creation-Date: 2026-02-08 16:14+0100\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"
@@ -388,7 +388,7 @@ msgstr "Montrer"
 
 #: club/templates/club/club_sellings.jinja
 #: counter/templates/counter/product_list.jinja
-msgid "Download as CSV"
+msgid "Download as cvs"
 msgstr "Télécharger en CSV"
 
 #: club/templates/club/club_sellings.jinja
@@ -1566,7 +1566,7 @@ msgstr "Visiteur"
 msgid "ban type"
 msgstr "type de ban"
 
-#: core/models.py counter/models.py
+#: core/models.py
 msgid "created at"
 msgstr "créé le"
 
@@ -3109,10 +3109,6 @@ msgstr "groupe d'achat"
 msgid "archived"
 msgstr "archivé"
 
-#: counter/models.py
-msgid "updated at"
-msgstr "mis à jour le"
-
 #: counter/models.py
 msgid "product"
 msgstr "produit"
@@ -3668,14 +3664,6 @@ msgstr ""
 msgid "Edit product %(name)s"
 msgstr "Édition du produit %(name)s"
 
-#: counter/templates/counter/product_form.jinja
-msgid "Creation date"
-msgstr "Date de création"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Last update"
-msgstr "Dernière mise à jour"
-
 #: counter/templates/counter/product_form.jinja
 msgid "Product creation"
 msgstr "Création de produit"
@@ -3963,8 +3951,8 @@ msgid ""
 "inconvenience."
 msgstr ""
 "Les paiements par carte bancaire sont actuellement désactivés sur l'eboutic. "
-"Vous pouvez cependant toujours recharger votre compte dans un des lieux de "
-"vie de l'AE. Veuillez nous excuser pour le désagrément."
+"Vous pouvez cependant toujours recharger votre compte dans un des lieux de vie de l'AE. "
+"Veuillez nous excuser pour le désagrément."
 
 #: eboutic/templates/eboutic/eboutic_checkout.jinja
 msgid ""
@@ -4133,8 +4121,8 @@ msgstr "Les candidatures sont fermées pour cette élection"
 #: election/templates/election/election_detail.jinja
 msgid "Candidate pictures won't display for privacy reasons."
 msgstr ""
-"La photo du candidat ne s'affiche pas pour des raisons de respect de la vie "
-"privée."
+"La photo du candidat ne s'affiche pas pour "
+"des raisons de respect de la vie privée."
 
 #: election/templates/election/election_detail.jinja
 msgid "Polls close "

uv.lock

@@ -1193,11 +1193,11 @@ wheels = [
 
 [[package]]
 name = "marshmallow"
-version = "4.1.0"
+version = "4.1.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a7/2c/e40834adb0bb6f21d7372ad90e616eda82116d4f090d93c29ceb2366cdaf/marshmallow-4.1.0.tar.gz", hash = "sha256:daa9862f74e2f7864980d25c29b4ea72944cde48aa17537e3bd5797a4ae62d71", size = 220619, upload-time = "2025-11-01T15:40:37.096Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e9/e1/5edfd1edf05d3cc98415b0810ca45fa19d7dee6def0d0ec639eb4eb14e20/marshmallow-4.1.2.tar.gz", hash = "sha256:083f250643d2e75fd363f256aeb6b1af369a7513ad37647ce4a601f6966e3ba5", size = 220974, upload-time = "2025-12-22T06:16:35.283Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e7/df/081ea8c41696d598e7cea4f101e49da718a9b6c9dcaaad4e76dfc11a022c/marshmallow-4.1.0-py3-none-any.whl", hash = "sha256:9901660499be3b880dc92d6b5ee0b9a79e94265b7793f71021f92040c07129f1", size = 48286, upload-time = "2025-11-01T15:40:35.542Z" },
+    { url = "https://files.pythonhosted.org/packages/af/b6/66d1748fb45453e337c8a334dafed7b818e72ac9cf9d105a56e0cf21865f/marshmallow-4.1.2-py3-none-any.whl", hash = "sha256:a8cfa18bd8d0e5f7339e734edf84815fe8db1bdb57358c7ccc05472b746eeadc", size = 48360, upload-time = "2025-12-22T06:16:33.994Z" },
 ]
 
 [[package]]
@@ -2446,4 +2446,4 @@ dependencies = [
     { name = "django-haystack" },
     { name = "filelock" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a3/db/c6219763f6c4519cdaae812e60fd9471a7805de2b39d912931e45575c8e6/xapian-haystack-3.1.0.tar.gz", hash = "sha256:9f9ab90bf450bf6699d164594d569243aafb6c9f0990a16855f55a1d16bc09c6", size = 37887, upload-time = "2023-03-19T11:58:37.035Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a3/db/c6219763f6c4519cdaae812e60fd9471a7805de2b39d912931e45575c8e6/xapian-haystack-3.1.0.tar.gz", hash = "sha256:9f9ab90bf450bf6699d164594d569243aafb6c9f0990a16855f55a1d16bc09c6", size = 37887, upload-time = "2023-03-19T11:58:37.035Z" }