Modification of operation's admin act (refs #141)

4 files changed, 292 insertions, 235 deletions

diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index 1e23c9877..672f2e67a 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -1018,7 +1018,7 @@ file_closing_wizard = FileWizard([
 
 class FileAdministrativeActWizard(FileWizard):
     edit = False
-    def get_associated_file(self, request, storage, dct):
+    def get_associated_item(self, request, storage, dct):
         return self.get_current_object(request, storage)
 
     def done(self, request, storage, form_list, **kwargs):
@@ -1039,19 +1039,22 @@ class FileAdministrativeActWizard(FileWizard):
                     if key in associated_models and value:
                         value = associated_models[key].objects.get(pk=value)
                     dct[key] = value
-        associated_file = self.get_associated_file(request, storage, dct)
-        if not associated_file:
+        associated_item = self.get_associated_item(request, storage, dct)
+        if not associated_item:
             return self.render(request, storage, form)
-        dct['associated_file'] = associated_file
+        if isinstance(associated_item, models.File):
+            dct['associated_file'] = associated_item
+        elif isinstance(associated_item, models.Operation):
+            dct['operation'] = associated_item
         dct['history_modifier'] = request.user
         if self.edit:
             admact = self.get_current_object(request, storage)
             for k in dct:
                 if hasattr(admact, k):
                     setattr(admact, k, dct[k])
-            admact.save()
         else:
             admact = models.AdministrativeAct(**dct)
+        admact.save()
         res = render_to_response('wizard_done.html', {},
                                   context_instance=RequestContext(request))
         return res
@@ -1059,11 +1062,11 @@ class FileAdministrativeActWizard(FileWizard):
 class FileEditAdministrativeActWizard(FileAdministrativeActWizard):
     model = models.AdministrativeAct
     edit = True
-    def get_associated_file(self, request, storage, dct):
+    def get_associated_item(self, request, storage, dct):
         return self.get_current_object(request, storage).associated_file
 
 class AdministrativeActForm(forms.Form):
-    form_label = _("Administrative act")
+    form_label = _("General")
     associated_models = {'act_type':models.ActType,
                          'signatory':models.Person}
     act_type = forms.ChoiceField(label=_("Act type"),
@@ -1510,13 +1513,42 @@ operation_deletion_wizard = OperationDeletionWizard([
 class OperationAdministrativeActWizard(FileAdministrativeActWizard):
     model = models.Operation
 
-class OpeAdministrativeActForm(AdministrativeActForm):
-    form_label = _("Administrative act")
+class OperationEditAdministrativeActWizard(FileAdministrativeActWizard):
+    model = models.AdministrativeAct
+    edit = True
+    def get_associated_item(self, request, storage, dct):
+        return self.get_current_object(request, storage).operation
+
+class AdministrativeActOpeSelect(forms.Form):
+    operation__towns = forms.IntegerField(label=_(u"Town"),
+         widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \
+                     'autocomplete-town', associated_model=models.Town),
+         validators=[models.valid_id(models.Town)])
+    act_type = forms.ChoiceField(label=_("Act type"),
+                choices=models.ActType.get_types(dct={'intented_to':'O'}))
+
+class AdministrativeActOpeFormSelection(AdministrativeActFileFormSelection):
+    pk = forms.IntegerField(label="", required=False,
+       widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeact'),
+                       AdministrativeActOpeSelect(), models.AdministrativeAct),
+       validators=[models.valid_id(models.AdministrativeAct)])
+
+class AdministrativeActOpeForm(AdministrativeActForm):
+    form_label = _("General")
     act_type = forms.ChoiceField(label=_("Act type"),
                 choices=models.ActType.get_types(dct={'intented_to':'O'}))
 
 operation_administrativeact_wizard = OperationAdministrativeActWizard([
     ('selec-operation_administrativeact', OperationFormSelection),
-    ('administrativeact-operation_administrativeact', OpeAdministrativeActForm),
+    ('administrativeact-operation_administrativeact', AdministrativeActOpeForm),
     ('final-operation_administrativeact', FinalForm)],
      url_name='operation_administrativeact',)
+
+operation_administrativeact_modification_wizard = \
+    OperationEditAdministrativeActWizard([
+       ('selec-operation_administrativeact_modification',
+                                            AdministrativeActOpeFormSelection),
+       ('administrativeact-operation_administrativeact_modification',
+                                            AdministrativeActOpeForm),
+       ('final-operation_administrativeact_modification', FinalForm)],
+       url_name='operation_administrativeact_modification',)
diff --git a/ishtar/furnitures/menus.py b/ishtar/furnitures/menus.py
index 691b828f2..26028db8a 100644
--- a/ishtar/furnitures/menus.py
+++ b/ishtar/furnitures/menus.py
@@ -111,6 +111,10 @@ class Menu:
                          _(u"Add an administrative act"),
                   model=models.Operation,
                   access_controls=['change_operation', 'change_own_operation']),
+                MenuItem('operation_administrativeact_modification',
+                         _(u"Modify an administrative act"),
+                  model=models.AdministrativeAct,
+                  access_controls=['change_operation', 'change_own_operation']),
             ]),
         ]
         self.items = {}
diff --git a/ishtar/furnitures/urls.py b/ishtar/furnitures/urls.py
index d9aa095ca..de3a24799 100644
--- a/ishtar/furnitures/urls.py
+++ b/ishtar/furnitures/urls.py
@@ -54,6 +54,9 @@ urlpatterns = patterns('',
          url(BASE_URL + r'operation_administrativeact/(?P<step>.+)$',
      ishtar_forms.operation_administrativeact_wizard,
                name='operation_administrativeact'),
+       url(BASE_URL + r'operation_administrativeact_modification/(?P<step>.+)$',
+     ishtar_forms.operation_administrativeact_modification_wizard,
+                               name='operation_administrativeact_modification'),
          )
 for section in menu.childs:
     for menu_item in section.childs:
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index f3c961c99..dc4a7dc33 100644
--- a/ishtar/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-10 23:57+0100\n"
+"POT-Creation-Date: 2011-02-11 14:25+0100\n"
 "PO-Revision-Date: 2010-12-09\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -28,276 +28,284 @@ msgstr "identifiant"
 msgid "email address"
 msgstr "courriel"
 
