Merge branch 'master' into master-importers

Conflicts:
	ishtar_common/fixtures/initial_importtypes-fr.json

5 files changed, 359 insertions, 575 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 219a6adeb..bcc0560b6 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -201,6 +201,7 @@ admin.site.register(models.GlobalVar, GlobalVarAdmin)
 
 class GeneralTypeAdmin(admin.ModelAdmin):
     list_display = ['label', 'txt_idx', 'available', 'comment']
+    search_fields = ('label',)
     actions = ['import_generic', export_as_csv_action()]
     import_generic = gen_import_generic
 
diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index 3c8aab20b..5f3205c74 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -1,22 +1,22 @@
 [
     {
-        "pk": 2, 
+        "pk": 3, 
         "model": "ishtar_common.authortype", 
         "fields": {
-            "comment": "Il y a plusieurs \u00e0 une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", 
+            "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", 
             "available": true, 
-            "txt_idx": "co_author", 
-            "label": "Co-auteur "
+            "txt_idx": "main_author", 
+            "label": "Auteur principal"
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 2, 
         "model": "ishtar_common.authortype", 
         "fields": {
-            "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", 
+            "comment": "Il y a plusieurs auteurs pour une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", 
             "available": true, 
-            "txt_idx": "main_author", 
-            "label": "Auteur principal"
+            "txt_idx": "co_author", 
+            "label": "Co-auteur "
         }
     }, 
     {
@@ -52,49 +52,6 @@
         }
     }, 
     {
-        "pk": 3, 
-        "model": "ishtar_common.persontype", 
-        "fields": {
-            "comment": "Responsables de dossiers d'arch\u00e9ologie", 
-            "available": true, 
-            "txt_idx": "sra_agent", 
-            "groups": [
-                1, 
-                2, 
-                3, 
-                4, 
-                5, 
-                6, 
-                7, 
-                8, 
-                9, 
-                10, 
-                13, 
-                14, 
-                15, 
-                16, 
-                17, 
-                18, 
-                21, 
-                22, 
-                23, 
-                24, 
-                25, 
-                26, 
-                27, 
-                28, 
-                29, 
-                30, 
-                31, 
-                32, 
-                33, 
-                34, 
-                35
-            ], 
-            "label": "Agent SRA (prescripteur)"
-        }
-    }, 
-    {
         "pk": 6, 
         "model": "ishtar_common.persontype", 
         "fields": {
@@ -117,6 +74,28 @@
         }
     }, 
     {
+        "pk": 9, 
+        "model": "ishtar_common.persontype", 
+        "fields": {
+            "comment": "Personnes pouvant intervenir sur les donn\u00e9es d'une op\u00e9ration sans en \u00eatre responsable", 
+            "available": true, 
+            "txt_idx": "collaborator", 
+            "groups": [], 
+            "label": "Collaborateur scientifique"
+        }
+    }, 
+    {
+        "pk": 10, 
+        "model": "ishtar_common.persontype", 
+        "fields": {
+            "comment": "Personne demandant une action sur le mobilier (traitements)", 
+            "available": true, 
+            "txt_idx": "applicant", 
+            "groups": [], 
+            "label": "Demandeur"
+        }
+    }, 
+    {
         "pk": 5, 
         "model": "ishtar_common.persontype", 
         "fields": {
@@ -128,25 +107,53 @@
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 3, 
         "model": "ishtar_common.persontype", 
         "fields": {
-            "comment": "Article 13 D\u00e9cret 2004\r\n\r\nLe pr\u00e9fet de r\u00e9gion \u00e9dicte les prescriptions arch\u00e9ologiques, d\u00e9livre l'autorisation de fouille et d\u00e9signe le responsable scientifique de toute op\u00e9ration d'arch\u00e9ologie pr\u00e9ventive.\r\n\r\nLe responsable scientifique est l'interlocuteur du pr\u00e9fet de r\u00e9gion et le garant de la qualit\u00e9 scientifique de l'op\u00e9ration arch\u00e9ologique. A ce titre, il prend, dans le cadre de la mise en oeuvre du projet d'intervention de l'op\u00e9rateur, les d\u00e9cisions relatives \u00e0 la conduite scientifique de l'op\u00e9ration et \u00e0 l'\u00e9laboration du rapport dont il dirige la r\u00e9daction. Il peut \u00eatre diff\u00e9rent pour la r\u00e9alisation du diagnostic et pour la r\u00e9alisation de la fouille.", 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "head_scientist", 
+            "txt_idx": "sra_agent", 
             "groups": [
                 30, 
+                31, 
                 32, 
+                2, 
                 1, 
                 4, 
+                3, 
+                5, 
+                7, 
                 6, 
+                8, 
+                9, 
+                10, 
+                13, 
+                14, 
                 15, 
+                16, 
+                17, 
+                18, 
                 21, 
+                22, 
+                23, 
+                24, 
                 25, 
-                33, 
-                34, 
-                35
+                26, 
+                27, 
+                28, 
+                29
             ], 
+            "label": "Responsable de suivi scientifique"
+        }
+    }, 
+    {
+        "pk": 2, 
+        "model": "ishtar_common.persontype", 
+        "fields": {
+            "comment": "Responsable d'op\u00e9ration arch\u00e9ologique", 
+            "available": true, 
+            "txt_idx": "head_scientist", 
+            "groups": [], 
             "label": "Responsable scientifique"
         }
     }, 
@@ -154,7 +161,7 @@
         "pk": 4, 
         "model": "ishtar_common.persontype", 
         "fields": {
-            "comment": "Acc\u00e8s pour les secr\u00e9taires d'un SRA", 
+            "comment": "", 
             "available": true, 
             "txt_idx": "secretarial_dept", 
             "groups": [
@@ -178,14 +185,14 @@
                 28, 
                 29
             ], 
-            "label": "Secr\u00e9tariat SRA"
+            "label": "Secr\u00e9tariat"
         }
-    },
+    }, 
     {
         "pk": 5, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations", 
+            "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations.", 
             "available": true, 
             "txt_idx": "general_contractor", 
             "label": "Am\u00e9nageur"
@@ -195,7 +202,7 @@
         "pk": 7, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement", 
+            "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement.", 
             "available": true, 
             "txt_idx": "volunteer", 
             "label": "Association de b\u00e9n\u00e9voles"
@@ -205,7 +212,7 @@
         "pk": 6, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "Laboratoire de recherche du CNRS. Peut-\u00eatre une UMR et donc int\u00e9gr\u00e9 des chercheurs de l'universit\u00e9. n'inclus pas les \"laboratoires\" priv\u00e9s", 
+            "comment": "Laboratoire de recherche public (CNRS). Peut \u00eatre une UMR et donc int\u00e9grer des chercheurs de l'universit\u00e9. ", 
             "available": true, 
             "txt_idx": "research_laboratory", 
             "label": "Laboratoire de recherche"
@@ -245,7 +252,7 @@
         "pk": 2, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "D\u00e9cret 2004\r\n\r\n\"Op\u00e9rateurs\" les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", 
+            "comment": "Selon le d\u00e9cret n\u00b0 2004-490 qui d\u00e9nomme \u00ab Op\u00e9rateurs \u00bb les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", 
             "available": true, 
             "txt_idx": "operator", 
             "label": "Op\u00e9rateur d'arch\u00e9ologie pr\u00e9ventive"
@@ -255,7 +262,7 @@
         "pk": 8, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.)", 
