Merge branch 'develop' into develop-bootstrap

1 files changed, 20 insertions, 10 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 3964e83e2..ee5815506 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -25,6 +25,7 @@ import datetime
 from django import forms
 from django.conf import settings
 from django.core import validators
+from django.forms.formsets import formset_factory
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 
@@ -34,12 +35,13 @@ from ishtar_common.models import Person, Organization, \
 from archaeological_operations.models import ActType, AdministrativeAct, \
     OperationType
 import models
+
 from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \
-    ManageOldType
+    ManageOldType, CustomForm, FieldType
 from ishtar_common.forms_common import get_town_field
 from archaeological_operations.forms import AdministrativeActOpeForm, \
     AdministrativeActOpeFormSelection, \
-    ParcelField, SLICING, AdministrativeActModifForm
+    ParcelField, SLICING, AdministrativeActModifForm, ParcelForm, ParcelFormSet
 from ishtar_common import widgets
 
 
@@ -271,6 +273,13 @@ class FileFormGeneralRO(FileFormGeneral):
         return cleaned_data
 
 
+ParcelFormset = formset_factory(ParcelForm, can_delete=True,
+                                formset=ParcelFormSet)
+ParcelFormset.form_label = _(u"Parcels")
+ParcelFormset.form_admin_name = _("Archaeological file - 020 - Parcel")
+ParcelFormset.form_slug = "source-general"
+
+
 class FileFormPreventive(ManageOldType, forms.Form):
     form_label = _(u"Preventive informations")
     associated_models = {'general_contractor': Person,
@@ -329,8 +338,10 @@ class FileFormPreventive(ManageOldType, forms.Form):
         self.fields['permit_type'].help_text = models.PermitType.get_help()
 
 
-class FileFormResearch(ManageOldType, forms.Form):
+class FileFormResearch(CustomForm, ManageOldType, forms.Form):
     form_label = _("Research archaeology")
+    form_admin_name = _("Archaeological file - 045 - Research - General")
+    form_slug = "file-045-research-general"
     base_model = 'department'
     associated_models = {'scientist': Person,
                          'requested_operation_type': OperationType,
@@ -528,15 +539,14 @@ class AdministrativeActFileModifyFormSelection(
 
 
 class AdministrativeActFileForm(AdministrativeActOpeForm):
+    form_admin_name = _(u"Archaeological file - Administrative act - General")
+    form_slug = "file-adminact-general"
     act_type = forms.ChoiceField(label=_(u"Act type"), choices=[])
 
-    def __init__(self, *args, **kwargs):
-        super(AdministrativeActFileForm, self).__init__(*args, **kwargs)
-        self.fields['act_type'].choices = ActType.get_types(
-            initial=self.init_data.get('act_type'),
-            dct={'intented_to': 'F'})
-        self.fields['act_type'].help_text = ActType.get_help(
-            dct={'intented_to': 'F'})
+    TYPES = [
+        FieldType('act_type', ActType,
+                  extra_args={"dct": {'intented_to': 'F'}}),
+    ]
 
 
 class AdministrativeActFileModifForm(AdministrativeActModifForm,