Preventive file: add some fields - better sheet - Administrativ act: add comment

1 files changed, 18 insertions, 18 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 1623e901f..defb7ba05 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -524,14 +524,14 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
     class Meta:
         model = models.File
         fields = [
+            "intervention_period",
+            "study_period",
+            "report_due_period",
             "start_date",
             "end_date",
             "ground_start_date",
             "ground_end_date",
-            "intervention_period",
-            "study_period",
             "execution_report_date",
-            "report_due_date",
             "type_of_agreement",
             "operation_type_for_royalties",
             "total_developed_surface",
@@ -540,6 +540,21 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
         ]
 
     pk = forms.IntegerField(label="", required=False, widget=forms.HiddenInput)
+    intervention_period = forms.CharField(
+        label=_("Intervention period"),
+        max_length=200,
+        required=False,
+    )
+    study_period = forms.CharField(
+        label=_("Study period"),
+        max_length=200,
+        required=False,
+    )
+    report_due_period = forms.CharField(
+        label=_("Report due period"),
+        max_length=200,
+        required=False,
+    )
     start_date = forms.DateField(
         label=_("Start date"),
         required=False,
@@ -560,26 +575,11 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
         required=False,
         widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
     )
-    intervention_period = forms.CharField(
-        label=_("Intervention period"),
-        max_length=200,
-        required=False,
-    )
-    study_period = forms.CharField(
-        label=_("Study period"),
-        max_length=200,
-        required=False,
-    )
     execution_report_date = forms.DateField(
         label=_("Execution report date"),
         required=False,
         widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
     )
-    report_due_date = forms.DateField(
-        label=_("Report due date"),
-        required=False,
-        widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
-    )
     total_developed_surface = forms.FloatField(
         widget=widgets.AreaWidget(attrs={"bs_col_width": "col-6 col-lg-3"}),
         label=_("Total developed surface (m2)"),