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

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,