-#: furnitures/context_processors.py:42 furnitures/forms.py:696
-#: furnitures/forms.py:1236 furnitures/models.py:618 furnitures/models.py:640
+#: furnitures/context_processors.py:42 furnitures/forms.py:714
+#: furnitures/forms.py:1286 furnitures/models.py:645 furnitures/models.py:671
 msgid "Archaelogical file"
 msgstr "Dossier archéologique"
 
-#: furnitures/context_processors.py:43 furnitures/forms.py:1202
-#: furnitures/models.py:394 furnitures/models.py:423 furnitures/models.py:619
-#: furnitures/models.py:638
+#: furnitures/context_processors.py:43 furnitures/forms.py:1252
+#: furnitures/models.py:395 furnitures/models.py:424 furnitures/models.py:646
+#: furnitures/models.py:669
 msgid "Operation"
 msgstr "Opération"
 
-#: furnitures/forms.py:52 furnitures/forms.py:597
+#: furnitures/forms.py:65
+msgid "There are identical items."
+msgstr "Il y a des éléments identiques."
+
+#: furnitures/forms.py:70 furnitures/forms.py:615
 msgid "Confirm"
 msgstr "Confirmation"
 
-#: furnitures/forms.py:153
+#: furnitures/forms.py:171
 msgid "Yes"
 msgstr "Oui"
 
-#: furnitures/forms.py:155
+#: furnitures/forms.py:173
 msgid "No"
 msgstr "Non"
 
-#: furnitures/forms.py:424
+#: furnitures/forms.py:442
 msgid "Enter a valid name consisting of letters, spaces and hyphens."
 msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
 
-#: furnitures/forms.py:430 furnitures/forms.py:433 furnitures/models.py:221
-#: furnitures/models.py:240 furnitures/models.py:734 furnitures/models.py:758
-#: furnitures/models.py:773
+#: furnitures/forms.py:448 furnitures/forms.py:451 furnitures/models.py:221
+#: furnitures/models.py:240 furnitures/models.py:767 furnitures/models.py:791
+#: furnitures/models.py:806
 msgid "Person"
 msgstr "Individu"
 
-#: furnitures/forms.py:439
+#: furnitures/forms.py:457
 msgid "Identity"
 msgstr "Identité"
 
-#: furnitures/forms.py:442 furnitures/models.py:208 furnitures/models.py:507
+#: furnitures/forms.py:460 furnitures/models.py:208 furnitures/models.py:534
 msgid "Title"
 msgstr "Titre"
 
-#: furnitures/forms.py:443 furnitures/models.py:209
+#: furnitures/forms.py:461 furnitures/models.py:209
 msgid "Surname"
 msgstr "Prénom"
 
-#: furnitures/forms.py:445 furnitures/models.py:180 furnitures/models.py:210
-#: furnitures/models.py:597 furnitures/models.py:699
+#: furnitures/forms.py:463 furnitures/models.py:180 furnitures/models.py:210
+#: furnitures/models.py:624 furnitures/models.py:732
 msgid "Name"
 msgstr "Nom"
 
-#: furnitures/forms.py:447 furnitures/forms.py:562 furnitures/models.py:211
+#: furnitures/forms.py:465 furnitures/forms.py:580 furnitures/models.py:211
 msgid "Email"
 msgstr "Courriel"
 
-#: furnitures/forms.py:449 furnitures/models.py:199
+#: furnitures/forms.py:467 furnitures/models.py:199
 msgid "Person type"
 msgstr "Type d'individu"
 
-#: furnitures/forms.py:451
+#: furnitures/forms.py:469
 msgid "Current organization"
 msgstr "Organisation actuelle"
 
-#: furnitures/forms.py:455 furnitures/models.py:215
+#: furnitures/forms.py:473 furnitures/models.py:215
 msgid "Is an author?"
 msgstr "Est un auteur ?"
 
-#: furnitures/forms.py:458 furnitures/models.py:217
+#: furnitures/forms.py:476 furnitures/models.py:217
 msgid "In charge of a storage?"
 msgstr "Est responsable d'un dépôt ?"
 
-#: furnitures/forms.py:480 furnitures/forms.py:564
+#: furnitures/forms.py:498 furnitures/forms.py:582
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: furnitures/forms.py:534
+#: furnitures/forms.py:552
 #, python-format
 msgid "[%(app_name)s] Account creation/modification"
 msgstr "[%(app_name)s] Création - modification du compte"
 
-#: furnitures/forms.py:557 furnitures/forms.py:561
+#: furnitures/forms.py:575 furnitures/forms.py:579
 msgid "Account"
 msgstr "Compte"
 
-#: furnitures/forms.py:568
+#: furnitures/forms.py:586
 msgid "New password (confirmation)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: furnitures/forms.py:586
+#: furnitures/forms.py:604
 msgid "Your password and confirmation password do not match."
 msgstr "La vérification du mot de passe a échoué."
 
-#: furnitures/forms.py:591
+#: furnitures/forms.py:609
 msgid "You must provide a correct password."
 msgstr "Vous devez fournir un mot de passe correct."
 
