* fix(salary): declare, book and pay AGI in whole kronor (SKV per-sats computation) A user's first lönekörning surfaced öre amounts in the AGI payable while Skatteverket deals in whole kronor. Three connected defects: - the AGI XML rounded amounts (Math.round); öretal bortfaller (SFF 2011:1261 22 kap. 1 §) requires truncation, and FK487 must be Skatteverket's own per-sats computation on the whole-krona underlag sums (IK587, kontroll B_006), not a truncation of the öre-exact engine sum - the salary booking credited 2731 with exact öre, leaving a residual after the whole-krona skattekonto draw; 2731 now carries the declared amount with the remainder on 3740 (Öres- och kronutjämning) - the LB payment file and TaxPaymentPanel paid/showed öre; they now use the declared whole-krona totals stored on agi_declarations (which also lets skattekonto auto-settlement match the draw); legacy öre rows keep paying öre-exact so pre-deploy bookings still clear 2731 New lib/salary/declared-avgifter.ts implements the SKV computation (per-IU whole-krona underlag, per-sats sums, youth/växa cap splits, exact integer math) shared by the AGI generator, the booking split and the preview. Review overrides route all legs through the same per-category truncation; basis overrides are inert on money totals (they never reach the filed IUs); the v1 book route gains override parity with book-run; F-skatt rows ignore avgifter overrides on every surface. Booked runs show their posted verifikat instead of a recomputed projection. tax_withheld_override requires whole kronor. Adversarially verified over three /skeptic rounds. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: merge origin/main and re-ratchet the öre-round baseline The merge brought #1609 (net-pay öresavrundning) whose two new Math.round(x*100)/100 occurrences are counted against the baseline this branch had tightened from 637 to 629; 631 keeps the net -6 improvement without policing already-merged code. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(salary): address PR review (hybrid override computation, legacy youth cap, robustness) CodeRabbit round on #1611, all findings in one pass: - computeDeclaredAvgifterWithOverrides: one shared hybrid for the AGI generator AND the booking split. Overridden rows contribute their manual amounts per category; colleagues keep the SKV-exact per-sats underlag computation (a FoU override on one employee no longer costs the rest of the roster kronor of declared accuracy) - youth cap keys on the RESOLVED category so legacy null-category rows classified as youth by the rate heuristic still get the 25k split - F-skatt rows zero their avgifter_basis on both booking surfaces and in the preview, matching the AGI's isFSkattRow invariant - preview route: posted-voucher lookup errors return 500 instead of masquerading as a booked run with no vouchers; 400/500 tests added - run page clears stale AGI totals when the tax-payment fetch fails - SalaryOverridePanel truncates the tax override to whole kronor so the schema's .int() cannot bounce a decimal input with a 400 - v1 book route override parity pinned by a lifecycle test - DECISIONS.md format fixes + superseded entry marked; exempt category mapped explicitly; unified truncation-drift band with rationale Declined (recorded): dating the decision entries 2026-08-13 (bot assumed UTC; the decisions were made after midnight local time). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(salary): round-2 review nits (shared F-skatt helper, test hygiene) - isFSkattStatus in declared-avgifter.ts: single source for the F-skatt exclusion, consumed by book-run, the v1 book route, the preview route and the AGI generator, per the Swedish review's drift-risk finding - declared-avgifter test suite gets the standard beforeEach cleanup Declined (recorded for the summary): auto-generated correction voucher for regenerated legacy periods (data-repair follow-up needing Emil's go); SFF 22 kap. 1 par. citation doubt (verified against lagen.nu and already shipped in tax-tables.ts); 3740 scope doubt (BAS generic utjamning account, Visma praxis, matches the user's reference voucher). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
105 lines
3.9 KiB
TypeScript
105 lines
3.9 KiB
TypeScript
'use client'
|
|
|
|
import { useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
|
import { Calculator, Loader2 } from 'lucide-react'
|
|
import { formatCurrency } from '@/lib/utils'
|
|
|
|
export interface EntryPreviewLine {
|
|
account_number: string
|
|
line_description: string
|
|
debit_amount: number | null
|
|
credit_amount: number | null
|
|
}
|
|
|
|
export interface EntryPreview {
|
|
description: string
|
|
lines: EntryPreviewLine[]
|
|
}
|
|
|
|
export interface PreviewData {
|
|
// True when the entries are the ACTUAL posted verifikat of a booked run
|
|
// (the preview route returns those instead of a recomputed projection,
|
|
// which could contradict vouchers booked under earlier rules).
|
|
booked?: boolean
|
|
salaryEntry: EntryPreview | null
|
|
avgifterEntry: EntryPreview | null
|
|
vacationEntry: EntryPreview | null
|
|
pensionEntry?: EntryPreview | null
|
|
}
|
|
|
|
interface RunJournalPreviewProps {
|
|
preview: PreviewData
|
|
// When provided (draft + write access), a "Beräkna om" button renders in the
|
|
// header — recalculation sits on the output it refreshes.
|
|
onRecalculate?: () => void
|
|
recalculating?: boolean
|
|
}
|
|
|
|
export function RunJournalPreview({ preview, onRecalculate, recalculating }: RunJournalPreviewProps) {
|
|
const t = useTranslations('salary_run')
|
|
|
|
const entries = [
|
|
preview.salaryEntry,
|
|
preview.avgifterEntry,
|
|
preview.vacationEntry,
|
|
preview.pensionEntry,
|
|
].filter(Boolean) as EntryPreview[]
|
|
|
|
return (
|
|
<Card>
|
|
<CardHeader className="flex flex-row items-center justify-between gap-3 space-y-0">
|
|
<CardTitle className="text-base">
|
|
{preview.booked ? t('journal_booked_title') : t('journal_preview_title')}
|
|
</CardTitle>
|
|
{onRecalculate && (
|
|
<Button variant="outline" size="sm" onClick={onRecalculate} disabled={recalculating}>
|
|
{recalculating ? (
|
|
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
|
) : (
|
|
<Calculator className="mr-2 h-4 w-4" />
|
|
)}
|
|
{t('action_recalculate')}
|
|
</Button>
|
|
)}
|
|
</CardHeader>
|
|
<CardContent className="space-y-6">
|
|
{entries.length === 0 ? (
|
|
<p className="text-sm text-muted-foreground">{t('journal_preview_nollkorning')}</p>
|
|
) : (
|
|
entries.map((entry, idx) => (
|
|
<div key={idx} className="space-y-2">
|
|
<h4 className="text-sm font-medium">{entry.description}</h4>
|
|
<table className="w-full text-xs">
|
|
<thead className="[&_th]:font-medium [&_th]:text-[11px] [&_th]:uppercase [&_th]:tracking-wider [&_th]:text-muted-foreground">
|
|
<tr className="border-b">
|
|
<th className="text-left py-1">{t('journal_th_account')}</th>
|
|
<th className="text-left py-1">{t('journal_th_description')}</th>
|
|
<th className="text-right py-1">{t('journal_th_debit')}</th>
|
|
<th className="text-right py-1">{t('journal_th_credit')}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{entry.lines.map((line, li) => (
|
|
<tr key={li} className="border-t border-border">
|
|
<td className="py-1.5 tabular-nums font-mono">{line.account_number}</td>
|
|
<td className="py-1.5 text-muted-foreground">{line.line_description}</td>
|
|
<td className="py-1.5 text-right tabular-nums">
|
|
{line.debit_amount ? formatCurrency(line.debit_amount) : ''}
|
|
</td>
|
|
<td className="py-1.5 text-right tabular-nums">
|
|
{line.credit_amount ? formatCurrency(line.credit_amount) : ''}
|
|
</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
))
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
)
|
|
}
|