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

Revised the way to import from the datetime package, to avoid name conflict with the common "date" and "time" names.

Browse Source
This commit is contained in:
依瑪貓
2023-04-26 13:17:31 +08:00
parent c11ae23885
commit 359c335662
30 changed files with 156 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
"""The income and expenses log.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
import sqlalchemy as sa
@ -53,7 +53,7 @@ class ReportLineItem:
"""Whether this is the brought-forward line item."""
self.is_total: bool = False
"""Whether this is the total line item."""
self.date: date | None = None
self.date: dt.date | None = None
"""The date."""
self.account: Account | None = None
"""The account."""
@ -213,7 +213,7 @@ class LineItemCollector:
class CSVRow(BaseCSVRow):
"""A row in the CSV."""
def __init__(self, journal_entry_date: date | str | None,
def __init__(self, journal_entry_date: dt.date | str | None,
account: str | None,
description: str | None,
income: str | Decimal | None,
@ -230,7 +230,7 @@ class CSVRow(BaseCSVRow):
:param balance: The balance.
:param note: The note.
"""
self.date: date | str | None = journal_entry_date
self.date: dt.date | str | None = journal_entry_date
"""The date."""
self.account: str | None = account
"""The account."""

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

@ -17,7 +17,7 @@
"""The journal.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
import sqlalchemy as sa
@ -67,7 +67,7 @@ class ReportLineItem:
class CSVRow(BaseCSVRow):
"""A row in the CSV."""
def __init__(self, journal_entry_date: str | date,
def __init__(self, journal_entry_date: str | dt.date,
currency: str,
account: str,
description: str | None,
@ -84,7 +84,7 @@ class CSVRow(BaseCSVRow):
:param credit: The credit amount.
:param note: The note.
"""
self.date: str | date = journal_entry_date
self.date: str | dt.date = journal_entry_date
"""The date."""
self.currency: str = currency
"""The currency."""

8
src/accounting/report/reports/ledger.py
View File

@ -17,7 +17,7 @@
"""The ledger.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
import sqlalchemy as sa
@ -52,7 +52,7 @@ class ReportLineItem:
"""Whether this is the brought-forward line item."""
self.is_total: bool = False
"""Whether this is the total line item."""
self.date: date | None = None
self.date: dt.date | None = None
"""The date."""
self.description: str | None = None
"""The description."""
@ -196,7 +196,7 @@ class LineItemCollector:
class CSVRow(BaseCSVRow):
"""A row in the CSV."""
def __init__(self, journal_entry_date: date | str | None,
def __init__(self, journal_entry_date: dt.date | str | None,
description: str | None,
debit: str | Decimal | None,
credit: str | Decimal | None,
@ -211,7 +211,7 @@ class CSVRow(BaseCSVRow):
:param balance: The balance.
:param note: The note.
"""
self.date: date | str | None = journal_entry_date
self.date: dt.date | str | None = journal_entry_date
"""The date."""
self.description: str | None = description
"""The description."""

12
src/accounting/report/reports/search.py
View File

