Explorar o código

Implementierung von Kommentar- und Buchungsbeleg-Tab-Filterung mit dynamischen Inhalten

- Hinzufügen von hx-on-Attributen zur automatischen Scrollfunktion im Chat-Container.
- Umstrukturierung der Kommentar- und Buchungsbeleg-Templates zur Verwendung von gemeinsamen Tab-Filter-Makros.
- Verbesserung der SQL-Abfragen zur Unterstützung von verschiedenen Filterbereichen (Rechnung, offen, Fahrzeug, Debitor).
- Einführung von Tests zur Validierung der neuen Filterlogik und zur Sicherstellung der korrekten Anzeige von Kommentaren und Buchungsbelegen.
- Bereinigung von nicht mehr benötigtem HTML und Kommentaren in den Templates.
gc-server3 hai 2 semanas
pai
achega
41b6bb7dfb

+ 21 - 0
README.md

@@ -86,6 +86,27 @@ Tests werden ohne zusätzliche Testabhängigkeiten ausgeführt:
 .venv\Scripts\python.exe -m unittest discover -v
 ```
 
+## Filter auf der Forderungsdetailseite
+
+Kommentare und Buchungsbelege starten jeweils mit „Diese Rechnung“ und lassen sich
+unabhängig auf offene Rechnungen, das Fahrzeug oder die gesamte Debitorhistorie erweitern.
+Die Auswahl gilt für die geöffnete Seite und wird beim Neuladen zurückgesetzt.
+Die Fahrzeugansicht bleibt auf denselben Debitor begrenzt und ist ohne Fahrzeugnummer deaktiviert.
+Offen bedeutet `Beleg_offen <> 0`; Zahlungen werden über `Bezug_Beleg_Nr` zugeordnet.
+
+Alle Filter bleiben im Mandanten der Ausgangsrechnung. Nach erfolgreicher Rechteprüfung
+dieser Rechnung umfasst die erweiterte Ansicht ausdrücklich auch andere Standorte und
+Abteilungen des Debitors. Der direkte Zugriff auf andere Rechnungen wird separat geprüft.
+Neue Kommentare gehören immer zur geöffneten Rechnung, auch in erweiterten Ansichten.
+Filterwechsel erhalten ungespeicherte Eingaben. Buchungsbelege sind auf 1.000 Zeilen begrenzt;
+bei Erreichen dieses Limits erscheint ein Hinweis.
+
+Die lesenden Endpunkte `/app/forderungen/details/{primary_key}/kommentare` und
+`/app/forderungen/details/{primary_key}/buchungen` liefern HTML-Fragmente für HTMX.
+`scope` akzeptiert `invoice` (Standard), `open`, `vehicle` und `debtor`; andere Werte
+werden mit HTTP 422 abgelehnt. Kommentar-POSTs übergeben die aktuelle Auswahl als
+`comment_scope`. Datenbankschemaänderungen sind nicht erforderlich.
+
 ## Debug-Anmeldung ohne LDAP
 
 Für Entwicklung und manuelle Tests diese Werte in `.env` setzen und die Anwendung neu starten:

+ 39 - 0
app/forderung_history.py

@@ -0,0 +1,39 @@
+from typing import Literal
+from urllib.parse import quote
+
+from fastapi import HTTPException
+from sqlalchemy import text
+from sqlalchemy.orm import Session
+
+from .jinja_templates import templates
+
+HistoryScope = Literal["invoice", "open", "vehicle", "debtor"]
+
+
+def history_context(db: Session, pkey: dict[str, str], section: str, scope: HistoryScope = "invoice") -> dict:
+    values = {"client_db": pkey["Client_DB"], "beleg_nr": pkey["Beleg_Nr"], "scope": scope}
+    invoice = db.execute(
+        text("SELECT TOP 1 * FROM dbo.Forderungen_Kopf WHERE Client_DB = :client_db AND Beleg_Nr = :beleg_nr"),
+        values,
+    ).mappings().first()
+    if invoice is None:
+        raise HTTPException(status_code=404, detail="Forderung nicht gefunden")
+    return section_context(db, pkey, invoice, section, scope)
+
+
+def section_context(db: Session, pkey: dict[str, str], invoice, section: str, scope: HistoryScope = "invoice") -> dict:
+    # Neither the customer nor the vehicle can be supplied by the browser.
+    invoice = getattr(invoice, "_mapping", invoice)
+    vehicle_missing = not str(invoice["Fahrzeug_Nr"] or "").strip()
+    values = {"client_db": pkey["Client_DB"], "beleg_nr": pkey["Beleg_Nr"], "scope": scope}
+    rows = []
+    if scope != "vehicle" or not vehicle_missing:
+        query = templates.env.get_template(f"forderungen/details/queries/forderungen_{section}.sql").render(scope=scope)
+        rows = db.execute(text(query), values).fetchall()
+    return {
+        "forderungen_details": [invoice],
+        f"forderungen_{section}": rows,
+        f"{section}_scope": scope,
+        "vehicle_missing": vehicle_missing,
+        "detail_url": "/app/forderungen/details/" + quote(f"{pkey['Client_DB']}_{pkey['Beleg_Nr']}", safe=""),
+    }

+ 29 - 6
app/routes.py

@@ -25,6 +25,7 @@ from .auth import clear_session_cookie, safe_next_url, set_session_cookie
 from .config import settings
 from .db import get_session
 from .docuware_search import get_invoice_pdf_by_document_no
+from .forderung_history import HistoryScope, history_context, section_context
 from .forderung_summary import get_forderung_summary
 from .jinja_templates import templates
 from .ldap import DirectoryUnavailable, DirectoryUser, ldap_authenticate, normalize_username
@@ -255,8 +256,6 @@ def get_template_context(request: Request, pkey: dict[str, str], db: Session) ->
     template_context = {}
     for filename in [
         "auftraege_positionen",
-        "forderungen_buchungen",
-        "forderungen_kommentare",
         "forderungen_details",
         "forderungen_mahnungen",
         "versicherungen",
@@ -264,19 +263,42 @@ def get_template_context(request: Request, pkey: dict[str, str], db: Session) ->
         query = templates.TemplateResponse(request, f"forderungen/details/queries/{filename}.sql", {}).body.decode(
             "utf-8"
         )
-        values = {"client_db": pkey["Client_DB"], "beleg_nr": pkey["Beleg_Nr"], "belege_filter": "D"}
+        values = {"client_db": pkey["Client_DB"], "beleg_nr": pkey["Beleg_Nr"]}
         template_context[filename] = db.execute(text(query), values).fetchall()
+    for section in ("kommentare", "buchungen"):
+        template_context.update(section_context(db, pkey, template_context["forderungen_details"][0], section))
     template_context["files"] = get_files(pkey)
     template_context["add7days"] = (datetime.now() + timedelta(days=7)).strftime("%Y-%m-%d")
     return template_context
 
 
+@router.get("/app/forderungen/details/{primary_key}/kommentare", response_class=HTMLResponse)
+def forderungen_kommentare(
+    request: Request, primary_key: str, scope: HistoryScope = "invoice", db: Session = Depends(get_session)
+):
+    pkey = convert_primary_key("forderungen", primary_key)
+    ensure_forderung_access(db, current_principal(request), pkey["Client_DB"], pkey["Beleg_Nr"])
+    context = history_context(db, pkey, "kommentare", scope)
+    return templates.TemplateResponse(request, "forderungen/details/details_kommentare.html", context)
+
+
+@router.get("/app/forderungen/details/{primary_key}/buchungen", response_class=HTMLResponse)
+def forderungen_buchungen(
+    request: Request, primary_key: str, scope: HistoryScope = "invoice", db: Session = Depends(get_session)
+):
+    pkey = convert_primary_key("forderungen", primary_key)
+    ensure_forderung_access(db, current_principal(request), pkey["Client_DB"], pkey["Beleg_Nr"])
+    context = history_context(db, pkey, "buchungen", scope)
+    return templates.TemplateResponse(request, "forderungen/details/details_buchungen.html", context)
+
+
 @router.post("/app/forderungen/details/{primary_key}", response_class=HTMLResponse)
 async def post_forderungen_details(
     request: Request,
     primary_key: str,
     source: Annotated[str, Form()],
     redirect: Annotated[str | None, Form()] = None,
+    comment_scope: Annotated[HistoryScope, Form()] = "invoice",
     db: Session = Depends(get_session),
 ):
     principal = current_principal(request)
@@ -317,7 +339,7 @@ async def post_forderungen_details(
 
     async with request.form() as form:
         for k, v in form.items():
-            if k in data:
+            if k in data and k not in {"Client_DB", "Beleg_Nr", "Benutzer_ID", "Timestamp"}:
                 if v == "on":
                     v = "J"
                 if re.match(r"\d+,?\d*", v):
@@ -333,12 +355,13 @@ async def post_forderungen_details(
         if subquery.strip():
             db.execute(text(subquery), data)
     db.commit()
-    template_context = get_template_context(request, pkey, db)
 
     if redirect:
         return RedirectResponse(url=redirect, status_code=302)
     if source == "comments":
-        return templates.TemplateResponse(request, "base/chat_container.html", template_context)
+        context = history_context(db, pkey, "kommentare", comment_scope)
+        return templates.TemplateResponse(request, "forderungen/details/details_kommentare.html", context)
+    template_context = get_template_context(request, pkey, db)
     return templates.TemplateResponse(request, "forderungen/details/details_formular.html", template_context)
 
 

+ 31 - 1
static/assets/css/main.css

@@ -152,6 +152,36 @@ body {
     color: var(--text-dark);
 }
 
+.history-tabs {
+    flex-wrap: wrap;
+    flex-shrink: 0;
+    padding: 0 8px;
+}
+
+.history-tab {
+    border: 0;
+    border-bottom: 2px solid transparent;
+    background: transparent;
+    font-family: inherit;
+}
+
+.history-tab:disabled {
+    cursor: not-allowed;
+    opacity: 0.5;
+}
+
+.comment-history {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
+}
+
+.comment-invoice {
+    font-size: 12px;
+    color: var(--text-light);
+}
+
 .badge {
     position: absolute;
     top: 8px;
@@ -1069,4 +1099,4 @@ input[type="date"]:in-range::-webkit-datetime-edit-month-field,
 input[type="date"]:in-range::-webkit-datetime-edit-day-field,
 input[type="date"]:in-range::-webkit-datetime-edit-text {
     color: #eee;
-}
+}

+ 12 - 388
templates/base/chat_container.html

@@ -1,4 +1,5 @@
-<div class="chat-container" id="chat">
+<div class="chat-container" id="chat"
+    hx-on::after-swap="const content = this.querySelector('#chatContent'); if (content) content.scrollTop = content.scrollHeight;">
     <div class="header">
         <div class="header-left">
             <div class="avatar" style="background-color: #5468FF;">
@@ -40,399 +41,22 @@
             </button>
         </div>
     </div>
-    <div class="tabs">
-        <div class="tab active">Diese Rechnung</div>
-        <div class="tab">Alle offenen Rechnungen</div>
-        <div class="tab">Dieses Fahrzeug</div>
-        <div class="tab">Debitor Historie</div>
-    </div>
-    <div class="chat-content" id="chatContent">
-        <div class="date-divider">
-            <div class="divider-line"></div>
-            <div class="divider-text">{{ forderungen_details[0].Beleg_Datum|date_format }}</div>
-            <div class="divider-line"></div>
-        </div>
-        <!--
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">DKI</div>
-                <div class="sender-name">Daniel Klingenstein</div>
-                <div class="timestamp">04.01.2025</div>
-            </div>
-            <div class="message-bubble">
-                Korrigierte Werkstattrechnung
-            </div>
-            <div class="embed-content">
-                <div class="embed-header">
-                    <div class="embed-icon">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none"
-                            stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <polygon points="1 6 1 22 8 18 16 22 23 18 23 2 16 6 8 2 1 6"></polygon>
-                            <line x1="8" y1="2" x2="8" y2="18"></line>
-                            <line x1="16" y1="6" x2="16" y2="22"></line>
-                        </svg>
-                    </div>
-                    <div class="embed-title">Rechnung WRG25400108</div>
-                </div>
-                <div class="embed-body">
-                    <img src="/static/assets/images/vorschau.jpg" alt="Rechnung WRG25400108" class="embed-image"  style="height:30px;">
-                    <div class="embed-text">
-                        ...
-                    </div>
-                </div>
-                <div class="embed-footer">
-                    <button class="embed-button" id="openResourceBtn">Öffnen</button>
-                </div>
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">22.01.2025</div>
-            </div>
-            <div class="message-bubble">
-                AZ 3120/24 HP Schaden Rep RE kann nicht eingereicht werden. ESW Zusatzprodukte fehlen
-            </div>
-        </div>-->
-        {% for row in forderungen_kommentare %}
-            {% set sender = "other" %}
-            {% if row.Benutzer_ID == request.state.principal.username %}
-                {% set sender = "myself" %}
-            {% endif %}
-        <div class="message {{sender}} {{ row.Rolle_ID }} ">
-            <div class="message-header">
-                <div class="avatar">{{ row.Benutzer_ID }}</div>
-                <div class="sender-name">{{ row.Name }}</div>
-                <div class="timestamp">{{ row.Timestamp|date_format }}</div>
-            </div>
-            <div class="message-bubble">
-                {{ row.Kommentar }}
-            </div>
-        </div>
-        {% endfor %}
-
-        <div id="chat-end">
-            &nbsp;
-        </div>
-
-        <!--
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">11.03.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="date-divider">
-            <div class="divider-line"></div>
-            <div class="divider-text">Q2/2025</div>
-            <div class="divider-line"></div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">01.04.2025</div>
-            </div>
-            <div class="message-bubble">
-                Akteneinsicht liegt nun vor, im Diktat
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">14.04.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">22.04.2025</div>
-            </div>
-            <div class="message-bubble">
-                Nachgefordert
-            </div>
-            <div class="embed-content">
-                <div class="embed-header">
-                    <div class="embed-icon">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none"
-                            stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <polygon points="1 6 1 22 8 18 16 22 23 18 23 2 16 6 8 2 1 6"></polygon>
-                            <line x1="8" y1="2" x2="8" y2="18"></line>
-                            <line x1="16" y1="6" x2="16" y2="22"></line>
-                        </svg>
-                    </div>
-                    <div class="embed-title">Mahnung</div>
-                </div>
-                <div class="embed-body">
-                    <img src="/static/assets/images/vorschau.jpg" alt="Mahnung 993413" class="embed-image" style="height:30px;">
-                    <div class="embed-text">
-                        ...
-                    </div>
-                </div>
-                <div class="embed-footer">
-                    <button class="embed-button" id="openResourceBtn">Öffnen</button>
-                </div>
-            </div>
-        </div>
-
-
-
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">09.05.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">03.06.2025</div>
-            </div>
-            <div class="message-bubble">
-                RA schreibt KD an ob geklagt werden soll und RS besteht
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">23.06.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">23.06.2025</div>
-            </div>
-            <div class="message-bubble">
-                Akte im Diktat
-            </div>
-        </div>
-        <div class="date-divider">
-            <div class="divider-line"></div>
-            <div class="divider-text">Q3/2025</div>
-            <div class="divider-line"></div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">01.07.2025</div>
-            </div>
-            <div class="message-bubble">
-                Warten auf RÜ Polizei
-            </div>
-        </div>
-
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">15.07.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">22.07.2025</div>
-            </div>
-            <div class="message-bubble">
-                Warten auf Rückmeldung Mdt wg Rechtschutz
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">11.08.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">19.08.2025</div>
-            </div>
-            <div class="message-bubble">
-                ST bez. Mit STN S+W wird nachgefordert
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">08.09.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="date-divider">
-            <div class="divider-line"></div>
-            <div class="divider-text">Q4/2025</div>
-            <div class="divider-line"></div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">14.10.2025</div>
-            </div>
-            <div class="message-bubble">
-                Klage in Vorbereitung WV 18.11.2025
-            </div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">25.11.2025</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">MDE</div>
-                <div class="sender-name">Maria Dietrich</div>
-                <div class="timestamp">30.11.2025</div>
-            </div>
-            <div class="message-bubble">
-                EWB
-            </div>
-            <div class="embed-content">
-                <div class="embed-header">
-                    <div class="embed-icon">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none"
-                            stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <polygon points="1 6 1 22 8 18 16 22 23 18 23 2 16 6 8 2 1 6"></polygon>
-                            <line x1="8" y1="2" x2="8" y2="18"></line>
-                            <line x1="16" y1="6" x2="16" y2="22"></line>
-                        </svg>
-                    </div>
-                    <div class="embed-title">EWB 20% 11/2025</div>
-                </div>
-                <div class="embed-body">
-                    <img src="/static/assets/images/vorschau.jpg" alt="Buchung" class="embed-image" style="height:30px;">
-                    <div class="embed-text">
-                        ...
-                    </div>
-                </div>
-                <div class="embed-footer">
-                    <button class="embed-button" id="openResourceBtn">Öffnen</button>
-                </div>
-            </div>
-        </div>
-
-        <div class="message student">
-            <div class="message-header">
-                <div class="avatar">CVE</div>
-                <div class="sender-name">Carolin Vetter</div>
-                <div class="timestamp">04.12.2025</div>
-            </div>
-            <div class="message-bubble">
-                gerichtliches Verfahren läuft WV 02/26
-            </div>
-        </div>
-
-        <div class="date-divider">
-            <div class="divider-line"></div>
-            <div class="divider-text">Q1/2026</div>
-            <div class="divider-line"></div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">19.02.2026</div>
-            </div>
-            <div class="message-bubble">
-                Stand RA
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">09.03.2026</div>
-            </div>
-            <div class="message-bubble">
-                Schreiben von RAW erhalten. Sehr verwirrend, nochmals nachgefragt
-            </div>
-        </div>
-
-        <div class="message teacher">
-            <div class="message-header">
-                <div class="avatar">JAK</div>
-                <div class="sender-name">Jennifer Walk</div>
-                <div class="timestamp">10.03.2026</div>
-            </div>
-            <div class="message-bubble">
-                Vergleich mit HP Versicherung nun KD angeschrieben ob bei seiner Kasko eingereicht wird oder nicht
-            </div>
-        </div>
-    -->
-
-    </div>
+    {% include 'forderungen/details/details_kommentare.html' %}
     <div class="input-area">
         <div class="toolbar">
-            <form>
+            <form id="comment-form" method="post" action="{{ detail_url }}" hx-post="{{ detail_url }}"
+                hx-target="#comments-history" hx-swap="outerHTML" hx-push-url="false"
+                hx-sync="#comments-history:replace"
+                hx-disabled-elt="#comment-form input, #comment-form button, #comments-history button"
+                hx-on::after-request="if (event.detail.successful) this.querySelector('[name=Kommentar]').value = ''">
                 <input type="hidden" name="_csrf" value="{{ request.state.principal.csrf }}" />
-                <button class="btn btn-primary">
+                <button type="button" class="btn btn-primary">
                     <i class="icon icon-lg cil-paperclip"></i>
                 </button>
                 <input type="hidden" name="source" value="comments" />
                 <input type="text" class="message-input" id="comment" name="Kommentar" placeholder="Kommentieren ..."
                     autofocus="autofocus" />
-                <button class="btn btn-primary" hx-post="" hx-trigger="click" hx-swap="outerHTML" hx-target="#chat" hx-push-url="false">
+                <button type="submit" class="btn btn-primary" aria-label="Kommentar speichern">
                     <i class="icon icon-lg cil-chevron-right"></i>
                 </button>
             </form>
@@ -477,7 +101,7 @@
 
 <script>
     window.setTimeout(function() {
-        let element = document.getElementById("chat-end");
-        element.scrollIntoView({ behavior: "smooth", block: "end" });
+        const content = document.getElementById("chatContent");
+        if (content) content.scrollTop = content.scrollHeight;
     }, 1000);
 </script>

+ 0 - 3
templates/forderungen/details/details.html

@@ -48,7 +48,6 @@
 
 <br>
 
-{%if forderungen_buchungen|length > 0 %}
 <h3>Buchungsbelege</h3>
 <p class="lead">
   Debitorenkonto {{ forderungen_details[0].Kunde_Nr }} - {{ forderungen_details[0].Kunde_Name }}
@@ -56,7 +55,5 @@
 
 {%include 'forderungen/details/details_buchungen.html' %}
 
-{%endif %}
-
 
 {% endblock %}

+ 14 - 9
templates/forderungen/details/details_buchungen.html

@@ -1,10 +1,12 @@
-<div class="tabs">
-    <div class="tab">Diese Rechnung</div>
-    <div class="tab">Alle offenen Belege</div>
-    <div class="tab">Dieses Fahrzeug</div>
-    <div class="tab active">Debitor Historie</div>
-</div>
-
+{% from 'forderungen/details/history_tabs.html' import history_tabs %}
+<div id="bookings-history">
+{{ history_tabs('buchungen', buchungen_scope, detail_url, vehicle_missing, 'bookings-history') }}
+{% if buchungen_scope == 'vehicle' and vehicle_missing %}
+<p role="status">Zu dieser Rechnung ist kein Fahrzeug hinterlegt.</p>
+{% endif %}
+{% if forderungen_buchungen|length >= 1000 %}
+<p role="status">Es werden die ersten 1.000 Buchungsbelege angezeigt. Bitte grenzen Sie die Auswahl bei Bedarf ein.</p>
+{% endif %}
 <table class="table table-striped table-bordered">
     <thead>
         <tr>
@@ -26,10 +28,13 @@
             <td>{{ row.Beleg_Nr }}</td>
             <td>{{ row.Beleg_Datum|date_format }}</td>
             <td>{{ row.Beleg_Beschreibung }}</td>
-            <td>{{ row.Benutzer }}</td>
+            <td>{{ row.Benutzer_ID }}</td>
             <td class="text-end">{{ row.Betrag|number_format }}</td>
             <td>{{ row.Bezahlt }}</td>
         </tr>
+        {% else %}
+        <tr><td colspan="8" role="status">Keine Buchungsbelege für diese Auswahl vorhanden.</td></tr>
         {% endfor %}
     </tbody>
-</table>
+</table>
+</div>

+ 24 - 27
templates/forderungen/details/details_kommentare.html

@@ -1,27 +1,24 @@
-<!--
-<br>
-<br>
-<h3>Kommentare</h3>
-
-<table class="table table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>Timestamp</th>
-      <th>Name</th>
-      <th>Rolle</th>
-      <th>Kommentar</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for row in forderungen_kommentare %}
-    <tr>
-      <td>{{ row.Timestamp|date_format }}</td>
-      <td>{{ row.Name }}</td>
-      <td>{{ row.Rolle }}</td>
-      <td>{{ row.Kommentar or '' }}</td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
-
--->
+{% from 'forderungen/details/history_tabs.html' import history_tabs %}
+<div id="comments-history" class="comment-history">
+    {{ history_tabs('kommentare', kommentare_scope, detail_url, vehicle_missing, 'comments-history') }}
+    <input type="hidden" name="comment_scope" value="{{ kommentare_scope }}" form="comment-form">
+    {% if kommentare_scope == 'vehicle' and vehicle_missing %}
+    <p class="p-3" role="status">Zu dieser Rechnung ist kein Fahrzeug hinterlegt.</p>
+    {% endif %}
+    <div class="chat-content" id="chatContent">
+        {% for row in forderungen_kommentare %}
+        <div class="message {{ 'myself' if row.Benutzer_ID == request.state.principal.username else 'other' }} {{ row.Rolle_ID }}">
+            <div class="message-header">
+                <div class="avatar">{{ row.Benutzer_ID }}</div>
+                <div class="sender-name">{{ row.Name }}</div>
+                <div class="timestamp">{{ row.Timestamp|date_format }}</div>
+                {% if kommentare_scope != 'invoice' %}<span class="comment-invoice">Rechnung {{ row.Beleg_Nr }}</span>{% endif %}
+            </div>
+            <div class="message-bubble">{{ row.Kommentar }}</div>
+        </div>
+        {% else %}
+        <p class="p-3" role="status">Keine Kommentare für diese Auswahl vorhanden.</p>
+        {% endfor %}
+        <div id="chat-end"></div>
+    </div>
+</div>

+ 15 - 0
templates/forderungen/details/history_tabs.html

@@ -0,0 +1,15 @@
+{% macro history_tabs(section, scope, detail_url, vehicle_missing, target) %}
+<div class="tabs history-tabs" role="group" aria-label="{{ 'Kommentare' if section == 'kommentare' else 'Buchungsbelege' }} filtern">
+    {% for value, label in [('invoice', 'Diese Rechnung'), ('open', 'Alle offenen Rechnungen'),
+                             ('vehicle', 'Dieses Fahrzeug'), ('debtor', 'Debitor Historie')] %}
+    <button type="button" class="tab history-tab{% if scope == value %} active{% endif %}"
+        aria-pressed="{{ 'true' if scope == value else 'false' }}"
+        hx-get="{{ detail_url }}/{{ section }}?scope={{ value }}"
+        hx-target="#{{ target }}" hx-swap="outerHTML" hx-push-url="false"
+        hx-sync="#{{ target }}:replace"
+        {% if value == 'vehicle' and vehicle_missing %}disabled title="Kein Fahrzeug zur Rechnung hinterlegt"{% endif %}>
+        {{ label }}
+    </button>
+    {% endfor %}
+</div>
+{% endmacro %}

+ 18 - 25
templates/forderungen/details/queries/forderungen_buchungen.sql

@@ -1,25 +1,18 @@
-SELECT TOP 1000 [Client_DB]
-     , [Kunde_Nr]
-     , [Fahrzeug_Nr]
-     , [Beleg_Nr]
-     , [Bezug_Beleg_Nr]
-     , [Beleg_Datum]
-     , [Beleg_Beschreibung]
-     , [Betrag]
-     , [Benutzer_ID]
-     , [Bezahlt]
-     , [Beleg_Art]
-FROM [dbo].[Forderungen_Buchungen]
-WHERE (
-    [Client_DB] = :client_db
-AND [Kunde_Nr] IN (SELECT [Kunde_Nr] FROM [dbo].[Forderungen_Mahnungen] WHERE [Client_DB] = :client_db AND [Beleg_Nr] = :beleg_nr)
-AND (
-	('D' = :belege_filter)
-	OR
-	('F' = :belege_filter AND [Fahrzeug_Nr] IN (SELECT [Fahrzeug_Nr] FROM [dbo].[Forderungen_Mahnungen] WHERE [Client_DB] = :client_db AND [Beleg_Nr] = :beleg_nr))
-
-)
-	
-) OR 1 != 1
-
-ORDER BY [Beleg_Datum], [Beleg_Art], [Beleg_Nr]
+{% include 'forderungen/details/queries/history_scope.sql' %}
+SELECT TOP 1000 B.Client_DB, B.Kunde_Nr, B.Fahrzeug_Nr, B.Beleg_Nr, B.Bezug_Beleg_Nr,
+    B.Beleg_Datum, B.Beleg_Beschreibung, B.Betrag, B.Benutzer_ID, B.Bezahlt, B.Beleg_Art
+FROM dbo.Forderungen_Buchungen AS B
+WHERE B.Client_DB = :client_db
+  AND EXISTS (SELECT 1 FROM current_invoice AS C WHERE C.Kunde_Nr = B.Kunde_Nr)
+  AND (
+      :scope = 'debtor'
+      OR (:scope = 'vehicle' AND EXISTS (
+          SELECT 1 FROM current_invoice AS C
+          WHERE C.Fahrzeug_Nr IS NOT NULL AND C.Fahrzeug_Nr <> '' AND C.Fahrzeug_Nr = B.Fahrzeug_Nr
+      ))
+      OR EXISTS (
+          SELECT 1 FROM scoped_invoices AS I
+          WHERE I.Client_DB = B.Client_DB AND (I.Beleg_Nr = B.Beleg_Nr OR I.Beleg_Nr = B.Bezug_Beleg_Nr)
+      )
+  )
+ORDER BY B.Beleg_Datum, B.Beleg_Art, B.Beleg_Nr, B.Bezug_Beleg_Nr, B.Benutzer_ID

+ 13 - 10
templates/forderungen/details/queries/forderungen_kommentare.sql

@@ -1,10 +1,13 @@
-SELECT [Timestamp],
- [Benutzer_ID],
- [Name],
- [Rolle_ID],
- [Rolle_Name],
- [Kommentar]
- 
-FROM [dbo].[Forderungen_Kommentar_Benutzer]
-WHERE [Client_DB] = :client_db
-AND [Beleg_Nr] = :beleg_nr
+{% if scope != 'invoice' %}{% include 'forderungen/details/queries/history_scope.sql' %}{% endif %}
+SELECT K.[Timestamp], K.Benutzer_ID, K.Name, K.Rolle_ID, K.Rolle_Name, K.Kommentar, K.Beleg_Nr
+FROM dbo.Forderungen_Kommentar_Benutzer AS K
+WHERE K.Client_DB = :client_db
+  {% if scope == 'invoice' %}
+  AND K.Beleg_Nr = :beleg_nr
+  {% else %}
+  AND EXISTS (
+      SELECT 1 FROM scoped_invoices AS I
+      WHERE I.Client_DB = K.Client_DB AND I.Beleg_Nr = K.Beleg_Nr
+  )
+  {% endif %}
+ORDER BY K.[Timestamp], K.Beleg_Nr, K.Benutzer_ID

+ 31 - 0
templates/forderungen/details/queries/history_scope.sql

@@ -0,0 +1,31 @@
+WITH current_invoice AS (
+    SELECT Client_DB, Beleg_Nr, Kunde_Nr, Fahrzeug_Nr
+    FROM dbo.Forderungen_Kopf
+    WHERE Client_DB = :client_db AND Beleg_Nr = :beleg_nr
+), scoped_invoices AS (
+    {% if scope == 'invoice' %}
+    SELECT Client_DB, Beleg_Nr FROM current_invoice
+    {% elif scope == 'open' %}
+    SELECT F.Client_DB, F.Beleg_Nr FROM dbo.Forderungen_Kopf AS F
+    WHERE F.Client_DB = :client_db AND F.Beleg_offen <> 0
+      AND EXISTS (SELECT 1 FROM current_invoice AS C WHERE C.Kunde_Nr = F.Kunde_Nr)
+    {% else %}
+    SELECT F.Client_DB, F.Beleg_Nr FROM dbo.Forderungen_Kopf AS F
+    WHERE F.Client_DB = :client_db
+      AND EXISTS (
+          SELECT 1 FROM current_invoice AS C WHERE C.Kunde_Nr = F.Kunde_Nr
+          {% if scope == 'vehicle' %}
+            AND C.Fahrzeug_Nr IS NOT NULL AND C.Fahrzeug_Nr <> '' AND C.Fahrzeug_Nr = F.Fahrzeug_Nr
+          {% endif %}
+      )
+    UNION
+    SELECT H.Client_DB, H.Beleg_Nr FROM dbo.Forderungen_Historie AS H
+    WHERE H.Client_DB = :client_db
+      AND EXISTS (
+          SELECT 1 FROM current_invoice AS C WHERE C.Kunde_Nr = H.Kunde_Nr
+          {% if scope == 'vehicle' %}
+            AND C.Fahrzeug_Nr IS NOT NULL AND C.Fahrzeug_Nr <> '' AND C.Fahrzeug_Nr = H.Fahrzeug_Nr
+          {% endif %}
+      )
+    {% endif %}
+)

+ 315 - 0
tests/test_forderung_history.py

@@ -0,0 +1,315 @@
+"""Exercise production SQL predicates on SQLite, adapting only SQL Server TOP syntax.
+
+This does not replace verification against the deployed SQL Server schema.
+"""
+import re
+import sqlite3
+import unittest
+from datetime import date, datetime
+from html.parser import HTMLParser
+from unittest.mock import patch
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+from app.auth import AuthenticationMiddleware
+from app.config import settings
+from app.db import get_session
+from app.forderung_history import history_context
+from app.oauth_token import create_access_token
+from app.permissions import Entitlement
+from app.routes import router
+
+
+class Record(dict):
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError:
+            raise AttributeError(name) from None
+
+
+class Result:
+    def __init__(self, cursor):
+        self.rows = []
+        if cursor.description:
+            for values in cursor.fetchall():
+                row = Record(zip((c[0] for c in cursor.description), values))
+                if row.get("Timestamp"):
+                    row["Timestamp"] = datetime.fromisoformat(row["Timestamp"])
+                if row.get("Beleg_Datum"):
+                    row["Beleg_Datum"] = date.fromisoformat(row["Beleg_Datum"])
+                self.rows.append(row)
+
+    def fetchall(self):
+        return self.rows
+
+    def first(self):
+        return next(iter(self.rows), None)
+
+    def mappings(self):
+        return self
+
+
+class FixtureDB:
+    def __init__(self):
+        self.connection = sqlite3.connect(":memory:", check_same_thread=False)
+        self.connection.execute("ATTACH DATABASE ':memory:' AS dbo")
+        self.calls = []
+        self.commits = 0
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        pass
+
+    def execute(self, query, values=None):
+        sql = str(query)
+        self.calls.append((sql, dict(values or {})))
+        top = re.search(r"SELECT TOP (\d+)", sql, re.I)
+        if top:
+            sql = re.sub(r"SELECT TOP \d+", "SELECT", sql, count=1, flags=re.I).rstrip() + " LIMIT " + top[1]
+        return Result(self.connection.execute(sql, values or {}))
+
+    def commit(self):
+        self.commits += 1
+        self.connection.commit()
+
+
+def seed(db):
+    db.connection.executescript("""
+        CREATE TABLE dbo.Forderungen_Kopf (
+            Client_DB TEXT, Beleg_Nr TEXT, Kunde_Nr TEXT, Fahrzeug_Nr TEXT, Beleg_offen REAL,
+            Hauptbetrieb_ID TEXT, Standort_ID TEXT, Abteilung TEXT, Kunde_Text TEXT, Beleg_Datum TEXT
+        );
+        CREATE TABLE dbo.Forderungen_Historie (Client_DB TEXT, Beleg_Nr TEXT, Kunde_Nr TEXT, Fahrzeug_Nr TEXT);
+        CREATE TABLE dbo.Forderungen_Buchungen (
+            Client_DB TEXT, Kunde_Nr TEXT, Fahrzeug_Nr TEXT, Beleg_Nr TEXT, Bezug_Beleg_Nr TEXT,
+            Beleg_Datum TEXT, Beleg_Beschreibung TEXT, Betrag REAL, Benutzer_ID TEXT, Bezahlt TEXT, Beleg_Art TEXT
+        );
+        CREATE TABLE dbo.Forderungen_Kommentar (
+            Client_DB TEXT, Beleg_Nr TEXT, Timestamp TEXT, Benutzer_ID TEXT, Kommentar TEXT
+        );
+        CREATE VIEW dbo.Forderungen_Kommentar_Benutzer AS
+            SELECT *, 'Test User' AS Name, 'MA' AS Rolle_ID, 'Mitarbeiter' AS Rolle_Name
+            FROM Forderungen_Kommentar;
+        CREATE TABLE dbo.Benutzer_Rechte (
+            Benutzer_ID TEXT, Hauptbetrieb_ID TEXT, Standort_ID TEXT, Abteilung TEXT
+        );
+        INSERT INTO dbo.Benutzer_Rechte VALUES ('tester', '1', '10', 'Service');
+    """)
+    for tenant, number, customer, vehicle, balance, branch in [
+        ('1', 'R1', 'D1', 'V1', 100, '10'),
+        ('1', 'R2', 'D1', 'V2', 20, '20'),
+        ('1', 'R3', 'D1', 'V1', 0, '10'),
+        ('1', 'X1', 'D2', 'V1', 90, '10'),
+        ('2', 'R1', 'D1', 'V1', 100, '10'),
+        ('1', 'NV', 'D3', None, 50, '10'),
+    ]:
+        db.connection.execute(
+            "INSERT INTO dbo.Forderungen_Kopf VALUES (?, ?, ?, ?, ?, '1', ?, 'Service', 'Test debtor', '2026-01-01')",
+            (tenant, number, customer, vehicle, balance, branch),
+        )
+    for number, vehicle in [('H1', 'V1'), ('H2', 'V2'), ('R3', 'V1')]:
+        db.connection.execute("INSERT INTO dbo.Forderungen_Historie VALUES ('1', ?, 'D1', ?)", (number, vehicle))
+    for tenant, customer, vehicle, number, reference in [
+        ('1', 'D1', 'V1', 'R1', 'R1'),
+        ('1', 'D1', None, 'P1', 'R1'),
+        ('1', 'D1', 'V2', 'R2', None),
+        ('1', 'D1', 'V1', 'R3', None),
+        ('1', 'D1', 'V1', 'H1', None),
+        ('1', 'D1', 'V2', 'H2', None),
+        ('1', 'D1', 'V1', 'LOOSE', None),
+        ('1', 'D2', 'V1', 'X1', 'R1'),
+        ('2', 'D1', 'V1', 'R1', 'R1'),
+    ]:
+        db.connection.execute(
+            "INSERT INTO dbo.Forderungen_Buchungen VALUES (?, ?, ?, ?, ?, '2026-01-02', ?, 10, 'tester', 'N', 'RE')",
+            (tenant, customer, vehicle, number, reference, 'Booking ' + number),
+        )
+    for tenant, number in [('1', 'R1'), ('1', 'R2'), ('1', 'R3'), ('1', 'H1'), ('1', 'H2'), ('1', 'X1'), ('2', 'R1')]:
+        db.connection.execute("INSERT INTO dbo.Forderungen_Kommentar VALUES (?, ?, '2026-01-02T12:00:00', 'tester', ?)",
+                              (tenant, number, f'Comment {tenant}/{number}'))
+    db.connection.commit()
+
+
+class Tags(HTMLParser):
+    def __init__(self, html):
+        super().__init__()
+        self.tags = []
+        self.feed(html)
+
+    def handle_starttag(self, tag, attrs):
+        self.tags.append((tag, dict(attrs)))
+
+
+class HistoryTests(unittest.TestCase):
+    def setUp(self):
+        self.db = FixtureDB()
+        seed(self.db)
+        self.addCleanup(self.db.connection.close)
+        self.application = FastAPI()
+        self.application.include_router(router)
+        self.application.dependency_overrides[get_session] = lambda: self.db
+        self.application.add_middleware(AuthenticationMiddleware)
+        self.entitlements = (Entitlement('1', '10', 'Service', 'Mitarbeiter', 100),)
+        for target, kwargs in [
+            ('app.auth.SessionLocal', {'return_value': self.db}),
+            ('app.auth.load_entitlements', {'return_value': self.entitlements}),
+        ]:
+            mocked = patch(target, **kwargs)
+            mocked.start()
+            self.addCleanup(mocked.stop)
+        config = patch.multiple(settings, COOKIE_SECURE=False, TRUSTED_PROXY_IPS=[])
+        config.start()
+        self.addCleanup(config.stop)
+        self.client = TestClient(self.application)
+        self.addCleanup(self.client.close)
+        self.token = create_access_token(username='tester', name='Tester', email='', role='Mitarbeiter', auth_source='ldap', csrf='csrf')
+        self.client.cookies.set(settings.SESSION_COOKIE_NAME, self.token)
+        self.pkey = {'Client_DB': '1', 'Beleg_Nr': 'R1'}
+
+    def test_all_scopes_apply_to_real_sql_without_duplicate_bookings(self):
+        expected_comments = {
+            'invoice': {'R1'}, 'open': {'R1', 'R2'}, 'vehicle': {'R1', 'R3', 'H1'},
+            'debtor': {'R1', 'R2', 'R3', 'H1', 'H2'},
+        }
+        expected_bookings = {
+            'invoice': {'R1', 'P1'}, 'open': {'R1', 'P1', 'R2'},
+            'vehicle': {'R1', 'P1', 'R3', 'H1', 'LOOSE'},
+            'debtor': {'R1', 'P1', 'R2', 'R3', 'H1', 'H2', 'LOOSE'},
+        }
+        for section, expectations in [('kommentare', expected_comments), ('buchungen', expected_bookings)]:
+            for scope, expected in expectations.items():
+                with self.subTest(section=section, scope=scope):
+                    rows = history_context(self.db, self.pkey, section, scope)['forderungen_' + section]
+                    self.assertEqual({r.Beleg_Nr for r in rows}, expected)
+                    self.assertEqual(len(rows), len(expected))
+                    if section == 'kommentare':
+                        self.assertTrue(all(r.Kommentar.startswith('Comment 1/') for r in rows))
+                    else:
+                        self.assertTrue(all(r.Client_DB == '1' and r.Kunde_Nr == 'D1' for r in rows))
+
+    def test_routes_render_isolated_fragments_and_default_to_invoice(self):
+        for section, target in [('kommentare', 'comments-history'), ('buchungen', 'bookings-history')]:
+            for scope in ['invoice', 'open', 'vehicle', 'debtor']:
+                with self.subTest(section=section, scope=scope):
+                    response = self.client.get(f'/app/forderungen/details/1_R1/{section}?scope={scope}')
+                    self.assertEqual(response.status_code, 200)
+                    tags = Tags(response.text).tags
+                    self.assertIn(('div', next(a for t, a in tags if a.get('id') == target)), tags)
+                    buttons = [a for t, a in tags if t == 'button']
+                    self.assertEqual(len(buttons), 4)
+                    self.assertEqual(sum(b['aria-pressed'] == 'true' for b in buttons), 1)
+                    self.assertTrue(all(b['hx-target'] == '#' + target for b in buttons))
+                    selected = next(b for b in buttons if b['aria-pressed'] == 'true')
+                    self.assertTrue(selected['hx-get'].endswith('scope=' + scope))
+                    self.assertNotIn('<html', response.text)
+                    self.assertNotIn('id="formular"', response.text)
+                    self.assertNotIn('name="Kommentar"', response.text)
+            response = self.client.get(f'/app/forderungen/details/1_R1/{section}')
+            self.assertIn('aria-pressed="true"', response.text)
+            self.assertNotIn('Booking R2' if section == 'buchungen' else 'Comment 1/R2', response.text)
+
+    def test_expansion_permits_other_branch_but_direct_access_remains_denied(self):
+        expanded = self.client.get('/app/forderungen/details/1_R1/kommentare?scope=debtor')
+        self.assertIn('Comment 1/R2', expanded.text)
+        for section in ['kommentare', 'buchungen']:
+            self.db.calls.clear()
+            response = self.client.get(f'/app/forderungen/details/1_R2/{section}?scope=debtor')
+            self.assertEqual(response.status_code, 404)
+            self.assertEqual(len(self.db.calls), 1)
+
+    def test_invalid_scope_does_not_query_history(self):
+        for section in ['kommentare', 'buchungen']:
+            self.db.calls.clear()
+            response = self.client.get(f'/app/forderungen/details/1_R1/{section}?scope=invalid')
+            self.assertEqual(response.status_code, 422)
+            self.assertFalse(self.db.calls)
+
+    def test_missing_vehicle_and_empty_results_leave_filters_available(self):
+        for section in ['kommentare', 'buchungen']:
+            for scope in ['invoice', 'vehicle']:
+                response = self.client.get(f'/app/forderungen/details/1_NV/{section}?scope={scope}')
+                self.assertEqual(response.status_code, 200)
+                buttons = [a for t, a in Tags(response.text).tags if t == 'button']
+                vehicle = next(b for b in buttons if b['hx-get'].endswith('scope=vehicle'))
+                self.assertIn('disabled', vehicle)
+                self.assertIn('Keine Kommentare' if section == 'kommentare' else 'Keine Buchungsbelege', response.text)
+                if scope == 'vehicle':
+                    self.assertIn('kein Fahrzeug hinterlegt', response.text)
+
+    def test_comment_post_preserves_scope_and_immutable_invoice_identity(self):
+        for scope in ['invoice', 'open', 'vehicle', 'debtor']:
+            response = self.client.post('/app/forderungen/details/1_R1', data={
+                'source': 'comments', '_csrf': 'csrf', 'comment_scope': scope,
+                'Kommentar': 'New comment ' + scope, 'Client_DB': '2', 'Beleg_Nr': 'X1', 'Benutzer_ID': 'intruder',
+            })
+            self.assertEqual(response.status_code, 200)
+            self.assertIn('New comment ' + scope, response.text)
+            self.assertIn(f'name="comment_scope" value="{scope}"', response.text)
+            self.assertNotIn('id="bookings-history"', response.text)
+            self.assertNotIn('id="comment-form"', response.text)
+        rows = self.db.connection.execute("SELECT Client_DB, Beleg_Nr, Benutzer_ID FROM dbo.Forderungen_Kommentar WHERE Kommentar LIKE 'New comment%'").fetchall()
+        self.assertEqual(rows, [('1', 'R1', 'tester')] * 4)
+        self.assertEqual(self.db.commits, 4)
+
+    def test_post_rejects_invalid_csrf_scope_and_unauthorized_invoice(self):
+        for suffix, extra, expected in [
+            ('1_R1', {'_csrf': 'wrong'}, 403),
+            ('1_R1', {'comment_scope': 'invalid'}, 422),
+            ('1_R2', {}, 404),
+        ]:
+            data = {'source': 'comments', '_csrf': 'csrf', 'Kommentar': 'Rejected'}
+            data.update(extra)
+            response = self.client.post('/app/forderungen/details/' + suffix, data=data)
+            self.assertEqual(response.status_code, expected)
+        self.assertEqual(self.db.commits, 0)
+
+    def test_booking_limit_is_enforced_and_disclosed(self):
+        self.db.connection.executemany(
+            "INSERT INTO dbo.Forderungen_Buchungen VALUES ('1', 'D1', 'V1', ?, 'R1', '2026-02-01', 'Bulk', 1, 'tester', 'N', 'RE')",
+            [(f'B{i:04}',) for i in range(1001)],
+        )
+        rows = history_context(self.db, self.pkey, 'buchungen')['forderungen_buchungen']
+        self.assertEqual(len(rows), 1000)
+        self.assertEqual(rows[0].Beleg_Nr, 'P1')
+        response = self.client.get('/app/forderungen/details/1_R1/buchungen')
+        self.assertIn('ersten 1.000 Buchungsbelege', response.text)
+
+    def test_comment_order_and_escaping(self):
+        self.db.connection.execute("INSERT INTO dbo.Forderungen_Kommentar VALUES ('1', 'R1', '2025-01-01T12:00:00', 'tester', '<script>old</script>')")
+        response = self.client.get('/app/forderungen/details/1_R1/kommentare?scope=debtor')
+        self.assertIn('&lt;script&gt;old&lt;/script&gt;', response.text)
+        self.assertLess(response.text.index('&lt;script&gt;old'), response.text.index('Comment 1/R1'))
+        self.assertIn('Rechnung H1', response.text)
+
+    def test_full_detail_page_keeps_filters_and_comment_form_when_lists_are_empty(self):
+        context = history_context(self.db, self.pkey, 'kommentare')
+        context.update(history_context(self.db, self.pkey, 'buchungen'))
+        invoice = dict(context['forderungen_details'][0])
+        invoice.update(
+            Kunde_offen_gesamt=120, Mwst_Betrag=0, Mwst_Betrag_berechnet=19,
+            Fahrzeug_Erstzulassung=None, Fahrzeug_Kaufdatum=None, Wiedervorlage=date(2026, 11, 1),
+        )
+        context.update(
+            forderungen_details=[invoice], forderungen_kommentare=[], forderungen_buchungen=[],
+            files=[], auftraege_positionen=[], versicherungen=[], summary=False,
+        )
+        with patch('app.routes.get_template_context', return_value=context):
+            response = self.client.get('/app/forderungen/details/1_R1')
+        self.assertEqual(response.status_code, 200)
+        tags = Tags(response.text).tags
+        selected = [a for t, a in tags if t == 'button' and a.get('aria-pressed') == 'true']
+        self.assertEqual(len(selected), 2)
+        self.assertTrue(all(a['hx-get'].endswith('scope=invoice') for a in selected))
+        form = next(a for t, a in tags if a.get('id') == 'comment-form')
+        self.assertEqual(form['hx-post'], '/app/forderungen/details/1_R1')
+        self.assertEqual(form['hx-target'], '#comments-history')
+        self.assertIn('Keine Kommentare', response.text)
+        self.assertIn('Keine Buchungsbelege', response.text)
+
+
+if __name__ == '__main__':
+    unittest.main()