* fix(security): guard MCP test keys, RLS role gate + voucher RPC guards, /api MFA gate, deps - MCP: force dry-run / block writes for test-mode API keys in tools/call (extensions/general/mcp-server) - DB: current_user_can_write role gate on write policies (40 tables) + tenant guards, SET search_path, REVOKE anon on commit_journal_entry / next_voucher_number / detect_voucher_gaps (migration 20260702093000) - Middleware: MFA (AAL2) gate on cookie-authenticated /api routes via apiPathSkipsMfaGate - Deps: npm audit fix clears mailparser/linkify-it/nodemailer/svix/uuid highs; xlsx -> SheetJS 0.20.3 Adds unit + pg-real tests. Does not touch in-progress ROT/RUT or invoice-email-texts work. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): rot/rut begäran om utbetalning — HUS XML (V6), payout tracking + settlement, MCP tool Generates Skatteverkets begäran-om-utbetalning file (schema V6) from paid ROT/RUT invoices — no submission API exists, the file is uploaded manually at skatteverket.se. Headless by design for now: API routes + MCP tool (gnubok_generate_rot_rut_file), no UI surfaces. - lib/invoices/rot-rut-file.ts: pure XML generator with deterministic per-invoice blockers (hours, work type, personnummer, property info, mixed rot+rut, XSD limits) + 31 January deadline warnings - rot_rut_payout_requests(+items) tables: one active begäran per invoice (DB triggers incl. reactivation guard), RLS, audit, pg-real tests - Settlement: POST /settle books debit 1930 / credit 1513 via the engine (source_type rot_rut_payout); partial payouts → partially_paid - Work-type lists corrected against Begaran.xsd: IT-tjänster is rut-only, snöskottning/tillsyn/tvätt added (schablontjänster utfört-only) - Fix: invoice-level fastighetsbeteckning was validated but never persisted — now stamped onto rot lines in build-invoice-write; API accepts bostadsrätt pair (lägenhetsnr + BRF orgnr, editor UI deferred) - invoice_items.brf_org_number migration + MCP scope invoices:write Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): per-company editable invoice email texts Add an "E-posttexter" section under Settings -> Fakturering where the subject, greeting, body and sign-off of the standard invoice email can be customized per company in Swedish and English. Fields pre-fill with the standard texts and only diffs from the standard are stored (company_settings.invoice_email_texts JSONB), so future improvements to the stock wording still reach companies that have not customized. Each field has a reset-to-standard button; cleared fields snap back. Texts support a fixed placeholder set (invoice number, customer name, first name, company, due date, amount) substituted at send time in a single pass; unknown placeholders stay literal. Custom texts are HTML-escaped after substitution, newlines become <br> in the HTML variant, and subject lines are flattened to a single header line. Overrides apply to standard invoices only - credit notes, proforma and delivery notes keep the stock texts. All send paths (UI, v1 API, MCP approval, recurring) pick the texts up via the existing settings row. The Zod schema half of this change (InvoiceEmailTextsSchema in lib/api/schemas.ts) was inadvertently included in 8291f745. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(documents): accept PDFs with preamble before %PDF- header, surface content rejections as 400 detectFileMagic required the %PDF- signature at byte 0 (BOM aside), rejecting genuine PDFs that carry a leading newline or junk bytes — files every ISO 32000 reader opens fine. Now scan the first 1024 bytes for the signature, matching real-reader behavior. Image types stay strict at offset 0 to keep the anti-placeholder defense tight. Magic-byte rejections were also mislabeled as DOC_UPLOAD_STORAGE_FAILED (500 'Filen kunde inte sparas'), blaming storage for a client-side file problem. Both upload routes now map them to a new DOC_UPLOAD_INVALID_CONTENT (400) with an accurate message. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(bookkeeping): full keyboard flow for manual journal entry Enter now drives the whole verifikat flow: verifikationstext drops into the first row missing an account, konto commits advance to debet, Enter on an empty debet hops to kredit, and an entered amount jumps to the next row. Once the voucher balances, Enter opens the review (unchanged gate) and the auto-focused confirm posts it — including through the no-underlag warning dialog. Escape in the inline review goes back to the form. Also fixes an Enter footgun in AccountCombobox: a bare Enter on a freshly focused field no longer selects the first account in the list — selection now requires typing or arrow navigation; otherwise Enter re-commits the current value or bubbles to the form-level handler. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: add custom inbound domains management for companies - Implemented functionality to allow companies to claim and manage their own inbound email domains via Resend's API. - Created a new table `company_inbound_domains` to store domain information, including status and DNS records. - Added necessary RLS policies to restrict access based on user roles (owner/admin). - Developed functions for domain normalization, validation, claiming, verification, and removal. - Implemented webhook handling for domain status updates from Resend. - Added comprehensive tests for RLS, constraints, and triggers related to the new domain management feature. * fix: address PR #878 review findings and CI failures - migrations: drop the ai_usage_tracking policy block from the role-gate migration — the table was removed by 20260504120000_remove_ai_subsystem and only lingers on staging as drift; a from-scratch chain (pg-real, Supabase preview) failed on it - invoice-inbox: never flip a custom domain to verified off a domain.updated webhook alone — confirm the receiving capability with Resend first (fail-closed); normalize both sides of the orphan-adoption domain match - rot/rut: block files where begärt belopp exceeds what the buyer paid (DEDUCTION_EXCEEDS_PAYMENT); tighten brf_org_number validation to real orgnr shapes; parameterize the settlement bank account (19xx, default 1930) - rot/rut routes: log acting user on financial mutations, stop swallowing item mirror errors, narrow response projections (no customer ids through the invoice join); document the deliberate inline-XML decision - documents: stop echoing raw storage-layer error messages to clients Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: round-2 CI + compliance findings on PR #878 - migrations: the role-gate migration targeted automation_webhooks, which 20260515170000_webhooks_v2 renamed to webhooks on the canonical chain (staging kept the old name — drift); gate public.webhooks instead, dropping legacy schema-sync policy names defensively. Restore the 20260623130000 owner fallback in next_voucher_number that the stale copied-verbatim body silently reverted (caught by engine.pg locally). Full migration chain verified from scratch against supabase/postgres:15. - mcp: bump the tools/list payload ceiling 44K -> 45K — main's #877 qualified-identifier schemas plus this branch's rot/rut tool crossed the ceiling only in combination; documented in the test's history log. - rot/rut: refuse partial settlement before Skatteverkets beslut is recorded (would bypass the PATCH lifecycle and strand the request); block zero-kronor ärenden (ZERO_DEDUCTION); require sekelsiffra 16 on 12-digit brf orgnr in both schema validation and normalizeBrfOrgNr Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: rename branch migrations off main's colliding versions After the merge with main, two versions were shared by two files each (20260702100000: rot_rut_payout_requests vs company_settings_dimensions_ enabled; 20260702130000: invoice_email_texts vs pending_operations_add_ create_dimension_value). psql-based CI applies by filename and doesn't care, but Supabase branching records migrations by version (PK) — the second file with the same version breaks the preview with a schema_migrations_pkey duplicate. Neither branch migration is version- recorded on staging or prod, so renaming to fresh 20260703 versions is safe; nothing between the old and new positions depends on these objects. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): scope the /api MFA-gate bypass to real Bearer-auth surfaces Any Authorization header — attacker-controlled — used to skip the AAL2 gate for every /api route, so a stolen-password AAL1 cookie session could reach cookie-authenticated routes (which ignore the header) by attaching `Authorization: x`. The skip is now scoped to the surfaces whose auth contract IS the header (/api/v1 API keys, the MCP endpoint's OAuth tokens); pure Bearer callers elsewhere (cron secret, signed webhooks) carry no cookie session and were never touched by the gate, which only fires for cookie users. Superagent P2 on PR #878. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: normalize path separators in dimension statutory guard scan The route scan compared walked file paths against a POSIX-path allowlist, so the suite failed on Windows (backslash separators) while passing on Linux CI. Normalize the scanned paths to forward slashes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
198 lines
7.6 KiB
TypeScript
198 lines
7.6 KiB
TypeScript
/**
|
||
* ROT/RUT-avdrag rules.
|
||
*
|
||
* Implements the calculation and validation logic for Sweden's tax deduction
|
||
* for household services (RUT) and home renovation (ROT). As of 2026:
|
||
* - ROT: 30% of labor cost, max 50 000 kr per person per year.
|
||
* - RUT: 50% of labor cost, max 75 000 kr per person per year.
|
||
*
|
||
* The deduction applies to labor only — material costs and travel time are
|
||
* NOT eligible. In this v1 we treat the entire invoice item amount as labor
|
||
* when the user flags it ROT/RUT; the user is expected to either invoice
|
||
* labor on its own row or split materials onto a non-flagged row. A future
|
||
* iteration can add per-line "labor portion" handling if needed.
|
||
*
|
||
* We CAN'T verify that the customer has remaining yearly headroom (they may
|
||
* have claimed elsewhere). We surface a warning when the per-invoice total
|
||
* already exceeds the statutory max — the customer must then handle the
|
||
* excess outside of fakturamodellen.
|
||
*
|
||
* All functions are pure and deterministic. No I/O, no DB calls — easy to
|
||
* unit-test and easy to embed in the API validator and the live total
|
||
* preview in the invoice editor.
|
||
*/
|
||
|
||
/** Percentage of eligible amount deducted for ROT (renovation). 2026 rule. */
|
||
export const ROT_PERCENT = 0.30
|
||
|
||
/** Percentage of eligible amount deducted for RUT (household services). 2026 rule. */
|
||
export const RUT_PERCENT = 0.50
|
||
|
||
/** Maximum yearly ROT deduction per person, in kr. 2026 rule. */
|
||
export const ROT_MAX = 50000
|
||
|
||
/** Maximum yearly RUT deduction per person, in kr. 2026 rule. */
|
||
export const RUT_MAX = 75000
|
||
|
||
export type DeductionType = 'rot' | 'rut'
|
||
|
||
/** Skatteverket work codes used by Husavdragstjänsten. Maps a free-text */
|
||
/** "what the worker did" label to the official code. The code drives which */
|
||
/** element the begäran-om-utbetalning file (Begaran.xsd V6) reports the */
|
||
/** hours under — see WORK_TYPE_ELEMENTS in lib/invoices/rot-rut-file.ts. */
|
||
/** The lists mirror the XSD exactly: rot work types are the seven */
|
||
/** ArendeUtfortArbeteRotTYPE elements (IT-tjänster is a RUT service and was */
|
||
/** removed from the rot list 2026-07); rut covers all thirteen */
|
||
/** ArendeUtfortArbeteRutTYPE elements incl. the two schablontjänster. */
|
||
export const ROT_WORK_TYPES = [
|
||
{ code: 'BYGG', label: 'Byggnadsarbete' },
|
||
{ code: 'EL', label: 'Elarbete' },
|
||
{ code: 'GLAS_PLAT', label: 'Glas- och plåtarbete' },
|
||
{ code: 'MARK_DRAN', label: 'Mark- och dräneringsarbete' },
|
||
{ code: 'MURNING', label: 'Murnings- och putsarbete' },
|
||
{ code: 'MALNING', label: 'Mål- och tapetseringsarbete' },
|
||
{ code: 'VVS', label: 'VVS-arbete' },
|
||
] as const
|
||
|
||
export const RUT_WORK_TYPES = [
|
||
{ code: 'STAD', label: 'Städning' },
|
||
{ code: 'KLAD', label: 'Kläd- och textilvård' },
|
||
{ code: 'SNOSKOTTNING', label: 'Snöskottning' },
|
||
{ code: 'TRADGARD', label: 'Trädgårdsarbete' },
|
||
{ code: 'BARNPASS', label: 'Barnpassning' },
|
||
{ code: 'PERSONLIG_OMS', label: 'Personlig omsorg' },
|
||
{ code: 'FLYTT', label: 'Flyttjänster' },
|
||
{ code: 'IT', label: 'IT-tjänster i hemmet' },
|
||
{ code: 'REPARATION', label: 'Reparation av vitvaror' },
|
||
{ code: 'MOBLERING', label: 'Möblering' },
|
||
{ code: 'TILLSYN', label: 'Tillsyn av bostad' },
|
||
// Schablontjänster: reported as utförd/ej utförd in the Skatteverket file,
|
||
// never with hours or material.
|
||
{ code: 'TRANSPORT', label: 'Transport till försäljning (schablon)' },
|
||
{ code: 'TVATT', label: 'Tvätt vid tvättinrättning (schablon)' },
|
||
] as const
|
||
|
||
export interface ItemForDeduction {
|
||
/** Unit price (per `quantity`). Same field as invoice_items.unit_price. */
|
||
unit_price: number
|
||
/** Quantity. Same field as invoice_items.quantity. */
|
||
quantity: number
|
||
/** 'rot' | 'rut' | null. Drives whether the deduction kicks in at all. */
|
||
deduction_type?: DeductionType | null
|
||
/**
|
||
* Optional. Reserved for a future iteration where the eligible portion of
|
||
* the row is just the labor hours × hourly rate. v1 ignores this and
|
||
* deducts on the full line total; we still take the field so the API
|
||
* schema accepts it without rejecting future-shaped payloads.
|
||
*/
|
||
labor_hours?: number | null
|
||
}
|
||
|
||
/**
|
||
* Compute the deduction amount for a single invoice item. Returns 0 when
|
||
* the item has no deduction_type. The result is always >= 0 and <= line
|
||
* total (no over-deduction even if percentages are tweaked).
|
||
*/
|
||
export function computeDeduction(item: ItemForDeduction): number {
|
||
if (!item.deduction_type) return 0
|
||
const lineTotal = item.unit_price * item.quantity
|
||
if (lineTotal <= 0) return 0
|
||
const percent = item.deduction_type === 'rot' ? ROT_PERCENT : RUT_PERCENT
|
||
const raw = lineTotal * percent
|
||
// Cap at line total — defensive against future rule changes that would
|
||
// push percent past 1.0.
|
||
const capped = Math.min(raw, lineTotal)
|
||
return Math.round(capped * 100) / 100
|
||
}
|
||
|
||
/**
|
||
* Sum the per-item deduction over an invoice. Returns the total to store
|
||
* on invoices.deduction_total and to use as the 1513 debit amount.
|
||
*/
|
||
export function computeInvoiceDeductionTotal(items: ItemForDeduction[]): number {
|
||
let total = 0
|
||
for (const item of items) {
|
||
total += computeDeduction(item)
|
||
}
|
||
return Math.round(total * 100) / 100
|
||
}
|
||
|
||
/**
|
||
* Sum per deduction kind. Used to surface separate cap warnings.
|
||
*/
|
||
export function computeDeductionTotalsByKind(items: ItemForDeduction[]): {
|
||
rot: number
|
||
rut: number
|
||
} {
|
||
let rot = 0
|
||
let rut = 0
|
||
for (const item of items) {
|
||
const amount = computeDeduction(item)
|
||
if (item.deduction_type === 'rot') rot += amount
|
||
else if (item.deduction_type === 'rut') rut += amount
|
||
}
|
||
return {
|
||
rot: Math.round(rot * 100) / 100,
|
||
rut: Math.round(rut * 100) / 100,
|
||
}
|
||
}
|
||
|
||
export interface ValidateInvoiceItem extends ItemForDeduction {
|
||
housing_designation?: string | null
|
||
}
|
||
|
||
export interface ValidationResult {
|
||
errors: string[]
|
||
warnings: string[]
|
||
}
|
||
|
||
/**
|
||
* Validate ROT/RUT prerequisites against a draft invoice.
|
||
*
|
||
* Errors block invoice creation; warnings surface in the UI but don't
|
||
* block (we can't verify a customer's yearly headroom across providers,
|
||
* but we can surface a "this invoice alone exceeds the cap" warning).
|
||
*
|
||
* The function takes invoice-level metadata as separate arguments rather
|
||
* than reading them off the items array so callers can compose it from
|
||
* either a HTTP request body or the form state without restructuring.
|
||
*/
|
||
export function validateInvoice(
|
||
items: ValidateInvoiceItem[],
|
||
personnummerProvided: boolean,
|
||
housingDesignationProvided: boolean,
|
||
): ValidationResult {
|
||
const errors: string[] = []
|
||
const warnings: string[] = []
|
||
|
||
const hasAnyDeduction = items.some((item) => item.deduction_type)
|
||
const hasAnyRot = items.some((item) => item.deduction_type === 'rot')
|
||
|
||
if (hasAnyDeduction && !personnummerProvided) {
|
||
errors.push('Personnummer krävs för ROT/RUT-avdrag.')
|
||
}
|
||
|
||
// ROT requires fastighetsbeteckning per Skatteverket's Husavdragstjänst.
|
||
// RUT does not (in 2026 the Skatteverket file accepts RUT without it).
|
||
if (hasAnyRot && !housingDesignationProvided) {
|
||
errors.push('Fastighetsbeteckning krävs för ROT-avdrag.')
|
||
}
|
||
|
||
const { rot, rut } = computeDeductionTotalsByKind(items)
|
||
|
||
if (rot > ROT_MAX) {
|
||
warnings.push(
|
||
`ROT-avdraget på denna faktura (${rot.toFixed(2)} kr) överstiger årsmaximum ${ROT_MAX.toLocaleString('sv-SE')} kr. ` +
|
||
'Kunden behöver kontrollera sitt återstående utrymme själv.',
|
||
)
|
||
}
|
||
if (rut > RUT_MAX) {
|
||
warnings.push(
|
||
`RUT-avdraget på denna faktura (${rut.toFixed(2)} kr) överstiger årsmaximum ${RUT_MAX.toLocaleString('sv-SE')} kr. ` +
|
||
'Kunden behöver kontrollera sitt återstående utrymme själv.',
|
||
)
|
||
}
|
||
|
||
return { errors, warnings }
|
||
}
|