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

Replaced the hard-coded cash account codes with the ACCUMULATED_CHANGE and NET_CHANGE constants and the accumulated_change() method of the Account data model.

Browse Source
This commit is contained in:
依瑪貓 2023-03-08 07:41:19 +08:00
parent 329e3d5362
commit 116d00a557
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/accounting/report/reports/balance_sheet.py
View File

@ -176,12 +176,11 @@ class AccountCollector:
:return: None. :return: None.
""" """
code: str = "3351-001"
amount: Decimal | None = self.__query_accumulated() amount: Decimal | None = self.__query_accumulated()
url: str = url_for("accounting.report.income-statement", url: str = url_for("accounting.report.income-statement",
currency=self.__currency, currency=self.__currency,
period=self.__period.before) period=self.__period.before)
self.__add_owner_s_equity(code, amount, url) self.__add_owner_s_equity(Account.ACCUMULATED_CHANGE, amount, url)
def __query_accumulated(self) -> Decimal | None: def __query_accumulated(self) -> Decimal | None:
"""Queries and returns the accumulated profit or loss. """Queries and returns the accumulated profit or loss.
@ -207,11 +206,10 @@ class AccountCollector:
:return: None. :return: None.
""" """
code: str = "3353-001"
amount: Decimal | None = self.__query_currency_period() amount: Decimal | None = self.__query_currency_period()
url: str = url_for("accounting.report.income-statement", url: str = url_for("accounting.report.income-statement",
currency=self.__currency, period=self.__period) currency=self.__currency, period=self.__period)
self.__add_owner_s_equity(code, amount, url) self.__add_owner_s_equity(Account.ACCUMULATED_CHANGE, amount, url)
def __query_currency_period(self) -> Decimal | None: def __query_currency_period(self) -> Decimal | None:
"""Queries and returns the net income or loss for current period. """Queries and returns the net income or loss for current period.

2
src/accounting/report/reports/income_expenses.py
View File

@ -125,7 +125,7 @@ class EntryCollector:
entry: Entry = Entry() entry: Entry = Entry()
entry.is_brought_forward = True entry.is_brought_forward = True
entry.date = self.__period.start entry.date = self.__period.start
entry.account = Account.find_by_code("3351-001") entry.account = Account.accumulated_change()
entry.summary = gettext("Brought forward") entry.summary = gettext("Brought forward")
if balance > 0: if balance > 0:
entry.income = balance entry.income = balance