-#: furnitures/forms.py:598
+#: furnitures/forms.py:616
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: furnitures/forms.py:685 furnitures/forms.py:774 furnitures/forms.py:802
-#: furnitures/forms.py:1191 furnitures/forms.py:1301 furnitures/models.py:163
-#: furnitures/models.py:426 furnitures/models.py:713
+#: furnitures/forms.py:703 furnitures/forms.py:792 furnitures/forms.py:820
+#: furnitures/forms.py:1083 furnitures/forms.py:1241 furnitures/forms.py:1351
+#: furnitures/models.py:163 furnitures/models.py:427 furnitures/models.py:746
 msgid "Town"
 msgstr "Commune"
 
-#: furnitures/forms.py:689 furnitures/forms.py:741 furnitures/models.py:281
+#: furnitures/forms.py:707 furnitures/forms.py:759 furnitures/models.py:281
 msgid "File type"
 msgstr "Type de dossier"
 
-#: furnitures/forms.py:691 furnitures/forms.py:892
+#: furnitures/forms.py:709 furnitures/forms.py:895
 #: templates/wizard_file_sheet.html:48
 msgid "Saisine type"
 msgstr "Type de saisine"
 
-#: furnitures/forms.py:693 furnitures/forms.py:731 furnitures/forms.py:751
-#: furnitures/forms.py:808 furnitures/forms.py:1199 furnitures/forms.py:1244
-#: furnitures/models.py:276 furnitures/models.py:367 furnitures/models.py:424
+#: furnitures/forms.py:711 furnitures/forms.py:749 furnitures/forms.py:769
+#: furnitures/forms.py:826 furnitures/forms.py:1249 furnitures/forms.py:1294
+#: furnitures/models.py:276 furnitures/models.py:367 furnitures/models.py:425
 #: templates/wizard_file_sheet.html:6
 msgid "Year"
 msgstr "Année"
 
-#: furnitures/forms.py:707
+#: furnitures/forms.py:725
 msgid "You should select a file."
 msgstr "Vous devez sélectionner un dossier archéologique."
 
-#: furnitures/forms.py:722 furnitures/forms.py:1224
+#: furnitures/forms.py:740 furnitures/forms.py:1274
 msgid "General"
 msgstr "Général"
 
-#: furnitures/forms.py:726 furnitures/models.py:283 furnitures/models.py:601
+#: furnitures/forms.py:744 furnitures/models.py:283 furnitures/models.py:628
 msgid "Person in charge"
 msgstr "Responsable"
 
-#: furnitures/forms.py:735 furnitures/forms.py:753 furnitures/models.py:278
+#: furnitures/forms.py:753 furnitures/forms.py:771 furnitures/models.py:278
 msgid "Numeric reference"
 msgstr "Référence numérique"
 
-#: furnitures/forms.py:737 furnitures/forms.py:755 furnitures/models.py:279
+#: furnitures/forms.py:755 furnitures/forms.py:773 furnitures/models.py:279
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: furnitures/forms.py:739 furnitures/models.py:294
+#: furnitures/forms.py:757 furnitures/models.py:294
 #: templates/wizard_file_sheet.html:13
 msgid "Creation date"
 msgstr "Date de création"
 
-#: furnitures/forms.py:743 furnitures/models.py:298
+#: furnitures/forms.py:761 furnitures/models.py:298
 #: templates/wizard_file_sheet.html:30
 msgid "Related file"
 msgstr "Dossier en relation avec"
 
-#: furnitures/forms.py:747 furnitures/forms.py:1248 furnitures/models.py:110
-#: furnitures/models.py:313 furnitures/models.py:390 furnitures/models.py:602
-#: furnitures/models.py:677
+#: furnitures/forms.py:765 furnitures/forms.py:1298 furnitures/models.py:110
+#: furnitures/models.py:313 furnitures/models.py:391 furnitures/models.py:629
+#: furnitures/models.py:710
 msgid "Comment"
 msgstr "Commentaire"
 
-#: furnitures/forms.py:759 furnitures/models.py:158
+#: furnitures/forms.py:777 furnitures/models.py:158
 msgid "Address"
 msgstr "Adresse"
 
-#: furnitures/forms.py:761 furnitures/models.py:305
+#: furnitures/forms.py:779 furnitures/models.py:305
 msgid "Total surface"
 msgstr "Surface totale"
 
-#: furnitures/forms.py:764 furnitures/models.py:308
+#: furnitures/forms.py:782 furnitures/models.py:308
 msgid "Main address"
 msgstr "Adresse principale"
 
-#: furnitures/forms.py:765 furnitures/models.py:309
+#: furnitures/forms.py:783 furnitures/models.py:309
 msgid "Main address - complement"
 msgstr "Adresse principale - complément"
 
-#: furnitures/forms.py:767 furnitures/models.py:311
+#: furnitures/forms.py:785 furnitures/models.py:311
 msgid "Main address - postal code"
 msgstr "Adresse principale - code postal"
 
-#: furnitures/forms.py:771 furnitures/forms.py:797 furnitures/forms.py:1299
-#: furnitures/forms.py:1320 furnitures/forms.py:1324 furnitures/models.py:293
-#: furnitures/models.py:374 furnitures/models.py:714
+#: furnitures/forms.py:789 furnitures/forms.py:815 furnitures/forms.py:1349
+#: furnitures/forms.py:1370 furnitures/forms.py:1374 furnitures/models.py:293
+#: furnitures/models.py:374 furnitures/models.py:747
 msgid "Towns"
 msgstr "Communes"
 
-#: furnitures/forms.py:793
+#: furnitures/forms.py:811
 msgid "There are identical towns."
 msgstr "Il y a des communes identiques."
 
-#: furnitures/forms.py:800 furnitures/forms.py:862 furnitures/forms.py:1327
-#: furnitures/forms.py:1348 furnitures/forms.py:1352 furnitures/models.py:432
+#: furnitures/forms.py:818 furnitures/forms.py:865 furnitures/forms.py:1377
+#: furnitures/forms.py:1398 furnitures/forms.py:1402 furnitures/models.py:433
 msgid "Parcels"
 msgstr "Parcelles"
 
