2 files changed, 21 insertions, 25 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index d3eb980c4..48116433c 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -19,26 +19,16 @@
 
 <p class='window-refs'>{% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} &ndash; OA{{item.code_patriarche}}{% endif %}
 </p>
-<p class='window-refs'>{{item.common_name|default:''}}</p>
+<p class='window-refs' title="{% trans 'Name' %}">{{item.common_name|default:''}}</p>
+<p class='window-refs' title="{% trans 'Address' %}">{{item.address|default:''}}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 <h3>{% trans "General"%}</h3>
 <ul class='form-flex'>
-{% field_li "Old code" item.old_code %}
-  <li><label>{%trans "Creation:"%}</label>
-    <span class='value'>
-        {{item.history_creator.ishtaruser.person}}<br/>
-        <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
-    </span>
-  </li>
-  {% if item.history_creation_date != item.last_edition_date %}
-  <li><label>{%trans "Modification:"%}</label>
-    <span class='value'>
-        {{item.history_modifier.ishtaruser.person}}<br/>
-        <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
-    </span>
-  </li>
-  {% endif %}
-{% field_li "Begining date" item.start_date %}
+  {% field_li "Old code" item.old_code %}
+  {% include "ishtar/blocks/sheet_creation_section.html" %}
+  {% trans "Begining date" as begining_date_label %}
+  {% field_li begining_date_label item.start_date %}
 {% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
 {% field_li_detail "Head scientist" item.scientist %}
 {% field_li_detail "In charge" item.in_charge %}
@@ -84,7 +74,7 @@
 {% if item.towns.count %}
 <h3>{% trans "Localisation"%}</h3>
 <ul class='form-flex'>
-{% field_li_multiple "Towns" item.towns %}
+{% field_li "Towns" item.towns_codes|join:" ; "  %}
 {% field_li "Main address" item.associated_file.address %}
 {% field_li "Complement" item.associated_file.address_complement %}
 {% field_li "Postal code" item.associated_file.postal_code %}
@@ -121,30 +111,35 @@
 {% endif %}
 
 {% if item.context_record.count %}
-<h3>{% trans "Context records" %}</h3>
-{% dynamic_table_document '' 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %}
+{% trans "Context records" as cr_lab %}
+{% dynamic_table_document cr_lab 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %}
 {% endif %}
 
-{% trans "Context record relations" as cr_rels %}
 {% if item.context_record_relations_q.count %}
+{% trans "Context record relations" as cr_rels %}
 {% dynamic_table_document cr_rels 'context_records_relations_detail' 'left_record__operation' item.pk '' output %}
 {% endif %}
 
-{% trans "Documents from associated context records" as cr_docs %}
 {% if item.context_record_docs_q.count %}
+{% trans "Documents from associated context records" as cr_docs %}
 {% dynamic_table_document cr_docs 'context_records_docs' 'context_record__operation' item.pk '' output %}
 {% endif %}
 
-{% trans "Finds" as finds %}
 {% 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 %}
 
-{% trans "Documents from associated finds" as finds_docs %}
 {% if item.find_docs_q.count %}
+{% trans "Documents from associated finds" as finds_docs %}
 {% dynamic_table_document finds_docs 'finds_docs' 'find__base_finds__context_record__operation' item.pk '' output %}
 {% endif %}
 
+{% 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 %}
+{% endif %}
+
 <h3>{% trans "Statistics" %}</h3>
 
 <h4>{% trans "Administrative acts" %}</h4>
diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html
index 9b8cbf509..55c48b319 100644
--- a/archaeological_operations/templates/ishtar/sheet_operationsource.html
+++ b/archaeological_operations/templates/ishtar/sheet_operationsource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related operation" item.owner '' item.owner|link_to_window %}
+{% trans "Related operation" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}