Files
accounted/lib/bookkeeping/supplier-payment-lines.ts
T
Jakob WennbergandClaude Opus 4.8 b38b3d0230 fix(bookkeeping): settle öre differences to 3740 and improve supplier-invoice matching (#699)
Whole-krona Bankgiro/Swish payments of öre-bearing invoices were stranded
as partially_paid forever (e.g. 11 231 paid on an 11 231,25 invoice left
0,25 kr open). Book the sub-krona residual to BAS 3740 (Öres- och
kronutjämning) and settle the invoice in full, on both the supplier- and
customer-invoice match flows.

New shared pure helpers buildSupplierPaymentClearingLines +
planSupplierPayment mirror the customer-side primitives; routing preview
and commit through the same builder also fixes two pre-existing
preview↔commit drifts (payment account + line descriptions). Öre
absorption is accrual-only — cash entries book the full invoice, so
absorbing there would hide a 1930 discrepancy.

Also improves supplier-invoice ↔ bank matching:
- Pass-3 date window now spans [invoice_date-5, due_date+5] instead of
  due_date ±5, so early payments auto-match; an ambiguity guard demotes
  non-unique amount matches to suggestions.
- New retroactive matcher (on supplier_invoice.registered/.approved)
  surfaces the settling bank payment when the invoice is registered after
  the payment was imported. Matches are written as suggestions for
  one-click confirm-to-book, never silently auto-booked.

Tests: new unit tests for both pure helpers; extended matching, handler,
customer öre, and route suites. Full suite green (407 files / 5364 tests).

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-09 19:09:39 +02:00

133 lines
5.2 KiB
TypeScript
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
/**
* Builds the journal-entry lines for the clearing entry that closes (fully or
* partially) a supplier invoice against an actual bank transaction under
* faktureringsmetoden (accrual) — Dr 2440 / Cr <payment account>.
*
* Shared between:
* - GET /api/transactions/[id]/match-supplier-invoice/preview (read-only,
* drives the dialog the user confirms against)
* - POST /api/transactions/[id]/match-supplier-invoice (the commit path)
*
* Single source of truth so the preview and the committed verifikat are
* byte-identical — including the payment account and the per-line descriptions,
* which previously drifted (the preview used `last_supplier_payment_account` and
* "Kvittning leverantörsskuld" / "Utbetalning från bank", while the commit path
* defaulted to 1930 and "Utbetalning leverantörsfaktura …").
*
* # Öresavrundning (3740)
*
* A whole-krona Bankgiro/Swish settlement of an öre-bearing invoice total leaves
* a sub-krona residual (e.g. paying 11 231,25 with a rounded 11 231,00). Rather
* than strand that 0,25 kr as a permanent partial, the difference is booked to
* BAS 3740 (Öres- och kronutjämning) and 2440 is cleared in full so the invoice
* reaches `paid`. The residual sign drives the 3740 side:
*
* bank paid LESS than owed (apSek > bankSek) → öresavrundningsvinst → Cr 3740
* bank paid MORE than owed (apSek < bankSek) → öresavrundningsförlust → Dr 3740
*
* This polarity is the mirror of the customer side (`buildInvoicePaymentClearingLines`,
* where AR is cleared with a credit and 3740 takes the opposite side).
*
* # SEK only
*
* `apSek`/`bankSek` are home-currency (SEK). Cross-currency settlement carries a
* kursvinst/kursförlust (3960/7960) handled by `createSupplierInvoicePaymentEntry`,
* not here — öresavrundning is the residual AFTER FX and only meaningful in whole
* SEK kronor, so callers route only same-currency SEK payments through this helper.
*/
import type { CreateJournalEntryLineInput } from '@/types'
import { roundOre, ORE_ROUNDING_SETTLEMENT_MAX } from '@/lib/money'
export interface SupplierClearingArgs {
/** SEK on 2440 to clear for this settlement — the full remaining when an öre
* diff is absorbed, so the invoice reaches `paid`. */
apSek: number
/** Actual SEK that left the bank — the payment-account credit. */
bankSek: number
/** Bank/clearing account credited (e.g. 1930). */
paymentAccount: string
}
export interface SupplierClearingResult {
apSek: number
bankSek: number
/** roundOre(apSek bankSek): >0 → 3740 credit (vinst); <0 → 3740 debit
* (förlust); 0 → no 3740 line. Non-zero only within ORE_ROUNDING_SETTLEMENT_MAX. */
oreDiffSek: number
lines: CreateJournalEntryLineInput[]
}
/**
* Build the verifikat lines for a supplier-invoice payment matched against a
* SEK bank tx. Pure — no DB calls. Caller decides how to persist.
*
* |apSek bankSek| < ORE_ROUNDING_SETTLEMENT_MAX (and ≠ 0)
* → clear the full apSek off 2440, credit the actual bankSek, book the
* residual to 3740. Invoice settles fully.
* otherwise (exact, or a genuine ≥ 1 kr partial)
* → clear min(bankSek, apSek), no 3740 line (unchanged legacy behaviour).
*/
export function buildSupplierPaymentClearingLines(
args: SupplierClearingArgs,
): SupplierClearingResult {
const apSek = roundOre(args.apSek)
const bankSek = roundOre(args.bankSek)
const diff = roundOre(apSek - bankSek)
const isOreRounding = diff !== 0 && Math.abs(diff) < ORE_ROUNDING_SETTLEMENT_MAX
const lines: CreateJournalEntryLineInput[] = []
if (isOreRounding) {
// Clear the FULL debt off 2440 so the invoice → paid; the bank leg is the
// actual SEK paid; 3740 absorbs the öre residual.
lines.push({
account_number: '2440',
debit_amount: apSek,
credit_amount: 0,
line_description: 'Kvittning leverantörsskuld',
})
lines.push({
account_number: args.paymentAccount,
debit_amount: 0,
credit_amount: bankSek,
line_description: 'Utbetalning från bank',
})
if (diff > 0) {
// Paid fewer kronor than owed → öresavrundningsvinst → 3740 credit.
lines.push({
account_number: '3740',
debit_amount: 0,
credit_amount: Math.abs(diff),
line_description: 'Öresavrundning',
})
} else {
// Paid more kronor than owed → öresavrundningsförlust → 3740 debit.
lines.push({
account_number: '3740',
debit_amount: Math.abs(diff),
credit_amount: 0,
line_description: 'Öresavrundning',
})
}
return { apSek, bankSek, oreDiffSek: diff, lines }
}
// Exact settlement, or a genuine partial payment (≥ 1 kr short): clear what
// was actually moved, leave any remainder on the supplier ledger.
const amount = roundOre(Math.min(bankSek, apSek))
lines.push({
account_number: '2440',
debit_amount: amount,
credit_amount: 0,
line_description: 'Kvittning leverantörsskuld',
})
lines.push({
account_number: args.paymentAccount,
debit_amount: 0,
credit_amount: amount,
line_description: 'Utbetalning från bank',
})
return { apSek, bankSek, oreDiffSek: 0, lines }
}