klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-11 04:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix statements

Browse Source
This commit is contained in:
Skia
2016-12-21 13:09:40 +01:00
parent f6d34baf59
commit b07b408ecf
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accounting/templates/accounting/journal_statement_nature.jinja
View File

@ -5,7 +5,7 @@
{% endblock %}
{% macro display_tables(dict) %}
<h5>{% trans %}Credit{% endtrans %}</h5>
<h6>{% trans %}Credit{% endtrans %}</h6>
<table>
<thead>
<tr>
@ -24,7 +24,7 @@
</table>
{% trans %}Total: {% endtrans %}{{ dict['CREDIT_sum'] }}
<h5>{% trans %}Debit{% endtrans %}</h5>
<h6>{% trans %}Debit{% endtrans %}</h6>
<table>
<thead>
<tr>
@ -48,7 +48,7 @@
<h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
{% for k,v in statement.items() %}
<h4>{{ k }}</h4>
<h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ v['CREDIT_sum'] - v['DEBIT_sum'] }}</h4>
{{ display_tables(v) }}
<hr>
{% endfor %}

8
accounting/templates/accounting/journal_statement_person.jinja
View File

@ -22,8 +22,10 @@
<tr>
{% if key.target_type == "OTHER" %}
<td>{{ o.target_label }}</td>
{% else %}
{% elif key %}
<td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
{% else %}
<td></td>
{% endif %}
<td>{{ credit_statement[key] }}</td>
</tr>
@ -48,8 +50,10 @@
<tr>
{% if key.target_type == "OTHER" %}
<td>{{ o.target_label }}</td>
{% else %}
{% elif key %}
<td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
{% else %}
<td></td>
{% endif %}
<td>{{ debit_statement[key] }}</td>
</tr>