Fix/skv connection flow (#1015)
* 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>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
e7e3c35f9e
commit
b6332e9ff4
@@ -0,0 +1,83 @@
|
||||
-- Add the payroll gap-closure operation types to the pending_operations
|
||||
-- operation_type CHECK constraint:
|
||||
--
|
||||
-- update_payslip_line (MCP gnubok_update_payslip_line, medium)
|
||||
-- register_absence (MCP gnubok_register_absence, medium)
|
||||
-- create_employee (MCP gnubok_create_employee, medium: PII +
|
||||
-- bank payment-routing fields, same BEC
|
||||
-- rationale as create_supplier)
|
||||
-- update_employee (MCP gnubok_update_employee, medium)
|
||||
-- set_employee_opening_balances (MCP gnubok_set_employee_opening_balances,
|
||||
-- medium: cutover state for mid-year
|
||||
-- migrations; distinct from the SIE
|
||||
-- 'set_opening_balances' op)
|
||||
--
|
||||
-- The list below is the union with 20260703120000 (the previous expansion).
|
||||
-- tests/pg/pending-operations-op-type-audit.pg.test.ts asserts every op type
|
||||
-- staged in server.ts or tiered in risk-tiers.ts is accepted by this
|
||||
-- constraint, so a hand-copy omission fails CI.
|
||||
|
||||
ALTER TABLE public.pending_operations
|
||||
DROP CONSTRAINT IF EXISTS pending_operations_operation_type_check;
|
||||
|
||||
ALTER TABLE public.pending_operations
|
||||
ADD CONSTRAINT pending_operations_operation_type_check
|
||||
CHECK (operation_type IN (
|
||||
'categorize_transaction',
|
||||
'create_customer',
|
||||
'create_invoice',
|
||||
'mark_invoice_paid',
|
||||
'send_invoice',
|
||||
'mark_invoice_sent',
|
||||
'match_transaction_invoice',
|
||||
'close_period',
|
||||
'lock_period',
|
||||
'unlock_period',
|
||||
'set_opening_balances',
|
||||
'run_year_end',
|
||||
'run_currency_revaluation',
|
||||
'import_sie',
|
||||
'explain_voucher_gap',
|
||||
'uncategorize_transaction',
|
||||
'approve_supplier_invoice',
|
||||
'credit_supplier_invoice',
|
||||
'credit_invoice',
|
||||
'convert_invoice',
|
||||
'create_transaction',
|
||||
'attach_document_to_transaction',
|
||||
'create_voucher',
|
||||
'correct_entry',
|
||||
'reverse_entry',
|
||||
'create_supplier',
|
||||
'create_supplier_invoice_from_inbox',
|
||||
'post_annual_depreciation',
|
||||
'link_invoice_voucher',
|
||||
'undo_sie_import',
|
||||
'match_batch_allocate',
|
||||
'bulk_book_transactions',
|
||||
'create_salary_run',
|
||||
'generate_agi',
|
||||
'link_transaction_journal_entry',
|
||||
'link_supplier_invoice_voucher',
|
||||
'submit_vat_declaration',
|
||||
'submit_agi',
|
||||
'create_article',
|
||||
'update_article',
|
||||
'bulk_book_inbox_items',
|
||||
'create_dimension_value',
|
||||
'retag_line_dimensions',
|
||||
'link_document_to_voucher',
|
||||
'update_payslip_line', -- payroll gap-closure 1.7
|
||||
'register_absence', -- payroll gap-closure 1.7
|
||||
'create_employee', -- payroll gap-closure 1.8
|
||||
'update_employee', -- payroll gap-closure 1.8
|
||||
'set_employee_opening_balances' -- payroll gap-closure 2.4 (cutover)
|
||||
)) NOT VALID;
|
||||
|
||||
-- NOT VALID: skips the full-table scan that ADD CONSTRAINT would otherwise
|
||||
-- run while holding ACCESS EXCLUSIVE on this continuously written table.
|
||||
-- Existing rows all satisfy the old (strict subset) list; the constraint is
|
||||
-- validated in 20260713123000 under a non-blocking SHARE UPDATE EXCLUSIVE
|
||||
-- lock. New writes are enforced either way.
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,121 @@
|
||||
-- Migration: employee_opening_balances — payroll cutover state (Phase 2 of
|
||||
-- the payroll gap-closure plan).
|
||||
--
|
||||
-- Why this exists: a company switching to Accounted mid-year brings per-
|
||||
-- employee state that the calculation engine otherwise derives from booked
|
||||
-- salary runs it does not have:
|
||||
-- * YTD gross/tax/net for the cutover year (payslip display continuity;
|
||||
-- AGI is per-run and the youth/växa avgifter caps are per-month, so YTD
|
||||
-- never affects calculations: verified in run-calculation.ts).
|
||||
-- * Vacation balances: paid days remaining this year + sparade dagar per
|
||||
-- origin year (Semesterlagen 5-year rule) + the SEK semesterlöneskuld
|
||||
-- that arrived via SIE opening balances on 2920/2940 (we never book it;
|
||||
-- it feeds the vacation-liability report as an opening term).
|
||||
-- * Karens periods in the prior 12 months NOT represented by imported
|
||||
-- salary_absence_days rows, for allmänt högriskskydd counting
|
||||
-- (Sjuklönelagen 11 §: karensavdrag suppressed from the 11th period).
|
||||
-- Ongoing sick cases themselves need NO field here: importing the
|
||||
-- pre-cutover per-day rows via the absence API reconstructs segments,
|
||||
-- återinsjuknande, and karens-already-taken exactly.
|
||||
--
|
||||
-- One row per (company, employee). Editable until the employee appears in a
|
||||
-- BOOKED salary run; the lock is DERIVED (trigger below), not a flag, so it
|
||||
-- self-unlocks if the only booked run is corrected (status -> 'corrected'),
|
||||
-- which is exactly when re-editing opening balances is legitimate again.
|
||||
|
||||
CREATE TABLE public.employee_opening_balances (
|
||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||
company_id UUID NOT NULL REFERENCES companies(id) ON DELETE CASCADE,
|
||||
employee_id UUID NOT NULL REFERENCES employees(id) ON DELETE CASCADE,
|
||||
-- First day of the month the FIRST Accounted-run period starts. YTD merge
|
||||
-- in the engine only applies to runs in the same year, on or after this.
|
||||
cutover_date DATE NOT NULL,
|
||||
|
||||
-- YTD accumulators for the cutover year (SEK).
|
||||
ytd_gross NUMERIC NOT NULL DEFAULT 0 CHECK (ytd_gross >= 0),
|
||||
ytd_tax NUMERIC NOT NULL DEFAULT 0 CHECK (ytd_tax >= 0),
|
||||
ytd_net NUMERIC NOT NULL DEFAULT 0 CHECK (ytd_net >= 0),
|
||||
|
||||
-- Vacation state at cutover.
|
||||
vacation_paid_days_remaining NUMERIC NOT NULL DEFAULT 0
|
||||
CHECK (vacation_paid_days_remaining >= 0 AND vacation_paid_days_remaining <= 40),
|
||||
-- Sparade dagar keyed by origin year, e.g. {"2024": 5, "2023": 3}.
|
||||
-- Semesterlagen: days may be saved max 5 years; Zod validates keys in
|
||||
-- [cutover_year - 5, cutover_year - 1] and values 0-40 app-side.
|
||||
vacation_saved_days_by_year JSONB NOT NULL DEFAULT '{}'
|
||||
CHECK (jsonb_typeof(vacation_saved_days_by_year) = 'object'),
|
||||
|
||||
-- Opening semesterlöneskuld in SEK. NOT booked by Accounted: the 2920/2940
|
||||
-- balances arrived via SIE opening balances. Feeds the vacation-liability
|
||||
-- report as an opening term only.
|
||||
opening_semester_liability NUMERIC NOT NULL DEFAULT 0
|
||||
CHECK (opening_semester_liability >= 0),
|
||||
opening_semester_liability_avgifter NUMERIC NOT NULL DEFAULT 0
|
||||
CHECK (opening_semester_liability_avgifter >= 0),
|
||||
|
||||
-- Karens periods in the 12 months before cutover not covered by imported
|
||||
-- absence rows (högriskskydd cap is 10 per rolling 12 months).
|
||||
karens_periods_adjustment INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (karens_periods_adjustment >= 0 AND karens_periods_adjustment <= 10),
|
||||
|
||||
created_by UUID REFERENCES auth.users(id),
|
||||
updated_by UUID REFERENCES auth.users(id),
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
|
||||
UNIQUE (company_id, employee_id),
|
||||
-- YTD tax can never exceed gross (net CAN differ from gross - tax because
|
||||
-- of net deductions, so no equality constraint there).
|
||||
CHECK (ytd_tax <= ytd_gross)
|
||||
);
|
||||
|
||||
-- The UNIQUE constraint doubles as the (company_id, employee_id) index; add
|
||||
-- the employee-first path for engine batch loads keyed by employee ids.
|
||||
CREATE INDEX idx_employee_opening_balances_employee
|
||||
ON public.employee_opening_balances (employee_id);
|
||||
|
||||
ALTER TABLE public.employee_opening_balances ENABLE ROW LEVEL SECURITY;
|
||||
|
||||
CREATE POLICY "employee_opening_balances_select" ON public.employee_opening_balances
|
||||
FOR SELECT USING (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_opening_balances_insert" ON public.employee_opening_balances
|
||||
FOR INSERT WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_opening_balances_update" ON public.employee_opening_balances
|
||||
FOR UPDATE USING (company_id IN (SELECT public.user_company_ids()))
|
||||
WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_opening_balances_delete" ON public.employee_opening_balances
|
||||
FOR DELETE USING (company_id IN (SELECT public.user_company_ids()));
|
||||
|
||||
CREATE TRIGGER employee_opening_balances_updated_at
|
||||
BEFORE UPDATE ON public.employee_opening_balances
|
||||
FOR EACH ROW EXECUTE FUNCTION public.update_updated_at_column();
|
||||
|
||||
-- Lock guard: opening balances are editable until the employee has a BOOKED
|
||||
-- salary run. Derived (no flag) so it cannot drift and self-unlocks when the
|
||||
-- only booked run is corrected. The route layer surfaces a clean 409
|
||||
-- (OPENING_BALANCES_LOCKED) before this trigger fires; the trigger is the
|
||||
-- all-paths backstop (service-role writes, future surfaces).
|
||||
CREATE OR REPLACE FUNCTION public.enforce_opening_balances_lock()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
IF EXISTS (
|
||||
SELECT 1
|
||||
FROM public.salary_run_employees sre
|
||||
JOIN public.salary_runs sr ON sr.id = sre.salary_run_id
|
||||
WHERE sre.employee_id = NEW.employee_id
|
||||
AND sre.company_id = NEW.company_id
|
||||
AND sr.status = 'booked'
|
||||
) THEN
|
||||
RAISE EXCEPTION
|
||||
'Ingående saldon är låsta: den anställda har en bokförd lönekörning.'
|
||||
USING ERRCODE = 'check_violation';
|
||||
END IF;
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
CREATE TRIGGER enforce_opening_balances_lock
|
||||
BEFORE INSERT OR UPDATE ON public.employee_opening_balances
|
||||
FOR EACH ROW EXECUTE FUNCTION public.enforce_opening_balances_lock();
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,26 @@
|
||||
-- Migration: employees work schedule (arbetsschema-lite, payroll gap-closure
|
||||
-- Phase 4).
|
||||
--
|
||||
-- The salary engine has hardcoded 40h/5d assumptions: monthly -> hourly uses
|
||||
-- divisor 173 (52w x 40h / 12m, CBA convention) and daily rates use divisor
|
||||
-- 21 (52w x 5d / 12m, rounded). For part-time schedules both are wrong: a
|
||||
-- 4-day/32-hour employee's sick/VAB deduction should divide by ~17.33, not
|
||||
-- 21. These two columns parametrize the divisors via
|
||||
-- lib/salary/work-schedule.ts.
|
||||
--
|
||||
-- Precedence: employment_degree keeps prorating BASE SALARY;
|
||||
-- hours_per_week/workdays_per_week ONLY drive the divisors. They can encode
|
||||
-- overlapping facts (75% degree vs 30h week); the engine deliberately does
|
||||
-- not reconcile them.
|
||||
--
|
||||
-- Backward compatibility: the helpers return the LEGACY constants (173, 21)
|
||||
-- exactly when the values equal the defaults, so every existing employee's
|
||||
-- pay math is byte-identical after this migration.
|
||||
|
||||
ALTER TABLE public.employees
|
||||
ADD COLUMN hours_per_week numeric NOT NULL DEFAULT 40
|
||||
CHECK (hours_per_week > 0 AND hours_per_week <= 80),
|
||||
ADD COLUMN workdays_per_week numeric NOT NULL DEFAULT 5
|
||||
CHECK (workdays_per_week >= 1 AND workdays_per_week <= 7);
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,125 @@
|
||||
-- RPC: get_vat_declaration_totals — one-round-trip aggregation for the
|
||||
-- momsdeklaration (SKV 4700) and the settlement proposal.
|
||||
--
|
||||
-- Replaces the fetchEntryLines pattern in lib/reports/vat-declaration.ts,
|
||||
-- which paged EVERY journal entry + VAT line for the period through
|
||||
-- PostgREST (dozens of round trips for a busy quarter) and aggregated in
|
||||
-- JS, plus a second full entry scan for source_type metadata counts. One
|
||||
-- SQL pass now returns all three sections:
|
||||
--
|
||||
-- totals per-account debit/credit sums over the
|
||||
-- VAT-relevant accounts (p_accounts), excluding
|
||||
-- settlement entries (tagged AND shaped, below)
|
||||
-- settlement_shaped_entries untagged momsredovisning entries detected by
|
||||
-- shape: a line on a declaration account
|
||||
-- (p_ruta_accounts) AND a line on 2650/1650
|
||||
-- (p_net_accounts) in the same entry. Manual
|
||||
-- vouchers, SIE-imported settlements, stornos of
|
||||
-- a settlement (#984). Excluded from totals;
|
||||
-- surfaced so the settlement proposal can warn
|
||||
-- and gate. Opening-balance entries are exempt:
|
||||
-- carried-in 26xx balances are unsettled VAT
|
||||
-- that belongs in the next declaration.
|
||||
-- source_type_counts posted/reversed entry counts per source_type
|
||||
-- for the period (includes tagged settlements,
|
||||
-- matching the old metadata scan).
|
||||
--
|
||||
-- The account lists stay parameters so ACCOUNT_RUTA in TypeScript remains
|
||||
-- the single source of truth for the BAS-to-ruta mapping; extending the
|
||||
-- mapping must never require a migration.
|
||||
--
|
||||
-- SECURITY INVOKER: journal_entries/journal_entry_lines RLS is
|
||||
-- company-scoped via user_company_ids(), so the caller's own membership
|
||||
-- bounds what is aggregated; a non-member calling with a foreign company id
|
||||
-- gets empty sections, not an error. Service-role callers (MCP) rely on the
|
||||
-- explicit p_company_id filter.
|
||||
--
|
||||
-- pg-test: tests/pg/vat-declaration-totals-rpc.pg.test.ts
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.get_vat_declaration_totals(
|
||||
p_company_id uuid,
|
||||
p_start date,
|
||||
p_end date,
|
||||
p_accounts text[],
|
||||
p_ruta_accounts text[],
|
||||
p_net_accounts text[]
|
||||
)
|
||||
RETURNS jsonb
|
||||
LANGUAGE sql
|
||||
STABLE
|
||||
SECURITY INVOKER
|
||||
SET search_path TO 'public'
|
||||
AS $$
|
||||
WITH scoped_entries AS (
|
||||
SELECT id, status, entry_date, source_type, voucher_series, voucher_number
|
||||
FROM public.journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND status IN ('posted', 'reversed')
|
||||
AND entry_date >= p_start
|
||||
AND entry_date <= p_end
|
||||
),
|
||||
non_settlement_entries AS (
|
||||
SELECT * FROM scoped_entries
|
||||
WHERE source_type IS DISTINCT FROM 'vat_settlement'
|
||||
),
|
||||
vat_lines AS (
|
||||
SELECT l.journal_entry_id, l.account_number, l.debit_amount, l.credit_amount
|
||||
FROM public.journal_entry_lines l
|
||||
JOIN non_settlement_entries e ON e.id = l.journal_entry_id
|
||||
WHERE l.account_number = ANY (p_accounts)
|
||||
),
|
||||
shaped AS (
|
||||
SELECT e.id, e.status, e.entry_date, e.source_type, e.voucher_series, e.voucher_number
|
||||
FROM non_settlement_entries e
|
||||
WHERE e.source_type IS DISTINCT FROM 'opening_balance'
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM vat_lines l
|
||||
WHERE l.journal_entry_id = e.id AND l.account_number = ANY (p_ruta_accounts)
|
||||
)
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM vat_lines l
|
||||
WHERE l.journal_entry_id = e.id AND l.account_number = ANY (p_net_accounts)
|
||||
)
|
||||
)
|
||||
SELECT jsonb_build_object(
|
||||
'totals', COALESCE((
|
||||
SELECT jsonb_agg(jsonb_build_object(
|
||||
'account_number', t.account_number,
|
||||
'debit', t.debit,
|
||||
'credit', t.credit
|
||||
) ORDER BY t.account_number)
|
||||
FROM (
|
||||
SELECT l.account_number,
|
||||
sum(l.debit_amount)::float8 AS debit,
|
||||
sum(l.credit_amount)::float8 AS credit
|
||||
FROM vat_lines l
|
||||
WHERE NOT EXISTS (SELECT 1 FROM shaped s WHERE s.id = l.journal_entry_id)
|
||||
GROUP BY l.account_number
|
||||
) t
|
||||
), '[]'::jsonb),
|
||||
'settlement_shaped_entries', COALESCE((
|
||||
SELECT jsonb_agg(jsonb_build_object(
|
||||
'id', s.id,
|
||||
'status', s.status,
|
||||
'entry_date', s.entry_date,
|
||||
'source_type', s.source_type,
|
||||
'voucher_series', s.voucher_series,
|
||||
'voucher_number', s.voucher_number
|
||||
) ORDER BY s.entry_date, s.id)
|
||||
FROM shaped s
|
||||
), '[]'::jsonb),
|
||||
'source_type_counts', COALESCE((
|
||||
SELECT jsonb_object_agg(COALESCE(c.source_type, ''), c.n)
|
||||
FROM (
|
||||
SELECT source_type, count(*)::int AS n
|
||||
FROM scoped_entries
|
||||
GROUP BY source_type
|
||||
) c
|
||||
), '{}'::jsonb)
|
||||
)
|
||||
$$;
|
||||
|
||||
REVOKE ALL ON FUNCTION public.get_vat_declaration_totals(uuid, date, date, text[], text[], text[]) FROM PUBLIC, anon;
|
||||
GRANT EXECUTE ON FUNCTION public.get_vat_declaration_totals(uuid, date, date, text[], text[], text[]) TO authenticated, service_role;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,73 @@
|
||||
-- Add 'vacation_year_close' to the pending_operations operation_type CHECK
|
||||
-- (payroll gap-closure Phase 3: gnubok_close_vacation_year).
|
||||
--
|
||||
-- Risk tier: HIGH (lib/pending-operations/risk-tiers.ts): the close rolls
|
||||
-- every employee's vacation balances into the next year and may post a
|
||||
-- 2920/2940 drift-adjustment verifikation. Never auto-committed.
|
||||
--
|
||||
-- The list below is the union with 20260713100000 (previous expansion).
|
||||
-- tests/pg/pending-operations-op-type-audit.pg.test.ts asserts every op type
|
||||
-- staged in server.ts or tiered in risk-tiers.ts is accepted here.
|
||||
|
||||
ALTER TABLE public.pending_operations
|
||||
DROP CONSTRAINT IF EXISTS pending_operations_operation_type_check;
|
||||
|
||||
ALTER TABLE public.pending_operations
|
||||
ADD CONSTRAINT pending_operations_operation_type_check
|
||||
CHECK (operation_type IN (
|
||||
'categorize_transaction',
|
||||
'create_customer',
|
||||
'create_invoice',
|
||||
'mark_invoice_paid',
|
||||
'send_invoice',
|
||||
'mark_invoice_sent',
|
||||
'match_transaction_invoice',
|
||||
'close_period',
|
||||
'lock_period',
|
||||
'unlock_period',
|
||||
'set_opening_balances',
|
||||
'run_year_end',
|
||||
'run_currency_revaluation',
|
||||
'import_sie',
|
||||
'explain_voucher_gap',
|
||||
'uncategorize_transaction',
|
||||
'approve_supplier_invoice',
|
||||
'credit_supplier_invoice',
|
||||
'credit_invoice',
|
||||
'convert_invoice',
|
||||
'create_transaction',
|
||||
'attach_document_to_transaction',
|
||||
'create_voucher',
|
||||
'correct_entry',
|
||||
'reverse_entry',
|
||||
'create_supplier',
|
||||
'create_supplier_invoice_from_inbox',
|
||||
'post_annual_depreciation',
|
||||
'link_invoice_voucher',
|
||||
'undo_sie_import',
|
||||
'match_batch_allocate',
|
||||
'bulk_book_transactions',
|
||||
'create_salary_run',
|
||||
'generate_agi',
|
||||
'link_transaction_journal_entry',
|
||||
'link_supplier_invoice_voucher',
|
||||
'submit_vat_declaration',
|
||||
'submit_agi',
|
||||
'create_article',
|
||||
'update_article',
|
||||
'bulk_book_inbox_items',
|
||||
'create_dimension_value',
|
||||
'retag_line_dimensions',
|
||||
'link_document_to_voucher',
|
||||
'update_payslip_line',
|
||||
'register_absence',
|
||||
'create_employee',
|
||||
'update_employee',
|
||||
'set_employee_opening_balances',
|
||||
'vacation_year_close' -- payroll gap-closure 3.4 (semesterårsavslut)
|
||||
)) NOT VALID;
|
||||
|
||||
-- NOT VALID for the same reason as 20260713100000: no full-table scan under
|
||||
-- ACCESS EXCLUSIVE. Validated in 20260713123000.
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,102 @@
|
||||
-- Migration: vacation balance ledger + year closures (payroll gap-closure
|
||||
-- Phase 3: semesterberedning/semesterårsavslut).
|
||||
--
|
||||
-- Why this exists: vacation liability has been COMPUTED from booked salary
|
||||
-- runs (per-run accrual summed by lib/reports/vacation-liability.ts) and
|
||||
-- sparade dagar was a single cumulative field on employees. That breaks at
|
||||
-- every intjänandeår boundary: no persisted per-year balance, no 5-year
|
||||
-- sparade-dagar tracking (Semesterlagen 18 §), no year-close.
|
||||
--
|
||||
-- employee_vacation_balances: one row per (company, employee, vacation year).
|
||||
-- DAYS ONLY: the SEK side stays derived (2920/2940 are booked per run plus
|
||||
-- the cutover opening term); persisting a parallel SEK column would create a
|
||||
-- reconciliation obligation with zero new information.
|
||||
--
|
||||
-- The ledger is RECOMPUTED from booked runs on every book/correct (not
|
||||
-- incremented): idempotent, self-healing, and corrections need no special
|
||||
-- casing.
|
||||
--
|
||||
-- vacation_year_closures: audit anchor for the year-close workflow. The
|
||||
-- frozen report is räkenskapsinformation (BFL 7 kap: it justifies the
|
||||
-- adjustment verifikation), so there is deliberately NO DELETE policy.
|
||||
|
||||
CREATE TABLE public.employee_vacation_balances (
|
||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||
company_id UUID NOT NULL REFERENCES companies(id) ON DELETE CASCADE,
|
||||
employee_id UUID NOT NULL REFERENCES employees(id) ON DELETE CASCADE,
|
||||
-- First day of the vacation year: Jan 1 (calendar basis) or Apr 1
|
||||
-- (statutory basis), per company_settings.salary_vacation_year_basis.
|
||||
vacation_year_start DATE NOT NULL,
|
||||
-- Betalda dagar available this year (entitlement, or the cutover import).
|
||||
entitled_days NUMERIC NOT NULL DEFAULT 0 CHECK (entitled_days >= 0),
|
||||
-- Intjänade toward NEXT year (statutory Apr-Mar basis only; for
|
||||
-- sammanfallande calendar years intjänande and uttag coincide and this
|
||||
-- stays 0).
|
||||
accrued_days NUMERIC NOT NULL DEFAULT 0 CHECK (accrued_days >= 0),
|
||||
taken_days NUMERIC NOT NULL DEFAULT 0 CHECK (taken_days >= 0),
|
||||
-- Sparade dagar keyed by origin year, e.g. {"2024": 5}: same
|
||||
-- representation as employee_opening_balances.vacation_saved_days_by_year.
|
||||
saved_days JSONB NOT NULL DEFAULT '{}'
|
||||
CHECK (jsonb_typeof(saved_days) = 'object'),
|
||||
-- Days that exceeded the 5-year saving limit at close: must be paid out
|
||||
-- as semesterersättning via a normal salary run.
|
||||
forced_payout_days NUMERIC NOT NULL DEFAULT 0 CHECK (forced_payout_days >= 0),
|
||||
status TEXT NOT NULL DEFAULT 'open' CHECK (status IN ('open', 'closed')),
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
UNIQUE (company_id, employee_id, vacation_year_start)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_employee_vacation_balances_employee
|
||||
ON public.employee_vacation_balances (employee_id, vacation_year_start);
|
||||
|
||||
ALTER TABLE public.employee_vacation_balances ENABLE ROW LEVEL SECURITY;
|
||||
|
||||
CREATE POLICY "employee_vacation_balances_select" ON public.employee_vacation_balances
|
||||
FOR SELECT USING (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_vacation_balances_insert" ON public.employee_vacation_balances
|
||||
FOR INSERT WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_vacation_balances_update" ON public.employee_vacation_balances
|
||||
FOR UPDATE USING (company_id IN (SELECT public.user_company_ids()))
|
||||
WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "employee_vacation_balances_delete" ON public.employee_vacation_balances
|
||||
FOR DELETE USING (company_id IN (SELECT public.user_company_ids()));
|
||||
|
||||
CREATE TRIGGER employee_vacation_balances_updated_at
|
||||
BEFORE UPDATE ON public.employee_vacation_balances
|
||||
FOR EACH ROW EXECUTE FUNCTION public.update_updated_at_column();
|
||||
|
||||
CREATE TABLE public.vacation_year_closures (
|
||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||
company_id UUID NOT NULL REFERENCES companies(id) ON DELETE CASCADE,
|
||||
vacation_year_start DATE NOT NULL,
|
||||
closed_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
closed_by UUID REFERENCES auth.users(id),
|
||||
-- The drift-adjustment verifikation, when one was booked (|drift| > 1 kr).
|
||||
adjustment_entry_id UUID REFERENCES journal_entries(id),
|
||||
-- Frozen close report (per-employee transitions + SEK reconcile): the
|
||||
-- underlag for the adjustment entry, retained 7 years per BFL 7 kap.
|
||||
report JSONB NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
UNIQUE (company_id, vacation_year_start)
|
||||
);
|
||||
|
||||
ALTER TABLE public.vacation_year_closures ENABLE ROW LEVEL SECURITY;
|
||||
|
||||
-- No DELETE policy: closures are audit artifacts. Reopening a year is a
|
||||
-- future explicit feature, not a row delete.
|
||||
CREATE POLICY "vacation_year_closures_select" ON public.vacation_year_closures
|
||||
FOR SELECT USING (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "vacation_year_closures_insert" ON public.vacation_year_closures
|
||||
FOR INSERT WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
CREATE POLICY "vacation_year_closures_update" ON public.vacation_year_closures
|
||||
FOR UPDATE USING (company_id IN (SELECT public.user_company_ids()))
|
||||
WITH CHECK (company_id IN (SELECT public.user_company_ids()));
|
||||
|
||||
-- Vacation year basis: sammanfallande calendar year (the small-company norm)
|
||||
-- or the statutory Apr 1 - Mar 31 split per Semesterlagen 3 §.
|
||||
ALTER TABLE public.company_settings
|
||||
ADD COLUMN salary_vacation_year_basis TEXT NOT NULL DEFAULT 'calendar'
|
||||
CHECK (salary_vacation_year_basis IN ('calendar', 'statutory_apr_mar'));
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,14 @@
|
||||
-- Validate the pending_operations operation_type CHECK constraint that
|
||||
-- 20260713100000 and 20260713121000 added NOT VALID.
|
||||
--
|
||||
-- Deliberately a separate migration file: each migration runs in its own
|
||||
-- transaction, and Postgres holds locks until commit. Putting VALIDATE in the
|
||||
-- same transaction as ADD CONSTRAINT would keep the ACCESS EXCLUSIVE lock
|
||||
-- through the validation scan and gain nothing. Here, VALIDATE only takes
|
||||
-- SHARE UPDATE EXCLUSIVE, so staged-operation writes proceed during the scan.
|
||||
--
|
||||
-- The validation cannot fail: every previous operation_type list is a strict
|
||||
-- subset of the list added by 20260713121000.
|
||||
|
||||
ALTER TABLE public.pending_operations
|
||||
VALIDATE CONSTRAINT pending_operations_operation_type_check;
|
||||
Reference in New Issue
Block a user