-#: furnitures/forms.py:804 furnitures/models.py:427
+#: furnitures/forms.py:822 furnitures/models.py:428
 msgid "Section"
 msgstr "Section"
 
-#: furnitures/forms.py:806 furnitures/models.py:428
+#: furnitures/forms.py:824 furnitures/models.py:429
 msgid "Parcel number"
 msgstr "Numéro de parcelle"
 
-#: furnitures/forms.py:836
+#: furnitures/forms.py:854
 msgid "All fields are required"
 msgstr "Tous les champs sont nécessaires"
 
-#: furnitures/forms.py:857
-msgid "There are identical parcels."
-msgstr "Il y a des parcelles identiques."
-
-#: furnitures/forms.py:865
+#: furnitures/forms.py:868
 msgid "Preventive informations"
 msgstr "Information archéologie préventive"
 
-#: furnitures/forms.py:870 furnitures/models.py:285
+#: furnitures/forms.py:873 furnitures/models.py:285
 msgid "General contractor"
 msgstr "Aménageur"
 
-#: furnitures/forms.py:877 furnitures/models.py:287
+#: furnitures/forms.py:880 furnitures/models.py:287
 msgid "Town planning service"
 msgstr "Service instructeur"
 
-#: furnitures/forms.py:883 furnitures/models.py:263 furnitures/models.py:288
+#: furnitures/forms.py:886 furnitures/models.py:263 furnitures/models.py:288
 #: templates/wizard_file_sheet.html:50
 msgid "Permit type"
 msgstr "Type de permis"
 
-#: furnitures/forms.py:885 furnitures/models.py:290
+#: furnitures/forms.py:888 furnitures/models.py:290
 #: templates/wizard_file_sheet.html:51
 msgid "Permit reference"
 msgstr "Référence du permis"
 
-#: furnitures/forms.py:888 furnitures/models.py:306
+#: furnitures/forms.py:891 furnitures/models.py:306
 msgid "Total developed surface"
 msgstr "Surface totale aménagée"
 
-#: furnitures/forms.py:894 furnitures/models.py:296
+#: furnitures/forms.py:897 furnitures/models.py:296
 #: templates/wizard_file_sheet.html:12
 msgid "Reception date"
 msgstr "Date de réception"
 
-#: furnitures/forms.py:983 templates/wizard_file_sheet.html:81
+#: furnitures/forms.py:986 templates/wizard_file_sheet.html:81
 msgid "Associated operations"
 msgstr "Opérations associées"
 
-#: furnitures/forms.py:1002
+#: furnitures/forms.py:1005
 msgid "Would you like to delete this archaelogical file ?"
 msgstr "Voulez vous supprimer ce dossier archéologique ?"
 
-#: furnitures/forms.py:1051 furnitures/forms.py:1460 furnitures/models.py:648
-#: furnitures/models.py:772
+#: furnitures/forms.py:1066 furnitures/forms.py:1514 furnitures/models.py:679
+#: furnitures/models.py:805
 msgid "Administrative act"
 msgstr "Acte administratif"
 
-#: furnitures/forms.py:1052 furnitures/forms.py:1461 furnitures/models.py:624
-#: furnitures/models.py:628
+#: furnitures/forms.py:1069 furnitures/forms.py:1087 furnitures/forms.py:1515
+#: furnitures/models.py:651 furnitures/models.py:659
 msgid "Act type"
 msgstr "Type d'acte"
 
-#: furnitures/forms.py:1054 furnitures/models.py:636
+#: furnitures/forms.py:1071 furnitures/models.py:667
 msgid "Signatory"
 msgstr "Signataire"
 
-#: furnitures/forms.py:1058 furnitures/models.py:642
+#: furnitures/forms.py:1075 furnitures/models.py:673
 msgid "Object"
 msgstr "Objet"
 
-#: furnitures/forms.py:1060 furnitures/models.py:641
+#: furnitures/forms.py:1077 furnitures/models.py:672
 msgid "Signature date"
 msgstr "Date de signature"
 
-#: furnitures/forms.py:1185
+#: furnitures/forms.py:1091
+msgid "Administrative Act"
+msgstr "Acte administratif"
+
+#: furnitures/forms.py:1102
+msgid "You should select an administrative act."
+msgstr "Vous devez sélectionner un acte administratif."
+
+#: furnitures/forms.py:1235
 msgid ""
 "Warning: No Archaelogical File is provided. If you have forget it return to "
 "the first step."
@@ -305,38 +313,38 @@ msgstr ""
 "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un "
 "oubli, définissez le à la première étape."
 
-#: furnitures/forms.py:1195 furnitures/forms.py:1240 furnitures/models.py:343
+#: furnitures/forms.py:1245 furnitures/forms.py:1290 furnitures/models.py:343
 #: furnitures/models.py:372
 msgid "Operation type"
 msgstr "Type d'opération"
 
-#: furnitures/forms.py:1197 furnitures/models.py:373
+#: furnitures/forms.py:1247 furnitures/models.py:373
 msgid "Remains"
 msgstr "Vestiges"
 
-#: furnitures/forms.py:1213
+#: furnitures/forms.py:1263
 msgid "You should select an operation."
 msgstr "Vous devez sélectionner une opération."
 
-#: furnitures/forms.py:1229 furnitures/models.py:630
+#: furnitures/forms.py:1279 furnitures/models.py:661
 msgid "Person in charge of the operation"
 msgstr "Responsable d'opération"
 