+            "comment": "Les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.).", 
             "available": true, 
             "txt_idx": "planning_service", 
             "label": "Service instructeur"
@@ -275,70 +282,90 @@
         "pk": 11, 
         "model": "ishtar_common.organizationtype", 
         "fields": {
-            "comment": "Par exmple une mairie portant un projet de fouille programm\u00e9e", 
+            "comment": "Par exemple une mairie portant un projet de fouille programm\u00e9e.", 
             "available": true, 
             "txt_idx": "public_struct", 
             "label": "Structure publique porteuse de projet programm\u00e9"
         }
     }, 
     {
-        "pk": 11, 
+        "pk": 18, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": null, 
-            "available": false, 
-            "txt_idx": "RI", 
-            "label": "Rapport interm\u00e9diaire"
+            "comment": "", 
+            "available": true, 
+            "txt_idx": "waterpaint", 
+            "label": "Aquarelle"
         }
     }, 
     {
-        "pk": 12, 
+        "pk": 17, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": null, 
-            "available": false, 
-            "txt_idx": "RF", 
-            "label": "Rapport final"
+            "comment": "", 
+            "available": true, 
+            "txt_idx": "comics_book", 
+            "label": "Bande dessin\u00e9e"
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 14, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "survey_report", 
-            "label": "Rapport de sondage"
+            "txt_idx": "Mesh", 
+            "label": "Mod\u00e8le 3D (mesh)"
         }
     }, 
     {
-        "pk": 4, 
+        "pk": 15, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "diagnostic_report", 
-            "label": "Rapport de diagnostic"
+            "txt_idx": "point_cloud", 
+            "label": "Mod\u00e8le 3D (nuage de points)"
         }
     }, 
     {
-        "pk": 9, 
+        "pk": 10, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", 
+            "comment": "", 
             "available": true, 
-            "txt_idx": "thematic_survey_report", 
-            "label": "Rapport de prospection th\u00e9matique"
+            "txt_idx": "undefined", 
+            "label": "Non pr\u00e9cis\u00e9"
         }
     }, 
     {
-        "pk": 10, 
+        "pk": 21, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "txt_idx": "undefined", 
-            "label": "Non pr\u00e9cis\u00e9"
+            "txt_idx": "photo_negative", 
+            "label": "Photographie argentique (n\u00e9gatif)"
+        }
+    }, 
+    {
+        "pk": 1, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "Tirage de photographie argentique.", 
+            "available": true, 
+            "txt_idx": "photo_print", 
+            "label": "Photographie argentique (tirage)"
+        }
+    }, 
+    {
+        "pk": 5, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "Source photographique num\u00e9rique.", 
+            "available": true, 
+            "txt_idx": "digital_photo", 
+            "label": "Photographie num\u00e9rique"
         }
     }, 
     {
@@ -352,6 +379,46 @@
         }
     }, 
     {
+        "pk": 20, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "txt_idx": "digital_x_ray", 
+            "label": "Radiographie num\u00e9rique"
+        }
+    }, 
+    {
+        "pk": 6, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "Rapport de laboratoire d'analyse.", 
+            "available": true, 
+            "txt_idx": "lab_report", 
+            "label": "Rapport d'analyse"
+        }
+    }, 
+    {
+        "pk": 4, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", 
+            "available": true, 
+            "txt_idx": "diagnostic_report", 
+            "label": "Rapport de diagnostic"
+        }
+    }, 
+    {
+        "pk": 19, 
+        "model": "ishtar_common.sourcetype", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "txt_idx": "stange_report", 
+            "label": "Rapport de nature ind\u00e9termin\u00e9e"
+        }
+    }, 
+    {
         "pk": 8, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
@@ -362,33 +429,33 @@
         }
     }, 
     {
-        "pk": 7, 
+        "pk": 9, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", 
+            "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", 
             "available": true, 
-            "txt_idx": "restoration_report", 
-            "label": "Rapport de restauration"
+            "txt_idx": "thematic_survey_report", 
+            "label": "Rapport de prospection th\u00e9matique"
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 7, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Rapport de laboratoire d'analyse.", 
+            "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", 
             "available": true, 
-            "txt_idx": "lab_report", 
-            "label": "Rapport d'analyse"
+            "txt_idx": "restoration_report", 
+            "label": "Rapport de restauration"
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 3, 
         "model": "ishtar_common.sourcetype", 
         "fields": {
-            "comment": "Source photographique num\u00e9rique.", 
+            "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", 
             "available": true, 
-            "txt_idx": "digital_photo", 
-            "label": "Photographie num\u00e9rique"
+            "txt_idx": "survey_report", 
+            "label": "Rapport de sondage"
         }
     }, 
     {
@@ -402,16 +469,6 @@
         }
     }, 
     {
-        "pk": 1, 
-        "model": "ishtar_common.sourcetype", 
-        "fields": {
-            "comment": "Photographie argentique sous une forme imprim\u00e9e.", 
-            "available": true, 
-            "txt_idx": "photo_print", 
-            "label": "\u00c9preuve de photographie argentique"
-        }
-    },
-    {
         "pk": 115, 
         "model": "ishtar_common.operationtype", 
         "fields": {
@@ -532,6 +589,18 @@
         }
     }, 
     {
+        "pk": 133, 
+        "model": "ishtar_common.operationtype", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "label": "\u00c0 d\u00e9terminer", 
+            "preventive": false, 
+            "order": 1, 
+            "txt_idx": "unknown"
+        }
+    }, 
+    {
         "pk": 118, 
         "model": "ishtar_common.operationtype", 
         "fields": {
@@ -556,6 +625,18 @@
         }
     }, 
     {
+        "pk": 132, 
+        "model": "ishtar_common.operationtype", 
+        "fields": {
+            "comment": null, 
+            "available": true, 
+            "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", 
+            "preventive": false, 
+            "order": 1, 
+            "txt_idx": "arch_diagnostic_research"
+        }
+    }, 
+    {
         "pk": 131, 
         "model": "ishtar_common.operationtype", 
         "fields": {
@@ -736,27 +817,27 @@
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 134, 
         "model": "ishtar_common.operationtype", 
         "fields": {
-            "comment": "Une campagne de prospection sur un th\u00e8me particulier", 
+            "comment": "", 
             "available": true, 
-            "label": "Prospection th\u00e9matique", 
+            "label": "Prospection sondage", 
             "preventive": false, 
             "order": 1, 
-            "txt_idx": "thematic_survey"
+            "txt_idx": "survey_dig"
         }
     }, 
     {
-        "pk": 116, 
+        "pk": 5, 
         "model": "ishtar_common.operationtype", 
         "fields": {
-            "comment": "", 
-            "available": false, 
+            "comment": "Une campagne de prospection sur un th\u00e8me particulier", 
+            "available": true, 
             "label": "Prospection th\u00e9matique", 
             "preventive": false, 
             "order": 1, 
-            "txt_idx": "thematic_prospection"
+            "txt_idx": "thematic_survey"
         }
     }, 
     {
@@ -794,451 +875,145 @@
             "order": 1, 
             "txt_idx": "sampling"
         }
-    },
-    {
-        "pk": 115, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Autre \u00e9tude", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "other_study"
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "Une op\u00e9ration arch\u00e9ologique visant \u00e0 qualifier et quantifier la pr\u00e9sence de vestiges sur une surface donn\u00e9e.", 
-            "available": true, 
-            "label": "Diagnostic arch\u00e9ologique", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "arch_diagnostic"
-        }
     }, 
     {
-        "pk": 7, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "\u00c9tude de b\u00e2ti (pr\u00e9ventif)", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "building_study"
-        }
-    }, 
-    {
-        "pk": 10, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "\u00c9tude documentaire (pr\u00e9ventif)", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "documents_study"
-        }
-    }, 
-    {
-        "pk": 12, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "\u00c9valuation", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "evaluation"
-        }
-    }, 
-    {
-        "pk": 113, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": null, 
-            "available": true, 
-            "label": "Fouille ancienne", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "ancient_excavation"
-        }
-    }, 
-    {
-        "pk": 2, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "A pr\u00e9ciser", 
-            "available": true, 
-            "label": "Fouille arch\u00e9ologique pr\u00e9ventive", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "prev_excavation"
-        }
-    }, 
-    {
-        "pk": 123, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": false, 
-            "label": "Prospection inventaire (pr\u00e9ventif)", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "inventory_survey"
-        }
-    }, 
-    {
-        "pk": 124, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": null, 
-            "available": false, 
-            "label": "Prospection (pr\u00e9ventif)", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "survey"
-        }
-    }, 
-    {
-        "pk": 22, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 5, 
+        "model": "ishtar_common.titletype", 
         "fields": {
             "comment": null, 
             "available": true, 
-            "label": "Sauvetage urgent", 
-            "preventive": true, 
-            "order": 1, 
-            "txt_idx": "emergency_excavation"
-        }
-    }, 
-    {
-        "pk": 118, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Aide \u00e0 la pr\u00e9paration de publication", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "assistance_preparation_help"
-        }
-    }, 
-    {
-        "pk": 130, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Aide \u00e0 l'\u00e9dition", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "AE"
+            "txt_idx": "dr", 
+            "label": "Dr."
         }
     }, 
     {
-        "pk": 132, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 1, 
+        "model": "ishtar_common.titletype", 
         "fields": {
             "comment": null, 
             "available": true, 
-            "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "arch_diagnostic_research"
-        }
-    }, 
-    {
-        "pk": 131, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Diffusion (pour les colloques, expo, s\u00e9minaires...)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "communication"
-        }
-    }, 
-    {
-        "pk": 8, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "\u00c9tude de b\u00e2ti (programm\u00e9)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "building_study_research"
-        }
-    }, 
-    {
-        "pk": 11, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "\u00c9tude documentaire (programm\u00e9)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "documents_study_research"
+            "txt_idx": "mr", 
+            "label": "M."
         }
     }, 
     {
         "pk": 3, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Fouille arch\u00e9ologique programm\u00e9e", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "prog_excavation"
-        }
-    }, 
-    {
-        "pk": 13, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Fouille arch\u00e9ologique programm\u00e9e pluriannuelle", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "prog_excavation_multiyear"
-        }
-    }, 
-    {
-        "pk": 122, 
-        "model": "ishtar_common.operationtype", 
+        "model": "ishtar_common.titletype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "label": "Programme d'analyses", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "analysis_program"
+            "txt_idx": "mr-and-mrs", 
+            "label": "M. et Mme"
         }
     }, 
     {
-        "pk": 16, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 2, 
+        "model": "ishtar_common.titletype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "label": "Projet Collectif de Recherche", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "collective_research_project"
+            "txt_idx": "miss", 
+            "label": "Mlle"
         }
     }, 
     {
-        "pk": 14, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 4, 
+        "model": "ishtar_common.titletype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "label": "Prospection a\u00e9rienne", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "aerial_survey_research"
-        }
-    }, 
-    {
-        "pk": 126, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": false, 
-            "label": "Prospection a\u00e9rienne (pr\u00e9ventif)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "aerial_survey"
+            "txt_idx": "mrs", 
+            "label": "Mme"
         }
     }, 
     {
-        "pk": 117, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 1, 
+        "model": "ishtar_common.supporttype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "label": "Prospection avec mat\u00e9riel sp\u00e9cialis\u00e9", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "specialized_eqp_prospection"
+            "txt_idx": "tracing-paper", 
+            "label": "Papier calque"
         }
     }, 
     {
-        "pk": 20, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 2, 
+        "model": "ishtar_common.supporttype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "label": "Prospection avec relev\u00e9 d'art rupestre", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "rock_art_survey"
+            "txt_idx": "graph-paper", 
+            "label": "Papier millim\u00e9tr\u00e9"
         }
     }, 
     {
-        "pk": 120, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 3, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "841 \u00d7 1189 mm", 
             "available": true, 
-            "label": "Prospection d\u00e9tecteur de m\u00e9taux", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "metal_detector_prospection"
-        }
-    }, 
-    {
-        "pk": 114, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": false, 
-            "label": "Prospection diachronique", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "diachronic_prospection"
+            "txt_idx": "a0", 
+            "label": "A0"
         }
     }, 
     {
-        "pk": 17, 
-        "model": "ishtar_common.operationtype", 
+        "pk": 4, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": "", 
+            "comment": "594 \u00d7 841 mm", 
             "available": true, 
-            "label": "Prospection inventaire", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "inventory_survey_research"
-        }
-    }, 
-    {
-        "pk": 18, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": false, 
-            "label": "Prospection (programm\u00e9)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "survey_research"
+            "txt_idx": "a1", 
+            "label": "A1"
         }
     }, 
     {
         "pk": 5, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "Une campagne de prospection sur un th\u00e8me particulier", 
-            "available": true, 
-            "label": "Prospection th\u00e9matique", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "thematic_survey"
-        }
-    }, 
-    {
-        "pk": 116, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": false, 
-            "label": "Prospection th\u00e9matique", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "thematic_prospection"
-        }
-    }, 
-    {
-        "pk": 121, 
-        "model": "ishtar_common.operationtype", 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "420 \u00d7 594 mm", 
             "available": true, 
-            "label": "Relev\u00e9 d'art rupestre", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "cave_art_record"
+            "txt_idx": "a2", 
+            "label": "A2"
         }
     }, 
     {
-        "pk": 21, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "Pas assez gros pour \u00eatre une fouille, mais porte n\u00e9anmoins atteinte au sous-sol.", 
-            "available": false, 
-            "label": "Sondage", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "sampling_research"
-        }
-    }, 
-    {
-        "pk": 127, 
-        "model": "ishtar_common.operationtype", 
-        "fields": {
-            "comment": "", 
-            "available": true, 
-            "label": "Sondage (programm\u00e9)", 
-            "preventive": false, 
-            "order": 1, 
-            "txt_idx": "sampling"
-        }
-    },
-    {
-        "pk": 25, 
-        "model": "ishtar_common.titletype", 
-        "fields": {
-            "comment": null, 
-            "available": true, 
-            "txt_idx": "dr", 
-            "label": "Dr."
-        }
-    }, 
-    {
-        "pk": 21, 
-        "model": "ishtar_common.titletype", 
+        "pk": 2, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "297 \u00d7 420 mm", 
             "available": true, 
-            "txt_idx": "mr", 
-            "label": "M."
+            "txt_idx": "a3", 
+            "label": "A3"
         }
     }, 
     {
-        "pk": 22, 
-        "model": "ishtar_common.titletype", 
+        "pk": 1, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "210 \u00d7 297 mm\r\n", 
             "available": true, 
-            "txt_idx": "ms", 
-            "label": "Mlle"
+            "txt_idx": "a4", 
+            "label": "A4"
         }
     }, 
     {
-        "pk": 24, 
-        "model": "ishtar_common.titletype", 
+        "pk": 6, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "148 \u00d7 210 mm\r\n", 
             "available": true, 
-            "txt_idx": "md", 
-            "label": "Mme"
+            "txt_idx": "a5", 
+            "label": "A5"
         }
     }, 
     {
-        "pk": 23, 
-        "model": "ishtar_common.titletype", 
+        "pk": 7, 
+        "model": "ishtar_common.format", 
         "fields": {
-            "comment": null, 
+            "comment": "105 \u00d7 148 mm", 
             "available": true, 
-            "txt_idx": "mr and miss", 
-            "label": "Mr and Mrs"
+            "txt_idx": "a6", 
+            "label": "A6"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index bb5977227..1b155ddf6 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -664,7 +664,7 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 4, 
-            "description": "Label / Identifiant externe ", 
+            "description": "Identifiant externe ", 
             "regexp_pre_filter": null, 
             "required": true, 
             "label": "Identifiant externe", 
@@ -799,7 +799,7 @@
             "description": "Identifiant parcelle", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": null, 
+            "label": "Parcelle", 
             "importer_type": 5
         }
     }, 
