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

Added the default_spec() method to Period, and applied it to the views in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-29 19:08:10 +08:00
parent 79337272ec
commit e64089f06f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accounting/views.py
View File

@ -27,7 +27,6 @@ from django.db.models.functions import TruncMonth, Coalesce
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render from django.shortcuts import render
from django.urls import reverse from django.urls import reverse
from django.utils import dateformat, timezone
from django.utils.translation import pgettext, gettext_noop from django.utils.translation import pgettext, gettext_noop
from django.views.decorators.http import require_GET, require_POST from django.views.decorators.http import require_GET, require_POST
@ -72,9 +71,8 @@ def cash_default(request):
""" """
account = Account.objects.get( account = Account.objects.get(
code=settings.ACCOUNTING["DEFAULT_CASH_ACCOUNT"]) code=settings.ACCOUNTING["DEFAULT_CASH_ACCOUNT"])
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:cash", args=(account, period_spec))) reverse("accounting:cash", args=(account, Period.default_spec())))
@require_GET @require_GET
@ -296,9 +294,8 @@ def ledger_default(request):
""" """
account = Account.objects.get( account = Account.objects.get(
code=settings.ACCOUNTING["DEFAULT_LEDGER_ACCOUNT"]) code=settings.ACCOUNTING["DEFAULT_LEDGER_ACCOUNT"])
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:ledger", args=(account, period_spec))) reverse("accounting:ledger", args=(account, Period.default_spec())))
@require_GET @require_GET
@ -441,9 +438,8 @@ def journal_default(request):
Returns: Returns:
HttpResponseRedirect: The redirection to the default month. HttpResponseRedirect: The redirection to the default month.
""" """
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:journal", args=(period_spec,))) reverse("accounting:journal", args=(Period.default_spec(),)))
@require_GET @require_GET
@ -528,9 +524,8 @@ def trial_balance_default(request):
Returns: Returns:
HttpResponseRedirect: The redirection to the default month. HttpResponseRedirect: The redirection to the default month.
""" """
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:trial-balance", args=(period_spec,))) reverse("accounting:trial-balance", args=(Period.default_spec(),)))
@require_GET @require_GET
@ -637,9 +632,8 @@ def income_statement_default(request):
Returns: Returns:
HttpResponseRedirect: The redirection to the default month. HttpResponseRedirect: The redirection to the default month.
""" """
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:income-statement", args=(period_spec,))) reverse("accounting:income-statement", args=(Period.default_spec(),)))
@require_GET @require_GET
@ -722,9 +716,8 @@ def balance_sheet_default(request):
Returns: Returns:
HttpResponseRedirect: The redirection to the default month. HttpResponseRedirect: The redirection to the default month.
""" """
period_spec = dateformat.format(timezone.localdate(), "Y-m")
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("accounting:balance-sheet", args=(period_spec,))) reverse("accounting:balance-sheet", args=(Period.default_spec(),)))
@require_GET @require_GET

9
mia_core/period.py
View File

@ -314,6 +314,15 @@ class Period:
"defaultDate": self.chosen_month, "defaultDate": self.chosen_month,
}) })
@staticmethod
def default_spec():
"""Returns the specification for the default period.
Returns:
str: The specification for the default period
"""
return dateformat.format(timezone.localdate(), "Y-m")
class Parser: class Parser:
"""The period parser. """The period parser.