-#: furnitures/forms.py:1242 furnitures/models.py:363 furnitures/models.py:441
-#: furnitures/models.py:465 furnitures/models.py:581 furnitures/models.py:735
-#: furnitures/models.py:774
+#: furnitures/forms.py:1292 furnitures/models.py:363 furnitures/models.py:442
+#: furnitures/models.py:492 furnitures/models.py:608 furnitures/models.py:768
+#: furnitures/models.py:807
 msgid "Start date"
 msgstr "Date de début"
 
-#: furnitures/forms.py:1252
+#: furnitures/forms.py:1302
 msgid "References"
 msgstr "Référence"
 
-#: furnitures/forms.py:1259 furnitures/models.py:368
+#: furnitures/forms.py:1309 furnitures/models.py:368
 msgid "Operation code"
 msgstr "Code de l'opération"
 
-#: furnitures/forms.py:1276
+#: furnitures/forms.py:1326
 #, python-format
 msgid ""
 "Operation code already exist for year: %(year)d - use a value bigger than "
@@ -345,44 +353,48 @@ msgstr ""
 "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
 "plus grande que %(last_val)d"
 
-#: furnitures/forms.py:1282
+#: furnitures/forms.py:1332
 msgid "Preventive informations - excavation"
 msgstr "Information archéologie préventive - fouille"
 
-#: furnitures/forms.py:1283 furnitures/models.py:375
+#: furnitures/forms.py:1333 furnitures/models.py:375
 msgid "Cost"
 msgstr "Coût"
 
-#: furnitures/forms.py:1291
+#: furnitures/forms.py:1341
 msgid "Preventive informations - diagnostic"
 msgstr "Information archéologie préventive - diagnostique"
 
-#: furnitures/forms.py:1329 furnitures/models.py:431 furnitures/models.py:475
-#: furnitures/models.py:580
+#: furnitures/forms.py:1379 furnitures/models.py:432 furnitures/models.py:502
+#: furnitures/models.py:607
 msgid "Parcel"
 msgstr "Parcelle"
 
-#: furnitures/forms.py:1355 furnitures/forms.py:1380 furnitures/models.py:358
+#: furnitures/forms.py:1405 furnitures/forms.py:1417 furnitures/models.py:358
 msgid "Remain types"
 msgstr "Types de vestige"
 
-#: furnitures/forms.py:1357 furnitures/models.py:357
+#: furnitures/forms.py:1407 furnitures/models.py:357
 msgid "Remain type"
 msgstr "Type de vestige"
 
-#: furnitures/forms.py:1375
-msgid "There are identical remain types."
-msgstr "Il y a des types de vestige identiques."
+#: furnitures/forms.py:1420 furnitures/forms.py:1432 furnitures/models.py:376
+msgid "Periods"
+msgstr "Périodes"
+
+#: furnitures/forms.py:1422 furnitures/models.py:491
+msgid "Period"
+msgstr "Période"
 
-#: furnitures/forms.py:1420 furnitures/forms.py:1421 furnitures/models.py:364
+#: furnitures/forms.py:1474 furnitures/forms.py:1475 furnitures/models.py:364
 msgid "Closing date"
 msgstr "Date de clotûre"
 
-#: furnitures/forms.py:1431
+#: furnitures/forms.py:1485
 msgid "Would you like to close this operation?"
 msgstr "Voulez vous clôturer cette opération ?"
 
-#: furnitures/forms.py:1449
+#: furnitures/forms.py:1503
 msgid "Would you like to delete this operation?"
 msgstr "Voulez vous supprimer cette opération ?"
 
@@ -418,27 +430,31 @@ msgstr "Modification de dossier"
 msgid "File deletion"
 msgstr "Suppression de dossier"
 
-#: furnitures/menus.py:88 furnitures/menus.py:107
+#: furnitures/menus.py:88 furnitures/menus.py:111
 msgid "Add an administrative act"
 msgstr "Ajouter un acte administratif"
 
 #: furnitures/menus.py:92
+msgid "Modify an administrative act"
+msgstr "Modifier un acte administratif"
+
+#: furnitures/menus.py:96
 msgid "Operation management"
 msgstr "Gestion des opérations"
 
-#: furnitures/menus.py:94
+#: furnitures/menus.py:98
 msgid "Operation creation"
 msgstr "Création de l'opération"
 
-#: furnitures/menus.py:97
+#: furnitures/menus.py:101
 msgid "Operation modification"
 msgstr "Modification de l'opération"
 
-#: furnitures/menus.py:100
+#: furnitures/menus.py:104
 msgid "Operation closing"
 msgstr "Clotûre de l'opération"
 
-#: furnitures/menus.py:103
+#: furnitures/menus.py:107
 msgid "Operation deletion"
 msgstr "Suppression de l'opération"
 
@@ -450,8 +466,8 @@ msgstr "Élément invalide."
 msgid "This item already exist."
 msgstr "Cet élément existe déjà."
 
-#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:476
-#: furnitures/models.py:527 furnitures/models.py:551
+#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:503
+#: furnitures/models.py:554 furnitures/models.py:578
 msgid "Label"
 msgstr "Libellé"
 
@@ -507,7 +523,7 @@ msgstr "Type d'organisation"
 msgid "Organization types"
 msgstr "Types d'organisation"
 
-#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:508
+#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:535
 #: templates/wizard_file_sheet.html:28
 msgid "Type"
 msgstr "Type"
@@ -640,7 +656,7 @@ msgstr "Peut changer son propre Dossier archéologique"
 msgid "Can delete own Archaelogical file"
 msgstr "Peut supprimer son propre Dossier archéologique"
 
-#: furnitures/models.py:328 furnitures/models.py:404
+#: furnitures/models.py:328 furnitures/models.py:405
 msgid "Intercommunal"
 msgstr "Intercommunal"
 
