lambda-erp 0.2.3__tar.gz → 0.2.5__tar.gz

{lambda_erp-0.2.3 → lambda_erp-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lambda-erp
-Version: 0.2.3
+Version: 0.2.5
 Summary: Core ERP logic - accounting, sales, purchasing, inventory
 Author: TORUS INVESTMENTS AG
 License-Expression: MIT

{lambda_erp-0.2.3 → lambda_erp-0.2.5}/api/routers/masters.py

@@ -388,8 +388,16 @@ def delete_master(master_type: str, name: str, _user: dict = _admin):
 
 
 @router.get("/account/tree")
-def account_tree(company: str | None = None, _user: dict = _viewer):
-    """Return Chart of Accounts as a nested tree."""
+def account_tree(company: str | None = None, include_disabled: bool = False,
+                 _user: dict = _viewer):
+    """Return Chart of Accounts as a nested tree.
+
+    Disabled accounts are hidden by default (they already drop out of account
+    pickers, and a disabled account is one the user retired). Pass
+    ``include_disabled=true`` to show them. A disabled *group* is still shown if
+    it has any enabled descendant, so an active account is never hidden behind a
+    disabled parent. Each node carries a ``disabled`` bool for the UI.
+    """
     db = get_db()
     filters = {}
     if company:
@@ -398,7 +406,7 @@ def account_tree(company: str | None = None, _user: dict = _viewer):
         "Account",
         filters=filters if filters else None,
         fields=["name", "account_name", "parent_account", "root_type",
-                "report_type", "account_type", "is_group"],
+                "report_type", "account_type", "is_group", "disabled"],
     )
 
     by_parent = {}
@@ -411,7 +419,12 @@ def account_tree(company: str | None = None, _user: dict = _viewer):
         result = []
         for acc in children:
             node = dict(acc)
+            node["disabled"] = bool(acc.get("disabled"))
             node["children"] = _build(acc["name"])
+            # Prune a disabled node only when nothing enabled survives beneath it,
+            # so an enabled child is never dropped along with its disabled parent.
+            if not include_disabled and node["disabled"] and not node["children"]:
+                continue
             result.append(node)
         return result
 

{lambda_erp-0.2.3 → lambda_erp-0.2.5}/api/routers/reports.py

@@ -121,9 +121,13 @@ def trial_balance(
                     company, presentation_currency, to_date)
 
 
-def _chart_of_accounts(db, company=None, from_date=None, to_date=None):
-    """Chart of accounts (every account, incl. groups and zero-balance ones)
-    with period balances — the tree the GUI renders.
+def _chart_of_accounts(db, company=None, from_date=None, to_date=None,
+                       include_disabled=False):
+    """Chart of accounts (groups and zero-balance ones included) with period
+    balances — the tree the GUI renders. Disabled accounts are hidden by default
+    (``include_disabled=True`` to show them); balances still roll up over every
+    descendant (incl. disabled), and a disabled group with an enabled descendant
+    is kept so no active account is orphaned.
 
     Balance semantics follow standard presentation:
       - Balance Sheet accounts: CLOSING balance as of ``to_date`` (all postings
@@ -212,6 +216,19 @@ def _chart_of_accounts(db, company=None, from_date=None, to_date=None):
             row["balance"] = flt(row["balance"] + subtree_extra[row["name"]], 2)
             row["has_entries"] = row["has_entries"] or bool(subtree_extra[row["name"]])
 
+    # Hide disabled accounts by default, but keep any disabled ancestor of an
+    # enabled account so the enabled one isn't orphaned in the rendered tree.
+    if not include_disabled:
+        keep = set()
+        for row in rows:
+            if not row["disabled"]:
+                keep.add(row["name"])
+                parent = row["parent_account"]
+                while parent and parent in by_name and parent not in keep:
+                    keep.add(parent)
+                    parent = by_name[parent]["parent_account"]
+        rows = [r for r in rows if r["name"] in keep]
+
     return {"accounts": rows, "from_date": from_date, "to_date": to_date}
 
 
@@ -221,10 +238,14 @@ def chart_of_accounts(
     from_date: str | None = None,
     to_date: str | None = None,
     presentation_currency: str | None = None,
+    include_disabled: bool = False,
 ):
     db = get_db()
-    return _present(db, _chart_of_accounts(db, company, from_date, to_date),
-                    company, presentation_currency, to_date)
+    return _present(
+        db,
+        _chart_of_accounts(db, company, from_date, to_date,
+                           include_disabled=include_disabled),
+        company, presentation_currency, to_date)
 
 
 def _general_ledger(db, filters=None):

{lambda_erp-0.2.3 → lambda_erp-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lambda-erp"
-version = "0.2.3"
+version = "0.2.5"
 description = "Core ERP logic - accounting, sales, purchasing, inventory"
 readme = "README.md"
 license = "MIT"