Merge branch 'v0.9' into wheezy

20 files changed, 445 insertions, 422 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 33ba9cf24..460381c07 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,18 @@
 Ishtar changelog
 ================
 
+v0.99.12 (2017-02-10)
+---------------------
+### Features ###
+- Admin: add search_fields for archaeological_finds/materialtype search
+- Admin: debug and add label for context records search
+- Admin: improve importer column form
+- Sheets: remove title from Created_by and add link to creator sheet
+- Update translations
+
+### Bug fixes ###
+- Shortcut menu: fix when current selected find is an integer
+
 v0.99.11 (2017-02-06)
 ---------------------
 ### Features ###
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 353d75925..2f6bb3291 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -37,7 +37,7 @@ class ContextRecordAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'length', 'width',
                     'thickness', 'depth')
     list_filter = ('has_furniture',)
-    search_fields = ('parcel__operation__name', "datings__period__label")
+    search_fields = ('label', 'parcel__operation__common_name', 'datings__period__label')
     model = models.ContextRecord
 
 admin.site.register(models.ContextRecord, ContextRecordAdmin)
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index e42400f29..11f313b1f 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -92,8 +92,8 @@ msgstr ""
 msgid "Depth (m)"
 msgstr ""
 
-#: forms.py:147 models.py:196 models.py:457
-msgid "Unit"
+#: forms.py:147 forms.py:355 models.py:196 models.py:457
+msgid "Context record type"
 msgstr ""
 
 #: forms.py:148 models.py:198
@@ -216,10 +216,6 @@ msgstr ""
 msgid "Period of the context record"
 msgstr ""
 
-#: forms.py:355
-msgid "Unit type of the context record"
-msgstr ""
-
 #: forms.py:368
 msgid "Documentation search"
 msgstr ""
@@ -273,15 +269,15 @@ msgid "Order"
 msgstr ""
 
 #: models.py:79
-msgid "Parent unit"
+msgid "Parent context record type"
 msgstr ""
 
 #: models.py:83
-msgid "Unit Type"
+msgid "Context record Type"
 msgstr ""
 
 #: models.py:84
-msgid "Unit Types"
+msgid "Context record Types"
 msgstr ""
 
 #: models.py:97
@@ -426,7 +422,7 @@ msgid "ID (left)"
 msgstr ""
 
 #: models.py:413
-msgid "Unit (left)"
+msgid "Context record type (left)"
 msgstr ""
 
 #: models.py:414
@@ -446,7 +442,7 @@ msgid "ID (right)"
 msgstr ""
 
 #: models.py:419
-msgid "Unit (right)"
+msgid "Context record type (right)"
 msgstr ""
 
 #: models.py:420
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index e5304f9cb..e44597961 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -16,7 +16,7 @@
 <ul class='form-flex'>
 <li><label>{% if item.operation.code_patriarche %}{%trans "Complete ID:"%}{% else %}{%trans "Temporary ID:"%}{% endif %}</label><span class='value'>{{item.full_label}}</span></li>
 {% field_li "Creation date" item.creation_date %}
