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

Changed the entry parameter of the ReportEntry class in journal to be non-optional. There is no optional entry in its actual use.

Browse Source
This commit is contained in:
依瑪貓 2023-03-09 07:30:04 +08:00
parent 13e3ef5875
commit 6fc21f82af
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/accounting/report/reports/journal.py
View File

@ -40,12 +40,12 @@ from .utils.report_type import ReportType
class ReportEntry: class ReportEntry:
"""An entry in the report.""" """An entry in the report."""
def __init__(self, entry: JournalEntry | None = None): def __init__(self, entry: JournalEntry):
"""Constructs the entry in the report. """Constructs the entry in the report.
:param entry: The journal entry. :param entry: The journal entry.
""" """
self.entry: JournalEntry | None = None self.entry: JournalEntry = entry
"""The journal entry.""" """The journal entry."""
self.transaction: Transaction | None = None self.transaction: Transaction | None = None
"""The transaction.""" """The transaction."""
@ -53,23 +53,16 @@ class ReportEntry:
"""Whether this is the total entry.""" """Whether this is the total entry."""
self.currency: Currency | None = None self.currency: Currency | None = None
"""The account.""" """The account."""
self.account: Account | None = None self.account: Account = entry.account
"""The account.""" """The account."""
self.summary: str | None = None self.summary: str | None = entry.summary
"""The summary.""" """The summary."""
self.debit: Decimal | None = None self.debit: Decimal | None = entry.amount if entry.is_debit else None
"""The debit amount.""" """The debit amount."""
self.credit: Decimal | None = None self.credit: Decimal | None = None if entry.is_debit else entry.amount
"""The credit amount.""" """The credit amount."""
self.amount: Decimal | None = None self.amount: Decimal = entry.amount
"""The amount.""" """The amount."""
if entry is not None:
self.entry = entry
self.account = entry.account
self.summary = entry.summary
self.debit = entry.amount if entry.is_debit else None
self.credit = None if entry.is_debit else entry.amount
self.amount = entry.amount
class CSVRow(BaseCSVRow): class CSVRow(BaseCSVRow):