From b25b8aeb5c42c0dec3a8e1437133fa82b490a4ac Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Sun, 10 Jan 2016 18:46:19 +0100
Subject: Fix land planning service form (refs #2999)

---
 archaeological_files_pdl/forms.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'archaeological_files_pdl/forms.py')

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 3ae35d065..1a260541f 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -271,7 +271,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
         current_status = ''
         if 'data' in kwargs:
             # the order is important: PERSON can have an ORGA
-            for field in [self.ORGA_FIELD, self.PERSON_FIELD]:
+            for field in [self.PERSON_FIELD, self.ORGA_FIELD]:
                 current_item_key = (
                     (kwargs['prefix'] + '-')
                     if kwargs.get('prefix') else '') + field
@@ -331,6 +331,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
                     js_template='ishtar/blocks/JQueryNaturalPerson.js',
                     new=True),
                 validators=[valid_id(Person)])
+            self.fields.pop(self.ORGA_FIELD)
         """
         else:
             self.fields[self.ORGA_FIELD] = forms.IntegerField(
-- 
cgit v1.2.3