Merge branch 'master' into v0.9

7 files changed, 939 insertions, 209 deletions

diff --git a/archaeological_context_records/fixtures/initial_data-fr.json b/archaeological_context_records/fixtures/initial_data-fr.json
index 4991e7b66..019940ea3 100644
--- a/archaeological_context_records/fixtures/initial_data-fr.json
+++ b/archaeological_context_records/fixtures/initial_data-fr.json
@@ -6,7 +6,7 @@
             "comment": "Datation fond\u00e9e sur des faits", 
             "available": true, 
             "txt_idx": "sure", 
-            "label": "Aver\u00e9e"
+            "label": "Av\u00e9r\u00e9e"
         }
     }, 
     {
@@ -23,7 +23,7 @@
         "pk": 1, 
         "model": "archaeological_context_records.activitytype", 
         "fields": {
-            "comment": "Unit\u00e9 enregistrement qui n'est pas directement d'origine anthropique", 
+            "comment": "Unit\u00e9 d'enregistrement qui n'est pas directement d'origine anthropique. ", 
             "available": true, 
             "txt_idx": "natural", 
             "order": 1000, 
@@ -34,7 +34,7 @@
         "pk": 2, 
         "model": "archaeological_context_records.activitytype", 
         "fields": {
-            "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme une mur ou un sol am\u00e9nag\u00e9 par exemple", 
+            "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme une mur ou un sol am\u00e9nag\u00e9 par exemple.", 
             "available": true, 
             "txt_idx": "construction", 
             "order": 1100, 
@@ -45,10 +45,10 @@
         "pk": 3, 
         "model": "archaeological_context_records.activitytype", 
         "fields": {
-            "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation", 
+            "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation.", 
             "available": true, 
             "txt_idx": "desertion", 
-            "order": 1300, 
+            "order": 1200, 
             "label": "Abandon"
         }
     }, 
@@ -56,10 +56,10 @@
         "pk": 4, 
         "model": "archaeological_context_records.activitytype", 
         "fields": {
-            "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame", 
+            "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame.", 
             "available": true, 
             "txt_idx": "occupation", 
-            "order": 1200, 
+            "order": 1300, 
             "label": "Occupation"
         }
     }, 
@@ -119,25 +119,25 @@
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 5, 
         "model": "archaeological_context_records.identificationtype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "txt_idx": "geological_level", 
+            "txt_idx": "desertion_level", 
             "order": 1400, 
-            "label": "Niveau g\u00e9ologique"
+            "label": "Niveau d'abandon"
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 6, 
         "model": "archaeological_context_records.identificationtype", 
         "fields": {
             "comment": "", 
             "available": true, 
-            "txt_idx": "desertion_level", 
+            "txt_idx": "geological_level", 
             "order": 1400, 
-            "label": "Niveau d'abandon"
+            "label": "Niveau g\u00e9ologique"
         }
     }, 
     {
@@ -218,15 +218,15 @@
         }
     }, 
     {
-        "pk": 9, 
+        "pk": 13, 
         "model": "archaeological_context_records.unit", 
         "fields": {
-            "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouver en dehors d'un contexte spatialis\u00e9 : mobilier trouver lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", 
+            "comment": "", 
             "available": true, 
             "parent": null, 
-            "label": "Hors contexte", 
+            "label": "Secteur", 
             "order": 1, 
-            "txt_idx": "not_in_context"
+            "txt_idx": "sector"
         }
     }, 
     {
@@ -242,6 +242,30 @@
         }
     }, 
     {
+        "pk": 9, 
+        "model": "archaeological_context_records.unit", 
+        "fields": {
+            "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouver en dehors d'un contexte spatialis\u00e9 : mobilier trouver lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", 
+            "available": true, 
+            "parent": null, 
+            "label": "Hors contexte", 
+            "order": 1, 
+            "txt_idx": "not_in_context"
+        }
+    }, 
+    {
+        "pk": 14, 
+        "model": "archaeological_context_records.unit", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "parent": null, 
+            "label": "Zone", 
+            "order": 2, 
+            "txt_idx": "zone"
+        }
+    }, 
+    {
         "pk": 10, 
         "model": "archaeological_context_records.unit", 
         "fields": {
@@ -365,7 +389,7 @@
         "pk": 1, 
         "model": "archaeological_context_records.datingtype", 
         "fields": {
-            "comment": "D'apr\u00e8s une datation de type C14, OSL, TL, arch\u00e9omagn\u00e9tisme, etc, forunissant une date en BPcal avec une marge.", 
+            "comment": "D'apr\u00e8s une datation de type C14, OSL, TL, arch\u00e9omagn\u00e9tisme, etc, fournissant une date en BP cal avec une marge.", 
             "available": true, 
             "txt_idx": "from_absolute_dating", 
             "label": "D'apr\u00e8s datation absolue"
@@ -375,7 +399,7 @@
         "pk": 2, 
         "model": "archaeological_context_records.datingtype", 
         "fields": {
-            "comment": "Une \u00e9tude du mobilier est la source de datation", 
+            "comment": "Une \u00e9tude du mobilier est la source de datation.", 
             "available": true, 
             "txt_idx": "from_artefact", 
             "label": "D'apr\u00e8s \u00e9tude du mobilier"
@@ -385,47 +409,79 @@
         "pk": 2, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE en remplit une autre (qui doit \u00eatre vraisemblablement une US de creusement)", 
+            "comment": "Une UE en rempli une autre (qui doit \u00eatre vraisemblablement une US de creusement)", 
             "available": true, 
-            "label": "Remplit", 
+            "tiny_label": null, 
+            "label": "Comble", 
             "symmetrical": false, 
-            "inverse_relation": null, 
+            "inverse_relation": 10, 
             "order": 1, 
             "txt_idx": "filling"
         }
     }, 
     {
-        "pk": 4, 
+        "pk": 8, 
+        "model": "archaeological_context_records.relationtype", 
+        "fields": {
+            "comment": "UE recoup\u00e9e par une autre", 
+            "available": true, 
+            "tiny_label": null, 
+            "label": "Coup\u00e9 par", 
+            "symmetrical": false, 
+            "inverse_relation": 1, 
+            "order": 1, 
+            "txt_idx": "cutted"
+        }
+    }, 
+    {
+        "pk": 9, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE est en relation indirecte avec une autre", 
+            "comment": "UE \u00e9quivalant \u00e0 une autre", 
             "available": true, 
-            "label": "Est en relation indirecte avec", 
+            "tiny_label": null, 
+            "label": "\u00c9quivaut \u00e0", 
             "symmetrical": true, 
             "inverse_relation": null, 
             "order": 1, 
-            "txt_idx": "indirect_relation"
+            "txt_idx": "equals"
         }
     }, 
     {
-        "pk": 5, 
+        "pk": 3, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE en inclut (regroupe) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", 
+            "comment": "UE est situ\u00e9e au-dessus d'une autre", 
             "available": true, 
-            "label": "Inclut", 
+            "tiny_label": null, 
+            "label": "Est au-dessus de", 
             "symmetrical": false, 
-            "inverse_relation": 6, 
+            "inverse_relation": 7, 
             "order": 1, 
-            "txt_idx": "include"
+            "txt_idx": "is_above"
+        }
+    }, 
+    {
+        "pk": 10, 
+        "model": "archaeological_context_records.relationtype", 
+        "fields": {
+            "comment": "", 
+            "available": true, 
+            "tiny_label": null, 
+            "label": "Est-combl\u00e9 par", 
+            "symmetrical": false, 
+            "inverse_relation": 2, 
+            "order": 1, 
+            "txt_idx": "filled_by"
         }
     }, 
     {
         "pk": 7, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE est situ\u00e9e en-dessous d'une autre", 
+            "comment": "UE est situ\u00e9e en-dessous d'une autre", 
             "available": true, 
+            "tiny_label": null, 
             "label": "Est en-dessous de", 
             "symmetrical": false, 
             "inverse_relation": 3, 
@@ -434,37 +490,40 @@
         }
     }, 
     {
-        "pk": 3, 
+        "pk": 6, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE est situ\u00e9e au-dessus d'une autre", 
+            "comment": "Cette unit\u00e9 d'enregistrement fait partie d'une autre", 
             "available": true, 
-            "label": "Est au-dessus de", 
+            "tiny_label": null, 
+            "label": "Est inclus dans", 
             "symmetrical": false, 
-            "inverse_relation": 7, 
+            "inverse_relation": 5, 
             "order": 1, 
-            "txt_idx": "is_above"
+            "txt_idx": "is_included"
         }
     }, 
     {
-        "pk": 8, 
+        "pk": 5, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE est recoup\u00e9e par une autre", 
+            "comment": "Cette Unit\u00e9 d\u2019enregistrement en inclut (regroupe) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", 
             "available": true, 
-            "label": "Est coup\u00e9e par", 
+            "tiny_label": null, 
+            "label": "Inclut", 
             "symmetrical": false, 
-            "inverse_relation": 1, 
+            "inverse_relation": 6, 
             "order": 1, 
-            "txt_idx": "cutted"
+            "txt_idx": "include"
         }
     }, 
     {
         "pk": 1, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE en recoupe une autre", 
+            "comment": "UE recoupant une autre", 
             "available": true, 
+            "tiny_label": null, 
             "label": "Recoupe", 
             "symmetrical": false, 
             "inverse_relation": 8, 
@@ -473,29 +532,17 @@
         }
     }, 
     {
-        "pk": 9, 
+        "pk": 4, 
         "model": "archaeological_context_records.relationtype", 
         "fields": {
-            "comment": "Cette UE est \u00e9quivalente \u00e0 une autre", 
+            "comment": "A pr\u00e9ciser ", 
             "available": true, 
-            "label": "\u00c9quivaut \u00e0", 
+            "tiny_label": null, 
+            "label": "Relation indirecte", 
             "symmetrical": true, 
             "inverse_relation": null, 
             "order": 1, 
-            "txt_idx": "equals"
-        }
-    }, 
-    {
-        "pk": 6, 
-        "model": "archaeological_context_records.relationtype", 
-        "fields": {
-            "comment": "Cette UE fait partie d'une autre", 
-            "available": true, 
-            "label": "Est incluse dans", 
-            "symmetrical": false, 
-            "inverse_relation": 5, 
-            "order": 1, 
-            "txt_idx": "is_included"
+            "txt_idx": "indirect_relation"
         }
     }
 ]
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 4a5267654..72cb24097 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -145,6 +145,8 @@ class RecordFormGeneral(ManageOldType, forms.Form):
     thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False)
     depth = forms.FloatField(label=_(u"Depth (m)"), required=False)
     unit = forms.ChoiceField(label=_("Unit"), required=False, choices=[])
