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

Revised the cash report template.

Browse Source
This commit is contained in:
依瑪貓 2020-07-06 23:58:47 +08:00
parent cd7d7a5106
commit 37e793f340
2 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accounting/models.py
View File

@ -94,6 +94,13 @@ class Transaction(models.Model):
credit_sum = sum([x.amount for x in self.credit_records]) credit_sum = sum([x.amount for x in self.credit_records])
return debit_sum == credit_sum return debit_sum == credit_sum
@property
def has_order_hole(self):
"""Whether the order of the transactions on this day is not
1, 2, 3, 4, 5..., and should be reordered. """
# TODO: To be done
return False
@property @property
def is_cash_income(self): def is_cash_income(self):
"""Whether this transaction is a cash income transaction.""" """Whether this transaction is a cash income transaction."""

70
accounting/templates/accounting/cash.html
View File

@ -34,34 +34,80 @@ First written: 2020/7/1
<p>{{ request.resolver_match.app_name }}</p> <p>{{ request.resolver_match.app_name }}</p>
{% if records %} {% if records %}
<table class="table table-striped"> {# The table for large screens #}
<table class="table table-striped table-hover d-none d-md-table general-journal-table">
<thead> <thead>
<tr> <tr>
<th scope="col">{% trans "Date" context "Accounting|" %}</th> <th scope="col">{% trans "Date" context "Accounting|" %}</th>
<th scope="col">{% trans "Subject" context "Accounting|" %}</th> <th scope="col">{% trans "Subject" context "Accounting|" %}</th>
<th scope="col">{% trans "Summary" context "Accounting|" %}</th> <th scope="col">{% trans "Summary" context "Accounting|" %}</th>
<th scope="col">{% trans "Income" context "Accounting|" %}</th> <th class="amount" scope="col">{% trans "Income" context "Accounting|" %}</th>
<th scope="col">{% trans "Expense" context "Accounting|" %}</th> <th class="amount" scope="col">{% trans "Expense" context "Accounting|" %}</th>
<th scope="col">{% trans "Balance" context "Accounting|" %}</th> <th class="amount" scope="col">{% trans "Balance" context "Accounting|" %}</th>
<th scope="col">{% trans "View" context "Accounting|" %}</th> <th class="actions" scope="col">{% trans "View" context "Accounting|" %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for record in records %} {% for record in records %}
<tr> <tr class="{% if not record.transaction.is_balanced or record.transaction.has_order_hole %} table-danger {% endif %}">
<td>{{ record.transaction.date|smart_date }}</td> <td>{{ record.transaction.date|smart_date }}</td>
<td>{{ record.subject.title_zhtw }}</td> <td>{{ record.subject.title_zhtw }}</td>
<td>{{ record.summary }}</td> <td>{{ record.summary }}{% if not record.transaction.is_balanced %}
<td>{{ record.credit_amount|default:""|intcomma:False }}</td> <span class="badge badge-danger badge-pill">
<td>{{ record.debit_amount|default:""|intcomma:False }}</td> {% trans "Unbalanced" context "Accounting|" %}
<td>{{ record.amount|intcomma:False }}</td> </span>
<td><a href="{{ record.transaction.get_absolute_url }}">{% trans "View" context "Accounting|" %}</a></td> {% endif %}{% if record.transaction.has_order_hole %}
<span class="badge badge-danger badge-pill">
{% trans "Need Reorder" context "Accounting|" %}
</span>
{% endif %}</td>
<td class="amount">{{ record.credit_amount|default:""|intcomma:False }}</td>
<td class="amount">{{ record.debit_amount|default:""|intcomma:False }}</td>
<td class="amount">{{ record.amount|intcomma:False }}</td>
<td class="actions">
<a href="{{ record.transaction.get_absolute_url }}" class="btn btn-info" role="button">
<i class="fas fa-eye"></i>
<span class="d-none d-lg-inline">{% trans "View" context "Accounting|" %}</span>
</a>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{# The list for small screens #}
<ul class="list-group d-md-none">
{% for record in records %}
<li class="list-group-item {% if not record.transaction.is_balanced or record.transaction.has_order_hole %} list-group-item-danger {% endif %}">
<a class="list-group-item-action" href="{{ record.transaction.get_absolute_url }}">
<div class="date-subject-line d-flex justify-content-between align-items-center">
{{ record.transaction.date|smart_date }} {{ record.subject.title_zhtw }}
</div>
<div class="d-flex justify-content-between align-items-center">
<div>
{{ record.summary }}
{% if not record.transaction.is_balanced %}
<span class="badge badge-danger badge-pill">
{% trans "Unbalanced" context "Accounting|" %}
</span>
{% endif %}
{% if record.transaction.has_order_hole %}
<span class="badge badge-danger badge-pill">
{% trans "Need Reorder" context "Accounting|" %}
</span>
{% endif %}
</div>
</div>
<div>
<span class="badge {% if not record.is_credit %} badge-warning {% else %} badge-success {% endif %} badge-pill">{{ record.amount|intcomma:False }}</span>
<span class="badge {% if record.balance < 0 %} badge-danger {% else %} badge-primary {% endif %} badge-pill">{{ record.balance|intcomma:False }}</span>
</div>
</a>
</li>
{% endfor %}
</ul>
{% else %} {% else %}
<p>No data.</p> <p>{% trans "There is currently no data." %}</p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}