UI improvment for parcels management (refs #151)

1 files changed, 7 insertions, 5 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 741dfb2b7..72834d8f0 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -59,13 +59,13 @@ class ParcelForm(forms.Form):
     associated_models = {'parcel':models.Parcel, 'town':models.Town}
     town = forms.ChoiceField(label=_("Town"), choices=(), required=False,
                              validators=[valid_id(models.Town)])
+    year = forms.IntegerField(label=_("Year"), required=False,
+                           validators=[validators.MinValueValidator(1900),
+                                       validators.MaxValueValidator(2100)])
     section = forms.CharField(label=_(u"Section"), required=False,
                              validators=[validators.MaxLengthValidator(4)])
     parcel_number = forms.CharField(label=_(u"Parcel number"), required=False,
                              validators=[validators.MaxLengthValidator(6)])
-    year = forms.IntegerField(label=_("Year"), required=False,
-                           validators=[validators.MinValueValidator(1900),
-                                       validators.MaxValueValidator(2100)])
     def __init__(self, *args, **kwargs):
         towns = None
         if 'data' in kwargs and 'TOWNS' in kwargs['data']:
@@ -85,9 +85,11 @@ class ParcelForm(forms.Form):
         """Check required fields"""
         if any(self.errors):
             return
-        if not self.cleaned_data or DELETION_FIELD_NAME in self.cleaned_data \
-           and self.cleaned_data[DELETION_FIELD_NAME]:
+        if not self.cleaned_data or (DELETION_FIELD_NAME in self.cleaned_data \
+           and self.cleaned_data[DELETION_FIELD_NAME]):
             return
+        if not self.cleaned_data.get('parcel_number'):
+            return {}
         for key in ('town', 'parcel_number', 'section'):
             if not key in self.cleaned_data or not self.cleaned_data[key]:
                 raise forms.ValidationError(_(u"Town section and parcel number "