+    has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"),
+                                           required=False)
     location = forms.CharField(
         label=_(u"Location"), widget=forms.Textarea,
         required=False, validators=[validators.MaxLengthValidator(200)])
@@ -154,7 +156,7 @@ class RecordFormGeneral(ManageOldType, forms.Form):
               u"(ratio is preserved).</p>") % {
                 'width': settings.IMAGE_MAX_SIZE[0],
                 'height': settings.IMAGE_MAX_SIZE[1]}),
-        required=False, widget=widgets.ImageFileInput())
+        max_length=255, required=False, widget=widgets.ImageFileInput())
 
     def __init__(self, *args, **kwargs):
         operation = None
@@ -289,8 +291,6 @@ class RecordFormInterpretation(ManageOldType, forms.Form):
     datings_comment = forms.CharField(
         label=_(u"Comments on dating"), required=False,
         widget=forms.Textarea)
-    has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"),
-                                           required=False)
     filling = forms.CharField(label=_(u"Filling"),
                               widget=forms.Textarea, required=False)
     interpretation = forms.CharField(label=_(u"Interpretation"),
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index c2fe20b14..283d5b050 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -7,11 +7,11 @@
 msgid ""
 msgstr ""
 
-#: forms.py:47 forms.py:51 models.py:143 wizards.py:77
+#: forms.py:47 forms.py:51 models.py:164 wizards.py:77
 msgid "Operation"
 msgstr ""
 
-#: forms.py:59 forms.py:137 models.py:145
+#: forms.py:59 forms.py:137 models.py:166
 msgid "ID"
 msgstr ""
 
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Search within operation relations"
 msgstr ""
 
-#: forms.py:77 forms.py:230 models.py:55
+#: forms.py:77 forms.py:232 models.py:55
 msgid "Period"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Search within relations"
 msgstr ""
 
-#: forms.py:111 forms.py:335 views.py:133
+#: forms.py:111 forms.py:335 views.py:88
 msgid "Context record search"
 msgstr ""
 
@@ -63,123 +63,123 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: forms.py:136 models.py:131 models.py:141
+#: forms.py:136 models.py:131 models.py:162
 msgid "Parcel"
 msgstr ""
 
-#: forms.py:139 models.py:146 templates/ishtar/sheet_contextrecord.html:25
+#: forms.py:139 models.py:167 templates/ishtar/sheet_contextrecord.html:27
 msgid "Description"
 msgstr ""
 
-#: forms.py:141 models.py:147
+#: forms.py:141 models.py:168
 msgid "General comment"
 msgstr ""
 
-#: forms.py:143 models.py:151
+#: forms.py:143 models.py:172
 msgid "Length (m)"
 msgstr ""
 
-#: forms.py:144 models.py:152
+#: forms.py:144 models.py:173
 msgid "Width (m)"
 msgstr ""
 
-#: forms.py:145 models.py:153
+#: forms.py:145 models.py:174
 msgid "Thickness (m)"
 msgstr ""
 
-#: forms.py:146 models.py:155
+#: forms.py:146 models.py:176
 msgid "Depth (m)"
 msgstr ""
 
-#: forms.py:147 models.py:163
+#: forms.py:147 models.py:184
 msgid "Unit"
 msgstr ""
 
-#: forms.py:149 models.py:157
+#: forms.py:148 models.py:186
+msgid "Has furniture?"
+msgstr ""
+
+#: forms.py:151 models.py:178
 msgid "Location"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:154
 msgid "Image"
 msgstr ""
 
-#: forms.py:153
+#: forms.py:155
 #, python-format
 msgid ""
 "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
 "p>"
 msgstr ""
 
-#: forms.py:219
+#: forms.py:221
 msgid "This ID already exists for this operation."
 msgstr ""
 
-#: forms.py:225 forms.py:252 models.py:66
+#: forms.py:227 forms.py:254 models.py:66
 msgid "Dating"
 msgstr ""
 
-#: forms.py:231 models.py:56
+#: forms.py:233 models.py:56
 msgid "Start date"
 msgstr ""
 
-#: forms.py:232 models.py:57 models.py:150
+#: forms.py:234 models.py:57 models.py:171
 msgid "End date"
 msgstr ""
 
-#: forms.py:233 models.py:60
+#: forms.py:235 models.py:60
 msgid "Quality"
 msgstr ""
 
-#: forms.py:234 models.py:38 models.py:58
+#: forms.py:236 models.py:38 models.py:58
 msgid "Dating type"
 msgstr ""
 
-#: forms.py:261 ishtar_menu.py:29 models.py:403
+#: forms.py:263 ishtar_menu.py:29 models.py:457
 msgid "Context record"
 msgstr ""
 
-#: forms.py:282
+#: forms.py:284
 msgid "Relations"
 msgstr ""
 
-#: forms.py:286 forms.py:296 models.py:168
-#: templates/ishtar/sheet_contextrecord.html:37
+#: forms.py:288 forms.py:296 models.py:189
+#: templates/ishtar/sheet_contextrecord.html:39
 msgid "Interpretation"
 msgstr ""
 
-#: forms.py:290
+#: forms.py:292
 msgid "Comments on dating"
 msgstr ""
 
-#: forms.py:292 models.py:165
-msgid "Has furniture?"
-msgstr ""
-
-#: forms.py:294 models.py:167
+#: forms.py:294 models.py:188
 msgid "Filling"
 msgstr ""
 
-#: forms.py:298 models.py:188
+#: forms.py:298 models.py:209
 msgid "Activity"
 msgstr ""
 
-#: forms.py:300 models.py:186
+#: forms.py:300 models.py:207
 msgid "Identification"
 msgstr ""
 
-#: forms.py:302 models.py:171
+#: forms.py:302 models.py:192
 msgid "TAQ"
 msgstr ""
 
-#: forms.py:303 models.py:175
+#: forms.py:303 models.py:196
 msgid "Estimated TAQ"
 msgstr ""
 
-#: forms.py:305 models.py:178
+#: forms.py:305 models.py:199
 msgid "TPQ"
 msgstr ""
 
-#: forms.py:306 models.py:182
+#: forms.py:306 models.py:203
 msgid "Estimated TPQ"
 msgstr ""
 
@@ -303,248 +303,248 @@ msgstr ""
 msgid "Identification Types"
 msgstr ""
 
-#: models.py:138
+#: models.py:159
 msgid "External ID"
 msgstr ""
 
-#: models.py:140
+#: models.py:161
 msgid "External ID is set automatically"
 msgstr ""
 
-#: models.py:148
+#: models.py:169
 msgid "Date d'ouverture"
 msgstr ""
 
-#: models.py:158
+#: models.py:179
 msgid "A short description of the location of the context record"
 msgstr ""
 
-#: models.py:161
+#: models.py:182
 msgid "Comment on datings"
 msgstr ""
 
-#: models.py:172
+#: models.py:193
 msgid ""
 "\"Terminus Ante Quem\" the context record can't have been created after this "
 "date"
 msgstr ""
 
-#: models.py:176
+#: models.py:197
 msgid "Estimation of a \"Terminus Ante Quem\""
 msgstr ""
 
-#: models.py:179
+#: models.py:200
 msgid ""
 "\"Terminus Post Quem\" the context record can't have been created before "
 "this date"
 msgstr ""
 
-#: models.py:183
+#: models.py:204
 msgid "Estimation of a \"Terminus Post Quem\""
 msgstr ""
 
-#: models.py:191
+#: models.py:212
 msgid "Point"
 msgstr ""
 
-#: models.py:192
+#: models.py:213
 msgid "Polygon"
 msgstr ""
 
-#: models.py:193
+#: models.py:214
 msgid "Cached name"
 msgstr ""
 
-#: models.py:197 models.py:198 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:218 models.py:219 templates/ishtar/sheet_contextrecord.html:4
 msgid "Context Record"
 msgstr ""
 
-#: models.py:200
+#: models.py:221
 msgid "Can view all Context Records"
 msgstr ""
 
-#: models.py:202
+#: models.py:223
 msgid "Can view own Context Record"
 msgstr ""
 
-#: models.py:204
+#: models.py:225
 msgid "Can add own Context Record"
 msgstr ""
 
-#: models.py:206
+#: models.py:227
 msgid "Can change own Context Record"
 msgstr ""
 
-#: models.py:208
+#: models.py:229
 msgid "Can delete own Context Record"
 msgstr ""
 
-#: models.py:218
+#: models.py:239
 msgctxt "short"
 msgid "Context record"
 msgstr ""
 
-#: models.py:350
+#: models.py:375
 msgid "Inverse relation"
 msgstr ""
 
-#: models.py:354 models.py:378
+#: models.py:379 models.py:403
 msgid "Relation type"
 msgstr ""
 
-#: models.py:355
+#: models.py:380
 msgid "Relation types"
 msgstr ""
 
-#: models.py:373
+#: models.py:398
 msgid "ID (left)"
 msgstr ""
 
-#: models.py:374
+#: models.py:399
 msgid "Unit (left)"
 msgstr ""
 
-#: models.py:375
+#: models.py:400
 msgid "Parcel (left)"
 msgstr ""
 
-#: models.py:376
+#: models.py:401
 msgid "Description (left)"
 msgstr ""
 
-#: models.py:377
+#: models.py:402
 msgid "Periods (left)"
 msgstr ""
 
-#: models.py:379
+#: models.py:404
 msgid "Unit (right)"
 msgstr ""
 
-#: models.py:380 models.py:381
+#: models.py:405 models.py:406
 msgid "Parcel (right)"
 msgstr ""
 
-#: models.py:382
+#: models.py:407
 msgid "Description (right)"
 msgstr ""
 
-#: models.py:383
+#: models.py:408
 msgid "Periods (right)"
 msgstr ""
 
-#: models.py:387
+#: models.py:417
 msgid "Record relation"
 msgstr ""
 
-#: models.py:388
+#: models.py:418
 msgid "Record relations"
 msgstr ""
 
-#: models.py:400
+#: models.py:454
 msgid "Context record documentation"
 msgstr ""
 
-#: models.py:401
+#: models.py:455
 msgid "Context record documentations"
 msgstr ""
 
-#: views.py:143
+#: views.py:98
 msgid "New context record"
 msgstr ""
 
-#: views.py:154
+#: views.py:109
 msgid "Context record modification"
 msgstr ""
 
-#: views.py:168
+#: views.py:123
 msgid "Context record deletion"
 msgstr ""
 
-#: views.py:173
+#: views.py:128
 msgid "Context record: source search"
 msgstr ""
 
-#: views.py:181
+#: views.py:136
 msgid "Context record: new source"
 msgstr ""
 
-#: views.py:189
+#: views.py:144
 msgid "Context record: source modification"
 msgstr ""
 
-#: views.py:204
+#: views.py:159
 msgid "Context record: source deletion"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:14
+#: templates/ishtar/sheet_contextrecord.html:17
 msgid "Complete ID:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:14
+#: templates/ishtar/sheet_contextrecord.html:17
 msgid "Temporary ID:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:49
+#: templates/ishtar/sheet_contextrecord.html:51
 msgid "Datations"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:58
+#: templates/ishtar/sheet_contextrecord.html:60
 msgid "Context record relations"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:65
+#: templates/ishtar/sheet_contextrecord.html:67
 msgid "Operation summary"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:67
+#: templates/ishtar/sheet_contextrecord.html:69
 msgid "Patriarche OA code not yet recorded!"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:76
 msgid "State:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:76
 msgid "Active file"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:76
 msgid "Closed operation"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:76
+#: templates/ishtar/sheet_contextrecord.html:78
 msgid "Closing date:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:76
+#: templates/ishtar/sheet_contextrecord.html:78
 msgid "by"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:84
+#: templates/ishtar/sheet_contextrecord.html:86
 msgid "Localisation"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:85
+#: templates/ishtar/sheet_contextrecord.html:87
 msgid "Towns:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:86
+#: templates/ishtar/sheet_contextrecord.html:88
 msgid "Related operation:"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:88
+#: templates/ishtar/sheet_contextrecord.html:90
 msgid "No operation linked to this context unit!"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:91
+#: templates/ishtar/sheet_contextrecord.html:93
 msgid "Document from this context record"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:96
+#: templates/ishtar/sheet_contextrecord.html:98
 msgid "Finds"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:101
+#: templates/ishtar/sheet_contextrecord.html:103
 msgid "Documents from associated finds"
 msgstr ""
 
diff --git a/archaeological_context_records/migrations/0026_auto__chg_field_contextrecord_image__chg_field_contextrecord_thumbnail.py b/archaeological_context_records/migrations/0026_auto__chg_field_contextrecord_image__chg_field_contextrecord_thumbnail.py
new file mode 100644
index 000000000..d17c902c5
--- /dev/null
+++ b/archaeological_context_records/migrations/0026_auto__chg_field_contextrecord_image__chg_field_contextrecord_thumbnail.py
@@ -0,0 +1,672 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'ContextRecord.image'
+        db.alter_column('archaeological_context_records_contextrecord', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+        # Changing field 'ContextRecord.thumbnail'
+        db.alter_column('archaeological_context_records_contextrecord', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+        # Changing field 'HistoricalContextRecord.image'
+        db.alter_column('archaeological_context_records_historicalcontextrecord', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+        # Changing field 'HistoricalContextRecord.thumbnail'
+        db.alter_column('archaeological_context_records_historicalcontextrecord', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+        # Changing field 'ContextRecordSource.image'
+        db.alter_column('archaeological_context_records_contextrecordsource', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+        # Changing field 'ContextRecordSource.thumbnail'
+        db.alter_column('archaeological_context_records_contextrecordsource', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'ContextRecord.image'
+        db.alter_column('archaeological_context_records_contextrecord', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+        # Changing field 'ContextRecord.thumbnail'
+        db.alter_column('archaeological_context_records_contextrecord', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+        # Changing field 'HistoricalContextRecord.image'
+        db.alter_column('archaeological_context_records_historicalcontextrecord', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+        # Changing field 'HistoricalContextRecord.thumbnail'
+        db.alter_column('archaeological_context_records_historicalcontextrecord', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+        # Changing field 'ContextRecordSource.image'
+        db.alter_column('archaeological_context_records_contextrecordsource', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+        # Changing field 'ContextRecordSource.thumbnail'
+        db.alter_column('archaeological_context_records_contextrecordsource', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+    models = {
+        'archaeological_context_records.activitytype': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_context_records.contextrecord': {
+            'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'},
+            'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}),
+            'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}),
+            'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_context_records_contextrecord'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}),
+            'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}),
+            'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}),
+            'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}),
+            'related_context_records': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.ContextRecord']", 'null': 'True', 'through': "orm['archaeological_context_records.RecordRelations']", 'blank': 'True'}),
+            'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}),
+            'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_context_records.contextrecordsource': {
+            'Meta': {'object_name': 'ContextRecordSource'},
+            'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contextrecordsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_context_records.ContextRecord']"}),
+            'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}),
+            'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),
+            'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}),
+            'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})
+        },
+        'archaeological_context_records.dating': {
+            'Meta': {'object_name': 'Dating'},
+            'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}),
+            'precise_dating': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}),
+            'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_context_records.datingquality': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'DatingQuality'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_context_records.datingtype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'DatingType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_context_records.historicalcontextrecord': {
+            'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalContextRecord'},
+            'activity_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'identification_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'operation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'parcel_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}),
+            'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}),
+            'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'unit_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_context_records.identificationtype': {
+            'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_context_records.recordrelations': {
+            'Meta': {'object_name': 'RecordRelations'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}),
+            'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']"}),
+            'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"})
+        },
+        'archaeological_context_records.relationtype': {
+            'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']", 'null': 'True', 'blank': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_context_records.unit': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'Unit'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_files.file': {
+            'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'},
+            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+            'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', 'null': 'True', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}),
+            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),
+            'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}),
+            'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+            'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),
+            'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),
+            'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.OperationType']"}),
+            'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}),
+            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),
+            'year': ('django.db.models.fields.IntegerField', [], {'default': '2016'})
+        },
+        'archaeological_files.filetype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'FileType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_files.permittype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_files.saisinetype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_operations.archaeologicalsite': {
+            'Meta': {'object_name': 'ArchaeologicalSite'},
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_operations.operation': {
+            'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'},
+            'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}),
+            'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),
+            'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+            'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}),
+            'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['ishtar_common.OperationType']"}),
+            'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+            'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+            'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}),
+            'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}),
+            'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}),
+            'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}),
+            'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),
+            'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_operations.parcel': {
+            'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'},
+            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),
+            'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),
+            'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
+            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}),
+            'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'archaeological_operations.period': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'Period'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+            'start_date': ('django.db.models.fields.IntegerField', [], {}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_operations.remaintype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'archaeological_operations.reportstate': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'ishtar_common.arrondissement': {
+            'Meta': {'object_name': 'Arrondissement'},
+            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'ishtar_common.author': {
+            'Meta': {'object_name': 'Author'},
+            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"})
+        },
+        'ishtar_common.authortype': {
+            'Meta': {'object_name': 'AuthorType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.canton': {
+            'Meta': {'object_name': 'Canton'},
+            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'ishtar_common.department': {
+            'Meta': {'ordering': "['number']", 'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}),
+            'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'})
+        },
+        'ishtar_common.format': {
+            'Meta': {'object_name': 'Format'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.import': {
+            'Meta': {'object_name': 'Import'},
+            'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}),
+            'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"})
+        },
+        'ishtar_common.importertype': {
+            'Meta': {'object_name': 'ImporterType'},
+            'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'})
+        },
+        'ishtar_common.ishtaruser': {
+            'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']},
+            'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}),
+            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'ishtar_common.operationtype': {
+            'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.organization': {
+            'Meta': {'object_name': 'Organization'},
+            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}),
+            'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),
+            'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),
+            'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
+            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'})
+        },
+        'ishtar_common.organizationtype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.person': {
+            'Meta': {'object_name': 'Person'},
+            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}),
+            'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}),
+            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),
+            'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),
+            'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+            'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+            'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}),
+            'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'})
+        },
+        'ishtar_common.persontype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.sourcetype': {
+            'Meta': {'object_name': 'SourceType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.state': {
+            'Meta': {'ordering': "['number']", 'object_name': 'State'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})
+        },
+        'ishtar_common.supporttype': {
+            'Meta': {'object_name': 'SupportType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.titletype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'ishtar_common.town': {
+            'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'},
+            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),
+            'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}),
+            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}),
+            'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['archaeological_context_records']
\ No newline at end of file
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index e1cb216a2..bbfb410f8 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -135,6 +135,27 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
         }
     }
     IMAGE_PREFIX = 'context_records/'
