* fix(enable-banking): read BBAN from AccountIdentification.other and store it on the account Enable Banking has no top-level `bban` key on AccountIdentification: a Swedish BBAN (clearing + account number) arrives as `other.identification` with `other.scheme_name = 'BBAN'`, or in `all_account_ids`. The client typed `bban?: string` and read `.bban`, so the value was always undefined: no connected account ever carried its clearing + account number, and domestic counterparty accounts on transactions were dropped. Type the identifiers per the OpenAPI spec, add extractBban() and pickAccountIdentifier(), read counterparty identifiers through the scheme list (IBAN, then BBAN/BGNR/PGNR, then anything), and store `bban` on StoredAccount from the OAuth callback. The external_id dedup scope stays IBAN-then-uid and is untouched. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): named payee accounts on cash_accounts with a default per currency A company had exactly one set of payment instructions per invoice currency (company_settings.invoice_payment_accounts), picked by currency alone. A second SEK bank account, or a second bankgiro number, had nowhere to live. cash_accounts is already the per-company bank-account entity. Migration 20260903150000 adds the payee fields (bankgiro, plusgiro, clearing + account number, BBAN, BIC, Swish, foreign routing) plus invoice_payee, a small invoice_payee_defaults table (one default account per currency; one account may be the default for several currencies, a SEK account with an IBAN is the usual EUR payee), and a SECURITY DEFINER mirror that rewrites the legacy map and the SEK bank columns from the default accounts. Every existing reader (PDF, email, reminders, v1, MCP) keeps working; the three writers that only touched legacy columns (PUT /api/settings, v1 settings, MCP update_company_settings) now write through to the default account, so what an agent sets is what the PDF prints. Peppol PaymentMeans is built from the resolver instead of the raw legacy column. bg_pg is dropped (never read or written; NULL on every prod and staging row). Backfill lands only on existing cash accounts (primary, IBAN match, or the only enabled account in the currency). Entries with no target stay in the map as the resolver fallback and get an attach action in settings. New: POST /api/cash-accounts (manual bank account on the next free 19xx), PATCH /api/cash-accounts/[id] payee fields (owner/admin), GET/PUT /api/cash-accounts/payee-defaults. Settings page rewritten as an account list with per-currency defaults. Behandlingshistorik and the full archive cover the new table and columns. Verified on staging: migration applied (11 defaults landed), mirror trigger observed rewriting company_settings from a payee edit. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): choose which bank account an invoice is paid to, frozen at issue Migration 20260903160000 adds invoices.payment_cash_account_id (FK to cash_accounts, SET NULL) and invoices.payment_details, the payee fields frozen when the account is chosen and refreshed at issue. Resolver: resolveInvoicePaymentAccount / companyWithInvoicePaymentAccount / assertInvoicePaymentAccountForRender take an optional override, and hasRequiredInvoicePaymentAccount reads it from the invoice row, so every surface (PDF, Swish QR, email, reminders, payment confirmation, Peppol, recurring, staged MCP send) prints the frozen payee when one exists and the company default per currency otherwise. Invoices that never chose an account behave exactly as before. Issue paths (mark-sent, send, v1 send, v1 mark-sent, Peppol send, recurring, MCP send and mark-sent) refresh the snapshot from the account as it is at issue; a chosen account that is disabled, un-flagged or unusable for the currency blocks with INVOICE_SEND_PAYMENT_ACCOUNT_INVALID. Writers: dashboard POST/PATCH, v1 create/update and MCP create_invoice accept payment_cash_account_id and validate it against the company's payee accounts (INVOICE_PAYEE_ACCOUNT_INVALID). Credit notes inherit the original's payee; copies carry the choice; preview-pdf renders the chosen account. The editor shows "Betalas till" under the currency when the company has two or more usable payee accounts for that currency. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): book manual payments on the invoice's chosen bank account Manual mark-paid (dashboard, v1, MCP gnubok_mark_invoice_as_paid) and the booking dialog's proposed lines debited 1930 regardless of which bank account the invoice asked to be paid to. They now resolve the chosen payee account's ledger account (resolveInvoiceSettlementAccount) and fall back to 1930 only when no account was chosen or the row is gone. Bank-transaction matching keeps debiting the account the money landed on and does not filter by the chosen account; between equal-confidence candidates it prefers the invoice that asked to be paid to the landing account. Scores are untouched, so nothing new auto-matches. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(invoices): keep the payload-size and phantom-column ceilings after the payee work Shorten the new gnubok_create_invoice argument description (tools/list payload was 29 bytes over the 60 kB budget), inline the cash-account payee UPDATE/INSERT payloads and the settings select strings as literals so the phantom-column scanner can read their columns, and reuse ACCOUNT_NUMBER_RE instead of a hand-rolled copy. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): harden the payee model after review (admin-only payee columns, separate payee IBAN, company-scoped FK) Review findings from CodeRabbit, Superagent, the Swedish accounting review and three skeptic passes, resolved in one batch: Schema (both migrations are unshipped and edited in place): - cash_accounts.payee_iban: the printed IBAN is its own column. iban stays the bank identity written by every sync and used to re-pair on reconnect, so a sync can no longer rewrite an invoice instruction or resurrect a cleared IBAN. The backfill copies each currency entry verbatim onto the target account (IBAN match first, then primary), so every invoice keeps printing exactly what it printed before; the bank IBAN is never pushed onto invoices that did not carry one. - Payee columns are owner/admin-only at the database (BEFORE trigger, service role exempt): cash_accounts is member-writable for bank sync, and the SECURITY DEFINER mirror would otherwise have let a member rewrite where customers pay. - Revoking an account as payee or disabling it drops its defaults; deleting a default drops that currency from the map and clears the legacy SEK columns (an admin saying "nothing to print" must not keep printing a closed account). The mirror leaves the legacy SEK columns alone when the map has no SEK entry, so legacy-only companies are never wiped by a mirror run for another currency. - Audit and mirror triggers fire on the same column set; anon and authenticated can no longer execute the trigger-only definer functions. - invoices.payment_cash_account_id is a composite same-company FK with SET NULL scoped to the account column. Code: - Only 19xx bank accounts can be payee: PATCH, the defaults PUT (which now also requires enabled, payee-flagged and usable for the currency), resolveInvoicePayeeChoice, and the mark-paid settlement resolver (which also refuses disabled rows and logs every fallback to 1930). - createManualBankAccount excludes every ledger slot any row already holds (findFreeLedgerAccount treats a manual holder as free; this path inserts). - The legacy settings writers (PUT /api/settings, v1, MCP) write through to the account BEFORE updating company_settings and fail the request on error; the account is written before it is adopted as default so the mirror never sees an empty payee. - snapshotInvoicePayee: dry runs no longer persist; a failed snapshot write blocks issue (INVOICE_PAYEE_SNAPSHOT_FAILED). v1 mark-sent/mark-paid projections carry the payee columns; v1 create validates the payee before the dry-run return and echoes it in the preview. - pickAccountIdentifier: supplementary IBAN wins over a primary BBAN, and non-account schemes (card PANs) are never persisted. - Editor shows the payee select for a single usable account with no default; the booking dialog waits for cash accounts before proposing lines; a failed default write no longer hides a created account. - Behandlingshistorik names the account on created/deleted defaults. - Regenerated skills/accounted-api; MCP argument description trimmed under the tools/list payload ceiling. Declined: clearing legacy columns via a forward migration (the mirror now does it on delete); Swedish review's "show the debit account in the mark-paid UI" (the booking dialog already proposes and lets the user edit the debit line); manual ledger collision (UNIQUE exists, and the create path now rejects it with a clear error); Peppol aligning to the PDF value for companies whose legacy column had drifted from the map (the PDF is the customer-facing document; both now agree). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): read NEW.invoice_payee only on the cash_accounts branch of the mirror trigger trg_mirror_invoice_payee_defaults fires for both tables; plpgsql resolves record fields per expression, so the combined condition failed with "record new has no field invoice_payee" whenever a default row changed, which took down every pg-real case on the payee tables. The revoke/disable check now sits inside its own TG_TABLE_NAME branch. The MCP settings executor test mocks the payee write-through like the settings route test already does. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): keep member disables from revoking payee defaults, gate payee on 1920-1999, fit the MCP payload Cycle 3 of /resolve-pr on #2233. Superagent P1: the SECURITY DEFINER mirror trigger deleted an admin's invoice_payee_defaults rows whenever cash_accounts.enabled flipped to false, and enabled is member-writable (the bank picker's "Synkas ej"), so a member could undo an admin's payee decision. The trigger now drops defaults only on the admin-only invoice_payee true -> false revoke; the mirror trigger's WHEN no longer lists enabled. Disabled accounts stay out of the pick lists and the send gate already refuses an invoice that chose one. Applied to staging as the same function + trigger definition and probed inside a rolled-back block: disable keeps the default and the mirrored bankgiro, revoke clears both. pg-real: the admin-guard test ran three expectations inside one withUserContext transaction; the first raise aborted it and the next statement failed with "current transaction is aborted". One transaction per expectation now, and the member case also flips enabled to prove the column stays member-level. Swedish review: payee eligibility was /^19\d\d$/, which admits 1910 Kassa and the 1911-1919 tills. A customer pays to a giro or bank account, so isBankCashAccount, CreateCashAccountSchema.ledger_account and the PATCH route now require BAS 1920-1999; tests cover 1910 and 1919. Unit tests (3/4): the tools/list payload guard read 60 025, then 60 014 tokens after main merged #2166 and #2163 alongside this branch. The ceiling is not bumped and no read on this surface is a demotion candidate, so gnubok_create_invoice drops payment_cash_account_id; agent-created invoices print the per-currency default and v1 REST plus the editor keep the field. Recorded in DECISIONS.md. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(migrations): move invoices_payment_cash_account to 20260903183000 after colliding with main's KPI migration origin/main merged 20260903160000_kpi_monthly_include_reversed_originals while this branch held the same version; identical versions abort the Supabase apply. Staging's schema_migrations row was moved to the new version with the file. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): gate invoice_payee on BAS 1920-1999 at the database, and unblock the typecheck ratchet Cycle 4 of /resolve-pr on #2233, on Emil's go. Swedish review: the 1920-1999 payee rule lived only in the routes. The cash_accounts_payee_admin_only trigger now also refuses invoice_payee on any other ledger (INVOICE_PAYEE_ACCOUNT_INVALID, 23514), whoever writes it, and the backfill only targets giro/bank rows, so a company whose single enabled cash_accounts row is a Stripe clearing account keeps its legacy bankgiro in company_settings instead of landing it on 1686. pg test covers insert and update on 1686 and 1910; the function was applied to staging and probed. Typecheck ratchet: main is red from two merges that landed with failing Checks, and every branch that syncs it inherits the errors. - #2242 added POST(req) calls to the fiscal-periods route test without the route params argument withRouteContext handlers take (25 errors in the file, baseline 23). All 25 calls now pass createMockRouteParams({}). - #2247 made SyncResult.requestedFromDate and historyNarrowed required; the 13 mockedSync results in the enable-banking accounts-route test lacked them. They now carry a fixed date and historyNarrowed: false. Both files' tests pass unchanged in behaviour. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore(migrations): move invoices_payment_cash_account to 20260903193000 after colliding with main's party_promotion origin/main merged 20260903183000_party_promotion while this branch held the same version. Staging's schema_migrations row must follow (pending: the Supabase MCP was disconnected at the time of this commit). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
455 lines
17 KiB
TypeScript
455 lines
17 KiB
TypeScript
/**
|
|
* Invoice Matching: auto-match income transactions to unpaid customer invoices.
|
|
*
|
|
* Amounts are only ever compared inside one currency: same currency → raw
|
|
* magnitudes, different currencies → the invoice's STORED SEK conversion
|
|
* against a SEK bank row. An invoice with no usable SEK value is not offered
|
|
* at all, because comparing a raw EUR total against a kronor bank row is what
|
|
* makes a 1 000 EUR invoice "exactly match" a 1 000 kr receipt. OCR/reference
|
|
* matching is deliberately exempt: the reference identifies the invoice on its
|
|
* own and no amount is involved.
|
|
*
|
|
* That guard is silent by design, which is its own problem: the user never
|
|
* learns why the EUR invoice that obviously matches is missing from the
|
|
* suggestions. `findInvoiceMatchCandidates()` therefore returns the dropped
|
|
* invoices alongside the matches (same shape as `unconverted_fx_count` in
|
|
* lib/reports/supplier-ledger.ts), so a caller can name them and point at the
|
|
* repair: POST /api/invoices/{id}/refresh-exchange-rate.
|
|
*
|
|
* The supplier-side twin is lib/invoices/supplier-invoice-matching.ts. Keep the
|
|
* two guards in step.
|
|
*/
|
|
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import { normalizeCurrencyCode, invoiceAmountSek } from './duplicate-guard-currency'
|
|
import type { Invoice, Transaction, Customer } from '@/types'
|
|
|
|
export interface InvoiceMatch {
|
|
invoice: Invoice & { customer?: Customer }
|
|
confidence: number
|
|
matchReason: string
|
|
}
|
|
|
|
/**
|
|
* An invoice dropped before scoring, with the reason, so callers can tell the
|
|
* user why an obvious invoice is not among the suggestions.
|
|
*/
|
|
export interface InvoiceMatchExclusion {
|
|
invoiceId: string
|
|
invoiceNumber: string | null
|
|
/** The invoice's own currency, e.g. 'EUR'. */
|
|
currency: string
|
|
/**
|
|
* `unconverted_fx`: foreign-currency invoice with no stored SEK conversion
|
|
* (`total_sek`), compared against a SEK bank row. Remedy:
|
|
* POST /api/invoices/{id}/refresh-exchange-rate, which fetches the
|
|
* taxable-event rate from Riksbanken and fills in `total_sek`. It refuses
|
|
* once the invoice is booked (INVOICE_FX_REFRESH_BOOKED); from there the
|
|
* correction is a storno or an inline rättelse.
|
|
*/
|
|
reason: 'unconverted_fx'
|
|
}
|
|
|
|
export interface InvoiceMatchResult {
|
|
matches: InvoiceMatch[]
|
|
/**
|
|
* Number of foreign-currency invoices excluded from candidacy because they
|
|
* had no usable SEK value. Offering them would mean comparing currencies;
|
|
* surfacing the count lets the caller tell the user a candidate was withheld
|
|
* and what to do about it, instead of the invoice just never showing up.
|
|
*/
|
|
unconvertedFxCount: number
|
|
/** The excluded invoices themselves, so a caller can name the repair target. */
|
|
unconvertedFxInvoices: InvoiceMatchExclusion[]
|
|
}
|
|
|
|
/**
|
|
* Confidence thresholds for invoice matching. Shared with voucher-matching.ts
|
|
* so the two flows (transaction→invoice and existing-verifikat→invoice) rank
|
|
* candidates on the same scale.
|
|
*/
|
|
export const CONFIDENCE = {
|
|
OCR_REFERENCE_MATCH: 0.99,
|
|
EXACT_AMOUNT_CUSTOMER: 0.95,
|
|
EXACT_AMOUNT_ONLY: 0.80,
|
|
FUZZY_AMOUNT_CUSTOMER: 0.70,
|
|
FUZZY_AMOUNT_ONLY: 0.50,
|
|
MIN_THRESHOLD: 0.50,
|
|
}
|
|
|
|
/**
|
|
* Fuzzy amount tolerance (±1% for FX fees)
|
|
*/
|
|
const FUZZY_TOLERANCE = 0.01
|
|
|
|
/**
|
|
* Check if two amounts match exactly (within rounding)
|
|
*/
|
|
export function amountsMatchExact(transactionAmount: number, invoiceTotal: number): boolean {
|
|
// Round to 2 decimal places for comparison
|
|
const txRounded = Math.round(transactionAmount * 100) / 100
|
|
const invRounded = Math.round(invoiceTotal * 100) / 100
|
|
return txRounded === invRounded
|
|
}
|
|
|
|
/**
|
|
* Check if two amounts match within fuzzy tolerance (±1%)
|
|
*/
|
|
export function amountsMatchFuzzy(transactionAmount: number, invoiceTotal: number): boolean {
|
|
if (invoiceTotal === 0) return false
|
|
const diff = Math.abs(transactionAmount - invoiceTotal)
|
|
// Cap fuzzy tolerance at 500 SEK to prevent false positives on large invoices
|
|
const tolerance = Math.min(invoiceTotal * FUZZY_TOLERANCE, 500)
|
|
return diff <= tolerance
|
|
}
|
|
|
|
/**
|
|
* Check if customer name appears in transaction counterparty
|
|
*/
|
|
export function customerNameMatches(
|
|
customerName: string | undefined,
|
|
transactionDescription: string,
|
|
merchantName: string | null
|
|
): boolean {
|
|
if (!customerName) return false
|
|
|
|
const searchTerms = customerName.toLowerCase().split(/\s+/).filter(term => term.length > 2)
|
|
const searchText = `${transactionDescription} ${merchantName || ''}`.toLowerCase()
|
|
|
|
// Check if any significant word from customer name appears in transaction
|
|
return searchTerms.some(term => searchText.includes(term))
|
|
}
|
|
|
|
/**
|
|
* Calculate confidence score and match reason for an invoice match
|
|
*/
|
|
export function calculateMatchScore(
|
|
transaction: Transaction,
|
|
invoice: Invoice & { customer?: Customer }
|
|
): { confidence: number; matchReason: string } {
|
|
const transactionAmount = transaction.amount
|
|
const invoiceTotal = invoice.total
|
|
|
|
const exactAmount = amountsMatchExact(transactionAmount, invoiceTotal)
|
|
const fuzzyAmount = !exactAmount && amountsMatchFuzzy(transactionAmount, invoiceTotal)
|
|
const customerMatch = customerNameMatches(
|
|
invoice.customer?.name,
|
|
transaction.description,
|
|
transaction.merchant_name
|
|
)
|
|
|
|
if (exactAmount && customerMatch) {
|
|
return {
|
|
confidence: CONFIDENCE.EXACT_AMOUNT_CUSTOMER,
|
|
matchReason: `Exakt belopp (${invoiceTotal} ${invoice.currency}) och kundnamn matchar`,
|
|
}
|
|
}
|
|
|
|
if (exactAmount) {
|
|
return {
|
|
confidence: CONFIDENCE.EXACT_AMOUNT_ONLY,
|
|
matchReason: `Exakt belopp (${invoiceTotal} ${invoice.currency})`,
|
|
}
|
|
}
|
|
|
|
if (fuzzyAmount && customerMatch) {
|
|
return {
|
|
confidence: CONFIDENCE.FUZZY_AMOUNT_CUSTOMER,
|
|
matchReason: `Belopp nära (±1%) och kundnamn matchar`,
|
|
}
|
|
}
|
|
|
|
if (fuzzyAmount) {
|
|
return {
|
|
confidence: CONFIDENCE.FUZZY_AMOUNT_ONLY,
|
|
matchReason: `Belopp nära (±1%)`,
|
|
}
|
|
}
|
|
|
|
return { confidence: 0, matchReason: '' }
|
|
}
|
|
|
|
/**
|
|
* The invoice's outstanding amount expressed in the transaction's currency, or
|
|
* null when no such value can be established from STORED data.
|
|
*
|
|
* Never falls back to the raw foreign amount. That fallback would hand the
|
|
* matcher a EUR total dressed up as kronor, which is the exact false match this
|
|
* function exists to prevent. A missing conversion means "not comparable",
|
|
* never "assume SEK".
|
|
*/
|
|
function comparableAmount(
|
|
invoice: Invoice,
|
|
transaction: Transaction,
|
|
invoiceAmount: number
|
|
): number | null {
|
|
// Currency codes normalize before any comparison: both `invoices.currency`
|
|
// and `transactions.currency` are nullable with DEFAULT 'SEK', so a legacy
|
|
// NULL (or lowercase) code means kronor and must keep matching a SEK bank
|
|
// row instead of being routed down the cross-currency branch and dropped.
|
|
// Same rule as normalizeCurrency in supplier-invoice-matching.ts.
|
|
const invoiceCurrency = normalizeCurrencyCode(invoice.currency)
|
|
const transactionCurrency = normalizeCurrencyCode(transaction.currency)
|
|
|
|
// Same currency: raw magnitudes, no rate needed. The only path a SEK-only
|
|
// company ever takes.
|
|
if (invoiceCurrency === transactionCurrency) return invoiceAmount
|
|
|
|
// Cross-currency: only a SEK bank row is comparable, and only against the
|
|
// invoice's stored SEK conversion.
|
|
if (transactionCurrency !== 'SEK') return null
|
|
|
|
// One definition of "the invoice amount in SEK", shared with the
|
|
// duplicate-payment guards: pro-rated total_sek first (total_sek covers the
|
|
// whole invoice at the registration rate while remaining_amount is in the
|
|
// invoice currency), then the stored exchange_rate when total_sek is 0 or
|
|
// absent. Both are STORED conversions; a missing rate still returns null.
|
|
return invoiceAmountSek({
|
|
amount: invoiceAmount,
|
|
currency: invoiceCurrency,
|
|
total: invoice.total,
|
|
totalSek: invoice.total_sek,
|
|
exchangeRate: invoice.exchange_rate,
|
|
})
|
|
}
|
|
|
|
/**
|
|
* True when the only thing standing between this invoice and candidacy is its
|
|
* own missing SEK conversion, i.e. the case POST
|
|
* /api/invoices/{id}/refresh-exchange-rate repairs. A SEK invoice against a
|
|
* foreign bank row, or two different foreign currencies, is a different
|
|
* (rate-independent) exclusion and is not reported as one of these.
|
|
*/
|
|
function isUnconvertedForeignInvoice(invoice: Invoice, transaction: Transaction): boolean {
|
|
// Same normalization as comparableAmount: a NULL/lowercase code is kronor,
|
|
// so a legacy NULL-currency invoice is never reported as unconverted FX.
|
|
const invoiceCurrency = normalizeCurrencyCode(invoice.currency)
|
|
return (
|
|
normalizeCurrencyCode(transaction.currency) === 'SEK' &&
|
|
invoiceCurrency !== 'SEK' &&
|
|
invoiceAmountSek({
|
|
amount: invoice.remaining_amount ?? invoice.total,
|
|
currency: invoiceCurrency,
|
|
total: invoice.total,
|
|
totalSek: invoice.total_sek,
|
|
exchangeRate: invoice.exchange_rate,
|
|
}) === null
|
|
)
|
|
}
|
|
|
|
function emptyResult(): InvoiceMatchResult {
|
|
return { matches: [], unconvertedFxCount: 0, unconvertedFxInvoices: [] }
|
|
}
|
|
|
|
/**
|
|
* Find invoices that potentially match a bank transaction
|
|
*
|
|
* Only matches income transactions (amount > 0) against unpaid invoices
|
|
* Returns matches sorted by confidence, filtered to >= 50% confidence
|
|
*
|
|
* Thin wrapper over `findInvoiceMatchCandidates()` that drops the exclusion
|
|
* diagnostics. Use the candidates function when the caller can tell the user
|
|
* why an invoice was withheld.
|
|
*/
|
|
export async function findMatchingInvoices(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
transaction: Transaction
|
|
): Promise<InvoiceMatch[]> {
|
|
const { matches } = await findInvoiceMatchCandidates(supabase, companyId, transaction)
|
|
return matches
|
|
}
|
|
|
|
/**
|
|
* `findMatchingInvoices()` plus the invoices that were dropped before scoring
|
|
* because they carried no comparable amount.
|
|
*/
|
|
export async function findInvoiceMatchCandidates(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
transaction: Transaction
|
|
): Promise<InvoiceMatchResult> {
|
|
// Only match income transactions
|
|
if (transaction.amount <= 0) {
|
|
return emptyResult()
|
|
}
|
|
|
|
// Query unpaid invoices (sent or overdue) with customer info. Proformas,
|
|
// delivery notes and quotes are never receivables, so a sent quote is never
|
|
// proposed as a payment candidate.
|
|
let invoices: Array<Invoice & { customer?: { name?: string | null } | null }>
|
|
try {
|
|
invoices = await fetchAllRows(({ from, to }) =>
|
|
supabase
|
|
.from('invoices')
|
|
.select('*, customer:customers(*), credit_notes:invoices!credited_invoice_id(id, status, creation_complete)')
|
|
.eq('company_id', companyId)
|
|
.eq('document_type', 'invoice')
|
|
.is('credited_invoice_id', null)
|
|
.in('status', ['sent', 'overdue', 'partially_paid'])
|
|
.order('id', { ascending: true })
|
|
.range(from, to),
|
|
)
|
|
} catch {
|
|
// Failed to fetch invoices: return empty matches
|
|
return emptyResult()
|
|
}
|
|
|
|
// Defensive filter: exclude invoices that already have a payment voucher
|
|
// attached but whose status leaked (still 'sent'/'overdue'). Partially-paid
|
|
// invoices can legitimately take more payments, so they pass through.
|
|
// Without this, a status leak would double-book the receipt.
|
|
const payableInvoices = invoices.filter(
|
|
(invoice) => {
|
|
const creditNotes = (invoice as Invoice & {
|
|
credit_notes?: Array<{ status: string; creation_complete?: boolean }>
|
|
}).credit_notes ?? []
|
|
return !invoice.credited_invoice_id && !creditNotes.some(
|
|
(creditNote) => creditNote.status !== 'cancelled' && creditNote.creation_complete !== false,
|
|
)
|
|
},
|
|
)
|
|
const fullCandidateIds = payableInvoices
|
|
.filter((inv) => inv.status === 'sent' || inv.status === 'overdue')
|
|
.map((inv) => inv.id as string)
|
|
const paidIds = new Set<string>()
|
|
if (fullCandidateIds.length > 0) {
|
|
const paymentRows = await fetchAllRows<{ id: string; invoice_id: string }>(({ from, to }) =>
|
|
supabase
|
|
.from('invoice_payments')
|
|
.select('id, invoice_id')
|
|
.eq('company_id', companyId)
|
|
.in('invoice_id', fullCandidateIds)
|
|
.not('journal_entry_id', 'is', null)
|
|
.order('id', { ascending: true })
|
|
.range(from, to),
|
|
)
|
|
for (const row of paymentRows) {
|
|
paidIds.add((row as { invoice_id: string }).invoice_id)
|
|
}
|
|
}
|
|
const filteredInvoices = payableInvoices.filter((inv) => !paidIds.has(inv.id as string))
|
|
if (filteredInvoices.length === 0) {
|
|
return emptyResult()
|
|
}
|
|
|
|
const matches: InvoiceMatch[] = []
|
|
const unconvertedFxInvoices: InvoiceMatchExclusion[] = []
|
|
|
|
// OCR/Bankgiro reference matching: highest confidence
|
|
// Swedish standard: match transaction reference to invoice OCR number
|
|
const txReference = (transaction as Transaction & { reference?: string | null }).reference
|
|
if (txReference) {
|
|
const normalizedRef = txReference.replace(/\s+/g, '')
|
|
for (const invoice of filteredInvoices) {
|
|
// Match against invoice_number (used as OCR reference in Swedish payments)
|
|
const invoiceRef = invoice.invoice_number?.replace(/\s+/g, '')
|
|
if (invoiceRef && normalizedRef === invoiceRef) {
|
|
matches.push({
|
|
invoice: invoice as Invoice & { customer?: Customer },
|
|
confidence: CONFIDENCE.OCR_REFERENCE_MATCH,
|
|
matchReason: `OCR-referens matchar fakturanummer ${invoice.invoice_number}`,
|
|
})
|
|
}
|
|
}
|
|
|
|
// If we found an OCR match, return immediately (highest possible confidence)
|
|
if (matches.length > 0) {
|
|
return { matches, unconvertedFxCount: 0, unconvertedFxInvoices: [] }
|
|
}
|
|
}
|
|
|
|
for (const invoice of filteredInvoices) {
|
|
// Use remaining_amount for partially paid invoices, otherwise total
|
|
const invoiceAmount = invoice.remaining_amount ?? invoice.total
|
|
|
|
// Every pass below compares amounts, so they need one shared unit. No
|
|
// shared unit means this invoice is not a candidate at all: it must never
|
|
// be offered on the strength of a raw foreign number that happens to line
|
|
// up with a kronor bank row.
|
|
const compareAmount = comparableAmount(invoice, transaction, invoiceAmount)
|
|
if (compareAmount === null) {
|
|
// Record the ones a missing exchange rate is holding back, so the caller
|
|
// can say so instead of leaving the user to wonder.
|
|
if (isUnconvertedForeignInvoice(invoice, transaction)) {
|
|
unconvertedFxInvoices.push({
|
|
invoiceId: invoice.id as string,
|
|
invoiceNumber: invoice.invoice_number ?? null,
|
|
currency: invoice.currency as string,
|
|
reason: 'unconverted_fx',
|
|
})
|
|
}
|
|
continue
|
|
}
|
|
|
|
const transactionAmount = transaction.amount
|
|
|
|
// Check if amounts are close enough to consider
|
|
const amountDiff = Math.abs(transactionAmount - compareAmount)
|
|
const tolerance = compareAmount * FUZZY_TOLERANCE
|
|
if (amountDiff > tolerance && transactionAmount !== compareAmount) {
|
|
continue
|
|
}
|
|
|
|
// Calculate score
|
|
const invoiceWithAdjustedTotal = {
|
|
...invoice,
|
|
total: compareAmount, // Use the comparable amount
|
|
}
|
|
|
|
const { confidence, matchReason } = calculateMatchScore(
|
|
transaction,
|
|
invoiceWithAdjustedTotal as Invoice & { customer?: Customer }
|
|
)
|
|
|
|
if (confidence >= CONFIDENCE.MIN_THRESHOLD) {
|
|
matches.push({
|
|
invoice: invoice as Invoice & { customer?: Customer },
|
|
confidence,
|
|
matchReason,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Sort by confidence descending. Ties (two open invoices for the same
|
|
// amount on the same day) prefer the invoice that asked to be paid to the
|
|
// account the money landed on. A tie-breaker only: scores are untouched, so
|
|
// nothing that did not auto-match before starts to.
|
|
const landedOn = (transaction as { cash_account_id?: string | null }).cash_account_id ?? null
|
|
const prefers = (m: InvoiceMatch): number =>
|
|
landedOn && m.invoice.payment_cash_account_id === landedOn ? 1 : 0
|
|
matches.sort((a, b) => b.confidence - a.confidence || prefers(b) - prefers(a))
|
|
|
|
return {
|
|
matches,
|
|
unconvertedFxCount: unconvertedFxInvoices.length,
|
|
unconvertedFxInvoices,
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the best matching invoice for a transaction
|
|
* Returns the highest confidence match if it meets the threshold
|
|
*
|
|
* `InvoiceMatch | null` has nowhere to carry a reason, so an invoice withheld
|
|
* for a missing exchange rate is invisible on this path. Callers that can show
|
|
* the user something should use `findInvoiceMatchCandidates()` and read
|
|
* `unconvertedFxInvoices`; widening this signature is left to whoever has a
|
|
* surface to render it on.
|
|
*/
|
|
export async function getBestInvoiceMatch(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
transaction: Transaction,
|
|
minConfidence: number = 0.80
|
|
): Promise<InvoiceMatch | null> {
|
|
const matches = await findMatchingInvoices(supabase, companyId, transaction)
|
|
|
|
if (matches.length > 0 && matches[0].confidence >= minConfidence) {
|
|
return matches[0]
|
|
}
|
|
|
|
return null
|
|
}
|