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

Added the order of the transaction in a day to the order of the records in the views of the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-22 08:25:43 +08:00
parent 21350127a1
commit c7a17cf0f2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
accounting/views/reports.py
View File

@ -94,7 +94,8 @@ def cash(request, account_code, period):
~Q(account__code__startswith="12"), ~Q(account__code__startswith="12"),
~Q(account__code__startswith="21"), ~Q(account__code__startswith="21"),
~Q(account__code__startswith="22")) ~Q(account__code__startswith="22"))
.order_by("transaction__date", "is_credit", "ord")) .order_by("transaction__date", "transaction__ord",
"is_credit", "ord"))
balance_before = Record.objects\ balance_before = Record.objects\
.filter( .filter(
Q(transaction__date__lt=period.start), Q(transaction__date__lt=period.start),
@ -115,7 +116,8 @@ def cash(request, account_code, period):
Q(date__lte=period.end), Q(date__lte=period.end),
Q(record__account__code__startswith=account_code))), Q(record__account__code__startswith=account_code))),
~Q(account__code__startswith=account_code)) ~Q(account__code__startswith=account_code))
.order_by("transaction__date", "is_credit", "ord")) .order_by("transaction__date", "transaction__ord",
"is_credit", "ord"))
balance_before = Record.objects\ balance_before = Record.objects\
.filter( .filter(
transaction__date__lt=period.start, transaction__date__lt=period.start,
@ -319,7 +321,7 @@ def ledger(request, account_code, period):
transaction__date__gte=period.start, transaction__date__gte=period.start,
transaction__date__lte=period.end, transaction__date__lte=period.end,
account__code__startswith=current_account.code) account__code__startswith=current_account.code)
.order_by("transaction__date", "is_credit", "ord")) .order_by("transaction__date", "transaction__ord", "is_credit", "ord"))
if re.match("^[1-3]", current_account.code) is not None: if re.match("^[1-3]", current_account.code) is not None:
balance = Record.objects\ balance = Record.objects\
.filter( .filter(
@ -469,7 +471,7 @@ def journal(request, period):
.filter( .filter(
transaction__date__gte=period.start, transaction__date__gte=period.start,
transaction__date__lte=period.end)\ transaction__date__lte=period.end)\
.order_by("transaction__date", "is_credit", "ord") .order_by("transaction__date", "transaction__ord", "is_credit", "ord")
# The brought-forward records # The brought-forward records
brought_forward_accounts = Account.objects\ brought_forward_accounts = Account.objects\
.filter( .filter(