🐛 find sheet: fix field order

4 files changed, 18 insertions, 17 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 659ccd779..a255cf25d 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -318,8 +318,6 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         "museum_original_repro",
         "museum_allocation_date",
         "museum_purchase_price",
-        "iconographic_pattern",
-        "iconography_notes",
         "workshop_movement_style",
         "description",
         "public_description",
@@ -334,6 +332,8 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         "object_type_quality",
         "functional_area",
         "technical_area",
+        "iconographic_pattern",
+        "iconography_notes",
         "find_number",
         "min_number_of_individuals",
         "museum_inventory_quantity",
@@ -398,6 +398,7 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
             "museum_purchase_price",
             "museum_inventory_quantity",
             "museum_observed_quantity",
+            "workshop_movement_style"
         ],
     }
     HEADERS = {}
@@ -471,12 +472,6 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
     museum_allocation_date = DateField(label=_("Date of museum allocation"),
                                        required=False)
     museum_purchase_price = forms.CharField(label=_("Purchase price"), required=False)
-    iconographic_pattern = widgets.Select2MultipleField(
-        label=_("Iconographic patterns"), required=False,
-    )
-    iconography_notes = forms.CharField(
-        label=_("Iconography notes"), widget=forms.Textarea, required=False
-    )
     workshop_movement_style = widgets.Select2MultipleField(
         label=_("Workshop, movement, style"), required=False,
     )
@@ -526,6 +521,12 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         label=_("Technical areas"),
         required=False,
     )
+    iconographic_pattern = widgets.Select2MultipleField(
+        label=_("Iconographic patterns"), required=False,
+    )
+    iconography_notes = forms.CharField(
+        label=_("Iconography notes"), widget=forms.Textarea, required=False
+    )
     find_number = forms.IntegerField(label=_("Number of remains"), required=False)
     min_number_of_individuals = forms.IntegerField(
         label=_("Minimum number of individuals (MNI)"), required=False
@@ -749,8 +750,6 @@ class FindForm(BasicFindForm):
         "museum_conformity_comment",
         "museum_original_repro",
         "museum_purchase_price",
-        "iconographic_pattern",
-        "iconography_notes",
         "workshop_movement_style",
         "museum_allocation_date",
         "museum_inventory_transcript",
@@ -772,6 +771,8 @@ class FindForm(BasicFindForm):
         "object_type_quality",
         "functional_area",
         "technical_area",
+        "iconographic_pattern",
+        "iconography_notes",
         "find_number",
         "min_number_of_individuals",
         "museum_inventory_quantity",
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index eed270ef9..a6f1263e1 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -2779,7 +2779,7 @@ class Find(
             return True
         for field in self._meta.get_fields():
             if not field.name.startswith("museum_") and \
-                    not field.name.startswith("iconograph"):
+                    field.name != "workshop_movement_styles":
                 continue
             instanced_field = getattr(self, field.name)
             if instanced_field and (not field.many_to_many or instanced_field.count()):
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 893d79897..20b325e73 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -146,12 +146,14 @@
             {% field_flex_multiple_obj _("Material types") item 'material_types' %}
             {% endif %}{% endwith %}
             {% field_flex _("Material type quality") item.material_type_quality %}
-            {% field_flex_multiple_obj _("Technical processes") item 'technical_processes' %}
             {% field_flex_full _("Comment on the material") item.material_comment "<pre>" "</pre>" %}
+            {% field_flex_multiple_obj _("Technical processes") item 'technical_processes' %}
             {% field_flex_multiple_obj _("Object types") item 'object_types' %}
             {% field_flex _("Object type quality") item.object_type_quality %}
             {% field_flex_multiple_obj _("Functional areas") item 'functional_areas' %}
             {% field_flex_multiple_obj _("Technical areas") item 'technical_areas' %}
+            {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
+            {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
             {% field_flex _("Number of remains") item.find_number %}
             {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
             {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
@@ -200,8 +202,6 @@
             {% field_flex museum_entry_date_label item.museum_entry_date_label %}
             {% field_flex _("Comment on museum entry date") item.museum_entry_date_comment %}
             {% field_flex_detail_multiple _("Donors, testators or vendors") item.museum_donors %}
-            {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
-            {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
             {% field_flex_multiple_obj _("Presence of inventory marking") item "museum_inventory_marking_presence" %}
             {% field_flex_multiple_obj _("Type of marking") item "museum_marking_type" %}
diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html
index ca6583e8c..fdbcaa3ee 100644
--- a/archaeological_finds/templates/ishtar/sheet_museum_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html
@@ -146,12 +146,14 @@
             {% field_flex_multiple_obj _("Material types") item 'material_types' %}
             {% endif %}{% endwith %}
             {% field_flex _("Material type quality") item.material_type_quality %}
-            {% field_flex_multiple_obj _("Technical processes") item 'technical_processes' %}
             {% field_flex_full _("Comment on the material") item.material_comment "<pre>" "</pre>" %}
+            {% field_flex_multiple_obj _("Technical processes") item 'technical_processes' %}
             {% field_flex_multiple_obj _("Object types") item 'object_types' %}
             {% field_flex _("Object type quality") item.object_type_quality %}
             {% field_flex_multiple_obj _("Functional areas") item 'functional_areas' %}
             {% field_flex_multiple_obj _("Technical areas") item 'technical_areas' %}
+            {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
+            {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
             {% field_flex _("Number of remains") item.find_number %}
             {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
             {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
@@ -200,8 +202,6 @@
             {% field_flex museum_entry_date_label item.museum_entry_date_label %}
             {% field_flex _("Comment on museum entry date") item.museum_entry_date_comment %}
             {% field_flex_detail_multiple _("Donors, testators or vendors") item.museum_donors %}
-            {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
-            {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
             {% field_flex_multiple_obj _("Presence of inventory marking") item "museum_inventory_marking_presence" %}
             {% field_flex_multiple_obj _("Type of marking") item "museum_marking_type" %}