Merge branch 'develop'

1 files changed, 17 insertions, 3 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 1513c7eeb..45050eb2e 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -156,8 +156,13 @@ admin_site.register(models.CommunicabilityType, HierarchicalTypeAdmin)
 
 
 class TreatmentTypeAdmin(GeneralTypeAdmin):
-    list_display = HierarchicalTypeAdmin.list_display + [
-        'order', 'virtual', 'upstream_is_many', 'downstream_is_many']
+    list_display = HierarchicalTypeAdmin.list_display[:-1] + ['order'] + \
+                   [HierarchicalTypeAdmin.list_display[-1]]
+    list_filter = [
+        'virtual', 'destructive', 'create_new_find', 'upstream_is_many',
+        'downstream_is_many', 'destructive', 'change_reference_location',
+        'change_current_location', 'restore_reference_location'
+    ]
     model = models.TreatmentType
 
 
@@ -177,10 +182,19 @@ class ConservatoryStateAdmin(GeneralTypeAdmin):
     list_display = GeneralTypeAdmin.list_display + ['order']
 
 
+@admin.register(models.TreatmentFileType, site=admin_site)
+class TreatmentFileType(GeneralTypeAdmin):
+    list_display = GeneralTypeAdmin.list_display + ["treatment_type"]
+
+
+@admin.register(models.TreatmentState, site=admin_site)
+class TreatmentState(GeneralTypeAdmin):
+    list_display = GeneralTypeAdmin.list_display[:-1] + ["order", "executed"]
+
+
 general_models = [
     models.RemarkabilityType,
     models.IntegrityType,
-    models.TreatmentFileType, models.TreatmentState,
     models.BatchType, models.AlterationCauseType, models.AlterationType,
     models.TreatmentEmergencyType, models.ObjectTypeQualityType,
     models.MaterialTypeQualityType