feat: UPC deadline determination — event-driven model with proceeding timeline

Full event-driven deadline determination system ported from youpc.org: Backend: - DetermineService: walks proceeding event tree, calculates cascading dates with holiday adjustment and conditional logic - GET /api/proceeding-types/{code}/timeline — full event tree structure - POST /api/deadlines/determine — calculate timeline with conditions - POST /api/cases/{caseID}/deadlines/batch — batch-create deadlines - DeadlineRule model: added is_spawn, spawn_label fields - GetFullTimeline: recursive CTE following cross-type spawn branches - Conditional deadlines: condition_rule_id toggles alt_duration/rule_code (e.g. Reply changes from RoP.029b to RoP.029a when CCR is filed) - Seed SQL with full UPC event trees (INF, REV, CCR, APM, APP, AMD) Frontend: - DeadlineWizard: interactive proceeding timeline with step-by-step flow 1. Select proceeding type (visual cards) 2. Enter trigger event date 3. Toggle conditional branches (CCR, Appeal, Amend) 4. See full calculated timeline with color-coded urgency 5. Batch-create all deadlines on a selected case - Visual timeline tree with party icons, rule codes, duration badges - Kept existing DeadlineCalculator as "Schnell" quick mode Also resolved merge conflicts across 6 files (auth, router, handlers) merging role-based permissions + audit trail features.
2026-03-30 11:33:59 +02:00
30 changed files with 1646 additions and 2392 deletions
--- a/backend/internal/auth/context.go
+++ b/backend/internal/auth/context.go
@@ -11,9 +11,9 @@ type contextKey string
 const (
 	userIDKey    contextKey = "user_id"
 	tenantIDKey  contextKey = "tenant_id"
-	userRoleKey  contextKey = "user_role"
 	ipKey        contextKey = "ip_address"
 	userAgentKey contextKey = "user_agent"
+	userRoleKey  contextKey = "user_role"
 )

 func ContextWithUserID(ctx context.Context, userID uuid.UUID) context.Context {
@@ -34,15 +34,6 @@ func TenantFromContext(ctx context.Context) (uuid.UUID, bool) {
 	return id, ok
 }

-func ContextWithUserRole(ctx context.Context, role string) context.Context {
-	return context.WithValue(ctx, userRoleKey, role)
-}
-
-func UserRoleFromContext(ctx context.Context) string {
-	role, _ := ctx.Value(userRoleKey).(string)
-	return role
-}
-
 func ContextWithRequestInfo(ctx context.Context, ip, userAgent string) context.Context {
 	ctx = context.WithValue(ctx, ipKey, ip)
 	ctx = context.WithValue(ctx, userAgentKey, userAgent)
@@ -62,3 +53,12 @@ func UserAgentFromContext(ctx context.Context) *string {
 	}
 	return nil
 }
+
+func ContextWithUserRole(ctx context.Context, role string) context.Context {
+	return context.WithValue(ctx, userRoleKey, role)
+}
+
+func UserRoleFromContext(ctx context.Context) string {
+	role, _ := ctx.Value(userRoleKey).(string)
+	return role
+}
--- a/backend/internal/auth/middleware.go
+++ b/backend/internal/auth/middleware.go
@@ -43,9 +43,7 @@ func (m *Middleware) RequireAuth(next http.Handler) http.Handler {
 		}
 		ctx = ContextWithRequestInfo(ctx, ip, r.UserAgent())

-		// Tenant resolution is handled by TenantResolver middleware for scoped routes.
-		// Tenant management routes handle their own access control.
-
+		// Tenant and role resolution handled by TenantResolver middleware for scoped routes.
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }
--- a/backend/internal/auth/tenant_resolver.go
+++ b/backend/internal/auth/tenant_resolver.go
@@ -12,7 +12,6 @@ import (
 // Defined as an interface to avoid circular dependency with services.
 type TenantLookup interface {
 	FirstTenantForUser(ctx context.Context, userID uuid.UUID) (*uuid.UUID, error)
-	VerifyAccess(ctx context.Context, userID, tenantID uuid.UUID) (bool, error)
 	GetUserRole(ctx context.Context, userID, tenantID uuid.UUID) (string, error)
 }

@@ -35,6 +34,7 @@ func (tr *TenantResolver) Resolve(next http.Handler) http.Handler {
 		}

 		var tenantID uuid.UUID
+		ctx := r.Context()

 		if header := r.Header.Get("X-Tenant-ID"); header != "" {
 			parsed, err := uuid.Parse(header)
@@ -56,7 +56,7 @@ func (tr *TenantResolver) Resolve(next http.Handler) http.Handler {
 			}

 			tenantID = parsed
-			r = r.WithContext(ContextWithUserRole(r.Context(), role))
+			ctx = ContextWithUserRole(ctx, role)
 		} else {
 			// Default to user's first tenant
 			first, err := tr.lookup.FirstTenantForUser(r.Context(), userID)
@@ -71,17 +71,17 @@ func (tr *TenantResolver) Resolve(next http.Handler) http.Handler {
 			}
 			tenantID = *first

-			// Also resolve role for default tenant
+			// Look up role for default tenant
 			role, err := tr.lookup.GetUserRole(r.Context(), userID, tenantID)
 			if err != nil {
-				slog.Error("failed to get role for default tenant", "error", err, "user_id", userID, "tenant_id", tenantID)
+				slog.Error("failed to get user role", "error", err, "user_id", userID, "tenant_id", tenantID)
 				http.Error(w, `{"error":"internal error"}`, http.StatusInternalServerError)
 				return
 			}
-			r = r.WithContext(ContextWithUserRole(r.Context(), role))
+			ctx = ContextWithUserRole(ctx, role)
 		}

-		ctx := ContextWithTenantID(r.Context(), tenantID)
+		ctx = ContextWithTenantID(ctx, tenantID)
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }
--- a/backend/internal/auth/tenant_resolver_test.go
+++ b/backend/internal/auth/tenant_resolver_test.go
@@ -10,42 +10,32 @@ import (
 )

 type mockTenantLookup struct {
-	tenantID  *uuid.UUID
-	err       error
-	hasAccess bool
-	accessErr error
-	role      string
+	tenantID *uuid.UUID
+	role     string
+	err      error
 }

 func (m *mockTenantLookup) FirstTenantForUser(ctx context.Context, userID uuid.UUID) (*uuid.UUID, error) {
 	return m.tenantID, m.err
 }

-func (m *mockTenantLookup) VerifyAccess(ctx context.Context, userID, tenantID uuid.UUID) (bool, error) {
-	return m.hasAccess, m.accessErr
-}
-
 func (m *mockTenantLookup) GetUserRole(ctx context.Context, userID, tenantID uuid.UUID) (string, error) {
-	if m.role != "" {
-		return m.role, m.err
-	}
-	if m.hasAccess {
-		return "associate", m.err
-	}
-	return "", m.err
+	return m.role, m.err
 }

 func TestTenantResolver_FromHeader(t *testing.T) {
 	tenantID := uuid.New()
-	tr := NewTenantResolver(&mockTenantLookup{hasAccess: true, role: "partner"})
+	tr := NewTenantResolver(&mockTenantLookup{role: "partner"})

 	var gotTenantID uuid.UUID
+	var gotRole string
 	next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		id, ok := TenantFromContext(r.Context())
 		if !ok {
 			t.Fatal("tenant ID not in context")
 		}
 		gotTenantID = id
+		gotRole = UserRoleFromContext(r.Context())
 		w.WriteHeader(http.StatusOK)
 	})

