* 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>
157 lines
5.9 KiB
TypeScript
157 lines
5.9 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { NextResponse } from 'next/server'
|
|
import { ensureInitialized } from '@/lib/init'
|
|
import { requireCompanyId } from '@/lib/company/context'
|
|
import { generateKU10Xml } from '@/lib/salary/ku/ku10-generator'
|
|
import type { KU10EmployeeData, KU10CompanyData } from '@/lib/salary/ku/ku10-generator'
|
|
|
|
ensureInitialized()
|
|
|
|
/**
|
|
* Generate KU10 (Kontrolluppgift) XML for a calendar year.
|
|
*
|
|
* Per Skatteförfarandelagen 15 kap: Must be filed by January 31 of the
|
|
* following year. Reports total annual income, tax, and benefits per employee.
|
|
*
|
|
* The XML is räkenskapsinformation per BFL 7 kap — 7-year retention.
|
|
*/
|
|
export async function GET(
|
|
request: Request,
|
|
{ params }: { params: Promise<{ year: string }> }
|
|
) {
|
|
const { year } = await params
|
|
const yearNum = parseInt(year)
|
|
const supabase = await createClient()
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
if (!user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
|
|
|
const companyId = await requireCompanyId(supabase, user.id)
|
|
|
|
if (isNaN(yearNum) || yearNum < 2020 || yearNum > 2100) {
|
|
return NextResponse.json({ error: 'Ogiltigt år' }, { status: 400 })
|
|
}
|
|
|
|
// Load company
|
|
const { data: company } = await supabase
|
|
.from('companies')
|
|
.select('name, org_number')
|
|
.eq('id', companyId)
|
|
.single()
|
|
|
|
if (!company) return NextResponse.json({ error: 'Företag hittades inte' }, { status: 404 })
|
|
|
|
const { data: settings } = await supabase
|
|
.from('company_settings')
|
|
.select('org_number, phone, email')
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
const { data: profile } = await supabase
|
|
.from('profiles')
|
|
.select('full_name, email')
|
|
.eq('id', user.id)
|
|
.single()
|
|
|
|
// Load all booked salary run employees for the year, grouped by employee
|
|
const { data: runEmployees, error } = await supabase
|
|
.from('salary_run_employees')
|
|
.select(`
|
|
employee_id, gross_salary, tax_withheld, tax_withheld_override,
|
|
avgifter_basis, avgifter_basis_override,
|
|
employee:employees(personnummer, specification_number, employment_start, employment_end),
|
|
salary_run:salary_runs!inner(period_year, status),
|
|
line_items:salary_line_items(item_type, amount)
|
|
`)
|
|
.eq('company_id', companyId)
|
|
|
|
if (error) return NextResponse.json({ error: error.message }, { status: 500 })
|
|
|
|
// Filter to booked runs for the year
|
|
const bookedForYear = (runEmployees || []).filter(sre => {
|
|
const run = sre.salary_run as unknown as { period_year: number; status: string } | null
|
|
return run && run.period_year === yearNum && run.status === 'booked'
|
|
})
|
|
|
|
// Aggregate per employee
|
|
const byEmployee = new Map<string, {
|
|
personnummer: string
|
|
specificationNumber: number
|
|
employmentStart: string | null
|
|
employmentEnd: string | null
|
|
totalGross: number
|
|
totalTax: number
|
|
totalAvgifterBasis: number
|
|
benefitCar: number
|
|
benefitHousing: number
|
|
benefitMeals: number
|
|
benefitOther: number
|
|
}>()
|
|
|
|
for (const sre of bookedForYear) {
|
|
const emp = sre.employee as unknown as { personnummer: string; specification_number: number; employment_start: string; employment_end: string | null } | null
|
|
if (!emp) continue
|
|
|
|
const current = byEmployee.get(sre.employee_id) || {
|
|
personnummer: emp.personnummer,
|
|
specificationNumber: emp.specification_number,
|
|
employmentStart: emp.employment_start,
|
|
employmentEnd: emp.employment_end,
|
|
totalGross: 0, totalTax: 0, totalAvgifterBasis: 0,
|
|
benefitCar: 0, benefitHousing: 0, benefitMeals: 0, benefitOther: 0,
|
|
}
|
|
|
|
current.totalGross += sre.gross_salary
|
|
// Honor advanced-mode override so KU matches AGI + the ledger.
|
|
current.totalTax += sre.tax_withheld_override ?? sre.tax_withheld
|
|
current.totalAvgifterBasis += sre.avgifter_basis_override ?? sre.avgifter_basis
|
|
|
|
// Sum benefits by type from line items
|
|
const lineItems = (sre.line_items || []) as Array<{ item_type: string; amount: number }>
|
|
for (const li of lineItems) {
|
|
if (li.item_type === 'benefit_car') current.benefitCar += li.amount
|
|
else if (li.item_type === 'benefit_housing') current.benefitHousing += li.amount
|
|
else if (li.item_type === 'benefit_meals') current.benefitMeals += li.amount
|
|
else if (['benefit_wellness', 'benefit_other'].includes(li.item_type)) current.benefitOther += li.amount
|
|
}
|
|
|
|
byEmployee.set(sre.employee_id, current)
|
|
}
|
|
|
|
if (byEmployee.size === 0) {
|
|
return NextResponse.json({ error: `Inga bokförda lönekörningar för ${yearNum}` }, { status: 404 })
|
|
}
|
|
|
|
const companyData: KU10CompanyData = {
|
|
orgNumber: (settings?.org_number || company.org_number || '').trim(),
|
|
companyName: company.name,
|
|
year: yearNum,
|
|
contactName: (profile?.full_name || company.name || '').trim(),
|
|
contactPhone: (settings?.phone || '').trim(),
|
|
contactEmail: (settings?.email || profile?.email || user.email || '').trim(),
|
|
}
|
|
|
|
const r = (x: number) => Math.round(x * 100) / 100
|
|
const employeeData: KU10EmployeeData[] = Array.from(byEmployee.values()).map(emp => ({
|
|
personnummer: emp.personnummer,
|
|
specificationNumber: emp.specificationNumber,
|
|
totalGross: r(emp.totalGross),
|
|
totalTax: r(emp.totalTax),
|
|
totalAvgifterBasis: r(emp.totalAvgifterBasis),
|
|
benefitCar: emp.benefitCar > 0 ? r(emp.benefitCar) : undefined,
|
|
benefitHousing: emp.benefitHousing > 0 ? r(emp.benefitHousing) : undefined,
|
|
benefitMeals: emp.benefitMeals > 0 ? r(emp.benefitMeals) : undefined,
|
|
benefitOther: emp.benefitOther > 0 ? r(emp.benefitOther) : undefined,
|
|
employmentStart: emp.employmentStart || undefined,
|
|
employmentEnd: emp.employmentEnd || undefined,
|
|
}))
|
|
|
|
const xml = generateKU10Xml(companyData, employeeData)
|
|
|
|
return new Response(xml, {
|
|
headers: {
|
|
'Content-Type': 'application/xml; charset=utf-8',
|
|
'Content-Disposition': `attachment; filename="KU10_${company.org_number}_${yearNum}.xml"`,
|
|
},
|
|
})
|
|
}
|