Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 23 insertions, 0 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
new file mode 100644
index 000000000..4a7b2f0b9
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -0,0 +1,23 @@
+{% extends "ishtar/sheet.html" %}
+{% load i18n window_header window_field window_tables %}
+
+{% block head_title %}{% trans "Container" %}{% endblock %}
+
+{% block content %}
+{% window_nav item window_id 'show-container' '' '' '' previous next 1 %}
+
+<ul class='form-flex'>
+    {% field_li "Reference" item.reference %}
+    {% field_li "Container type" item.container_type %}
+    {% field_li_detail "Responsible warehouse" item.responsible %}
+    {% field_li_detail "Location (warehouse)" item.location %}
+</ul>
+{% field "Location" item.precise_location %}
+{% field "Comment" item.comment "<pre>" "</pre>" %}
+
+{% if item.finds.count %}
+<h4>{% trans "Content" %}</h4>
+{% dynamic_table_document finds 'finds' 'container' item.pk 'TABLE_COLS' output 'large' %}
+{% endif %}
+
+{% endblock %}