@ -17,7 +17,7 @@
"""The search.
"""
from datetime import datetime
import datetime as dt
from decimal import Decimal
import sqlalchemy as sa
@ -124,15 +124,15 @@ class LineItemCollector:
"""
conditions: list[sa.BinaryExpression] \
= [JournalEntry.note.icontains(k)]
journal_entry_date: datetime
journal_entry_date: dt.datetime
try:
journal_entry_date = datetime.strptime(k, "%Y")
journal_entry_date = dt.datetime.strptime(k, "%Y")
conditions.append(sa.extract("year", JournalEntry.date)
== journal_entry_date.year)
except ValueError:
pass
try:
journal_entry_date = datetime.strptime(k, "%Y/%m")
journal_entry_date = dt.datetime.strptime(k, "%Y/%m")
conditions.append(sa.and_(
sa.extract("year", JournalEntry.date)
== journal_entry_date.year,
@ -141,7 +141,7 @@ class LineItemCollector:
except ValueError:
pass
try:
journal_entry_date = datetime.strptime(f"2000/{k}", "%Y/%m/%d")
journal_entry_date = dt.datetime.strptime(f"2000/{k}", "%Y/%m/%d")
conditions.append(sa.and_(
sa.extract("month", JournalEntry.date)
== journal_entry_date.month,
@ -150,7 +150,7 @@ class LineItemCollector:
except ValueError:
pass
try:
journal_entry_date = datetime.strptime(k, "%Y/%m/%d")
journal_entry_date = dt.datetime.strptime(k, "%Y/%m/%d")
conditions.append(sa.and_(
sa.extract("year", JournalEntry.date)
== journal_entry_date.year,

8
src/accounting/report/reports/unapplied.py
View File

@ -17,7 +17,7 @@
"""The unapplied original line items.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
from flask import render_template, Response
@ -41,7 +41,7 @@ from accounting.utils.pagination import Pagination
class CSVRow(BaseCSVRow):
"""A row in the CSV."""
def __init__(self, journal_entry_date: str | date, currency: str,
def __init__(self, journal_entry_date: str | dt.date, currency: str,
description: str | None, amount: str | Decimal,
net_balance: str | Decimal):
"""Constructs a row in the CSV.
@ -52,7 +52,7 @@ class CSVRow(BaseCSVRow):
:param amount: The amount.
:param net_balance: The net balance.
"""
self.date: str | date = journal_entry_date
self.date: str | dt.date = journal_entry_date
"""The date."""
self.currency: str = currency
"""The currency."""
@ -64,7 +64,7 @@ class CSVRow(BaseCSVRow):
"""The net balance."""
@property
def values(self) -> list[str | date | Decimal | None]:
def values(self) -> list[str | dt.date | Decimal | None]:
"""Returns the values of the row.
:return: The values of the row.

4
src/accounting/report/reports/unapplied_accounts.py
View File

@ -17,7 +17,7 @@
"""The accounts with unapplied original line items.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
from flask import render_template, Response
@ -49,7 +49,7 @@ class CSVRow(BaseCSVRow):
"""The number of unapplied original line items."""
@property
def values(self) -> list[str | date | Decimal | None]:
def values(self) -> list[str | dt.date | Decimal | None]:
"""Returns the values of the row.
:return: The values of the row.

8
src/accounting/report/reports/unmatched.py
View File

@ -17,7 +17,7 @@
"""The unmatched offsets.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
from flask import render_template, Response
@ -40,7 +40,7 @@ from accounting.utils.pagination import Pagination
class CSVRow(BaseCSVRow):
"""A row in the CSV."""
def __init__(self, journal_entry_date: str | date, currency: str,
def __init__(self, journal_entry_date: str | dt.date, currency: str,
description: str | None, debit: str | Decimal,
credit: str | Decimal, balance: str | Decimal):
"""Constructs a row in the CSV.
@ -52,7 +52,7 @@ class CSVRow(BaseCSVRow):
:param credit: The credit amount.
:param balance: The balance.
"""
self.date: str | date = journal_entry_date
self.date: str | dt.date = journal_entry_date
"""The date."""
self.currency: str = currency
"""The currency."""
@ -66,7 +66,7 @@ class CSVRow(BaseCSVRow):
"""The balance."""
@property
def values(self) -> list[str | date | Decimal | None]:
def values(self) -> list[str | dt.date | Decimal | None]:
"""Returns the values of the row.
:return: The values of the row.

4
src/accounting/report/reports/unmatched_accounts.py
View File

@ -17,7 +17,7 @@
"""The accounts with unmatched offsets.
"""
from datetime import date
import datetime as dt
from decimal import Decimal
from flask import render_template, Response
@ -49,7 +49,7 @@ class CSVRow(BaseCSVRow):
"""The number of unapplied original line items."""
@property
def values(self) -> list[str | date | Decimal | None]:
def values(self) -> list[str | dt.date | Decimal | None]:
"""Returns the values of the row.
:return: The values of the row.