* feat(bookkeeping): make blocked fiscal-year creation actionable When creating a new räkenskapsår is blocked because a prior period is still open, the "Skapa räkenskapsår" dialog no longer dead-ends on an English toast. The API now returns the canonical bilingual error envelope with the blocking periods (id/name/dates) under details, and the dialog renders a Swedish panel that locks them inline (reversible locked_at) via the existing /lock endpoint and retries creation. The guard rule is unchanged and remains BFL-compliant: BFL 6 kap allows löpande bokföring of the new year in parallel with the prior year's bokslut, so a lock (not a full close) is sufficient and reversible. - Add PERIOD_CREATE_BLOCKED_BY_OPEN_PERIODS structured error code - Return envelope + details.blockingPeriods from the 409 (was English string) - CreatePeriodDialog: inline "lås och skapa" panel + lock-and-retry - Update route tests for the new envelope shape Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(ui): prevent mouse wheel from mutating number inputs A focused <input type="number"> would change its value on scroll, silently turning e.g. a 20000 salary into 19998. Blur number inputs on wheel so the page scrolls instead of editing the value. Applied at the Input primitive so all number fields are protected. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(salary): auto-derive skattetabell and kolumn for employees Replace the opaque manual "Skattetabell (29-42)" and "Kolumn (1-6)" inputs on the employee form with a self-deriving flow: the user picks their folkbokföringskommun from a searchable dropdown and the tax table fills itself in, while the column derives from the personnummer we already collect. - Add a searchable municipality picker (MunicipalityCombobox) backed by a new cached GET /api/salary/tax-tables/kommuner endpoint. - Wrap the whole "Skatt" card in a self-contained EmployeeTaxCard used by both the create and edit pages, with InfoTooltips and named column options. - deriveTaxColumn(): auto-select column 1 for under-66 employees; leave the ambiguous 66+ case (pension vs working senior) to a clearly-named manual choice. - Fix fetchKommunTaxRates() to page through all ~1300 församling rows instead of a single 500-row page (which silently dropped ~200 kommuner, incl. Göteborg) and normalize the uppercase names to title case. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(import): correct CSV amount-column guess and surface skipped rows Manual CSV column-mapping auto-guess walked each data row right-to-left and picked the first numeric cell as the amount, so on the common ...;Belopp;Saldo layout it grabbed the trailing running-balance column. Extract the guess into a pure, tested suggestColumnMapping(): match header labels first (belopp/amount -> amount, saldo/balance -> balance), auto-fill the balance field, and fall back to value heuristics that skip the balance column and prefer a column carrying negative values. Also surface stats.skipped_rows + parse warnings in BankFileConfirmStep - the manual-mapping path skips the preview step that was the only place they showed, so skipped rows were silently dropped from view. Add a unit test reproducing the Saldo-as-amount regression. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat: add "Save as draft" functionality for invoices - Implemented a new feature to allow users to save invoices as unnumbered drafts without generating an invoice number until finalized. - Added a `save_as_draft` flag to the CreateInvoiceInput schema to handle draft saving logic. - Updated the invoice creation API to skip number allocation when saving as a draft. - Introduced a new endpoint for finalizing drafts, which allocates an invoice number and emits an `invoice.created` event. - Enhanced the UI to include a "Save as draft" button, with loading states and tooltips. - Updated tests to cover the new draft saving and finalization logic, including race conditions for concurrent modifications. - Added relevant error handling for draft finalization and deletion scenarios. * feat(employee): add employment start and end date fields to employee forms * feat: enhance invoice and salary run handling with improved validation and event logging --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
159 lines
5.1 KiB
TypeScript
159 lines
5.1 KiB
TypeScript
import { NextResponse } from 'next/server'
|
|
import { ensureInitialized } from '@/lib/init'
|
|
import { withRouteContext } from '@/lib/api/with-route-context'
|
|
import { formatRedovisare } from '@/lib/skatteverket/format'
|
|
import { decryptPersonnummer, maskPersonnummer } from '@/lib/salary/personnummer'
|
|
|
|
ensureInitialized()
|
|
|
|
export const GET = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'salary.runs.get',
|
|
async (_request, { supabase, companyId }, { params }) => {
|
|
const { id } = await params
|
|
|
|
const { data: run, error } = await supabase
|
|
.from('salary_runs')
|
|
.select('*')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (error || !run) {
|
|
return NextResponse.json({ error: 'Lönekörning hittades inte' }, { status: 404 })
|
|
}
|
|
|
|
// Load employees with line items
|
|
const { data: employees } = await supabase
|
|
.from('salary_run_employees')
|
|
.select('*, employee:employees(id, first_name, last_name, personnummer, personnummer_last4, employment_type), line_items:salary_line_items(*)')
|
|
.eq('salary_run_id', id)
|
|
.order('created_at')
|
|
|
|
// Resolve Skatteverket arbetsgivare ID for AGI submission. We surface this
|
|
// in the run payload so the client doesn't need a second round-trip just to
|
|
// build extension URLs. Quietly null when the org number isn't set yet.
|
|
let arbetsgivare: string | null = null
|
|
const { data: settings } = await supabase
|
|
.from('company_settings')
|
|
.select('org_number, entity_type')
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
if (settings?.org_number && settings?.entity_type) {
|
|
try {
|
|
arbetsgivare = formatRedovisare(settings.org_number, settings.entity_type)
|
|
} catch {
|
|
arbetsgivare = null
|
|
}
|
|
}
|
|
|
|
return NextResponse.json({
|
|
data: {
|
|
...run,
|
|
arbetsgivare,
|
|
employees: (employees || []).map(emp => ({
|
|
...emp,
|
|
employee: emp.employee ? {
|
|
...emp.employee,
|
|
personnummer: maskPersonnummer(decryptPersonnummer(emp.employee.personnummer)),
|
|
} : null,
|
|
})),
|
|
},
|
|
})
|
|
},
|
|
)
|
|
|
|
export const PATCH = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'salary.runs.update',
|
|
async (request, { supabase, companyId }, { params }) => {
|
|
const { id } = await params
|
|
|
|
// Only allow updates on draft runs
|
|
const { data: run, error: fetchError } = await supabase
|
|
.from('salary_runs')
|
|
.select('id, status')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (fetchError || !run) {
|
|
return NextResponse.json({ error: 'Lönekörning hittades inte' }, { status: 404 })
|
|
}
|
|
|
|
if (run.status !== 'draft') {
|
|
return NextResponse.json({ error: 'Kan bara redigera utkast' }, { status: 400 })
|
|
}
|
|
|
|
const body = await request.json()
|
|
const allowedFields = ['payment_date', 'voucher_series', 'notes']
|
|
const updates: Record<string, unknown> = {}
|
|
for (const field of allowedFields) {
|
|
if (body[field] !== undefined) {
|
|
updates[field] = body[field]
|
|
}
|
|
}
|
|
|
|
const { data: updated, error } = await supabase
|
|
.from('salary_runs')
|
|
.update(updates)
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.select()
|
|
.single()
|
|
|
|
if (error) {
|
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
|
}
|
|
|
|
return NextResponse.json({ data: updated })
|
|
},
|
|
{ requireWrite: true },
|
|
)
|
|
|
|
export const DELETE = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'salary.runs.delete',
|
|
async (_request, { supabase, companyId }, { params }) => {
|
|
const { id } = await params
|
|
|
|
// Only draft runs can be deleted. Once a run reaches review/approved/paid/
|
|
// booked it carries compliance weight — a booked run created immutable
|
|
// verifikat (storno to undo, never delete). A draft has produced no journal
|
|
// entries and no AGI (the arbetsgivardeklaration is filed monthly from the
|
|
// booked/paid run, never from a draft), so removing it touches no posted
|
|
// accounting data.
|
|
const { data: run, error: fetchError } = await supabase
|
|
.from('salary_runs')
|
|
.select('id, status')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (fetchError || !run) {
|
|
return NextResponse.json({ error: 'Lönekörning hittades inte' }, { status: 404 })
|
|
}
|
|
|
|
if (run.status !== 'draft') {
|
|
return NextResponse.json(
|
|
{ error: 'Bara utkast kan raderas. En bokförd lönekörning måste vändas (storno).' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// salary_run_employees and their salary_line_items are removed via
|
|
// ON DELETE CASCADE. An agi_declarations row — never present on a draft —
|
|
// would block the delete via its RESTRICT FK, the safety net for the
|
|
// impossible case.
|
|
const { error } = await supabase
|
|
.from('salary_runs')
|
|
.delete()
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
|
|
if (error) {
|
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
|
}
|
|
|
|
return NextResponse.json({ data: { id, deleted: true } })
|
|
},
|
|
{ requireWrite: true },
|
|
)
|