Compare commits

..

No commits in common. "79eb0771293121e2d82f6c292cd8efdb1cad67f8" and "937908717bb64fe96c735b56e4d51502533f31b5" have entirely different histories.

5 changed files with 3 additions and 18 deletions

View File

@ -38,4 +38,3 @@ python:
install: install:
- method: pip - method: pip
path: . path: .
- requirements: docs/requirements.txt

View File

@ -1 +0,0 @@
sphinx_rtd_theme

View File

@ -2,17 +2,6 @@ Change Log
========== ==========
Version 1.5.9
-------------
Released 2023/10/24
Bug fix.
* Refined to enable the selection of Accumulated Profit or Loss accounts other
than 3351-001, facilitating the consolidation of existing balances.
Version 1.5.8 Version 1.5.8
------------- -------------

View File

@ -24,7 +24,7 @@ from flask_sqlalchemy import SQLAlchemy
from accounting.utils.user import UserUtilityInterface from accounting.utils.user import UserUtilityInterface
VERSION: str = "1.5.9" VERSION: str = "1.5.8"
"""The package version.""" """The package version."""
db: SQLAlchemy = SQLAlchemy() db: SQLAlchemy = SQLAlchemy()
"""The database instance.""" """The database instance."""

View File

@ -304,8 +304,7 @@ class Account(db.Model):
cls.base_code.startswith("78"), cls.base_code.startswith("78"),
cls.base_code.startswith("8"), cls.base_code.startswith("8"),
cls.base_code.startswith("9")), cls.base_code.startswith("9")),
sa.not_(sa.and_(cls.base_code == "3351", cls.base_code != "3351",
cls.no == 1)),
cls.base_code != "3353")\ cls.base_code != "3353")\
.order_by(cls.base_code, cls.no).all() .order_by(cls.base_code, cls.no).all()
@ -327,8 +326,7 @@ class Account(db.Model):
cls.base_code.startswith("74"), cls.base_code.startswith("74"),
cls.base_code.startswith("8"), cls.base_code.startswith("8"),
cls.base_code.startswith("9")), cls.base_code.startswith("9")),
sa.not_(sa.and_(cls.base_code == "3351", cls.base_code != "3351",
cls.no == 1)),
cls.base_code != "3353")\ cls.base_code != "3353")\
.order_by(cls.base_code, cls.no).all() .order_by(cls.base_code, cls.no).all()