@@ -847,7 +847,7 @@
             "description": "Ref. du contenant / label temporaire utilis\u00e9 pour le mobilier = label libre = Label pour l'instant", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Libell\u00e9 contenant", 
             "importer_type": 5
         }
     }, 
@@ -859,7 +859,7 @@
             "description": "Nombre d'\u00e9l\u00e9ments", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Nombre d'\u00e9l\u00e9ments", 
             "importer_type": 5
         }
     }, 
@@ -871,7 +871,7 @@
             "description": "Poids", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Poids", 
             "importer_type": 5
         }
     }, 
@@ -883,7 +883,7 @@
             "description": "Unit\u00e9 de poids", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Unit\u00e9 de poids", 
             "importer_type": 5
         }
     }, 
@@ -895,7 +895,7 @@
             "description": "Date de d\u00e9couverte", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Date de d\u00e9couverte", 
             "importer_type": 5
         }
     }, 
@@ -907,7 +907,7 @@
             "description": "\u00c9tat de conservation", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "\u00c9tat de conservation", 
             "importer_type": 5
         }
     }, 
@@ -919,7 +919,7 @@
             "description": "Mesure de conservation", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Mesure de conservation", 
             "importer_type": 5
         }
     }, 
@@ -931,7 +931,7 @@
             "description": "Commentaire", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Commentaire", 
             "importer_type": 5
         }
     }, 
