summaryrefslogtreecommitdiff
path: root/ishtar/templates/sheet_operation.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-07-10 18:36:48 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-07-10 18:36:48 +0200
commit7dc79581218a205fb5b80ea6db306b77b9bd529b (patch)
treebe8d4564e68a0bf65a2b4f0136621d67f2acf62a /ishtar/templates/sheet_operation.html
parent571aa094f71d152df9a8ce60cd41a0bcad64bd0b (diff)
downloadIshtar-7dc79581218a205fb5b80ea6db306b77b9bd529b.tar.bz2
Ishtar-7dc79581218a205fb5b80ea6db306b77b9bd529b.zip
Disambiguation of closing date and end of excavation work (closes #526)
Diffstat (limited to 'ishtar/templates/sheet_operation.html')
-rw-r--r--ishtar/templates/sheet_operation.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar/templates/sheet_operation.html b/ishtar/templates/sheet_operation.html
index 0005ca82c..aa571d20c 100644
--- a/ishtar/templates/sheet_operation.html
+++ b/ishtar/templates/sheet_operation.html
@@ -13,10 +13,10 @@
<p><label>{%trans "Edition date:"%}</label> <span class='value'>{{ item.history.all.0.history_date }}</span></p> <!-- date = now -->
-{% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p>{%endif%}
-{% if item.end_date %}<p><label>{%trans "Field work end date:"%}</label> <span class='value'>{{ item.end_date|default:"-" }}</span></p>{%endif%}
-
-<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>
+{% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p>
+<p><label>{%trans "Excavation end date:"%}</label> <span class='value'>{{ item.excavation_end_date|default:"-" }}</span></p>
+{%endif%}
+{% if item.in_charge %}<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>{%endif%}
<p><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
{% else %}{%trans "Closed operation"%}</span></p>
<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></p>