Advanced to version 1.5.10.

after August 7, 2023.

.readthedocs.yaml

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

docs/requirements.txt

@@ -0,0 +1 @@
+sphinx_rtd_theme

docs/source/changelog.rst

@@ -2,6 +2,28 @@ Change Log
 ==========
 
 
+Version 1.5.10
+--------------
+
+Released 2023/11/28
+
+Bug fix.
+
+* Fixed the form validator to enable the selection of Accumulated Profit or
+  Loss accounts other than 3351-001.
+
+
+Version 1.5.9
+-------------
+
+Released 2023/11/28
+
+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
 -------------
 

src/accounting/__init__.py

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

src/accounting/forms.py

@@ -71,7 +71,7 @@ class IsDebitAccount:
         if field.data is None:
             return
         if re.match(r"^(?:[1235689]|7[5678])", field.data) \
-                and not field.data.startswith("3351-") \
+                and field.data != "3351-001" \
                 and not field.data.startswith("3353-"):
             return
         raise ValidationError(self.__message)
@@ -92,7 +92,7 @@ class IsCreditAccount:
         if field.data is None:
             return
         if re.match(r"^(?:[123489]|7[1234])", field.data) \
-                and not field.data.startswith("3351-") \
+                and field.data != "3351-001" \
                 and not field.data.startswith("3353-"):
             return
         raise ValidationError(self.__message)

src/accounting/models.py

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