@@ -955,7 +955,7 @@
             "description": "Localisation topographique", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Localisation topographique", 
             "importer_type": 5
         }
     }, 
@@ -967,7 +967,7 @@
             "description": "Int\u00e9r\u00eat sp\u00e9cifique", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Int\u00e9r\u00eat sp\u00e9cifique", 
             "importer_type": 5
         }
     }, 
@@ -979,7 +979,7 @@
             "description": "Description", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": null, 
+            "label": "Description", 
             "importer_type": 5
         }
     }, 
@@ -991,7 +991,7 @@
             "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": "CODE OPERATION", 
+            "label": "Code op\u00e9ration", 
             "importer_type": 17
         }
     }, 
@@ -1192,7 +1192,7 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 18, 
-            "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci).", 
+            "description": "Pr\u00e9nom du responsable du suivi scientifique. Exemple\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", 
             "regexp_pre_filter": null, 
             "required": false, 
             "label": "Pr\u00e9nom du responsable du suivi scientifique", 
@@ -1204,7 +1204,7 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 19, 
-            "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci).", 
+            "description": "Nom du responsable du suivi scientifique. Exemple : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", 
             "regexp_pre_filter": null, 
             "required": false, 
             "label": "Nom du responsable du suivi scientifique", 
@@ -1276,7 +1276,7 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 25, 
-            "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage).", 
+            "description": "Date d'avis. Exemple\u00a0: avis de CIRA ou autre selon votre usage.", 
             "regexp_pre_filter": null, 
             "required": false, 
             "label": "Date d'avis", 