+
+    # search parameters
+    EXTRA_REQUEST_KEYS = {
+        'parcel__town': 'parcel__town__pk',
+        'operation__year': 'operation__year__contains',
+        'operation__code_patriarche': 'operation__code_patriarche',
+        'operation__operation_code': 'operation__operation_code',
+        'datings__period': 'datings__period__pk',
+        'parcel_0': 'operation__parcels__section',
+        'parcel_1': 'operation__parcels__parcel_number',
+        'parcel_2': 'operation__parcels__public_domain',
+        'label': 'label__icontains',
+        'archaeological_sites': 'operation__archaeological_sites__pk',
+        'cached_label': 'cached_label__icontains',
+    }
+    RELATION_TYPES_PREFIX = {'ope_relation_types': 'operation__'}
+    RELATIVE_SESSION_NAMES = [
+        ('operation', 'operation__pk'),
+        ('file', 'operation__associated_file__pk')]
+
+    # fields
     external_id = models.TextField(_(u"External ID"), blank=True, null=True)
     auto_external_id = models.BooleanField(
         _(u"External ID is set automatically"), default=False)
@@ -264,6 +285,10 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
     def _generate_cached_label(self):
         return self.full_label()
 
+    def _get_associated_cached_labels(self):
+        from archaeological_finds.models import Find
+        return list(Find.objects.filter(base_finds__context_record=self).all())
+
     @property
     def reference(self):
         if not self.operation:
