fdcb7d937e
* feat(rot-rut): overview page, beslutsfil import, avslag reclaim, MCP list + settle Follow-up to #2239/#2360 for firms whose every invoice carries ROT/RUT. - /invoices/rot-rut: tiles (at Skatteverket on 1513, awaiting beslut, refused to book, ready to request) and one row per begaran with mark uploaded, cancel, download and "Bokfor nekat belopp"; the Fakturor button links here, ?rot-rut=1 still opens the file dialog. - Beslutsfil import from the UI through the existing import route. - Reclaim of the share Skatteverket refused: one voucher debit 1510 / credit 1513 per invoice (source_type rot_rut_reclaim), CAS-attached to the begaran and guarded by a partial unique index; the invoice reopens for the refused share via invoices.deduction_reclaimed_total, with the customer-share formula and its SQL twin gaining the same term. The payment dialog and bank match then settle the reopened remaining as a plain 1510 clearing; a booked kontantmetod invoice is proposed accrual- shaped so revenue is never recognised twice. Unknown per-invoice split of a partial beslut is refused, never allocated. - MCP: gnubok_list_rot_rut_payout_requests (search-only read) and gnubok_settle_rot_rut_payout (staged write, op settle_rot_rut_payout) sharing one pre-flight + settle with the dashboard match route. - Migrations 20260907140000 (reclaim state, source_type, INSERT guard), 20260907140100/140101 (pending_operations op type). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D9wvsGnvu5tHGqYnJnjnaB * chore(rot-rut): renumber migrations after merging main Main already carries 20260907143000 and 20260907150000, so the three rot-rut migrations move to 20260907160000/160100/160101 to keep the applied order monotonic (see memory: migration-version-collisions). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D9wvsGnvu5tHGqYnJnjnaB * fix(rot-rut): close the reclaim gaps found by skeptics, CI and review Skeptic refutations (#2397): - payment-sync recomputes remaining with deduction_reclaimed_total, so a storno of a payment on a reopened invoice no longer strands the refused share (R1). - Reclaim refused while an invoice sits in a later live begäran (ROT_RUT_RECLAIM_INVOICE_REREQUESTED); the overview and the MCP list hide the action for the same case (C2). - A reclaimed invoice is blocked from a new begäran (DEDUCTION_RECLAIMED) until the reclaim voucher is reversed (R2/C3). - Storno of the reclaim voucher syncs the invoices and the begäran back (rot-rut-reclaim-reversal.ts, hooked into reverseEntry) (R3). - A paid invoice with NULL paid_amount counts its customer share as paid (C4). Crediting an invoice with a reclaimed share is refused on the dashboard, v1 and MCP paths (R4). CI and review: - Build: custom-coded MCP errors via Object.assign, not codedError. - pg-real: column default for default_voucher_series_per_source_type re-stated with rot_rut_reclaim (20260907160200); the default test now re-applies the latest default migration. - Checks: accounted-api skill regenerated (journal-entries source types). - CodeRabbit/Superagent: per-item refused shares must reconcile with the request-level beslut; per-invoice reopen through the idempotent RPC apply_rot_rut_reclaim_invoice (20260907160300) with a resume path; update-stage settle failures keep the voucher id (failed_partial); Stockholm calendar date for the booking; existing-voucher tab uses the same proposal method; MCP stage checks bank_line junction rows. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D9wvsGnvu5tHGqYnJnjnaB * fix(rot-rut): carry the voucher id through the match outcome type; date the reclaim on the beslut - The shared match outcome now declares journalEntryId on update-stage errors, matching the settle service (Core Build TS2339 on 2d6cece1a). - The reclaim voucher is dated on the Swedish calendar day of Skatteverkets beslut (decided_at), today only when no decision date is recorded, and the confirm dialog states the date (Swedish accounting review: BFL 5 kap 6-7 §, datum for affarshandelsen). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D9wvsGnvu5tHGqYnJnjnaB * fix(rot-rut): reclaim RPCs validate the share and derive the invoice state; idempotent revert; v1 credit guard reads the column - apply_rot_rut_reclaim_invoice (20260907160400 replaces the 160300 signature) takes only the refused share, validates it against the locked item, request and invoice, and derives remaining_amount and status from the INSERT-guard formula (review: caller-supplied accounting values, CWE-862). revert_rot_rut_reclaim_invoice mirrors it for a reversed reclaim voucher; the request link is cleared only after every leg. - v1 credit route projection includes deduction_reclaimed_total so the reclaim guard actually fires there. - Overview keeps "Bokfor nekat belopp" available while legs are pending (resume after a partial failure). - Match and settle routes attach journal_entry_id on update-stage errors. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D9wvsGnvu5tHGqYnJnjnaB --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
69 lines
2.5 KiB
PL/PgSQL
69 lines
2.5 KiB
PL/PgSQL
-- Rot & rut: atomic, idempotent apply of one reclaimed share to its invoice.
|
|
--
|
|
-- lib/invoices/rot-rut-reclaim.ts books the reclaim voucher (debit 1510 /
|
|
-- credit 1513), attaches it to the begäran, and then reopens every invoice
|
|
-- for its refused share. Those last writes used to be two UPDATEs per invoice
|
|
-- (invoices, then rot_rut_payout_request_items). A failure between the
|
|
-- voucher and the invoice update left the ledger reclaimed while the invoice
|
|
-- still read as paid, and the next call was refused as already done
|
|
-- (CodeRabbit on #2397). This function makes the per-invoice step one
|
|
-- transaction with the item row as the idempotency marker:
|
|
--
|
|
-- reclaimed_amount IS NULL on the item -> apply both writes, return true
|
|
-- already set -> touch nothing, return false
|
|
--
|
|
-- so the service can resume after a partial failure by re-applying every
|
|
-- leg: applied legs are no-ops, missing legs complete. SECURITY INVOKER so
|
|
-- RLS still scopes the rows; the company id is checked explicitly on the
|
|
-- invoice as defense in depth (service-role callers have no RLS).
|
|
|
|
CREATE OR REPLACE FUNCTION public.apply_rot_rut_reclaim_invoice(
|
|
p_item_id uuid,
|
|
p_invoice_id uuid,
|
|
p_company_id uuid,
|
|
p_reclaimed_amount numeric,
|
|
p_remaining_amount numeric,
|
|
p_status text
|
|
)
|
|
RETURNS boolean
|
|
LANGUAGE plpgsql
|
|
SECURITY INVOKER
|
|
SET search_path = public
|
|
AS $$
|
|
BEGIN
|
|
IF p_reclaimed_amount IS NULL OR p_reclaimed_amount <= 0 THEN
|
|
RAISE EXCEPTION 'apply_rot_rut_reclaim_invoice: reclaimed amount must be positive';
|
|
END IF;
|
|
|
|
UPDATE public.rot_rut_payout_request_items
|
|
SET reclaimed_amount = p_reclaimed_amount
|
|
WHERE id = p_item_id
|
|
AND invoice_id = p_invoice_id
|
|
AND reclaimed_amount IS NULL;
|
|
|
|
IF NOT FOUND THEN
|
|
-- Already applied (marker set) or not this invoice's item: nothing to do.
|
|
RETURN false;
|
|
END IF;
|
|
|
|
UPDATE public.invoices
|
|
SET deduction_reclaimed_total = COALESCE(deduction_reclaimed_total, 0) + p_reclaimed_amount,
|
|
remaining_amount = p_remaining_amount,
|
|
status = p_status
|
|
WHERE id = p_invoice_id
|
|
AND company_id = p_company_id;
|
|
|
|
IF NOT FOUND THEN
|
|
RAISE EXCEPTION 'apply_rot_rut_reclaim_invoice: invoice % not found in company %',
|
|
p_invoice_id, p_company_id;
|
|
END IF;
|
|
|
|
RETURN true;
|
|
END;
|
|
$$;
|
|
|
|
GRANT EXECUTE ON FUNCTION public.apply_rot_rut_reclaim_invoice(uuid, uuid, uuid, numeric, numeric, text) TO authenticated;
|
|
GRANT EXECUTE ON FUNCTION public.apply_rot_rut_reclaim_invoice(uuid, uuid, uuid, numeric, numeric, text) TO service_role;
|
|
|
|
NOTIFY pgrst, 'reload schema';
|