5ac560ce41
* fix(bookkeeping): refresh correction line description on account change When editing an ändringsverifikation, CorrectionEntryDialog pre-filled each line's description from the original entry but never re-derived it when the user changed the account, so a description carried over from the old account (e.g. 2393 "Lån från närstående personer, långfristig del") stayed stale on the newly chosen account (e.g. 2893, the kortfristig account). The regular JournalEntryForm already auto-fills on account change; this mirrors it. The refresh is guarded: it only overwrites the description when it is empty or still equals the previously selected account's name, so a memo the user typed themselves is preserved. Logic is extracted into a pure, unit-tested helper. Note: the wrong text on an already-posted correction cannot be repaired (line descriptions of posted verifikat are immutable per BFL / migration 017); this prevents recurrence on future corrections. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(deadlines): generate tax deadlines for the installed base Automatic tax deadlines only regenerated when a tax-relevant settings field changed value (didTaxFieldsChange). Companies fill those fields once at onboarding, so a later save changed nothing and generated nothing; the annual cron was the only unconditional trigger. As a result only ~5 of ~776 real companies had any system deadlines, and the /deadlines empty state told users to "check the tax settings" that were already complete. - Settings save now also regenerates when the company has zero system deadlines yet (safe first-time backfill; cannot reset is_completed/status). Decision extracted into shouldRegenerateTaxDeadlines() with tests. - The empty-state banner gets a "Generera nu" action wired to the existing /api/tax-deadlines/generate route (previously it had no caller). New sv/en strings. - generateNewYearDeadlines (annual cron) paginates company_settings via fetchAllRows: a plain .select() silently caps at 1000 rows, leaving companies beyond the cap without next-year deadlines. - scripts/backfill-tax-deadlines.ts: one-off that reruns the real generator for non-sandbox companies with zero system deadlines. Known gap (follow-up): moms_period='yearly' has no deadline config, so annual VAT filers get no momsdeklaration deadline yet. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(deadlines): address review feedback + fix settings-route test - settings/route.ts: fail safe when the system-deadline count query errors. A null count on error was treated as 0, which would trigger a delete+regenerate and reset is_completed/status on a transient failure; now a count error keeps the self-heal off (CodeRabbit, Major). - Update app/api/settings/__tests__/route.test.ts (added on main via the withRouteContext refactor) for the extra deadline-count query and the new shouldRegenerateTaxDeadlines export; add self-heal / no-regen cases. - Soften the "no deadlines created" copy: zero generated rows can also mean no applicable obligations (or the moms_yearly gap), not just incomplete settings (CodeRabbit, Minor). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
300 lines
11 KiB
TypeScript
300 lines
11 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect } from 'react'
|
|
import { useRouter } from 'next/navigation'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
DialogFooter,
|
|
} from '@/components/ui/dialog'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Input } from '@/components/ui/input'
|
|
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
|
import CorrectionPreview from '@/components/bookkeeping/CorrectionPreview'
|
|
import { nextLineDescriptionForAccountChange } from '@/components/bookkeeping/correction-line-description'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
|
import { Plus, Trash2 } from 'lucide-react'
|
|
import { formatDate } from '@/lib/utils'
|
|
import { formatVoucher } from '@/lib/bookkeeping/voucher-series-resolver'
|
|
import type { JournalEntry, JournalEntryLine, BASAccount } from '@/types'
|
|
|
|
interface CorrectionLine {
|
|
account_number: string
|
|
debit_amount: string
|
|
credit_amount: string
|
|
line_description: string
|
|
}
|
|
|
|
interface Props {
|
|
entry: JournalEntry
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
onCorrected: () => void
|
|
}
|
|
|
|
export default function CorrectionEntryDialog({ entry, open, onOpenChange, onCorrected }: Props) {
|
|
const { toast } = useToast()
|
|
const router = useRouter()
|
|
const [accounts, setAccounts] = useState<BASAccount[]>([])
|
|
const [lines, setLines] = useState<CorrectionLine[]>([])
|
|
const [isSubmitting, setIsSubmitting] = useState(false)
|
|
|
|
const originalLines = ((entry.lines || []) as JournalEntryLine[])
|
|
.slice()
|
|
.sort((a, b) => a.sort_order - b.sort_order)
|
|
|
|
useEffect(() => {
|
|
if (open) {
|
|
// Pre-fill with original entry's lines
|
|
setLines(
|
|
originalLines.map((l) => ({
|
|
account_number: l.account_number,
|
|
debit_amount: Number(l.debit_amount) > 0 ? String(Number(l.debit_amount)) : '',
|
|
credit_amount: Number(l.credit_amount) > 0 ? String(Number(l.credit_amount)) : '',
|
|
line_description: l.line_description || '',
|
|
}))
|
|
)
|
|
fetchAccounts()
|
|
}
|
|
}, [open, entry.id]) // eslint-disable-line react-hooks/exhaustive-deps
|
|
|
|
async function fetchAccounts() {
|
|
try {
|
|
const res = await fetch('/api/bookkeeping/accounts')
|
|
const { data } = await res.json()
|
|
setAccounts(data || [])
|
|
} catch {
|
|
// Accounts will be empty: user can still type account numbers manually
|
|
}
|
|
}
|
|
|
|
const updateLine = (index: number, field: keyof CorrectionLine, value: string) => {
|
|
setLines((prev) =>
|
|
prev.map((l, i) => {
|
|
if (i !== index) return l
|
|
const next = { ...l, [field]: value }
|
|
// When the account changes, refresh the auto-filled description to the
|
|
// new account's name. Without this, a description carried over from the
|
|
// original entry (e.g. 2393 "Lån från närstående personer, långfristig
|
|
// del") stays stale on the newly chosen account (e.g. 2893, kortfristig).
|
|
if (field === 'account_number' && value) {
|
|
next.line_description = nextLineDescriptionForAccountChange(
|
|
l.line_description,
|
|
l.account_number,
|
|
value,
|
|
accounts,
|
|
)
|
|
}
|
|
return next
|
|
})
|
|
)
|
|
}
|
|
|
|
const addLine = () => {
|
|
setLines((prev) => [...prev, { account_number: '', debit_amount: '', credit_amount: '', line_description: '' }])
|
|
}
|
|
|
|
const removeLine = (index: number) => {
|
|
setLines((prev) => prev.filter((_, i) => i !== index))
|
|
}
|
|
|
|
const totalDebit = lines.reduce((sum, l) => sum + (parseFloat(l.debit_amount) || 0), 0)
|
|
const totalCredit = lines.reduce((sum, l) => sum + (parseFloat(l.credit_amount) || 0), 0)
|
|
const roundedDebit = Math.round(totalDebit * 100) / 100
|
|
const roundedCredit = Math.round(totalCredit * 100) / 100
|
|
const isBalanced = roundedDebit === roundedCredit && roundedDebit > 0
|
|
|
|
const hasValidLines = lines.length >= 2 && lines.every((l) => l.account_number.length === 4)
|
|
|
|
async function handleSubmit() {
|
|
if (!isBalanced || !hasValidLines) return
|
|
|
|
setIsSubmitting(true)
|
|
try {
|
|
const apiLines = lines.map((l) => ({
|
|
account_number: l.account_number,
|
|
debit_amount: parseFloat(l.debit_amount) || 0,
|
|
credit_amount: parseFloat(l.credit_amount) || 0,
|
|
line_description: l.line_description || undefined,
|
|
}))
|
|
|
|
const res = await fetch(`/api/bookkeeping/journal-entries/${entry.id}/correct`, {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ lines: apiLines }),
|
|
})
|
|
|
|
const result = await res.json()
|
|
|
|
if (!res.ok) {
|
|
const error = new Error('Failed to create correction') as Error & { body?: unknown; status?: number }
|
|
error.body = result
|
|
error.status = res.status
|
|
throw error
|
|
}
|
|
|
|
const correctedId = result.data?.corrected?.id
|
|
|
|
toast({
|
|
title: 'Ändringsverifikation skapad',
|
|
description: 'Storno och rättelse har bokförts.',
|
|
action: correctedId ? (
|
|
<Button variant="outline" size="sm" onClick={() => router.push(`/bookkeeping/${correctedId}`)}>
|
|
Visa rättelsen
|
|
</Button>
|
|
) : undefined,
|
|
})
|
|
onOpenChange(false)
|
|
onCorrected()
|
|
} catch (err) {
|
|
const anyErr = err as { body?: unknown; status?: number }
|
|
toast({
|
|
title: 'Kunde inte spara ändringsverifikation',
|
|
description: getErrorMessage(anyErr.body ?? err, { context: 'journal_entry', statusCode: anyErr.status }),
|
|
variant: 'destructive',
|
|
})
|
|
} finally {
|
|
setIsSubmitting(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="sm:max-w-3xl max-h-[95dvh] sm:max-h-[90vh] overflow-y-auto">
|
|
<DialogHeader>
|
|
<DialogTitle>Skapa ändringsverifikation</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
{/* Storno explanation */}
|
|
<div className="rounded-lg bg-muted/50 border p-3 text-sm text-muted-foreground">
|
|
<p className="font-medium text-foreground mb-1">Hur fungerar en ändringsverifikation?</p>
|
|
<p>En bokförd verifikation kan inte ändras direkt. Istället skapas automatiskt:</p>
|
|
<ol className="list-decimal list-inside mt-1 space-y-0.5">
|
|
<li>En <strong>stornoverifikation</strong> som nollställer den ursprungliga</li>
|
|
<li>En ny verifikation med dina rättade uppgifter</li>
|
|
</ol>
|
|
<p className="mt-2">
|
|
Rättelsen bokförs i samma räkenskapsperiod som originalet: du hittar den under originalets räkenskapsår.
|
|
</p>
|
|
</div>
|
|
|
|
{/* Original entry metadata: lines live inside CorrectionPreview below */}
|
|
<div className="space-y-1">
|
|
<div className="flex items-center gap-2 text-sm text-muted-foreground flex-wrap">
|
|
<span className="text-muted-foreground">Original</span>
|
|
<span className="font-mono">{formatVoucher(entry)}</span>
|
|
<span className="tabular-nums">{formatDate(entry.entry_date)}</span>
|
|
</div>
|
|
<p className="text-sm">{entry.description}</p>
|
|
</div>
|
|
|
|
{/* Live diff: original | storno | correction | förändring */}
|
|
<CorrectionPreview originalLines={originalLines} correctedLines={lines} />
|
|
|
|
{/* Corrected lines (editable) */}
|
|
<div className="space-y-2">
|
|
<div className="space-y-1">
|
|
<p className="text-sm font-medium">Rättade rader</p>
|
|
<p className="text-xs text-muted-foreground">
|
|
Det här är hela den nya verifikationen: alla konton som ska finnas kvar måste stå
|
|
kvar. Tar du bort ett konto nollställs det (stornon återför det). Vill du bara återföra
|
|
hela verifikatet utan att ersätta det, använd Återför (storno) istället.
|
|
</p>
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
{lines.map((line, index) => (
|
|
<div key={index} className="space-y-2 sm:space-y-0 sm:grid sm:grid-cols-[1fr_1fr_120px_120px_auto] sm:gap-2 sm:items-start border-b sm:border-0 pb-3 sm:pb-0 last:border-0">
|
|
<div className="grid grid-cols-[1fr_auto] sm:contents gap-2">
|
|
<AccountCombobox
|
|
value={line.account_number}
|
|
accounts={accounts}
|
|
onChange={(v) => updateLine(index, 'account_number', v)}
|
|
/>
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-8 w-8 min-h-[44px] min-w-[44px] sm:order-last"
|
|
onClick={() => removeLine(index)}
|
|
disabled={lines.length <= 2}
|
|
>
|
|
<Trash2 className="h-4 w-4" />
|
|
</Button>
|
|
</div>
|
|
<Input
|
|
value={line.line_description}
|
|
onChange={(e) => updateLine(index, 'line_description', e.target.value)}
|
|
placeholder="Beskrivning"
|
|
className="h-8"
|
|
/>
|
|
<div className="grid grid-cols-2 gap-2 sm:contents">
|
|
<Input
|
|
type="number"
|
|
value={line.debit_amount}
|
|
onChange={(e) => updateLine(index, 'debit_amount', e.target.value)}
|
|
placeholder="Debet"
|
|
className="h-8 text-right"
|
|
min={0}
|
|
step="0.01"
|
|
/>
|
|
<Input
|
|
type="number"
|
|
value={line.credit_amount}
|
|
onChange={(e) => updateLine(index, 'credit_amount', e.target.value)}
|
|
placeholder="Kredit"
|
|
className="h-8 text-right"
|
|
min={0}
|
|
step="0.01"
|
|
/>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
|
|
<Button variant="outline" size="sm" onClick={addLine}>
|
|
<Plus className="h-4 w-4 mr-1" />
|
|
Lägg till rad
|
|
</Button>
|
|
|
|
{/* Balance summary */}
|
|
<div className="flex justify-end gap-6 text-sm pt-2 border-t">
|
|
<div>
|
|
<span className="text-muted-foreground mr-2">Debet:</span>
|
|
<span className={!isBalanced ? 'text-destructive font-medium' : 'font-medium'}>
|
|
{roundedDebit.toLocaleString('sv-SE', { minimumFractionDigits: 2 })}
|
|
</span>
|
|
</div>
|
|
<div>
|
|
<span className="text-muted-foreground mr-2">Kredit:</span>
|
|
<span className={!isBalanced ? 'text-destructive font-medium' : 'font-medium'}>
|
|
{roundedCredit.toLocaleString('sv-SE', { minimumFractionDigits: 2 })}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
|
|
{!isBalanced && roundedDebit + roundedCredit > 0 && (
|
|
<p className="text-sm text-destructive">
|
|
Debet och kredit måste vara lika och större än 0.
|
|
</p>
|
|
)}
|
|
</div>
|
|
|
|
<DialogFooter>
|
|
<Button variant="outline" onClick={() => onOpenChange(false)} disabled={isSubmitting}>
|
|
Avbryt
|
|
</Button>
|
|
<Button
|
|
onClick={handleSubmit}
|
|
disabled={!isBalanced || !hasValidLines || isSubmitting}
|
|
>
|
|
{isSubmitting ? 'Skapar...' : 'Skapa ändringsverifikation'}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|