@@ -383,6 +408,11 @@ class RecordRelations(GeneralRecordRelations, models.Model):
         "right_record__datings__period": _(u"Periods (right)")
     }
 
+    # search parameters
+    EXTRA_REQUEST_KEYS = {
+        "left_record__operation": "left_record__operation__pk"
+    }
+
     class Meta:
         verbose_name = _(u"Record relation")
         verbose_name_plural = _(u"Record relations")
@@ -396,6 +426,30 @@ class ContextRecordSource(Source):
     TABLE_COLS = ['context_record__operation', 'context_record'] + \
         Source.TABLE_COLS
 
+    # search parameters
+    RELATIVE_SESSION_NAMES = [
+        ('contextrecord', 'context_record__pk'),
+        ('operation', 'context_record__operation__pk'),
+        ('file', 'context_record__operation__associated_file__pk')]
+    BOOL_FIELDS = ['duplicate']
+    EXTRA_REQUEST_KEYS = {
+        'title': 'title__icontains',
+        'description': 'description__icontains',
+        'comment': 'comment__icontains',
+        'person': 'authors__person__pk',
+        'additional_information': 'additional_information__icontains',
+        'context_record__parcel__town': 'context_record__parcel__town__pk',
+        'context_record__operation__year': 'context_record__operation__year',
+        'context_record__operation__operation_code':
+        'context_record__operation__operation_code',
+        'context_record__operation__code_patriarche':
+        'context_record__operation__code_patriarche',
+        'context_record__operation': 'context_record__operation__pk',
+        'context_record__datings__period':
+            'context_record__datings__period__pk',
+        'context_record__unit': 'context_record__unit__pk',
+    }
+
     class Meta:
         verbose_name = _(u"Context record documentation")
         verbose_name_plural = _(u"Context record documentations")
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 907697c9e..e5edb4af5 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -10,6 +10,9 @@
 <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a>
 {% endif%}
 
