From e1860522838c378e30ef42333e0302513624e2c9 Mon Sep 17 00:00:00 2001
From: Noa Fouich <noafouich.etude@protonmail.com>
Date: Mon, 22 Sep 2025 08:53:24 +0200
Subject: [PATCH 1/2] Fix deleted barman on user account

# Conflicts:
#	locale/fr/LC_MESSAGES/django.po
---
 core/templates/core/user_account_detail.jinja | 6 +++++-
 locale/fr/LC_MESSAGES/django.po               | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja
index ccf41cfb..ff9deea3 100644
--- a/core/templates/core/user_account_detail.jinja
+++ b/core/templates/core/user_account_detail.jinja
@@ -30,7 +30,11 @@
               - {{ purchase.date|localtime|time(DATETIME_FORMAT) }}
             </td>
             <td>{{ purchase.counter }}</td>
-            <td><a href="{{ purchase.seller.get_absolute_url() }}">{{ purchase.seller.get_display_name() }}</a></td>
+            {% if not purchase.seller %}
+              <td>{% trans %}Deleted User{% endtrans %}</td>
+            {% else %}
+              <td><a href="{{ purchase.seller.get_absolute_url() }}">{{ purchase.seller.get_display_name() }}</a></td>
+            {% endif %}
             <td>{{ purchase.label }}</td>
             <td>{{ purchase.quantity }}</td>
             <td>{{ purchase.quantity * purchase.unit_price }} €</td>
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 95a2dad7..7bfce885 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -2344,6 +2344,10 @@ msgstr "Etickets"
 msgid "User has no account"
 msgstr "L'utilisateur n'a pas de compte"
 
+#: core/templates/core/user_account_detail.jinja
+msgid "Deleted User"
+msgstr "Utilisateur supprimé"
+
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/last_ops.jinja
 #: counter/templates/counter/refilling_list.jinja
@@ -5515,3 +5519,6 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #, python-format
 msgid "Maximum characters: %(max_length)s"
 msgstr "Nombre de caractères max: %(max_length)s"
+
+#~ msgid "There is no page in this website."
+#~ msgstr "Il n'y a pas de page sur ce site web."

From 0b7c516f18ec02b5da74500ffafd43205f1064c3 Mon Sep 17 00:00:00 2001
From: Noa Fouich <noafouich.etude@protonmail.com>
Date: Thu, 25 Sep 2025 15:40:11 +0200
Subject: [PATCH 2/2] adding test

---
 core/templates/core/user_account_detail.jinja |  2 +-
 core/tests/test_user.py                       | 28 ++++++++++++++++++-
 locale/fr/LC_MESSAGES/django.po               |  7 ++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja
index ff9deea3..4c6275c8 100644
--- a/core/templates/core/user_account_detail.jinja
+++ b/core/templates/core/user_account_detail.jinja
@@ -31,7 +31,7 @@
             </td>
             <td>{{ purchase.counter }}</td>
             {% if not purchase.seller %}
-              <td>{% trans %}Deleted User{% endtrans %}</td>
+              <td>{% trans %}Deleted user{% endtrans %}</td>
             {% else %}
               <td><a href="{{ purchase.seller.get_absolute_url() }}">{{ purchase.seller.get_display_name() }}</a></td>
             {% endif %}
diff --git a/core/tests/test_user.py b/core/tests/test_user.py
index 5d4cb734..8be9bf5f 100644
--- a/core/tests/test_user.py
+++ b/core/tests/test_user.py
@@ -20,7 +20,8 @@ from core.baker_recipes import (
 )
 from core.models import Group, User
 from core.views import UserTabsMixin
-from counter.models import Counter, Refilling, Selling
+from counter.baker_recipes import sale_recipe
+from counter.models import Counter, Customer, Refilling, Selling
 from eboutic.models import Invoice, InvoiceItem
 
 
@@ -129,6 +130,31 @@ def test_user_account_not_found(client: Client):
     assert res.status_code == 404
 
 
+@pytest.mark.django_db
+def test_is_deleted_barman_shown_as_deleted(client: Client):
+    customer = baker.make(Customer)
+    date = now()
+    sale_recipe.make(
+        seller=iter([None, baker.make(User)]),
+        customer=customer,
+        date=date,
+        _quantity=2,
+        _bulk_create=True,
+    )
+    client.force_login(customer.user)
+    res = client.get(
+        reverse(
+            "core:user_account_detail",
+            kwargs={
+                "user_id": customer.user.id,
+                "year": date.year,
+                "month": date.month,
+            },
+        )
+    )
+    assert res.status_code == 200
+
+
 class TestFilterInactive(TestCase):
     @classmethod
     def setUpTestData(cls):
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 7bfce885..0c9cd5e5 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -2345,7 +2345,7 @@ msgid "User has no account"
 msgstr "L'utilisateur n'a pas de compte"
 
 #: core/templates/core/user_account_detail.jinja
-msgid "Deleted User"
+msgid "Deleted user"
 msgstr "Utilisateur supprimé"
 
 #: core/templates/core/user_account_detail.jinja
@@ -5518,7 +5518,4 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #: trombi/views.py
 #, python-format
 msgid "Maximum characters: %(max_length)s"
-msgstr "Nombre de caractères max: %(max_length)s"
-
-#~ msgid "There is no page in this website."
-#~ msgstr "Il n'y a pas de page sur ce site web."
+msgstr "Nombre de caractères max: %(max_length)s"
\ No newline at end of file