lambda-erp 0.8.24__tar.gz → 0.8.25__tar.gz

{lambda_erp-0.8.24 → lambda_erp-0.8.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lambda-erp
-Version: 0.8.24
+Version: 0.8.25
 Summary: Core ERP logic - accounting, sales, purchasing, inventory
 Author: TORUS INVESTMENTS AG
 License-Expression: Apache-2.0

{lambda_erp-0.8.24 → lambda_erp-0.8.25}/lambda_erp/accounting/bank_reconciliation.py

@@ -256,10 +256,10 @@ def _voucher_candidates(tx: dict, limit: int) -> list[dict]:
         'AND gle.voucher_type IN (?, ?) '
         'AND NOT EXISTS (SELECT 1 FROM "Bank Reconciliation" br '
         '  WHERE br.voucher_type = gle.voucher_type AND br.voucher_no = gle.voucher_no '
-        '  AND br.status = ?) '
+        '  AND br.status = ? AND br.bank_account = ?) '
         'GROUP BY gle.voucher_type, gle.voucher_no '
         'ORDER BY MIN(gle.posting_date) DESC LIMIT 500',
-        [tx["bank_account"], "Payment Entry", "Journal Entry", "Active"],
+        [tx["bank_account"], "Payment Entry", "Journal Entry", "Active", tx["bank_account"]],
     )
     expected = _amount(tx)
     deposit = _is_deposit(tx)
