feat: voucher linking, recovery ops, and salary overrides (#591)
* 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>
This commit is contained in:
Jakob Wennberg
co-authored by
Claude Opus 4.7
Emil
Claude Opus 4.7
Emil
parent
cb7eac90b1
commit
ccdfed5fea
@@ -16,6 +16,7 @@ import { Textarea } from '@/components/ui/textarea'
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
||||
import { Loader2, AlertTriangle } from 'lucide-react'
|
||||
import { isStandardBASAccount } from '@/lib/bookkeeping/bas-reference'
|
||||
import { classifyAccount } from '@/lib/bookkeeping/account-classifier'
|
||||
import type { BASAccount } from '@/types'
|
||||
|
||||
interface AddAccountDialogProps {
|
||||
@@ -26,27 +27,6 @@ interface AddAccountDialogProps {
|
||||
initialAccountName?: string
|
||||
}
|
||||
|
||||
function deriveAccountType(accountNumber: string): { type: string; balance: string } {
|
||||
const cls = parseInt(accountNumber[0])
|
||||
switch (cls) {
|
||||
case 1: return { type: 'asset', balance: 'debit' }
|
||||
case 2: {
|
||||
const group = parseInt(accountNumber.substring(0, 2))
|
||||
if (group <= 20) return { type: 'equity', balance: 'credit' }
|
||||
return { type: 'liability', balance: 'credit' }
|
||||
}
|
||||
case 3: return { type: 'revenue', balance: 'credit' }
|
||||
case 4: case 5: case 6: case 7: return { type: 'expense', balance: 'debit' }
|
||||
case 8: {
|
||||
const group = parseInt(accountNumber.substring(0, 2))
|
||||
if (group >= 83 && group <= 83) return { type: 'revenue', balance: 'credit' }
|
||||
if (group >= 84 && group <= 84) return { type: 'expense', balance: 'debit' }
|
||||
return { type: 'expense', balance: 'debit' }
|
||||
}
|
||||
default: return { type: 'expense', balance: 'debit' }
|
||||
}
|
||||
}
|
||||
|
||||
export function AddAccountDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
@@ -73,12 +53,12 @@ export function AddAccountDialog({
|
||||
setAccountName(initialAccountName ?? '')
|
||||
setError('')
|
||||
if (num.length === 4) {
|
||||
setNormalBalance(deriveAccountType(num).balance as 'debit' | 'credit')
|
||||
setNormalBalance(classifyAccount(num).normal_balance)
|
||||
}
|
||||
}, [open, initialAccountNumber, initialAccountName])
|
||||
|
||||
const isBASMatch = accountNumber.length === 4 && isStandardBASAccount(accountNumber)
|
||||
const derived = accountNumber.length === 4 ? deriveAccountType(accountNumber) : null
|
||||
const derived = accountNumber.length === 4 ? classifyAccount(accountNumber) : null
|
||||
|
||||
async function handleCreate() {
|
||||
setError('')
|
||||
@@ -101,7 +81,7 @@ export function AddAccountDialog({
|
||||
body: JSON.stringify({
|
||||
account_number: accountNumber,
|
||||
account_name: accountName.trim(),
|
||||
account_type: derived?.type || 'expense',
|
||||
account_type: derived?.account_type || 'expense',
|
||||
normal_balance: normalBalance,
|
||||
description: description || null,
|
||||
default_vat_code: defaultVatCode || null,
|
||||
@@ -160,8 +140,7 @@ export function AddAccountDialog({
|
||||
const v = e.target.value.replace(/\D/g, '').slice(0, 4)
|
||||
setAccountNumber(v)
|
||||
if (v.length === 4) {
|
||||
const d = deriveAccountType(v)
|
||||
setNormalBalance(d.balance as 'debit' | 'credit')
|
||||
setNormalBalance(classifyAccount(v).normal_balance)
|
||||
}
|
||||
}}
|
||||
placeholder="T.ex. 1935"
|
||||
@@ -187,7 +166,12 @@ export function AddAccountDialog({
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Auto-detekterad typ:{' '}
|
||||
<span className="font-medium">
|
||||
{derived.type === 'asset' ? 'Tillgång' : derived.type === 'liability' ? 'Skuld' : derived.type === 'equity' ? 'Eget kapital' : derived.type === 'revenue' ? 'Intäkt' : 'Kostnad'}
|
||||
{derived.account_type === 'asset' ? 'Tillgång'
|
||||
: derived.account_type === 'liability' ? 'Skuld'
|
||||
: derived.account_type === 'equity' ? 'Eget kapital'
|
||||
: derived.account_type === 'untaxed_reserves' ? 'Obeskattade reserver'
|
||||
: derived.account_type === 'revenue' ? 'Intäkt'
|
||||
: 'Kostnad'}
|
||||
</span>
|
||||
</p>
|
||||
)}
|
||||
|
||||
@@ -45,12 +45,8 @@ export default function ChartOfAccountsManager() {
|
||||
const t = useTranslations('chart_of_accounts')
|
||||
|
||||
const classLabel = (cls: number): string => {
|
||||
const key = `class_${cls}` as const
|
||||
try {
|
||||
return t(key)
|
||||
} catch {
|
||||
return ''
|
||||
}
|
||||
if (cls < 1 || cls > 8) return ''
|
||||
return t(`class_${cls}` as const)
|
||||
}
|
||||
|
||||
const typeLabel = (type: string): string => {
|
||||
|
||||
@@ -12,15 +12,33 @@ import {
|
||||
ExternalLink,
|
||||
RotateCcw,
|
||||
Info,
|
||||
Undo2,
|
||||
} from 'lucide-react'
|
||||
import {
|
||||
DestructiveConfirmDialog,
|
||||
useDestructiveConfirm,
|
||||
} from '@/components/ui/destructive-confirm-dialog'
|
||||
import type { ImportResult } from '@/lib/import/types'
|
||||
|
||||
interface ImportResultStepProps {
|
||||
result: ImportResult
|
||||
onNewImport: () => void
|
||||
onUndo?: (importId: string) => Promise<void> | void
|
||||
}
|
||||
|
||||
export default function ImportResultStep({ result, onNewImport }: ImportResultStepProps) {
|
||||
export default function ImportResultStep({ result, onNewImport, onUndo }: ImportResultStepProps) {
|
||||
const { dialogProps, confirm } = useDestructiveConfirm()
|
||||
|
||||
const handleUndoClick = async () => {
|
||||
if (!result.importId || !onUndo) return
|
||||
const ok = await confirm({
|
||||
title: 'Ångra hela importen?',
|
||||
description: `Detta raderar ${result.journalEntriesCreated} verifikation${result.journalEntriesCreated === 1 ? '' : 'er'} och rensar ingående balanser från den här importen. Bifogade dokument blir okopplade men finns kvar.`,
|
||||
confirmLabel: 'Ångra import',
|
||||
})
|
||||
if (!ok) return
|
||||
await onUndo(result.importId)
|
||||
}
|
||||
const hasErrors = result.errors.length > 0
|
||||
const skipped = result.details?.skippedVouchers
|
||||
|
||||
@@ -57,6 +75,38 @@ export default function ImportResultStep({ result, onNewImport }: ImportResultSt
|
||||
</CardHeader>
|
||||
</Card>
|
||||
|
||||
{/* IB resync notice (prior-year backfill) */}
|
||||
{result.success && result.nextPeriodIBResync && (
|
||||
<Card className="border-success/50">
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center gap-2 text-base">
|
||||
<CheckCircle className="h-5 w-5 text-success" />
|
||||
Ingående balanser synkades om
|
||||
</CardTitle>
|
||||
<CardDescription>
|
||||
Eftersom du importerade ett tidigare räkenskapsår uppdaterades ingående balanser för{' '}
|
||||
<span className="font-medium">{result.nextPeriodIBResync.nextPeriodName}</span>{' '}
|
||||
automatiskt (gammal IB makulerad, ny IB skapad från utgående balans).
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{result.success && result.nextPeriodIBResyncSkipped && (
|
||||
<Card className="border-warning/50">
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center gap-2 text-base text-warning">
|
||||
<AlertCircle className="h-5 w-5" />
|
||||
Ingående balanser för {result.nextPeriodIBResyncSkipped.nextPeriodName} kunde inte synkas
|
||||
</CardTitle>
|
||||
<CardDescription>
|
||||
Nästa räkenskapsår är låst eller stängt. Lås upp perioden och kör importen igen om du
|
||||
vill att ingående balanser ska uppdateras automatiskt.
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{/* Statistics */}
|
||||
{result.success && (
|
||||
<div className="grid grid-cols-2 gap-4 md:grid-cols-3">
|
||||
@@ -250,10 +300,18 @@ export default function ImportResultStep({ result, onNewImport }: ImportResultSt
|
||||
|
||||
{/* Actions */}
|
||||
<div className="flex flex-col-reverse gap-3 sm:flex-row sm:justify-between">
|
||||
<Button variant="outline" className="min-h-11" onClick={onNewImport}>
|
||||
<RotateCcw className="mr-2 h-4 w-4" />
|
||||
Ny import
|
||||
</Button>
|
||||
<div className="flex flex-col gap-2 sm:flex-row">
|
||||
<Button variant="outline" className="min-h-11" onClick={onNewImport}>
|
||||
<RotateCcw className="mr-2 h-4 w-4" />
|
||||
Ny import
|
||||
</Button>
|
||||
{result.success && result.importId && onUndo && (
|
||||
<Button variant="outline" className="min-h-11 text-destructive hover:text-destructive" onClick={handleUndoClick}>
|
||||
<Undo2 className="mr-2 h-4 w-4" />
|
||||
Ångra import
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col gap-2 sm:flex-row">
|
||||
{result.success && (
|
||||
<>
|
||||
@@ -273,6 +331,8 @@ export default function ImportResultStep({ result, onNewImport }: ImportResultSt
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DestructiveConfirmDialog {...dialogProps} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
'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>
|
||||
)
|
||||
}
|
||||
@@ -15,8 +15,10 @@ import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
||||
import LinkVoucherPicker from '@/components/invoices/LinkVoucherPicker'
|
||||
import { proposePaymentLines } from '@/lib/bookkeeping/propose-payment-lines'
|
||||
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import { formatCurrency, formatDate } from '@/lib/utils'
|
||||
@@ -77,12 +79,14 @@ export default function PaymentBookingDialog({
|
||||
const [isSubmitting, setIsSubmitting] = useState(false)
|
||||
const [isInitialized, setIsInitialized] = useState(false)
|
||||
const [duplicateCandidates, setDuplicateCandidates] = useState<DuplicateCandidate[] | null>(null)
|
||||
const [tab, setTab] = useState<'new' | 'existing'>('new')
|
||||
|
||||
// Load accounts and settings when dialog opens
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
setIsInitialized(false)
|
||||
setDuplicateCandidates(null)
|
||||
setTab('new')
|
||||
return
|
||||
}
|
||||
|
||||
@@ -314,12 +318,30 @@ export default function PaymentBookingDialog({
|
||||
})}
|
||||
</ul>
|
||||
</div>
|
||||
) : !isInitialized ? (
|
||||
<div className="flex items-center justify-center py-12">
|
||||
<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
<Tabs value={tab} onValueChange={(v) => setTab(v as 'new' | 'existing')}>
|
||||
<TabsList className="grid w-full grid-cols-2">
|
||||
<TabsTrigger value="new">{t('tab_new_payment')}</TabsTrigger>
|
||||
<TabsTrigger value="existing">{t('tab_existing_voucher')}</TabsTrigger>
|
||||
</TabsList>
|
||||
<TabsContent value="existing" className="mt-4">
|
||||
<LinkVoucherPicker
|
||||
invoiceId={invoice.id}
|
||||
invoiceCurrency={invoice.currency}
|
||||
onLinked={() => {
|
||||
onOpenChange(false)
|
||||
onSuccess()
|
||||
}}
|
||||
onCancel={() => setTab('new')}
|
||||
/>
|
||||
</TabsContent>
|
||||
<TabsContent value="new" className="mt-4">
|
||||
{!isInitialized ? (
|
||||
<div className="flex items-center justify-center py-12">
|
||||
<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
{/* Payment date */}
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="payment-date">{t('payment_date_label')}</Label>
|
||||
@@ -473,32 +495,37 @@ export default function PaymentBookingDialog({
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
)}
|
||||
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => onOpenChange(false)} disabled={isSubmitting} className="w-full sm:w-auto min-h-11">
|
||||
{t('cancel')}
|
||||
</Button>
|
||||
{duplicateCandidates && duplicateCandidates.length > 0 ? (
|
||||
<Button
|
||||
onClick={handleForceSubmit}
|
||||
disabled={!isBalanced || isSubmitting}
|
||||
className="w-full sm:w-auto min-h-11"
|
||||
>
|
||||
{isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('book_anyway')}
|
||||
{(duplicateCandidates && duplicateCandidates.length > 0) || tab === 'new' ? (
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => onOpenChange(false)} disabled={isSubmitting} className="w-full sm:w-auto min-h-11">
|
||||
{t('cancel')}
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
onClick={handleSubmit}
|
||||
disabled={!isBalanced || isSubmitting || !isInitialized}
|
||||
className="w-full sm:w-auto min-h-11"
|
||||
>
|
||||
{isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('confirm_and_book')}
|
||||
</Button>
|
||||
)}
|
||||
</DialogFooter>
|
||||
{duplicateCandidates && duplicateCandidates.length > 0 ? (
|
||||
<Button
|
||||
onClick={handleForceSubmit}
|
||||
disabled={!isBalanced || isSubmitting}
|
||||
className="w-full sm:w-auto min-h-11"
|
||||
>
|
||||
{isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('book_anyway')}
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
onClick={handleSubmit}
|
||||
disabled={!isBalanced || isSubmitting || !isInitialized}
|
||||
className="w-full sm:w-auto min-h-11"
|
||||
>
|
||||
{isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('confirm_and_book')}
|
||||
</Button>
|
||||
)}
|
||||
</DialogFooter>
|
||||
) : null}
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import { Settings2, Loader2 } from 'lucide-react'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { formatCurrency } from '@/lib/utils'
|
||||
|
||||
interface SalaryOverridePanelProps {
|
||||
runId: string
|
||||
employeeId: string
|
||||
taxWithheld: number
|
||||
taxOverride: number | null
|
||||
avgifterAmount: number
|
||||
avgifterOverride: number | null
|
||||
avgifterBasis: number
|
||||
avgifterBasisOverride: number | null
|
||||
reason: string | null
|
||||
onSaved: () => void
|
||||
disabled?: boolean
|
||||
}
|
||||
|
||||
function num(v: string): number | null {
|
||||
const trimmed = v.trim()
|
||||
if (!trimmed) return null
|
||||
const n = Number(trimmed.replace(',', '.'))
|
||||
return Number.isFinite(n) ? n : null
|
||||
}
|
||||
|
||||
export function SalaryOverridePanel(props: SalaryOverridePanelProps) {
|
||||
const { toast } = useToast()
|
||||
const [expanded, setExpanded] = useState(
|
||||
props.taxOverride !== null ||
|
||||
props.avgifterOverride !== null ||
|
||||
props.avgifterBasisOverride !== null,
|
||||
)
|
||||
const [taxStr, setTaxStr] = useState(props.taxOverride !== null ? String(props.taxOverride) : '')
|
||||
const [avgStr, setAvgStr] = useState(
|
||||
props.avgifterOverride !== null ? String(props.avgifterOverride) : '',
|
||||
)
|
||||
const [basisStr, setBasisStr] = useState(
|
||||
props.avgifterBasisOverride !== null ? String(props.avgifterBasisOverride) : '',
|
||||
)
|
||||
const [reason, setReason] = useState(props.reason ?? '')
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
const hasOverride =
|
||||
props.taxOverride !== null ||
|
||||
props.avgifterOverride !== null ||
|
||||
props.avgifterBasisOverride !== null
|
||||
|
||||
async function handleSave() {
|
||||
setSaving(true)
|
||||
try {
|
||||
const body = {
|
||||
tax_withheld_override: num(taxStr),
|
||||
avgifter_amount_override: num(avgStr),
|
||||
avgifter_basis_override: num(basisStr),
|
||||
reason: reason.trim() || null,
|
||||
}
|
||||
const res = await fetch(`/api/salary/runs/${props.runId}/employees/${props.employeeId}`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
})
|
||||
const data = await res.json()
|
||||
if (!res.ok) {
|
||||
toast({
|
||||
title: 'Kunde inte spara justering',
|
||||
description: typeof data?.error === 'string' ? data.error : 'Okänt fel',
|
||||
variant: 'destructive',
|
||||
})
|
||||
return
|
||||
}
|
||||
toast({ title: 'Justering sparad' })
|
||||
props.onSaved()
|
||||
} catch (err) {
|
||||
toast({
|
||||
title: 'Kunde inte spara justering',
|
||||
description: err instanceof Error ? err.message : 'Okänt fel',
|
||||
variant: 'destructive',
|
||||
})
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
async function handleClear() {
|
||||
setSaving(true)
|
||||
try {
|
||||
const res = await fetch(`/api/salary/runs/${props.runId}/employees/${props.employeeId}`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
tax_withheld_override: null,
|
||||
avgifter_amount_override: null,
|
||||
avgifter_basis_override: null,
|
||||
reason: null,
|
||||
}),
|
||||
})
|
||||
if (!res.ok) {
|
||||
const data = await res.json()
|
||||
toast({
|
||||
title: 'Kunde inte rensa justering',
|
||||
description: typeof data?.error === 'string' ? data.error : 'Okänt fel',
|
||||
variant: 'destructive',
|
||||
})
|
||||
return
|
||||
}
|
||||
setTaxStr('')
|
||||
setAvgStr('')
|
||||
setBasisStr('')
|
||||
setReason('')
|
||||
toast({ title: 'Justering rensad' })
|
||||
props.onSaved()
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader className="flex flex-row items-center justify-between space-y-0">
|
||||
<div className="flex items-center gap-2">
|
||||
<CardTitle className="text-base">Avancerat läge</CardTitle>
|
||||
{hasOverride && <Badge variant="warning">Justerat</Badge>}
|
||||
</div>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => setExpanded((v) => !v)}
|
||||
disabled={props.disabled}
|
||||
>
|
||||
<Settings2 className="mr-1.5 h-3.5 w-3.5" />
|
||||
{expanded ? 'Dölj' : 'Visa'}
|
||||
</Button>
|
||||
</CardHeader>
|
||||
{expanded && (
|
||||
<CardContent className="space-y-4">
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Justera skatteavdrag eller arbetsgivaravgift för den här anställde — t.ex. för FoU-avdrag eller
|
||||
jämkning. Justerade värden används vid bokföring och AGI-rapportering. Endast tillåtet i
|
||||
granskningsläge.
|
||||
</p>
|
||||
|
||||
<div className="grid gap-4 sm:grid-cols-3">
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="tax_override" className="text-xs">
|
||||
Skatteavdrag (kr)
|
||||
</Label>
|
||||
<Input
|
||||
id="tax_override"
|
||||
inputMode="decimal"
|
||||
placeholder={String(props.taxWithheld)}
|
||||
value={taxStr}
|
||||
onChange={(e) => setTaxStr(e.target.value)}
|
||||
disabled={props.disabled || saving}
|
||||
className="tabular-nums"
|
||||
/>
|
||||
<p className="text-[11px] text-muted-foreground">
|
||||
Beräknat: <span className="tabular-nums">{formatCurrency(props.taxWithheld)}</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="avgifter_override" className="text-xs">
|
||||
Arbetsgivaravgifter (kr)
|
||||
</Label>
|
||||
<Input
|
||||
id="avgifter_override"
|
||||
inputMode="decimal"
|
||||
placeholder={String(props.avgifterAmount)}
|
||||
value={avgStr}
|
||||
onChange={(e) => setAvgStr(e.target.value)}
|
||||
disabled={props.disabled || saving}
|
||||
className="tabular-nums"
|
||||
/>
|
||||
<p className="text-[11px] text-muted-foreground">
|
||||
Beräknat: <span className="tabular-nums">{formatCurrency(props.avgifterAmount)}</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="avgifter_basis_override" className="text-xs">
|
||||
Avgiftsunderlag (kr)
|
||||
</Label>
|
||||
<Input
|
||||
id="avgifter_basis_override"
|
||||
inputMode="decimal"
|
||||
placeholder={String(props.avgifterBasis)}
|
||||
value={basisStr}
|
||||
onChange={(e) => setBasisStr(e.target.value)}
|
||||
disabled={props.disabled || saving}
|
||||
className="tabular-nums"
|
||||
/>
|
||||
<p className="text-[11px] text-muted-foreground">
|
||||
Beräknat: <span className="tabular-nums">{formatCurrency(props.avgifterBasis)}</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="override_reason" className="text-xs">
|
||||
Anledning (krävs vid justering)
|
||||
</Label>
|
||||
<Textarea
|
||||
id="override_reason"
|
||||
rows={2}
|
||||
placeholder="T.ex. FoU-avdrag 10 % på arbetsgivaravgifter, jämkning enligt beslut från Skatteverket"
|
||||
value={reason}
|
||||
onChange={(e) => setReason(e.target.value)}
|
||||
disabled={props.disabled || saving}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<Button onClick={handleSave} disabled={props.disabled || saving}>
|
||||
{saving && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
||||
Spara justering
|
||||
</Button>
|
||||
{hasOverride && (
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={handleClear}
|
||||
disabled={props.disabled || saving}
|
||||
>
|
||||
Rensa justering
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</CardContent>
|
||||
)}
|
||||
</Card>
|
||||
)
|
||||
}
|
||||
@@ -15,7 +15,7 @@ const ToastViewport = React.forwardRef<
|
||||
<ToastPrimitives.Viewport
|
||||
ref={ref}
|
||||
className={cn(
|
||||
"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
|
||||
"fixed top-0 z-[100] flex max-h-screen w-full flex-col p-4 sm:top-4 sm:right-4 sm:bottom-auto sm:flex-col md:max-w-[420px]",
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
@@ -24,7 +24,7 @@ const ToastViewport = React.forwardRef<
|
||||
ToastViewport.displayName = ToastPrimitives.Viewport.displayName
|
||||
|
||||
const toastVariants = cva(
|
||||
"group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
|
||||
"group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full",
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
|
||||
Reference in New Issue
Block a user