Improve Operation numbering in accounting

This commit is contained in:
Skia
2016-07-20 18:48:18 +02:00
parent 150147c69f
commit 28aa143f39
8 changed files with 75 additions and 10 deletions

View File

@ -17,6 +17,7 @@
<p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p>
{% endif %}
<table>
<thead>
<tr>
<td>{% trans %}Name{% endtrans %}</td>
<td>{% trans %}Start{% endtrans %}</td>
@ -24,7 +25,10 @@
<td>{% trans %}Amount{% endtrans %}</td>
<td>{% trans %}Effective amount{% endtrans %}</td>
<td>{% trans %}Closed{% endtrans %}</td>
<td>{% trans %}Actions{% endtrans %}</td>
</tr>
</thead>
<tbody>
{% for j in object.journals.all() %}
<tr>
<td>{{ j.name }}</td>
@ -45,5 +49,6 @@
<a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a> </td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}

View File

@ -15,6 +15,7 @@
<p><a href="{{ url('accounting:op_new') }}?parent={{ object.id }}">{% trans %}New operation{% endtrans %}</a></p>
{% endif %}
<table>
<thead>
<tr>
<td>{% trans %}Nb{% endtrans %}</td>
<td>{% trans %}Date{% endtrans %}</td>
@ -28,9 +29,11 @@
<td>{% trans %}Comment{% endtrans %}</td>
<td>{% trans %}Actions{% endtrans %}</td>
</tr>
</thead>
<tbody>
{% for o in object.operations.all() %}
<tr>
<td>{{ o.id }}</td>
<td>{{ o.number }}</td>
<td>{{ o.date }}</td>
<td>{{ o.label }}</td>
<td>{{ o.amount }} €</td>
@ -50,5 +53,6 @@
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}