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

Added the mount, debit_amount, and credit_amount properties to replace the run-time balance, total, debit, and credit properties in the Account data model in the accounting application.

Browse Source
This commit is contained in:
依瑪貓
2020-08-02 19:42:48 +08:00
parent bcc394128e
commit b652d090d3
5 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ First written: 2020/7/20
{% for item in group.details %}
<tr>
<td><div class="account">{{ item.title|title }}</div></td>
<td class="amount {% if item.balance < 0 %} text-danger {% endif %}">{{ item.balance|accounting_amount }}</td>
<td class="amount {% if item.amount < 0 %} text-danger {% endif %}">{{ item.amount|accounting_amount }}</td>
<td class="actions">
<a href="{{ item.url }}" class="btn btn-info" role="button">
<i class="fas fa-eye"></i>
@ -126,7 +126,7 @@ First written: 2020/7/20
{% for item in group.details %}
<tr>
<td><div class="account">{{ item.title|title }}</div></td>
<td class="amount {% if item.balance < 0 %} text-danger {% endif %}">{{ item.balance|accounting_amount }}</td>
<td class="amount {% if item.amount < 0 %} text-danger {% endif %}">{{ item.amount|accounting_amount }}</td>
<td class="actions">
<a href="{{ item.url }}" class="btn btn-info" role="button">
<i class="fas fa-eye"></i>
@ -140,8 +140,8 @@ First written: 2020/7/20
<tfoot>
<tr class="total">
<td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="amount {% if liabilities.balance < 0 %} text-danger {% endif %}">
{{ liabilities.balance|accounting_amount }}
<td class="amount {% if liabilities.amount < 0 %} text-danger {% endif %}">
{{ liabilities.amount|accounting_amount }}
</td>
</tr>
</tfoot>
@ -163,7 +163,7 @@ First written: 2020/7/20
{% for item in group.details %}
<tr>
<td><div class="account">{{ item.title|title }}</div></td>
<td class="amount {% if item.balance < 0 %} text-danger {% endif %}">{{ item.balance|accounting_amount }}</td>
<td class="amount {% if item.amount < 0 %} text-danger {% endif %}">{{ item.amount|accounting_amount }}</td>
<td class="actions">
<a href="{{ item.url }}" class="btn btn-info" role="button">
<i class="fas fa-eye"></i>
@ -177,8 +177,8 @@ First written: 2020/7/20
<tfoot>
<tr class="total">
<td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="amount {% if owners_equity.balance < 0 %} text-danger {% endif %}">
{{ owners_equity.balance|accounting_amount }}
<td class="amount {% if owners_equity.amount < 0 %} text-danger {% endif %}">
{{ owners_equity.amount|accounting_amount }}
</td>
</tr>
</tfoot>
@ -192,8 +192,8 @@ First written: 2020/7/20
<tfoot>
<tr class="total">
<td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="text-right align-middle font-italic {% if assets.balance < 0 %} text-danger {% endif %}">
{{ assets.balance|accounting_amount }}
<td class="text-right align-middle font-italic {% if assets.amount < 0 %} text-danger {% endif %}">
{{ assets.amount|accounting_amount }}
</td>
</tr>
</tfoot>
@ -205,8 +205,8 @@ First written: 2020/7/20
<tfoot>
<tr class="total">
<td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="text-right align-middle font-italic {% if liabilities.balance|add:owners_equity.balance < 0 %} text-danger {% endif %}">
{{ liabilities.balance|add:owners_equity.balance|accounting_amount }}
<td class="text-right align-middle font-italic {% if liabilities.amount|add:owners_equity.amount < 0 %} text-danger {% endif %}">
{{ liabilities.amount|add:owners_equity.amount|accounting_amount }}
</td>
</tr>
</tfoot>
@ -236,8 +236,8 @@ First written: 2020/7/20
<a class="list-group-item-action" href="{{ item.url }}">
{{ item.title|title }}
<div class="float-right">
<span class="badge {% if item.balance < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.balance|accounting_amount }}
<span class="badge {% if item.amount < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.amount|accounting_amount }}
</span>
</div>
</a>
@ -246,8 +246,8 @@ First written: 2020/7/20
{% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center grand-total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if assets.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ assets.balance|accounting_amount }}
<span class="badge {% if assets.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ assets.amount|accounting_amount }}
</span>
</li>
</ul>
@ -267,8 +267,8 @@ First written: 2020/7/20
<a class="list-group-item-action" href="{{ item.url }}">
{{ item.title|title }}
<div class="float-right">
<span class="badge {% if item.balance < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.balance|accounting_amount }}
<span class="badge {% if item.amount < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.amount|accounting_amount }}
</span>
</div>
</a>
@ -277,8 +277,8 @@ First written: 2020/7/20
{% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if liabilities.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ liabilities.balance|accounting_amount }}
<span class="badge {% if liabilities.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ liabilities.amount|accounting_amount }}
</span>
</li>
</ul>
@ -297,8 +297,8 @@ First written: 2020/7/20
<a class="list-group-item-action" href="{{ item.url }}">
{{ item.title|title }}
<div class="float-right">
<span class="badge {% if item.balance < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.balance|accounting_amount }}
<span class="badge {% if item.amount < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.amount|accounting_amount }}
</span>
</div>
</a>
@ -307,8 +307,8 @@ First written: 2020/7/20
{% endfor %}
<li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if owners_equity.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ owners_equity.balance|accounting_amount }}
<span class="badge {% if owners_equity.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ owners_equity.amount|accounting_amount }}
</span>
</li>
</ul>
@ -316,8 +316,8 @@ First written: 2020/7/20
<ul class="list-group balance-sheet-list">
<li class="list-group-item d-flex justify-content-between align-items-center grand-total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<span class="badge {% if liabilities.balance|add:owners_equity.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ liabilities.balance|add:owners_equity.balance|accounting_amount }}
<span class="badge {% if liabilities.amount|add:owners_equity.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ liabilities.amount|add:owners_equity.amount|accounting_amount }}
</span>
</li>
</ul>

