Fix innapropriate parcel deletion

1 files changed, 14 insertions, 14 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index acce3835b..866700871 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -77,20 +77,6 @@ class ParcelForm(IshtarForm):
     public_domain = forms.BooleanField(label=_(u"Public domain"),
                                        initial=False, required=False)
 
-    def count_valid_fields(self, data):
-        if not data:
-            return 0
-        data = get_data_from_formset(data)
-        nb = len(data)
-        # remove last non relevant fields
-        for idx, vals in enumerate(reversed(data[:])):
-            if 'public_domain' in vals:
-                break
-            if 'section' in vals and 'parcel_number' in vals:
-                break
-            nb -= 1
-        return nb
-
     def __init__(self, *args, **kwargs):
         towns = None
         if 'data' in kwargs and 'TOWNS' in kwargs['data']:
@@ -106,6 +92,20 @@ class ParcelForm(IshtarForm):
         if towns:
             self.fields['town'].choices = towns
 
+    def count_valid_fields(self, data):
+        if not data:
+            return 0
+        data = get_data_from_formset(data)
+        nb = len(data)
+        # remove last non relevant fields
+        for idx, vals in enumerate(reversed(data[:])):
+            if 'public_domain' in vals:
+                break
+            if 'section' in vals and 'parcel_number' in vals:
+                break
+            nb -= 1
+        return nb
+
     def clean(self):
         """Check required fields"""
         if any(self.errors):