Resolving merge conflict

src/open_inwoner/openzaak/migrations/0057_merge_20241021_2201.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.16 on 2024-10-21 20:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("openzaak", "0056_openzaakconfig_order_statusses_by_date_set"),
+        ("openzaak", "0056_openzaakconfig_use_zaak_omschrijving_as_title"),
+    ]
+
+    operations = []

src/open_inwoner/openzaak/migrations/0058_alter_openzaakconfig_order_statuses_by_date_set.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.16 on 2024-10-21 20:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("openzaak", "0057_merge_20241021_2201"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="openzaakconfig",
+            name="order_statuses_by_date_set",
+            field=models.BooleanField(
+                help_text="If enabled, the statuses of a case are ordered based on 'datum_status_gezet'. If not enabled, we show the statuses in the reverse order they are returned via the API, this because the eSuite does not return the timestamps of the statuses (eSuite, but also works for Open Zaak).",
+                verbose_name="On the detail page of the case, order the statuses based on the date they have been set",
+            ),
+        ),
+    ]

src/open_inwoner/openzaak/models.py

@@ -421,6 +421,8 @@ def form_service(self, service):
             "If not enabled, we show the statuses in the reverse order they are returned via the API, "
             "this because the eSuite does not return the timestamps of the statuses (eSuite, but also "
             "works for Open Zaak)."
+        ),
+    )
 
     use_zaak_omschrijving_as_title = models.BooleanField(
         verbose_name=_(