🐛 Forms: fix date validation not possible when switching to english (refs #5837)

3 files changed, 47 insertions, 92 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 4e3dfef14..60a3337d5 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -24,6 +24,7 @@ Finds forms definitions
 from collections import OrderedDict
 import logging
 
+from bootstrap_datepicker.widgets import DateField
 from django import forms
 from django.core import validators
 from django.core.exceptions import PermissionDenied
@@ -70,7 +71,6 @@ from archaeological_operations.models import (
 )
 from archaeological_operations.widgets import OAWidget
 from archaeological_warehouse.models import Warehouse, Container
-from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common import widgets
 
 from ishtar_common.forms import (
@@ -392,12 +392,8 @@ class BasicFindForm(CustomForm, ManageOldType):
         label=_("Collections entry mode"), required=False, choices=[]
     )
     museum_entry_mode_comment = forms.CharField(label=_("Comment on museum entry mode"), widget=forms.Textarea, required=False)
-    museum_entry_date = forms.DateField(
-        label=_("Museum entry date (exact or start)"), widget=DatePicker, required=False
-    )
-    museum_entry_date_end = forms.DateField(
-        label=_("Museum entry date (end)"), widget=DatePicker, required=False
-    )
+    museum_entry_date = DateField(label=_("Museum entry date (exact or start)"), required=False)
+    museum_entry_date_end = DateField(label=_("Museum entry date (end)"), required=False)
     museum_entry_date_comment = forms.CharField(label=_("Comment on museum entry date"), required=False)
     museum_donor = forms.IntegerField(
         widget=widgets.JQueryAutoComplete(
@@ -424,9 +420,7 @@ class BasicFindForm(CustomForm, ManageOldType):
     museum_original_repro = forms.ChoiceField(
         label=_("Original/reproduction"), required=False, choices=[]
     )
-    museum_allocation_date = forms.DateField(
-        label=_("Date of museum allocation"), widget=DatePicker, required=False
-    )
+    museum_allocation_date = DateField(label=_("Date of museum allocation"), required=False)
     museum_purchase_price = forms.CharField(label=_("Purchase price"), required=False)
 
     HEADERS["museum_inventory_transcript"] = FormHeader(_("Description"))
@@ -545,9 +539,7 @@ class BasicFindForm(CustomForm, ManageOldType):
 
     HEADERS["checked_type"] = FormHeader(_("Sheet"))
     checked_type = forms.ChoiceField(label=_("Check"), required=False)
-    check_date = forms.DateField(
-        initial=get_now, label=_("Check date"), widget=DatePicker
-    )
+    check_date = DateField(initial=get_now, label=_("Check date"))
 
     TYPES = [
         FieldType(
@@ -705,11 +697,11 @@ class FindForm(BasicFindForm):
         label=_("Excavation ID"), required=False
     )
 
-    get_first_base_find__discovery_date = forms.DateField(
-        label=_("Discovery date (exact or beginning)"), widget=DatePicker, required=False
+    get_first_base_find__discovery_date = DateField(
+        label=_("Discovery date (exact or beginning)"), required=False
     )
-    get_first_base_find__discovery_date_taq = forms.DateField(
-        label=_("Discovery date (end)"), widget=DatePicker, required=False
+    get_first_base_find__discovery_date_taq = DateField(
+        label=_("Discovery date (end)"), required=False
     )
     get_first_base_find__batch = forms.ChoiceField(
         label=_("Batch/object"), choices=[], required=False
@@ -826,9 +818,7 @@ class ResultingFindForm(CustomForm, ManageOldType):
 
     HEADERS["resulting_checked_type"] = FormHeader(_("Sheet"))
     resulting_checked_type = forms.ChoiceField(label=_("Check"), required=False)
-    resulting_check_date = forms.DateField(
-        initial=get_now, label=_("Check date"), widget=DatePicker
-    )
+    resulting_check_date = DateField(initial=get_now, label=_("Check date"))
 
     TYPES = [
         FieldType("resulting_material_type", models.MaterialType, is_multiple=True),
@@ -1054,12 +1044,10 @@ class QAFindFormMulti(QAForm):
     qa_museum_entry_mode_comment = forms.CharField(
         label=_("Comment on museum entry mode"), required=False, widget=forms.Textarea
     )
-    qa_museum_entry_date = forms.DateField(
-        label=_("Museum entry date (exact or start)"), widget=DatePicker, required=False
-    )
-    qa_museum_entry_date_end = forms.DateField(
-        label=_("Museum entry date (end)"), widget=DatePicker, required=False
+    qa_museum_entry_date = DateField(
+        label=_("Museum entry date (exact or start)"), required=False
     )
+    qa_museum_entry_date_end = DateField(label=_("Museum entry date (end)"), required=False)
     qa_museum_donor = forms.IntegerField(
         label=_("Donor, testator or vendor"),
         widget=widgets.JQueryAutoComplete(
@@ -1137,12 +1125,8 @@ class QAFindFormMulti(QAForm):
     )
 
     qa_checked_type = forms.ChoiceField(label=_("Check"), required=False)
-    qa_check_date = forms.DateField(
-        label=_("Check date"), widget=DatePicker, required=False
-    )
-    qa_appraisal_date = forms.DateField(
-        label=_("Appraisal date"), widget=DatePicker, required=False
-    )
+    qa_check_date = DateField(label=_("Check date"), required=False)
+    qa_appraisal_date = DateField(label=_("Appraisal date"), required=False)
     qa_insurance_value = forms.FloatField(label=_("Insurance value"), required=False)
 
     qa_period = widgets.Select2MultipleField(
@@ -1524,9 +1508,7 @@ class PreservationForm(CustomForm, ManageOldType):
     )
     estimated_value = FloatField(label=_("Estimated value"), required=False)
     insurance_value = FloatField(label=_("Insurance value"), required=False)
-    appraisal_date = forms.DateField(
-        label=_("Appraisal date"), widget=DatePicker, required=False
-    )
+    appraisal_date = DateField(label=_("Appraisal date"), required=False)
     conservatory_comment = forms.CharField(
         label=_("Conservatory comment"), required=False, widget=forms.Textarea
     )
@@ -1819,12 +1801,8 @@ class FindSelect(GeoItemSelect, PeriodSelect):
 
     description = forms.CharField(label=_("Description"))
     base_finds__comment = forms.CharField(label=_("Base find - Comment on the circumstances of discovery"))
-    base_finds__discovery_date = forms.DateField(
-        label=_("Discovery date (exact or beginning)"), widget=DatePicker
-    )
-    base_finds__discovery_date_taq = forms.DateField(
-        label=_("Discovery date (end)"), widget=DatePicker
-    )
+    base_finds__discovery_date = DateField(label=_("Discovery date (exact or beginning)"))
+    base_finds__discovery_date_taq = DateField(label=_("Discovery date (end)"))
     base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[])
     is_complete = forms.NullBooleanField(label=_("Is complete?"))
     material_types = forms.IntegerField(
@@ -1911,7 +1889,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
         label=_("Point of topographic reference"),
     )
     checked_type = forms.ChoiceField(label=_("Check"))
-    check_date = forms.DateField(label=_("Check date"), widget=DatePicker)
+    check_date = DateField(label=_("Check date"))
     integrities = forms.ChoiceField(label=_("Integrity"), choices=[])
     remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[])
     conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[])
@@ -1925,15 +1903,11 @@ class FindSelect(GeoItemSelect, PeriodSelect):
 
     estimated_value = FloatField(label=_("Estimated value"))
     insurance_value = FloatField(label=_("Insurance value"))
-    appraisal_date = forms.DateField(label=_("Appraisal date"), widget=DatePicker)
+    appraisal_date = DateField(label=_("Appraisal date"))
 
     loan = forms.NullBooleanField(label=_("Loan?"))
-    treatments_file_end_date = forms.DateField(
-        label=_("Treatment file end date"), widget=DatePicker
-    )
-    treatments_end_date = forms.DateField(
-        label=_("Treatment end date"), widget=DatePicker
-    )
+    treatments_file_end_date = DateField(label=_("Treatment file end date"))
+    treatments_end_date = DateField(label=_("Treatment end date"))
     # museum
     museum_id_comment = forms.CharField(label=_("Museum - Comment on museum ID"))
     museum_owner_institution = forms.IntegerField(
@@ -1957,12 +1931,8 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     museum_depositor_inventory_number = forms.CharField(label=_("Museum - Depositor inventory number"))
     museum_collection_entry_mode = forms.ChoiceField(label=_("Museum - Collections entry mode"), choices=[])
     museum_entry_mode_comment = forms.CharField(label=_("Museum - Comment on museum entry mode"))
-    museum_entry_date = forms.DateField(
-        label=_("Museum - Entry date (exact or start)"), widget=DatePicker
-    )
-    museum_entry_date_end = forms.DateField(
-        label=_("Museum - Entry date end"), widget=DatePicker
-    )
+    museum_entry_date = DateField(label=_("Museum - Entry date (exact or start)"))
+    museum_entry_date_end = DateField(label=_("Museum - Entry date end"))
     museum_entry_date_comment = forms.CharField(label=_("Museum - Comment on entry date"))
     museum_donor = forms.IntegerField(
         label=_("Museum - Donor, testator or vendor"),
@@ -1996,12 +1966,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     museum_original_repro = forms.ChoiceField(
         label=_("Museum - Original/reproduction"), choices=[]
     )
-    museum_allocation_date_before = forms.DateField(
-        label=_("Museum - Date of allocation - before"), widget=DatePicker
-    )
-    museum_allocation_date_after = forms.DateField(
-        label=_("Museum - Date of allocation - after"), widget=DatePicker
-    )
+    museum_allocation_date = DateField(label=_("Museum - Date of allocation"))
     museum_purchase_price = forms.CharField(label=_("Museum - Purchase price"))
 
     TYPES = PeriodSelect.TYPES + [
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index a717b905d..011dc2d30 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -21,6 +21,7 @@ import datetime
 import logging
 from collections import OrderedDict
 
+from bootstrap_datepicker.widgets import DateField
 from django import forms
 from django.core import validators
 from ishtar_common.utils import ugettext_lazy as _
@@ -30,7 +31,6 @@ from archaeological_operations.forms import AdministrativeActForm, \
     AdministrativeActOpeFormSelection, AdministrativeActModifForm
 from archaeological_operations.models import ActType, AdministrativeAct
 from archaeological_warehouse.models import Warehouse, Container
-from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common import widgets
 from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \
     ManageOldType, CustomForm, FieldType, IshtarForm, \
@@ -177,10 +177,9 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
         label=_("Other ref."), max_length=200, required=False)
     # external_id = forms.CharField(
     #     label=_("External ref."), max_length=200, required=False)
-    start_date = forms.DateField(label=_("Start date"), required=False,
-                                 widget=DatePicker, initial=datetime.date.today)
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
+    start_date = DateField(label=_("Start date"), required=False,
+                           initial=datetime.date.today)
+    end_date = DateField(label=_("Closing date"), required=False)
     container = forms.IntegerField(
         label=_("Destination container (relevant for treatment that change "
                 "location)"),
@@ -427,8 +426,7 @@ class QAFindTreatmentForm(IshtarForm):
         label=_("Year"), initial=lambda: datetime.datetime.now().year,
         validators=[validators.MinValueValidator(1000),
                     validators.MaxValueValidator(2100)], required=False)
-    start_date = forms.DateField(label=_("Precise date"), required=False,
-                                 widget=DatePicker)
+    start_date = DateField(label=_("Precise date"), required=False)
     person = forms.IntegerField(
         label=_("Responsible"),
         widget=widgets.JQueryAutoComplete(
@@ -569,10 +567,8 @@ class AdministrativeActTreatmentSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = forms.DateField(
-        label=_("Signature date after"), widget=DatePicker)
-    signature_date_before = forms.DateField(
-        label=_("Signature date before"), widget=DatePicker)
+    signature_date_after = DateField(label=_("Signature date after"))
+    signature_date_before = DateField(label=_("Signature date before"))
     treatment__name = forms.CharField(
         label=_("Treatment name"), max_length=200)
     treatment__year = forms.IntegerField(label=_("Treatment year"))
@@ -664,10 +660,9 @@ class TreatmentFileSelect(DocumentItemSelect):
             associated_model=Organization),
         validators=[valid_id(Organization)])
 
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
-    exhibition_start = forms.DateField(label=_("Exhibition start date"), widget=DatePicker)
-    exhibition_end = forms.DateField(label=_("Exhibition end date"), widget=DatePicker)
+    end_date = DateField(label=_("Closing date"), required=False)
+    exhibition_start = DateField(label=_("Exhibition start date"))
+    exhibition_end = DateField(label=_("Exhibition end date"))
 
     def __init__(self, *args, **kwargs):
         super(TreatmentFileSelect, self).__init__(*args, **kwargs)
@@ -748,20 +743,17 @@ class TreatmentFileForm(CustomForm, ManageOldType):
             associated_model=models.FindBasket), required=False)
     exhibition_name = forms.CharField(label=_("Exhibition name"),
                                       max_length=200, required=False)
-    exhibition_start_date = forms.DateField(
-        label=_("Exhibition start date"), required=False, widget=DatePicker)
-    exhibition_end_date = forms.DateField(
-        label=_("Exhibition end date"), required=False, widget=DatePicker)
+    exhibition_start_date = DateField(label=_("Exhibition start date"), required=False)
+    exhibition_end_date = DateField(label=_("Exhibition end date"), required=False)
     comment = forms.CharField(label=_("Comment"),
                               widget=forms.Textarea, required=False)
-    reception_date = forms.DateField(
-        label=_("Reception date"), required=False, widget=DatePicker,
-        initial=lambda: datetime.datetime.now())
-    creation_date = forms.DateField(label=_("Start date"), required=False,
-                                    widget=DatePicker,
-                                    initial=lambda: datetime.datetime.now())
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
+    reception_date = DateField(
+        label=_("Reception date"), required=False,
+        initial=lambda: datetime.datetime.now()
+    )
+    creation_date = DateField(label=_("Start date"), required=False,
+                              initial=lambda: datetime.datetime.now())
+    end_date = DateField(label=_("Closing date"), required=False)
 
     TYPES = [
         FieldType('type', models.TreatmentFileType),
@@ -834,10 +826,8 @@ class AdministrativeActTreatmentFileSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = forms.DateField(
-        label=_("Signature date after"), widget=DatePicker)
-    signature_date_before = forms.DateField(
-        label=_("Signature date before"), widget=DatePicker)
+    signature_date_after = DateField(label=_("Signature date after"))
+    signature_date_before = DateField(label=_("Signature date before"))
 
     treatment_file__name = forms.CharField(
         label=_("Treatment request name"), max_length=200)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 79faecb0d..52ac8d581 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1775,7 +1775,7 @@ class Find(
             pgettext_lazy("key for text search", "museum-original-repro"),
             "museum_original_repro__label__iexact",
             related_name="museum_original_repro"
-    ),
+        ),
         "museum_allocation_date": SearchAltName(
             pgettext_lazy("key for text search", "museum-allocation-date"),
             "museum_allocation_date"