diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-10-22 12:31:19 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-10-22 12:31:19 +0200 |
| commit | 2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d (patch) | |
| tree | 1f9a6b5a8261502f699927994c308a67369ff11f /archaeological_operations/templates | |
| parent | 1ccc55cd446d9b2e63a8241915afafa566d82dbc (diff) | |
| parent | 00822b4f57c61d5563f1ae4a47640ab1c754843c (diff) | |
| download | Ishtar-2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d.tar.bz2 Ishtar-2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d.zip | |
Merge branch 'decoupage'
Conflicts:
archaeological_operations/admin.py
archaeological_operations/models.py
Diffstat (limited to 'archaeological_operations/templates')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 0b5e58d56..138a94d14 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -84,8 +84,10 @@ {% trans "Associated parcels" as parcels_label %} {% include "ishtar/blocks/window_tables/parcels.html" %} +{% if item.administrative_act %} {% trans "Administrativ acts" as administrativeacts_label %} {% table_administrativact administrativeacts_label item.administrative_act.all %} +{% endif %} {% trans "Document from this operation" as operation_docs %} {% if item.source.count %} {% table_document operation_docs item.source.all %}{% endif %} |