Fix warehouse division forms

2 files changed, 7 insertions, 12 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 30d48d6bd..feb8b786a 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -3,7 +3,7 @@
 
 {% block head_title %}<strong>{% trans "Warehouse" %}</strong> - {{item.name}} ({{item.warehouse_type}}){% endblock %}
 {% block toolbar %}
-{% window_nav item window_id 'show-warehouse' 'warehouse_modify' '' '' previous next 1 %}
+{% window_nav item window_id 'show-warehouse' 'warehouse_modify' 'show-historized-warehouse' 'revert-warehouse' previous next 1 %}
 {% endblock %}
 
 {% block content %}
@@ -32,7 +32,8 @@
     {% include "ishtar/blocks/sheet_creation_section.html" %}
     {% field_flex_detail "Person in charge" item.person_in_charge %}
     {% field_flex_detail "Organization" item.organization %}
-    {% field_flex "Divisions" item.location_types|join:", " %}
+    {% trans "Default divisions" as def_div_label %}
+    {% field_flex def_div_label item.location_types|join:", " %}
     {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
     {% include "ishtar/blocks/sheet_json.html" %}
 </div>
@@ -57,10 +58,6 @@
 {% dynamic_table_document '' 'containers' 'location_id' item.pk 'TABLE_COLS' output %}
 {% endif %}
 
-{% if item.owned_containers.count %}
-<h4>{% trans "Attached containers" %}</h4>
-{% dynamic_table_document '' 'containers' 'responsible_id' item.pk 'TABLE_COLS' output %}
-{% endif %}
 
 <h3>{% trans "Statistics" %}</h3>
 <small class="centered"><em>{% trans "These numbers are updated hourly" %}</em></small>
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
index cceabb4a0..dff23bc6c 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
@@ -1,10 +1,8 @@
 {% extends "ishtar/wizard/default_wizard.html" %}
 {% load i18n %}
 {% block form_head %}
-{% if wizard.form.readonly %}
-<p class="alert">
-    <i class="fa fa-exclamation-triangle"></i>
-    {% trans "Containers with localisation are associated to this warehouse. You cannot change divisions." %}<br/>
-</p>
-{% endif %}
+<div class="alert alert-info">
+  <i class="fa fa-exclamation-triangle"></i>
+  {% trans "Default division for this warehouse. Theses divisions are only used for imports." %}<br/>
+</div>
 {% endblock %}