Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 9 insertions, 5 deletions

diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 2f6bb3291..567f50014 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -36,8 +36,9 @@ admin.site.register(models.Dating, DatingAdmin)
 class ContextRecordAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'length', 'width',
                     'thickness', 'depth')
-    list_filter = ('has_furniture',)
-    search_fields = ('label', 'parcel__operation__common_name', 'datings__period__label')
+    list_filter = ('documentations',)
+    search_fields = ('label', 'parcel__operation__common_name',
+                     'datings__period__label')
     model = models.ContextRecord
 
 admin.site.register(models.ContextRecord, ContextRecordAdmin)
@@ -65,8 +66,10 @@ class RelationTypeAdmin(admin.ModelAdmin):
 
 admin.site.register(models.RelationType, RelationTypeAdmin)
 
+
 class UnitAdmin(admin.ModelAdmin):
-    list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment']
+    list_display = ['label', 'txt_idx', 'parent', 'available', 'order',
+                    'comment']
 
 admin.site.register(models.Unit, UnitAdmin)
 
@@ -77,8 +80,9 @@ class IdentificationTypeAdmin(admin.ModelAdmin):
 admin.site.register(models.IdentificationType, IdentificationTypeAdmin)
 
 
-general_models = [models.DatingType, models.DatingQuality,
-                  models.ActivityType]
+general_models = [
+    models.DatingType, models.DatingQuality, models.DocumentationType,
+    models.ActivityType, models.ExcavationTechnicType]
 for model in general_models:
     admin.site.register(model, GeneralTypeAdmin)