* 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>
111 lines
5.2 KiB
TypeScript
111 lines
5.2 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { invoiceCustomerOutstanding, invoiceCustomerShare } from '../customer-share'
|
|
import { roundOre } from '@/lib/money'
|
|
import { makeInvoice } from '@/tests/helpers'
|
|
|
|
// Arbetskostnad 20 000 + moms 5 000 = 25 000, ROT 30 % of labor incl. moms
|
|
// = 7 500, customer share 17 500 (invoice-rules.md section 8, fakturamodellen).
|
|
const rot = makeInvoice({ subtotal: 20000, vat_amount: 5000, total: 25000, deduction_total: 7500 })
|
|
|
|
describe('invoiceCustomerShare', () => {
|
|
it('is the total on a plain invoice, returned exactly as stored', () => {
|
|
const plain = makeInvoice({ total: 12500 })
|
|
expect(invoiceCustomerShare(plain)).toBe(12500)
|
|
expect(invoiceCustomerShare({ total: 1234.56 })).toBe(1234.56)
|
|
})
|
|
|
|
it('treats a null, undefined or zero deduction as no deduction', () => {
|
|
expect(invoiceCustomerShare({ total: 25000, deduction_total: null })).toBe(25000)
|
|
expect(invoiceCustomerShare({ total: 25000, deduction_total: undefined })).toBe(25000)
|
|
expect(invoiceCustomerShare({ total: 25000, deduction_total: 0 })).toBe(25000)
|
|
expect(invoiceCustomerShare({ total: 25000, deduction_total: Number.NaN })).toBe(25000)
|
|
})
|
|
|
|
it('subtracts the ROT/RUT deduction: the 1513 share is Skatteverket\'s, not the customer\'s', () => {
|
|
expect(invoiceCustomerShare(rot)).toBe(17500)
|
|
})
|
|
|
|
it('follows the sign of the total on a credit note, whose deduction is stored as a positive magnitude', () => {
|
|
const credit = makeInvoice({
|
|
...rot, id: 'credit', total: -25000, vat_amount: -5000, subtotal: -20000, credited_invoice_id: rot.id,
|
|
})
|
|
expect(credit.deduction_total).toBe(7500)
|
|
expect(invoiceCustomerShare(credit)).toBe(-17500)
|
|
// An invoice and its full credit note net to zero for the customer.
|
|
expect(invoiceCustomerShare(rot) + invoiceCustomerShare(credit)).toBe(0)
|
|
})
|
|
|
|
it('rounds to the öre without float drift', () => {
|
|
expect(invoiceCustomerShare({ total: 1000.1, deduction_total: 300.2 })).toBe(699.9)
|
|
expect(invoiceCustomerShare({ total: 1234.56, deduction_total: 370.37 })).toBe(864.19)
|
|
})
|
|
})
|
|
|
|
describe('invoiceCustomerOutstanding', () => {
|
|
it('is zero once the customer has paid their share, even though the gross total is not covered', () => {
|
|
expect(invoiceCustomerOutstanding(rot, 17500)).toBe(0)
|
|
})
|
|
|
|
it('is the customer residual on a part-paid ROT/RUT invoice', () => {
|
|
expect(invoiceCustomerOutstanding(rot, 10000)).toBe(7500)
|
|
})
|
|
|
|
it('is total minus paid on a plain invoice, signed: overpayment goes negative, not floored', () => {
|
|
const plain = makeInvoice({ total: 12500 })
|
|
expect(invoiceCustomerOutstanding(plain, 0)).toBe(12500)
|
|
expect(invoiceCustomerOutstanding(plain, 5000)).toBe(7500)
|
|
expect(invoiceCustomerOutstanding(plain, 12500.4)).toBe(-0.4)
|
|
})
|
|
|
|
it('keeps the sign on a credit note so a refund settles it', () => {
|
|
const credit = makeInvoice({ ...rot, id: 'credit', total: -25000, credited_invoice_id: rot.id })
|
|
expect(invoiceCustomerOutstanding(credit, 0)).toBe(-17500)
|
|
expect(invoiceCustomerOutstanding(credit, -17500)).toBe(0)
|
|
})
|
|
|
|
it('stays in lockstep with the SQL guard once floored the way the guard does', () => {
|
|
// invoices_remaining_amount_guard (20260817191708):
|
|
// remaining_amount = GREATEST(0, ROUND(total - paid_amount - deduction_total, 2))
|
|
// The guard rounds the whole expression once; the helper rounds the
|
|
// share first. Both must land on the same öre.
|
|
const guard = (total: number, paid: number, deduction: number) =>
|
|
Math.max(0, roundOre(total - paid - deduction))
|
|
const rows: Array<[number, number, number | null]> = [
|
|
[25000, 0, 7500],
|
|
[25000, 17500, 7500],
|
|
[25000, 10000, 7500],
|
|
[25000, 17500.4, 7500],
|
|
[12500, 0, null],
|
|
[12500, 12500, 0],
|
|
[1234.56, 370.37, 100.1],
|
|
]
|
|
for (const [total, paid, deduction] of rows) {
|
|
expect(Math.max(0, invoiceCustomerOutstanding({ total, deduction_total: deduction }, paid)))
|
|
.toBe(guard(total, paid, deduction ?? 0))
|
|
}
|
|
})
|
|
})
|
|
|
|
describe('invoiceCustomerShare with a reclaimed deduction (rot_rut_reclaim)', () => {
|
|
it('adds the refused share back onto the customer', () => {
|
|
// Skatteverket refused 2 500 of the 7 500: the customer owes 17 500 + 2 500.
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: 2500 })).toBe(20000)
|
|
// Full avslag: the whole invoice is the customer's again.
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: 7500 })).toBe(25000)
|
|
})
|
|
|
|
it('treats null, undefined and zero reclaimed as nothing reclaimed', () => {
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: null })).toBe(17500)
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: undefined })).toBe(17500)
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: 0 })).toBe(17500)
|
|
})
|
|
|
|
it('never reclaims more than the deduction (CHECK twin)', () => {
|
|
expect(invoiceCustomerShare({ ...rot, deduction_reclaimed_total: 9000 })).toBe(25000)
|
|
})
|
|
|
|
it('feeds the outstanding: customer paid their share, refused share is open', () => {
|
|
expect(invoiceCustomerOutstanding({ ...rot, deduction_reclaimed_total: 2500 }, 17500)).toBe(2500)
|
|
})
|
|
})
|