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

Revised the codes in the views of the accounting application to avoid long lines.

Browse Source
This commit is contained in:
依瑪貓 2020-07-16 23:25:10 +08:00
parent fb37da4ac0
commit 1f80f8a4d6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
accounting/views/__init__.py
View File

@ -261,14 +261,17 @@ ORDER BY
records = pagination.records records = pagination.records
_find_imbalanced(records) _find_imbalanced(records)
_find_order_holes(records) _find_order_holes(records)
shortcut_subjects = settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]
return render(request, "accounting/cash.html", { return render(request, "accounting/cash.html", {
"records": records, "records": records,
"pagination": pagination, "pagination": pagination,
"current_subject": current_subject, "current_subject": current_subject,
"period": period, "period": period,
"reports": ReportUrl(cash=current_subject, period=period), "reports": ReportUrl(cash=current_subject, period=period),
"shortcut_subjects": [x for x in subjects if x.code in settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]], "shortcut_subjects": [x for x in subjects
"all_subjects": [x for x in subjects if x.code not in settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]], if x.code in shortcut_subjects],
"all_subjects": [x for x in subjects
if x.code not in shortcut_subjects],
}) })
@ -316,7 +319,8 @@ WHERE s.code NOT LIKE '11%%'
GROUP BY month GROUP BY month
ORDER BY month""")) ORDER BY month"""))
else: else:
records = list(RecordSummary.objects.raw("""SELECT records = list(RecordSummary.objects.raw(
"""SELECT
""" + month_definition + """ AS month, """ + month_definition + """ AS month,
SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount, SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount,
SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount
@ -335,8 +339,7 @@ FROM accounting_records AS r
WHERE s.code NOT LIKE %s WHERE s.code NOT LIKE %s
GROUP BY month GROUP BY month
ORDER BY month""", ORDER BY month""",
[current_subject.code + "%", [current_subject.code + "%", current_subject.code + "%"]))
current_subject.code + "%"]))
cumulative_balance = 0 cumulative_balance = 0
for record in records: for record in records:
cumulative_balance = cumulative_balance + record.balance cumulative_balance = cumulative_balance + record.balance
@ -348,13 +351,16 @@ ORDER BY month""",
cumulative_balance=cumulative_balance, cumulative_balance=cumulative_balance,
)) ))
pagination = Pagination(request, records, True) pagination = Pagination(request, records, True)
shortcut_subjects = settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]
params = { params = {
"records": pagination.records, "records": pagination.records,
"pagination": pagination, "pagination": pagination,
"current_subject": current_subject, "current_subject": current_subject,
"reports": ReportUrl(cash=current_subject), "reports": ReportUrl(cash=current_subject),
"shortcut_subjects": [x for x in subjects if x.code in settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]], "shortcut_subjects": [x for x in subjects if
"all_subjects": [x for x in subjects if x.code not in settings.ACCOUNTING["CASH_SHORTCUT_SUBJECTS"]], x.code in shortcut_subjects],
"all_subjects": [x for x in subjects if
x.code not in shortcut_subjects],
} }
return render(request, "accounting/cash_summary.html", params) return render(request, "accounting/cash_summary.html", params)
@ -420,10 +426,11 @@ def ledger(request, subject_code, period_spec):
row = cursor.fetchone() row = cursor.fetchone()
balance = row[0] balance = row[0]
record_brought_forward = Record( record_brought_forward = Record(
transaction=Transaction(date=records[-1].transaction.date), transaction=Transaction(
date=records[-1].transaction.date),
subject=current_subject, subject=current_subject,
summary=pgettext("Accounting|", "Brought Forward"), summary=pgettext("Accounting|", "Brought Forward"),
is_credit=balance<0, is_credit=balance < 0,
amount=abs(balance), amount=abs(balance),
balance=balance, balance=balance,
) )