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

Fixed to avoid getting the income and expenses with accounts that are not current assets and liabilities when switching from the ledger.

Browse Source
This commit is contained in:
依瑪貓 2023-03-06 00:29:29 +08:00
parent 734362396f
commit cd49ca44b1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/accounting/report/report_chooser.py
View File

@ -20,6 +20,7 @@ This file is largely taken from the NanoParma ERP project, first written in
2021/9/16 by imacat (imacat@nanoparma.com). 2021/9/16 by imacat (imacat@nanoparma.com).
""" """
import re
import typing as t import typing as t
from flask import url_for from flask import url_for
@ -105,11 +106,14 @@ class ReportChooser:
:return: The income and expenses. :return: The income and expenses.
""" """
account: Account = self.__account
if not re.match(r"[12][12]", account.base_code):
account: Account = Account.find_by_code("1111-001")
url: str = url_for("accounting.report.income-expenses-default", url: str = url_for("accounting.report.income-expenses-default",
currency=self.__currency, account=self.__account) \ currency=self.__currency, account=account) \
if self.__period.is_default \ if self.__period.is_default \
else url_for("accounting.report.income-expenses", else url_for("accounting.report.income-expenses",
currency=self.__currency, account=self.__account, currency=self.__currency, account=account,
period=self.__period) period=self.__period)
return OptionLink(gettext("Income and Expenses"), url, return OptionLink(gettext("Income and Expenses"), url,
self.__active_report == ReportType.INCOME_EXPENSES) self.__active_report == ReportType.INCOME_EXPENSES)