@@ -652,428 +668,424 @@ msgstr "Types d'opération"
 msgid "In charge"
 msgstr "Responsable"
 
-#: furnitures/models.py:370 furnitures/models.py:421
+#: furnitures/models.py:370 furnitures/models.py:422
 msgid "File"
 msgstr "Dossier"
 
-#: furnitures/models.py:384
+#: furnitures/models.py:385
 msgid "Prescription on zoning"
 msgstr "Prescription sur zonage"
 
-#: furnitures/models.py:387
+#: furnitures/models.py:388
 msgid "Prescription on large area"
 msgstr "Prescription sur une vaste surface"
 
-#: furnitures/models.py:389
+#: furnitures/models.py:390
 msgid "Prescription on geoarchaeological context"
 msgstr "Prescription sur un contexte géo-archéologique"
 
-#: furnitures/models.py:395
+#: furnitures/models.py:396
 msgid "Operations"
 msgstr "Opérations"
 
-#: furnitures/models.py:397
+#: furnitures/models.py:398
 msgid "Can view own Operation"
 msgstr "Peut voir sa propre Opération"
 
-#: furnitures/models.py:398
+#: furnitures/models.py:399
 msgid "Can add own Operation"
 msgstr "Peut ajouter sa propre Opération"
 
-#: furnitures/models.py:399
+#: furnitures/models.py:400
 msgid "Can change own Operation"
 msgstr "Peut changer sa propre Opération"
 
-#: furnitures/models.py:400
+#: furnitures/models.py:401
 msgid "Can delete own Operation"
 msgstr "Peut supprimer sa propre Opération"
 
-#: furnitures/models.py:440 furnitures/models.py:550
+#: furnitures/models.py:441 furnitures/models.py:577
 msgid "Order"
 msgstr "Ordre"
 
-#: furnitures/models.py:442 furnitures/models.py:466 furnitures/models.py:582
-#: furnitures/models.py:736 furnitures/models.py:775
+#: furnitures/models.py:443 furnitures/models.py:493 furnitures/models.py:609
+#: furnitures/models.py:769 furnitures/models.py:808
 msgid "End date"
 msgstr "Date de fin"
 
-#: furnitures/models.py:443
+#: furnitures/models.py:444
 msgid "Parent period"
 msgstr "Période parente"
 
-#: furnitures/models.py:447
+#: furnitures/models.py:448
 msgid "Type Period"
 msgstr "Type de période"
 
-#: furnitures/models.py:448
+#: furnitures/models.py:449
 msgid "Types Period"
 msgstr "Types de période"
 
-#: furnitures/models.py:455 furnitures/models.py:467
+#: furnitures/models.py:482 furnitures/models.py:494
 msgid "Dating type"
 msgstr "Type de datation"
 
-#: furnitures/models.py:456
+#: furnitures/models.py:483
 msgid "Dating types"
 msgstr "Types de datation"
 
-#: furnitures/models.py:460
+#: furnitures/models.py:487
 msgid "Dating quality"
 msgstr "Qualité de datation"
 
-#: furnitures/models.py:461
+#: furnitures/models.py:488
 msgid "Dating qualities"
 msgstr "Qualités de datation"
 
-#: furnitures/models.py:464
-msgid "Period"
-msgstr "Période"
-
-#: furnitures/models.py:468
+#: furnitures/models.py:495
 msgid "Quality"
 msgstr "Qualité"
 
-#: furnitures/models.py:471 furnitures/models.py:562
+#: furnitures/models.py:498 furnitures/models.py:589
 msgid "Dating"
 msgstr "Datation"
 
-#: furnitures/models.py:472
+#: furnitures/models.py:499
 msgid "Datings"
 msgstr "Datations"
 
-#: furnitures/models.py:477 furnitures/models.py:528 furnitures/models.py:552
+#: furnitures/models.py:504 furnitures/models.py:555 furnitures/models.py:579
 msgid "Description"
 msgstr "Description"
 
-#: furnitures/models.py:478 furnitures/models.py:661
+#: furnitures/models.py:505 furnitures/models.py:694
 msgid "Lenght"
 msgstr "Longueur"
 
-#: furnitures/models.py:479 furnitures/models.py:662
+#: furnitures/models.py:506 furnitures/models.py:695
 msgid "Width"
 msgstr "Largeur"
 
-#: furnitures/models.py:480
+#: furnitures/models.py:507
 msgid "Thickness"
 msgstr "Épaisseur"
 
-#: furnitures/models.py:481
+#: furnitures/models.py:508
 msgid "Depth"
 msgstr "Profondeur"
 
-#: furnitures/models.py:483
+#: furnitures/models.py:510
 msgid "Interpretation"
 msgstr "Interpretation"
 
-#: furnitures/models.py:484
+#: furnitures/models.py:511
 msgid "Filling"
 msgstr "Remplissage"
 
-#: furnitures/models.py:489 furnitures/models.py:530
+#: furnitures/models.py:516 furnitures/models.py:557
 msgid "Registration Unit"
 msgstr "Unité d'Enregistrement"
 
-#: furnitures/models.py:490
+#: furnitures/models.py:517
 msgid "Registration Units"
 msgstr "Unités d'Enregistrement"
 
-#: furnitures/models.py:492
+#: furnitures/models.py:519
 msgid "Can view own Registration Unit"
 msgstr "Peut voir sa propre Unité d'Enregistrement"
 
-#: furnitures/models.py:493
+#: furnitures/models.py:520
 msgid "Can add own Registration Unit"
 msgstr "Peut ajouter sa propre Unité d'Enregistrement"
 
-#: furnitures/models.py:494
+#: furnitures/models.py:521
 msgid "Can change own Registration Unit"
 msgstr "Peut changer sa propre Unité d'Enregistrement"
 
