1 files changed, 12 insertions, 1 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 126cbefba..c5d3eb638 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -44,13 +44,19 @@
 {% if item.weight %}{% with item.weight|add:' '|add:item.weight_unit as weight %}
 {% field "Weight" weight %}
 {% endwith %}{% endif %}
+{% field "Weight" item.weight %}
 
 {% field "Find number" item.find_number %}
 {% field "Conservatory state" item.conservatory_state %}
 {% field_multiple "Type of preservation to consider" item.preservation_to_considers %}
 {% field_multiple "Object types" item.object_types %}
 {% field_multiple "Integrity" item.integrities %}
+{% if item.CHECK_DICT %}
 {% field "Checked" item.checked|from_dict:item.CHECK_DICT %}
+{% endif%}
+{% if item.history_object and item.history_object.CHECK_DICT %}
+{% field "Checked" item.checked|from_dict:item.history_object.CHECK_DICT %}
+{% endif%}
 
 {% if item.upstream_treatment %}<p><label>{%trans "Upstream treatment"%}{% trans ":"%}</label>
 <span class='value'>{{item.upstream_treatment}} ({% for up in item.upstream_treatment.upstream_treatment.all %}{% if forloop.counter0 %}, {%endif %}{{up}}{% endfor %})</span></p>{% endif%}
@@ -66,7 +72,12 @@
 <span class='value'>{{base_find.complete_id}}</span></p>
 
 {% field "Short ID" base_find.short_id %}
-{% field "Batch/object" base_find|from_dict:base_find.IS_ISOLATED_DICT %}
+{% if base_find.IS_ISOLATED_DICT %}
+{% field "Batch/object" base_find.batch|from_dict:base_find.IS_ISOLATED_DICT %}
+{% endif %}
+{% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %}
+{% field "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %}
+{% endif %}
 
 {% if base_find.discovery_date %}
 <p><label>{%trans "Discovery date"%}{% trans ":"%}</label>