Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

3 files changed, 37 insertions, 35 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index cf241aa18..4890eb5d6 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -116,6 +116,8 @@ class FileFormResearchAddress(forms.Form):
     form_label = _(u"Address")
     base_models = ['town', 'department']
     associated_models = {'town': Town, 'department': Department}
+    name = forms.CharField(label=_(u"Project name"), required=False,
+                           max_length=100)
     town = widgets.MultipleAutocompleteField(
         model=Town, label=_("Towns"), required=False)
     department = widgets.MultipleAutocompleteField(
@@ -343,7 +345,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
 
 
 class FileFormPlanningService(forms.Form):
-    form_label = _(u"Town planning service")
+    form_label = _(u"Planning service")
     associated_models = {'responsible_town_planning_service': models.Person,
                          'planning_service': models.Organization}
 
diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot
index 5c3d03a37..24d70d743 100644
--- a/archaeological_files_pdl/locale/django.pot
+++ b/archaeological_files_pdl/locale/django.pot
@@ -2,122 +2,121 @@
 # Copyright (C) 2014
 # This file is distributed under the same license as the Ishtar package.
 # Étienne Loks <etienne.loks at peacefrogs net>, 2014.
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
 msgid ""
 msgstr ""
 
-#: forms.py:41
+#: forms.py:38
 msgid "General"
 msgstr ""
 
-#: forms.py:43
+#: forms.py:40
 msgid "File type"
 msgstr ""
 
-#: forms.py:44 forms.py:403
+#: forms.py:41 forms.py:415
 msgid "Year"
 msgstr ""
 
-#: forms.py:48
+#: forms.py:45
 msgid "Creation date"
 msgstr ""
 
-#: forms.py:51
+#: forms.py:48
 msgid "Reception date"
 msgstr ""
 
-#: forms.py:63
+#: forms.py:60
 msgid "Reception date cannot be after today."
 msgstr ""
 
-#: forms.py:71
+#: forms.py:68
 msgid "Permit type"
 msgstr ""
 
-#: forms.py:73
+#: forms.py:70
 msgid "Saisine type"
 msgstr ""
 
-#: forms.py:87
+#: forms.py:84
 msgid "Planning"
 msgstr ""
 
-#: forms.py:90
+#: forms.py:87
 msgid "Planning name"
 msgstr ""
 
-#: forms.py:93 forms.py:123
+#: forms.py:90 forms.py:122
 #: templates/ishtar/wizard/wizard_preventiveplanning.html:31
 msgid "Towns"
 msgstr ""
 
-#: forms.py:95 forms.py:125
+#: forms.py:92 forms.py:124
 #: templates/ishtar/wizard/wizard_preventiveplanning.html:41
 msgid "Departments"
 msgstr ""
 
-#: forms.py:96 forms.py:126
+#: forms.py:93 forms.py:125
 msgid "Locality"
 msgstr ""
 
-#: forms.py:99 forms.py:129
+#: forms.py:96 forms.py:128
 msgid "Address (number/street)"
 msgstr ""
 
-#: forms.py:100 forms.py:130
+#: forms.py:97 forms.py:129
 msgid "Number/street"
 msgstr ""
 
-#: forms.py:102 forms.py:132
+#: forms.py:99 forms.py:131
 msgid "Postal code"
 msgstr ""
 
-#: forms.py:107
+#: forms.py:104
 msgid "Total surface (m2)"
 msgstr ""
 
-#: forms.py:112
+#: forms.py:109
 msgid "Total developed surface (m2)"
 msgstr ""
 
-#: forms.py:119
+#: forms.py:116
 msgid "Address"
 msgstr ""
 
-#: forms.py:233 forms.py:237 forms.py:267 forms.py:270
+#: forms.py:119
+msgid "Project name"
+msgstr ""
+
+#: forms.py:232 forms.py:236 forms.py:273 forms.py:276
 msgid "General contractor"
 msgstr ""
 
-#: forms.py:252 forms.py:364
+#: forms.py:254 forms.py:372
 msgid "In charge"
 msgstr ""
 
-#: forms.py:342
-msgid "Town planning service"
+#: forms.py:348 forms.py:355
+msgid "Planning service"
 msgstr ""
 
-#: forms.py:346
+#: forms.py:352
 msgid "File reference"
 msgstr ""
 
-#: forms.py:349
-msgid "Planning service"
-msgstr ""
-
-#: forms.py:383
+#: forms.py:395
 msgid "Person in charge"
 msgstr ""
 
-#: forms.py:395
+#: forms.py:407
 msgid "Related file"
 msgstr ""
 
-#: forms.py:399
+#: forms.py:411
 msgid "Comment"
 msgstr ""
 
-#: forms.py:406
+#: forms.py:418
 msgid "Numeric reference"
 msgstr ""
 
diff --git a/archaeological_files_pdl/wizards.py b/archaeological_files_pdl/wizards.py
index c64c70eab..1506b5d49 100644
--- a/archaeological_files_pdl/wizards.py
+++ b/archaeological_files_pdl/wizards.py
@@ -97,7 +97,8 @@ class FileWizard(BaseFileWizard):
                 towns = self.session_get_value(
                     parcel_step_key, 'town', multi=True) or []
                 for idx, parcel_number in enumerate(parcel_numbers):
-                    if not parcel_number:
+                    if not parcel_number or len(sections) <= idx \
+                            or len(towns) <= idx:
                         continue
                     parcels.append({
                         'town': towns[idx],