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 CASH constant and the cash() method of the Account data model.

Browse Source
This commit is contained in:
依瑪貓
2023-03-08 07:38:57 +08:00
parent 47e8944f06
commit 329e3d5362
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/accounting/models.py
View File

@@ -588,7 +588,7 @@ class Transaction(db.Model):
for currency in self.currencies:
if len(currency.debit) > 1:
return False
if currency.debit[0].account.code != "1111-001":
if currency.debit[0].account.code != Account.CASH:
return False
return True
@@ -602,7 +602,7 @@ class Transaction(db.Model):
for currency in self.currencies:
if len(currency.credit) > 1:
return False
if currency.credit[0].account.code != "1111-001":
if currency.credit[0].account.code != Account.CASH:
return False
return True

6
src/accounting/report/reports/utils/report_chooser.py
View File

@@ -58,8 +58,8 @@ class ReportChooser:
Currency, default_currency_code()) \
if currency is None else currency
"""The currency."""
self.__account: Account = Account.find_by_code("1111-001") \
if account is None else account
self.__account: Account = Account.cash() if account is None \
else account
"""The currency."""
self.__reports: list[OptionLink] = []
"""The links to the reports."""
@@ -110,7 +110,7 @@ class ReportChooser:
"""
account: Account = self.__account
if not re.match(r"[12][12]", account.base_code):
account: Account = Account.find_by_code("1111-001")
account: Account = Account.cash()
url: str = url_for("accounting.report.income-expenses-default",
currency=self.__currency, account=account) \
if self.__period.is_default \