Files
accounted/lib/bookkeeping/payment-sync.ts
T
Jakob Wennberg be0478c219 fix(bokslut): kontantmetod cut-off treats the ROT/RUT share as settled on 1513 (#2278)
* fix(bokslut): kontantmetod cut-off treats the ROT/RUT share as settled on 1513

Root cause: collectKontantmetodCutoff compared invoice_payments against
the gross invoice total and never read deduction_total. Under
fakturamodellen the customer owes total minus the skattereduktion; the
deduction is a fordran on Skatteverket carried on 1513 by the payment
voucher (Dr 1930 customer share / Dr 1513 deduction / Cr 30xx / Cr 26xx
in full), and every settlement path records the customer share as the
payment row amount. A fully paid ROT/RUT invoice therefore showed exactly
deduction_total as outstanding, and the year-end cut-off booked a phantom
Dr 1510 / Cr 30xx / Cr 2618 on top of a sale whose revenue and moms were
already fully recognised: revenue overstated and vilande moms invented.

Fix: the customer's outstanding is total - deduction_total - paid (the
deduction follows the sign of the total, since credit notes store it as
a positive magnitude), floored at zero on the invoice's own side for
over-collection noise, mirroring the invoices_remaining_amount_guard
formula. The moms carried into the cut-off is scaled by the customer
share, not the gross total, so an unpaid ROT/RUT invoice reports its
whole moms in the final period and a part-paid one the matching
fraction. Invoices without a deduction take the unchanged gross path.

