5 Commits

6 changed files with 31 additions and 4 deletions

View File

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

1
docs/requirements.txt Normal file
View File

@ -0,0 +1 @@
sphinx_rtd_theme

View File

@ -2,6 +2,29 @@ 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
-------------
Released 2023/10/24
Bug fix.
* Fixed an icon in the detail of the cash receipt journal entry.
Released at Jaipur, India on vacation.
Version 1.5.7
-------------

View File

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

View File

@ -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()

View File

@ -23,7 +23,7 @@ First written: 2023/2/26
{% block as_trasfer %}
<a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_journal_entry_to_transfer|accounting_inherit_next }}">
<i class="fa-solid fa-bars-staggered"></i>
<i class="fa-solid fa-table-columns"></i>
<span class="d-none d-md-inline">{{ A_("As Transfer") }}</span>
</a>
{% endblock %}