@@ -311,6 +311,7 @@ def _new_audit(tx: dict, *, mode: str, voucher_type: str, voucher_no: str,
     get_db().insert("Bank Reconciliation", {
         "name": name,
         "bank_transaction": tx["name"],
+        "bank_account": tx["bank_account"],
         "mode": mode,
         "voucher_type": voucher_type,
         "voucher_no": voucher_no,
@@ -360,34 +361,35 @@ def reverse_generated_reconciliation(reconciliation: str | None, *, voucher_type
             "Bank Reconciliation", reconciliation,
             ["name", "bank_transaction", "voucher_type", "voucher_no", "status", "reversed_by"],
         )
+        rows = [row] if row else []
     else:
-        matches = db.sql(
+        rows = db.sql(
             'SELECT name, bank_transaction, voucher_type, voucher_no, status, reversed_by '
             'FROM "Bank Reconciliation" WHERE voucher_type = ? AND voucher_no = ? '
-            'AND status = ? LIMIT 1',
+            'AND status = ?',
             [voucher_type, voucher_no, "Active"],
         )
-        row = matches[0] if matches else None
-    if not row or row.get("status") != "Active":
-        return
-    if row.get("voucher_type") != voucher_type or row.get("voucher_no") != voucher_no:
-        raise ValidationError("Bank reconciliation voucher does not match the cancelled document")
-    tx = _transaction(row["bank_transaction"])
-    db.set_value("Bank Transaction", tx["name"], {
-        "reference_doctype": None,
-        "reference_name": None,
-        "allocated_amount": 0,
-        "unallocated_amount": _amount(tx),
-        "status": "Unreconciled",
-        "reconciled_by": None,
-        "reconciled_at": None,
-        "modified": now(),
-    })
-    db.set_value("Bank Reconciliation", row["name"], {
-        "status": "Reversed",
-        "reversed_by": row.get("reversed_by"),
-        "reversed_at": now(),
-    })
+    for row in rows:
+        if row.get("status") != "Active":
+            continue
+        if row.get("voucher_type") != voucher_type or row.get("voucher_no") != voucher_no:
+            raise ValidationError("Bank reconciliation voucher does not match the cancelled document")
+        tx = _transaction(row["bank_transaction"])
+        db.set_value("Bank Transaction", tx["name"], {
+            "reference_doctype": None,
+            "reference_name": None,
+            "allocated_amount": 0,
+            "unallocated_amount": _amount(tx),
+            "status": "Unreconciled",
+            "reconciled_by": None,
+            "reconciled_at": None,
+            "modified": now(),
+        })
+        db.set_value("Bank Reconciliation", row["name"], {
+            "status": "Reversed",
+            "reversed_by": row.get("reversed_by"),
+            "reversed_at": now(),
+        })
 
 
 def _allocation_profile(tx: dict, allocations: list[dict]) -> tuple[tuple[str, str, str, str], list[dict]]:
@@ -586,7 +588,19 @@ def _validate_existing_voucher(tx: dict, voucher_type: str, voucher_no: str) ->
         raise ValidationError(f"{voucher_type} {voucher_no} is unavailable or not submitted")
     if document.get("company") != tx["company"]:
         raise ValidationError("Voucher and bank transaction belong to different companies")
-    rows = get_db().sql(
+    db = get_db()
+    used = db.sql(
+        'SELECT bank_transaction FROM "Bank Reconciliation" '
+        'WHERE voucher_type = ? AND voucher_no = ? AND bank_account = ? '
+        'AND status = ? LIMIT 1',
+        [voucher_type, voucher_no, tx["bank_account"], "Active"],
+    )
+    if used:
+        raise ValidationError(
+            f"The {voucher_type} {voucher_no} bank movement on account "
+            f"{tx['bank_account']} is already reconciled with {used[0]['bank_transaction']}"
+        )
+    rows = db.sql(
         'SELECT COALESCE(SUM(debit), 0) AS debit, COALESCE(SUM(credit), 0) AS credit, '
         'COALESCE(SUM(debit_in_account_currency), 0) AS debit_ccy, '
         'COALESCE(SUM(credit_in_account_currency), 0) AS credit_ccy '

{lambda_erp-0.8.24 → lambda_erp-0.8.25}/lambda_erp/database.py

@@ -1423,12 +1423,14 @@ class Database:
             """CREATE INDEX IF NOT EXISTS "ix_bank_transaction_detail_parent"
                 ON "Bank Transaction Detail" (parent, idx)""",
 
-            # Immutable-ish audit trail for bank reconciliation decisions. A
-            # transaction can have only one active reconciliation, while old
-            # reversed rows remain available for review.
+            # Audit trail for bank reconciliation decisions. A transaction can
+            # have only one active reconciliation. A multi-bank Journal Entry
+            # may be linked once per bank account; reversed rows remain for
+            # review.
             """CREATE TABLE IF NOT EXISTS "Bank Reconciliation" (
                 name TEXT PRIMARY KEY,
                 bank_transaction TEXT NOT NULL,
+                bank_account TEXT NOT NULL,
                 mode TEXT NOT NULL,
                 voucher_type TEXT NOT NULL,
                 voucher_no TEXT NOT NULL,
@@ -1438,15 +1440,13 @@ class Database:
                 created_at TEXT,
                 reversed_by TEXT,
                 reversed_at TEXT,
-                FOREIGN KEY (bank_transaction) REFERENCES "Bank Transaction"(name)
+                FOREIGN KEY (bank_transaction) REFERENCES "Bank Transaction"(name),
+                FOREIGN KEY (bank_account) REFERENCES "Account"(name)
             )""",
 
             """CREATE UNIQUE INDEX IF NOT EXISTS "ux_bank_reconciliation_active_transaction"
                 ON "Bank Reconciliation" (bank_transaction) WHERE status = 'Active'""",
 
-            """CREATE UNIQUE INDEX IF NOT EXISTS "ux_bank_reconciliation_active_voucher"
-                ON "Bank Reconciliation" (voucher_type, voucher_no) WHERE status = 'Active'""",
-
             # --- Chat Sessions ---
             """CREATE TABLE IF NOT EXISTS "Chat Session" (
                 id TEXT PRIMARY KEY,
@@ -2427,6 +2427,27 @@ def _m024_bank_reconciliation(db: "Database") -> None:
     db._add_column_if_missing("Bank Transaction", "reconciled_at", "TEXT")
 
 
+def _m025_bank_reconciliation_multi_account_voucher(db: "Database") -> None:
+    """Allow one voucher to reconcile one bank movement per bank account.
+
+    Version 24 allowed only one active reconciliation for an entire voucher.
+    That rejects legitimate multi-bank journals (for example one CHF fee and
+    one USD fee collected in a single Journal Entry). Keep the conservative
+    one-use rule at the bank-account leg instead.
+    """
+    db.ensure_column("Bank Reconciliation", "bank_account", "TEXT")
+    db._alter_table_lock_safe([
+        'DROP INDEX IF EXISTS "ux_bank_reconciliation_active_voucher"',
+        'UPDATE "Bank Reconciliation" SET bank_account = ('
+        'SELECT bt.bank_account FROM "Bank Transaction" bt '
+        'WHERE bt.name = "Bank Reconciliation".bank_transaction'
+        ') WHERE bank_account IS NULL',
+        'CREATE UNIQUE INDEX IF NOT EXISTS "ux_bank_reconciliation_active_voucher_account" '
+        'ON "Bank Reconciliation" (voucher_type, voucher_no, bank_account) '
+        "WHERE status = 'Active'",
+    ], ["Bank Reconciliation"])
+
+
 Database.MIGRATIONS = [
     (1, "chat_message_session_id", _m001_chat_message_session_id),
     (2, "chat_session_user_id", _m002_chat_session_user_id),
@@ -2452,6 +2473,7 @@ Database.MIGRATIONS = [
     (22, "company_default_tax_templates", _m022_company_default_tax_templates),
     (23, "camt_bank_statement_import", _m023_camt_bank_statement_import),
     (24, "bank_reconciliation", _m024_bank_reconciliation),
+    (25, "bank_reconciliation_multi_account_voucher", _m025_bank_reconciliation_multi_account_voucher),
 ]
 
 

{lambda_erp-0.8.24 → lambda_erp-0.8.25}/pyproject.toml

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