Merge branch 'master' into v0.9

1 files changed, 11 insertions, 2 deletions

diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index f5c42c11a..8fc2d9211 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -76,12 +76,21 @@
 {% dynamic_table_document ao 'operations' 'in_charge' item.pk '' output %}
 {% endif %}
 
-
-{% trans "Associated archaelogical files" as af %}
+{% trans "In charge of archaelogical files" as af %}
 {% if item.file_responsability.count %}
 {% dynamic_table_document af 'files' 'in_charge' item.pk '' output %}
 {% endif %}
 
+{% trans "General contractor of archaelogical files" as af %}
+{% if item.general_contractor_files.count %}
+{% dynamic_table_document af 'files' 'general_contractor' item.pk '' output %}
+{% endif %}
+
+{% trans "Responsible for town planning service of archaelogical files" as af %}
+{% if item.responsible_town_planning_service_files.count %}
+{% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %}
+{% endif %}
+
 {% if item.operation_docs_q.count %}
 {% trans "Documents associated to operations" as operation_docs %}
 {% dynamic_table_document operation_docs 'operation_docs' 'person' item.pk '' output %}