@@ -1447,7 +1447,7 @@
             "description": "Code PATRIARCHE ou code UNIQUE de l'op\u00e9ration associ\u00e9e.", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": "CODE OPERATION", 
+            "label": "Code op\u00e9ration", 
             "importer_type": 18
         }
     }, 
@@ -1492,10 +1492,10 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 5, 
-            "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", 
+            "description": "Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": "Label UE", 
+            "label": "Identifiant UE", 
             "importer_type": 18
         }
     }, 
@@ -1747,7 +1747,7 @@
             "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": "CODE OPERATION", 
+            "label": "Code op\u00e9ration", 
             "importer_type": 19
         }
     }, 
@@ -1843,7 +1843,7 @@
             "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", 
             "regexp_pre_filter": null, 
             "required": true, 
-            "label": "CODE OPERATION", 
+            "label": "Code op\u00e9ration", 
             "importer_type": 20
         }
     }, 
@@ -1963,7 +1963,7 @@
             "description": "Type(s) de mat\u00e9riau(x) s\u00e9par\u00e9s par des \"&\". Exemple : \"m\u00e9tal & os\", \"LT\", \"Min\u00e9ral\", \"Granito\u00efde & Basalte & Ardoise\".", 
             "regexp_pre_filter": null, 
             "required": false, 
