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

Renamed the credit_amount attribute to credit and debit_summary to debit in RecordSummary in the accounting application.

Browse Source
This commit is contained in:
依瑪貓
2020-07-18 07:52:16 +08:00
parent a15a359ca7
commit 753e69d4e9
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accounting/templates/accounting/cash_summary.html
View File

@@ -102,8 +102,8 @@ First written: 2020/7/15
{% for record in records %}
<tr class="{% if record.balance < 0 %} table-danger {% endif %}">
<td>{{ record.label }}</td>
<td class="amount">{{ record.credit_amount|accounting_amount }}</td>
<td class="amount">{{ record.debit_amount|accounting_amount }}</td>
<td class="amount">{{ record.credit|accounting_amount }}</td>
<td class="amount">{{ record.debit|accounting_amount }}</td>
<td class="amount {% if record.balance < 0 %} text-danger {% endif %}">{{ record.balance|accounting_amount }}</td>
<td class="amount {% if record.cumulative_balance < 0 %} text-danger {% endif %}">{{ record.cumulative_balance|accounting_amount }}</td>
<td class="actions">
@@ -128,10 +128,10 @@ First written: 2020/7/15
{{ record.label }}
<div>
<span class="badge badge-success badge-pill">
{{ record.credit_amount|accounting_amount }}
{{ record.credit|accounting_amount }}
</span>
<span class="badge badge-warning badge-pill">
{{ record.debit_amount|accounting_amount }}
{{ record.debit|accounting_amount }}
</span>
<span class="badge {% if record.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ record.balance|intcomma:False }}
@@ -146,10 +146,10 @@ First written: 2020/7/15
{{ record.label }}
<div>
<span class="badge badge-success badge-pill">
{{ record.credit_amount|accounting_amount }}
{{ record.credit|accounting_amount }}
</span>
<span class="badge badge-warning badge-pill">
{{ record.debit_amount|accounting_amount }}
{{ record.debit|accounting_amount }}
</span>
<span class="badge {% if record.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ record.balance|intcomma:False }}

12
accounting/templates/accounting/ledger_summary.html
View File

@@ -95,8 +95,8 @@ First written: 2020/7/17
{% for record in records %}
<tr class="{% if current_subject.code|first in "12" and record.balance < 0 %} table-danger {% endif %}">
<td>{{ record.label }}</td>
<td class="amount">{{ record.debit_amount|accounting_amount }}</td>
<td class="amount">{{ record.credit_amount|accounting_amount }}</td>
<td class="amount">{{ record.debit|accounting_amount }}</td>
<td class="amount">{{ record.credit|accounting_amount }}</td>
<td class="amount {% if record.balance < 0 %} text-danger {% endif %}">{{ record.balance|accounting_amount }}</td>
<td class="amount {% if record.cumulative_balance < 0 %} text-danger {% endif %}">{{ record.cumulative_balance|accounting_amount }}</td>
<td class="actions">
@@ -121,10 +121,10 @@ First written: 2020/7/17
{{ record.label }}
<div>
<span class="badge badge-success badge-pill">
{{ record.debit_amount|accounting_amount }}
{{ record.debit|accounting_amount }}
</span>
<span class="badge badge-warning badge-pill">
{{ record.credit_amount|accounting_amount }}
{{ record.credit|accounting_amount }}
</span>
<span class="badge {% if record.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ record.balance|intcomma:False }}
@@ -145,10 +145,10 @@ First written: 2020/7/17
{{ record.label }}
<div>
<span class="badge badge-success badge-pill">
{{ record.debit_amount|accounting_amount }}
{{ record.debit|accounting_amount }}
</span>
<span class="badge badge-warning badge-pill">
{{ record.credit_amount|accounting_amount }}
{{ record.credit|accounting_amount }}
</span>
<span class="badge {% if record.balance < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
{{ record.balance|intcomma:False }}