3bbf2a051b
* fix(year-end): stop revaluing FX items that were not on the balance sheet The year-end close ran currency revaluation as an unconditional step before the irreversible close, and the revaluation queried LIVE open invoices with no date scoping. An invoice issued after balansdagen, settled before it, or never booked at all was therefore revalued into the year being closed, writing down a 1510/2440 that stood at zero. Because the entry lands inside the same run that closes the period, the only remedy left was a rattelse in the following year. The population is now measured as of balansdagen, reusing the reconstruction the reskontra reports already use (fetchPaymentsAsOf / outstandingAsOf): the invoice_date ceiling is unconditional (post-dated invoices make the bug reachable for a current period too) and the widening to 'paid' applies only to a historical date, where a since-settled invoice was still open then. Rows that carry no balance-sheet exposure are skipped per row rather than per company: an unbooked registration is not on 1510/2440. Deliberately NOT keyed on accounting_method, since BFL 5 kap 2 § 3 st requires kontantmetoden companies to book their outstanding fordringar/skulder at balansdagen, and those converted rows are genuine exposure that ARL 4 kap. 13 § must value. The readiness warning stays ungated on purpose: an unbooked FX row is exactly what deserves a warning, because /book still posts it into the year about to close and lockPeriod/closePeriod then removes that remedy for good. The wizard preview now lists the per-invoice revaluation rows it will post instead of three aggregate numbers, so the user approves line-level content before the close. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(bookkeeping): reach accounts outside BAS 2026 from a verifikat rattelse A user could not move a verifikat line to konto 8022: the picker reported no such account and offered no way forward. 8022 was dropped from BAS 2026 (it is in BAS 2018), so it is a legitimate company-specific underkonto rather than a catalog gap. Verified against the official bas.se kontoplan that our BAS reference already matches BAS 2026, so 8022 is deliberately NOT added to it: seeding a retired account would push it onto every company. StrikeLinesDialog and CorrectionEntryDialog were the only account pickers in the app that never passed onCreateAccount, so their combobox rendered a dead empty state. Both now open AddAccountDialog prefilled, then refetch the chart and select the new account on the initiating line, leaving the half-finished rattelse intact. AccountCombobox closed its dropdown on the fourth digit of any committed number, which hid the empty state before it was ever painted and made the create affordance unreachable for exactly the numbers that need it. It now closes only when the number matches something, so focus still advances to the belopp field for real accounts. No change to posting rules: correct_entry_lines_inline validates chart membership, not BAS membership, and account creation already required the same write role. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(vacation): adjust vacation accrual calculations for mid-year hires and update related logic --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
228 lines
8.6 KiB
TypeScript
228 lines
8.6 KiB
TypeScript
'use client'
|
|
|
|
import Link from 'next/link'
|
|
import { useState } from 'react'
|
|
import { useLocale, useTranslations } from 'next-intl'
|
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
|
import { AlertTriangle, Download, Loader2, CheckCircle2, ChevronDown, Info } from 'lucide-react'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { downloadFile } from '@/lib/browser/download-file'
|
|
import { failureDescription } from '@/lib/browser/action-failure'
|
|
import type { ErrorLocale } from '@/lib/errors/get-error-message'
|
|
|
|
type PaymentFormat = 'bg_lb' | 'pain001'
|
|
|
|
interface PaymentFilePanelProps {
|
|
salaryRunId: string
|
|
periodLabel: string
|
|
paymentFileFormat: string | null
|
|
paymentFileGeneratedAt: string | null
|
|
defaultFormat: PaymentFormat
|
|
/** company_settings.salary_default_bank: sorts and auto-expands the matching bank's instructions. */
|
|
defaultBank?: string | null
|
|
readOnly?: boolean
|
|
onDownloaded?: () => void
|
|
}
|
|
|
|
type BankKey = 'swedbank' | 'seb' | 'handelsbanken' | 'nordea'
|
|
|
|
const BANK_NAME: Record<BankKey, string> = {
|
|
swedbank: 'Swedbank',
|
|
seb: 'SEB',
|
|
handelsbanken: 'Handelsbanken',
|
|
nordea: 'Nordea',
|
|
}
|
|
|
|
// Instruction copy lives in messages/{sv,en}.json under
|
|
// salary_payments.steps_<format>_<bank>; this is the ordered key list.
|
|
const BANKS_BY_FORMAT: Record<PaymentFormat, BankKey[]> = {
|
|
bg_lb: ['swedbank', 'seb', 'handelsbanken', 'nordea'],
|
|
pain001: ['swedbank', 'seb', 'handelsbanken', 'nordea'],
|
|
}
|
|
|
|
export function PaymentFilePanel({
|
|
salaryRunId,
|
|
periodLabel,
|
|
paymentFileFormat,
|
|
paymentFileGeneratedAt,
|
|
defaultFormat,
|
|
defaultBank,
|
|
readOnly,
|
|
onDownloaded,
|
|
}: PaymentFilePanelProps) {
|
|
const t = useTranslations('salary_payments')
|
|
const locale = useLocale() as ErrorLocale
|
|
const { toast } = useToast()
|
|
const [format, setFormat] = useState<PaymentFormat>(defaultFormat)
|
|
const [downloading, setDownloading] = useState(false)
|
|
|
|
const banks = BANKS_BY_FORMAT[format]
|
|
const matchedBank = banks.find((b) => b === defaultBank) ?? null
|
|
const sortedBanks = matchedBank
|
|
? [matchedBank, ...banks.filter((b) => b !== matchedBank)]
|
|
: banks
|
|
const [showInstructions, setShowInstructions] = useState(Boolean(matchedBank))
|
|
|
|
const FORMAT_LABEL: Record<PaymentFormat, string> = {
|
|
bg_lb: t('format_bg_lb'),
|
|
pain001: t('format_pain001'),
|
|
}
|
|
|
|
const endpoint =
|
|
format === 'bg_lb'
|
|
? `/api/salary/runs/${salaryRunId}/payment/bg-lb`
|
|
: `/api/salary/runs/${salaryRunId}/payment/pain001`
|
|
|
|
async function handleDownload() {
|
|
// The button is disabled while a file is in flight; this guard closes the
|
|
// double-click / Enter-repeat race before React has re-rendered it. Two
|
|
// payment files for one salary run is not a cosmetic problem: each one is
|
|
// payable on its own, so a user who uploads both to the bank pays the
|
|
// month's wages twice.
|
|
if (downloading) return
|
|
setDownloading(true)
|
|
try {
|
|
const ext = format === 'bg_lb' ? 'txt' : 'xml'
|
|
// Bounded, and no file is written unless the server answered 2xx with a
|
|
// complete body: an error envelope saved as lon_2026-04.xml is a file the
|
|
// user would carry to the bank before discovering it pays nobody.
|
|
const result = await downloadFile({
|
|
url: endpoint,
|
|
filename: `lon_${periodLabel}.${ext}`,
|
|
locale,
|
|
})
|
|
// Exactly one toast per outcome. TOAST_LIMIT is 1, so a failure toast
|
|
// followed by a success toast in the same tick would render only the last.
|
|
if (!result.ok) {
|
|
toast({
|
|
title: t('download_failed_title'),
|
|
description: failureDescription(result, {
|
|
timeout: t('download_timeout'),
|
|
network: t('download_network'),
|
|
}),
|
|
variant: 'destructive',
|
|
})
|
|
return
|
|
}
|
|
toast({ title: t('downloaded') })
|
|
onDownloaded?.()
|
|
} finally {
|
|
setDownloading(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('title')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent className="space-y-4">
|
|
{paymentFileFormat && paymentFileGeneratedAt && (
|
|
<div className="flex items-start gap-2 text-sm text-muted-foreground">
|
|
<CheckCircle2 className="h-4 w-4 mt-0.5 text-success" />
|
|
<div>
|
|
{t('last_generated')}{' '}
|
|
<span className="text-foreground">
|
|
{FORMAT_LABEL[paymentFileFormat as PaymentFormat] ?? paymentFileFormat}
|
|
</span>{' '}
|
|
({new Date(paymentFileGeneratedAt).toLocaleString('sv-SE')})
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{!readOnly && (
|
|
<>
|
|
<div className="space-y-1">
|
|
<label className="text-sm font-medium">{t('format_label')}</label>
|
|
<Select value={format} onValueChange={(v) => setFormat(v as PaymentFormat)}>
|
|
<SelectTrigger className="w-full">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="pain001">{FORMAT_LABEL.pain001}</SelectItem>
|
|
<SelectItem value="bg_lb">{FORMAT_LABEL.bg_lb}</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
<p className="text-xs text-muted-foreground">
|
|
{format === 'bg_lb' ? t('format_description_bg_lb') : t('format_description_pain001')}
|
|
</p>
|
|
</div>
|
|
|
|
{/* The flow looked clean all the way until the bank said no: the
|
|
file downloads fine and only fails at upload, on the pay date.
|
|
Say the delivery precondition up front instead. */}
|
|
{format === 'pain001' && (
|
|
<div className="flex items-start gap-2 rounded-md border border-border p-3 text-xs">
|
|
<AlertTriangle className="h-3.5 w-3.5 mt-0.5 shrink-0" />
|
|
<span className="text-muted-foreground">{t('pain001_agreement_warning')}</span>
|
|
</div>
|
|
)}
|
|
|
|
{format === 'bg_lb' && (
|
|
<div className="flex items-start gap-2 rounded-md border border-border p-3 text-xs">
|
|
<AlertTriangle className="h-3.5 w-3.5 mt-0.5 shrink-0" />
|
|
<span className="text-muted-foreground">
|
|
{t('sunset_warning')}{' '}
|
|
<Link
|
|
href="/settings/salary"
|
|
className="underline underline-offset-2 hover:text-foreground"
|
|
>
|
|
{t('sunset_link')}
|
|
</Link>
|
|
</span>
|
|
</div>
|
|
)}
|
|
|
|
<div className="flex justify-end">
|
|
<Button onClick={handleDownload} disabled={downloading}>
|
|
{downloading ? (
|
|
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
|
) : (
|
|
<Download className="mr-2 h-4 w-4" />
|
|
)}
|
|
{t('download')}
|
|
</Button>
|
|
</div>
|
|
|
|
<button
|
|
type="button"
|
|
onClick={() => setShowInstructions(s => !s)}
|
|
className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground"
|
|
aria-expanded={showInstructions}
|
|
>
|
|
<ChevronDown className={`h-3 w-3 transition-transform ${showInstructions ? 'rotate-180' : ''}`} />
|
|
{t('instructions_toggle')}
|
|
</button>
|
|
|
|
{showInstructions && (
|
|
<div className="space-y-2 rounded-md border bg-muted/30 p-3 text-xs">
|
|
{sortedBanks.map((bank) => (
|
|
<div key={bank}>
|
|
<strong className="text-foreground">
|
|
{BANK_NAME[bank]}
|
|
{bank === matchedBank ? ` (${t('your_bank')})` : ''}.
|
|
</strong>{' '}
|
|
<span className="text-muted-foreground">
|
|
{t(`steps_${format}_${bank}`)}
|
|
</span>
|
|
</div>
|
|
))}
|
|
<p className="pt-1 text-muted-foreground border-t mt-2">
|
|
{t('instructions_footer')}
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="flex items-start gap-2 rounded-md border border-dashed bg-muted/20 p-3 text-xs text-muted-foreground">
|
|
<Info className="h-3.5 w-3.5 mt-0.5 shrink-0" />
|
|
<span>{t('open_payments_note')}</span>
|
|
</div>
|
|
</>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
)
|
|
}
|