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

Removed the transaction type from the template variables of the transactions, because they are not necessary at all in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-28 00:23:13 +08:00
parent 99fb99b160
commit 760c739864
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounting/templates/accounting/transactions/expense/show.html
View File

@ -71,7 +71,7 @@ First written: 2020/7/23
<i class="fas fa-chevron-circle-left"></i> <i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" transaction_type item %}"> <a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "expense" item %}">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>

2
accounting/templates/accounting/transactions/income/show.html
View File

@ -71,7 +71,7 @@ First written: 2020/7/23
<i class="fas fa-chevron-circle-left"></i> <i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" transaction_type item %}"> <a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "income" item %}">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>

2
accounting/templates/accounting/transactions/transfer/show.html
View File

@ -71,7 +71,7 @@ First written: 2020/7/23
<i class="fas fa-chevron-circle-left"></i> <i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" transaction_type item %}"> <a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "transfer" item %}">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
</a> </a>

2
accounting/views.py
View File

@ -856,7 +856,6 @@ def transaction_show(request, type, transaction):
HttpResponse: The response. HttpResponse: The response.
""" """
return render(request, F"accounting/transactions/{type}/show.html", { return render(request, F"accounting/transactions/{type}/show.html", {
"transaction_type": type,
"item": transaction, "item": transaction,
}) })
@ -879,6 +878,5 @@ def transaction_create(request, type):
if len(transaction.credit_records) == 0: if len(transaction.credit_records) == 0:
transaction.records.append(Record(ord=1, is_credit=True)) transaction.records.append(Record(ord=1, is_credit=True))
return render(request, F"accounting/transactions/{type}/edit.html", { return render(request, F"accounting/transactions/{type}/edit.html", {
"transaction_type": type,
"item": transaction, "item": transaction,
}) })