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

Added the output_field when calculating the sum and coalesce in the views.

Browse Source
This commit is contained in:
依瑪貓 2021-08-24 07:34:56 +08:00
parent fc6f1fd18a
commit 874cbca320
1 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
accounting/views.py
View File

@ -28,7 +28,7 @@ from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.db import transaction from django.db import transaction
from django.db.models import Sum, Case, When, F, Q, Count, BooleanField, \ from django.db.models import Sum, Case, When, F, Q, Count, BooleanField, \
ExpressionWrapper, Exists, OuterRef, Value, CharField ExpressionWrapper, Exists, OuterRef, Value, CharField, DecimalField
from django.db.models.functions import TruncMonth, Coalesce, Left, StrIndex from django.db.models.functions import TruncMonth, Coalesce, Left, StrIndex
from django.http import JsonResponse, HttpResponseRedirect, Http404, \ from django.http import JsonResponse, HttpResponseRedirect, Http404, \
HttpRequest, HttpResponse HttpRequest, HttpResponse
@ -103,9 +103,10 @@ def cash(request: HttpRequest, account: Account,
Q(account__code__startswith="21") | Q(account__code__startswith="21") |
Q(account__code__startswith="22"))) \ Q(account__code__startswith="22"))) \
.aggregate( .aggregate(
balance=Coalesce(Sum(Case( balance=Coalesce(Sum(Case(When(is_credit=True, then=-1),
When(is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")), 0))["balance"] output_field=DecimalField()),
0, output_field=DecimalField()))["balance"]
else: else:
records = list( records = list(
Record.objects Record.objects
@ -122,9 +123,10 @@ def cash(request: HttpRequest, account: Account,
transaction__date__lt=period.start, transaction__date__lt=period.start,
account__code__startswith=account.code) \ account__code__startswith=account.code) \
.aggregate( .aggregate(
balance=Coalesce(Sum(Case(When( balance=Coalesce(Sum(Case(When(is_credit=True, then=-1),
is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")), 0))["balance"] output_field=DecimalField()),
0, output_field=DecimalField()))["balance"]
balance = balance_before balance = balance_before
for record in records: for record in records:
sign = 1 if record.is_credit else -1 sign = 1 if record.is_credit else -1
@ -211,14 +213,13 @@ def cash_summary(request: HttpRequest, account: Account) -> HttpResponse:
.values("month") .values("month")
.order_by("month") .order_by("month")
.annotate( .annotate(
debit=Coalesce( debit=Coalesce(Sum(Case(When(is_credit=False,
Sum(Case(When(is_credit=False, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
credit=Coalesce( credit=Coalesce(Sum(Case(When(is_credit=True,
Sum(Case(When(is_credit=True, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
balance=Sum(Case( balance=Sum(Case(When(is_credit=False, then=-F("amount")),
When(is_credit=False, then=-F("amount")),
default=F("amount"))))] default=F("amount"))))]
else: else:
months = [utils.MonthlySummary(**x) for x in Record.objects months = [utils.MonthlySummary(**x) for x in Record.objects
@ -230,14 +231,13 @@ def cash_summary(request: HttpRequest, account: Account) -> HttpResponse:
.values("month") .values("month")
.order_by("month") .order_by("month")
.annotate( .annotate(
debit=Coalesce( debit=Coalesce(Sum(Case(When(is_credit=False,
Sum(Case(When(is_credit=False, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
credit=Coalesce( credit=Coalesce(Sum(Case(When(is_credit=True,
Sum(Case(When(is_credit=True, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
balance=Sum(Case( balance=Sum(Case(When(is_credit=False, then=-F("amount")),
When(is_credit=False, then=-F("amount")),
default=F("amount"))))] default=F("amount"))))]
cumulative_balance = 0 cumulative_balance = 0
for month in months: for month in months:
@ -305,9 +305,10 @@ def ledger(request: HttpRequest, account: Account,
transaction__date__lt=period.start, transaction__date__lt=period.start,
account__code__startswith=account.code) \ account__code__startswith=account.code) \
.aggregate( .aggregate(
balance=Coalesce(Sum(Case(When( balance=Coalesce(Sum(Case(When(is_credit=True, then=-1),
is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")), 0))["balance"] output_field=DecimalField()),
0, output_field=DecimalField()))["balance"]
record_brought_forward = Record( record_brought_forward = Record(
transaction=Transaction(date=period.start), transaction=Transaction(date=period.start),
account=account, account=account,
@ -370,14 +371,13 @@ def ledger_summary(request: HttpRequest, account: Account) -> HttpResponse:
.values("month") .values("month")
.order_by("month") .order_by("month")
.annotate( .annotate(
debit=Coalesce( debit=Coalesce(Sum(Case(When(is_credit=False,
Sum(Case(When(is_credit=False, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
credit=Coalesce( credit=Coalesce(Sum(Case(When(is_credit=True,
Sum(Case(When(is_credit=True, then=F("amount")))), then=F("amount")))),
0), 0, output_field=DecimalField()),
balance=Sum(Case( balance=Sum(Case(When(is_credit=False, then=F("amount")),
When(is_credit=False, then=F("amount")),
default=-F("amount"))))] default=-F("amount"))))]
cumulative_balance = 0 cumulative_balance = 0
for month in months: for month in months:
@ -436,11 +436,10 @@ def journal(request: HttpRequest, period: Period) -> HttpResponse:
| Q(code__startswith="2") | Q(code__startswith="2")
| Q(code__startswith="3")) \ | Q(code__startswith="3")) \
.annotate(balance=Sum( .annotate(balance=Sum(
Case( Case(When(record__is_credit=True, then=-1),
When(record__is_credit=True, then=-1), default=1) * F("record__amount"),
default=1 filter=Q(record__transaction__date__lt=period.start),
) * F("record__amount"), output_field=DecimalField())) \
filter=Q(record__transaction__date__lt=period.start))) \
.filter(~Q(balance=0)) .filter(~Q(balance=0))
debit_records = [Record( debit_records = [Record(
transaction=Transaction(date=period.start), transaction=Transaction(date=period.start),
@ -513,9 +512,9 @@ def trial_balance(request: HttpRequest, period: Period) -> HttpResponse:
| Q(code__startswith="2") | Q(code__startswith="2")
| Q(code__startswith="3"))) | Q(code__startswith="3")))
.annotate( .annotate(
amount=Sum(Case( amount=Sum(Case(When(record__is_credit=True, then=-1),
When(record__is_credit=True, then=-1), default=1) * F("record__amount"),
default=1) * F("record__amount"))) output_field=DecimalField()))
.filter(Q(amount__isnull=False), ~Q(amount=0)) .filter(Q(amount__isnull=False), ~Q(amount=0))
.annotate( .annotate(
debit_amount=Case( debit_amount=Case(
@ -534,9 +533,9 @@ def trial_balance(request: HttpRequest, period: Period) -> HttpResponse:
| Q(code__startswith="3")), | Q(code__startswith="3")),
~Q(code=Account.ACCUMULATED_BALANCE)) ~Q(code=Account.ACCUMULATED_BALANCE))
.annotate( .annotate(
amount=Sum(Case( amount=Sum(Case(When(record__is_credit=True, then=-1),
When(record__is_credit=True, then=-1), default=1) * F("record__amount"),
default=1) * F("record__amount"))) output_field=DecimalField()))
.filter(Q(amount__isnull=False), ~Q(amount=0)) .filter(Q(amount__isnull=False), ~Q(amount=0))
.annotate( .annotate(
debit_amount=Case( debit_amount=Case(
@ -555,9 +554,9 @@ def trial_balance(request: HttpRequest, period: Period) -> HttpResponse:
| (Q(transaction__date__lte=period.end) | (Q(transaction__date__lte=period.end)
& Q(account__code=Account.ACCUMULATED_BALANCE))) \ & Q(account__code=Account.ACCUMULATED_BALANCE))) \
.aggregate( .aggregate(
balance=Sum(Case( balance=Sum(Case(When(is_credit=True, then=-1),
When(is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")))["balance"] output_field=DecimalField()))["balance"]
if balance is not None and balance != 0: if balance is not None and balance != 0:
brought_forward = Account.objects.get( brought_forward = Account.objects.get(
code=Account.ACCUMULATED_BALANCE) code=Account.ACCUMULATED_BALANCE)
@ -614,9 +613,9 @@ def income_statement(request: HttpRequest, period: Period) -> HttpResponse:
| Q(code__startswith="2") | Q(code__startswith="2")
| Q(code__startswith="3"))) | Q(code__startswith="3")))
.annotate( .annotate(
amount=Sum(Case( amount=Sum(Case(When(record__is_credit=True, then=1),
When(record__is_credit=True, then=1), default=-1) * F("record__amount"),
default=-1) * F("record__amount"))) output_field=DecimalField()))
.filter(Q(amount__isnull=False), ~Q(amount=0)) .filter(Q(amount__isnull=False), ~Q(amount=0))
.order_by("code")) .order_by("code"))
groups = list(Account.objects.filter( groups = list(Account.objects.filter(
@ -687,9 +686,9 @@ def balance_sheet(request: HttpRequest, period: Period) -> HttpResponse:
| Q(code__startswith="3")), | Q(code__startswith="3")),
~Q(code=Account.ACCUMULATED_BALANCE)) ~Q(code=Account.ACCUMULATED_BALANCE))
.annotate( .annotate(
amount=Sum(Case( amount=Sum(Case(When(record__is_credit=True, then=-1),
When(record__is_credit=True, then=-1), default=1) * F("record__amount"),
default=1) * F("record__amount"))) output_field=DecimalField()))
.filter(Q(amount__isnull=False), ~Q(amount=0)) .filter(Q(amount__isnull=False), ~Q(amount=0))
.order_by("code")) .order_by("code"))
for account in accounts: for account in accounts:
@ -703,9 +702,9 @@ def balance_sheet(request: HttpRequest, period: Period) -> HttpResponse:
| Q(account__code__startswith="3")) | Q(account__code__startswith="3"))
& ~Q(account__code=Account.ACCUMULATED_BALANCE))) \ & ~Q(account__code=Account.ACCUMULATED_BALANCE))) \
.aggregate( .aggregate(
balance=Sum(Case( balance=Sum(Case(When(is_credit=True, then=-1),
When(is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")))["balance"] output_field=DecimalField()))["balance"]
if balance is not None and balance != 0: if balance is not None and balance != 0:
brought_forward = Account.objects.get( brought_forward = Account.objects.get(
code=Account.ACCUMULATED_BALANCE) code=Account.ACCUMULATED_BALANCE)
@ -723,9 +722,9 @@ def balance_sheet(request: HttpRequest, period: Period) -> HttpResponse:
| Q(account__code__startswith="3")) | Q(account__code__startswith="3"))
& ~Q(account__code=Account.ACCUMULATED_BALANCE))) \ & ~Q(account__code=Account.ACCUMULATED_BALANCE))) \
.aggregate( .aggregate(
balance=Sum(Case( balance=Sum(Case(When(is_credit=True, then=-1),
When(is_credit=True, then=-1), default=1) * F("amount"),
default=1) * F("amount")))["balance"] output_field=DecimalField()))["balance"]
if balance is not None and balance != 0: if balance is not None and balance != 0:
net_change = Account.objects.get(code=Account.NET_CHANGE) net_change = Account.objects.get(code=Account.NET_CHANGE)
net_change.amount = balance net_change.amount = balance