Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 13 insertions, 3 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index 097f5defd..b84f60883 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -1,10 +1,10 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_field from_dict link_to_window window_tables window_header humanize %}
+{% load i18n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %}
 {% load url from future %}
 
 {% block head_title %}{% trans "Treatment request" %}{% endblock %}
 {% block content %}
-{% window_nav item window_id 'show-treatmentfile' 'treatmentfile_modify' %}
+{% window_nav item window_id 'show-treatmentfile' 'treatmentfile_modify' 'show-historized-treatmentfile' 'revert-treatmentfile' previous next 1 %}
 
 <p class="window-refs">{{ item.name|default:"" }}</p>
 {% if item.internal_reference %}
@@ -42,9 +42,19 @@
 {% field "Contact" item.applicant.address_lbl %}
 {% endif %}
 
-{% trans "Treatments" as treatments %}
 {% if item.treatments.count %}
+{% trans "Treatments" as treatments %}
 {% dynamic_table_document treatments 'treatments' 'file' item.pk '' output '' 'treatment' %}
 {% endif %}
 
+{% if item.source.count %}
+{% trans "Associated documents" as associated_docs %}
+{% dynamic_table_document associated_docs 'treatmentfiles_docs' 'treatment_file' item.pk '' output %}
+{% endif %}
+
+{% if item.administrative_act.count %}
+{% trans "Administrative acts" as admact_lbl %}
+{% table_administrativact admact_lbl item.administrative_act.all %}
+{% endif %}
+
 {% endblock %}