+<p class='window-refs'>{{ item.parcel.short_label }}</p>
+<p class="window-refs">{{ item.label|default:"" }}</p>
+
 <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 %}
@@ -17,7 +20,6 @@
 {% field_li "Type" item.unit %}
 {% field_li_multiple "Chronology" item.datings %}
 {% field_li "Town" item.parcel.town %}
-{% field_li "Parcel" item.parcel.short_label %}
 </ul>
 {% field "Comment on datings" item.datings_comment "<pre>" "</pre>" %}
 
diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index 0ced39b20..8991e4edd 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -35,20 +35,6 @@ import models
 show_contextrecord = show_item(models.ContextRecord, 'contextrecord')
 revert_contextrecord = revert_item(models.ContextRecord)
 
-contextrecord_extra_keys = {
-    'parcel__town': 'parcel__town__pk',
-    'operation__year': 'operation__year__contains',
-    'operation__code_patriarche': 'operation__code_patriarche',
-    'operation__operation_code': 'operation__operation_code',
-    'datings__period': 'datings__period__pk',
-    'parcel_0': 'operation__parcels__section',
-    'parcel_1': 'operation__parcels__parcel_number',
-    'parcel_2': 'operation__parcels__public_domain',
-    'label': 'label__icontains',
-    'archaeological_sites': 'operation__archaeological_sites__pk',
-    'cached_label': 'cached_label__icontains',
-}
-
 
 def autocomplete_contextrecord(request):
     if (not request.user.has_perm(
@@ -80,16 +66,10 @@ def autocomplete_contextrecord(request):
 
 get_contextrecord = get_item(
     models.ContextRecord,
-    'get_contextrecord', 'contextrecord',
-    relation_types_prefix={'ope_relation_types': 'operation__'},
-    relative_session_names=[
-        ('operation', 'operation__pk'),
-        ('file', 'operation__associated_file__pk')],
-    extra_request_keys=contextrecord_extra_keys,)
+    'get_contextrecord', 'contextrecord')
 get_contextrecord_for_ope = get_item(
     models.ContextRecord,
     'get_contextrecord', 'contextrecord',
-    extra_request_keys=contextrecord_extra_keys,
     own_table_cols=models.ContextRecord.TABLE_COLS_FOR_OPE)
 
 show_contextrecordsource = show_item(models.ContextRecordSource,
@@ -97,36 +77,11 @@ show_contextrecordsource = show_item(models.ContextRecordSource,
 
 get_contextrecordsource = get_item(
     models.ContextRecordSource,
-    'get_contextrecordsource', 'contextrecordsource',
-    relative_session_names=[
-        ('contextrecord', 'context_record__pk'),
-        ('operation', 'context_record__operation__pk'),
-        ('file', 'context_record__operation__associated_file__pk')],
-    bool_fields=['duplicate'],
-    extra_request_keys={
-        'title': 'title__icontains',
-        'description': 'description__icontains',
-        'comment': 'comment__icontains',
-        'person': 'authors__person__pk',
-        'additional_information': 'additional_information__icontains',
-        'context_record__parcel__town': 'context_record__parcel__town__pk',
-        'context_record__operation__year': 'context_record__operation__year',
-        'context_record__operation__operation_code':
-        'context_record__operation__operation_code',
-        'context_record__operation__code_patriarche':
-        'context_record__operation__code_patriarche',
-        'context_record__operation': 'context_record__operation__pk',
-        'context_record__datings__period':
-            'context_record__datings__period__pk',
-        'context_record__unit': 'context_record__unit__pk',
-    })
+    'get_contextrecordsource', 'contextrecordsource')
 
 get_contextrecordrelation = get_item(
     models.RecordRelations, 'get_contextrecordrelation',
-    'contextrecordrelation',
-    extra_request_keys={
-        "left_record__operation": "left_record__operation__pk"
-    })
+    'contextrecordrelation')
 
 record_search_wizard = SearchWizard.as_view([
     ('general-record_search', RecordFormSelection)],