diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-05 15:15:41 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-05 15:15:41 +0200 |
| commit | e5001171bc00c4c60070f6e0eea7840c99cbdeb4 (patch) | |
| tree | 5c528867399e26cb0e27334dcf41f9cc84e759d8 /ishtar/templates | |
| parent | bde33272d7c78dff1ead167a7cb2ee69fa0af1ba (diff) | |
| download | Ishtar-e5001171bc00c4c60070f6e0eea7840c99cbdeb4.tar.bz2 Ishtar-e5001171bc00c4c60070f6e0eea7840c99cbdeb4.zip | |
Display cost on Operation sheet (closes #442)
Diffstat (limited to 'ishtar/templates')
| -rw-r--r-- | ishtar/templates/sheet_operation.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar/templates/sheet_operation.html b/ishtar/templates/sheet_operation.html index 1fb2850c1..1b6755385 100644 --- a/ishtar/templates/sheet_operation.html +++ b/ishtar/templates/sheet_operation.html @@ -22,8 +22,8 @@ <p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></p> {% endif %} <p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.operation_type }}</span></p> -{#<p><label>{%trans "Surface:"%}</label> <span class='value'>{{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)</span></p>#} -{% if item.cost %}<p><label>{%trans "Cost:"%}</label> <span class='value'>{{ item.cost }} Euros, ({{ item.cost_by_m2 }} Euros/m<sup>2</sup>)</span></p>{%endif%} +{% if item.surface %}<p><label>{%trans "Surface:"%}</label> <span class='value'>{{ item.surface }} m<sup>2</sup> ({{ item.surface_ha }} ha)</span></p>{% endif %} +{% if item.cost %}<p><label>{%trans "Cost:"%}</label> <span class='value'>{{ item.cost }} €{% if item.cost_by_m2 %}, ({{ item.cost_by_m2 }} €/m<sup>2</sup>){%endif%}</span></p>{%endif%} {% if item.duration %}<p><label>{%trans "Duration:"%}</label> <span class='value'>{{ item.duration }} {%trans "Day"%}s</span></p>{%endif%} <p><label>{%trans "Remains:"%}</label> <span class='value'>{{ item.remains.all|join:", " }}</span></p> |