-            "label": "Materiaux(x)", 
+            "label": "Mat\u00e9riau(x)", 
             "importer_type": 20
         }
     }, 
@@ -2224,7 +2224,7 @@
         "model": "ishtar_common.importercolumn", 
         "fields": {
             "col_number": 33, 
-            "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"2154\" pour le Lambert 93.", 
+            "description": "Code permettant de qualifier le mode de projection des donn\u00e9es (SRS /EPSG). Exemple : \"2154\" pour le Lambert 93.", 
             "regexp_pre_filter": null, 
             "required": false, 
             "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", 
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 458368a35..797aad587 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -6,7 +6,6 @@
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
 msgid ""
 msgstr ""
 
@@ -22,6 +21,10 @@ msgstr ""
 msgid "Related item"
 msgstr ""
 
+#: admin.py:79
+msgid "Export selected as CSV file"
+msgstr ""
+
 #: data_importer.py:182
 #, python-format
 msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
@@ -162,7 +165,7 @@ msgid "Template"
 msgstr ""
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1539 models.py:2940
+#: forms_common.py:406 models.py:1539 models.py:2943
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:13
 msgid "Town"
@@ -179,7 +182,7 @@ msgid ""
 msgstr ""
 
 #: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712
-#: models.py:2567 models.py:2749 models.py:2810
+#: models.py:2567 models.py:2749 models.py:2811
 #: templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr ""
@@ -198,7 +201,7 @@ msgstr ""
 
 #: forms_common.py:173 forms_common.py:210 forms_common.py:322
 #: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472
-#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926
+#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2929
 #: templates/ishtar/sheet_organization.html:8
 #: templates/ishtar/sheet_organization.html:21
 msgid "Name"
@@ -247,7 +250,7 @@ msgid "Mobile phone"
 msgstr ""
 
 #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144
-#: models.py:2446 models.py:2861 templates/sheet_ope.html:85
+#: models.py:2446 models.py:2864 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
@@ -290,7 +293,7 @@ msgid "Identity"
 msgstr ""
 
 #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109
-#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104
+#: models.py:2545 models.py:2547 models.py:2861 templates/sheet_ope.html:104
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Title"
 msgstr ""
@@ -391,7 +394,7 @@ msgstr ""
 msgid "Send the new password by email?"
 msgstr ""
 
-#: forms_common.py:628 forms_common.py:641 models.py:2941
+#: forms_common.py:628 forms_common.py:641 models.py:2944
 msgid "Towns"
 msgstr ""
 
@@ -407,7 +410,7 @@ msgstr ""
 msgid "Documentation informations"
 msgstr ""
 
-#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835
+#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2836
 msgid "Source type"
 msgstr ""
 
@@ -419,37 +422,37 @@ msgstr ""
 msgid "Internal reference"
 msgstr ""
 
-#: forms_common.py:783 models.py:2872
+#: forms_common.py:783 models.py:2875
 msgid "Numerical ressource (web address)"
 msgstr ""
 
-#: forms_common.py:784 models.py:2874
+#: forms_common.py:784 models.py:2877
 msgid "Receipt date"
 msgstr ""
 
-#: forms_common.py:786 models.py:2273 models.py:2876
+#: forms_common.py:786 models.py:2273 models.py:2879
 msgid "Creation date"
 msgstr ""
 
-#: forms_common.py:789 models.py:2879
+#: forms_common.py:789 models.py:2882
 msgid "Receipt date in documentation"
 msgstr ""
 
 #: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687
-#: models.py:2004 models.py:2559 models.py:2886
+#: models.py:2004 models.py:2559 models.py:2889
 msgid "Comment"
 msgstr ""
 
 #: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762
-#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128
+#: models.py:1936 models.py:1978 models.py:2888 templates/sheet_ope.html:128
 msgid "Description"
 msgstr ""
 
-#: forms_common.py:796 models.py:2887
+#: forms_common.py:796 models.py:2890
 msgid "Additional information"
 msgstr ""
 
-#: forms_common.py:798 forms_common.py:830 models.py:2889
+#: forms_common.py:798 forms_common.py:830 models.py:2892
 msgid "Has a duplicate"
 msgstr ""
 
@@ -464,7 +467,7 @@ msgid ""
 "p>"
 msgstr ""
 
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2816
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr ""
@@ -477,7 +480,7 @@ msgstr ""
 msgid "Would you like to delete this documentation?"
 msgstr ""
 
-#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812
+#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2813
 msgid "Author type"
 msgstr ""
 
@@ -489,7 +492,7 @@ msgstr ""
 msgid "There are identical authors."
 msgstr ""
 
-#: forms_common.py:893 models.py:2816 models.py:2868
+#: forms_common.py:893 models.py:2817 models.py:2871
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:9
 msgid "Authors"
@@ -507,7 +510,7 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
-#: ishtar_menu.py:39 models.py:1268 views.py:1548
+#: ishtar_menu.py:39 models.py:1268 views.py:1549
 msgid "Global variables"
 msgstr ""
 
@@ -539,15 +542,15 @@ msgstr ""
 msgid "Imports"
 msgstr ""
 
-#: ishtar_menu.py:112 views.py:1556
+#: ishtar_menu.py:112 views.py:1557
 msgid "New import"
 msgstr ""
 
-#: ishtar_menu.py:116 views.py:1570
+#: ishtar_menu.py:116 views.py:1571
 msgid "Current imports"
 msgstr ""
 
-#: ishtar_menu.py:120 views.py:1606
+#: ishtar_menu.py:120 views.py:1607
 msgid "Old imports"
 msgstr ""
 
@@ -591,7 +594,7 @@ msgstr ""
 msgid "Creator"
 msgstr ""
 
-#: models.py:956 models.py:2952 models.py:3008
+#: models.py:956 models.py:2955 models.py:3011
 msgid "Order"
 msgstr ""
 
@@ -886,11 +889,11 @@ msgstr ""
 msgid "Operation source"
 msgstr ""
 
-#: models.py:1722 views.py:1364 views.py:1414
+#: models.py:1722 views.py:1365 views.py:1415
 msgid "Archaeological files"
 msgstr ""
 
-#: models.py:1724 views.py:1367 views.py:1422
+#: models.py:1724 views.py:1368 views.py:1423
 msgid "Context records"
 msgstr ""
 
@@ -1022,11 +1025,11 @@ msgstr ""
 msgid "Importer - Targets keys"
 msgstr ""
 
-#: models.py:2112 models.py:2851 models.py:2864
+#: models.py:2112 models.py:2867
 msgid "Format"
 msgstr ""
 
-#: models.py:2113 models.py:2956
+#: models.py:2113 models.py:2959
 msgid "Operation type"
 msgstr ""
 
@@ -1090,11 +1093,11 @@ msgstr ""
 msgid "Context record relation type"
 msgstr ""
 
-#: models.py:2132 models.py:3014
+#: models.py:2132 models.py:3017
 msgid "Spatial reference system"
 msgstr ""
 
-#: models.py:2133 models.py:2843
+#: models.py:2133 models.py:2845
 msgid "Support type"
 msgstr ""
 
@@ -1380,75 +1383,79 @@ msgstr ""
 msgid "Author types"
 msgstr ""
 
-#: models.py:2836
+#: models.py:2837
 msgid "Source types"
 msgstr ""
 
-#: models.py:2844
+#: models.py:2846
 msgid "Support types"
 msgstr ""
 
-#: models.py:2852
-msgid "Formats"
+#: models.py:2853
+msgid "Format type"
 msgstr ""
 
-#: models.py:2859
-msgid "External ID"
+#: models.py:2854
+msgid "Format types"
 msgstr ""
 
 #: models.py:2862
+msgid "External ID"
+msgstr ""
+
+#: models.py:2865
 msgid "Support"
 msgstr ""
 
-#: models.py:2866
+#: models.py:2869
 msgid "Scale"
 msgstr ""
 
-#: models.py:2880
+#: models.py:2883
 msgid "Item number"
 msgstr ""
 
-#: models.py:2881
+#: models.py:2884
 msgid "Ref."
 msgstr ""
 
-#: models.py:2884
+#: models.py:2887
 msgid "Internal ref."
 msgstr ""
 
-#: models.py:2927
+#: models.py:2930
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2931 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr ""
 
-#: models.py:2953
+#: models.py:2956
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:2957
+#: models.py:2960
 msgid "Operation types"
 msgstr ""
 
-#: models.py:2986
+#: models.py:2989
 msgid "Preventive"
 msgstr ""
 
-#: models.py:2987
+#: models.py:2990
 msgid "Research"
 msgstr ""
 
-#: models.py:3010
+#: models.py:3013
 msgid "Authority name"
 msgstr ""
 
-#: models.py:3011
+#: models.py:3014
 msgid "Authority SRID"
 msgstr ""
 
-#: models.py:3015
+#: models.py:3018
 msgid "Spatial reference systems"
 msgstr ""
 
@@ -1512,48 +1519,48 @@ msgstr ""
 msgid "Treatment"
 msgstr ""
 
-#: views.py:1303 views.py:1346
+#: views.py:1304 views.py:1347
 msgid "Operation not permitted."
 msgstr ""
 
-#: views.py:1305
+#: views.py:1306
 #, python-format
 msgid "New %s"
 msgstr ""
 
-#: views.py:1365 views.py:1418
+#: views.py:1366 views.py:1419
 msgid "Operations"
 msgstr ""
 
-#: views.py:1369 views.py:1425
+#: views.py:1370 views.py:1426
 msgid "Finds"
 msgstr ""
 
-#: views.py:1618 templates/ishtar/import_list.html:43
+#: views.py:1619 templates/ishtar/import_list.html:43
 msgid "Link unmatched items"
 msgstr ""
 
-#: views.py:1633
+#: views.py:1634
 msgid "Delete import"
 msgstr ""
 
-#: views.py:1672
+#: views.py:1673
 msgid "Merge persons"
 msgstr ""
 
-#: views.py:1696
+#: views.py:1697
 msgid "Select the main person"
 msgstr ""
 
-#: views.py:1705
+#: views.py:1706
 msgid "Merge organization"
 msgstr ""
 
-#: views.py:1715
+#: views.py:1716
 msgid "Select the main organization"
 msgstr ""
 
-#: views.py:1755 views.py:1771
+#: views.py:1756 views.py:1772
 msgid "Corporation manager"
 msgstr ""
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 6e655776d..979b29b33 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2844,8 +2844,9 @@ post_delete.connect(post_save_cache, sender=SupportType)
 
 class Format(GeneralType):
     class Meta:
-        verbose_name = _(u"Format")
-        verbose_name_plural = _(u"Formats")
+        verbose_name = _(u"Format type")
+        verbose_name_plural = _(u"Format types")
+        ordering = ['label']
 post_save.connect(post_save_cache, sender=Format)
 post_delete.connect(post_save_cache, sender=Format)