imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Updated the template variables in the balance sheet in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-21 11:58:50 +08:00
parent 6f47c08c80
commit 3c294ffcb8
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
accounting/templates/accounting/balance-sheet.html
View File

@ -85,11 +85,11 @@ First written: 2020/7/20
<table class="table table-borderless table-hover table-sm balance-sheet-table"> <table class="table table-borderless table-hover table-sm balance-sheet-table">
<thead> <thead>
<tr> <tr>
<th colspan="3" scope="col">{{ section_1.title|title }}</th> <th colspan="3" scope="col">{{ assets.title|title }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for group in section_1.groups %} {% for group in assets.groups %}
<tr class="group-title"> <tr class="group-title">
<td><div>{{ group.title|title }}</div></td> <td><div>{{ group.title|title }}</div></td>
<td class="amount"></td> <td class="amount"></td>
@ -116,11 +116,11 @@ First written: 2020/7/20
<table class="table table-borderless table-hover table-sm balance-sheet-table"> <table class="table table-borderless table-hover table-sm balance-sheet-table">
<thead> <thead>
<tr> <tr>
<th colspan="3" scope="col">{{ section_2.title|title }}</th> <th colspan="3" scope="col">{{ liabilities.title|title }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for group in section_2.groups %} {% for group in liabilities.groups %}
<tr class="group-title"> <tr class="group-title">
<td><div>{{ group.title|title }}</div></td> <td><div>{{ group.title|title }}</div></td>
<td class="amount"></td> <td class="amount"></td>
@ -143,8 +143,8 @@ First written: 2020/7/20
<tfoot> <tfoot>
<tr class="total"> <tr class="total">
<td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td> <td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="amount {% if section_2.balance < 0 %} text-danger {% endif %}"> <td class="amount {% if liabilities.balance < 0 %} text-danger {% endif %}">
{{ section_2.balance|accounting_amount }} {{ liabilities.balance|accounting_amount }}
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -153,11 +153,11 @@ First written: 2020/7/20
<table class="table table-borderless table-hover table-sm balance-sheet-table"> <table class="table table-borderless table-hover table-sm balance-sheet-table">
<thead> <thead>
<tr> <tr>
<th colspan="3" scope="col">{{ section_3.title|title }}</th> <th colspan="3" scope="col">{{ owners_equity.title|title }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for group in section_3.groups %} {% for group in owners_equity.groups %}
<tr class="group-title"> <tr class="group-title">
<td><div>{{ group.title|title }}</div></td> <td><div>{{ group.title|title }}</div></td>
<td class="amount"></td> <td class="amount"></td>
@ -180,8 +180,8 @@ First written: 2020/7/20
<tfoot> <tfoot>
<tr class="total"> <tr class="total">
<td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td> <td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="amount {% if section_3.balance < 0 %} text-danger {% endif %}"> <td class="amount {% if owners_equity.balance < 0 %} text-danger {% endif %}">
{{ section_3.balance|accounting_amount }} {{ owners_equity.balance|accounting_amount }}
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -195,8 +195,8 @@ First written: 2020/7/20
<tfoot> <tfoot>
<tr class="total"> <tr class="total">
<td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td> <td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="text-right align-middle font-italic {% if section_1.balance < 0 %} text-danger {% endif %}"> <td class="text-right align-middle font-italic {% if assets.balance < 0 %} text-danger {% endif %}">
{{ section_1.balance|accounting_amount }} {{ assets.balance|accounting_amount }}
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -208,8 +208,8 @@ First written: 2020/7/20
<tfoot> <tfoot>
<tr class="total"> <tr class="total">
<td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td> <td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="text-right align-middle font-italic {% if section_2.balance|add:section_3.balance < 0 %} text-danger {% endif %}"> <td class="text-right align-middle font-italic {% if liabilities.balance|add:owners_equity.balance < 0 %} text-danger {% endif %}">
{{ section_2.balance|add:section_3.balance|accounting_amount }} {{ liabilities.balance|add:owners_equity.balance|accounting_amount }}
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -228,9 +228,9 @@ First written: 2020/7/20
<div class="col-sm-6"> <div class="col-sm-6">
<ul class="list-group balance-sheet-list"> <ul class="list-group balance-sheet-list">
<li class="list-group-item section-title"> <li class="list-group-item section-title">
{{ section_1.title|title }} {{ assets.title|title }}
</li> </li>
{% for group in section_1.groups %} {% for group in assets.groups %}
<li class="list-group-item d-flex justify-content-between align-items-center group-title"> <li class="list-group-item d-flex justify-content-between align-items-center group-title">
{{ group.title|title }} {{ group.title|title }}
</li> </li>
@ -249,8 +249,8 @@ First written: 2020/7/20
{% endfor %} {% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center grand-total"> <li class="list-group-item d-flex justify-content-between align-items-center grand-total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }} {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if section_1.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill"> <span class="badge {% if assets.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section_1.balance|accounting_amount }} {{ assets.balance|accounting_amount }}
</span> </span>
</li> </li>
</ul> </ul>
@ -259,9 +259,9 @@ First written: 2020/7/20
<div class="col-sm-6"> <div class="col-sm-6">
<ul class="list-group balance-sheet-list"> <ul class="list-group balance-sheet-list">
<li class="list-group-item section-title"> <li class="list-group-item section-title">
{{ section_2.title|title }} {{ liabilities.title|title }}
</li> </li>
{% for group in section_2.groups %} {% for group in liabilities.groups %}
<li class="list-group-item d-flex justify-content-between align-items-center group-title"> <li class="list-group-item d-flex justify-content-between align-items-center group-title">
{{ group.title|title }} {{ group.title|title }}
</li> </li>
@ -280,17 +280,17 @@ First written: 2020/7/20
{% endfor %} {% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center total"> <li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }} {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if section_2.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill"> <span class="badge {% if liabilities.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section_2.balance|accounting_amount }} {{ liabilities.balance|accounting_amount }}
</span> </span>
</li> </li>
</ul> </ul>
<ul class="list-group balance-sheet-list"> <ul class="list-group balance-sheet-list">
<li class="list-group-item section-title"> <li class="list-group-item section-title">
{{ section_3.title|title }} {{ owners_equity.title|title }}
</li> </li>
{% for group in section_3.groups %} {% for group in owners_equity.groups %}
<li class="list-group-item d-flex justify-content-between align-items-center group-title"> <li class="list-group-item d-flex justify-content-between align-items-center group-title">
{{ group.title|title }} {{ group.title|title }}
</li> </li>
@ -310,8 +310,8 @@ First written: 2020/7/20
{% endfor %} {% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center total"> <li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }} {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if section_3.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill"> <span class="badge {% if owners_equity.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section_3.balance|accounting_amount }} {{ owners_equity.balance|accounting_amount }}
</span> </span>
</li> </li>
</ul> </ul>
@ -319,8 +319,8 @@ First written: 2020/7/20
<ul class="list-group balance-sheet-list"> <ul class="list-group balance-sheet-list">
<li class="list-group-item d-flex justify-content-between align-items-center grand-total"> <li class="list-group-item d-flex justify-content-between align-items-center grand-total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }} {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if section_2.balance|add:section_3.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill"> <span class="badge {% if liabilities.balance|add:owners_equity.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section_2.balance|add:section_3.balance|accounting_amount }} {{ liabilities.balance|add:owners_equity.balance|accounting_amount }}
</span> </span>
</li> </li>
</ul> </ul>

6
accounting/views/reports.py
View File

@ -784,9 +784,9 @@ def balance_sheet(request, period_spec):
section.balance = sum([x.balance for x in section.groups]) section.balance = sum([x.balance for x in section.groups])
by_code = {x.code: x for x in sections} by_code = {x.code: x for x in sections}
return render(request, "accounting/balance-sheet.html", { return render(request, "accounting/balance-sheet.html", {
"section_1": by_code["1"], "assets": by_code["1"],
"section_2": by_code["2"], "liabilities": by_code["2"],
"section_3": by_code["3"], "owners_equity": by_code["3"],
"reports": ReportUrl(period=period), "reports": ReportUrl(period=period),
"period": period, "period": period,
}) })