Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

7 files changed, 98 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 %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container_pdf.html b/archaeological_warehouse/templates/ishtar/sheet_container_pdf.html
new file mode 100644
index 000000000..5e4947cfa
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_container_pdf.html
@@ -0,0 +1,18 @@
+{% extends "ishtar/sheet_container.html" %}
+{% block header %}
+<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" />
+{% endblock %}
+{% block main_head %}
+{{ block.super }}
+<div id="pdfheader">
+Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
+</div>
+{% endblock %}
+{%block head_sheet%}{%endblock%}
+{%block main_foot%}
+<div id="pdffooter">
+&ndash; <pdf:pagenumber/> &ndash;
+</div>
+</body>
+</html>
+{%endblock%}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container_window.html b/archaeological_warehouse/templates/ishtar/sheet_container_window.html
new file mode 100644
index 000000000..28aeaf9aa
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_container_window.html
@@ -0,0 +1,3 @@
+{% extends "ishtar/sheet_container.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
new file mode 100644
index 000000000..9fd022281
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -0,0 +1,26 @@
+{% extends "ishtar/sheet.html" %}
+{% load i18n window_header window_field window_tables %}
+
+{% block head_title %}{% trans "Warehouse" %}{% endblock %}
+
+{% block content %}
+{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %}
+
+<ul class='form-flex'>
+    {% field_li "Name" item.name %}
+    {% field_li "Warehouse type" item.warehouse_type %}
+    {% field_li "Person in charge" item.person_in_charge %}
+</ul>
+{% field "Comment" item.comment "<pre>" "</pre>" %}
+
+{% if item.containers.count %}
+<h4>{% trans "Containers" %}</h4>
+{% dynamic_table_document '' 'containers' 'location' item.pk 'TABLE_COLS' output %}
+{% endif %}
+
+{% if item.owned_containers.count %}
+<h4>{% trans "Attached containers" %}</h4>
+{% dynamic_table_document '' 'containers' 'responsible' item.pk 'TABLE_COLS' output %}
+{% endif %}
+
+{% endblock %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse_pdf.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse_pdf.html
new file mode 100644
index 000000000..260834ac6
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse_pdf.html
@@ -0,0 +1,18 @@
+{% extends "ishtar/sheet_warehouse.html" %}
+{% block header %}
+<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" />
+{% endblock %}
+{% block main_head %}
+{{ block.super }}
+<div id="pdfheader">
+Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
+</div>
+{% endblock %}
+{%block head_sheet%}{%endblock%}
+{%block main_foot%}
+<div id="pdffooter">
+&ndash; <pdf:pagenumber/> &ndash;
+</div>
+</body>
+</html>
+{%endblock%}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse_window.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse_window.html
new file mode 100644
index 000000000..e77c2c2a3
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse_window.html
@@ -0,0 +1,3 @@
+{% extends "ishtar/sheet_warehouse.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
new file mode 100644
index 000000000..4a21368ae
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
@@ -0,0 +1,7 @@
+{% extends "ishtar/wizard/default_wizard.html" %}
+{% load i18n %}
+{% block form_head %}
+{% if not wizard.form.fields %}
+<p class='warning'>{% trans "No division set for this warehouse. Define it to localise container in this warehouse." %}</p>
+{% endif %}
+{% endblock %}