Merge branch 'develop'

1 files changed, 13 insertions, 3 deletions

diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 6d8d475e4..8801855cd 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -33,6 +33,7 @@
     </div>
 
     <div class="row">
+        {% field_flex_2 "Code DRASSM" item.drassm_code %}
         {% field_flex_2 "Old code" item.old_code %}
         {% trans "Begining date" as begining_date_label %}
         {% field_flex_2 begining_date_label item.start_date|date:"DATE_FORMAT" %}
@@ -195,20 +196,24 @@
 {% dynamic_table_document archaeologicalsites_label 'sites' 'operations' item.pk '' output %}
 {% endif %}
 
+{% if item.grouped_parcels %}
 {% trans "Associated parcels" as parcels_label %}
 {% include "ishtar/blocks/window_tables/parcels.html" %}
+{% endif %}
 
-{% if item.administrative_act %}
+{% if item.administrative_act.count %}
 <h3>{% trans "Administrative acts" %}</h3>
 {% table_administrativact "" item.administrative_act.all %}
 {% endif %}
 
 {% trans "Document from this operation" as operation_docs %}
+{% if permission_view_own_document or permission_view_document %}
 {% if item.documents.count %}
 {% dynamic_table_document operation_docs 'documents' 'operations' item.pk '' output %}
 {% endif %}
+{% endif %}
 
-{% if view_own_contextrecord or view_contextrecord %}
+{% if permission_view_own_contextrecord or permission_view_contextrecord %}
 {% if item.context_record.count %}
 {% trans "Context records" as cr_lab %}
 {% dynamic_table_document cr_lab 'context_records_for_ope' 'operation_id' item.pk 'TABLE_COLS_FOR_OPE' output %}
@@ -219,23 +224,28 @@
 {% dynamic_table_document cr_rels 'context_records_relations_detail' 'left_record__operation' item.pk '' output %}
 {% endif %}
 
+{% if permission_view_own_document or permission_view_document %}
 {% if item.context_record_docs_q.count %}
 {% trans "Documents from associated context records" as cr_docs %}
 {% dynamic_table_document cr_docs 'documents' 'context_records__operation' item.pk '' output %}
 {% endif %}
 {% endif %}
 
+{% endif %}
+
 {% if item.finds %}
 {% trans "Finds" as finds %}
 {% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record__operation' item.pk 'TABLE_COLS_FOR_OPE' output %}
 {% endif %}
 
+{% if permission_view_own_document or permission_view_document %}
 {% if item.find_docs_q.count %}
 {% trans "Documents from associated finds" as finds_docs %}
 {% dynamic_table_document finds_docs 'documents' 'finds__base_finds__context_record__operation' item.pk '' output %}
 {% endif %}
+{% endif %}
 
-{% if view_own_container or view_container %}
+{% if permission_view_own_container or permission_view_container %}
 {% if item.containers_q.count %}
 {% trans "Associated containers" as containers_lbl %}
 {% dynamic_table_document containers_lbl 'containers' 'finds__base_finds__context_record__operation' item.pk '' output %}