* feat: voucher linking, recovery ops, and salary overrides Adds reversible/correction-style write paths that customers and agents have been asking for, plus per-run salary employee overrides. Invoice → voucher linking - POST /api/invoices/[id]/link-to-voucher and GET /api/invoices/[id]/voucher-candidates - lib/invoices/voucher-matching.ts with full + pg test coverage - LinkVoucherPicker UI in PaymentBookingDialog - pending_operations.operation_type expanded with link_invoice_voucher (medium risk) and a (journal_entry_id, invoice_id) unique guard - MCP: gnubok_find_voucher_candidates_for_invoice and gnubok_link_invoice_to_voucher tools SIE undo - POST /api/import/sie/[id]/undo + undo_sie_import RPC - sie_imports.status gains 'undone' - ImportResultStep surfaces the action; structured error SIE_UNDO_FAILED Edit-recreate journal entries - POST /api/bookkeeping/journal-entries/[id]/edit-recreate - Bookkeeping detail page wires it into the existing edit flow Delete-last-voucher clears IB link - Trigger + pg test ensure deleting the last voucher of a period nulls the opening_balance_journal_entry_id link so a re-import lands cleanly Salary employee overrides - salary_run_employees gains per-run override fields + migration - lib/salary/effective-values.ts centralises resolved values; all payslip, payment, AGI, KU, and booking routes read through it - SalaryOverridePanel on the employee detail page Account classifier - lib/bookkeeping/account-classifier.ts + tests; AddAccountDialog uses it - backfill-import-accounts script updated Misc - toast: minor styling tweak - AGI generate-declaration: respect effective values - structured-errors: new LINK_INVOICE_VOUCHER namespace Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat: add link_invoice_voucher operation type to pending_operations * feat: refactor salary run calculations and update error handling for SIE imports * fix: PR review feedback on voucher linking and SIE recovery pg-real (blocking): - tests/pg/delete-last-voucher-ib: drop posted_at = now() from the seed UPDATE — journal_entries has no posted_at column. - lib/invoices/__tests__/voucher-matching.pg: seed the posted voucher before closing the fiscal period so enforce_period_lock doesn't block the INSERT during setup. voucher-matching error codes and rollback: - Add LINK_VOUCHER_DB_ERROR (HTTP 500) and return it on real invoice UPDATE / payment INSERT failures. Previously these returned LINK_VOUCHER_VOUCHER_NOT_FOUND (404) which the pending-op dispatcher auto-rejects on transient DB errors. - Log rollback failures explicitly so an invoice left in a half-linked state (advanced status, no payment row) surfaces for manual reconciliation instead of disappearing silently. resyncNextPeriodOpeningBalance ordering: - Create the new IB first, relink the period FK, then storno the old IB. Previously the storno ran first; if createJournalEntry failed the next period was left with a reversed IB and nothing to replace it, and executeSIEImport swallows the error as a non-fatal warning. replace_period_opening_balance_link: - Tighten role check to owner/admin (was owner/admin/member). Matches delete_last_voucher and undo_sie_import. Data minimisation: - /api/invoices/[id]/voucher-candidates and the matching MCP tools now project only the invoice and customer fields the matcher reads, instead of returning the full customer row. Schema bounds: - SalaryEmployeeOverrideSchema caps each numeric override at 10 MSEK to catch typos before they reach the ledger or AGI. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(tests): supply user_id when seeding voucher_sequences voucher_sequences.user_id is NOT NULL (per the multi-tenant refactor in 20260330130000). The previous test seed only set company_id / fiscal_period_id / voucher_series, which made the seed fail with a constraint violation on the latest pg-real run. Pass the same userId used elsewhere in the seed helper. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(tests): scope delete-last-voucher RPC assertions inside the tx withUserContext always ROLLBACKs, so any DELETE the RPC performs is discarded when the callback returns. The previous test then queried journal_entries via a fresh getPool() connection that only saw the pre-RPC committed seed state — hence "expected '1' to be '0'". Move every post-RPC assertion (entry count, period FK clear, opening_balances_set flip, audit log entry, sie_imports clear) inside the same withUserContext callback so they observe the uncommitted state before ROLLBACK fires. Also fix the sie_imports INSERT: the column is `filename`, not `file_name`, and `sie_type` is NOT NULL. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(tests): assert against the IB-marker audit row directly DELETE on journal_entries fires two audit_log writes: the generic write_audit_log() trigger row ("Deleted journal_entries record") and the delete_last_voucher RPC's explicit "(was period IB)" entry. Both land at the same statement_timestamp(), so ORDER BY created_at DESC LIMIT 1 returned the trigger row non-deterministically in CI. Switch to a presence check with a LIKE filter on the IB marker so the test verifies what it actually cares about — that the RPC's IB-aware audit row exists. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(db): set company_id on delete_last_voucher audit_log rows 20260528120000_delete_last_voucher_clears_ib_link.sql inserts directly into audit_log without setting company_id. audit_log's SELECT policy filters company_id IN user_company_ids(), so those rows landed with company_id=NULL and were invisible to every reader — only the generic write_audit_log() trigger row remained visible. That broke BFL audit- trail intent: the "(was period IB)" provenance row was never readable. Republish delete_last_voucher with p_company_id populated on both audit_log INSERTs (draft path and posted path). Behavior is otherwise unchanged; the pg-real test for the IB-clear flow now sees the RPC-written marker row as expected. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Emil <emilmattsson14@gmail.com>
241 lines
8.0 KiB
TypeScript
241 lines
8.0 KiB
TypeScript
'use client'
|
|
|
|
import { useEffect, useMemo, useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Skeleton } from '@/components/ui/skeleton'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
|
import { formatCurrency, formatDate } from '@/lib/utils'
|
|
import { Loader2, Search } from 'lucide-react'
|
|
|
|
interface VoucherCandidate {
|
|
journal_entry_id: string
|
|
voucher_series: string | null
|
|
voucher_number: number | null
|
|
entry_date: string
|
|
description: string
|
|
ar_credit_amount: number
|
|
currency: string
|
|
ar_line_currency: string | null
|
|
period_locked: boolean
|
|
confidence: number
|
|
match_reason: string
|
|
}
|
|
|
|
interface LinkVoucherPickerProps {
|
|
invoiceId: string
|
|
invoiceCurrency: string
|
|
onLinked: () => void
|
|
onCancel: () => void
|
|
}
|
|
|
|
function voucherLabel(c: VoucherCandidate): string {
|
|
if (c.voucher_series && c.voucher_number != null) {
|
|
return `${c.voucher_series}-${c.voucher_number}`
|
|
}
|
|
if (c.voucher_number != null) return String(c.voucher_number)
|
|
return c.journal_entry_id.slice(0, 8)
|
|
}
|
|
|
|
function confidenceBadge(confidence: number): {
|
|
variant: 'success' | 'secondary' | 'outline'
|
|
key: 'high' | 'medium' | 'low'
|
|
} {
|
|
if (confidence >= 0.9) return { variant: 'success', key: 'high' }
|
|
if (confidence >= 0.7) return { variant: 'secondary', key: 'medium' }
|
|
return { variant: 'outline', key: 'low' }
|
|
}
|
|
|
|
export default function LinkVoucherPicker({
|
|
invoiceId,
|
|
invoiceCurrency,
|
|
onLinked,
|
|
onCancel,
|
|
}: LinkVoucherPickerProps) {
|
|
const { toast } = useToast()
|
|
const t = useTranslations('invoice_link_voucher')
|
|
|
|
const [candidates, setCandidates] = useState<VoucherCandidate[] | null>(null)
|
|
const [loading, setLoading] = useState(true)
|
|
const [submitting, setSubmitting] = useState(false)
|
|
const [selectedId, setSelectedId] = useState<string | null>(null)
|
|
const [search, setSearch] = useState('')
|
|
|
|
useEffect(() => {
|
|
let cancelled = false
|
|
async function load() {
|
|
setLoading(true)
|
|
try {
|
|
const response = await fetch(`/api/invoices/${invoiceId}/voucher-candidates`)
|
|
if (!response.ok) {
|
|
if (cancelled) return
|
|
setCandidates([])
|
|
return
|
|
}
|
|
const body = await response.json()
|
|
if (cancelled) return
|
|
setCandidates(body?.data?.candidates ?? [])
|
|
} catch {
|
|
if (!cancelled) setCandidates([])
|
|
} finally {
|
|
if (!cancelled) setLoading(false)
|
|
}
|
|
}
|
|
load()
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
}, [invoiceId])
|
|
|
|
const filtered = useMemo(() => {
|
|
if (!candidates) return [] as VoucherCandidate[]
|
|
if (!search.trim()) return candidates
|
|
const needle = search.trim().toLowerCase()
|
|
return candidates.filter((c) => {
|
|
const label = voucherLabel(c).toLowerCase()
|
|
const desc = c.description?.toLowerCase() ?? ''
|
|
return label.includes(needle) || desc.includes(needle)
|
|
})
|
|
}, [candidates, search])
|
|
|
|
const selected = useMemo(
|
|
() => (selectedId ? filtered.find((c) => c.journal_entry_id === selectedId) ?? null : null),
|
|
[filtered, selectedId],
|
|
)
|
|
|
|
const handleConfirm = async () => {
|
|
if (!selected) return
|
|
setSubmitting(true)
|
|
try {
|
|
const response = await fetch(`/api/invoices/${invoiceId}/link-to-voucher`, {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ journal_entry_id: selected.journal_entry_id }),
|
|
})
|
|
if (!response.ok) {
|
|
const body = await response.json().catch(() => null)
|
|
toast({
|
|
title: t('link_failed_title'),
|
|
description: getErrorMessage(body, {
|
|
context: 'invoice',
|
|
statusCode: response.status,
|
|
}),
|
|
variant: 'destructive',
|
|
})
|
|
return
|
|
}
|
|
toast({ title: t('link_success_title'), variant: 'success' })
|
|
onLinked()
|
|
} catch (err) {
|
|
toast({
|
|
title: t('link_failed_title'),
|
|
description: getErrorMessage(err, { context: 'invoice' }),
|
|
variant: 'destructive',
|
|
})
|
|
} finally {
|
|
setSubmitting(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">{t('intro')}</p>
|
|
|
|
<div className="relative">
|
|
<Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
|
|
<Input
|
|
value={search}
|
|
onChange={(e) => setSearch(e.target.value)}
|
|
placeholder={t('search_placeholder')}
|
|
className="pl-9"
|
|
/>
|
|
</div>
|
|
|
|
{loading ? (
|
|
<div className="space-y-2">
|
|
<Skeleton className="h-16 w-full" />
|
|
<Skeleton className="h-16 w-full" />
|
|
<Skeleton className="h-16 w-full" />
|
|
</div>
|
|
) : filtered.length === 0 ? (
|
|
<div className="rounded-lg border border-dashed bg-muted/30 p-6 text-center">
|
|
<p className="text-sm font-medium">{t('empty_title')}</p>
|
|
<p className="mt-1 text-xs text-muted-foreground">{t('empty_description')}</p>
|
|
</div>
|
|
) : (
|
|
<ul className="space-y-2 max-h-[320px] overflow-y-auto">
|
|
{filtered.map((c) => {
|
|
const badge = confidenceBadge(c.confidence)
|
|
const isSelected = selectedId === c.journal_entry_id
|
|
return (
|
|
<li key={c.journal_entry_id}>
|
|
<button
|
|
type="button"
|
|
onClick={() => setSelectedId(c.journal_entry_id)}
|
|
className={`w-full rounded-lg border bg-card p-3 text-left transition-colors hover:bg-secondary/60 ${
|
|
isSelected ? 'border-foreground' : 'border-border'
|
|
}`}
|
|
>
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="min-w-0 flex-1 space-y-1">
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
<span className="text-sm font-medium tabular-nums">
|
|
{voucherLabel(c)}
|
|
</span>
|
|
<span className="text-xs tabular-nums text-muted-foreground">
|
|
{formatDate(c.entry_date)}
|
|
</span>
|
|
<Badge variant={badge.variant}>{t(`confidence_${badge.key}`)}</Badge>
|
|
{c.period_locked && (
|
|
<Badge variant="outline">{t('period_locked')}</Badge>
|
|
)}
|
|
</div>
|
|
<p className="truncate text-xs text-muted-foreground">
|
|
{c.match_reason || c.description}
|
|
</p>
|
|
</div>
|
|
<div className="shrink-0 text-right">
|
|
<p className="text-sm font-medium tabular-nums">
|
|
{formatCurrency(c.ar_credit_amount, invoiceCurrency)}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</button>
|
|
</li>
|
|
)
|
|
})}
|
|
</ul>
|
|
)}
|
|
|
|
{selected && (
|
|
<div className="rounded-lg border bg-secondary/40 p-3">
|
|
<p className="text-sm">
|
|
{t('confirmation', {
|
|
voucher: voucherLabel(selected),
|
|
amount: formatCurrency(selected.ar_credit_amount, invoiceCurrency),
|
|
})}
|
|
</p>
|
|
<p className="mt-1 text-xs text-muted-foreground">{t('no_new_je_note')}</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="flex flex-col-reverse gap-2 sm:flex-row sm:justify-end">
|
|
<Button variant="outline" onClick={onCancel} disabled={submitting} className="min-h-11">
|
|
{t('cancel')}
|
|
</Button>
|
|
<Button
|
|
onClick={handleConfirm}
|
|
disabled={!selected || submitting}
|
|
className="min-h-11"
|
|
>
|
|
{submitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
|
{t('confirm')}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|