b6332e9ff4
* feat(salary): one-click AGI submission with filing state machine and success feedback The AGI panel required users to know that "Ladda ner AGI-fil" was the generate step, then click submit, signing link, and kvittens manually. A nollkorning filing stalled on "AGI-XML saknas" pointing at a UI path that does not exist. - New primary button "Lamna in till Skatteverket" chains the existing endpoints client-side: generate XML if missing, POST underlag, poll kontrollresultat, create signing link, open Mina Sidor in a tab opened synchronously at click (popup-blocker safe). Inline stepper shows each step; the four old buttons become collapsed advanced/recovery actions, auto-expanded in stale-draft and rejected states. XML download stays visible and free for manual filing. - deriveAgiFilingState() + useAgiSubmission() lift the per-period submission record to the run page: the progress rail and salary hero now render the real state machine (generated, underlag inskickat, vantar pa BankID-signatur, inlamnad med kvittensnummer) instead of telling users to "lamna in" an already-submitted declaration. - Success card with kvittensnummer and signature metadata once signed, plus a toast when a poll flips the state while the page is open. - AGI kvittens cron every 15 min instead of every 2 h so filings signed on another device get stamped and emailed promptly. - Advanced submit also auto-generates, and the stale "Lon -> AGI -> Generera" error text now points at the real buttons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(enable-banking): instant OAuth callback feedback and dead-attempt cleanup The bank redirect landed on a blank page for the several seconds the callback spent exchanging the PSD2 session and mirroring accounts, and every failed connect attempt left a status='error' row that rendered forever as an "Atgard kravs" card next to a successful retry, showing duplicate connections to the same bank. - Stream a branded "Slutfor bankanslutningen" progress page from the callback: the shell flushes before the session exchange starts and a script/meta redirect follows when the work completes, with a 30s slow-work escape hatch. Fast outcomes (denial, bad params, unknown state) keep their plain redirects. - Delete never-activated connection rows (no session_id, no accounts_data) on denial or exchange failure, and sweep leftovers for the same bank on the next connect. Established connections keep their "Atgard krävs" card via the accounts_data guard; FKs are ON DELETE SET NULL so deletion has no dependents. - Show "Banken ar ansluten: hamtar dina konton" while the settings panel loads after the callback instead of an anonymous spinner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): reject re-send of issued invoices and gate bookkeeping on the sent flip A direct POST to /api/invoices/[id]/send against an already-issued invoice re-emailed the customer and posted a second revenue verifikat (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id and orphaning the first entry. Only the UI hid the button; the v1 route and the MCP commit executor already rejected non-drafts. - Non-draft invoices now return 409 INVOICE_ALREADY_SENT. - The draft to sent status flip is an optimistic lock (status guard plus row-count check); journal entry, accrual schedules, PDF archival and the invoice.sent event only run for the request that won the flip. - On a flip failure the journal entry is deferred: the row stays draft and a retry re-runs the pipeline, ending with exactly one verifikat. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): payment links, failure visibility and sandbox guard for recurring auto-send - sendInvoiceFromSchedule now auto-creates an online payment link via applyPaymentLinkToInvoice before rendering and passes the payment link QR to the PDF: parity with the dashboard and v1 send routes, which recurring invoices silently lacked. - The recurring cron persists last_run_warning both when a claimed run throws (hourly retries stay visible on the schedule) and when a stale schedule is rolled forward, so a deterministic failure can no longer skip a month silently. - Auto-send is blocked for sandbox companies at the email chokepoint (freeze-and-retain: the invoice is still generated as a draft), covering both the cron and the run-now route with one guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(salary): close the Fortnox payroll API gaps (phases 1-4) Payroll now runs end-to-end through the open API, including onboarding a client from another payroll system, with every write staged for approval. - v1: per-employee payslips (list/detail/PDF), payslip line writes, run roster attach/remove, absence ranges (per-day storage), jamkning fields, cutover opening balances (single + atomic bulk PUT), vacation balance + vacation-year-close. PUT added to the wrapper's idempotency/ test-key set (test keys could otherwise write through PUT). - MCP: 10 new tools (get_employee/get_payslip/list_absence/ get_vacation_balance reads + staged update_payslip_line, register_absence, create_employee, update_employee, set_employee_opening_balances, close_vacation_year), executors, risk tiers, op-type CHECK expansions. create_employee encrypts personnummer at staging: pending_operations never holds plaintext. - Scope-map audit retrofit: 11 formerly unmapped tools now scoped; BREAKING for keys that relied on the 4 default-allow writes. - Cutover: employee_opening_balances (derived lock trigger, self-unlocks on run correction), engine YTD/karens/liability integration, Ingaende saldon section in the employee editor. - Arbetsschema-lite: employees.hours_per_week/workdays_per_week drive the hourly/daily divisors; legacy 173/21 preserved exactly at defaults so existing pay math is byte-identical. - Vacation ledger + semesterberedning/arsavslut: recomputed per-year day balances (synced on book/correct, non-fatal), year-close with the min-20 floor, 5-year sparade-dagar expiry to forced payout, and a 2920/2940 drift adjustment via the bookkeeping engine; Semester dashboard card with preview-then-confirm dialog. - Fix: Zod 4 defaults leak through .partial(), which made every sparse employee PATCH fail validation and reset defaulted columns. Migrations 20260713100000/101000/110000/121000/122000 (applied to staging with version rows; prod via merge). vacation_ledger renamed from 20260713120000 to avoid colliding with vat_declaration_totals_rpc. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf: cut dashboard page-load latency (region, round trips, caching, VAT RPC) The dominant cost was infrastructure: Vercel functions ran in iad1 (Washington D.C.) while Supabase (DB + auth) lives in eu-north-1 (Stockholm), so every request paid 4-5 transatlantic round trips of auth + company resolution before doing any real work (measured 530-1900ms for single-query GETs in prod logs). Pin functions to arn1 and cut the redundant work on top: - vercel.json: functions to arn1, same city as the database - getActiveCompanyId: preference + first-membership queries run in parallel; the fallback result doubles as validation in the common single-company case (one round trip instead of two sequential) - withRouteContext: Server-Timing header and authMs/companyMs/handlerMs in the op-completed log, so latency is attributable per phase - dashboard layout: nav badge counts off the critical path; DashboardNav loads them client-side via the new use-worklist-badges SWR hook with debounced realtime revalidation - swr (new dependency, approved): global provider; useCompanySettings shares one cache entry across consumers and renders from cache on back-navigation instead of re-showing skeletons - /pending: realtime refetch debounced; bulk operations previously fired 4 requests per row-change event - VAT declaration: new get_vat_declaration_totals RPC returns per-account totals, settlement-shape detection (#984) and source_type counts in ONE round trip instead of paging every entry+line through PostgREST. Account lists stay TS-side parameters so ACCOUNT_RUTA remains the single source of truth. Shape-exclusion coverage moved to tests/pg/vat-declaration-totals-rpc.pg.test.ts; DDL already applied to staging. - bundle: CommandPalette lazy-mounts on first Ctrl/Cmd+K, AgentChat dynamic-imports the markdown parser, @vercel/speed-insights (new dependency, approved) added for real-user timings The /salary fetch-waterfall fix from the same effort already landed inside 2084a756. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): settle öre-rounded payments from the mark-paid flow An invoice with öresavrundning shows a rounded "Att betala" on the PDF; the customer pays that amount (up to 50 öre off the stored öre total) and the invoice-page mark-paid flow rejected it with MATCH_AMOUNT_EXCEEDS_REMAINING: a dead end, while the bank-transaction match flow already absorbed the residual to 3740. - PaymentBookingDialog now proposes the rounded bank leg plus the 3740 residual line (credit when rounded up, debit when rounded down), resolved via getDisplayTotal from the per-invoice override and company_settings.ore_rounding. - settleInvoicePayment and the v1 mark-paid route absorb the sub-krona residual, gated by planInvoicePaymentForLines: absorption applies ONLY when the caller lines carry the exact residual on 3740; otherwise the strict plan applies (sub-krona partials stay partial, no-3740 overshoots keep the 400), so the GL can never diverge from the AR sub-ledger. - planInvoicePayment absorb-band boundary tightened to >= 1 kr: an exactly-1-kr overshoot used to slip past both the guard and the absorb branch and silently over-record paid_amount (pre-existing on the bank-match path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): resolve all 7 PR compliance findings - ASVS V3.3: per-request CSP nonce on the enable-banking finalize page (mirrors the mcp-oauth consent page); inline scripts are nonce-bound - ASVS V16: decouple callback finalize work from the response stream (eager promise + next/server after()) so a client disconnect cannot drop session persistence or the consent_granted audit emit - ISO 27001 A.8.15: failed audit-event emits log through the structured logger with a stable message for log-based alerting - ASVS V2.3: recurring-invoice cron and run-now routes resolve isSandboxCompany themselves and pass an explicit suppressAutoSend flag (defence in depth around the email chokepoint, freeze-and-retain kept) - ISO 27001 A.8.11: stagePendingOperation rejects plaintext personnummer-bearing keys in params/preview_data (key-based guard; EF org numbers make value-matching unsafe) - ASVS V4.5: employee PATCH body is truly sparse; cleared number fields are omitted instead of resetting DB values to hardcoded fallbacks - ASVS V8.2.1: route-level tests pin the v1 cross-company deny (404 by convention, not 403) on the payslip PDF endpoint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: implement vacation-year basis change validation and error handling - Added tests to block vacation-year basis changes when open balances exist. - Implemented error handling for open-balances guard query failures in the settings route. - Enhanced absence route to reject reversed date ranges with a validation error. - Updated absence handling to use atomic upserts instead of delete+insert for better performance and reliability. - Refactored salary calculation logic to correctly handle age-based avgifter rates according to Skatteverket's rules. - Improved error messaging for vacation year closure adjustments. - Adjusted employee opening balances handling to preserve audit information during upserts. * feat(settings): add validation to block vacation-year basis change with open balances feat(absence): reject reversed date ranges in absence queries fix(absence): update absence handling to use atomic upserts instead of delete+insert fix(employee): improve validation for jamkning dates in employee updates fix(opening-balances): ensure created_by field is preserved during upserts test(absence): enhance tests for absence range and date validations test(calculation): add tests for age-based avgifter rates and edge cases test(semesterberedning): validate vacation year closure adjustments and error handling test(employee-opening-balances): update tests to reflect changes in salary_run_employees schema * fix(migrations): implement NOT VALID constraints for pending_operations and add validation migration --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
244 lines
9.0 KiB
TypeScript
244 lines
9.0 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
|
|
/**
|
|
* Semesterlöneskuld: Vacation liability report per BFNAR 2016:10.
|
|
*
|
|
* Per BFNAR 2016:10 kap 16: Vacation liability must be calculated per employee,
|
|
* not as a lump sum. This report shows earned/taken days, accrued SEK amount
|
|
* on account 2920, and accrued avgifter on account 2940.
|
|
*
|
|
* The report is required for year-end closing and ongoing monthly review.
|
|
* Per BFL 7 kap: retained 7 years as part of räkenskapsinformation.
|
|
*/
|
|
|
|
export interface VacationLiabilityRow {
|
|
employeeId: string
|
|
employeeName: string
|
|
personnummerLast4: string
|
|
vacationRule: string
|
|
vacationDaysEntitled: number
|
|
vacationDaysTaken: number
|
|
vacationDaysRemaining: number
|
|
vacationDaysSaved: number
|
|
accruedAmount: number // Account 2920
|
|
accruedAvgifter: number // Account 2940
|
|
avgifterRate: number
|
|
totalLiability: number // 2920 + 2940
|
|
}
|
|
|
|
export interface VacationLiabilityReport {
|
|
rows: VacationLiabilityRow[]
|
|
totals: {
|
|
accruedAmount: number // Sum for account 2920
|
|
accruedAvgifter: number // Sum for account 2940
|
|
totalLiability: number
|
|
}
|
|
asOfDate: string
|
|
}
|
|
|
|
/**
|
|
* Generate vacation liability report.
|
|
*
|
|
* Aggregates vacation accruals from all booked salary runs in the year
|
|
* and compares against vacation days taken.
|
|
*/
|
|
export async function generateVacationLiability(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
year: number
|
|
): Promise<VacationLiabilityReport> {
|
|
const r = (x: number) => Math.round(x * 100) / 100
|
|
|
|
// Load active employees who actually accrue vacation. Employees on
|
|
// 'none' or 'semesterersattning' have no semesterlöneskuld liability:
|
|
// including them in the report would just show empty rows.
|
|
const employees = await fetchAllRows(({ from, to }) =>
|
|
supabase
|
|
.from('employees')
|
|
.select('id, first_name, last_name, personnummer_last4, vacation_rule, vacation_days_per_year, vacation_days_saved')
|
|
.eq('company_id', companyId)
|
|
.eq('is_active', true)
|
|
.not('vacation_rule', 'in', '(none,semesterersattning)')
|
|
.order('last_name')
|
|
// id tiebreaker: last_name is not unique, so it alone is not a stable
|
|
// total order for paging (see fetch-all.ts).
|
|
.order('id', { ascending: true })
|
|
.range(from, to)
|
|
)
|
|
|
|
// Load salary run employees for booked runs this year (server-side filtered via !inner join)
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const bookedForYear: any[] = await fetchAllRows(({ from, to }) =>
|
|
supabase
|
|
.from('salary_run_employees')
|
|
.select(`
|
|
employee_id,
|
|
vacation_accrual,
|
|
vacation_accrual_avgifter,
|
|
avgifter_rate,
|
|
vacation_days_taken,
|
|
salary_run:salary_runs!inner(period_year, status)
|
|
`)
|
|
.eq('company_id', companyId)
|
|
.eq('salary_runs.period_year', year)
|
|
.eq('salary_runs.status', 'booked')
|
|
// Stable total order for correct paging (see fetch-all.ts).
|
|
.order('id', { ascending: true })
|
|
.range(from, to)
|
|
)
|
|
|
|
// Client-side safety check: ensure server-side !inner filter was applied
|
|
const verifiedBookedForYear = bookedForYear.filter(sre => {
|
|
const run = sre.salary_run as unknown as { period_year: number; status: string } | null
|
|
return run && run.period_year === year && run.status === 'booked'
|
|
})
|
|
|
|
// Cutover opening balances (payroll gap-closure 2.2): a mid-year switcher's
|
|
// semesterlöneskuld arrived via SIE opening balances on 2920/2940, so the
|
|
// per-employee liability must include the opening term or the report
|
|
// understates against the booked balance. Days likewise: the opening row's
|
|
// paid-days-remaining replaces the naive entitled-minus-taken, and saved
|
|
// days by origin year add to the master-row aggregate. Applies for report
|
|
// years >= the cutover year (post-cutover-year drift is reconciled by the
|
|
// Phase 3 vacation ledger).
|
|
// Vacation ledger v2 (payroll gap-closure 3.2): when a persisted balance
|
|
// row exists for the report year, it is authoritative for DAYS (it already
|
|
// folded in the cutover seed, legacy saved days, and booked-run recompute).
|
|
// SEK stays derived from runs + the opening terms below.
|
|
const { data: ledgerRows } = await supabase
|
|
.from('employee_vacation_balances')
|
|
.select('employee_id, vacation_year_start, entitled_days, taken_days, saved_days')
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'open')
|
|
.gte('vacation_year_start', `${year}-01-01`)
|
|
.lte('vacation_year_start', `${year}-12-31`)
|
|
const ledgerByEmployee = new Map(
|
|
((ledgerRows ?? []) as Array<{
|
|
employee_id: string
|
|
vacation_year_start: string
|
|
entitled_days: number
|
|
taken_days: number
|
|
saved_days: Record<string, number> | null
|
|
}>).map((r) => [r.employee_id, r]),
|
|
)
|
|
|
|
const { data: openingRows } = await supabase
|
|
.from('employee_opening_balances')
|
|
.select(
|
|
'employee_id, cutover_date, vacation_paid_days_remaining, vacation_saved_days_by_year, opening_semester_liability, opening_semester_liability_avgifter',
|
|
)
|
|
.eq('company_id', companyId)
|
|
const openingByEmployee = new Map<
|
|
string,
|
|
{
|
|
paidDaysRemaining: number
|
|
savedDays: number
|
|
liability: number
|
|
liabilityAvgifter: number
|
|
}
|
|
>()
|
|
for (const opening of (openingRows || []) as Array<{
|
|
employee_id: string
|
|
cutover_date: string
|
|
vacation_paid_days_remaining: number
|
|
vacation_saved_days_by_year: Record<string, number> | null
|
|
opening_semester_liability: number
|
|
opening_semester_liability_avgifter: number
|
|
}>) {
|
|
const cutoverYear = Number(opening.cutover_date.slice(0, 4))
|
|
if (year < cutoverYear) continue
|
|
const savedDays = Object.values(opening.vacation_saved_days_by_year ?? {}).reduce(
|
|
(sum, days) => sum + (Number(days) || 0),
|
|
0,
|
|
)
|
|
openingByEmployee.set(opening.employee_id, {
|
|
paidDaysRemaining: opening.vacation_paid_days_remaining || 0,
|
|
savedDays,
|
|
liability: opening.opening_semester_liability || 0,
|
|
liabilityAvgifter: opening.opening_semester_liability_avgifter || 0,
|
|
})
|
|
}
|
|
|
|
// Aggregate per employee
|
|
const accrualsByEmployee = new Map<string, {
|
|
totalAccrual: number
|
|
totalAvgifter: number
|
|
totalDaysTaken: number
|
|
lastRate: number
|
|
}>()
|
|
|
|
for (const sre of verifiedBookedForYear) {
|
|
const current = accrualsByEmployee.get(sre.employee_id) || {
|
|
totalAccrual: 0, totalAvgifter: 0, totalDaysTaken: 0, lastRate: 0.3142,
|
|
}
|
|
current.totalAccrual += sre.vacation_accrual
|
|
current.totalAvgifter += sre.vacation_accrual_avgifter
|
|
current.totalDaysTaken += sre.vacation_days_taken
|
|
current.lastRate = sre.avgifter_rate
|
|
accrualsByEmployee.set(sre.employee_id, current)
|
|
}
|
|
|
|
const rows: VacationLiabilityRow[] = employees.map(emp => {
|
|
const accruals = accrualsByEmployee.get(emp.id)
|
|
const opening = openingByEmployee.get(emp.id)
|
|
const ledger = ledgerByEmployee.get(emp.id)
|
|
const accruedAmount = r((accruals?.totalAccrual || 0) + (opening?.liability || 0))
|
|
const accruedAvgifter = r((accruals?.totalAvgifter || 0) + (opening?.liabilityAvgifter || 0))
|
|
|
|
// Days: ledger row wins (it already folded in cutover seed + legacy
|
|
// saved days + booked-run recompute); else the opening row shifts the
|
|
// starting balance; else the naive entitled-minus-taken.
|
|
let daysTaken: number
|
|
let daysEntitled: number
|
|
let daysRemaining: number
|
|
let daysSaved: number
|
|
if (ledger) {
|
|
daysTaken = ledger.taken_days
|
|
daysEntitled = ledger.entitled_days
|
|
daysRemaining = ledger.entitled_days - ledger.taken_days
|
|
daysSaved = Object.values(ledger.saved_days ?? {}).reduce(
|
|
(sum, days) => sum + (Number(days) || 0),
|
|
0,
|
|
)
|
|
} else {
|
|
daysTaken = accruals?.totalDaysTaken || 0
|
|
daysEntitled = emp.vacation_days_per_year
|
|
// With an opening row, remaining days start from the imported balance
|
|
// rather than the full annual entitlement (the previous system already
|
|
// consumed part of the year).
|
|
daysRemaining = opening
|
|
? opening.paidDaysRemaining - daysTaken
|
|
: emp.vacation_days_per_year - daysTaken
|
|
daysSaved = emp.vacation_days_saved + (opening?.savedDays || 0)
|
|
}
|
|
|
|
return {
|
|
employeeId: emp.id,
|
|
employeeName: `${emp.first_name} ${emp.last_name}`,
|
|
personnummerLast4: emp.personnummer_last4,
|
|
vacationRule: emp.vacation_rule,
|
|
vacationDaysEntitled: daysEntitled,
|
|
vacationDaysTaken: daysTaken,
|
|
vacationDaysRemaining: daysRemaining,
|
|
vacationDaysSaved: daysSaved,
|
|
accruedAmount,
|
|
accruedAvgifter,
|
|
avgifterRate: accruals?.lastRate || 0.3142,
|
|
totalLiability: r(accruedAmount + accruedAvgifter),
|
|
}
|
|
})
|
|
|
|
const totals = {
|
|
accruedAmount: r(rows.reduce((s, row) => s + row.accruedAmount, 0)),
|
|
accruedAvgifter: r(rows.reduce((s, row) => s + row.accruedAvgifter, 0)),
|
|
totalLiability: r(rows.reduce((s, row) => s + row.totalLiability, 0)),
|
|
}
|
|
|
|
return {
|
|
rows,
|
|
totals,
|
|
asOfDate: `${year}-12-31`,
|
|
}
|
|
}
|