-#: furnitures/models.py:495
+#: furnitures/models.py:522
 msgid "Can delete own Registration Unit"
 msgstr "Peut supprimer sa propre Unité d'Enregistrement"
 
-#: furnitures/models.py:503
+#: furnitures/models.py:530
 msgid "Source type"
 msgstr "Type de source"
 
-#: furnitures/models.py:504
+#: furnitures/models.py:531
 msgid "Source types"
 msgstr "Types de source"
 
-#: furnitures/models.py:511 furnitures/models.py:759
+#: furnitures/models.py:538 furnitures/models.py:792
 msgid "Source"
 msgstr "Source"
 
-#: furnitures/models.py:512
+#: furnitures/models.py:539
 msgid "Sources"
 msgstr "Sources"
 
-#: furnitures/models.py:518
+#: furnitures/models.py:545
 msgid "Recommendation"
 msgstr "Recommendation"
 
-#: furnitures/models.py:520
+#: furnitures/models.py:547
 msgid "Parent material"
 msgstr "Matériau parent"
 
-#: furnitures/models.py:523 furnitures/models.py:554
+#: furnitures/models.py:550 furnitures/models.py:581
 msgid "Material type"
 msgstr "Type de matériaux"
 
-#: furnitures/models.py:524
+#: furnitures/models.py:551
 msgid "Material types"
 msgstr "Types de matériaux"
 
-#: furnitures/models.py:531
+#: furnitures/models.py:558
 msgid "Is isolated?"
 msgstr "Est isolé ?"
 
-#: furnitures/models.py:536 furnitures/models.py:549
+#: furnitures/models.py:563 furnitures/models.py:576
 msgid "Base item"
 msgstr "Élément de base"
 
-#: furnitures/models.py:537
+#: furnitures/models.py:564
 msgid "Base items"
 msgstr "Éléments de base"
 
-#: furnitures/models.py:539
+#: furnitures/models.py:566
 msgid "Can view own Base item"
 msgstr "Peut voir son propre Élément de base"
 
-#: furnitures/models.py:540
+#: furnitures/models.py:567
 msgid "Can add own Base item"
 msgstr "Peut ajouter son propre Élément de base"
 
-#: furnitures/models.py:541
+#: furnitures/models.py:568
 msgid "Can change own Base item"
 msgstr "Peut changer son propre Élément de base"
 
-#: furnitures/models.py:542
+#: furnitures/models.py:569
 msgid "Can delete own Base item"
 msgstr "Peut supprimer son propre Élément de base"
 
-#: furnitures/models.py:555 furnitures/models.py:664
+#: furnitures/models.py:582 furnitures/models.py:697
 msgid "Volume"
 msgstr "Volume"
 
-#: furnitures/models.py:556
+#: furnitures/models.py:583
 msgid "Weight"
 msgstr "Poids"
 
-#: furnitures/models.py:557
+#: furnitures/models.py:584
 msgid "Item number"
 msgstr "Nombre d'éléments"
 
-#: furnitures/models.py:559
+#: furnitures/models.py:586
 msgid "Upstream treatment"
 msgstr "Traitement amont"
 
-#: furnitures/models.py:561
+#: furnitures/models.py:588
 msgid "Downstream treatment"
 msgstr "Traitement aval"
 
-#: furnitures/models.py:566 furnitures/models.py:770
+#: furnitures/models.py:593 furnitures/models.py:803
 msgid "Item"
 msgstr "Élément"
 
-#: furnitures/models.py:567
+#: furnitures/models.py:594
 msgid "Items"
 msgstr "Éléments"
 
-#: furnitures/models.py:569
+#: furnitures/models.py:596
 msgid "Can view own Item"
 msgstr "Peut voir son propre Élément"
 
-#: furnitures/models.py:570
+#: furnitures/models.py:597
 msgid "Can add own Item"
 msgstr "Peut ajouter son propre Élément"
 
-#: furnitures/models.py:571
+#: furnitures/models.py:598
 msgid "Can change own Item"
 msgstr "Peut changer son propre Élément"
 
-#: furnitures/models.py:572
+#: furnitures/models.py:599
 msgid "Can delete own Item"
 msgstr "Peut supprimer son propre Élément"
 
-#: furnitures/models.py:579
+#: furnitures/models.py:606
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: furnitures/models.py:585
+#: furnitures/models.py:612
 msgid "Parcel owner"
 msgstr "Propriétaire de parcelle"
 
-#: furnitures/models.py:586
+#: furnitures/models.py:613
 msgid "Parcel owners"
 msgstr "Propriétaires de parcelle"
 
-#: furnitures/models.py:593 furnitures/models.py:599
+#: furnitures/models.py:620 furnitures/models.py:626
 msgid "Warehouse type"
 msgstr "Type de dépôt"
 
-#: furnitures/models.py:594
+#: furnitures/models.py:621
 msgid "Warehouse types"
 msgstr "Types de dépôts"
 
-#: furnitures/models.py:605
+#: furnitures/models.py:632
 msgid "Warehouse"
 msgstr "Dépôt"
 
-#: furnitures/models.py:606
+#: furnitures/models.py:633
 msgid "Warehouses"
 msgstr "Dépôts"
 
-#: furnitures/models.py:608
+#: furnitures/models.py:635
 msgid "Can view own Warehouse"
 msgstr "Peut voir son propre Dépôt"
 
-#: furnitures/models.py:609
+#: furnitures/models.py:636
 msgid "Can add own Warehouse"
 msgstr "Peut ajouter son propre Dépôt"
 
-#: furnitures/models.py:610
+#: furnitures/models.py:637
 msgid "Can change own Warehouse"
 msgstr "Peut changer son propre Dépôt"
 
-#: furnitures/models.py:611
+#: furnitures/models.py:638
 msgid "Can delete own Warehouse"
 msgstr "Peut supprimer son propre Dépôt"
 