-{% field_li "Created by" item.history_creator.ishtaruser.full_label %}
+{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 {% field_li "Type" item.unit %}
 {% field_li_multiple "Chronology" item.datings %}
 {% field_li "Town" item.parcel.town %}
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 249a9846c..071db20ee 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -23,7 +23,7 @@
 
 {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
 {% field_li "Creation date" item.creation_date|date:"DATE_FORMAT" %}
-{% field_li "Created by" item.history_creator.ishtaruser.full_label %}
+{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 
 {% comment %}
 {% if item.deadline_date and not item.acts %}
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 3d8aed855..988897ceb 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -90,6 +90,7 @@ admin.site.register(models.ObjectType, HierarchicalTypeAdmin)
 
 class MaterialTypeAdmin(HierarchicalTypeAdmin):
     list_display = HierarchicalTypeAdmin.list_display + ['recommendation']
+    search_fields = ('label', 'parent__label', 'comment',)
 
 admin.site.register(models.MaterialType, MaterialTypeAdmin)
 
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index b25eac027..9fe1cb651 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -194,12 +194,12 @@ msgstr ""
 
 #: forms.py:299 forms_treatments.py:138 forms_treatments.py:436
 #: models_finds.py:833 models_treatments.py:127 models_treatments.py:290
-#: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:141
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:144
 msgid "Start date"
 msgstr ""
 
 #: forms.py:301 models_finds.py:834 models_treatments.py:291
-#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
 msgid "End date"
 msgstr ""
 
@@ -334,7 +334,7 @@ msgid "Basket"
 msgstr ""
 
 #: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
 msgid "Label"
 msgstr ""
 
@@ -364,6 +364,7 @@ msgid "Base treatment"
 msgstr ""
 
 #: forms_treatments.py:103 models_treatments.py:109
+#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
 msgid "State"
 msgstr ""
 
@@ -512,8 +513,8 @@ msgid "Internal ref."
 msgstr ""
 
 #: forms_treatments.py:358 forms_treatments.py:415
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137
-#: templates/ishtar/sheet_find.html:227
+#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
+#: templates/ishtar/sheet_find.html:231
 msgid "Type"
 msgstr ""
 
@@ -614,8 +615,8 @@ msgstr ""
 msgid "Administrative act"
 msgstr ""
 
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222
-#: templates/ishtar/sheet_find.html:224
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:228
 msgid "Documents"
 msgstr ""
 
@@ -791,8 +792,8 @@ msgid "Periods"
 msgstr ""
 
 #: models_finds.py:336 models_finds.py:442 models_treatments.py:129
-#: models_treatments.py:293 templates/ishtar/sheet_find.html:100
-#: templates/ishtar/sheet_find.html:140
+#: models_treatments.py:293 templates/ishtar/sheet_find.html:101
+#: templates/ishtar/sheet_find.html:143
 msgid "Container"
 msgstr ""
 
@@ -836,7 +837,7 @@ msgstr ""
 msgid "Upstream treatment"
 msgstr ""
 
-#: models_finds.py:438 templates/ishtar/sheet_find.html:129
+#: models_finds.py:438 templates/ishtar/sheet_find.html:131
 msgid "Downstream treatment"
 msgstr ""
 
@@ -985,8 +986,8 @@ msgstr ""
 msgid "TREATMENT"
 msgstr ""
 
-#: models_treatments.py:294 templates/ishtar/sheet_find.html:99
-#: templates/ishtar/sheet_find.html:139
+#: models_treatments.py:294 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:142
 msgid "Doer"
 msgstr ""
 
@@ -1182,55 +1183,55 @@ msgstr ""
 msgid "Warehouse"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:135
+#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
 msgid "Year - index"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
 msgid "Related finds (max. 15 displayed)"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:125
+#: templates/ishtar/sheet_find.html:127
 msgid "Export as CSV"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:125 templates/ishtar/sheet_find.html:166
+#: templates/ishtar/sheet_find.html:127 templates/ishtar/sheet_find.html:170
 msgid "CSV"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:175
 msgid "Associated base finds"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:203
+#: templates/ishtar/sheet_find.html:207
 msgid "Coordinates:"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:205
+#: templates/ishtar/sheet_find.html:209
 msgid "X:"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:206
+#: templates/ishtar/sheet_find.html:210
 msgid "Y:"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:207
+#: templates/ishtar/sheet_find.html:211
 msgid "Z:"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:210
+#: templates/ishtar/sheet_find.html:214
 msgid "SRID:"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:230
 msgid "Title"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:228
+#: templates/ishtar/sheet_find.html:232
 msgid "Authors"
 msgstr ""
 
-#: templates/ishtar/sheet_find.html:229
+#: templates/ishtar/sheet_find.html:233
 msgid "Link"
 msgstr ""
 
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 57ab530bf..3e9077a48 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -177,7 +177,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
         if menu_filtr:
             if 'treatmentfile' in menu_filtr:
                 replace_query = Q(file=menu_filtr['treatmentfile'])
-            if 'find' in menu_filtr and 'basket' not in menu_filtr['find']:
+            if 'find' in menu_filtr and 'basket' not in str(menu_filtr['find']):
                 q = Q(upstream=menu_filtr['find']) | Q(
                     downstream=menu_filtr['find'])
                 if replace_query:
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index b12c1f8c0..080275aa9 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -35,7 +35,7 @@
     {% if item.operation and item.operation.surface %}
     <li><label>{% trans "Surface:"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li>
     {% endif %}
-    {% field_li "Created by" item.history_creator.ishtaruser %}
+    {% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 {% comment %}{% if item.general_contractor.attached_to %}<p>
     <label>{% trans "General contractor organisation:"%}</label>
     <span class='value'>{{ item.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 43446c516..28e4ae6b5 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -25,7 +25,7 @@
 <ul class='form-flex'>
 {% field_li "Old code" item.old_code %}
 <li><label>{%trans "Last modification date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now -->
-{% field_li "Created by" item.history_creator.ishtaruser.full_label %}
+{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 {% field_li "Begining date" item.start_date %}
 {% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
 {% field_li_detail "Head scientist" item.scientist %}
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index e2ecbf839..3460c4a75 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -238,15 +238,26 @@ class ImporterDuplicateFieldInline(admin.TabularInline):
     model = models.ImporterDuplicateField
 
 
+class ImportTargetForm(forms.ModelForm):
+    class Meta:
+        model = models.ImportTarget
+        exclude = []
+        widgets = {
+            'comment': forms.TextInput
+        }
+
+
 class ImportTargetInline(admin.TabularInline):
     model = models.ImportTarget
+    extra = 1
+    form = ImportTargetForm
 
 
 class ImporterColumnAdmin(admin.ModelAdmin):
     list_display = ('label', 'importer_type', 'col_number', 'description',
                     'targets_lbl', 'duplicate_fields_lbl', 'required')
     list_filter = ('importer_type',)
-    inlines = (ImporterDuplicateFieldInline, ImportTargetInline)
+    inlines = (ImportTargetInline, ImporterDuplicateFieldInline)
 admin.site.register(models.ImporterColumn, ImporterColumnAdmin)
 
 
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index fbc4b4eac..7efeabbef 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -177,7 +177,7 @@ msgid "Template"
 msgstr ""
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1541 models.py:2950
+#: forms_common.py:406 models.py:1541 models.py:2953
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:13
 msgid "Town"
@@ -193,8 +193,8 @@ msgid ""
 "french town Saint-Denis in the Seine-Saint-Denis department.</p>"
 msgstr ""
 
-#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2574
-#: models.py:2756 models.py:2818 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2577
+#: models.py:2759 models.py:2821 templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr ""
 
@@ -205,15 +205,15 @@ msgid ""
 msgstr ""
 
 #: forms_common.py:170 forms_common.py:327 forms_common.py:451
-#: ishtar_menu.py:75 models.py:2457 models.py:2548
+#: ishtar_menu.py:75 models.py:2460 models.py:2551
 #: templates/ishtar/sheet_organization.html:4
 msgid "Organization"
 msgstr ""
 
 #: forms_common.py:173 forms_common.py:210 forms_common.py:322
 #: forms_common.py:376 forms_common.py:446 models.py:1096 models.py:1474
-#: models.py:1742 models.py:1758 models.py:1984 models.py:2451 models.py:2560
-#: models.py:2936 templates/ishtar/sheet_organization.html:8
+#: models.py:1742 models.py:1758 models.py:1984 models.py:2454 models.py:2563
+#: models.py:2939 templates/ishtar/sheet_organization.html:8
 #: templates/ishtar/sheet_organization.html:21
 msgid "Name"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Mobile phone"
 msgstr ""
 
 #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2151
-#: models.py:2453 models.py:2871 templates/sheet_ope.html:85
+#: models.py:2456 models.py:2874 templates/sheet_ope.html:85
 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
 #: templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:23
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Organization to merge"
 msgstr ""
 
-#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2558
+#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2561
 #: templates/ishtar/sheet_organization.html:22
 msgid "Surname"
 msgstr ""
@@ -304,16 +304,16 @@ msgid "Identity"
 msgstr ""
 
 #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2116
-#: models.py:2552 models.py:2554 models.py:2868 templates/sheet_ope.html:104
+#: models.py:2555 models.py:2557 models.py:2871 templates/sheet_ope.html:104
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Title"
 msgstr ""
 
-#: forms_common.py:372 models.py:2556
+#: forms_common.py:372 models.py:2559
 msgid "Salutation"
 msgstr ""
 
-#: forms_common.py:378 models.py:2562
+#: forms_common.py:378 models.py:2565
 msgid "Raw name"
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr ""
 msgid "Account search"
 msgstr ""
 
-#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2505
+#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2508
 msgid "Person type"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr ""
 msgid "Send the new password by email?"
 msgstr ""
 
-#: forms_common.py:628 forms_common.py:641 models.py:2951
+#: forms_common.py:628 forms_common.py:641 models.py:2954
 msgid "Towns"
 msgstr ""
 
@@ -421,7 +421,7 @@ msgstr ""
 msgid "Documentation informations"
 msgstr ""
 
-#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2843
+#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2846
 msgid "Source type"
 msgstr ""
 
@@ -433,37 +433,37 @@ msgstr ""
 msgid "Internal reference"
 msgstr ""
 
-#: forms_common.py:783 models.py:2882
+#: forms_common.py:783 models.py:2885
 msgid "Numerical ressource (web address)"
 msgstr ""
 
-#: forms_common.py:784 models.py:2884
+#: forms_common.py:784 models.py:2887
 msgid "Receipt date"
 msgstr ""
 
-#: forms_common.py:786 models.py:2280 models.py:2886
+#: forms_common.py:786 models.py:2283 models.py:2889
 msgid "Creation date"
 msgstr ""
 
-#: forms_common.py:789 models.py:2889
+#: forms_common.py:789 models.py:2892
 msgid "Receipt date in documentation"
 msgstr ""
 
 #: forms_common.py:791 forms_common.py:827 models.py:377 models.py:689
-#: models.py:2011 models.py:2566 models.py:2896
+#: models.py:2011 models.py:2569 models.py:2899
 msgid "Comment"
 msgstr ""
 
 #: forms_common.py:793 forms_common.py:826 models.py:1098 models.py:1762
-#: models.py:1943 models.py:1985 models.py:2895 templates/sheet_ope.html:128
+#: models.py:1943 models.py:1985 models.py:2898 templates/sheet_ope.html:128
 msgid "Description"
 msgstr ""
 
-#: forms_common.py:796 models.py:2897
+#: forms_common.py:796 models.py:2900
 msgid "Additional information"
 msgstr ""
 
-#: forms_common.py:798 forms_common.py:830 models.py:2899
+#: forms_common.py:798 forms_common.py:830 models.py:2902
 msgid "Has a duplicate"
 msgstr ""
 
@@ -478,7 +478,7 @@ msgid ""
 "p>"
 msgstr ""
 
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2823
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2826
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 msgid "Would you like to delete this documentation?"
 msgstr ""
 
-#: forms_common.py:856 models.py:2118 models.py:2810 models.py:2820
+#: forms_common.py:856 models.py:2118 models.py:2813 models.py:2823
 msgid "Author type"
 msgstr ""
 
@@ -503,7 +503,7 @@ msgstr ""
 msgid "There are identical authors."
 msgstr ""
 
-#: forms_common.py:893 models.py:2824 models.py:2878
+#: forms_common.py:893 models.py:2827 models.py:2881
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:9
 msgid "Authors"
@@ -549,7 +549,7 @@ msgstr ""
 msgid "Manual merge"
 msgstr ""
 
-#: ishtar_menu.py:109 models.py:2291
+#: ishtar_menu.py:109 models.py:2294
 msgid "Imports"
 msgstr ""
 
@@ -605,7 +605,7 @@ msgstr ""
 msgid "Creator"
 msgstr ""
 
-#: models.py:958 models.py:2962 models.py:3018
+#: models.py:958 models.py:2965 models.py:3021
 msgid "Order"
 msgstr ""
 
@@ -844,7 +844,7 @@ msgstr ""
 msgid "Document templates"
 msgstr ""
 
-#: models.py:1513 models.py:1523 models.py:2275
+#: models.py:1513 models.py:1523 models.py:2278
 msgid "State"
 msgstr ""
 
@@ -1024,11 +1024,11 @@ msgstr ""
 msgid "Importer - Targets keys"
 msgstr ""
 
-#: models.py:2119 models.py:2874
+#: models.py:2119 models.py:2877
 msgid "Format"
 msgstr ""
 
-#: models.py:2120 models.py:2966
+#: models.py:2120 models.py:2969
 msgid "Operation type"
 msgstr ""
 
@@ -1092,15 +1092,15 @@ msgstr ""
 msgid "Context record relation type"
 msgstr ""
 
-#: models.py:2139 models.py:3024
+#: models.py:2139 models.py:3027
 msgid "Spatial reference system"
 msgstr ""
 
-#: models.py:2140 models.py:2852
+#: models.py:2140 models.py:2855
 msgid "Support type"
 msgstr ""
 
-#: models.py:2141 models.py:2517
+#: models.py:2141 models.py:2520
 msgid "Title type"
 msgstr ""
 
@@ -1166,295 +1166,295 @@ msgstr ""
 msgid "Importer - Formater types"
 msgstr ""
 
-#: models.py:2239 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2242 templates/ishtar/dashboards/dashboard_main_detail.html:63
 msgid "Created"
 msgstr ""
 
-#: models.py:2240
+#: models.py:2243
 msgid "Analyse in progress"
 msgstr ""
 
-#: models.py:2241
+#: models.py:2244
 msgid "Analysed"
 msgstr ""
 
-#: models.py:2242
+#: models.py:2245
 msgid "Import pending"
 msgstr ""
 
-#: models.py:2243
+#: models.py:2246
 msgid "Import in progress"
 msgstr ""
 
-#: models.py:2244
+#: models.py:2247
 msgid "Finished with errors"
 msgstr ""
 
-#: models.py:2245
+#: models.py:2248
 msgid "Finished"
 msgstr ""
 
-#: models.py:2246
+#: models.py:2249
 msgid "Archived"
 msgstr ""
 
-#: models.py:2259
+#: models.py:2262
 msgid "Imported file"
 msgstr ""
 
-#: models.py:2261
+#: models.py:2264
 msgid "Associated images (zip file)"
 msgstr ""
 
-#: models.py:2263
+#: models.py:2266
 msgid "Encoding"
 msgstr ""
 
-#: models.py:2265
+#: models.py:2268
 msgid "Skip lines"
 msgstr ""
 
-#: models.py:2266 templates/ishtar/import_list.html:47
+#: models.py:2269 templates/ishtar/import_list.html:47
 msgid "Error file"
 msgstr ""
 
-#: models.py:2269
+#: models.py:2272
 msgid "Result file"
 msgstr ""
 
-#: models.py:2272 templates/ishtar/import_list.html:53
+#: models.py:2275 templates/ishtar/import_list.html:53
 msgid "Match file"
 msgstr ""
 
-#: models.py:2278
+#: models.py:2281
 msgid "Conservative import"
 msgstr ""
 
-#: models.py:2283
+#: models.py:2286
 msgid "End date"
 msgstr ""
 
-#: models.py:2285
+#: models.py:2288
 msgid "Remaining seconds"
 msgstr ""
 
-#: models.py:2290
+#: models.py:2293
 msgid "Import"
 msgstr ""
 
-#: models.py:2307
+#: models.py:2310
 msgid "Analyse"
 msgstr ""
 
-#: models.py:2309 models.py:2312
+#: models.py:2312 models.py:2315
 msgid "Re-analyse"
 msgstr ""
 
-#: models.py:2310
+#: models.py:2313
 msgid "Launch import"
 msgstr ""
 
-#: models.py:2313
+#: models.py:2316
 msgid "Re-import"
 msgstr ""
 
-#: models.py:2314
+#: models.py:2317
 msgid "Archive"
 msgstr ""
 
-#: models.py:2316
+#: models.py:2319
 msgid "Unarchive"
 msgstr ""
 
-#: models.py:2317 widgets.py:130 templates/ishtar/form_delete.html:11
+#: models.py:2320 widgets.py:130 templates/ishtar/form_delete.html:11
 msgid "Delete"
 msgstr ""
 
-#: models.py:2458
+#: models.py:2461
 msgid "Organizations"
 msgstr ""
 
-#: models.py:2460
+#: models.py:2463
 msgid "Can view all Organizations"
 msgstr ""
 
-#: models.py:2461
+#: models.py:2464
 msgid "Can view own Organization"
 msgstr ""
 
-#: models.py:2462
+#: models.py:2465
 msgid "Can add own Organization"
 msgstr ""
 
-#: models.py:2464
+#: models.py:2467
 msgid "Can change own Organization"
 msgstr ""
 
-#: models.py:2466
+#: models.py:2469
 msgid "Can delete own Organization"
 msgstr ""
 
-#: models.py:2501
+#: models.py:2504
 msgid "Groups"
 msgstr ""
 
-#: models.py:2506
+#: models.py:2509
 msgid "Person types"
 msgstr ""
 
-#: models.py:2518
+#: models.py:2521
 msgid "Title types"
 msgstr ""
 
-#: models.py:2527
+#: models.py:2530
 msgid "Mr"
 msgstr ""
 
-#: models.py:2528
+#: models.py:2531
 msgid "Miss"
 msgstr ""
 
-#: models.py:2529
+#: models.py:2532
 msgid "Mr and Mrs"
 msgstr ""
 
-#: models.py:2530
+#: models.py:2533
 msgid "Mrs"
 msgstr ""
 
-#: models.py:2531
+#: models.py:2534
 msgid "Doctor"
 msgstr ""
 
-#: models.py:2564
+#: models.py:2567
 msgid "Contact type"
 msgstr ""
 
-#: models.py:2567 models.py:2631
+#: models.py:2570 models.py:2634
 msgid "Types"
 msgstr ""
 
-#: models.py:2570
+#: models.py:2573
 msgid "Is attached to"
 msgstr ""
 
-#: models.py:2575
+#: models.py:2578
 msgid "Persons"
 msgstr ""
 
-#: models.py:2577
+#: models.py:2580
 msgid "Can view all Persons"
 msgstr ""
 
-#: models.py:2578
+#: models.py:2581
 msgid "Can view own Person"
 msgstr ""
 
-#: models.py:2579
+#: models.py:2582
 msgid "Can add own Person"
 msgstr ""
 
-#: models.py:2580
+#: models.py:2583
 msgid "Can change own Person"
 msgstr ""
 
-#: models.py:2581
+#: models.py:2584
 msgid "Can delete own Person"
 msgstr ""
 
-#: models.py:2759
+#: models.py:2762
 msgid "Advanced shortcut menu"
 msgstr ""
 
-#: models.py:2762
+#: models.py:2765
 msgid "Ishtar user"
 msgstr ""
 
-#: models.py:2763
+#: models.py:2766
 msgid "Ishtar users"
 msgstr ""
 
-#: models.py:2805
+#: models.py:2808
 msgid "To modify the password use the form in Auth > User"
 msgstr ""
 
-#: models.py:2811
+#: models.py:2814
 msgid "Author types"
 msgstr ""
 
-#: models.py:2844
+#: models.py:2847
 msgid "Source types"
 msgstr ""
 
-#: models.py:2853
+#: models.py:2856
 msgid "Support types"
 msgstr ""
 
-#: models.py:2860
+#: models.py:2863
 msgid "Format type"
 msgstr ""
 
-#: models.py:2861
+#: models.py:2864
 msgid "Format types"
 msgstr ""
 
-#: models.py:2869
+#: models.py:2872
 msgid "External ID"
 msgstr ""
 
-#: models.py:2872
+#: models.py:2875
 msgid "Support"
 msgstr ""
 
-#: models.py:2876
+#: models.py:2879
 msgid "Scale"
 msgstr ""
 
-#: models.py:2890
+#: models.py:2893
 msgid "Item number"
 msgstr ""
 
-#: models.py:2891
+#: models.py:2894
 msgid "Ref."
 msgstr ""
 
-#: models.py:2894
+#: models.py:2897
 msgid "Internal ref."
 msgstr ""
 
-#: models.py:2937
+#: models.py:2940
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:2938 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2941 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr ""
 
-#: models.py:2963
+#: models.py:2966
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:2967
+#: models.py:2970
 msgid "Operation types"
 msgstr ""
 
-#: models.py:2996
+#: models.py:2999
 msgid "Preventive"
 msgstr ""
 
-#: models.py:2997
+#: models.py:3000
 msgid "Research"
 msgstr ""
 
-#: models.py:3020
+#: models.py:3023
 msgid "Authority name"
 msgstr ""
 
-#: models.py:3021
+#: models.py:3024
 msgid "Authority SRID"
 msgstr ""
 
-#: models.py:3025
+#: models.py:3028
 msgid "Spatial reference systems"
 msgstr ""
 
@@ -2042,7 +2042,6 @@ msgstr ""
 #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8
 #: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31
 #: templates/ishtar/simple_form.html:7
-#: templates/ishtar/wizard/confirm_wizard.html:42
 #: templates/ishtar/wizard/default_wizard.html:31
 #: templates/ishtar/wizard/search.html:13
 #: templates/ishtar/wizard/validation_bar.html:4
@@ -2439,7 +2438,7 @@ msgstr ""
 msgid "You have entered the following informations:"
 msgstr ""
 
-#: templates/ishtar/wizard/confirm_wizard.html:41
+#: templates/ishtar/wizard/confirm_wizard.html:44
 msgid "Would you like to save them?"
 msgstr ""
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index c9903525d..90e2bd6f6 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1777,6 +1777,7 @@ class ImporterType(models.Model):
     class Meta:
         verbose_name = _(u"Importer - Type")
         verbose_name_plural = _(u"Importer - Types")
+        ordering = ('name',)
 
     def __unicode__(self):
         return self.name
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index a3fa62ce7..82acb1904 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -650,7 +650,7 @@ class ShortMenuTest(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTrue(str(basket.label) in response.content)
 
-    def testTreatmentFile(self):
+    def test_treatment_file(self):
         c = Client()
         c.login(username=self.username, password=self.password)
         from archaeological_finds.models import TreatmentFile, TreatmentFileType
@@ -693,7 +693,7 @@ class ShortMenuTest(TestCase):
             year=2052
         )
 
-    def testTreatment(self):
+    def test_treatment(self):
         c = Client()
         c.login(username=self.username, password=self.password)
         treat = self._create_treatment()
@@ -747,6 +747,13 @@ class ShortMenuTest(TestCase):
         self.assertFalse(c.session['find'])
         self.assertFalse(c.session['contextrecord'])
 
+        # current find is set as an integer
+        session = c.session
+        session['find'] = find.id
+        session.save()
+        response = c.get(reverse('shortcut-menu'))
+        self.assertEqual(response.status_code, 200)
+
         self._create_treatment()
 
     def test_basket_is_current_item(self):
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index ca174763b..9c44fa41c 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -179,7 +179,7 @@ msgid "Template"
 msgstr ""
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1541 models.py:2950
+#: forms_common.py:406 models.py:1541 models.py:2953
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:13
 msgid "Town"
@@ -195,8 +195,8 @@ msgid ""
 "french town Saint-Denis in the Seine-Saint-Denis department.</p>"
 msgstr ""
 
-#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2574
-#: models.py:2756 models.py:2818 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2577
+#: models.py:2759 models.py:2821 templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr ""
 
@@ -207,15 +207,15 @@ msgid ""
 msgstr ""
 
 #: forms_common.py:170 forms_common.py:327 forms_common.py:451
-#: ishtar_menu.py:75 models.py:2457 models.py:2548
+#: ishtar_menu.py:75 models.py:2460 models.py:2551
 #: templates/ishtar/sheet_organization.html:4
 msgid "Organization"
 msgstr ""
 
 #: forms_common.py:173 forms_common.py:210 forms_common.py:322
 #: forms_common.py:376 forms_common.py:446 models.py:1096 models.py:1474
-#: models.py:1742 models.py:1758 models.py:1984 models.py:2451 models.py:2560
-#: models.py:2936 templates/ishtar/sheet_organization.html:8
+#: models.py:1742 models.py:1758 models.py:1984 models.py:2454 models.py:2563
+#: models.py:2939 templates/ishtar/sheet_organization.html:8
 #: templates/ishtar/sheet_organization.html:21
 msgid "Name"
 msgstr ""
@@ -263,7 +263,7 @@ msgid "Mobile phone"
 msgstr ""
 
 #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2151
-#: models.py:2453 models.py:2871 templates/sheet_ope.html:85
+#: models.py:2456 models.py:2874 templates/sheet_ope.html:85
 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
 #: templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:23
@@ -287,7 +287,7 @@ msgstr ""
 msgid "Organization to merge"
 msgstr ""
 
-#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2558
+#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2561
 #: templates/ishtar/sheet_organization.html:22
 msgid "Surname"
 msgstr ""
@@ -306,16 +306,16 @@ msgid "Identity"
 msgstr ""
 
 #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2116
-#: models.py:2552 models.py:2554 models.py:2868 templates/sheet_ope.html:104
+#: models.py:2555 models.py:2557 models.py:2871 templates/sheet_ope.html:104
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Title"
 msgstr ""
 
-#: forms_common.py:372 models.py:2556
+#: forms_common.py:372 models.py:2559
 msgid "Salutation"
 msgstr ""
 
-#: forms_common.py:378 models.py:2562
+#: forms_common.py:378 models.py:2565
 msgid "Raw name"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "Account search"
 msgstr ""
 
-#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2505
+#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2508
 msgid "Person type"
 msgstr ""
 
@@ -407,7 +407,7 @@ msgstr ""
 msgid "Send the new password by email?"
 msgstr ""
 
-#: forms_common.py:628 forms_common.py:641 models.py:2951
+#: forms_common.py:628 forms_common.py:641 models.py:2954
 msgid "Towns"
 msgstr ""
 
@@ -423,7 +423,7 @@ msgstr ""
 msgid "Documentation informations"
 msgstr ""
 
-#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2843
+#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2846
 msgid "Source type"
 msgstr ""
 
@@ -435,37 +435,37 @@ msgstr ""
 msgid "Internal reference"
 msgstr ""
 
-#: forms_common.py:783 models.py:2882
+#: forms_common.py:783 models.py:2885
 msgid "Numerical ressource (web address)"
 msgstr ""
 
-#: forms_common.py:784 models.py:2884
+#: forms_common.py:784 models.py:2887
 msgid "Receipt date"
 msgstr ""
 
-#: forms_common.py:786 models.py:2280 models.py:2886
+#: forms_common.py:786 models.py:2283 models.py:2889
 msgid "Creation date"
 msgstr ""
 
-#: forms_common.py:789 models.py:2889
+#: forms_common.py:789 models.py:2892
 msgid "Receipt date in documentation"
 msgstr ""
 
 #: forms_common.py:791 forms_common.py:827 models.py:377 models.py:689
-#: models.py:2011 models.py:2566 models.py:2896
+#: models.py:2011 models.py:2569 models.py:2899
 msgid "Comment"
 msgstr ""
 
 #: forms_common.py:793 forms_common.py:826 models.py:1098 models.py:1762
-#: models.py:1943 models.py:1985 models.py:2895 templates/sheet_ope.html:128
+#: models.py:1943 models.py:1985 models.py:2898 templates/sheet_ope.html:128
 msgid "Description"
 msgstr ""
 
-#: forms_common.py:796 models.py:2897
+#: forms_common.py:796 models.py:2900
 msgid "Additional information"
 msgstr ""
 
-#: forms_common.py:798 forms_common.py:830 models.py:2899
+#: forms_common.py:798 forms_common.py:830 models.py:2902
 msgid "Has a duplicate"
 msgstr ""
 
@@ -480,7 +480,7 @@ msgid ""
 "p>"
 msgstr ""
 
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2823
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2826
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr ""
@@ -493,7 +493,7 @@ msgstr ""
 msgid "Would you like to delete this documentation?"
 msgstr ""
 
-#: forms_common.py:856 models.py:2118 models.py:2810 models.py:2820
+#: forms_common.py:856 models.py:2118 models.py:2813 models.py:2823
 msgid "Author type"
 msgstr ""
 
@@ -505,7 +505,7 @@ msgstr ""
 msgid "There are identical authors."
 msgstr ""
 
-#: forms_common.py:893 models.py:2824 models.py:2878
+#: forms_common.py:893 models.py:2827 models.py:2881
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:9
 msgid "Authors"
@@ -551,7 +551,7 @@ msgstr ""
 msgid "Manual merge"
 msgstr ""
 
-#: ishtar_menu.py:109 models.py:2291
+#: ishtar_menu.py:109 models.py:2294
 msgid "Imports"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Creator"
 msgstr ""
 
-#: models.py:958 models.py:2962 models.py:3018
+#: models.py:958 models.py:2965 models.py:3021
 msgid "Order"
 msgstr ""
 
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Document templates"
 msgstr ""
 
-#: models.py:1513 models.py:1523 models.py:2275
+#: models.py:1513 models.py:1523 models.py:2278
 msgid "State"
 msgstr ""
 
@@ -1026,11 +1026,11 @@ msgstr ""
 msgid "Importer - Targets keys"
 msgstr ""
 
-#: models.py:2119 models.py:2874
+#: models.py:2119 models.py:2877
 msgid "Format"
 msgstr ""
 
-#: models.py:2120 models.py:2966
+#: models.py:2120 models.py:2969
 msgid "Operation type"
 msgstr ""
 
@@ -1094,15 +1094,15 @@ msgstr ""
 msgid "Context record relation type"
 msgstr ""
 
-#: models.py:2139 models.py:3024
+#: models.py:2139 models.py:3027
 msgid "Spatial reference system"
 msgstr ""
 
-#: models.py:2140 models.py:2852
+#: models.py:2140 models.py:2855
 msgid "Support type"
 msgstr ""
 
-#: models.py:2141 models.py:2517
+#: models.py:2141 models.py:2520
 msgid "Title type"
 msgstr ""
 
@@ -1168,295 +1168,295 @@ msgstr ""
 msgid "Importer - Formater types"
 msgstr ""
 
-#: models.py:2239 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2242 templates/ishtar/dashboards/dashboard_main_detail.html:63
 msgid "Created"
 msgstr ""
 
-#: models.py:2240
+#: models.py:2243
 msgid "Analyse in progress"
 msgstr ""
 
-#: models.py:2241
+#: models.py:2244
 msgid "Analysed"
 msgstr ""
 
-#: models.py:2242
+#: models.py:2245
 msgid "Import pending"
 msgstr ""
 
-#: models.py:2243
+#: models.py:2246
 msgid "Import in progress"
 msgstr ""
 
-#: models.py:2244
+#: models.py:2247
 msgid "Finished with errors"
 msgstr ""
 
-#: models.py:2245
+#: models.py:2248
 msgid "Finished"
 msgstr ""
 
-#: models.py:2246
+#: models.py:2249
 msgid "Archived"
 msgstr ""
 
-#: models.py:2259
+#: models.py:2262
 msgid "Imported file"
 msgstr ""
 
-#: models.py:2261
+#: models.py:2264
 msgid "Associated images (zip file)"
 msgstr ""
 
-#: models.py:2263
+#: models.py:2266
 msgid "Encoding"
 msgstr ""
 
-#: models.py:2265
+#: models.py:2268
 msgid "Skip lines"
 msgstr ""
 
-#: models.py:2266 templates/ishtar/import_list.html:47
+#: models.py:2269 templates/ishtar/import_list.html:47
 msgid "Error file"
 msgstr ""
 
-#: models.py:2269
+#: models.py:2272
 msgid "Result file"
 msgstr ""
 
-#: models.py:2272 templates/ishtar/import_list.html:53
+#: models.py:2275 templates/ishtar/import_list.html:53
 msgid "Match file"
 msgstr ""
 
-#: models.py:2278
+#: models.py:2281
 msgid "Conservative import"
 msgstr ""
 
-#: models.py:2283
+#: models.py:2286
 msgid "End date"
 msgstr ""
 
-#: models.py:2285
+#: models.py:2288
 msgid "Remaining seconds"
 msgstr ""
 
-#: models.py:2290
+#: models.py:2293
 msgid "Import"
 msgstr ""
 
-#: models.py:2307
+#: models.py:2310
 msgid "Analyse"
 msgstr ""
 
-#: models.py:2309 models.py:2312
+#: models.py:2312 models.py:2315
 msgid "Re-analyse"
 msgstr ""
 
-#: models.py:2310
+#: models.py:2313
 msgid "Launch import"
 msgstr ""
 
-#: models.py:2313
+#: models.py:2316
 msgid "Re-import"
 msgstr ""
 
-#: models.py:2314
+#: models.py:2317
 msgid "Archive"
 msgstr ""
 
-#: models.py:2316
+#: models.py:2319
 msgid "Unarchive"
 msgstr ""
 
-#: models.py:2317 widgets.py:130 templates/ishtar/form_delete.html:11
+#: models.py:2320 widgets.py:130 templates/ishtar/form_delete.html:11
 msgid "Delete"
 msgstr ""
 
-#: models.py:2458
+#: models.py:2461
 msgid "Organizations"
 msgstr ""
 
-#: models.py:2460
+#: models.py:2463
 msgid "Can view all Organizations"
 msgstr ""
 
-#: models.py:2461
+#: models.py:2464
 msgid "Can view own Organization"
 msgstr ""
 
-#: models.py:2462
+#: models.py:2465
 msgid "Can add own Organization"
 msgstr ""
 
-#: models.py:2464
+#: models.py:2467
 msgid "Can change own Organization"
 msgstr ""
 
-#: models.py:2466
+#: models.py:2469
 msgid "Can delete own Organization"
 msgstr ""
 
-#: models.py:2501
+#: models.py:2504
 msgid "Groups"
 msgstr ""
 
-#: models.py:2506
+#: models.py:2509
 msgid "Person types"
 msgstr ""
 
-#: models.py:2518
+#: models.py:2521
 msgid "Title types"
 msgstr ""
 
-#: models.py:2527
+#: models.py:2530
 msgid "Mr"
 msgstr ""
 
-#: models.py:2528
+#: models.py:2531
 msgid "Miss"
 msgstr ""
 
-#: models.py:2529
+#: models.py:2532
 msgid "Mr and Mrs"
 msgstr ""
 
-#: models.py:2530
+#: models.py:2533
 msgid "Mrs"
 msgstr ""
 
-#: models.py:2531
+#: models.py:2534
 msgid "Doctor"
 msgstr ""
 
-#: models.py:2564
+#: models.py:2567
 msgid "Contact type"
 msgstr ""
 
-#: models.py:2567 models.py:2631
+#: models.py:2570 models.py:2634
 msgid "Types"
 msgstr ""
 
-#: models.py:2570
+#: models.py:2573
 msgid "Is attached to"
 msgstr ""
 
-#: models.py:2575
+#: models.py:2578
 msgid "Persons"
 msgstr ""
 
-#: models.py:2577
+#: models.py:2580
 msgid "Can view all Persons"
 msgstr ""
 
-#: models.py:2578
+#: models.py:2581
 msgid "Can view own Person"
 msgstr ""
 
-#: models.py:2579
+#: models.py:2582
 msgid "Can add own Person"
 msgstr ""
 
-#: models.py:2580
+#: models.py:2583
 msgid "Can change own Person"
 msgstr ""
 
-#: models.py:2581
+#: models.py:2584
 msgid "Can delete own Person"
 msgstr ""
 
-#: models.py:2759
+#: models.py:2762
 msgid "Advanced shortcut menu"
 msgstr ""
 
-#: models.py:2762
+#: models.py:2765
 msgid "Ishtar user"
 msgstr ""
 
-#: models.py:2763
+#: models.py:2766
 msgid "Ishtar users"
 msgstr ""
 
-#: models.py:2805
+#: models.py:2808
 msgid "To modify the password use the form in Auth > User"
 msgstr ""
 
-#: models.py:2811
+#: models.py:2814
 msgid "Author types"
 msgstr ""
 
-#: models.py:2844
+#: models.py:2847
 msgid "Source types"
 msgstr ""
 
-#: models.py:2853
+#: models.py:2856
 msgid "Support types"
 msgstr ""
 
-#: models.py:2860
+#: models.py:2863
 msgid "Format type"
 msgstr ""
 
-#: models.py:2861
+#: models.py:2864
 msgid "Format types"
 msgstr ""
 
-#: models.py:2869
+#: models.py:2872
 msgid "External ID"
 msgstr ""
 
-#: models.py:2872
+#: models.py:2875
 msgid "Support"
 msgstr ""
 
-#: models.py:2876
+#: models.py:2879
 msgid "Scale"
 msgstr ""
 
-#: models.py:2890
+#: models.py:2893
 msgid "Item number"
 msgstr ""
 
-#: models.py:2891
+#: models.py:2894
 msgid "Ref."
 msgstr ""
 
-#: models.py:2894
+#: models.py:2897
 msgid "Internal ref."
 msgstr ""
 
-#: models.py:2937
+#: models.py:2940
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:2938 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2941 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr ""
 
-#: models.py:2963
+#: models.py:2966
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:2967
+#: models.py:2970
 msgid "Operation types"
 msgstr ""
 
-#: models.py:2996
+#: models.py:2999
 msgid "Preventive"
 msgstr ""
 
-#: models.py:2997
+#: models.py:3000
 msgid "Research"
 msgstr ""
 
-#: models.py:3020
+#: models.py:3023
 msgid "Authority name"
 msgstr ""
 
-#: models.py:3021
+#: models.py:3024
 msgid "Authority SRID"
 msgstr ""
 
-#: models.py:3025
+#: models.py:3028
 msgid "Spatial reference systems"
 msgstr ""
 
@@ -2044,7 +2044,6 @@ msgstr ""
 #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8
 #: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31
 #: templates/ishtar/simple_form.html:7
-#: templates/ishtar/wizard/confirm_wizard.html:42
 #: templates/ishtar/wizard/default_wizard.html:31
 #: templates/ishtar/wizard/search.html:13
 #: templates/ishtar/wizard/validation_bar.html:4
@@ -2441,7 +2440,7 @@ msgstr ""
 msgid "You have entered the following informations:"
 msgstr ""
 
-#: templates/ishtar/wizard/confirm_wizard.html:41
+#: templates/ishtar/wizard/confirm_wizard.html:44
 msgid "Would you like to save them?"
 msgstr ""
 
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index f25806fc8..6066b15a5 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-02-05 05:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2017-02-06 05:10-0500\n"
+"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -101,9 +101,9 @@ msgstr "Épaisseur (m)"
 msgid "Depth (m)"
 msgstr "Profondeur (m)"
 
-#: forms.py:147 models.py:196 models.py:457
-msgid "Unit"
-msgstr "Unité"
+#: forms.py:147 forms.py:355 models.py:196 models.py:457
+msgid "Context record type"
+msgstr "Type d'Unité d'Enregistrement"
 
 #: forms.py:148 models.py:198
 msgid "Has furniture?"
@@ -227,10 +227,6 @@ msgstr "Commune de l'opération"
 msgid "Period of the context record"
 msgstr "Période de l'Unité d'Enregistrement"
 
-#: forms.py:355
-msgid "Unit type of the context record"
-msgstr "Type d'unité de l'Unité d'Enregistrement"
-
 #: forms.py:368
 msgid "Documentation search"
 msgstr "Rechercher une documentation"
@@ -284,16 +280,16 @@ msgid "Order"
 msgstr "Ordre"
 
 #: models.py:79
-msgid "Parent unit"
-msgstr "Unité parente"
+msgid "Parent context record type"
+msgstr "Type d'UE parent"
 
 #: models.py:83
-msgid "Unit Type"
-msgstr "Type d'unité"
+msgid "Context record Type"
+msgstr "Type d'Unité d'Enregistrement"
 
 #: models.py:84
-msgid "Unit Types"
-msgstr "Types d'unité"
+msgid "Context record Types"
+msgstr "Types d'Unité d'Enregistrement"
 
 #: models.py:97
 msgid "Activity Type"
@@ -441,8 +437,8 @@ msgid "ID (left)"
 msgstr "ID (gauche)"
 
 #: models.py:413
-msgid "Unit (left)"
-msgstr "Unité (gauche)"
+msgid "Context record type (left)"
+msgstr "Type d'UE (gauche)"
 
 #: models.py:414
 msgid "Parcel (left)"
@@ -461,8 +457,8 @@ msgid "ID (right)"
 msgstr "ID (droit)"
 
 #: models.py:419
-msgid "Unit (right)"
-msgstr "Unité (droite)"
+msgid "Context record type (right)"
+msgstr "Type d'UE (droite)"
 
 #: models.py:420
 msgid "Parcel (right)"
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 609ad25c3..ae27bb014 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -211,12 +211,12 @@ msgstr "Période"
 
 #: forms.py:299 forms_treatments.py:138 forms_treatments.py:436
 #: models_finds.py:833 models_treatments.py:127 models_treatments.py:290
-#: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:141
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:144
 msgid "Start date"
 msgstr "Date de début"
 
 #: forms.py:301 models_finds.py:834 models_treatments.py:291
-#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
 msgid "End date"
 msgstr "Date de fin"
 
@@ -351,7 +351,7 @@ msgid "Basket"
 msgstr "Panier"
 
 #: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
 msgid "Label"
 msgstr "Intitulé"
 
@@ -381,6 +381,7 @@ msgid "Base treatment"
 msgstr "Traitement de base"
 
 #: forms_treatments.py:103 models_treatments.py:109
+#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
 msgid "State"
 msgstr "État"
 
@@ -535,8 +536,8 @@ msgid "Internal ref."
 msgstr "Réf. interne"
 
 #: forms_treatments.py:358 forms_treatments.py:415
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137
-#: templates/ishtar/sheet_find.html:227
+#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
+#: templates/ishtar/sheet_find.html:231
 msgid "Type"
 msgstr "Type"
 
@@ -637,8 +638,8 @@ msgstr "Documentation"
 msgid "Administrative act"
 msgstr "Acte administratif"
 
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222
-#: templates/ishtar/sheet_find.html:224
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:228
 msgid "Documents"
 msgstr "Documents"
 
@@ -814,8 +815,8 @@ msgid "Periods"
 msgstr "Périodes"
 
 #: models_finds.py:336 models_finds.py:442 models_treatments.py:129
-#: models_treatments.py:293 templates/ishtar/sheet_find.html:100
-#: templates/ishtar/sheet_find.html:140
+#: models_treatments.py:293 templates/ishtar/sheet_find.html:101
+#: templates/ishtar/sheet_find.html:143
 msgid "Container"
 msgstr "Contenant"
 
@@ -859,7 +860,7 @@ msgstr "Unité de poids"
 msgid "Upstream treatment"
 msgstr "Traitement amont"
 
-#: models_finds.py:438 templates/ishtar/sheet_find.html:129
+#: models_finds.py:438 templates/ishtar/sheet_find.html:131
 msgid "Downstream treatment"
 msgstr "Traitement aval"
 
@@ -1014,8 +1015,8 @@ msgstr "Peut supprimer son propre Traitement"
 msgid "TREATMENT"
 msgstr "TRAITEMENT"
 
-#: models_treatments.py:294 templates/ishtar/sheet_find.html:99
-#: templates/ishtar/sheet_find.html:139
+#: models_treatments.py:294 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:142
 msgid "Doer"
 msgstr "Opérateur"
 
@@ -1211,55 +1212,55 @@ msgstr "Opération"
 msgid "Warehouse"
 msgstr "Dépôt"
 
-#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:135
+#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
 msgid "Year - index"
 msgstr "Année - index"
 
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
 msgid "Related finds (max. 15 displayed)"
 msgstr "Mobilier associé (max. 15 affichés)"
 
-#: templates/ishtar/sheet_find.html:125
+#: templates/ishtar/sheet_find.html:127
 msgid "Export as CSV"
 msgstr "Export en CSV"
 
-#: templates/ishtar/sheet_find.html:125 templates/ishtar/sheet_find.html:166
+#: templates/ishtar/sheet_find.html:127 templates/ishtar/sheet_find.html:170
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:175
 msgid "Associated base finds"
 msgstr "Mobilier de base associé"
 
-#: templates/ishtar/sheet_find.html:203
+#: templates/ishtar/sheet_find.html:207
 msgid "Coordinates:"
 msgstr "Cordonnées :"
 
-#: templates/ishtar/sheet_find.html:205
+#: templates/ishtar/sheet_find.html:209
 msgid "X:"
 msgstr "X :"
 
-#: templates/ishtar/sheet_find.html:206
+#: templates/ishtar/sheet_find.html:210
 msgid "Y:"
 msgstr "Y :"
 
-#: templates/ishtar/sheet_find.html:207
+#: templates/ishtar/sheet_find.html:211
 msgid "Z:"
 msgstr "Z :"
 
-#: templates/ishtar/sheet_find.html:210
+#: templates/ishtar/sheet_find.html:214
 msgid "SRID:"
 msgstr "SRID :"
 
-#: templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:230
 msgid "Title"
 msgstr "Titre"
 
-#: templates/ishtar/sheet_find.html:228
+#: templates/ishtar/sheet_find.html:232
 msgid "Authors"
 msgstr "Auteurs"
 
-#: templates/ishtar/sheet_find.html:229
+#: templates/ishtar/sheet_find.html:233
 msgid "Link"
 msgstr "Lien"
 
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index cdb8dd3be..e65aa1011 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -11,8 +11,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-02-06 09:32-0500\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
+"PO-Revision-Date: 2017-02-07 11:33-0500\n"
+"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -146,7 +146,7 @@ msgstr "Est ouvert ?"
 
 #: forms.py:478 forms.py:782 models.py:271
 msgid "In charge"
-msgstr "Responsable"
+msgstr "Responsable du suivi scientifique"
 
 #: forms.py:485 models.py:985
 msgid "Scientist in charge"
@@ -733,19 +733,19 @@ msgstr "Scientifique - Organisation (nom)"
 
 #: models.py:242
 msgid "In charge (title)"
-msgstr "Responsable (titre)"
+msgstr "Responsable du suivi scientifique (titre)"
 
 #: models.py:243
 msgid "In charge (surname)"
-msgstr "Responsable (prénom)"
+msgstr "Responsable du suivi scientifique (prénom)"
 
 #: models.py:244
 msgid "In charge (name)"
-msgstr "Responsable (nom)"
+msgstr "Responsable du suivi scientifique (nom)"
 
 #: models.py:245
 msgid "In charge - Organization (name)"
-msgstr "Responsable - Organisation (nom)"
+msgstr "Responsable du suivi scientifique - Organisation (nom)"
 
 #: models.py:250
 msgid "Archaeological sites (reference)"
@@ -757,7 +757,7 @@ msgstr "Date de clôture"
 
 #: models.py:264
 msgid "In charge scientist"
-msgstr "Responsable scientifique"
+msgstr "Responsable du suivi scientifique"
 
 #: models.py:279 models.py:1196
 msgid "File"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index ef36de26d..26167187f 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -195,7 +195,7 @@ msgid "Template"
 msgstr "Patron"
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1541 models.py:2950
+#: forms_common.py:406 models.py:1541 models.py:2953
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:13
 msgid "Town"
@@ -218,8 +218,8 @@ msgstr ""
 "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
 "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
 
-#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2574
-#: models.py:2756 models.py:2818 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:2577
+#: models.py:2759 models.py:2821 templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr "Personne"
 
@@ -232,15 +232,15 @@ msgstr ""
 "pas possible."
 
 #: forms_common.py:170 forms_common.py:327 forms_common.py:451
-#: ishtar_menu.py:75 models.py:2457 models.py:2548
+#: ishtar_menu.py:75 models.py:2460 models.py:2551
 #: templates/ishtar/sheet_organization.html:4
 msgid "Organization"
 msgstr "Organisation"
 
 #: forms_common.py:173 forms_common.py:210 forms_common.py:322
 #: forms_common.py:376 forms_common.py:446 models.py:1096 models.py:1474
-#: models.py:1742 models.py:1758 models.py:1984 models.py:2451 models.py:2560
-#: models.py:2936 templates/ishtar/sheet_organization.html:8
+#: models.py:1742 models.py:1758 models.py:1984 models.py:2454 models.py:2563
+#: models.py:2939 templates/ishtar/sheet_organization.html:8
 #: templates/ishtar/sheet_organization.html:21
 msgid "Name"
 msgstr "Nom"
@@ -288,7 +288,7 @@ msgid "Mobile phone"
 msgstr "Téléphone portable"
 
 #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2151
-#: models.py:2453 models.py:2871 templates/sheet_ope.html:85
+#: models.py:2456 models.py:2874 templates/sheet_ope.html:85
 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
 #: templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:23
@@ -312,7 +312,7 @@ msgstr "Fusionner tous les éléments dans"
 msgid "Organization to merge"
 msgstr "Organisation à fusionner"
 
-#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2558
+#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2561
 #: templates/ishtar/sheet_organization.html:22
 msgid "Surname"
 msgstr "Prénom"
@@ -331,16 +331,16 @@ msgid "Identity"
 msgstr "Identité"
 
 #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2116
-#: models.py:2552 models.py:2554 models.py:2868 templates/sheet_ope.html:104
+#: models.py:2555 models.py:2557 models.py:2871 templates/sheet_ope.html:104
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Title"
 msgstr "Titre"
 
-#: forms_common.py:372 models.py:2556
+#: forms_common.py:372 models.py:2559
 msgid "Salutation"
 msgstr "Formule d'appel"
 
-#: forms_common.py:378 models.py:2562
+#: forms_common.py:378 models.py:2565
 msgid "Raw name"
 msgstr "Nom brut"
 
@@ -400,7 +400,7 @@ msgstr "Nom d'utilisateur"
 msgid "Account search"
 msgstr "Rechercher un compte"
 
-#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2505
+#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2508
 msgid "Person type"
 msgstr "Type de personne"
 
@@ -432,7 +432,7 @@ msgstr "Ce nom d'utilisateur existe déjà."
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: forms_common.py:628 forms_common.py:641 models.py:2951
+#: forms_common.py:628 forms_common.py:641 models.py:2954
 msgid "Towns"
 msgstr "Communes"
 
@@ -448,7 +448,7 @@ msgstr "Seul un choix peut être coché."
 msgid "Documentation informations"
 msgstr "Information sur le document"
 
-#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2843
+#: forms_common.py:775 forms_common.py:823 models.py:2117 models.py:2846
 msgid "Source type"
 msgstr "Type de document"
 
@@ -460,37 +460,37 @@ msgstr "Référence"
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: forms_common.py:783 models.py:2882
+#: forms_common.py:783 models.py:2885
 msgid "Numerical ressource (web address)"
 msgstr "Ressource numérique (adresse web)"
 
-#: forms_common.py:784 models.py:2884
+#: forms_common.py:784 models.py:2887
 msgid "Receipt date"
 msgstr "Date de réception"
 
-#: forms_common.py:786 models.py:2280 models.py:2886
+#: forms_common.py:786 models.py:2283 models.py:2889
 msgid "Creation date"
 msgstr "Date de création"
 
-#: forms_common.py:789 models.py:2889
+#: forms_common.py:789 models.py:2892
 msgid "Receipt date in documentation"
 msgstr "Date de réception en documentation"
 
 #: forms_common.py:791 forms_common.py:827 models.py:377 models.py:689
-#: models.py:2011 models.py:2566 models.py:2896
+#: models.py:2011 models.py:2569 models.py:2899
 msgid "Comment"
 msgstr "Commentaire"
 
 #: forms_common.py:793 forms_common.py:826 models.py:1098 models.py:1762
-#: models.py:1943 models.py:1985 models.py:2895 templates/sheet_ope.html:128
+#: models.py:1943 models.py:1985 models.py:2898 templates/sheet_ope.html:128
 msgid "Description"
 msgstr "Description"
 
-#: forms_common.py:796 models.py:2897
+#: forms_common.py:796 models.py:2900
 msgid "Additional information"
 msgstr "Information supplémentaire"
 
-#: forms_common.py:798 forms_common.py:830 models.py:2899
+#: forms_common.py:798 forms_common.py:830 models.py:2902
 msgid "Has a duplicate"
 msgstr "Existe en doublon"
 
@@ -507,7 +507,7 @@ msgstr ""
 "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
 "ratio est conservé).</p>"
 
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2823
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2826
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr "Auteur"
@@ -520,7 +520,7 @@ msgstr "Informations supplémentaires"
 msgid "Would you like to delete this documentation?"
 msgstr "Voulez-vous supprimer ce document ?"
 
-#: forms_common.py:856 models.py:2118 models.py:2810 models.py:2820
+#: forms_common.py:856 models.py:2118 models.py:2813 models.py:2823
 msgid "Author type"
 msgstr "Type d'auteur"
 
@@ -532,7 +532,7 @@ msgstr "Sélection d'auteur"
 msgid "There are identical authors."
 msgstr "Il y a des auteurs identiques."
 
-#: forms_common.py:893 models.py:2824 models.py:2878
+#: forms_common.py:893 models.py:2827 models.py:2881
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:9
 msgid "Authors"
@@ -578,7 +578,7 @@ msgstr "Fusion automatique"
 msgid "Manual merge"
 msgstr "Fusion manuelle"
 
-#: ishtar_menu.py:109 models.py:2291
+#: ishtar_menu.py:109 models.py:2294
 msgid "Imports"
 msgstr "Imports"
 
@@ -634,7 +634,7 @@ msgstr "Dernier éditeur"
 msgid "Creator"
 msgstr "Créateur"
 
-#: models.py:958 models.py:2962 models.py:3018
+#: models.py:958 models.py:2965 models.py:3021
 msgid "Order"
 msgstr "Ordre"
 
@@ -900,7 +900,7 @@ msgstr "Patron de document"
 msgid "Document templates"
 msgstr "Patrons de document"
 
-#: models.py:1513 models.py:1523 models.py:2275
+#: models.py:1513 models.py:1523 models.py:2278
 msgid "State"
 msgstr "État"
 
@@ -1080,11 +1080,11 @@ msgstr "Importeur - Clé de rapprochement"
 msgid "Importer - Targets keys"
 msgstr "Importeur - Clés de rapprochement"
 
-#: models.py:2119 models.py:2874
+#: models.py:2119 models.py:2877
 msgid "Format"
 msgstr "Format"
 
-#: models.py:2120 models.py:2966
+#: models.py:2120 models.py:2969
 msgid "Operation type"
 msgstr "Type d'opération"
 
@@ -1148,15 +1148,15 @@ msgstr "Type d'identification"
 msgid "Context record relation type"
 msgstr "Type de relations entre Unités d'Enregistrement"
 
-#: models.py:2139 models.py:3024
+#: models.py:2139 models.py:3027
 msgid "Spatial reference system"
 msgstr "Système de référence spatiale"
 
-#: models.py:2140 models.py:2852
+#: models.py:2140 models.py:2855
 msgid "Support type"
 msgstr "Type de support"
 
-#: models.py:2141 models.py:2517
+#: models.py:2141 models.py:2520
 msgid "Title type"
 msgstr "Type de titre"
 
@@ -1222,297 +1222,297 @@ msgstr "Importeur - Type de mise en forme"
 msgid "Importer - Formater types"
 msgstr "Importeur - Types de mise en forme"
 
-#: models.py:2239 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2242 templates/ishtar/dashboards/dashboard_main_detail.html:63
 msgid "Created"
 msgstr "Créé"
 
-#: models.py:2240
+#: models.py:2243
 msgid "Analyse in progress"
 msgstr "Analyse en cours"
 
-#: models.py:2241
+#: models.py:2244
 msgid "Analysed"
 msgstr "Analysé"
 
-#: models.py:2242
+#: models.py:2245
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: models.py:2243
+#: models.py:2246
 msgid "Import in progress"
 msgstr "Import en cours"
 
-#: models.py:2244
+#: models.py:2247
 msgid "Finished with errors"
 msgstr "Terminé avec des erreurs"
 
-#: models.py:2245
+#: models.py:2248
 msgid "Finished"
 msgstr "Terminé"
 
-#: models.py:2246
+#: models.py:2249
 msgid "Archived"
 msgstr "Archivé"
 
-#: models.py:2259
+#: models.py:2262
 msgid "Imported file"
 msgstr "Fichier importé"
 
-#: models.py:2261
+#: models.py:2264
 msgid "Associated images (zip file)"
 msgstr "Images associées (fichier zip)"
 
-#: models.py:2263
+#: models.py:2266
 msgid "Encoding"
 msgstr "Codage"
 
-#: models.py:2265
+#: models.py:2268
 msgid "Skip lines"
 msgstr "Nombre de lignes d'entête"
 
-#: models.py:2266 templates/ishtar/import_list.html:47
+#: models.py:2269 templates/ishtar/import_list.html:47
 msgid "Error file"
 msgstr "Fichier erreur"
 
-#: models.py:2269
+#: models.py:2272
 msgid "Result file"
 msgstr "Fichier résultant"
 
-#: models.py:2272 templates/ishtar/import_list.html:53
+#: models.py:2275 templates/ishtar/import_list.html:53
 msgid "Match file"
 msgstr "Fichier de correspondance"
 
-#: models.py:2278
+#: models.py:2281
 msgid "Conservative import"
 msgstr "Import conservateur"
 
-#: models.py:2283
+#: models.py:2286
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:2285
+#: models.py:2288
 msgid "Remaining seconds"
 msgstr "Secondes restantes"
 
-#: models.py:2290
+#: models.py:2293
 msgid "Import"
 msgstr "Import"
 
-#: models.py:2307
+#: models.py:2310
 msgid "Analyse"
 msgstr "Analyser"
 
-#: models.py:2309 models.py:2312
+#: models.py:2312 models.py:2315
 msgid "Re-analyse"
 msgstr "Analyser de nouveau "
 
-#: models.py:2310
+#: models.py:2313
 msgid "Launch import"
 msgstr "Lancer l'import"
 
-#: models.py:2313
+#: models.py:2316
 msgid "Re-import"
 msgstr "Ré-importer"
 
-#: models.py:2314
+#: models.py:2317
 msgid "Archive"
 msgstr "Archiver"
 
-#: models.py:2316
+#: models.py:2319
 msgid "Unarchive"
 msgstr "Désarchiver"
 
-#: models.py:2317 widgets.py:130 templates/ishtar/form_delete.html:11
+#: models.py:2320 widgets.py:130 templates/ishtar/form_delete.html:11
 msgid "Delete"
 msgstr "Supprimer"
 
-#: models.py:2458
+#: models.py:2461
 msgid "Organizations"
 msgstr "Organisations"
 
-#: models.py:2460
+#: models.py:2463
 msgid "Can view all Organizations"
 msgstr "Peut voir toutes les Organisations"
 
-#: models.py:2461
+#: models.py:2464
 msgid "Can view own Organization"
 msgstr "Peut voir sa propre Organisation"
 
-#: models.py:2462
+#: models.py:2465
 msgid "Can add own Organization"
 msgstr "Peut ajouter sa propre Organisation"
 
-#: models.py:2464
+#: models.py:2467
 msgid "Can change own Organization"
 msgstr "Peut modifier sa propre Organisation"
 
-#: models.py:2466
+#: models.py:2469
 msgid "Can delete own Organization"
 msgstr "Peut supprimer sa propre Organisation"
 
-#: models.py:2501
+#: models.py:2504
 msgid "Groups"
 msgstr "Groupes"
 
-#: models.py:2506
+#: models.py:2509
 msgid "Person types"
 msgstr "Types de personne"
 
-#: models.py:2518
+#: models.py:2521
 msgid "Title types"
 msgstr "Types de titre"
 
-#: models.py:2527
+#: models.py:2530
 msgid "Mr"
 msgstr "M."
 
-#: models.py:2528
+#: models.py:2531
 msgid "Miss"
 msgstr "Mlle"
 
-#: models.py:2529
+#: models.py:2532
 msgid "Mr and Mrs"
 msgstr "M. et Mme"
 
-#: models.py:2530
+#: models.py:2533
 msgid "Mrs"
 msgstr "Mme"
 
-#: models.py:2531
+#: models.py:2534
 msgid "Doctor"
 msgstr "Dr."
 
-#: models.py:2564
+#: models.py:2567
 msgid "Contact type"
 msgstr "Type de contact"
 
-#: models.py:2567 models.py:2631
+#: models.py:2570 models.py:2634
 msgid "Types"
 msgstr "Types"
 
-#: models.py:2570
+#: models.py:2573
 msgid "Is attached to"
 msgstr "Est rattaché à"
 
-#: models.py:2575
+#: models.py:2578
 msgid "Persons"
 msgstr "Personnes"
 
-#: models.py:2577
+#: models.py:2580
 msgid "Can view all Persons"
 msgstr "Peut voir toutes les Personnes"
 
-#: models.py:2578
+#: models.py:2581
 msgid "Can view own Person"
 msgstr "Peut voir sa propre Personne"
 
-#: models.py:2579
+#: models.py:2582
 msgid "Can add own Person"
 msgstr "Peut ajouter sa propre Personne"
 
-#: models.py:2580
+#: models.py:2583
 msgid "Can change own Person"
 msgstr "Peut modifier sa propre Personne"
 
-#: models.py:2581
+#: models.py:2584
 msgid "Can delete own Person"
 msgstr "Peut supprimer sa propre Personne"
 
-#: models.py:2759
+#: models.py:2762
 msgid "Advanced shortcut menu"
 msgstr "Menu de raccourci (avancé)"
 
-#: models.py:2762
+#: models.py:2765
 msgid "Ishtar user"
 msgstr "Utilisateur d'Ishtar"
 
-#: models.py:2763
+#: models.py:2766
 msgid "Ishtar users"
 msgstr "Utilisateurs d'Ishtar"
 
-#: models.py:2805
+#: models.py:2808
 msgid "To modify the password use the form in Auth > User"
 msgstr ""
 "Pour modifier le mot de passe, utilisez le formulaire dans Authentification "
 "> Utilisateurs"
 
-#: models.py:2811
+#: models.py:2814
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: models.py:2844
+#: models.py:2847
 msgid "Source types"
 msgstr "Types de document"
 
-#: models.py:2853
+#: models.py:2856
 msgid "Support types"
 msgstr "Types de support"
 
-#: models.py:2860
+#: models.py:2863
 msgid "Format type"
 msgstr "Type de format"
 
-#: models.py:2861
+#: models.py:2864
 msgid "Format types"
 msgstr "Types de format"
 
-#: models.py:2869
+#: models.py:2872
 msgid "External ID"
 msgstr "Identifiant externe"
 
-#: models.py:2872
+#: models.py:2875
 msgid "Support"
 msgstr "Support"
 
-#: models.py:2876
+#: models.py:2879
 msgid "Scale"
 msgstr "Échelle"
 
-#: models.py:2890
+#: models.py:2893
 msgid "Item number"
 msgstr "Numéro d'élément"
 
-#: models.py:2891
+#: models.py:2894
 msgid "Ref."
 msgstr "Réf."
 
-#: models.py:2894
+#: models.py:2897
 msgid "Internal ref."
 msgstr "Réf. interne"
 
-#: models.py:2937
+#: models.py:2940
 msgid "Surface (m2)"
 msgstr "Surface (m2)"
 
-#: models.py:2938 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2941 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr "Localisation"
 
-#: models.py:2963
+#: models.py:2966
 msgid "Is preventive"
 msgstr "Est du préventif"
 
-#: models.py:2967
+#: models.py:2970
 msgid "Operation types"
 msgstr "Types d'opération"
 
-#: models.py:2996
+#: models.py:2999
 msgid "Preventive"
 msgstr "Préventif"
 
-#: models.py:2997
+#: models.py:3000
 msgid "Research"
 msgstr "Programmé"
 
-#: models.py:3020
+#: models.py:3023
 msgid "Authority name"
 msgstr "Registre"
 
-#: models.py:3021
+#: models.py:3024
 msgid "Authority SRID"
 msgstr "SRID"
 
-#: models.py:3025
+#: models.py:3028
 msgid "Spatial reference systems"
 msgstr "Systèmes de référence spatiale"
 
@@ -2108,7 +2108,6 @@ msgstr "supprimer"
 #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8
 #: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31
 #: templates/ishtar/simple_form.html:7
-#: templates/ishtar/wizard/confirm_wizard.html:42
 #: templates/ishtar/wizard/default_wizard.html:31
 #: templates/ishtar/wizard/search.html:13
 #: templates/ishtar/wizard/validation_bar.html:4
@@ -2516,7 +2515,7 @@ msgstr "Type d'utilisateur"
 msgid "You have entered the following informations:"
 msgstr "Vous avez entré les informations suivantes :"
 
-#: templates/ishtar/wizard/confirm_wizard.html:41
+#: templates/ishtar/wizard/confirm_wizard.html:44
 msgid "Would you like to save them?"
 msgstr "Voulez-vous sauvegarder ces informations ?"
 
diff --git a/version.py b/version.py
index f635dd125..e5d838a62 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 11)
+VERSION = (0, 99, 12)
 
 
 def get_version():