diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 15:02:07 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 15:02:07 +0200 |
commit | 96fc326ad4fcfcad645e4d8e7fa9c3daf1dfcf79 (patch) | |
tree | ec252ac69c8a664ba5bff5aa28a844e29a8c3dde /archaeological_warehouse/templates | |
parent | f423a0882d8be220911959ba0206058cafc2d48e (diff) | |
parent | e7e161c2e610b442b4d72d9d749687ff87b993f9 (diff) | |
download | Ishtar-96fc326ad4fcfcad645e4d8e7fa9c3daf1dfcf79.tar.bz2 Ishtar-96fc326ad4fcfcad645e4d8e7fa9c3daf1dfcf79.zip |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse/templates')
-rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index eb31392e4..3d39f9845 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -14,6 +14,7 @@ {% field_li "Person in charge" item.person_in_charge %} {% include "ishtar/blocks/sheet_creation_section.html" %} </ul> +{% include "ishtar/blocks/sheet_address_section.html" %} {% field "Comment" item.comment "<pre>" "</pre>" %} {% if item.containers.count %} |