ccdfed5fea
* 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>
217 lines
7.3 KiB
PL/PgSQL
217 lines
7.3 KiB
PL/PgSQL
-- 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';
|