@@ -62,11 +52,14 @@ func TestTenantResolver_FromHeader(t *testing.T) {
 	if gotTenantID != tenantID {
 		t.Errorf("expected tenant %s, got %s", tenantID, gotTenantID)
 	}
+	if gotRole != "partner" {
+		t.Errorf("expected role partner, got %s", gotRole)
+	}
 }

 func TestTenantResolver_FromHeader_NoAccess(t *testing.T) {
 	tenantID := uuid.New()
-	tr := NewTenantResolver(&mockTenantLookup{hasAccess: false})
+	tr := NewTenantResolver(&mockTenantLookup{role: ""})

 	next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		t.Fatal("next should not be called")
@@ -86,7 +79,7 @@ func TestTenantResolver_FromHeader_NoAccess(t *testing.T) {

 func TestTenantResolver_DefaultsToFirst(t *testing.T) {
 	tenantID := uuid.New()
-	tr := NewTenantResolver(&mockTenantLookup{tenantID: &tenantID, role: "owner"})
+	tr := NewTenantResolver(&mockTenantLookup{tenantID: &tenantID, role: "associate"})

 	var gotTenantID uuid.UUID
 	next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
--- a/backend/internal/handlers/billing_rates.go
+++ b/backend/internal/handlers/billing_rates.go
@@ -1,66 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/auth"
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/services"
-)
-
-type BillingRateHandler struct {
-	svc *services.BillingRateService
-}
-
-func NewBillingRateHandler(svc *services.BillingRateService) *BillingRateHandler {
-	return &BillingRateHandler{svc: svc}
-}
-
-// List handles GET /api/billing-rates
-func (h *BillingRateHandler) List(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	rates, err := h.svc.List(r.Context(), tenantID)
-	if err != nil {
-		internalError(w, "failed to list billing rates", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{"billing_rates": rates})
-}
-
-// Upsert handles PUT /api/billing-rates
-func (h *BillingRateHandler) Upsert(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	var input services.UpsertBillingRateInput
-	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-
-	if input.Rate < 0 {
-		writeError(w, http.StatusBadRequest, "rate must be non-negative")
-		return
-	}
-	if input.ValidFrom == "" {
-		writeError(w, http.StatusBadRequest, "valid_from is required")
-		return
-	}
-
-	rate, err := h.svc.Upsert(r.Context(), tenantID, input)
-	if err != nil {
-		internalError(w, "failed to upsert billing rate", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, rate)
-}
--- a/backend/internal/handlers/deadlines.go
+++ b/backend/internal/handlers/deadlines.go
@@ -198,9 +198,8 @@ func (h *DeadlineHandlers) Delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	err = h.deadlines.Delete(r.Context(), tenantID, deadlineID)
-	if err != nil {
-		writeError(w, http.StatusNotFound, err.Error())
+	if err := h.deadlines.Delete(r.Context(), tenantID, deadlineID); err != nil {
+		writeError(w, http.StatusNotFound, "deadline not found")
 		return
 	}

--- a/backend/internal/handlers/determine.go
+++ b/backend/internal/handlers/determine.go
@@ -0,0 +1,127 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/google/uuid"
+
+	"mgit.msbls.de/m/KanzlAI-mGMT/internal/auth"
+	"mgit.msbls.de/m/KanzlAI-mGMT/internal/services"
+)
+
+// DetermineHandlers holds handlers for deadline determination endpoints
+type DetermineHandlers struct {
+	determine *services.DetermineService
+	deadlines *services.DeadlineService
+}
+
+// NewDetermineHandlers creates determine handlers
+func NewDetermineHandlers(determine *services.DetermineService, deadlines *services.DeadlineService) *DetermineHandlers {
+	return &DetermineHandlers{determine: determine, deadlines: deadlines}
+}
+
+// GetTimeline handles GET /api/proceeding-types/{code}/timeline
+// Returns the full event tree for a proceeding type (no date calculations)
+func (h *DetermineHandlers) GetTimeline(w http.ResponseWriter, r *http.Request) {
+	code := r.PathValue("code")
+	if code == "" {
+		writeError(w, http.StatusBadRequest, "proceeding type code required")
+		return
+	}
+
+	timeline, pt, err := h.determine.GetTimeline(code)
+	if err != nil {
+		writeError(w, http.StatusNotFound, "proceeding type not found")
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"proceeding_type": pt,
+		"timeline":        timeline,
+	})
+}
+
+// Determine handles POST /api/deadlines/determine
+// Calculates the full timeline with cascading dates and conditional logic
+func (h *DetermineHandlers) Determine(w http.ResponseWriter, r *http.Request) {
+	var req services.DetermineRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		writeError(w, http.StatusBadRequest, "invalid request body")
+		return
+	}
+
+	if req.ProceedingType == "" || req.TriggerEventDate == "" {
+		writeError(w, http.StatusBadRequest, "proceeding_type and trigger_event_date are required")
+		return
+	}
+
+	resp, err := h.determine.Determine(req)
+	if err != nil {
+		writeError(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	writeJSON(w, http.StatusOK, resp)
+}
+
+// BatchCreate handles POST /api/cases/{caseID}/deadlines/batch
+// Creates multiple deadlines on a case from determined timeline
+func (h *DetermineHandlers) BatchCreate(w http.ResponseWriter, r *http.Request) {
+	tenantID, ok := auth.TenantFromContext(r.Context())
+	if !ok {
+		writeError(w, http.StatusForbidden, "missing tenant")
+		return
+	}
+
+	caseID, err := parsePathUUID(r, "caseID")
+	if err != nil {
+		writeError(w, http.StatusBadRequest, "invalid case ID")
+		return
+	}
+
+	var req struct {
+		Deadlines []struct {
+			Title           string     `json:"title"`
+			DueDate         string     `json:"due_date"`
+			OriginalDueDate *string    `json:"original_due_date,omitempty"`
+			RuleID          *uuid.UUID `json:"rule_id,omitempty"`
+			RuleCode        *string    `json:"rule_code,omitempty"`
+			Notes           *string    `json:"notes,omitempty"`
+		} `json:"deadlines"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		writeError(w, http.StatusBadRequest, "invalid request body")
+		return
+	}
+
+	if len(req.Deadlines) == 0 {
+		writeError(w, http.StatusBadRequest, "at least one deadline is required")
+		return
+	}
+
+	var created int
+	for _, d := range req.Deadlines {
+		if d.Title == "" || d.DueDate == "" {
+			continue
+		}
+		input := services.CreateDeadlineInput{
+			CaseID:  caseID,
+			Title:   d.Title,
+			DueDate: d.DueDate,
+			Source:   "determined",
+			RuleID:  d.RuleID,
+			Notes:   d.Notes,
+		}
+		_, err := h.deadlines.Create(r.Context(), tenantID, input)
+		if err != nil {
+			internalError(w, "failed to create deadline", err)
+			return
+		}
+		created++
+	}
+
+	writeJSON(w, http.StatusCreated, map[string]any{
+		"created": created,
+	})
+}
--- a/backend/internal/handlers/invoices.go
+++ b/backend/internal/handlers/invoices.go
@@ -1,170 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/auth"
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/services"
-
-	"github.com/google/uuid"
-)
-
-type InvoiceHandler struct {
-	svc *services.InvoiceService
-}
-
-func NewInvoiceHandler(svc *services.InvoiceService) *InvoiceHandler {
-	return &InvoiceHandler{svc: svc}
-}
-
-// List handles GET /api/invoices?case_id=&status=
-func (h *InvoiceHandler) List(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	var caseID *uuid.UUID
-	if caseStr := r.URL.Query().Get("case_id"); caseStr != "" {
-		parsed, err := uuid.Parse(caseStr)
-		if err != nil {
-			writeError(w, http.StatusBadRequest, "invalid case_id")
-			return
-		}
-		caseID = &parsed
-	}
-
-	invoices, err := h.svc.List(r.Context(), tenantID, caseID, r.URL.Query().Get("status"))
-	if err != nil {
-		internalError(w, "failed to list invoices", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{"invoices": invoices})
-}
-
-// Get handles GET /api/invoices/{id}
-func (h *InvoiceHandler) Get(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	invoiceID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid invoice ID")
-		return
-	}
-
-	inv, err := h.svc.GetByID(r.Context(), tenantID, invoiceID)
-	if err != nil {
-		internalError(w, "failed to get invoice", err)
-		return
-	}
-	if inv == nil {
-		writeError(w, http.StatusNotFound, "invoice not found")
-		return
-	}
-
-	writeJSON(w, http.StatusOK, inv)
-}
-
-// Create handles POST /api/invoices
-func (h *InvoiceHandler) Create(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-	userID, _ := auth.UserFromContext(r.Context())
-
-	var input services.CreateInvoiceInput
-	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-
-	if input.ClientName == "" {
-		writeError(w, http.StatusBadRequest, "client_name is required")
-		return
-	}
-	if input.CaseID == uuid.Nil {
-		writeError(w, http.StatusBadRequest, "case_id is required")
-		return
-	}
-
-	inv, err := h.svc.Create(r.Context(), tenantID, userID, input)
-	if err != nil {
-		internalError(w, "failed to create invoice", err)
-		return
-	}
-
-	writeJSON(w, http.StatusCreated, inv)
-}
-
-// Update handles PUT /api/invoices/{id}
-func (h *InvoiceHandler) Update(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	invoiceID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid invoice ID")
-		return
-	}
-
-	var input services.UpdateInvoiceInput
-	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-
-	inv, err := h.svc.Update(r.Context(), tenantID, invoiceID, input)
-	if err != nil {
-		writeError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	writeJSON(w, http.StatusOK, inv)
-}
-
-// UpdateStatus handles PATCH /api/invoices/{id}/status
-func (h *InvoiceHandler) UpdateStatus(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	invoiceID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid invoice ID")
-		return
-	}
-
-	var body struct {
-		Status string `json:"status"`
-	}
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-	if body.Status == "" {
-		writeError(w, http.StatusBadRequest, "status is required")
-		return
-	}
-
-	inv, err := h.svc.UpdateStatus(r.Context(), tenantID, invoiceID, body.Status)
-	if err != nil {
-		writeError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	writeJSON(w, http.StatusOK, inv)
-}
--- a/backend/internal/handlers/time_entries.go
+++ b/backend/internal/handlers/time_entries.go
@@ -1,209 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"net/http"
-	"strconv"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/auth"
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/services"
-
-	"github.com/google/uuid"
-)
-
-type TimeEntryHandler struct {
-	svc *services.TimeEntryService
-}
-
-func NewTimeEntryHandler(svc *services.TimeEntryService) *TimeEntryHandler {
-	return &TimeEntryHandler{svc: svc}
-}
-
-// ListForCase handles GET /api/cases/{id}/time-entries
-func (h *TimeEntryHandler) ListForCase(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	caseID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid case ID")
-		return
-	}
-
-	entries, err := h.svc.ListForCase(r.Context(), tenantID, caseID)
-	if err != nil {
-		internalError(w, "failed to list time entries", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{"time_entries": entries})
-}
-
-// List handles GET /api/time-entries?case_id=&user_id=&from=&to=
-func (h *TimeEntryHandler) List(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	limit, _ := strconv.Atoi(r.URL.Query().Get("limit"))
-	offset, _ := strconv.Atoi(r.URL.Query().Get("offset"))
-	limit, offset = clampPagination(limit, offset)
-
-	filter := services.TimeEntryFilter{
-		From:   r.URL.Query().Get("from"),
-		To:     r.URL.Query().Get("to"),
-		Limit:  limit,
-		Offset: offset,
-	}
-
-	if caseStr := r.URL.Query().Get("case_id"); caseStr != "" {
-		caseID, err := uuid.Parse(caseStr)
-		if err != nil {
-			writeError(w, http.StatusBadRequest, "invalid case_id")
-			return
-		}
-		filter.CaseID = &caseID
-	}
-	if userStr := r.URL.Query().Get("user_id"); userStr != "" {
-		userID, err := uuid.Parse(userStr)
-		if err != nil {
-			writeError(w, http.StatusBadRequest, "invalid user_id")
-			return
-		}
-		filter.UserID = &userID
-	}
-
-	entries, total, err := h.svc.List(r.Context(), tenantID, filter)
-	if err != nil {
-		internalError(w, "failed to list time entries", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{
-		"time_entries": entries,
-		"total":        total,
-	})
-}
-
-// Create handles POST /api/cases/{id}/time-entries
-func (h *TimeEntryHandler) Create(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-	userID, _ := auth.UserFromContext(r.Context())
-
-	caseID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid case ID")
-		return
-	}
-
-	var input services.CreateTimeEntryInput
-	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-	input.CaseID = caseID
-
-	if input.Description == "" {
-		writeError(w, http.StatusBadRequest, "description is required")
-		return
-	}
-	if input.DurationMinutes <= 0 {
-		writeError(w, http.StatusBadRequest, "duration_minutes must be positive")
-		return
-	}
-	if input.Date == "" {
-		writeError(w, http.StatusBadRequest, "date is required")
-		return
-	}
-
-	entry, err := h.svc.Create(r.Context(), tenantID, userID, input)
-	if err != nil {
-		internalError(w, "failed to create time entry", err)
-		return
-	}
-
-	writeJSON(w, http.StatusCreated, entry)
-}
-
-// Update handles PUT /api/time-entries/{id}
-func (h *TimeEntryHandler) Update(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	entryID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid time entry ID")
-		return
-	}
-
-	var input services.UpdateTimeEntryInput
-	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
-		writeError(w, http.StatusBadRequest, "invalid JSON body")
-		return
-	}
-
-	entry, err := h.svc.Update(r.Context(), tenantID, entryID, input)
-	if err != nil {
-		writeError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	writeJSON(w, http.StatusOK, entry)
-}
-
-// Delete handles DELETE /api/time-entries/{id}
-func (h *TimeEntryHandler) Delete(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	entryID, err := parsePathUUID(r, "id")
-	if err != nil {
-		writeError(w, http.StatusBadRequest, "invalid time entry ID")
-		return
-	}
-
-	if err := h.svc.Delete(r.Context(), tenantID, entryID); err != nil {
-		writeError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]string{"status": "deleted"})
-}
-
-// Summary handles GET /api/time-entries/summary?group_by=case|user|month&from=&to=
-func (h *TimeEntryHandler) Summary(w http.ResponseWriter, r *http.Request) {
-	tenantID, ok := auth.TenantFromContext(r.Context())
-	if !ok {
-		writeError(w, http.StatusForbidden, "missing tenant")
-		return
-	}
-
-	groupBy := r.URL.Query().Get("group_by")
-	if groupBy == "" {
-		groupBy = "case"
-	}
-
-	summaries, err := h.svc.Summary(r.Context(), tenantID, groupBy,
-		r.URL.Query().Get("from"), r.URL.Query().Get("to"))
-	if err != nil {
-		internalError(w, "failed to get summary", err)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{"summary": summaries})
-}
--- a/backend/internal/models/billing_rate.go
+++ b/backend/internal/models/billing_rate.go
@@ -1,18 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type BillingRate struct {
-	ID        uuid.UUID  `db:"id" json:"id"`
-	TenantID  uuid.UUID  `db:"tenant_id" json:"tenant_id"`
-	UserID    *uuid.UUID `db:"user_id" json:"user_id,omitempty"`
-	Rate      float64    `db:"rate" json:"rate"`
-	Currency  string     `db:"currency" json:"currency"`
-	ValidFrom string     `db:"valid_from" json:"valid_from"`
-	ValidTo   *string    `db:"valid_to" json:"valid_to,omitempty"`
-	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-}
--- a/backend/internal/models/deadline_rule.go
+++ b/backend/internal/models/deadline_rule.go
@@ -26,6 +26,8 @@ type DeadlineRule struct {
 	AltDurationValue *int       `db:"alt_duration_value" json:"alt_duration_value,omitempty"`
 	AltDurationUnit  *string    `db:"alt_duration_unit" json:"alt_duration_unit,omitempty"`
 	AltRuleCode      *string    `db:"alt_rule_code" json:"alt_rule_code,omitempty"`
+	IsSpawn          bool       `db:"is_spawn" json:"is_spawn"`
+	SpawnLabel       *string    `db:"spawn_label" json:"spawn_label,omitempty"`
 	IsActive         bool       `db:"is_active" json:"is_active"`
 	CreatedAt        time.Time  `db:"created_at" json:"created_at"`
 	UpdatedAt        time.Time  `db:"updated_at" json:"updated_at"`
--- a/backend/internal/models/invoice.go
+++ b/backend/internal/models/invoice.go
@@ -1,38 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type Invoice struct {
-	ID            uuid.UUID       `db:"id" json:"id"`
-	TenantID      uuid.UUID       `db:"tenant_id" json:"tenant_id"`
-	CaseID        uuid.UUID       `db:"case_id" json:"case_id"`
-	InvoiceNumber string          `db:"invoice_number" json:"invoice_number"`
-	ClientName    string          `db:"client_name" json:"client_name"`
-	ClientAddress *string         `db:"client_address" json:"client_address,omitempty"`
-	Items         json.RawMessage `db:"items" json:"items"`
-	Subtotal      float64         `db:"subtotal" json:"subtotal"`
-	TaxRate       float64         `db:"tax_rate" json:"tax_rate"`
-	TaxAmount     float64         `db:"tax_amount" json:"tax_amount"`
-	Total         float64         `db:"total" json:"total"`
-	Status        string          `db:"status" json:"status"`
-	IssuedAt      *string         `db:"issued_at" json:"issued_at,omitempty"`
-	DueAt         *string         `db:"due_at" json:"due_at,omitempty"`
-	PaidAt        *time.Time      `db:"paid_at" json:"paid_at,omitempty"`
-	Notes         *string         `db:"notes" json:"notes,omitempty"`
-	CreatedBy     uuid.UUID       `db:"created_by" json:"created_by"`
-	CreatedAt     time.Time       `db:"created_at" json:"created_at"`
-	UpdatedAt     time.Time       `db:"updated_at" json:"updated_at"`
-}
-
-type InvoiceItem struct {
-	Description     string  `json:"description"`
-	DurationMinutes int     `json:"duration_minutes,omitempty"`
-	HourlyRate      float64 `json:"hourly_rate,omitempty"`
-	Amount          float64 `json:"amount"`
-	TimeEntryID     *string `json:"time_entry_id,omitempty"`
-}
--- a/backend/internal/models/time_entry.go
+++ b/backend/internal/models/time_entry.go
@@ -1,24 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type TimeEntry struct {
-	ID              uuid.UUID  `db:"id" json:"id"`
-	TenantID        uuid.UUID  `db:"tenant_id" json:"tenant_id"`
-	CaseID          uuid.UUID  `db:"case_id" json:"case_id"`
-	UserID          uuid.UUID  `db:"user_id" json:"user_id"`
-	Date            string     `db:"date" json:"date"`
-	DurationMinutes int        `db:"duration_minutes" json:"duration_minutes"`
-	Description     string     `db:"description" json:"description"`
-	Activity        *string    `db:"activity" json:"activity,omitempty"`
-	Billable        bool       `db:"billable" json:"billable"`
-	Billed          bool       `db:"billed" json:"billed"`
-	InvoiceID       *uuid.UUID `db:"invoice_id" json:"invoice_id,omitempty"`
-	HourlyRate      *float64   `db:"hourly_rate" json:"hourly_rate,omitempty"`
-	CreatedAt       time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt       time.Time  `db:"updated_at" json:"updated_at"`
-}
--- a/backend/internal/router/router.go
+++ b/backend/internal/router/router.go
@@ -28,12 +28,10 @@ func New(db *sqlx.DB, authMW *auth.Middleware, cfg *config.Config, calDAVSvc *se
 	deadlineSvc := services.NewDeadlineService(db, auditSvc)
 	deadlineRuleSvc := services.NewDeadlineRuleService(db)
 	calculator := services.NewDeadlineCalculator(holidaySvc)
+	determineSvc := services.NewDetermineService(db, calculator)
 	storageCli := services.NewStorageClient(cfg.SupabaseURL, cfg.SupabaseServiceKey)
 	documentSvc := services.NewDocumentService(db, storageCli, auditSvc)
 	assignmentSvc := services.NewCaseAssignmentService(db)
-	timeEntrySvc := services.NewTimeEntryService(db, auditSvc)
-	billingRateSvc := services.NewBillingRateService(db, auditSvc)
-	invoiceSvc := services.NewInvoiceService(db, auditSvc)

 	// AI service (optional — only if API key is configured)
 	var aiH *handlers.AIHandler
@@ -63,14 +61,12 @@ func New(db *sqlx.DB, authMW *auth.Middleware, cfg *config.Config, calDAVSvc *se
 	deadlineH := handlers.NewDeadlineHandlers(deadlineSvc)
 	ruleH := handlers.NewDeadlineRuleHandlers(deadlineRuleSvc)
 	calcH := handlers.NewCalculateHandlers(calculator, deadlineRuleSvc)
+	determineH := handlers.NewDetermineHandlers(determineSvc, deadlineSvc)
 	dashboardH := handlers.NewDashboardHandler(dashboardSvc)
 	noteH := handlers.NewNoteHandler(noteSvc)
 	eventH := handlers.NewCaseEventHandler(db)
 	docH := handlers.NewDocumentHandler(documentSvc)
 	assignmentH := handlers.NewCaseAssignmentHandler(assignmentSvc)
-	timeEntryH := handlers.NewTimeEntryHandler(timeEntrySvc)
-	billingRateH := handlers.NewBillingRateHandler(billingRateSvc)
-	invoiceH := handlers.NewInvoiceHandler(invoiceSvc)

 	// Public routes
 	mux.HandleFunc("GET /health", handleHealth(db))
@@ -138,6 +134,11 @@ func New(db *sqlx.DB, authMW *auth.Middleware, cfg *config.Config, calDAVSvc *se
 	// Deadline calculator — all can use
 	scoped.HandleFunc("POST /api/deadlines/calculate", calcH.Calculate)

+	// Deadline determination — full timeline calculation with conditions
+	scoped.HandleFunc("GET /api/proceeding-types/{code}/timeline", determineH.GetTimeline)
+	scoped.HandleFunc("POST /api/deadlines/determine", determineH.Determine)
+	scoped.HandleFunc("POST /api/cases/{caseID}/deadlines/batch", perm(auth.PermManageDeadlines, determineH.BatchCreate))
+
 	// Appointments — all can manage (PermManageAppointments granted to all)
 	scoped.HandleFunc("GET /api/appointments/{id}", apptH.Get)
 	scoped.HandleFunc("GET /api/appointments", apptH.List)
@@ -162,8 +163,8 @@ func New(db *sqlx.DB, authMW *auth.Middleware, cfg *config.Config, calDAVSvc *se
 	// Dashboard — all can view
 	scoped.HandleFunc("GET /api/dashboard", dashboardH.Get)

-	// Audit log — view requires PermViewAuditLog
-	scoped.HandleFunc("GET /api/audit-log", perm(auth.PermViewAuditLog, auditH.List))
+	// Audit log
+	scoped.HandleFunc("GET /api/audit-log", auditH.List)

 	// Documents — all can upload, delete checked in handler (own vs all)
 	scoped.HandleFunc("GET /api/cases/{id}/documents", docH.ListByCase)
@@ -196,25 +197,6 @@ func New(db *sqlx.DB, authMW *auth.Middleware, cfg *config.Config, calDAVSvc *se
 		scoped.HandleFunc("GET /api/caldav/status", calDAVH.GetStatus)
 	}

-	// Time entries — billing permission for create/update/delete
-	scoped.HandleFunc("GET /api/cases/{id}/time-entries", timeEntryH.ListForCase)
-	scoped.HandleFunc("POST /api/cases/{id}/time-entries", perm(auth.PermManageBilling, timeEntryH.Create))
-	scoped.HandleFunc("GET /api/time-entries", timeEntryH.List)
-	scoped.HandleFunc("GET /api/time-entries/summary", perm(auth.PermManageBilling, timeEntryH.Summary))
-	scoped.HandleFunc("PUT /api/time-entries/{id}", perm(auth.PermManageBilling, timeEntryH.Update))
-	scoped.HandleFunc("DELETE /api/time-entries/{id}", perm(auth.PermManageBilling, timeEntryH.Delete))
-
-	// Billing rates — billing permission required
-	scoped.HandleFunc("GET /api/billing-rates", perm(auth.PermManageBilling, billingRateH.List))
-	scoped.HandleFunc("PUT /api/billing-rates", perm(auth.PermManageBilling, billingRateH.Upsert))
-
-	// Invoices — billing permission required
-	scoped.HandleFunc("GET /api/invoices", perm(auth.PermManageBilling, invoiceH.List))
-	scoped.HandleFunc("POST /api/invoices", perm(auth.PermManageBilling, invoiceH.Create))
-	scoped.HandleFunc("GET /api/invoices/{id}", perm(auth.PermManageBilling, invoiceH.Get))
-	scoped.HandleFunc("PUT /api/invoices/{id}", perm(auth.PermManageBilling, invoiceH.Update))
-	scoped.HandleFunc("PATCH /api/invoices/{id}/status", perm(auth.PermManageBilling, invoiceH.UpdateStatus))
-
 	// Wire: auth -> tenant routes go directly, scoped routes get tenant resolver
 	api.Handle("/api/", tenantResolver.Resolve(scoped))

--- a/backend/internal/services/billing_rate_service.go
+++ b/backend/internal/services/billing_rate_service.go
@@ -1,88 +0,0 @@
-package services
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jmoiron/sqlx"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/models"
-)
-
-type BillingRateService struct {
-	db    *sqlx.DB
-	audit *AuditService
-}
-
-func NewBillingRateService(db *sqlx.DB, audit *AuditService) *BillingRateService {
-	return &BillingRateService{db: db, audit: audit}
-}
-
-type UpsertBillingRateInput struct {
-	UserID    *uuid.UUID `json:"user_id,omitempty"`
-	Rate      float64    `json:"rate"`
-	Currency  string     `json:"currency"`
-	ValidFrom string     `json:"valid_from"`
-	ValidTo   *string    `json:"valid_to,omitempty"`
-}
-
-func (s *BillingRateService) List(ctx context.Context, tenantID uuid.UUID) ([]models.BillingRate, error) {
-	var rates []models.BillingRate
-	err := s.db.SelectContext(ctx, &rates,
-		`SELECT id, tenant_id, user_id, rate, currency, valid_from, valid_to, created_at
-		 FROM billing_rates
-		 WHERE tenant_id = $1
-		 ORDER BY valid_from DESC, user_id NULLS LAST`,
-		tenantID)
-	if err != nil {
-		return nil, fmt.Errorf("list billing rates: %w", err)
-	}
-	return rates, nil
-}
-
-func (s *BillingRateService) Upsert(ctx context.Context, tenantID uuid.UUID, input UpsertBillingRateInput) (*models.BillingRate, error) {
-	if input.Currency == "" {
-		input.Currency = "EUR"
-	}
-
-	// Close any existing open-ended rate for this user
-	_, err := s.db.ExecContext(ctx,
-		`UPDATE billing_rates SET valid_to = $3
-		 WHERE tenant_id = $1
-		 AND (($2::uuid IS NULL AND user_id IS NULL) OR user_id = $2)
-		 AND valid_to IS NULL
-		 AND valid_from < $3`,
-		tenantID, input.UserID, input.ValidFrom)
-	if err != nil {
-		return nil, fmt.Errorf("close existing rate: %w", err)
-	}
-
-	var rate models.BillingRate
-	err = s.db.QueryRowxContext(ctx,
-		`INSERT INTO billing_rates (tenant_id, user_id, rate, currency, valid_from, valid_to)
-		 VALUES ($1, $2, $3, $4, $5, $6)
-		 RETURNING id, tenant_id, user_id, rate, currency, valid_from, valid_to, created_at`,
-		tenantID, input.UserID, input.Rate, input.Currency, input.ValidFrom, input.ValidTo,
-	).StructScan(&rate)
-	if err != nil {
-		return nil, fmt.Errorf("upsert billing rate: %w", err)
-	}
-
-	s.audit.Log(ctx, "create", "billing_rate", &rate.ID, nil, rate)
-	return &rate, nil
-}
-
-func (s *BillingRateService) GetCurrentRate(ctx context.Context, tenantID uuid.UUID, userID uuid.UUID, date string) (*float64, error) {
-	var rate float64
-	err := s.db.GetContext(ctx, &rate,
-		`SELECT rate FROM billing_rates
-		 WHERE tenant_id = $1 AND (user_id = $2 OR user_id IS NULL)
-		 AND valid_from <= $3 AND (valid_to IS NULL OR valid_to >= $3)
-		 ORDER BY user_id NULLS LAST LIMIT 1`,
-		tenantID, userID, date)
-	if err != nil {
-		return nil, err
-	}
-	return &rate, nil
-}
--- a/backend/internal/services/deadline_rule_service.go
+++ b/backend/internal/services/deadline_rule_service.go
@@ -8,6 +8,12 @@ import (
 	"mgit.msbls.de/m/KanzlAI-mGMT/internal/models"
 )

+const ruleColumns = `id, proceeding_type_id, parent_id, code, name, description,
+	primary_party, event_type, is_mandatory, duration_value, duration_unit,
+	timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
+	alt_duration_value, alt_duration_unit, alt_rule_code,
+	is_spawn, spawn_label, is_active, created_at, updated_at`
+
 // DeadlineRuleService handles deadline rule queries
 type DeadlineRuleService struct {
 	db *sqlx.DB
@@ -25,21 +31,13 @@ func (s *DeadlineRuleService) List(proceedingTypeID *int) ([]models.DeadlineRule

 	if proceedingTypeID != nil {
 		err = s.db.Select(&rules,
-			`SELECT id, proceeding_type_id, parent_id, code, name, description,
-			        primary_party, event_type, is_mandatory, duration_value, duration_unit,
-			        timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
-			        alt_duration_value, alt_duration_unit, alt_rule_code, is_active,
-			        created_at, updated_at
+			`SELECT `+ruleColumns+`
 			 FROM deadline_rules
 			 WHERE proceeding_type_id = $1 AND is_active = true
 			 ORDER BY sequence_order`, *proceedingTypeID)
 	} else {
 		err = s.db.Select(&rules,
-			`SELECT id, proceeding_type_id, parent_id, code, name, description,
-			        primary_party, event_type, is_mandatory, duration_value, duration_unit,
-			        timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
-			        alt_duration_value, alt_duration_unit, alt_rule_code, is_active,
-			        created_at, updated_at
+			`SELECT `+ruleColumns+`
 			 FROM deadline_rules
 			 WHERE is_active = true
 			 ORDER BY proceeding_type_id, sequence_order`)
@@ -72,11 +70,7 @@ func (s *DeadlineRuleService) GetRuleTree(proceedingTypeCode string) ([]RuleTree
 	// Get all rules for this proceeding type
 	var rules []models.DeadlineRule
 	err = s.db.Select(&rules,
-		`SELECT id, proceeding_type_id, parent_id, code, name, description,
-		        primary_party, event_type, is_mandatory, duration_value, duration_unit,
-		        timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
-		        alt_duration_value, alt_duration_unit, alt_rule_code, is_active,
-		        created_at, updated_at
+		`SELECT `+ruleColumns+`
 		 FROM deadline_rules
 		 WHERE proceeding_type_id = $1 AND is_active = true
 		 ORDER BY sequence_order`, pt.ID)
@@ -87,6 +81,36 @@ func (s *DeadlineRuleService) GetRuleTree(proceedingTypeCode string) ([]RuleTree
 	return buildTree(rules), nil
 }

+// GetFullTimeline returns the full event tree for a proceeding type using a recursive CTE.
+// Unlike GetRuleTree, this follows parent_id across proceeding types (includes cross-type spawns).
+func (s *DeadlineRuleService) GetFullTimeline(proceedingTypeCode string) ([]models.DeadlineRule, *models.ProceedingType, error) {
+	var pt models.ProceedingType
+	err := s.db.Get(&pt,
+		`SELECT id, code, name, description, jurisdiction, default_color, sort_order, is_active
+		 FROM proceeding_types
+		 WHERE code = $1 AND is_active = true`, proceedingTypeCode)
+	if err != nil {
+		return nil, nil, fmt.Errorf("resolving proceeding type %q: %w", proceedingTypeCode, err)
+	}
+
+	var rules []models.DeadlineRule
+	err = s.db.Select(&rules, `
+		WITH RECURSIVE tree AS (
+			SELECT * FROM deadline_rules
+			WHERE proceeding_type_id = $1 AND parent_id IS NULL AND is_active = true
+			UNION ALL
+			SELECT dr.* FROM deadline_rules dr
+			JOIN tree t ON dr.parent_id = t.id
+			WHERE dr.is_active = true
+		)
+		SELECT `+ruleColumns+` FROM tree ORDER BY sequence_order`, pt.ID)
+	if err != nil {
+		return nil, nil, fmt.Errorf("fetching timeline for type %q: %w", proceedingTypeCode, err)
+	}
+
+	return rules, &pt, nil
+}
+
 // GetByIDs returns deadline rules by their IDs
 func (s *DeadlineRuleService) GetByIDs(ids []string) ([]models.DeadlineRule, error) {
 	if len(ids) == 0 {
@@ -94,11 +118,7 @@ func (s *DeadlineRuleService) GetByIDs(ids []string) ([]models.DeadlineRule, err
 	}

 	query, args, err := sqlx.In(
-		`SELECT id, proceeding_type_id, parent_id, code, name, description,
-		        primary_party, event_type, is_mandatory, duration_value, duration_unit,
-		        timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
-		        alt_duration_value, alt_duration_unit, alt_rule_code, is_active,
-		        created_at, updated_at
+		`SELECT `+ruleColumns+`
 		 FROM deadline_rules
 		 WHERE id IN (?) AND is_active = true
 		 ORDER BY sequence_order`, ids)
@@ -119,11 +139,7 @@ func (s *DeadlineRuleService) GetByIDs(ids []string) ([]models.DeadlineRule, err
 func (s *DeadlineRuleService) GetRulesForProceedingType(proceedingTypeID int) ([]models.DeadlineRule, error) {
 	var rules []models.DeadlineRule
 	err := s.db.Select(&rules,
-		`SELECT id, proceeding_type_id, parent_id, code, name, description,
-		        primary_party, event_type, is_mandatory, duration_value, duration_unit,
-		        timing, rule_code, deadline_notes, sequence_order, condition_rule_id,
-		        alt_duration_value, alt_duration_unit, alt_rule_code, is_active,
-		        created_at, updated_at
+		`SELECT `+ruleColumns+`
 		 FROM deadline_rules
 		 WHERE proceeding_type_id = $1 AND is_active = true
 		 ORDER BY sequence_order`, proceedingTypeID)
--- a/backend/internal/services/determine_service.go
+++ b/backend/internal/services/determine_service.go
@@ -0,0 +1,236 @@
+package services
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+
+	"mgit.msbls.de/m/KanzlAI-mGMT/internal/models"
+)
+
+// DetermineService handles event-driven deadline determination.
+// It walks the proceeding event tree and calculates cascading dates.
+type DetermineService struct {
+	rules      *DeadlineRuleService
+	calculator *DeadlineCalculator
+}
+
+// NewDetermineService creates a new determine service
+func NewDetermineService(db *sqlx.DB, calculator *DeadlineCalculator) *DetermineService {
+	return &DetermineService{
+		rules:      NewDeadlineRuleService(db),
+		calculator: calculator,
+	}
+}
+
+// TimelineEvent represents a calculated event in the proceeding timeline
+type TimelineEvent struct {
+	ID               string          `json:"id"`
+	Code             string          `json:"code,omitempty"`
+	Name             string          `json:"name"`
+	Description      string          `json:"description,omitempty"`
+	PrimaryParty     string          `json:"primary_party,omitempty"`
+	EventType        string          `json:"event_type,omitempty"`
+	IsMandatory      bool            `json:"is_mandatory"`
+	DurationValue    int             `json:"duration_value"`
+	DurationUnit     string          `json:"duration_unit"`
+	RuleCode         string          `json:"rule_code,omitempty"`
+	DeadlineNotes    string          `json:"deadline_notes,omitempty"`
+	IsSpawn          bool            `json:"is_spawn"`
+	SpawnLabel       string          `json:"spawn_label,omitempty"`
+	HasCondition     bool            `json:"has_condition"`
+	ConditionRuleID  string          `json:"condition_rule_id,omitempty"`
+	AltRuleCode      string          `json:"alt_rule_code,omitempty"`
+	AltDurationValue *int            `json:"alt_duration_value,omitempty"`
+	AltDurationUnit  string          `json:"alt_duration_unit,omitempty"`
+	Date             string          `json:"date,omitempty"`
+	OriginalDate     string          `json:"original_date,omitempty"`
+	WasAdjusted      bool            `json:"was_adjusted"`
+	Children         []TimelineEvent `json:"children,omitempty"`
+}
+
+// DetermineRequest is the input for POST /api/deadlines/determine
+type DetermineRequest struct {
+	ProceedingType   string          `json:"proceeding_type"`
+	TriggerEventDate string          `json:"trigger_event_date"`
+	Conditions       map[string]bool `json:"conditions"`
+}
+
+// DetermineResponse is the output of the determine endpoint
+type DetermineResponse struct {
+	ProceedingType  string          `json:"proceeding_type"`
+	ProceedingName  string          `json:"proceeding_name"`
+	ProceedingColor string          `json:"proceeding_color"`
+	TriggerDate     string          `json:"trigger_event_date"`
+	Timeline        []TimelineEvent `json:"timeline"`
+	TotalDeadlines  int             `json:"total_deadlines"`
+}
+
+// GetTimeline returns the proceeding event tree (without date calculations)
+func (s *DetermineService) GetTimeline(proceedingTypeCode string) ([]TimelineEvent, *models.ProceedingType, error) {
+	rules, pt, err := s.rules.GetFullTimeline(proceedingTypeCode)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	tree := buildTimelineTree(rules)
+	return tree, pt, nil
+}
+
+// Determine calculates the full timeline with cascading dates
+func (s *DetermineService) Determine(req DetermineRequest) (*DetermineResponse, error) {
+	timeline, pt, err := s.GetTimeline(req.ProceedingType)
+	if err != nil {
+		return nil, fmt.Errorf("loading timeline: %w", err)
+	}
+
+	triggerDate, err := time.Parse("2006-01-02", req.TriggerEventDate)
+	if err != nil {
+		return nil, fmt.Errorf("invalid trigger_event_date: %w", err)
+	}
+
+	conditions := req.Conditions
+	if conditions == nil {
+		conditions = make(map[string]bool)
+	}
+
+	total := s.calculateDates(timeline, triggerDate, conditions)
+
+	return &DetermineResponse{
+		ProceedingType:  pt.Code,
+		ProceedingName:  pt.Name,
+		ProceedingColor: pt.DefaultColor,
+		TriggerDate:     req.TriggerEventDate,
+		Timeline:        timeline,
+		TotalDeadlines:  total,
+	}, nil
+}
+
+// calculateDates walks the tree and calculates dates for each node
+func (s *DetermineService) calculateDates(events []TimelineEvent, parentDate time.Time, conditions map[string]bool) int {
+	total := 0
+	for i := range events {
+		ev := &events[i]
+
+		// Skip inactive spawns: if this is a spawn node and conditions don't include it, skip
+		if ev.IsSpawn && !conditions[ev.ID] {
+			continue
+		}
+
+		durationValue := ev.DurationValue
+		durationUnit := ev.DurationUnit
+		ruleCode := ev.RuleCode
+
+		// Apply conditional logic
+		if ev.HasCondition && ev.ConditionRuleID != "" {
+			if conditions[ev.ConditionRuleID] {
+				if ev.AltDurationValue != nil {
+					durationValue = *ev.AltDurationValue
+				}
+				if ev.AltDurationUnit != "" {
+					durationUnit = ev.AltDurationUnit
+				}
+				if ev.AltRuleCode != "" {
+					ruleCode = ev.AltRuleCode
+				}
+			}
+		}
+
+		// Calculate this node's date
+		if durationValue > 0 {
+			rule := models.DeadlineRule{
+				DurationValue: durationValue,
+				DurationUnit:  durationUnit,
+			}
+			adjusted, original, wasAdjusted := s.calculator.CalculateEndDate(parentDate, rule)
+			ev.Date = adjusted.Format("2006-01-02")
+			ev.OriginalDate = original.Format("2006-01-02")
+			ev.WasAdjusted = wasAdjusted
+		} else {
+			ev.Date = parentDate.Format("2006-01-02")
+			ev.OriginalDate = parentDate.Format("2006-01-02")
+		}
+
+		ev.RuleCode = ruleCode
+		total++
+
+		// Recurse: children's dates cascade from this node's date
+		if len(ev.Children) > 0 {
+			childDate, _ := time.Parse("2006-01-02", ev.Date)
+			total += s.calculateDates(ev.Children, childDate, conditions)
+		}
+	}
+	return total
+}
+
+// buildTimelineTree converts flat rules to a tree of TimelineEvents
+func buildTimelineTree(rules []models.DeadlineRule) []TimelineEvent {
+	nodeMap := make(map[string]*TimelineEvent, len(rules))
+	var roots []TimelineEvent
+
+	// Create event nodes
+	for _, r := range rules {
+		ev := ruleToEvent(r)
+		nodeMap[r.ID.String()] = &ev
+	}
+
+	// Build tree by parent_id
+	for _, r := range rules {
+		ev := nodeMap[r.ID.String()]
+		if r.ParentID != nil {
+			parentKey := r.ParentID.String()
+			if parent, ok := nodeMap[parentKey]; ok {
+				parent.Children = append(parent.Children, *ev)
+				continue
+			}
+		}
+		roots = append(roots, *ev)
+	}
+
+	return roots
+}
+
+func ruleToEvent(r models.DeadlineRule) TimelineEvent {
+	ev := TimelineEvent{
+		ID:            r.ID.String(),
+		Name:          r.Name,
+		IsMandatory:   r.IsMandatory,
+		DurationValue: r.DurationValue,
+		DurationUnit:  r.DurationUnit,
+		IsSpawn:       r.IsSpawn,
+		HasCondition:  r.ConditionRuleID != nil,
+	}
+	if r.Code != nil {
+		ev.Code = *r.Code
+	}
+	if r.Description != nil {
+		ev.Description = *r.Description
+	}
+	if r.PrimaryParty != nil {
+		ev.PrimaryParty = *r.PrimaryParty
+	}
+	if r.EventType != nil {
+		ev.EventType = *r.EventType
+	}
+	if r.RuleCode != nil {
+		ev.RuleCode = *r.RuleCode
+	}
+	if r.DeadlineNotes != nil {
+		ev.DeadlineNotes = *r.DeadlineNotes
+	}
+	if r.SpawnLabel != nil {
+		ev.SpawnLabel = *r.SpawnLabel
+	}
+	if r.ConditionRuleID != nil {
+		ev.ConditionRuleID = r.ConditionRuleID.String()
+	}
+	if r.AltRuleCode != nil {
+		ev.AltRuleCode = *r.AltRuleCode
+	}
+	ev.AltDurationValue = r.AltDurationValue
+	if r.AltDurationUnit != nil {
+		ev.AltDurationUnit = *r.AltDurationUnit
+	}
+	return ev
+}
--- a/backend/internal/services/invoice_service.go
+++ b/backend/internal/services/invoice_service.go
@@ -1,292 +0,0 @@
-package services
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/jmoiron/sqlx"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/models"
-)
-
-type InvoiceService struct {
-	db    *sqlx.DB
-	audit *AuditService
-}
-
-func NewInvoiceService(db *sqlx.DB, audit *AuditService) *InvoiceService {
-	return &InvoiceService{db: db, audit: audit}
-}
-
-type CreateInvoiceInput struct {
-	CaseID        uuid.UUID             `json:"case_id"`
-	ClientName    string                `json:"client_name"`
-	ClientAddress *string               `json:"client_address,omitempty"`
-	Items         []models.InvoiceItem  `json:"items"`
-	TaxRate       *float64              `json:"tax_rate,omitempty"`
-	IssuedAt      *string               `json:"issued_at,omitempty"`
-	DueAt         *string               `json:"due_at,omitempty"`
-	Notes         *string               `json:"notes,omitempty"`
-	TimeEntryIDs  []uuid.UUID           `json:"time_entry_ids,omitempty"`
-}
-
-type UpdateInvoiceInput struct {
-	ClientName    *string               `json:"client_name,omitempty"`
-	ClientAddress *string               `json:"client_address,omitempty"`
-	Items         []models.InvoiceItem  `json:"items,omitempty"`
-	TaxRate       *float64              `json:"tax_rate,omitempty"`
-	IssuedAt      *string               `json:"issued_at,omitempty"`
-	DueAt         *string               `json:"due_at,omitempty"`
-	Notes         *string               `json:"notes,omitempty"`
-}
-
-const invoiceCols = `id, tenant_id, case_id, invoice_number, client_name, client_address,
-	items, subtotal, tax_rate, tax_amount, total, status, issued_at, due_at, paid_at, notes,
-	created_by, created_at, updated_at`
-
-func (s *InvoiceService) List(ctx context.Context, tenantID uuid.UUID, caseID *uuid.UUID, status string) ([]models.Invoice, error) {
-	where := "WHERE tenant_id = $1"
-	args := []any{tenantID}
-	argIdx := 2
-
-	if caseID != nil {
-		where += fmt.Sprintf(" AND case_id = $%d", argIdx)
-		args = append(args, *caseID)
-		argIdx++
-	}
-	if status != "" {
-		where += fmt.Sprintf(" AND status = $%d", argIdx)
-		args = append(args, status)
-		argIdx++
-	}
-
-	var invoices []models.Invoice
-	err := s.db.SelectContext(ctx, &invoices,
-		fmt.Sprintf("SELECT %s FROM invoices %s ORDER BY created_at DESC", invoiceCols, where),
-		args...)
-	if err != nil {
-		return nil, fmt.Errorf("list invoices: %w", err)
-	}
-	return invoices, nil
-}
-
-func (s *InvoiceService) GetByID(ctx context.Context, tenantID, invoiceID uuid.UUID) (*models.Invoice, error) {
-	var inv models.Invoice
-	err := s.db.GetContext(ctx, &inv,
-		`SELECT `+invoiceCols+` FROM invoices WHERE tenant_id = $1 AND id = $2`,
-		tenantID, invoiceID)
-	if err == sql.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("get invoice: %w", err)
-	}
-	return &inv, nil
-}
-
-func (s *InvoiceService) Create(ctx context.Context, tenantID, userID uuid.UUID, input CreateInvoiceInput) (*models.Invoice, error) {
-	tx, err := s.db.BeginTxx(ctx, nil)
-	if err != nil {
-		return nil, fmt.Errorf("begin tx: %w", err)
-	}
-	defer tx.Rollback()
-
-	// Generate invoice number: RE-YYYY-NNN
-	year := time.Now().Year()
-	var seq int
-	err = tx.GetContext(ctx, &seq,
-		`SELECT COUNT(*) + 1 FROM invoices WHERE tenant_id = $1 AND invoice_number LIKE $2`,
-		tenantID, fmt.Sprintf("RE-%d-%%", year))
-	if err != nil {
-		return nil, fmt.Errorf("generate invoice number: %w", err)
-	}
-	invoiceNumber := fmt.Sprintf("RE-%d-%03d", year, seq)
-
-	// Calculate totals
-	taxRate := 19.00
-	if input.TaxRate != nil {
-		taxRate = *input.TaxRate
-	}
-
-	var subtotal float64
-	for _, item := range input.Items {
-		subtotal += item.Amount
-	}
-	taxAmount := subtotal * taxRate / 100
-	total := subtotal + taxAmount
-
-	itemsJSON, err := json.Marshal(input.Items)
-	if err != nil {
-		return nil, fmt.Errorf("marshal items: %w", err)
-	}
-
-	var inv models.Invoice
-	err = tx.QueryRowxContext(ctx,
-		`INSERT INTO invoices (tenant_id, case_id, invoice_number, client_name, client_address,
-			items, subtotal, tax_rate, tax_amount, total, issued_at, due_at, notes, created_by)
-		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
-		 RETURNING `+invoiceCols,
-		tenantID, input.CaseID, invoiceNumber, input.ClientName, input.ClientAddress,
-		itemsJSON, subtotal, taxRate, taxAmount, total, input.IssuedAt, input.DueAt, input.Notes, userID,
-	).StructScan(&inv)
-	if err != nil {
-		return nil, fmt.Errorf("create invoice: %w", err)
-	}
-
-	// Mark linked time entries as billed
-	if len(input.TimeEntryIDs) > 0 {
-		query, args, err := sqlx.In(
-			`UPDATE time_entries SET billed = true, invoice_id = ? WHERE tenant_id = ? AND id IN (?)`,
-			inv.ID, tenantID, input.TimeEntryIDs)
-		if err != nil {
-			return nil, fmt.Errorf("build time entry update: %w", err)
-		}
-		query = tx.Rebind(query)
-		_, err = tx.ExecContext(ctx, query, args...)
-		if err != nil {
-			return nil, fmt.Errorf("mark time entries billed: %w", err)
-		}
-	}
-
-	if err := tx.Commit(); err != nil {
-		return nil, fmt.Errorf("commit: %w", err)
-	}
-
-	s.audit.Log(ctx, "create", "invoice", &inv.ID, nil, inv)
-	return &inv, nil
-}
-
-func (s *InvoiceService) Update(ctx context.Context, tenantID, invoiceID uuid.UUID, input UpdateInvoiceInput) (*models.Invoice, error) {
-	old, err := s.GetByID(ctx, tenantID, invoiceID)
-	if err != nil {
-		return nil, err
-	}
-	if old == nil {
-		return nil, fmt.Errorf("invoice not found")
-	}
-	if old.Status != "draft" {
-		return nil, fmt.Errorf("can only update draft invoices")
-	}
-
-	// Recalculate totals if items changed
-	var itemsJSON json.RawMessage
-	var subtotal float64
-	taxRate := old.TaxRate
-
-	if input.Items != nil {
-		for _, item := range input.Items {
-			subtotal += item.Amount
-		}
-		itemsJSON, _ = json.Marshal(input.Items)
-	}
-	if input.TaxRate != nil {
-		taxRate = *input.TaxRate
-	}
-
-	if input.Items != nil {
-		taxAmount := subtotal * taxRate / 100
-		total := subtotal + taxAmount
-
-		var inv models.Invoice
-		err = s.db.QueryRowxContext(ctx,
-			`UPDATE invoices SET
-				client_name = COALESCE($3, client_name),
-				client_address = COALESCE($4, client_address),
-				items = $5,
-				subtotal = $6,
-				tax_rate = $7,
-				tax_amount = $8,
-				total = $9,
-				issued_at = COALESCE($10, issued_at),
-				due_at = COALESCE($11, due_at),
-				notes = COALESCE($12, notes),
-				updated_at = now()
-			 WHERE tenant_id = $1 AND id = $2
-			 RETURNING `+invoiceCols,
-			tenantID, invoiceID, input.ClientName, input.ClientAddress,
-			itemsJSON, subtotal, taxRate, subtotal*taxRate/100, total,
-			input.IssuedAt, input.DueAt, input.Notes,
-		).StructScan(&inv)
-		if err != nil {
-			return nil, fmt.Errorf("update invoice: %w", err)
-		}
-		s.audit.Log(ctx, "update", "invoice", &inv.ID, old, inv)
-		return &inv, nil
-	}
-
-	// Update without changing items
-	var inv models.Invoice
-	err = s.db.QueryRowxContext(ctx,
-		`UPDATE invoices SET
-			client_name = COALESCE($3, client_name),
-			client_address = COALESCE($4, client_address),
-			tax_rate = COALESCE($5, tax_rate),
-			issued_at = COALESCE($6, issued_at),
-			due_at = COALESCE($7, due_at),
-			notes = COALESCE($8, notes),
-			updated_at = now()
-		 WHERE tenant_id = $1 AND id = $2
-		 RETURNING `+invoiceCols,
-		tenantID, invoiceID, input.ClientName, input.ClientAddress,
-		input.TaxRate, input.IssuedAt, input.DueAt, input.Notes,
-	).StructScan(&inv)
-	if err != nil {
-		return nil, fmt.Errorf("update invoice: %w", err)
-	}
-
-	s.audit.Log(ctx, "update", "invoice", &inv.ID, old, inv)
-	return &inv, nil
-}
-
-func (s *InvoiceService) UpdateStatus(ctx context.Context, tenantID, invoiceID uuid.UUID, newStatus string) (*models.Invoice, error) {
-	old, err := s.GetByID(ctx, tenantID, invoiceID)
-	if err != nil {
-		return nil, err
-	}
-	if old == nil {
-		return nil, fmt.Errorf("invoice not found")
-	}
-
-	// Validate transitions
-	validTransitions := map[string][]string{
-		"draft":     {"sent", "cancelled"},
-		"sent":      {"paid", "cancelled"},
-		"paid":      {},
-		"cancelled": {},
-	}
-	allowed := validTransitions[old.Status]
-	valid := false
-	for _, s := range allowed {
-		if s == newStatus {
-			valid = true
-			break
-		}
-	}
-	if !valid {
-		return nil, fmt.Errorf("invalid status transition from %s to %s", old.Status, newStatus)
-	}
-
-	var paidAt *time.Time
-	if newStatus == "paid" {
-		now := time.Now()
-		paidAt = &now
-	}
-
-	var inv models.Invoice
-	err = s.db.QueryRowxContext(ctx,
-		`UPDATE invoices SET status = $3, paid_at = COALESCE($4, paid_at), updated_at = now()
-		 WHERE tenant_id = $1 AND id = $2
-		 RETURNING `+invoiceCols,
-		tenantID, invoiceID, newStatus, paidAt,
-	).StructScan(&inv)
-	if err != nil {
-		return nil, fmt.Errorf("update invoice status: %w", err)
-	}
-
-	s.audit.Log(ctx, "update", "invoice", &inv.ID, old, inv)
-	return &inv, nil
-}
--- a/backend/internal/services/time_entry_service.go
+++ b/backend/internal/services/time_entry_service.go
@@ -1,276 +0,0 @@
-package services
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jmoiron/sqlx"
-
-	"mgit.msbls.de/m/KanzlAI-mGMT/internal/models"
-)
-
-type TimeEntryService struct {
-	db    *sqlx.DB
-	audit *AuditService
-}
-
-func NewTimeEntryService(db *sqlx.DB, audit *AuditService) *TimeEntryService {
-	return &TimeEntryService{db: db, audit: audit}
-}
-
-type CreateTimeEntryInput struct {
-	CaseID          uuid.UUID `json:"case_id"`
-	Date            string    `json:"date"`
-	DurationMinutes int       `json:"duration_minutes"`
-	Description     string    `json:"description"`
-	Activity        *string   `json:"activity,omitempty"`
-	Billable        *bool     `json:"billable,omitempty"`
-	HourlyRate      *float64  `json:"hourly_rate,omitempty"`
-}
-
-type UpdateTimeEntryInput struct {
-	Date            *string  `json:"date,omitempty"`
-	DurationMinutes *int     `json:"duration_minutes,omitempty"`
-	Description     *string  `json:"description,omitempty"`
-	Activity        *string  `json:"activity,omitempty"`
-	Billable        *bool    `json:"billable,omitempty"`
-	HourlyRate      *float64 `json:"hourly_rate,omitempty"`
-}
-
-type TimeEntryFilter struct {
-	CaseID *uuid.UUID
-	UserID *uuid.UUID
-	From   string
-	To     string
-	Limit  int
-	Offset int
-}
-
-type TimeEntrySummary struct {
-	GroupKey       string  `db:"group_key" json:"group_key"`
-	TotalMinutes   int     `db:"total_minutes" json:"total_minutes"`
-	BillableMinutes int   `db:"billable_minutes" json:"billable_minutes"`
-	TotalAmount    float64 `db:"total_amount" json:"total_amount"`
-	EntryCount     int     `db:"entry_count" json:"entry_count"`
-}
-
-const timeEntryCols = `id, tenant_id, case_id, user_id, date, duration_minutes, description,
-	activity, billable, billed, invoice_id, hourly_rate, created_at, updated_at`
-
-func (s *TimeEntryService) ListForCase(ctx context.Context, tenantID, caseID uuid.UUID) ([]models.TimeEntry, error) {
-	var entries []models.TimeEntry
-	err := s.db.SelectContext(ctx, &entries,
-		`SELECT `+timeEntryCols+` FROM time_entries
-		 WHERE tenant_id = $1 AND case_id = $2
-		 ORDER BY date DESC, created_at DESC`,
-		tenantID, caseID)
-	if err != nil {
-		return nil, fmt.Errorf("list time entries for case: %w", err)
-	}
-	return entries, nil
-}
-
-func (s *TimeEntryService) List(ctx context.Context, tenantID uuid.UUID, filter TimeEntryFilter) ([]models.TimeEntry, int, error) {
-	if filter.Limit <= 0 {
-		filter.Limit = 20
-	}
-	if filter.Limit > 100 {
-		filter.Limit = 100
-	}
-
-	where := "WHERE tenant_id = $1"
-	args := []any{tenantID}
-	argIdx := 2
-
-	if filter.CaseID != nil {
-		where += fmt.Sprintf(" AND case_id = $%d", argIdx)
-		args = append(args, *filter.CaseID)
-		argIdx++
-	}
-	if filter.UserID != nil {
-		where += fmt.Sprintf(" AND user_id = $%d", argIdx)
-		args = append(args, *filter.UserID)
-		argIdx++
-	}
-	if filter.From != "" {
-		where += fmt.Sprintf(" AND date >= $%d", argIdx)
-		args = append(args, filter.From)
-		argIdx++
-	}
-	if filter.To != "" {
-		where += fmt.Sprintf(" AND date <= $%d", argIdx)
-		args = append(args, filter.To)
-		argIdx++
-	}
-
-	var total int
-	err := s.db.GetContext(ctx, &total,
-		"SELECT COUNT(*) FROM time_entries "+where, args...)
-	if err != nil {
-		return nil, 0, fmt.Errorf("count time entries: %w", err)
-	}
-
-	query := fmt.Sprintf("SELECT %s FROM time_entries %s ORDER BY date DESC, created_at DESC LIMIT $%d OFFSET $%d",
-		timeEntryCols, where, argIdx, argIdx+1)
-	args = append(args, filter.Limit, filter.Offset)
-
-	var entries []models.TimeEntry
-	err = s.db.SelectContext(ctx, &entries, query, args...)
-	if err != nil {
-		return nil, 0, fmt.Errorf("list time entries: %w", err)
-	}
-	return entries, total, nil
-}
-
-func (s *TimeEntryService) GetByID(ctx context.Context, tenantID, entryID uuid.UUID) (*models.TimeEntry, error) {
-	var entry models.TimeEntry
-	err := s.db.GetContext(ctx, &entry,
-		`SELECT `+timeEntryCols+` FROM time_entries WHERE tenant_id = $1 AND id = $2`,
-		tenantID, entryID)
-	if err == sql.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("get time entry: %w", err)
-	}
-	return &entry, nil
-}
-
-func (s *TimeEntryService) Create(ctx context.Context, tenantID, userID uuid.UUID, input CreateTimeEntryInput) (*models.TimeEntry, error) {
-	billable := true
-	if input.Billable != nil {
-		billable = *input.Billable
-	}
-
-	// If no hourly rate provided, look up the current billing rate
-	hourlyRate := input.HourlyRate
-	if hourlyRate == nil {
-		var rate float64
-		err := s.db.GetContext(ctx, &rate,
-			`SELECT rate FROM billing_rates
-			 WHERE tenant_id = $1 AND (user_id = $2 OR user_id IS NULL)
-			 AND valid_from <= $3 AND (valid_to IS NULL OR valid_to >= $3)
-			 ORDER BY user_id NULLS LAST LIMIT 1`,
-			tenantID, userID, input.Date)
-		if err == nil {
-			hourlyRate = &rate
-		}
-	}
-
-	var entry models.TimeEntry
-	err := s.db.QueryRowxContext(ctx,
-		`INSERT INTO time_entries (tenant_id, case_id, user_id, date, duration_minutes, description, activity, billable, hourly_rate)
-		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
-		 RETURNING `+timeEntryCols,
-		tenantID, input.CaseID, userID, input.Date, input.DurationMinutes, input.Description, input.Activity, billable, hourlyRate,
-	).StructScan(&entry)
-	if err != nil {
-		return nil, fmt.Errorf("create time entry: %w", err)
-	}
-
-	s.audit.Log(ctx, "create", "time_entry", &entry.ID, nil, entry)
-	return &entry, nil
-}
-
-func (s *TimeEntryService) Update(ctx context.Context, tenantID, entryID uuid.UUID, input UpdateTimeEntryInput) (*models.TimeEntry, error) {
-	old, err := s.GetByID(ctx, tenantID, entryID)
-	if err != nil {
-		return nil, err
-	}
-	if old == nil {
-		return nil, fmt.Errorf("time entry not found")
-	}
-	if old.Billed {
-		return nil, fmt.Errorf("cannot update a billed time entry")
-	}
-
-	var entry models.TimeEntry
-	err = s.db.QueryRowxContext(ctx,
-		`UPDATE time_entries SET
-			date = COALESCE($3, date),
-			duration_minutes = COALESCE($4, duration_minutes),
-			description = COALESCE($5, description),
-			activity = COALESCE($6, activity),
-			billable = COALESCE($7, billable),
-			hourly_rate = COALESCE($8, hourly_rate),
-			updated_at = now()
-		 WHERE tenant_id = $1 AND id = $2
-		 RETURNING `+timeEntryCols,
-		tenantID, entryID, input.Date, input.DurationMinutes, input.Description, input.Activity, input.Billable, input.HourlyRate,
-	).StructScan(&entry)
-	if err != nil {
-		return nil, fmt.Errorf("update time entry: %w", err)
-	}
-
-	s.audit.Log(ctx, "update", "time_entry", &entry.ID, old, entry)
-	return &entry, nil
-}
-
-func (s *TimeEntryService) Delete(ctx context.Context, tenantID, entryID uuid.UUID) error {
-	old, err := s.GetByID(ctx, tenantID, entryID)
-	if err != nil {
-		return err
-	}
-	if old == nil {
-		return fmt.Errorf("time entry not found")
-	}
-	if old.Billed {
-		return fmt.Errorf("cannot delete a billed time entry")
-	}
-
-	_, err = s.db.ExecContext(ctx,
-		`DELETE FROM time_entries WHERE tenant_id = $1 AND id = $2`,
-		tenantID, entryID)
-	if err != nil {
-		return fmt.Errorf("delete time entry: %w", err)
-	}
-
-	s.audit.Log(ctx, "delete", "time_entry", &entryID, old, nil)
-	return nil
-}
-
-func (s *TimeEntryService) Summary(ctx context.Context, tenantID uuid.UUID, groupBy string, from, to string) ([]TimeEntrySummary, error) {
-	var groupExpr string
-	switch groupBy {
-	case "user":
-		groupExpr = "user_id::text"
-	case "month":
-		groupExpr = "to_char(date, 'YYYY-MM')"
-	default:
-		groupExpr = "case_id::text"
-	}
-
-	where := "WHERE tenant_id = $1"
-	args := []any{tenantID}
-	argIdx := 2
-
-	if from != "" {
-		where += fmt.Sprintf(" AND date >= $%d", argIdx)
-		args = append(args, from)
-		argIdx++
-	}
-	if to != "" {
-		where += fmt.Sprintf(" AND date <= $%d", argIdx)
-		args = append(args, to)
-		argIdx++
-	}
-
-	query := fmt.Sprintf(`SELECT %s AS group_key,
-		SUM(duration_minutes) AS total_minutes,
-		SUM(CASE WHEN billable THEN duration_minutes ELSE 0 END) AS billable_minutes,
-		SUM(CASE WHEN billable AND hourly_rate IS NOT NULL THEN duration_minutes * hourly_rate / 60.0 ELSE 0 END) AS total_amount,
-		COUNT(*) AS entry_count
-		FROM time_entries %s
-		GROUP BY %s
-		ORDER BY %s`,
-		groupExpr, where, groupExpr, groupExpr)
-
-	var summaries []TimeEntrySummary
-	err := s.db.SelectContext(ctx, &summaries, query, args...)
-	if err != nil {
-		return nil, fmt.Errorf("time entry summary: %w", err)
-	}
-	return summaries, nil
-}
--- a/backend/seed/seed_upc_timeline.sql
+++ b/backend/seed/seed_upc_timeline.sql
@@ -0,0 +1,466 @@
+-- UPC Proceeding Timeline: Full event tree with conditional deadlines
+-- Ported from youpc.org migrations 039 + 040
+-- Run against kanzlai schema in flexsiebels Supabase instance
+
+-- ========================================
+-- 1. Add is_spawn + spawn_label columns
+-- ========================================
+ALTER TABLE deadline_rules
+    ADD COLUMN IF NOT EXISTS is_spawn BOOLEAN DEFAULT false,
+    ADD COLUMN IF NOT EXISTS spawn_label TEXT;
+
+-- ========================================
+-- 2. Clear existing UPC rules (fresh seed)
+-- ========================================
+DELETE FROM deadline_rules WHERE proceeding_type_id IN (
+    SELECT id FROM proceeding_types WHERE code IN ('INF', 'REV', 'CCR', 'APM', 'APP', 'AMD')
+);
+
+-- ========================================
+-- 3. Ensure all proceeding types exist
+-- ========================================
+INSERT INTO proceeding_types (code, name, description, is_active, sort_order, default_color)
+VALUES
+    ('INF', 'Infringement', 'Patent infringement proceedings', true, 1, '#3b82f6'),
+    ('REV', 'Revocation', 'Standalone revocation proceedings', true, 2, '#ef4444'),
+    ('CCR', 'Counterclaim for Revocation', 'Counterclaim for revocation within infringement', true, 3, '#ef4444'),
+    ('APM', 'Provisional Measures', 'Application for preliminary injunction', true, 4, '#f59e0b'),
+    ('APP', 'Appeal', 'Appeal to the Court of Appeal', true, 5, '#8b5cf6'),
+    ('AMD', 'Application to Amend Patent', 'Sub-proceeding for patent amendment during revocation', true, 6, '#10b981')
+ON CONFLICT (code) DO UPDATE SET
+    name = EXCLUDED.name,
+    description = EXCLUDED.description,
+    default_color = EXCLUDED.default_color,
+    sort_order = EXCLUDED.sort_order,
+    is_active = EXCLUDED.is_active;
+
+-- ========================================
+-- 4. Seed all proceeding events
+-- ========================================
+DO $$
+DECLARE
+    v_inf INTEGER;
+    v_rev INTEGER;
+    v_ccr INTEGER;
+    v_apm INTEGER;
+    v_app INTEGER;
+    v_amd INTEGER;
+    -- INF event IDs
+    v_inf_soc UUID;
+    v_inf_sod UUID;
+    v_inf_reply UUID;
+    v_inf_rejoin UUID;
+    v_inf_interim UUID;
+    v_inf_oral UUID;
+    v_inf_decision UUID;
+    v_inf_prelim UUID;
+    -- CCR event IDs
+    v_ccr_root UUID;
+    v_ccr_defence UUID;
+    v_ccr_reply UUID;
+    v_ccr_rejoin UUID;
+    v_ccr_interim UUID;
+    v_ccr_oral UUID;
+    v_ccr_decision UUID;
+    -- REV event IDs
+    v_rev_app UUID;
+    v_rev_defence UUID;
+    v_rev_reply UUID;
+    v_rev_rejoin UUID;
+    v_rev_interim UUID;
+    v_rev_oral UUID;
+    v_rev_decision UUID;
+    -- PI event IDs
+    v_pi_app UUID;
+    v_pi_resp UUID;
+    v_pi_oral UUID;
+    -- APP event IDs
+    v_app_notice UUID;
+    v_app_grounds UUID;
+    v_app_response UUID;
+    v_app_oral UUID;
+BEGIN
+    SELECT id INTO v_inf FROM proceeding_types WHERE code = 'INF';
+    SELECT id INTO v_rev FROM proceeding_types WHERE code = 'REV';
+    SELECT id INTO v_ccr FROM proceeding_types WHERE code = 'CCR';
+    SELECT id INTO v_apm FROM proceeding_types WHERE code = 'APM';
+    SELECT id INTO v_app FROM proceeding_types WHERE code = 'APP';
+    SELECT id INTO v_amd FROM proceeding_types WHERE code = 'AMD';
+
+    -- ========================================
+    -- INFRINGEMENT PROCEEDINGS
+    -- ========================================
+
+    -- Root: Statement of Claim
+    v_inf_soc := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_soc, v_inf, NULL, 'inf.soc', 'Statement of Claim',
+        'Claimant files the statement of claim with the Registry',
+        'claimant', 'filing', true, 0, 'months', NULL, NULL, false, NULL, 0, true);
+
+    -- Preliminary Objection (from SoC)
+    v_inf_prelim := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_prelim, v_inf, v_inf_soc, 'inf.prelim', 'Preliminary Objection',
+        'Defendant raises preliminary objection (jurisdiction, admissibility)',
+        'defendant', 'filing', false, 1, 'months', 'R.19',
+        'Rarely triggers separate decision; usually decided with main case',
+        false, NULL, 1, true);
+
+    -- Statement of Defence (from SoC)
+    v_inf_sod := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_sod, v_inf, v_inf_soc, 'inf.sod', 'Statement of Defence',
+        'Defendant files the statement of defence',
+        'defendant', 'filing', true, 3, 'months', 'RoP.023', NULL,
+        false, NULL, 2, true);
+
+    -- Reply to Defence (from SoD) — CONDITIONAL: rule code changes if CCR
+    v_inf_reply := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_reply, v_inf, v_inf_sod, 'inf.reply', 'Reply to Defence',
+        'Claimant''s reply to the statement of defence (includes Defence to Counterclaim if CCR active)',
+        'claimant', 'filing', true, 2, 'months', 'RoP.029b', NULL,
+        false, NULL, 1, true);
+
+    -- Rejoinder (from Reply) — CONDITIONAL: duration changes if CCR
+    v_inf_rejoin := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_rejoin, v_inf, v_inf_reply, 'inf.rejoin', 'Rejoinder',
+        'Defendant''s rejoinder to the reply',
+        'defendant', 'filing', true, 1, 'months', 'RoP.029c', NULL,
+        false, NULL, 0, true);
+
+    -- Interim Conference
+    v_inf_interim := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_interim, v_inf, v_inf_rejoin, 'inf.interim', 'Interim Conference',
+        'Interim conference with the judge-rapporteur',
+        'court', 'hearing', true, 0, 'months', NULL, NULL, false, NULL, 0, true);
+
+    -- Oral Hearing
+    v_inf_oral := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_oral, v_inf, v_inf_interim, 'inf.oral', 'Oral Hearing',
+        'Oral hearing before the panel',
+        'court', 'hearing', true, 0, 'months', NULL, NULL, false, NULL, 0, true);
+
+    -- Decision
+    v_inf_decision := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_inf_decision, v_inf, v_inf_oral, 'inf.decision', 'Decision',
+        'Panel delivers its decision',
+        'court', 'decision', true, 0, 'months', NULL, NULL, false, NULL, 0, true);
+
+    -- Appeal (spawn from Decision — cross-type to APP)
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_app, v_inf_decision, 'inf.appeal', 'Appeal',
+        'Appeal against infringement decision to Court of Appeal',
+        'both', 'filing', true, 2, 'months', 'RoP.220.1', NULL,
+        true, 'Appeal filed', 0, true);
+
+    -- ========================================
+    -- COUNTERCLAIM FOR REVOCATION (spawn from SoD)
+    -- ========================================
+
+    v_ccr_root := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_root, v_ccr, v_inf_sod, 'ccr.counterclaim', 'Counterclaim for Revocation',
+        'Defendant files counterclaim challenging patent validity (included in SoD)',
+        'defendant', 'filing', true, 0, 'months', NULL, NULL,
+        true, 'Includes counterclaim for revocation', 0, true);
+
+    -- Defence to Counterclaim
+    v_ccr_defence := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_defence, v_ccr, v_ccr_root, 'ccr.defence', 'Defence to Counterclaim',
+        'Patent proprietor files defence to revocation counterclaim',
+        'claimant', 'filing', true, 3, 'months', 'RoP.050', NULL,
+        false, NULL, 0, true);
+
+    -- Reply in CCR
+    v_ccr_reply := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_reply, v_ccr, v_ccr_defence, 'ccr.reply', 'Reply in CCR',
+        'Reply in the counterclaim for revocation',
+        'defendant', 'filing', true, 2, 'months', NULL,
+        'Timing overlaps with infringement Rejoinder',
+        false, NULL, 1, true);
+
+    -- Rejoinder in CCR
+    v_ccr_rejoin := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_rejoin, v_ccr, v_ccr_reply, 'ccr.rejoin', 'Rejoinder in CCR',
+        'Rejoinder in the counterclaim for revocation',
+        'claimant', 'filing', true, 2, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- Interim Conference
+    v_ccr_interim := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_interim, v_ccr, v_ccr_rejoin, 'ccr.interim', 'Interim Conference',
+        'Interim conference covering revocation issues',
+        'court', 'hearing', true, 0, 'months', NULL,
+        'May be combined with infringement IC',
+        false, NULL, 0, true);
+
+    -- Oral Hearing
+    v_ccr_oral := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_oral, v_ccr, v_ccr_interim, 'ccr.oral', 'Oral Hearing',
+        'Oral hearing on validity',
+        'court', 'hearing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- Decision
+    v_ccr_decision := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_ccr_decision, v_ccr, v_ccr_oral, 'ccr.decision', 'Decision',
+        'Decision on validity of the patent',
+        'court', 'decision', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- Appeal from CCR
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_app, v_ccr_decision, 'ccr.appeal', 'Appeal',
+        'Appeal against revocation decision to Court of Appeal',
+        'both', 'filing', true, 2, 'months', 'RoP.220.1', NULL,
+        true, 'Appeal filed', 0, true);
+
+    -- Application to Amend Patent (spawn from Defence to CCR)
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_amd, v_ccr_defence, 'ccr.amend', 'Application to Amend Patent',
+        'Patent proprietor applies to amend the patent during revocation proceedings',
+        'claimant', 'filing', false, 0, 'months', NULL, NULL,
+        true, 'Includes application to amend patent', 2, true);
+
+    -- ========================================
+    -- STANDALONE REVOCATION
+    -- ========================================
+
+    v_rev_app := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_app, v_rev, NULL, 'rev.app', 'Application for Revocation',
+        'Applicant files standalone application for revocation of the patent',
+        'claimant', 'filing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_rev_defence := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_defence, v_rev, v_rev_app, 'rev.defence', 'Defence to Revocation',
+        'Patent proprietor files defence to revocation application',
+        'defendant', 'filing', true, 3, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_rev_reply := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_reply, v_rev, v_rev_defence, 'rev.reply', 'Reply',
+        'Reply in standalone revocation proceedings',
+        'claimant', 'filing', true, 2, 'months', NULL, NULL,
+        false, NULL, 1, true);
+
+    v_rev_rejoin := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_rejoin, v_rev, v_rev_reply, 'rev.rejoin', 'Rejoinder',
+        'Rejoinder in standalone revocation proceedings',
+        'defendant', 'filing', true, 2, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_rev_interim := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_interim, v_rev, v_rev_rejoin, 'rev.interim', 'Interim Conference',
+        'Interim conference with the judge-rapporteur',
+        'court', 'hearing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_rev_oral := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_oral, v_rev, v_rev_interim, 'rev.oral', 'Oral Hearing',
+        'Oral hearing on validity in standalone revocation',
+        'court', 'hearing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_rev_decision := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_rev_decision, v_rev, v_rev_oral, 'rev.decision', 'Decision',
+        'Decision on patent validity',
+        'court', 'decision', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- Appeal from REV
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_app, v_rev_decision, 'rev.appeal', 'Appeal',
+        'Appeal against revocation decision to Court of Appeal',
+        'both', 'filing', true, 2, 'months', 'RoP.220.1', NULL,
+        true, 'Appeal filed', 0, true);
+
+    -- Application to Amend Patent from REV Defence
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_amd, v_rev_defence, 'rev.amend', 'Application to Amend Patent',
+        'Patent proprietor applies to amend the patent',
+        'claimant', 'filing', false, 0, 'months', NULL, NULL,
+        true, 'Includes application to amend patent', 2, true);
+
+    -- ========================================
+    -- PRELIMINARY INJUNCTION
+    -- ========================================
+
+    v_pi_app := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_pi_app, v_apm, NULL, 'pi.app', 'Application for Provisional Measures',
+        'Claimant files application for preliminary injunction',
+        'claimant', 'filing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_pi_resp := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_pi_resp, v_apm, v_pi_app, 'pi.response', 'Response to PI Application',
+        'Defendant files response to preliminary injunction application',
+        'defendant', 'filing', true, 0, 'months', NULL,
+        'Deadline set by court',
+        false, NULL, 0, true);
+
+    v_pi_oral := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_pi_oral, v_apm, v_pi_resp, 'pi.oral', 'Oral Hearing',
+        'Oral hearing on provisional measures',
+        'court', 'hearing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_apm, v_pi_oral, 'pi.order', 'Order on Provisional Measures',
+        'Court issues order on preliminary injunction',
+        'court', 'decision', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- ========================================
+    -- APPEAL (standalone)
+    -- ========================================
+
+    v_app_notice := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_app_notice, v_app, NULL, 'app.notice', 'Notice of Appeal',
+        'Appellant files notice of appeal with the Court of Appeal',
+        'both', 'filing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_app_grounds := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_app_grounds, v_app, v_app_notice, 'app.grounds', 'Statement of Grounds of Appeal',
+        'Appellant files statement of grounds',
+        'both', 'filing', true, 2, 'months', 'RoP.220.1', NULL,
+        false, NULL, 0, true);
+
+    v_app_response := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_app_response, v_app, v_app_grounds, 'app.response', 'Response to Appeal',
+        'Respondent files response to the appeal',
+        'both', 'filing', true, 2, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    v_app_oral := gen_random_uuid();
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (v_app_oral, v_app, v_app_response, 'app.oral', 'Oral Hearing',
+        'Oral hearing before the Court of Appeal',
+        'court', 'hearing', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    INSERT INTO deadline_rules (id, proceeding_type_id, parent_id, code, name, description,
+        primary_party, event_type, is_mandatory, duration_value, duration_unit,
+        rule_code, deadline_notes, is_spawn, spawn_label, sequence_order, is_active)
+    VALUES (gen_random_uuid(), v_app, v_app_oral, 'app.decision', 'Decision',
+        'Court of Appeal delivers its decision',
+        'court', 'decision', true, 0, 'months', NULL, NULL,
+        false, NULL, 0, true);
+
+    -- ========================================
+    -- 5. Set conditional deadlines (from 040)
+    -- ========================================
+
+    -- Reply to Defence: rule code changes when CCR is active
+    -- Default: RoP.029b | With CCR: RoP.029a
+    UPDATE deadline_rules
+    SET condition_rule_id = v_ccr_root,
+        alt_rule_code = 'RoP.029a'
+    WHERE id = v_inf_reply;
+
+    -- Rejoinder: duration changes when CCR is active
+    -- Default: 1 month RoP.029c | With CCR: 2 months RoP.029d
+    UPDATE deadline_rules
+    SET condition_rule_id = v_ccr_root,
+        alt_duration_value = 2,
+        alt_duration_unit = 'months',
+        alt_rule_code = 'RoP.029d'
+    WHERE id = v_inf_rejoin;
+
+END $$;
--- a/frontend/src/app/(app)/abrechnung/page.tsx
+++ b/frontend/src/app/(app)/abrechnung/page.tsx
@@ -1,164 +0,0 @@
-"use client";
-
-import { useQuery } from "@tanstack/react-query";
-import { api } from "@/lib/api";
-import type { TimeEntry } from "@/lib/types";
-import { format } from "date-fns";
-import { de } from "date-fns/locale";
-import { Timer, Loader2 } from "lucide-react";
-import { useState } from "react";
-import Link from "next/link";
-import { Breadcrumb } from "@/components/layout/Breadcrumb";
-
-function formatDuration(minutes: number): string {
-  const h = Math.floor(minutes / 60);
-  const m = minutes % 60;
-  if (h === 0) return `${m}min`;
-  if (m === 0) return `${h}h`;
-  return `${h}h ${m}min`;
-}
-
-export default function AbrechnungPage() {
-  const [from, setFrom] = useState(() => {
-    const d = new Date();
-    d.setDate(1);
-    return format(d, "yyyy-MM-dd");
-  });
-  const [to, setTo] = useState(() => format(new Date(), "yyyy-MM-dd"));
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["time-entries", from, to],
-    queryFn: () =>
-      api.get<{ time_entries: TimeEntry[]; total: number }>(
-        `/time-entries?from=${from}&to=${to}&limit=100`,
-      ),
-  });
-
-  const entries = data?.time_entries ?? [];
-  const totalMinutes = entries.reduce((s, e) => s + e.duration_minutes, 0);
-  const billableMinutes = entries
-    .filter((e) => e.billable)
-    .reduce((s, e) => s + e.duration_minutes, 0);
-  const totalAmount = entries
-    .filter((e) => e.billable && e.hourly_rate)
-    .reduce((s, e) => s + (e.duration_minutes / 60) * (e.hourly_rate ?? 0), 0);
-
-  return (
-    <div className="animate-fade-in">
-      <Breadcrumb
-        items={[
-          { label: "Dashboard", href: "/dashboard" },
-          { label: "Abrechnung" },
-        ]}
-      />
-
-      <div className="mt-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-        <h1 className="text-lg font-semibold text-neutral-900">
-          Zeiterfassung
-        </h1>
-        <Link
-          href="/abrechnung/rechnungen"
-          className="text-sm text-neutral-500 transition-colors hover:text-neutral-700"
-        >
-          Rechnungen ansehen &rarr;
-        </Link>
-      </div>
-
-      {/* Filters */}
-      <div className="mt-4 flex flex-wrap items-center gap-3">
-        <div className="flex items-center gap-2">
-          <label className="text-xs text-neutral-500">Von</label>
-          <input
-            type="date"
-            value={from}
-            onChange={(e) => setFrom(e.target.value)}
-            className="rounded-md border border-neutral-300 px-2 py-1 text-sm focus:border-neutral-500 focus:outline-none"
-          />
-        </div>
-        <div className="flex items-center gap-2">
-          <label className="text-xs text-neutral-500">Bis</label>
-          <input
-            type="date"
-            value={to}
-            onChange={(e) => setTo(e.target.value)}
-            className="rounded-md border border-neutral-300 px-2 py-1 text-sm focus:border-neutral-500 focus:outline-none"
-          />
-        </div>
-      </div>
-
-      {/* Summary cards */}
-      <div className="mt-4 grid grid-cols-1 gap-3 sm:grid-cols-3">
-        <div className="rounded-md border border-neutral-200 bg-white p-4">
-          <p className="text-xs text-neutral-500">Gesamt</p>
-          <p className="mt-1 text-xl font-semibold text-neutral-900">
-            {formatDuration(totalMinutes)}
-          </p>
-        </div>
-        <div className="rounded-md border border-neutral-200 bg-white p-4">
-          <p className="text-xs text-neutral-500">Abrechenbar</p>
-          <p className="mt-1 text-xl font-semibold text-neutral-900">
-            {formatDuration(billableMinutes)}
-          </p>
-        </div>
-        <div className="rounded-md border border-neutral-200 bg-white p-4">
-          <p className="text-xs text-neutral-500">Betrag</p>
-          <p className="mt-1 text-xl font-semibold text-neutral-900">
-            {totalAmount.toFixed(2)} EUR
-          </p>
-        </div>
-      </div>
-
-      {/* Entries */}
-      {isLoading ? (
-        <div className="flex items-center justify-center py-8">
-          <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
-        </div>
-      ) : entries.length === 0 ? (
-        <div className="flex flex-col items-center py-12 text-center">
-          <div className="rounded-xl bg-neutral-100 p-3">
-            <Timer className="h-5 w-5 text-neutral-400" />
-          </div>
-          <p className="mt-2 text-sm text-neutral-500">
-            Keine Zeiteintraege im gewaehlten Zeitraum.
-          </p>
-        </div>
-      ) : (
-        <div className="mt-4 space-y-2">
-          {entries.map((entry) => (
-            <div
-              key={entry.id}
-              className="flex items-center justify-between rounded-md border border-neutral-200 bg-white px-4 py-3"
-            >
-              <div className="min-w-0 flex-1">
-                <p className="text-sm font-medium text-neutral-900 truncate">
-                  {entry.description}
-                </p>
-                <div className="mt-0.5 flex gap-3 text-xs text-neutral-500">
-                  <span>
-                    {format(new Date(entry.date), "d. MMM yyyy", { locale: de })}
-                  </span>
-                  <Link
-                    href={`/cases/${entry.case_id}/zeiterfassung`}
-                    className="hover:text-neutral-700"
-                  >
-                    Akte ansehen
-                  </Link>
-                </div>
-              </div>
-              <div className="flex items-center gap-4 ml-4 text-sm">
-                {entry.billable ? (
-                  <span className="text-emerald-600">abrechenbar</span>
-                ) : (
-                  <span className="text-neutral-400">intern</span>
-                )}
-                <span className="font-medium text-neutral-900 whitespace-nowrap">
-                  {formatDuration(entry.duration_minutes)}
-                </span>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
--- a/frontend/src/app/(app)/abrechnung/rechnungen/[id]/page.tsx
+++ b/frontend/src/app/(app)/abrechnung/rechnungen/[id]/page.tsx
@@ -1,225 +0,0 @@
-"use client";
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { useParams } from "next/navigation";
-import { api } from "@/lib/api";
-import type { Invoice } from "@/lib/types";
-import { format } from "date-fns";
-import { de } from "date-fns/locale";
-import { Loader2, AlertTriangle } from "lucide-react";
-import { Breadcrumb } from "@/components/layout/Breadcrumb";
-
-const STATUS_BADGE: Record<string, string> = {
-  draft: "bg-neutral-100 text-neutral-600",
-  sent: "bg-blue-50 text-blue-700",
-  paid: "bg-emerald-50 text-emerald-700",
-  cancelled: "bg-red-50 text-red-600",
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: "Entwurf",
-  sent: "Versendet",
-  paid: "Bezahlt",
-  cancelled: "Storniert",
-};
-
-const TRANSITIONS: Record<string, { label: string; next: string }[]> = {
-  draft: [
-    { label: "Als versendet markieren", next: "sent" },
-    { label: "Stornieren", next: "cancelled" },
-  ],
-  sent: [
-    { label: "Als bezahlt markieren", next: "paid" },
-    { label: "Stornieren", next: "cancelled" },
-  ],
-  paid: [],
-  cancelled: [],
-};
-
-export default function InvoiceDetailPage() {
-  const { id } = useParams<{ id: string }>();
-  const queryClient = useQueryClient();
-
-  const { data: invoice, isLoading, error } = useQuery({
-    queryKey: ["invoice", id],
-    queryFn: () => api.get<Invoice>(`/invoices/${id}`),
-  });
-
-  const statusMutation = useMutation({
-    mutationFn: (status: string) =>
-      api.patch<Invoice>(`/invoices/${id}/status`, { status }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["invoice", id] });
-      queryClient.invalidateQueries({ queryKey: ["invoices"] });
-    },
-  });
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center py-12">
-        <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
-      </div>
-    );
-  }
-
-  if (error || !invoice) {
-    return (
-      <div className="py-12 text-center">
-        <AlertTriangle className="mx-auto h-6 w-6 text-red-500" />
-        <p className="mt-2 text-sm text-neutral-500">
-          Rechnung nicht gefunden.
-        </p>
-      </div>
-    );
-  }
-
-  const items = Array.isArray(invoice.items) ? invoice.items : [];
-  const actions = TRANSITIONS[invoice.status] ?? [];
-
-  return (
-    <div className="animate-fade-in">
-      <Breadcrumb
-        items={[
-          { label: "Dashboard", href: "/dashboard" },
-          { label: "Abrechnung", href: "/abrechnung" },
-          { label: "Rechnungen", href: "/abrechnung/rechnungen" },
-          { label: invoice.invoice_number },
-        ]}
-      />
-
-      <div className="mt-4 flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
-        <div>
-          <div className="flex items-center gap-3">
-            <h1 className="text-lg font-semibold text-neutral-900">
-              {invoice.invoice_number}
-            </h1>
-            <span
-              className={`rounded-full px-2 py-0.5 text-xs font-medium ${STATUS_BADGE[invoice.status]}`}
-            >
-              {STATUS_LABEL[invoice.status]}
-            </span>
-          </div>
-          <p className="mt-1 text-sm text-neutral-500">
-            {invoice.client_name}
-          </p>
-        </div>
-        <div className="flex gap-2">
-          {actions.map((action) => (
-            <button
-              key={action.next}
-              onClick={() => statusMutation.mutate(action.next)}
-              disabled={statusMutation.isPending}
-              className="rounded-md bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-neutral-800 disabled:opacity-50"
-            >
-              {action.label}
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Invoice details */}
-      <div className="mt-6 rounded-md border border-neutral-200 bg-white">
-        {/* Client info */}
-        <div className="border-b border-neutral-100 p-4">
-          <p className="text-xs text-neutral-500">Empfaenger</p>
-          <p className="mt-1 text-sm font-medium text-neutral-900">
-            {invoice.client_name}
-          </p>
-          {invoice.client_address && (
-            <p className="mt-0.5 text-sm text-neutral-500 whitespace-pre-line">
-              {invoice.client_address}
-            </p>
-          )}
-        </div>
-
-        {/* Dates */}
-        <div className="flex flex-wrap gap-6 border-b border-neutral-100 p-4">
-          {invoice.issued_at && (
-            <div>
-              <p className="text-xs text-neutral-500">Rechnungsdatum</p>
-              <p className="mt-0.5 text-sm text-neutral-900">
-                {format(new Date(invoice.issued_at), "d. MMMM yyyy", { locale: de })}
-              </p>
-            </div>
-          )}
-          {invoice.due_at && (
-            <div>
-              <p className="text-xs text-neutral-500">Faellig am</p>
-              <p className="mt-0.5 text-sm text-neutral-900">
-                {format(new Date(invoice.due_at), "d. MMMM yyyy", { locale: de })}
-              </p>
-            </div>
-          )}
-          {invoice.paid_at && (
-            <div>
-              <p className="text-xs text-neutral-500">Bezahlt am</p>
-              <p className="mt-0.5 text-sm text-neutral-900">
-                {format(new Date(invoice.paid_at), "d. MMMM yyyy", { locale: de })}
-              </p>
-            </div>
-          )}
-        </div>
-
-        {/* Line items */}
-        <div className="p-4">
-          <table className="w-full text-sm">
-            <thead>
-              <tr className="border-b border-neutral-100 text-left text-xs text-neutral-500">
-                <th className="pb-2 font-medium">Beschreibung</th>
-                <th className="pb-2 font-medium text-right">Betrag</th>
-              </tr>
-            </thead>
-            <tbody>
-              {items.map((item, i) => (
-                <tr key={i} className="border-b border-neutral-50">
-                  <td className="py-2 text-neutral-900">
-                    {item.description}
-                    {item.duration_minutes && item.hourly_rate && (
-                      <span className="ml-2 text-xs text-neutral-400">
-                        ({Math.floor(item.duration_minutes / 60)}h{" "}
-                        {item.duration_minutes % 60}min x {item.hourly_rate} EUR/h)
-                      </span>
-                    )}
-                  </td>
-                  <td className="py-2 text-right text-neutral-900">
-                    {item.amount.toFixed(2)} EUR
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </div>
-
-        {/* Totals */}
-        <div className="border-t border-neutral-200 p-4">
-          <div className="flex justify-end">
-            <div className="w-48 space-y-1">
-              <div className="flex justify-between text-sm">
-                <span className="text-neutral-500">Netto</span>
-                <span>{invoice.subtotal.toFixed(2)} EUR</span>
-              </div>
-              <div className="flex justify-between text-sm">
-                <span className="text-neutral-500">
-                  USt. {invoice.tax_rate}%
-                </span>
-                <span>{invoice.tax_amount.toFixed(2)} EUR</span>
-              </div>
-              <div className="flex justify-between border-t border-neutral-200 pt-1 text-sm font-semibold">
-                <span>Gesamt</span>
-                <span>{invoice.total.toFixed(2)} EUR</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        {/* Notes */}
-        {invoice.notes && (
-          <div className="border-t border-neutral-100 p-4">
-            <p className="text-xs text-neutral-500">Anmerkungen</p>
-            <p className="mt-1 text-sm text-neutral-700">{invoice.notes}</p>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
--- a/frontend/src/app/(app)/abrechnung/rechnungen/page.tsx
+++ b/frontend/src/app/(app)/abrechnung/rechnungen/page.tsx
@@ -1,118 +0,0 @@
-"use client";
-
-import { useQuery } from "@tanstack/react-query";
-import { api } from "@/lib/api";
-import type { Invoice } from "@/lib/types";
-import { format } from "date-fns";
-import { de } from "date-fns/locale";
-import { Receipt, Loader2 } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { Breadcrumb } from "@/components/layout/Breadcrumb";
-
-const STATUS_BADGE: Record<string, string> = {
-  draft: "bg-neutral-100 text-neutral-600",
-  sent: "bg-blue-50 text-blue-700",
-  paid: "bg-emerald-50 text-emerald-700",
-  cancelled: "bg-red-50 text-red-600",
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: "Entwurf",
-  sent: "Versendet",
-  paid: "Bezahlt",
-  cancelled: "Storniert",
-};
-
-export default function RechnungenPage() {
-  const [statusFilter, setStatusFilter] = useState("");
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["invoices", statusFilter],
-    queryFn: () => {
-      const params = statusFilter ? `?status=${statusFilter}` : "";
-      return api.get<{ invoices: Invoice[] }>(`/invoices${params}`);
-    },
-  });
-
-  const invoices = data?.invoices ?? [];
-
-  return (
-    <div className="animate-fade-in">
-      <Breadcrumb
-        items={[
-          { label: "Dashboard", href: "/dashboard" },
-          { label: "Abrechnung", href: "/abrechnung" },
-          { label: "Rechnungen" },
-        ]}
-      />
-
-      <div className="mt-4 flex items-center justify-between">
-        <h1 className="text-lg font-semibold text-neutral-900">Rechnungen</h1>
-      </div>
-
-      {/* Filters */}
-      <div className="mt-4 flex gap-2">
-        {["", "draft", "sent", "paid", "cancelled"].map((s) => (
-          <button
-            key={s}
-            onClick={() => setStatusFilter(s)}
-            className={`rounded-md px-2.5 py-1 text-xs font-medium transition-colors ${
-              statusFilter === s
-                ? "bg-neutral-900 text-white"
-                : "bg-neutral-100 text-neutral-600 hover:bg-neutral-200"
-            }`}
-          >
-            {s === "" ? "Alle" : STATUS_LABEL[s]}
-          </button>
-        ))}
-      </div>
-
-      {isLoading ? (
-        <div className="flex items-center justify-center py-8">
-          <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
-        </div>
-      ) : invoices.length === 0 ? (
-        <div className="flex flex-col items-center py-12 text-center">
-          <div className="rounded-xl bg-neutral-100 p-3">
-            <Receipt className="h-5 w-5 text-neutral-400" />
-          </div>
-          <p className="mt-2 text-sm text-neutral-500">
-            Keine Rechnungen vorhanden.
-          </p>
-        </div>
-      ) : (
-        <div className="mt-4 space-y-2">
-          {invoices.map((inv) => (
-            <Link
-              key={inv.id}
-              href={`/abrechnung/rechnungen/${inv.id}`}
-              className="flex items-center justify-between rounded-md border border-neutral-200 bg-white px-4 py-3 transition-colors hover:bg-neutral-50"
-            >
-              <div>
-                <div className="flex items-center gap-2">
-                  <p className="text-sm font-medium text-neutral-900">
-                    {inv.invoice_number}
-                  </p>
-                  <span
-                    className={`rounded-full px-2 py-0.5 text-xs font-medium ${STATUS_BADGE[inv.status]}`}
-                  >
-                    {STATUS_LABEL[inv.status]}
-                  </span>
-                </div>
-                <p className="mt-0.5 text-xs text-neutral-500">
-                  {inv.client_name}
-                  {inv.issued_at &&
-                    ` — ${format(new Date(inv.issued_at), "d. MMM yyyy", { locale: de })}`}
-                </p>
-              </div>
-              <p className="text-sm font-semibold text-neutral-900">
-                {inv.total.toFixed(2)} EUR
-              </p>
-            </Link>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
--- a/frontend/src/app/(app)/cases/[id]/layout.tsx
+++ b/frontend/src/app/(app)/cases/[id]/layout.tsx
@@ -17,7 +17,6 @@ import {
  StickyNote,
  AlertTriangle,
  ScrollText,
-  Timer,
 } from "lucide-react";
 import { format } from "date-fns";
 import { de } from "date-fns/locale";
@@ -47,7 +46,6 @@ const TABS = [
  { segment: "dokumente", label: "Dokumente", icon: FileText },
  { segment: "parteien", label: "Parteien", icon: Users },
  { segment: "mitarbeiter", label: "Mitarbeiter", icon: UserCheck },
-  { segment: "zeiterfassung", label: "Zeiterfassung", icon: Timer },
  { segment: "notizen", label: "Notizen", icon: StickyNote },
  { segment: "protokoll", label: "Protokoll", icon: ScrollText },
 ] as const;
@@ -58,7 +56,6 @@ const TAB_LABELS: Record<string, string> = {
  dokumente: "Dokumente",
  parteien: "Parteien",
  mitarbeiter: "Mitarbeiter",
-  zeiterfassung: "Zeiterfassung",
  notizen: "Notizen",
  protokoll: "Protokoll",
 };
--- a/frontend/src/app/(app)/cases/[id]/zeiterfassung/page.tsx
+++ b/frontend/src/app/(app)/cases/[id]/zeiterfassung/page.tsx
@@ -1,306 +0,0 @@
-"use client";
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { useParams } from "next/navigation";
-import { api } from "@/lib/api";
-import type { TimeEntry } from "@/lib/types";
-import { format } from "date-fns";
-import { de } from "date-fns/locale";
-import { Timer, Loader2, Plus, Trash2 } from "lucide-react";
-import { useState } from "react";
-
-function formatDuration(minutes: number): string {
-  const h = Math.floor(minutes / 60);
-  const m = minutes % 60;
-  if (h === 0) return `${m}min`;
-  if (m === 0) return `${h}h`;
-  return `${h}h ${m}min`;
-}
-
-function formatAmount(minutes: number, rate?: number): string {
-  if (!rate) return "-";
-  return `${((minutes / 60) * rate).toFixed(2)} EUR`;
-}
-
-const ACTIVITIES = [
-  { value: "", label: "Keine Kategorie" },
-  { value: "research", label: "Recherche" },
-  { value: "drafting", label: "Entwurf" },
-  { value: "hearing", label: "Verhandlung" },
-  { value: "call", label: "Telefonat" },
-  { value: "review", label: "Prüfung" },
-  { value: "travel", label: "Reise" },
-  { value: "meeting", label: "Besprechung" },
-];
-
-export default function ZeiterfassungPage() {
-  const { id } = useParams<{ id: string }>();
-  const queryClient = useQueryClient();
-  const [showForm, setShowForm] = useState(false);
-  const [desc, setDesc] = useState("");
-  const [hours, setHours] = useState("");
-  const [minutes, setMinutes] = useState("");
-  const [date, setDate] = useState(format(new Date(), "yyyy-MM-dd"));
-  const [activity, setActivity] = useState("");
-  const [billable, setBillable] = useState(true);
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["case-time-entries", id],
-    queryFn: () =>
-      api.get<{ time_entries: TimeEntry[] }>(`/cases/${id}/time-entries`),
-  });
-
-  const createMutation = useMutation({
-    mutationFn: (input: {
-      description: string;
-      duration_minutes: number;
-      date: string;
-      activity?: string;
-      billable: boolean;
-    }) => api.post<TimeEntry>(`/cases/${id}/time-entries`, input),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["case-time-entries", id] });
-      setShowForm(false);
-      setDesc("");
-      setHours("");
-      setMinutes("");
-      setActivity("");
-      setBillable(true);
-    },
-  });
-
-  const deleteMutation = useMutation({
-    mutationFn: (entryId: string) =>
-      api.delete(`/time-entries/${entryId}`),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["case-time-entries", id] });
-    },
-  });
-
-  function handleSubmit(e: React.FormEvent) {
-    e.preventDefault();
-    const totalMinutes = (parseInt(hours || "0") * 60) + parseInt(minutes || "0");
-    if (totalMinutes <= 0 || !desc.trim()) return;
-    createMutation.mutate({
-      description: desc.trim(),
-      duration_minutes: totalMinutes,
-      date,
-      activity: activity || undefined,
-      billable,
-    });
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
-      </div>
-    );
-  }
-
-  const entries = data?.time_entries ?? [];
-  const totalMinutes = entries.reduce((s, e) => s + e.duration_minutes, 0);
-  const billableMinutes = entries
-    .filter((e) => e.billable)
-    .reduce((s, e) => s + e.duration_minutes, 0);
-
-  return (
-    <div className="space-y-4">
-      {/* Summary bar */}
-      <div className="flex flex-wrap items-center justify-between gap-3">
-        <div className="flex gap-6 text-sm text-neutral-500">
-          <span>
-            Gesamt: <span className="font-medium text-neutral-900">{formatDuration(totalMinutes)}</span>
-          </span>
-          <span>
-            Abrechenbar: <span className="font-medium text-neutral-900">{formatDuration(billableMinutes)}</span>
-          </span>
-        </div>
-        <button
-          onClick={() => setShowForm(!showForm)}
-          className="inline-flex items-center gap-1.5 rounded-md bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-neutral-800"
-        >
-          <Plus className="h-3.5 w-3.5" />
-          Eintrag
-        </button>
-      </div>
-
-      {/* Quick add form */}
-      {showForm && (
-        <form
-          onSubmit={handleSubmit}
-          className="rounded-md border border-neutral-200 bg-neutral-50 p-4 space-y-3"
-        >
-          <div>
-            <label className="block text-xs font-medium text-neutral-600 mb-1">
-              Beschreibung
-            </label>
-            <input
-              type="text"
-              value={desc}
-              onChange={(e) => setDesc(e.target.value)}
-              placeholder="Was wurde getan?"
-              className="w-full rounded-md border border-neutral-300 px-3 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-              required
-            />
-          </div>
-          <div className="flex flex-wrap gap-3">
-            <div className="flex-1 min-w-[120px]">
-              <label className="block text-xs font-medium text-neutral-600 mb-1">
-                Dauer
-              </label>
-              <div className="flex gap-2">
-                <div className="flex items-center gap-1">
-                  <input
-                    type="number"
-                    min="0"
-                    value={hours}
-                    onChange={(e) => setHours(e.target.value)}
-                    placeholder="0"
-                    className="w-16 rounded-md border border-neutral-300 px-2 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-                  />
-                  <span className="text-xs text-neutral-500">h</span>
-                </div>
-                <div className="flex items-center gap-1">
-                  <input
-                    type="number"
-                    min="0"
-                    max="59"
-                    value={minutes}
-                    onChange={(e) => setMinutes(e.target.value)}
-                    placeholder="0"
-                    className="w-16 rounded-md border border-neutral-300 px-2 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-                  />
-                  <span className="text-xs text-neutral-500">min</span>
-                </div>
-              </div>
-            </div>
-            <div className="flex-1 min-w-[120px]">
-              <label className="block text-xs font-medium text-neutral-600 mb-1">
-                Datum
-              </label>
-              <input
-                type="date"
-                value={date}
-                onChange={(e) => setDate(e.target.value)}
-                className="w-full rounded-md border border-neutral-300 px-3 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-              />
-            </div>
-            <div className="flex-1 min-w-[120px]">
-              <label className="block text-xs font-medium text-neutral-600 mb-1">
-                Kategorie
-              </label>
-              <select
-                value={activity}
-                onChange={(e) => setActivity(e.target.value)}
-                className="w-full rounded-md border border-neutral-300 px-3 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-              >
-                {ACTIVITIES.map((a) => (
-                  <option key={a.value} value={a.value}>
-                    {a.label}
-                  </option>
-                ))}
-              </select>
-            </div>
-          </div>
-          <div className="flex items-center justify-between">
-            <label className="flex items-center gap-2 text-sm text-neutral-600">
-              <input
-                type="checkbox"
-                checked={billable}
-                onChange={(e) => setBillable(e.target.checked)}
-                className="rounded border-neutral-300"
-              />
-              Abrechenbar
-            </label>
-            <div className="flex gap-2">
-              <button
-                type="button"
-                onClick={() => setShowForm(false)}
-                className="rounded-md px-3 py-1.5 text-sm text-neutral-600 transition-colors hover:bg-neutral-100"
-              >
-                Abbrechen
-              </button>
-              <button
-                type="submit"
-                disabled={createMutation.isPending}
-                className="rounded-md bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-neutral-800 disabled:opacity-50"
-              >
-                {createMutation.isPending ? "Speichern..." : "Speichern"}
-              </button>
-            </div>
-          </div>
-          {createMutation.isError && (
-            <p className="text-sm text-red-600">Fehler beim Speichern.</p>
-          )}
-        </form>
-      )}
-
-      {/* Entries list */}
-      {entries.length === 0 ? (
-        <div className="flex flex-col items-center py-8 text-center">
-          <div className="rounded-xl bg-neutral-100 p-3">
-            <Timer className="h-5 w-5 text-neutral-400" />
-          </div>
-          <p className="mt-2 text-sm text-neutral-500">
-            Keine Zeiteintraege vorhanden.
-          </p>
-        </div>
-      ) : (
-        <div className="space-y-2">
-          {entries.map((entry) => (
-            <div
-              key={entry.id}
-              className="flex items-center justify-between rounded-md border border-neutral-200 bg-white px-4 py-3"
-            >
-              <div className="min-w-0 flex-1">
-                <div className="flex items-center gap-2">
-                  <p className="text-sm font-medium text-neutral-900 truncate">
-                    {entry.description}
-                  </p>
-                  {entry.activity && (
-                    <span className="shrink-0 rounded-full bg-neutral-100 px-2 py-0.5 text-xs text-neutral-500">
-                      {ACTIVITIES.find((a) => a.value === entry.activity)?.label ?? entry.activity}
-                    </span>
-                  )}
-                  {!entry.billable && (
-                    <span className="shrink-0 rounded-full bg-neutral-100 px-2 py-0.5 text-xs text-neutral-400">
-                      nicht abrechenbar
-                    </span>
-                  )}
-                  {entry.billed && (
-                    <span className="shrink-0 rounded-full bg-emerald-50 px-2 py-0.5 text-xs text-emerald-700">
-                      abgerechnet
-                    </span>
-                  )}
-                </div>
-                <div className="mt-0.5 flex gap-4 text-xs text-neutral-500">
-                  <span>
-                    {format(new Date(entry.date), "d. MMM yyyy", { locale: de })}
-                  </span>
-                  {entry.hourly_rate && (
-                    <span>{formatAmount(entry.duration_minutes, entry.hourly_rate)}</span>
-                  )}
-                </div>
-              </div>
-              <div className="flex items-center gap-3 ml-4">
-                <span className="text-sm font-medium text-neutral-900 whitespace-nowrap">
-                  {formatDuration(entry.duration_minutes)}
-                </span>
-                {!entry.billed && (
-                  <button
-                    onClick={() => deleteMutation.mutate(entry.id)}
-                    className="rounded-md p-1 text-neutral-400 transition-colors hover:bg-red-50 hover:text-red-600"
-                    title="Loeschen"
-                  >
-                    <Trash2 className="h-3.5 w-3.5" />
-                  </button>
-                )}
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
--- a/frontend/src/app/(app)/einstellungen/abrechnung/page.tsx
+++ b/frontend/src/app/(app)/einstellungen/abrechnung/page.tsx
@@ -1,166 +0,0 @@
-"use client";
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { api } from "@/lib/api";
-import type { BillingRate } from "@/lib/types";
-import { format } from "date-fns";
-import { de } from "date-fns/locale";
-import { Loader2, Plus } from "lucide-react";
-import { useState } from "react";
-import { Breadcrumb } from "@/components/layout/Breadcrumb";
-
-export default function BillingRatesPage() {
-  const queryClient = useQueryClient();
-  const [showForm, setShowForm] = useState(false);
-  const [rate, setRate] = useState("");
-  const [validFrom, setValidFrom] = useState(format(new Date(), "yyyy-MM-dd"));
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["billing-rates"],
-    queryFn: () =>
-      api.get<{ billing_rates: BillingRate[] }>("/billing-rates"),
-  });
-
-  const upsertMutation = useMutation({
-    mutationFn: (input: { rate: number; valid_from: string; currency: string }) =>
-      api.put<BillingRate>("/billing-rates", input),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["billing-rates"] });
-      setShowForm(false);
-      setRate("");
-    },
-  });
-
-  function handleSubmit(e: React.FormEvent) {
-    e.preventDefault();
-    const rateNum = parseFloat(rate);
-    if (isNaN(rateNum) || rateNum < 0) return;
-    upsertMutation.mutate({
-      rate: rateNum,
-      valid_from: validFrom,
-      currency: "EUR",
-    });
-  }
-
-  const rates = data?.billing_rates ?? [];
-
-  return (
-    <div className="animate-fade-in">
-      <Breadcrumb
-        items={[
-          { label: "Dashboard", href: "/dashboard" },
-          { label: "Einstellungen", href: "/einstellungen" },
-          { label: "Stundensaetze" },
-        ]}
-      />
-
-      <div className="mt-4 flex items-center justify-between">
-        <h1 className="text-lg font-semibold text-neutral-900">
-          Stundensaetze
-        </h1>
-        <button
-          onClick={() => setShowForm(!showForm)}
-          className="inline-flex items-center gap-1.5 rounded-md bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-neutral-800"
-        >
-          <Plus className="h-3.5 w-3.5" />
-          Neuer Satz
-        </button>
-      </div>
-
-      {showForm && (
-        <form
-          onSubmit={handleSubmit}
-          className="mt-4 rounded-md border border-neutral-200 bg-neutral-50 p-4 space-y-3"
-        >
-          <div className="flex flex-wrap gap-3">
-            <div className="flex-1 min-w-[150px]">
-              <label className="block text-xs font-medium text-neutral-600 mb-1">
-                Stundensatz (EUR)
-              </label>
-              <input
-                type="number"
-                min="0"
-                step="0.01"
-                value={rate}
-                onChange={(e) => setRate(e.target.value)}
-                placeholder="z.B. 350.00"
-                className="w-full rounded-md border border-neutral-300 px-3 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-                required
-              />
-            </div>
-            <div className="flex-1 min-w-[150px]">
-              <label className="block text-xs font-medium text-neutral-600 mb-1">
-                Gueltig ab
-              </label>
-              <input
-                type="date"
-                value={validFrom}
-                onChange={(e) => setValidFrom(e.target.value)}
-                className="w-full rounded-md border border-neutral-300 px-3 py-1.5 text-sm focus:border-neutral-500 focus:outline-none"
-                required
-              />
-            </div>
-          </div>
-          <div className="flex justify-end gap-2">
-            <button
-              type="button"
-              onClick={() => setShowForm(false)}
-              className="rounded-md px-3 py-1.5 text-sm text-neutral-600 hover:bg-neutral-100"
-            >
-              Abbrechen
-            </button>
-            <button
-              type="submit"
-              disabled={upsertMutation.isPending}
-              className="rounded-md bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white hover:bg-neutral-800 disabled:opacity-50"
-            >
-              Speichern
-            </button>
-          </div>
-        </form>
-      )}
-
-      {isLoading ? (
-        <div className="flex items-center justify-center py-8">
-          <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
-        </div>
-      ) : rates.length === 0 ? (
-        <div className="mt-8 text-center">
-          <p className="text-sm text-neutral-500">
-            Noch keine Stundensaetze definiert.
-          </p>
-        </div>
-      ) : (
-        <div className="mt-4 space-y-2">
-          {rates.map((r) => (
-            <div
-              key={r.id}
-              className="flex items-center justify-between rounded-md border border-neutral-200 bg-white px-4 py-3"
-            >
-              <div>
-                <p className="text-sm font-medium text-neutral-900">
-                  {r.rate.toFixed(2)} {r.currency}/h
-                </p>
-                <p className="mt-0.5 text-xs text-neutral-500">
-                  {r.user_id ? `Benutzer: ${r.user_id.slice(0, 8)}...` : "Standard (alle Benutzer)"}
-                </p>
-              </div>
-              <div className="text-right text-xs text-neutral-500">
-                <p>
-                  Ab{" "}
-                  {format(new Date(r.valid_from), "d. MMM yyyy", { locale: de })}
-                </p>
-                {r.valid_to && (
-                  <p>
-                    Bis{" "}
-                    {format(new Date(r.valid_to), "d. MMM yyyy", { locale: de })}
-                  </p>
-                )}
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
--- a/frontend/src/app/(app)/fristen/rechner/page.tsx
+++ b/frontend/src/app/(app)/fristen/rechner/page.tsx
@@ -1,28 +1,61 @@
 "use client";

 import { DeadlineCalculator } from "@/components/deadlines/DeadlineCalculator";
+import { DeadlineWizard } from "@/components/deadlines/DeadlineWizard";
 import { ArrowLeft } from "lucide-react";
 import Link from "next/link";
+import { useState } from "react";

 export default function FristenrechnerPage() {
+  const [mode, setMode] = useState<"wizard" | "quick">("wizard");
+
  return (
    <div className="animate-fade-in space-y-4">
-      <div>
-        <Link
-          href="/fristen"
-          className="mb-2 inline-flex items-center gap-1 text-sm text-neutral-500 transition-colors hover:text-neutral-700"
-        >
-          <ArrowLeft className="h-3.5 w-3.5" />
-          Zurück zu Fristen
-        </Link>
-        <h1 className="text-lg font-semibold text-neutral-900">
-          Fristenrechner
-        </h1>
-        <p className="mt-0.5 text-sm text-neutral-500">
-          Berechnen Sie Fristen basierend auf Verfahrensart und Auslösedatum
-        </p>
+      <div className="flex items-start justify-between">
+        <div>
+          <Link
+            href="/fristen"
+            className="mb-2 inline-flex items-center gap-1 text-sm text-neutral-500 transition-colors hover:text-neutral-700"
+          >
+            <ArrowLeft className="h-3.5 w-3.5" />
+            Zurueck zu Fristen
+          </Link>
+          <h1 className="text-lg font-semibold text-neutral-900">
+            Fristenbestimmung
+          </h1>
+          <p className="mt-0.5 text-sm text-neutral-500">
+            {mode === "wizard"
+              ? "Vollstaendige Verfahrens-Timeline mit automatischer Fristenberechnung"
+              : "Schnellberechnung einzelner Fristen nach Verfahrensart"}
+          </p>
+        </div>
+
+        {/* Mode toggle */}
+        <div className="flex rounded-md border border-neutral-200 bg-neutral-50 p-0.5">
+          <button
+            onClick={() => setMode("wizard")}
+            className={`rounded px-3 py-1 text-xs font-medium transition-colors ${
+              mode === "wizard"
+                ? "bg-white text-neutral-900 shadow-sm"
+                : "text-neutral-500 hover:text-neutral-700"
+            }`}
+          >
+            Verfahren
+          </button>
+          <button
+            onClick={() => setMode("quick")}
+            className={`rounded px-3 py-1 text-xs font-medium transition-colors ${
+              mode === "quick"
+                ? "bg-white text-neutral-900 shadow-sm"
+                : "text-neutral-500 hover:text-neutral-700"
+            }`}
+          >
+            Schnell
+          </button>
+        </div>
      </div>
-      <DeadlineCalculator />
+
+      {mode === "wizard" ? <DeadlineWizard /> : <DeadlineCalculator />}
    </div>
  );
 }
--- a/frontend/src/components/deadlines/DeadlineWizard.tsx
+++ b/frontend/src/components/deadlines/DeadlineWizard.tsx
@@ -0,0 +1,622 @@
+"use client";
+
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { api } from "@/lib/api";
+import type {
+  ProceedingType,
+  TimelineResponse,
+  DetermineResponse,
+  TimelineEvent,
+  Case,
+} from "@/lib/types";
+import { format, parseISO, isPast, isThisWeek, isBefore, addDays } from "date-fns";
+import { de } from "date-fns/locale";
+import {
+  Scale,
+  Calendar,
+  ChevronRight,
+  ChevronDown,
+  GitBranch,
+  Check,
+  Clock,
+  AlertTriangle,
+  FileText,
+  Users,
+  Gavel,
+  ArrowRight,
+  RotateCcw,
+  Loader2,
+  CheckCircle2,
+  FolderOpen,
+} from "lucide-react";
+import { useState, useCallback, useMemo } from "react";
+import { toast } from "sonner";
+
+// --- Helpers ---
+
+function formatDuration(value: number, unit: string): string {
+  if (value === 0) return "";
+  const labels: Record<string, string> = {
+    days: value === 1 ? "Tag" : "Tage",
+    weeks: value === 1 ? "Woche" : "Wochen",
+    months: value === 1 ? "Monat" : "Monate",
+  };
+  return `${value} ${labels[unit] || unit}`;
+}
+
+function getPartyIcon(party?: string) {
+  switch (party) {
+    case "claimant":
+      return <Scale className="h-3.5 w-3.5" />;
+    case "defendant":
+      return <Users className="h-3.5 w-3.5" />;
+    case "court":
+      return <Gavel className="h-3.5 w-3.5" />;
+    default:
+      return <FileText className="h-3.5 w-3.5" />;
+  }
+}
+
+function getPartyLabel(party?: string): string {
+  switch (party) {
+    case "claimant":
+      return "Klaeger";
+    case "defendant":
+      return "Beklagter";
+    case "court":
+      return "Gericht";
+    case "both":
+      return "Beide Parteien";
+    default:
+      return "";
+  }
+}
+
+function getEventTypeLabel(type?: string): string {
+  switch (type) {
+    case "filing":
+      return "Einreichung";
+    case "hearing":
+      return "Verhandlung";
+    case "decision":
+      return "Entscheidung";
+    default:
+      return "";
+  }
+}
+
+type Urgency = "past" | "overdue" | "this_week" | "upcoming" | "future" | "none";
+
+function getUrgency(dateStr?: string): Urgency {
+  if (!dateStr) return "none";
+  const date = parseISO(dateStr);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  if (isPast(date) && isBefore(date, today)) return "overdue";
+  if (isThisWeek(date, { weekStartsOn: 1 })) return "this_week";
+  if (isBefore(date, addDays(today, 30))) return "upcoming";
+  return "future";
+}
+
+const urgencyStyles: Record<Urgency, { dot: string; text: string; bg: string }> = {
+  past: { dot: "bg-neutral-400", text: "text-neutral-500", bg: "bg-neutral-50" },
+  overdue: { dot: "bg-red-500", text: "text-red-700", bg: "bg-red-50" },
+  this_week: { dot: "bg-amber-500", text: "text-amber-700", bg: "bg-amber-50" },
+  upcoming: { dot: "bg-blue-500", text: "text-blue-700", bg: "bg-blue-50" },
+  future: { dot: "bg-green-500", text: "text-green-700", bg: "bg-green-50" },
+  none: { dot: "bg-neutral-300", text: "text-neutral-500", bg: "bg-neutral-50" },
+};
+
+// --- Spawn Extraction ---
+
+function extractSpawns(events: TimelineEvent[]): TimelineEvent[] {
+  const spawns: TimelineEvent[] = [];
+  function walk(evts: TimelineEvent[]) {
+    for (const ev of evts) {
+      if (ev.is_spawn) spawns.push(ev);
+      if (ev.children) walk(ev.children);
+    }
+  }
+  walk(events);
+  return spawns;
+}
+
+// --- Flat timeline extraction ---
+
+function flattenTimeline(events: TimelineEvent[], depth = 0): (TimelineEvent & { depth: number })[] {
+  const result: (TimelineEvent & { depth: number })[] = [];
+  for (const ev of events) {
+    result.push({ ...ev, depth });
+    if (ev.children && ev.children.length > 0) {
+      result.push(...flattenTimeline(ev.children, depth + 1));
+    }
+  }
+  return result;
+}
+
+// --- Main Component ---
+
+export function DeadlineWizard() {
+  const [selectedType, setSelectedType] = useState<string>("");
+  const [triggerDate, setTriggerDate] = useState("");
+  const [conditions, setConditions] = useState<Record<string, boolean>>({});
+  const [selectedCaseId, setSelectedCaseId] = useState<string>("");
+  const [showBatchPanel, setShowBatchPanel] = useState(false);
+  const queryClient = useQueryClient();
+
+  // Fetch proceeding types
+  const { data: proceedingTypes, isLoading: typesLoading } = useQuery({
+    queryKey: ["proceeding-types"],
+    queryFn: () => api.get<ProceedingType[]>("/proceeding-types"),
+  });
+
+  // Fetch timeline structure when type is selected
+  const { data: timelineData } = useQuery({
+    queryKey: ["timeline", selectedType],
+    queryFn: () => api.get<TimelineResponse>(`/proceeding-types/${selectedType}/timeline`),
+    enabled: !!selectedType,
+  });
+
+  // Determine mutation
+  const determineMutation = useMutation({
+    mutationFn: (params: { proceeding_type: string; trigger_event_date: string; conditions: Record<string, boolean> }) =>
+      api.post<DetermineResponse>("/deadlines/determine", params),
+  });
+
+  // Cases for batch create
+  const { data: cases } = useQuery({
+    queryKey: ["cases"],
+    queryFn: () => api.get<Case[]>("/cases"),
+    enabled: showBatchPanel,
+  });
+
+  // Batch create mutation
+  const batchMutation = useMutation({
+    mutationFn: (params: { caseId: string; deadlines: { title: string; due_date: string; rule_code?: string }[] }) =>
+      api.post(`/cases/${params.caseId}/deadlines/batch`, { deadlines: params.deadlines }),
+    onSuccess: () => {
+      toast.success("Alle Fristen wurden auf die Akte uebernommen");
+      queryClient.invalidateQueries({ queryKey: ["deadlines"] });
+      setShowBatchPanel(false);
+    },
+    onError: () => {
+      toast.error("Fehler beim Erstellen der Fristen");
+    },
+  });
+
+  // Spawns from timeline structure (for condition toggles)
+  const spawns = useMemo(() => {
+    if (!timelineData?.timeline) return [];
+    return extractSpawns(timelineData.timeline);
+  }, [timelineData]);
+
+  // Calculate on type/date/condition change
+  const calculate = useCallback(() => {
+    if (!selectedType || !triggerDate) return;
+    determineMutation.mutate({
+      proceeding_type: selectedType,
+      trigger_event_date: triggerDate,
+      conditions,
+    });
+  }, [selectedType, triggerDate, conditions, determineMutation]);
+
+  // Auto-calculate when date or conditions change
+  const handleDateChange = (date: string) => {
+    setTriggerDate(date);
+    if (selectedType && date) {
+      determineMutation.mutate({
+        proceeding_type: selectedType,
+        trigger_event_date: date,
+        conditions,
+      });
+    }
+  };
+
+  const handleConditionToggle = (spawnId: string) => {
+    const next = { ...conditions, [spawnId]: !conditions[spawnId] };
+    setConditions(next);
+    if (selectedType && triggerDate) {
+      determineMutation.mutate({
+        proceeding_type: selectedType,
+        trigger_event_date: triggerDate,
+        conditions: next,
+      });
+    }
+  };
+
+  const handleTypeSelect = (code: string) => {
+    setSelectedType(code);
+    setConditions({});
+    if (triggerDate) {
+      // Will recalculate once timeline loads
+      determineMutation.reset();
+    }
+  };
+
+  const handleReset = () => {
+    setSelectedType("");
+    setTriggerDate("");
+    setConditions({});
+    setShowBatchPanel(false);
+    determineMutation.reset();
+  };
+
+  // Collect calculated deadlines for batch create
+  const collectDeadlines = (events: TimelineEvent[]): { title: string; due_date: string; rule_code?: string }[] => {
+    const result: { title: string; due_date: string; rule_code?: string }[] = [];
+    for (const ev of events) {
+      if (ev.date && ev.duration_value > 0) {
+        result.push({ title: ev.name, due_date: ev.date, rule_code: ev.rule_code || undefined });
+      }
+      if (ev.children) result.push(...collectDeadlines(ev.children));
+    }
+    return result;
+  };
+
+  const results = determineMutation.data;
+  const selectedPT = proceedingTypes?.find((pt) => pt.code === selectedType);
+
+  return (
+    <div className="space-y-5">
+      {/* Step 1: Proceeding Type Selection */}
+      <div className="rounded-lg border border-neutral-200 bg-white p-5">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-2 text-sm font-medium text-neutral-900">
+            <Scale className="h-4 w-4" />
+            Verfahrensart waehlen
+          </div>
+          {selectedType && (
+            <button
+              onClick={handleReset}
+              className="flex items-center gap-1 text-xs text-neutral-500 hover:text-neutral-700"
+            >
+              <RotateCcw className="h-3 w-3" />
+              Zuruecksetzen
+            </button>
+          )}
+        </div>
+
+        <div className="mt-4 grid grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6">
+          {typesLoading ? (
+            <div className="col-span-full flex justify-center py-4">
+              <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
+            </div>
+          ) : (
+            proceedingTypes?.map((pt) => (
+              <button
+                key={pt.id}
+                onClick={() => handleTypeSelect(pt.code)}
+                className={`rounded-lg border px-3 py-2.5 text-left transition-all ${
+                  selectedType === pt.code
+                    ? "border-neutral-900 bg-neutral-900 text-white shadow-sm"
+                    : "border-neutral-200 bg-white text-neutral-700 hover:border-neutral-400 hover:bg-neutral-50"
+                }`}
+              >
+                <div className="flex items-center gap-1.5">
+                  <div
+                    className="h-2 w-2 rounded-full"
+                    style={{ backgroundColor: pt.default_color }}
+                  />
+                  <span className="text-xs font-semibold">{pt.code}</span>
+                </div>
+                <div className="mt-1 text-xs leading-tight opacity-80">{pt.name}</div>
+              </button>
+            ))
+          )}
+        </div>
+      </div>
+
+      {/* Step 2: Date + Conditions */}
+      {selectedType && (
+        <div className="animate-fade-in rounded-lg border border-neutral-200 bg-white p-5">
+          <div className="flex items-center gap-2 text-sm font-medium text-neutral-900">
+            <Calendar className="h-4 w-4" />
+            Ausloesendes Ereignis
+          </div>
+
+          <div className="mt-4 flex flex-col gap-4 sm:flex-row sm:items-end">
+            <div className="flex-1">
+              <label className="mb-1 block text-xs font-medium text-neutral-500">
+                Datum des {selectedPT?.name || selectedType} (z.B. Klagezustellung)
+              </label>
+              <input
+                type="date"
+                value={triggerDate}
+                onChange={(e) => handleDateChange(e.target.value)}
+                className="w-full rounded-md border border-neutral-200 bg-white px-3 py-2 text-sm text-neutral-900 outline-none transition-colors focus:border-neutral-400 focus:ring-1 focus:ring-neutral-400"
+              />
+            </div>
+
+            {/* Condition toggles */}
+            {spawns.length > 0 && (
+              <div className="flex flex-wrap gap-2">
+                {spawns.map((spawn) => (
+                  <button
+                    key={spawn.id}
+                    onClick={() => handleConditionToggle(spawn.id)}
+                    className={`flex items-center gap-1.5 rounded-full px-3 py-1.5 text-xs font-medium transition-all ${
+                      conditions[spawn.id]
+                        ? "bg-neutral-900 text-white"
+                        : "border border-neutral-300 bg-white text-neutral-600 hover:bg-neutral-50"
+                    }`}
+                  >
+                    <GitBranch className="h-3 w-3" />
+                    {spawn.spawn_label || spawn.name}
+                    {conditions[spawn.id] && <Check className="h-3 w-3" />}
+                  </button>
+                ))}
+              </div>
+            )}
+          </div>
+        </div>
+      )}
+
+      {/* Error */}
+      {determineMutation.isError && (
+        <div className="flex items-center gap-2 rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
+          <AlertTriangle className="h-4 w-4 shrink-0" />
+          Fehler bei der Berechnung. Bitte Eingaben pruefen.
+        </div>
+      )}
+
+      {/* Step 3: Calculated Timeline */}
+      {results && results.timeline && (
+        <div className="animate-fade-in space-y-3">
+          {/* Header */}
+          <div className="flex items-center justify-between">
+            <div>
+              <h3 className="text-sm font-medium text-neutral-900">
+                Verfahrens-Timeline: {results.proceeding_name}
+              </h3>
+              <p className="mt-0.5 text-xs text-neutral-500">
+                {results.total_deadlines} Ereignisse ab{" "}
+                {format(parseISO(results.trigger_event_date), "dd. MMMM yyyy", { locale: de })}
+              </p>
+            </div>
+            <button
+              onClick={() => setShowBatchPanel(!showBatchPanel)}
+              className="flex items-center gap-1.5 rounded-md bg-neutral-900 px-3 py-1.5 text-xs font-medium text-white transition-colors hover:bg-neutral-800"
+            >
+              <CheckCircle2 className="h-3.5 w-3.5" />
+              Alle uebernehmen
+            </button>
+          </div>
+
+          {/* Timeline visualization */}
+          <div className="rounded-lg border border-neutral-200 bg-white">
+            <TimelineTree events={results.timeline} conditions={conditions} depth={0} />
+          </div>
+
+          {/* Batch create panel */}
+          {showBatchPanel && (
+            <div className="animate-fade-in rounded-lg border border-neutral-200 bg-neutral-50 p-4">
+              <div className="flex items-center gap-2 text-sm font-medium text-neutral-900">
+                <FolderOpen className="h-4 w-4" />
+                Fristen auf Akte uebernehmen
+              </div>
+              <div className="mt-3 flex gap-3">
+                <select
+                  value={selectedCaseId}
+                  onChange={(e) => setSelectedCaseId(e.target.value)}
+                  className="flex-1 rounded-md border border-neutral-200 bg-white px-3 py-2 text-sm text-neutral-900 outline-none focus:border-neutral-400"
+                >
+                  <option value="">Akte waehlen...</option>
+                  {cases
+                    ?.filter((c) => c.status !== "closed")
+                    .map((c) => (
+                      <option key={c.id} value={c.id}>
+                        {c.case_number} — {c.title}
+                      </option>
+                    ))}
+                </select>
+                <button
+                  disabled={!selectedCaseId || batchMutation.isPending}
+                  onClick={() => {
+                    const deadlines = collectDeadlines(results.timeline);
+                    if (deadlines.length === 0) return;
+                    batchMutation.mutate({ caseId: selectedCaseId, deadlines });
+                  }}
+                  className="flex items-center gap-1.5 rounded-md bg-neutral-900 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-neutral-800 disabled:cursor-not-allowed disabled:opacity-50"
+                >
+                  {batchMutation.isPending ? (
+                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                  ) : (
+                    <ArrowRight className="h-3.5 w-3.5" />
+                  )}
+                  {batchMutation.isPending ? "Erstelle..." : `${collectDeadlines(results.timeline).length} Fristen erstellen`}
+                </button>
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* Empty state */}
+      {!results && !determineMutation.isPending && selectedType && triggerDate && (
+        <div className="flex items-center justify-center py-8">
+          <Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
+        </div>
+      )}
+
+      {!selectedType && (
+        <div className="flex flex-col items-center rounded-lg border border-dashed border-neutral-300 bg-white px-6 py-12 text-center">
+          <div className="rounded-xl bg-neutral-100 p-3">
+            <Scale className="h-6 w-6 text-neutral-400" />
+          </div>
+          <p className="mt-3 text-sm font-medium text-neutral-700">
+            UPC-Fristenbestimmung
+          </p>
+          <p className="mt-1 max-w-sm text-xs text-neutral-500">
+            Waehlen Sie die Verfahrensart und geben Sie das Datum des ausloesenden Ereignisses ein.
+            Alle Fristen des Verfahrens werden automatisch berechnet.
+          </p>
+        </div>
+      )}
+    </div>
+  );
+}
+
+// --- Timeline Tree Component ---
+
+function TimelineTree({
+  events,
+  conditions,
+  depth,
+}: {
+  events: TimelineEvent[];
+  conditions: Record<string, boolean>;
+  depth: number;
+}) {
+  return (
+    <>
+      {events.map((ev, i) => (
+        <TimelineNode
+          key={ev.id}
+          event={ev}
+          conditions={conditions}
+          depth={depth}
+          isLast={i === events.length - 1}
+        />
+      ))}
+    </>
+  );
+}
+
+function TimelineNode({
+  event: ev,
+  conditions,
+  depth,
+  isLast,
+}: {
+  event: TimelineEvent;
+  conditions: Record<string, boolean>;
+  depth: number;
+  isLast: boolean;
+}) {
+  const [expanded, setExpanded] = useState(true);
+
+  // Skip inactive spawns
+  if (ev.is_spawn && !conditions[ev.id]) return null;
+
+  const hasChildren = ev.children && ev.children.length > 0;
+  const visibleChildren = ev.children?.filter(
+    (c) => !c.is_spawn || conditions[c.id]
+  );
+  const hasVisibleChildren = visibleChildren && visibleChildren.length > 0;
+
+  const urgency = getUrgency(ev.date);
+  const styles = urgencyStyles[urgency];
+  const duration = formatDuration(ev.duration_value, ev.duration_unit);
+  const isConditional = ev.has_condition && ev.condition_rule_id;
+
+  return (
+    <>
+      <div
+        className={`group relative flex gap-3 px-4 py-3 transition-colors hover:bg-neutral-50 ${
+          !isLast && depth === 0 ? "border-b border-neutral-100" : ""
+        }`}
+        style={{ paddingLeft: `${16 + depth * 24}px` }}
+      >
+        {/* Timeline connector */}
+        <div className="flex flex-col items-center pt-1">
+          <div className={`h-3 w-3 shrink-0 rounded-full border-2 border-white shadow-sm ${styles.dot}`} />
+          {!isLast && <div className="mt-1 w-px flex-1 bg-neutral-200" />}
+        </div>
+
+        {/* Content */}
+        <div className="min-w-0 flex-1">
+          <div className="flex flex-col gap-1 sm:flex-row sm:items-start sm:justify-between sm:gap-2">
+            <div className="flex items-center gap-1.5">
+              {hasVisibleChildren && (
+                <button
+                  onClick={() => setExpanded(!expanded)}
+                  className="text-neutral-400 hover:text-neutral-600"
+                >
+                  {expanded ? (
+                    <ChevronDown className="h-3.5 w-3.5" />
+                  ) : (
+                    <ChevronRight className="h-3.5 w-3.5" />
+                  )}
+                </button>
+              )}
+              {ev.is_spawn && (
+                <GitBranch className="h-3.5 w-3.5 text-violet-500" />
+              )}
+              <span className="text-sm font-medium text-neutral-900">{ev.name}</span>
+              {!ev.is_mandatory && (
+                <span className="rounded bg-neutral-100 px-1 py-0.5 text-[10px] text-neutral-500">
+                  optional
+                </span>
+              )}
+            </div>
+
+            {/* Date */}
+            {ev.date && (
+              <div className="flex items-center gap-1.5 shrink-0">
+                {ev.was_adjusted && (
+                  <span className="text-[10px] text-amber-600" title={`Original: ${ev.original_date}`}>
+                    angepasst
+                  </span>
+                )}
+                <span className={`text-sm font-medium tabular-nums ${styles.text}`}>
+                  {format(parseISO(ev.date), "dd.MM.yyyy")}
+                </span>
+              </div>
+            )}
+          </div>
+
+          {/* Meta row */}
+          <div className="mt-0.5 flex flex-wrap items-center gap-x-2 gap-y-0.5 text-xs text-neutral-500">
+            {ev.primary_party && (
+              <span className="flex items-center gap-0.5">
+                {getPartyIcon(ev.primary_party)}
+                {getPartyLabel(ev.primary_party)}
+              </span>
+            )}
+            {ev.event_type && (
+              <>
+                <span className="text-neutral-300">·</span>
+                <span>{getEventTypeLabel(ev.event_type)}</span>
+              </>
+            )}
+            {duration && (
+              <>
+                <span className="text-neutral-300">·</span>
+                <span className="flex items-center gap-0.5">
+                  <Clock className="h-3 w-3" />
+                  {duration}
+                </span>
+              </>
+            )}
+            {ev.rule_code && (
+              <>
+                <span className="text-neutral-300">·</span>
+                <span className="rounded bg-neutral-100 px-1 py-0.5 font-mono text-[10px]">
+                  {ev.rule_code}
+                </span>
+              </>
+            )}
+            {isConditional && (
+              <>
+                <span className="text-neutral-300">·</span>
+                <span className="text-violet-600">
+                  bedingt{ev.alt_rule_code ? ` (${ev.alt_rule_code})` : ""}
+                </span>
+              </>
+            )}
+          </div>
+
+          {/* Notes */}
+          {ev.deadline_notes && (
+            <p className="mt-1 text-xs text-neutral-400 italic">{ev.deadline_notes}</p>
+          )}
+        </div>
+      </div>
+
+      {/* Children */}
+      {expanded && hasVisibleChildren && (
+        <TimelineTree events={visibleChildren!} conditions={conditions} depth={depth + 1} />
+      )}
+    </>
+  );
+}
--- a/frontend/src/components/layout/Sidebar.tsx
+++ b/frontend/src/components/layout/Sidebar.tsx
@@ -11,7 +11,6 @@ import {
  Settings,
  Menu,
  X,
-  Receipt,
 } from "lucide-react";
 import { useState, useEffect } from "react";
 import { usePermissions } from "@/lib/hooks/usePermissions";
@@ -28,7 +27,6 @@ const allNavigation: NavItem[] = [
  { name: "Akten", href: "/cases", icon: FolderOpen },
  { name: "Fristen", href: "/fristen", icon: Clock },
  { name: "Termine", href: "/termine", icon: Calendar },
-  { name: "Abrechnung", href: "/abrechnung", icon: Receipt, permission: "manage_billing" },
  { name: "AI Analyse", href: "/ai/extract", icon: Brain, permission: "ai_extraction" },
  { name: "Einstellungen", href: "/einstellungen", icon: Settings, permission: "manage_settings" },
 ];
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -120,12 +120,76 @@ export interface DeadlineRule {
  rule_code?: string;
  deadline_notes?: string;
  sequence_order: number;
+  condition_rule_id?: string;
+  alt_duration_value?: number;
+  alt_duration_unit?: string;
+  alt_rule_code?: string;
+  is_spawn?: boolean;
+  spawn_label?: string;
 }

 export interface RuleTreeNode extends DeadlineRule {
  children?: RuleTreeNode[];
 }

+// Timeline determination types
+
+export interface TimelineEvent {
+  id: string;
+  code?: string;
+  name: string;
+  description?: string;
+  primary_party?: string;
+  event_type?: string;
+  is_mandatory: boolean;
+  duration_value: number;
+  duration_unit: string;
+  rule_code?: string;
+  deadline_notes?: string;
+  is_spawn: boolean;
+  spawn_label?: string;
+  has_condition: boolean;
+  condition_rule_id?: string;
+  alt_rule_code?: string;
+  alt_duration_value?: number;
+  alt_duration_unit?: string;
+  date?: string;
+  original_date?: string;
+  was_adjusted: boolean;
+  children?: TimelineEvent[];
+}
+
+export interface TimelineResponse {
+  proceeding_type: ProceedingType;
+  timeline: TimelineEvent[];
+}
+
+export interface DetermineRequest {
+  proceeding_type: string;
+  trigger_event_date: string;
+  conditions: Record<string, boolean>;
+}
+
+export interface DetermineResponse {
+  proceeding_type: string;
+  proceeding_name: string;
+  proceeding_color: string;
+  trigger_event_date: string;
+  timeline: TimelineEvent[];
+  total_deadlines: number;
+}
+
+export interface BatchCreateRequest {
+  deadlines: {
+    title: string;
+    due_date: string;
+    original_due_date?: string;
+    rule_id?: string;
+    rule_code?: string;
+    notes?: string;
+  }[];
+}
+
 export interface ProceedingType {
  id: number;
  code: string;
@@ -223,125 +287,6 @@ export const CASE_ASSIGNMENT_ROLE_LABELS: Record<CaseAssignmentRole, string> = {
  viewer: "Einsicht",
 };

-// Time tracking & billing
-
-export interface TimeEntry {
-  id: string;
-  tenant_id: string;
-  case_id: string;
-  user_id: string;
-  date: string;
-  duration_minutes: number;
-  description: string;
-  activity?: string;
-  billable: boolean;
-  billed: boolean;
-  invoice_id?: string;
-  hourly_rate?: number;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface BillingRate {
-  id: string;
-  tenant_id: string;
-  user_id?: string;
-  rate: number;
-  currency: string;
-  valid_from: string;
-  valid_to?: string;
-  created_at: string;
-}
-
-export interface InvoiceItem {
-  description: string;
-  duration_minutes?: number;
-  hourly_rate?: number;
-  amount: number;
-  time_entry_id?: string;
-}
-
-export interface Invoice {
-  id: string;
-  tenant_id: string;
-  case_id: string;
-  invoice_number: string;
-  client_name: string;
-  client_address?: string;
-  items: InvoiceItem[];
-  subtotal: number;
-  tax_rate: number;
-  tax_amount: number;
-  total: number;
-  status: "draft" | "sent" | "paid" | "cancelled";
-  issued_at?: string;
-  due_at?: string;
-  paid_at?: string;
-  notes?: string;
-  created_by: string;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface TimeEntrySummary {
-  group_key: string;
-  total_minutes: number;
-  billable_minutes: number;
-  total_amount: number;
-  entry_count: number;
-}
-
-// Notifications
-export interface Notification {
-  id: string;
-  tenant_id: string;
-  user_id: string;
-  type: string;
-  title: string;
-  body?: string;
-  entity_type?: string;
-  entity_id?: string;
-  sent_at?: string;
-  read_at?: string;
-  created_at: string;
-}
-
-export interface NotificationPreferences {
-  user_id: string;
-  tenant_id: string;
-  deadline_reminder_days: number[];
-  email_enabled: boolean;
-  daily_digest: boolean;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface NotificationListResponse {
-  notifications: Notification[];
-  data: Notification[];
-  total: number;
-}
-
-// Audit log
-export interface AuditLogEntry {
-  id: number;
-  tenant_id: string;
-  user_id?: string;
-  action: string;
-  entity_type: string;
-  entity_id?: string;
-  old_values?: Record<string, unknown>;
-  new_values?: Record<string, unknown>;
-  ip_address?: string;
-  user_agent?: string;
-  created_at: string;
-}
-
-export interface AuditLogResponse {
-  entries: AuditLogEntry[];
-  total: number;
-}
-
 export interface ApiError {
  error: string;
  status: number;