fix tests and migration conflict

yverdon · Jun 24, 2024 · 4a3b89c · 4a3b89c
1 parent 438ece3
commit 4a3b89c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/geocity/apps/accounts/migrations/0020_remove_administrativeentity_ofs_id_and_more.py b/geocity/apps/accounts/migrations/0020_remove_administrativeentity_ofs_id_and_more.py
diff --git a/...er_administrativeentity_phone_and_more.py → ...e_administrativeentity_ofs_id_and_more.py b/...er_administrativeentity_phone_and_more.py → ...e_administrativeentity_ofs_id_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-05-30 08:58
+# Generated by Django 4.2.11 on 2024-06-24 09:45
 
 import django.core.validators
 from django.db import migrations, models
@@ -11,6 +11,19 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name="administrativeentity",
+            name="ofs_id",
+        ),
+        migrations.AddField(
+            model_name="administrativeentity",
+            name="group_order",
+            field=models.PositiveIntegerField(
+                default=0,
+                help_text="Utilisé afin de grouper et définir l'ordre des entités.<br>Affichés par ordre croissant et groupés en cas de nombre identique",
+                verbose_name="Groupe et ordre",
+            ),
+        ),
         migrations.AlterField(
             model_name="administrativeentity",
             name="phone",

diff --git a/geocity/tests/reports/data/test_pdf_preview/page-000.expected.png b/geocity/tests/reports/data/test_pdf_preview/page-000.expected.png