feat: voucher linking, recovery ops, and salary overrides (#591)
* 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>
This commit is contained in:
Jakob Wennberg
co-authored by
Claude Opus 4.7
Emil
Claude Opus 4.7
Emil
parent
cb7eac90b1
commit
ccdfed5fea
@@ -0,0 +1,216 @@
|
||||
-- Fix delete_last_voucher RPC to clear the fiscal-period IB pointer before
|
||||
-- deleting an opening-balance entry.
|
||||
--
|
||||
-- Background: 20260509103736_allow_draft_voucher_delete.sql added support
|
||||
-- for deleting drafts and the last posted voucher in a series. It bypasses
|
||||
-- enforce_journal_entry_immutability with gnubok.allow_delete='true', but
|
||||
-- when the target is the opening-balance entry (referenced by
|
||||
-- fiscal_periods.opening_balance_entry_id), the trigger
|
||||
-- enforce_opening_balance_immutability blocks the deletion path because
|
||||
-- the FK is still held by fiscal_periods. That trigger does NOT honor the
|
||||
-- gnubok.allow_delete GUC.
|
||||
--
|
||||
-- Symptom: customer report (Nice Problems AB) -- "IB-verifikat (A1) går
|
||||
-- inte radera, 'Kunde inte radera'".
|
||||
--
|
||||
-- Fix mirrors the two-step pattern already used by replace_sie_import
|
||||
-- (20260526120000_fix_replace_sie_import_hard_delete.sql:113-122):
|
||||
-- 1. Flip opening_balances_set to false in its own UPDATE so the
|
||||
-- immutability trigger lets us change the FK in a second UPDATE.
|
||||
-- 2. Clear opening_balance_entry_id.
|
||||
-- 3. Also clear sie_imports.opening_balance_entry_id if any import row
|
||||
-- pointed to this entry, so the import audit row stays consistent
|
||||
-- without a dangling FK.
|
||||
-- Then proceed with the existing deletion logic.
|
||||
--
|
||||
-- After deletion, getOpeningBalances() (lib/reports/opening-balances.ts)
|
||||
-- falls back to compute-from-history; trial balance and reports remain
|
||||
-- correct (the entry is gone, the period link is gone, BFL trail is in
|
||||
-- audit_log).
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.delete_last_voucher(p_company_id uuid, p_entry_id uuid)
|
||||
RETURNS jsonb
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path TO 'public'
|
||||
AS $function$
|
||||
DECLARE
|
||||
v_entry record;
|
||||
v_period record;
|
||||
v_max_voucher integer;
|
||||
v_ref_count integer;
|
||||
v_caller_role text;
|
||||
v_snapshot jsonb;
|
||||
v_lines_snapshot jsonb;
|
||||
v_is_period_ib boolean := false;
|
||||
BEGIN
|
||||
SELECT cm.role INTO v_caller_role
|
||||
FROM company_members cm
|
||||
WHERE cm.company_id = p_company_id
|
||||
AND cm.user_id = auth.uid();
|
||||
|
||||
IF v_caller_role IS NULL OR v_caller_role NOT IN ('owner', 'admin') THEN
|
||||
RAISE EXCEPTION 'Only company owners and admins can delete vouchers';
|
||||
END IF;
|
||||
|
||||
SELECT * INTO v_entry
|
||||
FROM journal_entries
|
||||
WHERE id = p_entry_id
|
||||
AND company_id = p_company_id
|
||||
FOR UPDATE;
|
||||
|
||||
IF v_entry IS NULL THEN
|
||||
RAISE EXCEPTION 'Journal entry not found';
|
||||
END IF;
|
||||
|
||||
IF v_entry.status NOT IN ('posted', 'draft') THEN
|
||||
RAISE EXCEPTION 'Only posted or draft entries can be deleted (current status: %)', v_entry.status;
|
||||
END IF;
|
||||
|
||||
SELECT jsonb_agg(to_jsonb(l)) INTO v_lines_snapshot
|
||||
FROM journal_entry_lines l
|
||||
WHERE l.journal_entry_id = p_entry_id;
|
||||
|
||||
v_snapshot := to_jsonb(v_entry) || jsonb_build_object('lines', COALESCE(v_lines_snapshot, '[]'::jsonb));
|
||||
|
||||
-- Draft path: simplified deletion (no series, no period checks needed)
|
||||
IF v_entry.status = 'draft' THEN
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
|
||||
UPDATE document_attachments
|
||||
SET journal_entry_id = NULL
|
||||
WHERE journal_entry_id = p_entry_id;
|
||||
|
||||
DELETE FROM journal_entries WHERE id = p_entry_id;
|
||||
|
||||
INSERT INTO audit_log (user_id, action, table_name, record_id, actor_id, old_state, description)
|
||||
VALUES (
|
||||
v_entry.user_id,
|
||||
'DELETE',
|
||||
'journal_entries',
|
||||
p_entry_id,
|
||||
auth.uid(),
|
||||
v_snapshot,
|
||||
'Deleted draft journal entry (delete_last_voucher RPC, caller: ' || auth.uid() || ')'
|
||||
);
|
||||
|
||||
RETURN jsonb_build_object(
|
||||
'deleted', true,
|
||||
'voucher_series', v_entry.voucher_series,
|
||||
'voucher_number', v_entry.voucher_number,
|
||||
'was_draft', true
|
||||
);
|
||||
END IF;
|
||||
|
||||
-- Posted path
|
||||
SELECT * INTO v_period
|
||||
FROM fiscal_periods
|
||||
WHERE id = v_entry.fiscal_period_id
|
||||
FOR UPDATE;
|
||||
|
||||
IF v_period.is_closed THEN
|
||||
RAISE EXCEPTION 'Cannot delete voucher in a closed fiscal period';
|
||||
END IF;
|
||||
|
||||
IF v_period.locked_at IS NOT NULL THEN
|
||||
RAISE EXCEPTION 'Cannot delete voucher in a locked fiscal period';
|
||||
END IF;
|
||||
|
||||
PERFORM 1 FROM voucher_sequences
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series
|
||||
FOR UPDATE;
|
||||
|
||||
SELECT MAX(voucher_number) INTO v_max_voucher
|
||||
FROM journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series
|
||||
AND status NOT IN ('cancelled', 'draft');
|
||||
|
||||
IF v_entry.voucher_number != v_max_voucher THEN
|
||||
RAISE EXCEPTION 'Kan bara radera det sista verifikatet i serien. % har nummer % men senaste är %',
|
||||
v_entry.voucher_series, v_entry.voucher_number, v_max_voucher;
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(*) INTO v_ref_count
|
||||
FROM journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND status != 'cancelled'
|
||||
AND (reverses_id = p_entry_id OR correction_of_id = p_entry_id);
|
||||
|
||||
IF v_ref_count > 0 THEN
|
||||
RAISE EXCEPTION 'Cannot delete: other entries reference this voucher (% references)',
|
||||
v_ref_count;
|
||||
END IF;
|
||||
|
||||
IF v_entry.reverses_id IS NOT NULL THEN
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
UPDATE journal_entries
|
||||
SET status = 'posted', reversed_by_id = NULL
|
||||
WHERE id = v_entry.reverses_id
|
||||
AND company_id = p_company_id;
|
||||
END IF;
|
||||
|
||||
-- IB pointer clearing: if this entry is the fiscal period's opening-
|
||||
-- balance entry, clear the FK in two steps before deletion. The
|
||||
-- enforce_opening_balance_immutability trigger raises only when both
|
||||
-- opening_balances_set is true AND opening_balance_entry_id changes in
|
||||
-- the same UPDATE, so flip the flag first, then null the FK.
|
||||
v_is_period_ib := (v_period.opening_balance_entry_id = p_entry_id);
|
||||
IF v_is_period_ib THEN
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balances_set = false
|
||||
WHERE id = v_entry.fiscal_period_id;
|
||||
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE id = v_entry.fiscal_period_id;
|
||||
END IF;
|
||||
|
||||
-- Mirror clear on sie_imports if any import row points at this entry
|
||||
-- (sie_imports.opening_balance_entry_id is SET NULL on delete but we
|
||||
-- clear explicitly so the import row stays consistent and we don't rely
|
||||
-- on cascade ordering).
|
||||
UPDATE sie_imports
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE opening_balance_entry_id = p_entry_id;
|
||||
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
|
||||
UPDATE document_attachments
|
||||
SET journal_entry_id = NULL
|
||||
WHERE journal_entry_id = p_entry_id;
|
||||
|
||||
DELETE FROM journal_entries WHERE id = p_entry_id;
|
||||
|
||||
UPDATE voucher_sequences
|
||||
SET last_number = GREATEST(last_number - 1, 0)
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series;
|
||||
|
||||
INSERT INTO audit_log (user_id, action, table_name, record_id, actor_id, old_state, description)
|
||||
VALUES (
|
||||
v_entry.user_id,
|
||||
'DELETE',
|
||||
'journal_entries',
|
||||
p_entry_id,
|
||||
auth.uid(),
|
||||
v_snapshot,
|
||||
'Deleted voucher ' || v_entry.voucher_series || v_entry.voucher_number ||
|
||||
CASE WHEN v_is_period_ib THEN ' (was period IB)' ELSE '' END ||
|
||||
' (delete_last_voucher RPC, caller: ' || auth.uid() || ')'
|
||||
);
|
||||
|
||||
RETURN jsonb_build_object(
|
||||
'deleted', true,
|
||||
'voucher_series', v_entry.voucher_series,
|
||||
'voucher_number', v_entry.voucher_number,
|
||||
'was_period_ib', v_is_period_ib
|
||||
);
|
||||
END;
|
||||
$function$;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,79 @@
|
||||
-- Expand pending_operations.operation_type to include link_invoice_voucher.
|
||||
--
|
||||
-- New op type lets the user mark an invoice as paid by linking an EXISTING
|
||||
-- posted verifikat (whose lines already credit an AR account, default 1510)
|
||||
-- instead of creating a new journal entry. Common after SIE imports, manual
|
||||
-- cash receipts, or any flow where the AR-credit posting landed in the GL
|
||||
-- without invoice linkage. Pure linking — only an invoice_payments row is
|
||||
-- inserted; the verifikat is never modified, so this is safe against
|
||||
-- enforce_period_lock (locked-period vouchers can still be linked).
|
||||
--
|
||||
-- Risk tier: 'medium' (lib/pending-operations/risk-tiers.ts) — reversible by
|
||||
-- deleting the invoice_payments row and reverting invoice status, no booking
|
||||
-- impact. Sits alongside match_transaction_invoice semantically.
|
||||
--
|
||||
-- Also adds the partial unique index that mirrors the existing
|
||||
-- (transaction_id, invoice_id) guard: a single voucher may legitimately
|
||||
-- settle multiple invoices, but linking the same voucher to the same
|
||||
-- invoice twice is rejected at the DB level (matches the
|
||||
-- VOUCHER_ALREADY_LINKED service guard).
|
||||
|
||||
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 (
|
||||
-- Phase 0: original 7 op types
|
||||
'categorize_transaction',
|
||||
'create_customer',
|
||||
'create_invoice',
|
||||
'mark_invoice_paid',
|
||||
'send_invoice',
|
||||
'mark_invoice_sent',
|
||||
'match_transaction_invoice',
|
||||
-- Stream 1 Phase 1: bookkeeping period operations
|
||||
'close_period',
|
||||
'lock_period',
|
||||
'unlock_period',
|
||||
'set_opening_balances',
|
||||
'run_year_end',
|
||||
'run_currency_revaluation',
|
||||
-- Stream 1 Phase 1: SIE import (export is read-only)
|
||||
'import_sie',
|
||||
-- Stream 1 Phase 1: voucher gap explanations
|
||||
'explain_voucher_gap',
|
||||
-- Stream 1 Phase 1: transaction reversal
|
||||
'uncategorize_transaction',
|
||||
-- Stream 1 Phase 1: supplier invoice lifecycle
|
||||
'approve_supplier_invoice',
|
||||
'credit_supplier_invoice',
|
||||
-- Stream 1 Phase 1: invoice operations beyond simple create/send
|
||||
'credit_invoice',
|
||||
'convert_invoice',
|
||||
-- Phase 3: manual transaction ingestion + document attachment
|
||||
'create_transaction',
|
||||
'attach_document_to_transaction',
|
||||
-- Phase 4: arbitrary-line bookkeeping primitives
|
||||
'create_voucher',
|
||||
'correct_entry',
|
||||
'reverse_entry',
|
||||
-- Phase 5: supplier CRUD + inbox conversion
|
||||
'create_supplier',
|
||||
'create_supplier_invoice_from_inbox',
|
||||
-- Bokslut: planenlig avskrivning (one journal entry per asset)
|
||||
'post_annual_depreciation',
|
||||
-- Link an existing posted verifikat as payment for an invoice (no new JE)
|
||||
'link_invoice_voucher'
|
||||
));
|
||||
|
||||
-- Partial unique index: prevent linking the same voucher to the same invoice
|
||||
-- twice while still allowing one voucher to settle multiple distinct invoices
|
||||
-- (e.g. a single bank deposit covering several customer invoices). Mirrors the
|
||||
-- existing idx_invoice_payments_tx_inv_unique pattern from
|
||||
-- 20260323120001_invoice_partial_payments.sql.
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_invoice_payments_je_inv_unique
|
||||
ON public.invoice_payments (journal_entry_id, invoice_id)
|
||||
WHERE journal_entry_id IS NOT NULL;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,143 @@
|
||||
-- Add undo_sie_import RPC and 'undone' status for sie_imports.
|
||||
--
|
||||
-- Background: replace_sie_import already hard-deletes a prior import's
|
||||
-- entries and inserts a replacement. Customers want a one-step "Ångra
|
||||
-- import" that performs the hard-delete portion without requiring a
|
||||
-- replacement file (Fortnox/Bokio behavior). This factors the deletion
|
||||
-- body into a separate RPC.
|
||||
--
|
||||
-- Design choice: do NOT call replace_sie_import internally — the source
|
||||
-- of truth is identical but replace_sie_import marks status='replaced',
|
||||
-- whereas an undo should be distinguishable for audit (status='undone'),
|
||||
-- so the body is duplicated rather than parameterized. The shape mirrors
|
||||
-- 20260526120000_fix_replace_sie_import_hard_delete.sql exactly.
|
||||
|
||||
ALTER TABLE public.sie_imports DROP CONSTRAINT IF EXISTS sie_imports_status_check;
|
||||
ALTER TABLE public.sie_imports ADD CONSTRAINT sie_imports_status_check
|
||||
CHECK (status = ANY (ARRAY['pending','mapped','completed','failed','replaced','undone']));
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.undo_sie_import(p_company_id uuid, p_import_id uuid)
|
||||
RETURNS integer
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path TO 'public'
|
||||
AS $function$
|
||||
DECLARE
|
||||
v_fiscal_period_id uuid;
|
||||
v_opening_balance_entry_id uuid;
|
||||
v_is_closed boolean;
|
||||
v_locked_at timestamptz;
|
||||
v_deleted integer := 0;
|
||||
v_caller_role text;
|
||||
BEGIN
|
||||
SELECT cm.role INTO v_caller_role
|
||||
FROM company_members cm
|
||||
WHERE cm.company_id = p_company_id
|
||||
AND cm.user_id = auth.uid();
|
||||
|
||||
IF v_caller_role IS NULL OR v_caller_role NOT IN ('owner', 'admin') THEN
|
||||
RAISE EXCEPTION 'Only company owners and admins can undo SIE imports';
|
||||
END IF;
|
||||
|
||||
SELECT fiscal_period_id, opening_balance_entry_id
|
||||
INTO v_fiscal_period_id, v_opening_balance_entry_id
|
||||
FROM public.sie_imports
|
||||
WHERE id = p_import_id
|
||||
AND company_id = p_company_id
|
||||
AND status = 'completed';
|
||||
|
||||
IF NOT FOUND THEN
|
||||
RAISE EXCEPTION 'Import % not found or not in completed status', p_import_id;
|
||||
END IF;
|
||||
|
||||
IF v_fiscal_period_id IS NOT NULL THEN
|
||||
SELECT is_closed, locked_at
|
||||
INTO v_is_closed, v_locked_at
|
||||
FROM public.fiscal_periods
|
||||
WHERE id = v_fiscal_period_id;
|
||||
|
||||
IF v_is_closed OR v_locked_at IS NOT NULL THEN
|
||||
RAISE EXCEPTION 'Cannot undo SIE import in a locked or closed fiscal period';
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
|
||||
-- Detach documents (entry- and line-level).
|
||||
UPDATE public.document_attachments
|
||||
SET journal_entry_id = NULL,
|
||||
journal_entry_line_id = NULL
|
||||
WHERE journal_entry_id IN (
|
||||
SELECT je.id
|
||||
FROM public.journal_entries je
|
||||
WHERE je.company_id = p_company_id
|
||||
AND je.fiscal_period_id = v_fiscal_period_id
|
||||
AND je.source_type IN ('import', 'opening_balance')
|
||||
AND je.status IN ('posted', 'cancelled')
|
||||
)
|
||||
OR journal_entry_line_id IN (
|
||||
SELECT jel.id
|
||||
FROM public.journal_entry_lines jel
|
||||
JOIN public.journal_entries je ON je.id = jel.journal_entry_id
|
||||
WHERE je.company_id = p_company_id
|
||||
AND je.fiscal_period_id = v_fiscal_period_id
|
||||
AND je.source_type IN ('import', 'opening_balance')
|
||||
AND je.status IN ('posted', 'cancelled')
|
||||
);
|
||||
|
||||
-- Clear the fiscal-period OB pointer (two-step around
|
||||
-- enforce_opening_balance_immutability).
|
||||
IF v_opening_balance_entry_id IS NOT NULL THEN
|
||||
UPDATE public.fiscal_periods
|
||||
SET opening_balances_set = false
|
||||
WHERE id = v_fiscal_period_id
|
||||
AND opening_balance_entry_id = v_opening_balance_entry_id;
|
||||
|
||||
UPDATE public.fiscal_periods
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE id = v_fiscal_period_id
|
||||
AND opening_balance_entry_id = v_opening_balance_entry_id;
|
||||
END IF;
|
||||
|
||||
-- Drop the sie_imports -> opening_balance_entry FK before delete.
|
||||
UPDATE public.sie_imports
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE id = p_import_id;
|
||||
|
||||
-- Hard-delete the import's journal entries (both transaction vouchers
|
||||
-- and the opening_balance entry).
|
||||
WITH deleted AS (
|
||||
DELETE FROM public.journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_fiscal_period_id
|
||||
AND source_type IN ('import', 'opening_balance')
|
||||
AND status IN ('posted', 'cancelled')
|
||||
RETURNING id
|
||||
)
|
||||
SELECT count(*) INTO v_deleted FROM deleted;
|
||||
|
||||
-- Reset voucher_sequences per series to the max remaining number.
|
||||
UPDATE public.voucher_sequences vs
|
||||
SET last_number = COALESCE((
|
||||
SELECT MAX(je.voucher_number)
|
||||
FROM public.journal_entries je
|
||||
WHERE je.company_id = vs.company_id
|
||||
AND je.fiscal_period_id = vs.fiscal_period_id
|
||||
AND je.voucher_series = vs.voucher_series
|
||||
AND je.voucher_number > 0
|
||||
), 0),
|
||||
updated_at = now()
|
||||
WHERE vs.company_id = p_company_id
|
||||
AND vs.fiscal_period_id = v_fiscal_period_id;
|
||||
|
||||
UPDATE public.sie_imports
|
||||
SET status = 'undone',
|
||||
replaced_at = now()
|
||||
WHERE id = p_import_id
|
||||
AND company_id = p_company_id;
|
||||
|
||||
RETURN v_deleted;
|
||||
END;
|
||||
$function$;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,69 @@
|
||||
-- Atomic relink of fiscal_periods.opening_balance_entry_id.
|
||||
--
|
||||
-- Used by the pragmatic IB resync flow in lib/import/sie-import.ts when
|
||||
-- importing a prior fiscal year retroactively. The next period's IB
|
||||
-- (already created from a prior import or manual entry) gets stornoed and
|
||||
-- replaced with the new IB derived from the just-imported year's #UB —
|
||||
-- so the chain stays consistent without forcing the user to drop and
|
||||
-- reimport the later year.
|
||||
--
|
||||
-- enforce_opening_balance_immutability blocks any UPDATE that changes
|
||||
-- opening_balance_entry_id while opening_balances_set is true. The
|
||||
-- canonical workaround is to flip opening_balances_set to false in one
|
||||
-- statement and change the FK in another (the trigger reads OLD on each
|
||||
-- UPDATE). Doing this in a single transaction-level RPC keeps the period
|
||||
-- from being observable in an unset state by concurrent queries.
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.replace_period_opening_balance_link(
|
||||
p_company_id uuid,
|
||||
p_period_id uuid,
|
||||
p_new_entry_id uuid
|
||||
)
|
||||
RETURNS void
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path TO 'public'
|
||||
AS $function$
|
||||
DECLARE
|
||||
v_caller_role text;
|
||||
BEGIN
|
||||
SELECT cm.role INTO v_caller_role
|
||||
FROM company_members cm
|
||||
WHERE cm.company_id = p_company_id
|
||||
AND cm.user_id = auth.uid();
|
||||
|
||||
IF v_caller_role IS NULL OR v_caller_role NOT IN ('owner', 'admin', 'member') THEN
|
||||
RAISE EXCEPTION 'Insufficient role to relink opening balance';
|
||||
END IF;
|
||||
|
||||
-- Sanity: the new entry must exist, be posted, and belong to the same
|
||||
-- company and period as the link target.
|
||||
PERFORM 1
|
||||
FROM journal_entries
|
||||
WHERE id = p_new_entry_id
|
||||
AND company_id = p_company_id
|
||||
AND fiscal_period_id = p_period_id
|
||||
AND status = 'posted';
|
||||
|
||||
IF NOT FOUND THEN
|
||||
RAISE EXCEPTION 'New opening balance entry % is not a posted entry in period %', p_new_entry_id, p_period_id;
|
||||
END IF;
|
||||
|
||||
-- Two-step around enforce_opening_balance_immutability: the trigger
|
||||
-- only raises when OLD.opening_balances_set = true AND the FK is being
|
||||
-- changed in the same statement. Flip the flag first, then change the
|
||||
-- FK and flip the flag back on.
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balances_set = false
|
||||
WHERE id = p_period_id
|
||||
AND company_id = p_company_id;
|
||||
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balance_entry_id = p_new_entry_id,
|
||||
opening_balances_set = true
|
||||
WHERE id = p_period_id
|
||||
AND company_id = p_company_id;
|
||||
END;
|
||||
$function$;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,35 @@
|
||||
-- Add per-employee override columns for tax and employer contributions.
|
||||
--
|
||||
-- Customers reported (2026-05-28) that they need to adjust the computed
|
||||
-- tax (skatteavdrag) and arbetsgivaravgift per individual employee inside
|
||||
-- a salary run — common reasons:
|
||||
-- * FoU-avdrag (R&D research deduction lowering avgifter ~10%)
|
||||
-- * Jämkning (Skatteverket-issued personal tax adjustment)
|
||||
-- * Växa-stöd corner cases not covered by salary_payroll_config
|
||||
--
|
||||
-- Modeled additively: the engine writes computed values into
|
||||
-- tax_withheld / avgifter_amount / avgifter_basis exactly as before.
|
||||
-- Booking and AGI now coalesce override → computed:
|
||||
-- effective_tax = COALESCE(tax_withheld_override, tax_withheld)
|
||||
-- so legacy runs continue to behave identically.
|
||||
--
|
||||
-- override_reason is a compliance breadcrumb required by the UI when any
|
||||
-- override is set (BFL requires documentable rationale for manual tax
|
||||
-- adjustments). NULL when no override is set.
|
||||
|
||||
ALTER TABLE public.salary_run_employees
|
||||
ADD COLUMN tax_withheld_override numeric,
|
||||
ADD COLUMN avgifter_amount_override numeric,
|
||||
ADD COLUMN avgifter_basis_override numeric,
|
||||
ADD COLUMN override_reason text;
|
||||
|
||||
ALTER TABLE public.salary_run_employees
|
||||
ADD CONSTRAINT salary_run_employees_override_reason_required
|
||||
CHECK (
|
||||
(tax_withheld_override IS NULL
|
||||
AND avgifter_amount_override IS NULL
|
||||
AND avgifter_basis_override IS NULL)
|
||||
OR override_reason IS NOT NULL
|
||||
);
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,24 @@
|
||||
-- Allow re-importing an SIE file after the previous import was undone.
|
||||
--
|
||||
-- 20260528120100_undo_sie_import.sql added the 'undone' status but did not
|
||||
-- touch the partial unique index from 20260517150000, which excludes only
|
||||
-- 'replaced' and 'failed'. Result: after undo_sie_import flips a row to
|
||||
-- 'undone', the (company_id, file_hash) slot is still held and a fresh
|
||||
-- upload of the same file fails with sie_imports_company_id_file_hash_key.
|
||||
--
|
||||
-- This migration also catches databases (e.g. staging) where
|
||||
-- 20260517150000 was never applied — they still carry the plain UNIQUE
|
||||
-- constraint. All operations are idempotent: dropping non-existent
|
||||
-- constraints/indexes is a no-op, and CREATE INDEX IF NOT EXISTS skips
|
||||
-- when the partial index already exists from a prior run.
|
||||
|
||||
ALTER TABLE public.sie_imports
|
||||
DROP CONSTRAINT IF EXISTS sie_imports_company_id_file_hash_key;
|
||||
|
||||
DROP INDEX IF EXISTS public.sie_imports_company_id_file_hash_active_idx;
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS sie_imports_company_id_file_hash_active_idx
|
||||
ON public.sie_imports (company_id, file_hash)
|
||||
WHERE status <> ALL (ARRAY['replaced'::text, 'failed'::text, 'undone'::text]);
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
-- Tighten replace_period_opening_balance_link to owner/admin only.
|
||||
--
|
||||
-- 20260528120200_replace_period_opening_balance_link.sql initially allowed
|
||||
-- 'member' alongside 'owner'/'admin'. That was inconsistent with the peer
|
||||
-- recovery RPCs (delete_last_voucher, undo_sie_import), which both restrict
|
||||
-- this kind of structural mutation to owner/admin. Tighten here so the
|
||||
-- whole recovery surface uses the same role gate.
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.replace_period_opening_balance_link(
|
||||
p_company_id uuid,
|
||||
p_period_id uuid,
|
||||
p_new_entry_id uuid
|
||||
)
|
||||
RETURNS void
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path TO 'public'
|
||||
AS $function$
|
||||
DECLARE
|
||||
v_caller_role text;
|
||||
BEGIN
|
||||
SELECT cm.role INTO v_caller_role
|
||||
FROM company_members cm
|
||||
WHERE cm.company_id = p_company_id
|
||||
AND cm.user_id = auth.uid();
|
||||
|
||||
IF v_caller_role IS NULL OR v_caller_role NOT IN ('owner', 'admin') THEN
|
||||
RAISE EXCEPTION 'Insufficient role to relink opening balance';
|
||||
END IF;
|
||||
|
||||
PERFORM 1
|
||||
FROM journal_entries
|
||||
WHERE id = p_new_entry_id
|
||||
AND company_id = p_company_id
|
||||
AND fiscal_period_id = p_period_id
|
||||
AND status = 'posted';
|
||||
|
||||
IF NOT FOUND THEN
|
||||
RAISE EXCEPTION 'New opening balance entry % is not a posted entry in period %', p_new_entry_id, p_period_id;
|
||||
END IF;
|
||||
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balances_set = false
|
||||
WHERE id = p_period_id
|
||||
AND company_id = p_company_id;
|
||||
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balance_entry_id = p_new_entry_id,
|
||||
opening_balances_set = true
|
||||
WHERE id = p_period_id
|
||||
AND company_id = p_company_id;
|
||||
END;
|
||||
$function$;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
@@ -0,0 +1,190 @@
|
||||
-- Fix delete_last_voucher RPC to set company_id on its audit_log writes.
|
||||
--
|
||||
-- 20260528120000_delete_last_voucher_clears_ib_link's INSERT into
|
||||
-- audit_log omitted company_id (it pre-dated the multi-tenant audit_log
|
||||
-- policy, then was copied without that field). The audit_log SELECT
|
||||
-- policy filters `company_id IN user_company_ids()`, so the RPC's
|
||||
-- explicit "(was period IB)" provenance row landed with company_id=NULL
|
||||
-- and was invisible to every reader — only the generic write_audit_log()
|
||||
-- trigger row remained visible. That defeats BFL audit-trail intent.
|
||||
--
|
||||
-- Republish the RPC with company_id populated on both audit_log writes
|
||||
-- (draft path and posted path). Behavior is otherwise unchanged.
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.delete_last_voucher(p_company_id uuid, p_entry_id uuid)
|
||||
RETURNS jsonb
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path TO 'public'
|
||||
AS $function$
|
||||
DECLARE
|
||||
v_entry record;
|
||||
v_period record;
|
||||
v_max_voucher integer;
|
||||
v_ref_count integer;
|
||||
v_caller_role text;
|
||||
v_snapshot jsonb;
|
||||
v_lines_snapshot jsonb;
|
||||
v_is_period_ib boolean := false;
|
||||
BEGIN
|
||||
SELECT cm.role INTO v_caller_role
|
||||
FROM company_members cm
|
||||
WHERE cm.company_id = p_company_id
|
||||
AND cm.user_id = auth.uid();
|
||||
|
||||
IF v_caller_role IS NULL OR v_caller_role NOT IN ('owner', 'admin') THEN
|
||||
RAISE EXCEPTION 'Only company owners and admins can delete vouchers';
|
||||
END IF;
|
||||
|
||||
SELECT * INTO v_entry
|
||||
FROM journal_entries
|
||||
WHERE id = p_entry_id
|
||||
AND company_id = p_company_id
|
||||
FOR UPDATE;
|
||||
|
||||
IF v_entry IS NULL THEN
|
||||
RAISE EXCEPTION 'Journal entry not found';
|
||||
END IF;
|
||||
|
||||
IF v_entry.status NOT IN ('posted', 'draft') THEN
|
||||
RAISE EXCEPTION 'Only posted or draft entries can be deleted (current status: %)', v_entry.status;
|
||||
END IF;
|
||||
|
||||
SELECT jsonb_agg(to_jsonb(l)) INTO v_lines_snapshot
|
||||
FROM journal_entry_lines l
|
||||
WHERE l.journal_entry_id = p_entry_id;
|
||||
|
||||
v_snapshot := to_jsonb(v_entry) || jsonb_build_object('lines', COALESCE(v_lines_snapshot, '[]'::jsonb));
|
||||
|
||||
IF v_entry.status = 'draft' THEN
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
|
||||
UPDATE document_attachments
|
||||
SET journal_entry_id = NULL
|
||||
WHERE journal_entry_id = p_entry_id;
|
||||
|
||||
DELETE FROM journal_entries WHERE id = p_entry_id;
|
||||
|
||||
INSERT INTO audit_log (user_id, company_id, action, table_name, record_id, actor_id, old_state, description)
|
||||
VALUES (
|
||||
v_entry.user_id,
|
||||
p_company_id,
|
||||
'DELETE',
|
||||
'journal_entries',
|
||||
p_entry_id,
|
||||
auth.uid(),
|
||||
v_snapshot,
|
||||
'Deleted draft journal entry (delete_last_voucher RPC, caller: ' || auth.uid() || ')'
|
||||
);
|
||||
|
||||
RETURN jsonb_build_object(
|
||||
'deleted', true,
|
||||
'voucher_series', v_entry.voucher_series,
|
||||
'voucher_number', v_entry.voucher_number,
|
||||
'was_draft', true
|
||||
);
|
||||
END IF;
|
||||
|
||||
SELECT * INTO v_period
|
||||
FROM fiscal_periods
|
||||
WHERE id = v_entry.fiscal_period_id
|
||||
FOR UPDATE;
|
||||
|
||||
IF v_period.is_closed THEN
|
||||
RAISE EXCEPTION 'Cannot delete voucher in a closed fiscal period';
|
||||
END IF;
|
||||
|
||||
IF v_period.locked_at IS NOT NULL THEN
|
||||
RAISE EXCEPTION 'Cannot delete voucher in a locked fiscal period';
|
||||
END IF;
|
||||
|
||||
PERFORM 1 FROM voucher_sequences
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series
|
||||
FOR UPDATE;
|
||||
|
||||
SELECT MAX(voucher_number) INTO v_max_voucher
|
||||
FROM journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series
|
||||
AND status NOT IN ('cancelled', 'draft');
|
||||
|
||||
IF v_entry.voucher_number != v_max_voucher THEN
|
||||
RAISE EXCEPTION 'Kan bara radera det sista verifikatet i serien. % har nummer % men senaste är %',
|
||||
v_entry.voucher_series, v_entry.voucher_number, v_max_voucher;
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(*) INTO v_ref_count
|
||||
FROM journal_entries
|
||||
WHERE company_id = p_company_id
|
||||
AND status != 'cancelled'
|
||||
AND (reverses_id = p_entry_id OR correction_of_id = p_entry_id);
|
||||
|
||||
IF v_ref_count > 0 THEN
|
||||
RAISE EXCEPTION 'Cannot delete: other entries reference this voucher (% references)',
|
||||
v_ref_count;
|
||||
END IF;
|
||||
|
||||
IF v_entry.reverses_id IS NOT NULL THEN
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
UPDATE journal_entries
|
||||
SET status = 'posted', reversed_by_id = NULL
|
||||
WHERE id = v_entry.reverses_id
|
||||
AND company_id = p_company_id;
|
||||
END IF;
|
||||
|
||||
v_is_period_ib := (v_period.opening_balance_entry_id = p_entry_id);
|
||||
IF v_is_period_ib THEN
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balances_set = false
|
||||
WHERE id = v_entry.fiscal_period_id;
|
||||
|
||||
UPDATE fiscal_periods
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE id = v_entry.fiscal_period_id;
|
||||
END IF;
|
||||
|
||||
UPDATE sie_imports
|
||||
SET opening_balance_entry_id = NULL
|
||||
WHERE opening_balance_entry_id = p_entry_id;
|
||||
|
||||
PERFORM set_config('gnubok.allow_delete', 'true', true);
|
||||
|
||||
UPDATE document_attachments
|
||||
SET journal_entry_id = NULL
|
||||
WHERE journal_entry_id = p_entry_id;
|
||||
|
||||
DELETE FROM journal_entries WHERE id = p_entry_id;
|
||||
|
||||
UPDATE voucher_sequences
|
||||
SET last_number = GREATEST(last_number - 1, 0)
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = v_entry.fiscal_period_id
|
||||
AND voucher_series = v_entry.voucher_series;
|
||||
|
||||
INSERT INTO audit_log (user_id, company_id, action, table_name, record_id, actor_id, old_state, description)
|
||||
VALUES (
|
||||
v_entry.user_id,
|
||||
p_company_id,
|
||||
'DELETE',
|
||||
'journal_entries',
|
||||
p_entry_id,
|
||||
auth.uid(),
|
||||
v_snapshot,
|
||||
'Deleted voucher ' || v_entry.voucher_series || v_entry.voucher_number ||
|
||||
CASE WHEN v_is_period_ib THEN ' (was period IB)' ELSE '' END ||
|
||||
' (delete_last_voucher RPC, caller: ' || auth.uid() || ')'
|
||||
);
|
||||
|
||||
RETURN jsonb_build_object(
|
||||
'deleted', true,
|
||||
'voucher_series', v_entry.voucher_series,
|
||||
'voucher_number', v_entry.voucher_number,
|
||||
'was_period_ib', v_is_period_ib
|
||||
);
|
||||
END;
|
||||
$function$;
|
||||
|
||||
NOTIFY pgrst, 'reload schema';
|
||||
Reference in New Issue
Block a user