-#: furnitures/models.py:621
+#: furnitures/models.py:648
 msgid "Intended to"
 msgstr "Destiné à"
 
-#: furnitures/models.py:625
+#: furnitures/models.py:652
 msgid "Act types"
 msgstr "Types d'acte"
 
-#: furnitures/models.py:632
+#: furnitures/models.py:663
 msgid "Archaeological preventive operator"
 msgstr "Opérateur d'archéologie préventive"
 
-#: furnitures/models.py:634
+#: furnitures/models.py:665
 msgid "Person in charge of the scientific part"
 msgstr "Responsable scientifique"
 
-#: furnitures/models.py:649
+#: furnitures/models.py:680
 msgid "Administrative acts"
 msgstr "Actes administratifs"
 
-#: furnitures/models.py:651
+#: furnitures/models.py:682
 msgid "Can view own Administrative act"
 msgstr "Peut voir son propre Acte administratif"
 
-#: furnitures/models.py:652
+#: furnitures/models.py:683
 msgid "Can add own Administrative act"
 msgstr "Peut ajouter son propre Acte administratif"
 
-#: furnitures/models.py:653
+#: furnitures/models.py:684
 msgid "Can change own Administrative act"
 msgstr "Peut changer son propre Acte administratif"
 
-#: furnitures/models.py:654
+#: furnitures/models.py:685
 msgid "Can delete own Administrative act"
 msgstr "Peut supprimer son propre Acte administratif"
 
-#: furnitures/models.py:663
+#: furnitures/models.py:696
 msgid "Height"
 msgstr "Hauteur"
 
-#: furnitures/models.py:665 furnitures/models.py:672 furnitures/models.py:676
+#: furnitures/models.py:698 furnitures/models.py:705 furnitures/models.py:709
 msgid "Reference"
 msgstr "Référence"
 
-#: furnitures/models.py:668 furnitures/models.py:675
+#: furnitures/models.py:701 furnitures/models.py:708
 msgid "Container type"
 msgstr "Type de contenant"
 
-#: furnitures/models.py:669
+#: furnitures/models.py:702
 msgid "Container types"
 msgstr "Types de contenant"
 
-#: furnitures/models.py:673 furnitures/models.py:733
+#: furnitures/models.py:706 furnitures/models.py:766
 msgid "Location"
 msgstr "Lieu"
 
-#: furnitures/models.py:680 furnitures/models.py:730
+#: furnitures/models.py:713 furnitures/models.py:763
 msgid "Container"
 msgstr "Contenant"
 
-#: furnitures/models.py:681
+#: furnitures/models.py:714
 msgid "Containers"
 msgstr "Contenants"
 
-#: furnitures/models.py:700 templates/wizard_file_sheet.html:41
+#: furnitures/models.py:733 templates/wizard_file_sheet.html:41
 msgid "Surface"
 msgstr "Surface"
 
-#: furnitures/models.py:701
+#: furnitures/models.py:734
 msgid "Localisation"
 msgstr "Localisation"
 
-#: furnitures/models.py:724
+#: furnitures/models.py:757
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: furnitures/models.py:726 furnitures/models.py:732
+#: furnitures/models.py:759 furnitures/models.py:765
 msgid "Treatment type"
 msgstr "Type de traitement"
 
-#: furnitures/models.py:727
+#: furnitures/models.py:760
 msgid "Treatment types"
 msgstr "Types de traitements"
 
-#: furnitures/models.py:740
+#: furnitures/models.py:773
 msgid "Treatment"
 msgstr "Traitement"
 
-#: furnitures/models.py:741
+#: furnitures/models.py:774
 msgid "Treatments"
 msgstr "Traitements"
 
-#: furnitures/models.py:743
+#: furnitures/models.py:776
 msgid "Can view own Treatment"
 msgstr "Peut voir son propre Traitement"
 
-#: furnitures/models.py:744
+#: furnitures/models.py:777
 msgid "Can add own Treatment"
 msgstr "Peut ajouter son propre Traitement"
 
-#: furnitures/models.py:745
+#: furnitures/models.py:778
 msgid "Can change own Treatment"
 msgstr "Peut changer son propre Traitement"
 
-#: furnitures/models.py:746
+#: furnitures/models.py:779
 msgid "Can delete own Treatment"
 msgstr "Peut supprimer son propre traitement"
 
-#: furnitures/models.py:754 furnitures/models.py:760
+#: furnitures/models.py:787 furnitures/models.py:793
 msgid "Author type"
 msgstr "Type d'auteur"
 
-#: furnitures/models.py:755
+#: furnitures/models.py:788
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: furnitures/models.py:763
+#: furnitures/models.py:796
 msgid "Author"
 msgstr "Auteur"
 
-#: furnitures/models.py:764
+#: furnitures/models.py:797
 msgid "Authors"
 msgstr "Auteurs"
 
-#: furnitures/models.py:778
+#: furnitures/models.py:811
 msgid "Property"
 msgstr "Propriété"
 
-#: furnitures/models.py:779
+#: furnitures/models.py:812
 msgid "Properties"
 msgstr "Propriétés"
 
-#: furnitures/views.py:273
+#: furnitures/views.py:283
 msgid "Operation not permitted."
 msgstr "Opération non permise"
 
@@ -1302,6 +1314,12 @@ msgstr ""
 "Vous être maintenant enregistré. Un courriel d'activation de votre compte "
 "vous a été envoyé."
 
+#~ msgid "There are identical parcels."
+#~ msgstr "Il y a des parcelles identiques."
+
+#~ msgid "There are identical remain types."
+#~ msgstr "Il y a des types de vestige identiques."
+
 #~ msgid "Code DRACAR"
 #~ msgstr "Code DRACAR"