Compare commits
2 Commits
50d4526e0b
...
e0ed81ad1f
Author | SHA1 | Date | |
---|---|---|---|
e0ed81ad1f | |||
ece7481e9e |
@ -2,6 +2,17 @@ Change Log
|
||||
==========
|
||||
|
||||
|
||||
Version 1.5.11
|
||||
--------------
|
||||
|
||||
Released 2023/12/26
|
||||
|
||||
Bug fix.
|
||||
|
||||
* Refined to enable the selection of the 3351-001 Accumulated Profit or Loss
|
||||
account.
|
||||
|
||||
|
||||
Version 1.5.10
|
||||
--------------
|
||||
|
||||
|
@ -24,7 +24,7 @@ from flask_sqlalchemy import SQLAlchemy
|
||||
|
||||
from accounting.utils.user import UserUtilityInterface
|
||||
|
||||
VERSION: str = "1.5.10"
|
||||
VERSION: str = "1.5.11"
|
||||
"""The package version."""
|
||||
db: SQLAlchemy = SQLAlchemy()
|
||||
"""The database instance."""
|
||||
|
@ -71,7 +71,6 @@ class IsDebitAccount:
|
||||
if field.data is None:
|
||||
return
|
||||
if re.match(r"^(?:[1235689]|7[5678])", field.data) \
|
||||
and field.data != "3351-001" \
|
||||
and not field.data.startswith("3353-"):
|
||||
return
|
||||
raise ValidationError(self.__message)
|
||||
@ -92,7 +91,6 @@ class IsCreditAccount:
|
||||
if field.data is None:
|
||||
return
|
||||
if re.match(r"^(?:[123489]|7[1234])", field.data) \
|
||||
and field.data != "3351-001" \
|
||||
and not field.data.startswith("3353-"):
|
||||
return
|
||||
raise ValidationError(self.__message)
|
||||
|
@ -304,8 +304,6 @@ class Account(db.Model):
|
||||
cls.base_code.startswith("78"),
|
||||
cls.base_code.startswith("8"),
|
||||
cls.base_code.startswith("9")),
|
||||
sa.not_(sa.and_(cls.base_code == "3351",
|
||||
cls.no == 1)),
|
||||
cls.base_code != "3353")\
|
||||
.order_by(cls.base_code, cls.no).all()
|
||||
|
||||
@ -327,8 +325,6 @@ class Account(db.Model):
|
||||
cls.base_code.startswith("74"),
|
||||
cls.base_code.startswith("8"),
|
||||
cls.base_code.startswith("9")),
|
||||
sa.not_(sa.and_(cls.base_code == "3351",
|
||||
cls.no == 1)),
|
||||
cls.base_code != "3353")\
|
||||
.order_by(cls.base_code, cls.no).all()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user