The readiness gate, the pending-operation executor and the MCP tool all
consume this collector, so they inherit the fix. The Skatteverket share
itself (an unpaid ROT/RUT invoice's 1513 fordran at year end) is not
part of the cut-off and stays a separate change, as is the 1513 point
already deferred on the currency revaluation.

Fixes #2248

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015qgLgdt4mLmha1ZLFMwq1u

* refactor(invoices): one definition of the customer share of an invoice

The customer share of an invoice (total minus the ROT/RUT deduction,
and what remains of it after payments) was re-derived by hand at three
TypeScript sites plus the SQL guard invoices_remaining_amount_guard, and
the kontantmetod cut-off's copy had drifted to the gross total (#2248).
Fixing the cut-off's arithmetic alone would leave the next copy free to
drift the same way.

lib/invoices/customer-share.ts now holds the definition:
invoiceCustomerShare(invoice) returns total minus sign(total) times
deduction_total (the deduction is stored as a positive magnitude, also
on credit notes), and invoiceCustomerOutstanding(invoice, paid) returns
the signed residual after payments. The module comment names the SQL
twin (migration 20260817191708) so the two stay in lockstep; the SQL is
untouched.

Call sites moved onto the helper with byte-identical behaviour:
kontantmetod-cutoff.ts (keeps its as-of payment sum, the sign-aware zero
floor for ROT/RUT rows and the moms scaling), rot-rut-file.ts (the
customer-share-paid test) and payment-sync.ts (the storno path, which
still floors with Math.max(0, ...) because it persists the column).
Plain invoices get their total back exactly as stored, so their paths
do not change by a bit. New unit tests cover plain, ROT/RUT, credit-note
sign, null deduction and the lockstep with the guard's formula.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015qgLgdt4mLmha1ZLFMwq1u

---------

Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-04 17:01:06 +02:00

323 lines
13 KiB
TypeScript

import type { SupabaseClient } from '@supabase/supabase-js'
import { createLogger } from '@/lib/logger'
import { roundOre } from '@/lib/money'
import { invoiceCustomerOutstanding } from '@/lib/invoices/customer-share'
import type { JournalEntry } from '@/types'
const log = createLogger('payment-sync')
export const PAYMENT_SOURCE_TYPES = [
'invoice_paid',
'invoice_cash_payment',
'supplier_invoice_paid',
'supplier_invoice_cash_payment',
] as const
export function isPaymentSourceType(sourceType: string | null | undefined): boolean {
if (!sourceType) return false
return (PAYMENT_SOURCE_TYPES as readonly string[]).includes(sourceType)
}
/**
* Revert the business-level paid status on the invoice or supplier invoice
* that a payment journal entry was attached to. Used by both reverseEntry()
* (storno) and the DELETE journal entry route: both paths leave the GL in a
* consistent state but the invoice's status/paid_amount/paid_at would otherwise
* stay stuck on "paid".
*
* Safe to call with any entry: returns early if source_type is not a payment.
*/
export async function syncInvoiceStatusFromPaymentEntry(
supabase: SupabaseClient,
companyId: string,
entry: Pick<JournalEntry, 'id' | 'source_type' | 'source_id'>
): Promise<void> {
if (!isPaymentSourceType(entry.source_type) || !entry.source_id) return
const entryId = entry.id
if (entry.source_type.startsWith('supplier_invoice')) {
// Scope to THIS invoice's payment row: a batch voucher (match_batch_allocate)
// carries one payment row per invoice under the same journal_entry_id, so an
// unfiltered .single() errors out on multi-row and silently yields null.
const { data: payment } = await supabase
.from('supplier_invoice_payments')
.select('amount')
.eq('journal_entry_id', entryId)
.eq('supplier_invoice_id', entry.source_id)
.eq('company_id', companyId)
.single()
// Column is `total`, not `total_amount` (supplier_invoices has never had a
// total_amount column). Selecting the wrong name made PostgREST reject the
// whole query, so `supplierInvoice` was always null: the restore below was
// silently skipped while the payment-row delete and the bank-line release
// still ran. The invoice then stayed 'paid' with a stale paid_amount and
// nothing behind it, so the AP ledger (leverantörsreskontra) showed money
// as paid that was never paid.
const { data: supplierInvoice, error: supplierInvoiceError } = await supabase
.from('supplier_invoices')
.select('paid_amount, total, due_date')
.eq('id', entry.source_id)
.eq('company_id', companyId)
.single()
// PGRST116 = no row: the invoice itself is gone, so there is nothing to
// restore and the cleanup below is still the right thing to do. Any OTHER
// error means we could not read the state we are about to overwrite.
// Deleting the payment row and releasing the bank line at that point would
// destroy the only evidence of the payment while the invoice stays 'paid':
// exactly the wrong-AP-ledger outcome above. Abort instead, at ERROR level
// so the failure is observable: the storno is already committed and both
// callers (reverseEntry, the DELETE voucher route) treat this sync as
// best-effort, so bailing out leaves invoice + payment row + bank line
// mutually consistent and the operation safely re-runnable.
if (supplierInvoiceError && supplierInvoiceError.code !== 'PGRST116') {
log.error(
'Failed to read supplier invoice for payment reversal: aborting status sync',
supplierInvoiceError,
{ companyId, journalEntryId: entryId, supplierInvoiceId: entry.source_id }
)
return
}
if (supplierInvoice) {
// Same fallback semantics as the customer branch below: a cash payment
// (supplier_invoice_cash_payment) books no payment row and is only ever
// a FULL payment, so reverting the whole paid_amount is correct. The
// old `&& payment` guard skipped the restore entirely for cash
// reversals, leaving the supplier invoice deadlocked on 'paid'.
const paymentAmount = payment?.amount ?? supplierInvoice.paid_amount
const newPaidAmount = roundOre(supplierInvoice.paid_amount - paymentAmount)
const newRemaining = roundOre(supplierInvoice.total - Math.max(0, newPaidAmount))
let newStatus: string
if (newPaidAmount > 0) {
newStatus = 'partially_paid'
} else if (supplierInvoice.due_date && new Date(supplierInvoice.due_date) < new Date()) {
newStatus = 'overdue'
} else {
newStatus = 'approved'
}
await supabase
.from('supplier_invoices')
.update({
status: newStatus,
paid_amount: Math.max(0, newPaidAmount),
remaining_amount: newRemaining,
paid_at: null,
payment_journal_entry_id: null,
})
.eq('id', entry.source_id)
.eq('company_id', companyId)
}
// Remove THIS invoice's payment row tied to the reversed voucher so a
// re-match of the same bank line doesn't double-count or trip the unique
// index on supplier_invoice_payments. Scoped to the source invoice: a
// batch voucher carries sibling rows for other invoices whose status this
// call does not restore, so deleting them here would desync paid_amount
// from the payment rows (PR #666 review, SOC 2 CC6.3). Capture the linked
// transaction id first so the bank line can be released back to the inbox.
const { data: spRows } = await supabase
.from('supplier_invoice_payments')
.select('transaction_id')
.eq('journal_entry_id', entryId)
.eq('supplier_invoice_id', entry.source_id)
.eq('company_id', companyId)
await supabase
.from('supplier_invoice_payments')
.delete()
.eq('journal_entry_id', entryId)
.eq('supplier_invoice_id', entry.source_id)
.eq('company_id', companyId)
await releaseLinkedTransactions(
supabase,
companyId,
entryId,
(spRows ?? []).map((r) => (r as { transaction_id: string | null }).transaction_id),
'supplier_invoice_id',
)
} else {
// Scoped like the supplier branch: filter by invoice_id + company_id so a
// batch voucher's sibling payment rows don't break the .single().
const { data: payment } = await supabase
.from('invoice_payments')
.select('amount')
.eq('journal_entry_id', entryId)
.eq('invoice_id', entry.source_id)
.eq('company_id', companyId)
.single()
const { data: customerInvoice } = await supabase
.from('invoices')
.select('paid_amount, total, due_date, deduction_total')
.eq('id', entry.source_id)
.eq('company_id', companyId)
.single()
if (customerInvoice) {
// For a partial reversal we take the exact amount from the payment row.
// The fallback (full paid_amount) only applies when no payment row exists:
// true for invoice_cash_payment, which is only ever booked on a FULL
// payment, so reverting the whole paid_amount is correct there. Guarding
// this keeps a future partial-cash path from over-reverting.
const paymentAmount = payment?.amount ?? customerInvoice.paid_amount
const newPaidAmount = roundOre(customerInvoice.paid_amount - paymentAmount)
const safePaidAmount = Math.max(0, newPaidAmount)
// The supplier branch already resets remaining_amount; the customer branch
// never did, leaving it stale (= total) after a reversal so the invoice
// showed fully unpaid yet stuck on 'paid'. Recompute from total. (The
// .in('status', …) guard below can leave status/remaining un-updated if
// the invoice isn't paid/partially_paid: only reachable on a non-storno
// path; the payment-row delete + tx release still run, freeing the line.)
//
// remaining_amount is the CUSTOMER share: net of the ROT/RUT deduction,
// exactly as build-invoice-write stores it at creation (total -
// deduction_total) and as the invoices_remaining_amount_guard trigger
// derives it. Recomputing gross here inflated remaining on ROT/RUT
// invoices after a storno, which made them permanently un-settleable
// once mark-paid started comparing the net customer settlement against
// remaining (a net payment can never reach a gross remaining, and the
// cash-partial block rejects the "partial"). The share comes from the
// one shared definition (lib/invoices/customer-share.ts); the
// Math.max(0, ...) mirrors the guard's GREATEST(0, ...) because this
// value is persisted into the column.
const deductionTotal =
(customerInvoice as { deduction_total?: number | null }).deduction_total ?? 0
const newRemaining = Math.max(
0,
invoiceCustomerOutstanding(
{ total: customerInvoice.total, deduction_total: deductionTotal },
safePaidAmount,
),
)
const revertStatus = newPaidAmount > 0
? 'partially_paid'
: customerInvoice.due_date && new Date(customerInvoice.due_date) < new Date()
? 'overdue'
: 'sent'
await supabase
.from('invoices')
.update({
status: revertStatus,
paid_at: null,
paid_amount: safePaidAmount,
remaining_amount: newRemaining,
})
.eq('id', entry.source_id)
.eq('company_id', companyId)
.in('status', ['paid', 'partially_paid'])
}
// Remove THIS invoice's payment row tied to the reversed voucher so a
// re-match of the same bank line doesn't trip the (transaction_id,
// invoice_id) / (journal_entry_id, invoice_id) unique indexes on
// invoice_payments. Scoped to the source invoice: see the supplier
// branch comment for the batch-voucher rationale.
const { data: ipRows } = await supabase
.from('invoice_payments')
.select('transaction_id')
.eq('journal_entry_id', entryId)
.eq('invoice_id', entry.source_id)
.eq('company_id', companyId)
await supabase
.from('invoice_payments')
.delete()
.eq('journal_entry_id', entryId)
.eq('invoice_id', entry.source_id)
.eq('company_id', companyId)
await releaseLinkedTransactions(
supabase,
companyId,
entryId,
(ipRows ?? []).map((r) => (r as { transaction_id: string | null }).transaction_id),
'invoice_id',
)
}
}
/**
* Detach any bank transactions still pointing at a reversed payment voucher so
* the bank line returns to the inbox and becomes re-matchable. Without this, a
* standalone storno (the reverse route / MCP reverse tool / delete-last-voucher)
* leaves transactions.journal_entry_id pointing at a reversed JE: the match
* POST refuses (invoice no longer matchable once we also fix its status) and the
* line can't be re-booked or deleted. The match-invoice route already clears the
* tx when IT stornos a conflicting auto-categorization JE; this covers every
* other reversal path.
*
* Clears by journal_entry_id (covers the link even when the payment row was
* missing) and by the captured payment-row transaction ids (covers a partial
* match that cleared journal_entry_id but left invoice_id/category set). Only
* the link/categorization columns are reset; the transaction row is preserved.
*/
async function releaseLinkedTransactions(
supabase: SupabaseClient,
companyId: string,
entryId: string,
paymentTransactionIds: Array<string | null>,
invoiceColumn: 'invoice_id' | 'supplier_invoice_id',
): Promise<void> {
const resetFields = {
journal_entry_id: null,
[invoiceColumn]: null,
is_business: null,
category: null,
}
const { data: releasedByEntry, error: byEntryError } = await supabase
.from('transactions')
.update(resetFields)
.eq('company_id', companyId)
.eq('journal_entry_id', entryId)
.select('id')
if (byEntryError) {
// Best-effort like the rest of the sync: the storno itself already
// committed, but a failed release leaves the bank line stuck on a
// reversed JE, so it must be observable.
log.error('Failed to release transactions by journal_entry_id', byEntryError, {
companyId,
journalEntryId: entryId,
})
} else if (releasedByEntry && releasedByEntry.length > 0) {
// transactions has no write_audit_log trigger, so the clearing of the
// link/categorization columns is logged here for incident reconstruction.
log.info('Released bank transactions from reversed payment voucher', {
companyId,
journalEntryId: entryId,
invoiceColumn,
transactionIds: releasedByEntry.map((r) => (r as { id: string }).id),
})
}
const txIds = paymentTransactionIds.filter((id): id is string => !!id)
if (txIds.length > 0) {
const { data: releasedById, error: byIdError } = await supabase
.from('transactions')
.update(resetFields)
.eq('company_id', companyId)
.in('id', txIds)
.select('id')
if (byIdError) {
log.error('Failed to release transactions by payment transaction ids', byIdError, {
companyId,
journalEntryId: entryId,
transactionIds: txIds,
})
} else if (releasedById && releasedById.length > 0) {
log.info('Released payment-linked bank transactions from reversed voucher', {
companyId,
journalEntryId: entryId,
invoiceColumn,
transactionIds: releasedById.map((r) => (r as { id: string }).id),
})
}
}
}