20
accounting/templates/accounting/income-statement.html
View File

@ -106,7 +106,7 @@ First written: 2020/7/19
{% for item in group.details %}
<tr>
<td><div class="account">{{ item.title|title }}</div></td>
<td class="amount {% if item.balance < 0 %} text-danger {% endif %}">{{ item.balance|accounting_amount }}</td>
<td class="amount {% if item.amount < 0 %} text-danger {% endif %}">{{ item.amount|accounting_amount }}</td>
<td class="amount"></td>
<td class="actions">
<a href="{% url "accounting:ledger" item period %}" class="btn btn-info" role="button">
@ -119,7 +119,7 @@ First written: 2020/7/19
<tr class="total">
<td><div>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</div></td>
<td class="amount"></td>
<td class="amount {% if group.total < 0 %} text-danger {% endif %}">{{ group.total|accounting_amount }}</td>
<td class="amount {% if group.amount < 0 %} text-danger {% endif %}">{{ group.amount|accounting_amount }}</td>
<td class="actions"></td>
</tr>
{% endfor %}
@ -135,7 +135,7 @@ First written: 2020/7/19
<tr class="cumulative-total">
<td><div>{{ section.cumulative_total.title|title }}</div></td>
<td class="amount"></td>
<td class="amount {% if section.cumulative_total.total < 0 %} text-danger {% endif %}">{{ section.cumulative_total.total|accounting_amount }}</td>
<td class="amount {% if section.cumulative_total.amount < 0 %} text-danger {% endif %}">{{ section.cumulative_total.amount|accounting_amount }}</td>
<td class="actions"></td>
</tr>
{% endif %}
@ -172,8 +172,8 @@ First written: 2020/7/19
<a class="list-group-item-action" href="{% url "accounting:ledger" item period %}">
{{ item.title|title }}
<div class="float-right">
<span class="badge {% if item.balance < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.balance|accounting_amount }}
<span class="badge {% if item.amount < 0 %} badge-warning {% else %} badge-secondary {% endif %} badge-pill">
{{ item.amount|accounting_amount }}
</span>
</div>
</a>
@ -182,8 +182,8 @@ First written: 2020/7/19
<li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<div class="float-right">
<span class="badge {% if group.total < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ group.total|accounting_amount }}
<span class="badge {% if group.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ group.amount|accounting_amount }}
</span>
</div>
</li>
@ -192,7 +192,7 @@ First written: 2020/7/19
<li class="list-group-item d-flex justify-content-between align-items-center total">
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<div class="float-right">
<span class="badge {% if group.total < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">-</span>
<span class="badge {% if group.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">-</span>
</div>
</li>
{% endif %}
@ -200,8 +200,8 @@ First written: 2020/7/19
<li class="list-group-item d-flex justify-content-between align-items-center cumulative-total">
{{ section.cumulative_total.title|title }}
<div class="float-right">
<span class="badge {% if section.cumulative_total.total < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section.cumulative_total.total|accounting_amount }}
<span class="badge {% if section.cumulative_total.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ section.cumulative_total.amount|accounting_amount }}
</span>
</div>
</li>

20
accounting/templates/accounting/trial-balance.html
View File

@ -95,8 +95,8 @@ First written: 2020/7/19
{% for item in item_list %}
<tr>
<td>{{ item.title|title }}</td>
<td class="amount">{{ item.debit|accounting_amount }}</td>
<td class="amount">{{ item.credit|accounting_amount }}</td>
<td class="amount">{{ item.debit_amount|accounting_amount }}</td>
<td class="amount">{{ item.credit_amount|accounting_amount }}</td>
<td class="actions">
<a href="{% url "accounting:ledger" item period %}" class="btn btn-info" role="button">
<i class="fas fa-eye"></i>
@ -109,8 +109,8 @@ First written: 2020/7/19
<tfoot>
<tr>
<td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
<td class="amount">{{ total_item.debit|accounting_amount }}</td>
<td class="amount">{{ total_item.credit|accounting_amount }}</td>
<td class="amount">{{ total_item.debit_amount|accounting_amount }}</td>
<td class="amount">{{ total_item.credit_amount|accounting_amount }}</td>
<td></td>
</tr>
</tfoot>
@ -133,14 +133,14 @@ First written: 2020/7/19
<a class="list-group-item-action d-flex justify-content-between align-items-center" href="{% url "accounting:ledger" item period %}">
{{ item.title|title }}
<div>
{% if item.debit is not None %}
{% if item.debit_amount is not None %}
<span class="badge badge-success badge-pill">
{{ item.debit|intcomma:False }}
{{ item.debit_amount|intcomma:False }}
</span>
{% endif %}
{% if item.credit is not None %}
{% if item.credit_amount is not None %}
<span class="badge badge-warning badge-pill">
{{ item.credit|intcomma:False }}
{{ item.credit_amount|intcomma:False }}
</span>
{% endif %}
</div>
@ -151,10 +151,10 @@ First written: 2020/7/19
{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
<div>
<span class="badge badge-success badge-pill">
{{ total_item.debit|intcomma:False }}
{{ total_item.debit_amount|intcomma:False }}
</span>
<span class="badge badge-warning badge-pill">
{{ total_item.credit|intcomma:False }}
{{ total_item.credit_amount|intcomma:False }}
</span>
</div>
</li>