* chore: repo-wide bloat sweep, remove dead code and fold duplicate helpers Remove 33 dead files, ~270 unreferenced exports/types, 13 dead i18n namespaces and 4 unused dependencies; fold byte-identical helper copies into one canonical home each (lib/utils chunk/sleep/utcDateStamp, lib/dates/iso, lib/invariants/uuid, lib/xml/escape, lib/reports/sru/format, lib/pdf/number-text, lib/browser/panel-request, lib/api/v1/body + v1ValidationError rolled out to ~55 v1 routes, booking-template schemas). No behaviour change: v1 bodies and status codes, MCP tool schemas, DB writes and money math are untouched. Naive ore rounding was deliberately not swapped for roundOre; see DECISIONS.md 2026-09-02 for the full list of things left alone on purpose. tsc, lint, 19588 unit tests and check:guards green; antipattern baseline ratcheted (naive-ore-round 622 -> 620, hand-rolled-invariant 115 -> 113). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * test(transactions): import RawTransaction from @/types after the ingest re-export removal CI's type ratchet (check:types, full tsconfig) caught the one test file that still imported the type through lib/transactions/ingest. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
919 lines
37 KiB
TypeScript
919 lines
37 KiB
TypeScript
import { createJournalEntry, findFiscalPeriod } from './engine'
|
|
import { resolveSekAmountOrNull, buildCurrencyMetadata } from './currency-utils'
|
|
import { resolveBookingAccount } from './accruals/account-suggestions'
|
|
import {
|
|
coerceDimensionsBag,
|
|
dimensionsBagKey,
|
|
mergeDimensionBags,
|
|
type LineDimensions,
|
|
} from './dimension-resolver'
|
|
import { generateSalesVatLines } from './vat-entries'
|
|
import { getVatTreatmentForRate } from '@/lib/invoices/vat-rules'
|
|
import { computeDeduction } from '@/lib/invoices/rot-rut-rules'
|
|
import { createLogger } from '@/lib/logger'
|
|
import { roundOre } from '@/lib/money'
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type {
|
|
CreateJournalEntryInput,
|
|
CreateJournalEntryLineInput,
|
|
EntityType,
|
|
Invoice,
|
|
InvoiceItem,
|
|
JournalEntry,
|
|
VatTreatment,
|
|
} from '@/types'
|
|
|
|
const log = createLogger('invoice-entries')
|
|
|
|
// INVOICE_FX_RATE_MISSING, InvoiceFxRateMissingError, getRevenueAccount and
|
|
// getOutputVatAccount live in ./invoice-accounts (pure, no engine import):
|
|
// the client-side proposal helpers (propose-send-lines, propose-payment-lines)
|
|
// need only those, and importing them from here dragged the engine, the
|
|
// account backfill and with it the full BAS chart into the browser bundle.
|
|
export { getOutputVatAccount, getRevenueAccount } from './invoice-accounts'
|
|
import { InvoiceFxRateMissingError, getOutputVatAccount, getRevenueAccount } from './invoice-accounts'
|
|
|
|
/**
|
|
* Convert an invoice-currency item amount to SEK for a journal entry line.
|
|
*
|
|
* SEK invoices short-circuit exactly as before, and so does any invoice with a
|
|
* legitimately supplied positive rate: the only new behaviour is the refusal
|
|
* above when a foreign invoice reaches a booking path with no rate at all.
|
|
* `amountSek` is deliberately null: an InvoiceItem has no per-item SEK column,
|
|
* so the rate is the only honest source at item granularity.
|
|
*/
|
|
function itemToSekOrThrow(
|
|
amount: number,
|
|
currency: string | null | undefined,
|
|
exchangeRate: number | null | undefined
|
|
): number {
|
|
const sek = resolveSekAmountOrNull(amount, null, currency, exchangeRate)
|
|
if (sek === null) throw new InvoiceFxRateMissingError(currency || 'okänd valuta')
|
|
return sek
|
|
}
|
|
|
|
/**
|
|
* Convert an invoice-level (header) amount to SEK for a journal entry line.
|
|
*
|
|
* Same refusal contract as `itemToSekOrThrow`, but honours a pre-computed
|
|
* `*_sek` column when the row carries one: header amounts (subtotal /
|
|
* vat_amount / total) have SEK twins that items lack. Rows that DO carry a
|
|
* `*_sek` value or a usable rate convert exactly as before; only the "foreign
|
|
* amount with no SEK source at all" case changes, from silently relabelling
|
|
* the foreign number as kronor (the lenient `resolveSekAmount` ladder, which
|
|
* currency-utils marks READ-ONLY CODE ONLY) to the same INVOICE_FX_RATE_MISSING
|
|
* refusal the item-driven generators raise. Without this, a rate-less foreign
|
|
* invoice booked through a caller without hydrated items posted its raw
|
|
* foreign number as kronor (1 250 EUR → 1 250 kr on 1510): balanced, so no
|
|
* trigger fired, and undetectable downstream.
|
|
*/
|
|
function headerToSekOrThrow(
|
|
amount: number,
|
|
amountSek: number | null | undefined,
|
|
currency: string | null | undefined,
|
|
exchangeRate: number | null | undefined
|
|
): number {
|
|
const sek = resolveSekAmountOrNull(amount, amountSek, currency, exchangeRate)
|
|
if (sek === null) throw new InvoiceFxRateMissingError(currency || 'okänd valuta')
|
|
return sek
|
|
}
|
|
|
|
/**
|
|
* Build the invoice identifier used in line_description. Prefers the assigned
|
|
* invoice number; falls back to a draft tag with the first 8 chars of the
|
|
* invoice UUID so the verifikation still identifies *vad affärshändelsen avser*
|
|
* per BFL 5 kap 6§ p.3 even if a journal entry is somehow created against an
|
|
* unnumbered invoice. The send path always assigns a number first, so this
|
|
* fallback is defensive, but it leaves no ambiguity if a future caller skips
|
|
* ensureInvoiceNumber.
|
|
*/
|
|
function invoiceTag(invoice: Pick<Invoice, 'id' | 'invoice_number'>): string {
|
|
return invoice.invoice_number ?? `utkast ${invoice.id.slice(0, 8)}`
|
|
}
|
|
|
|
/**
|
|
* Build a BFL-compliant verifikation description with event type and counterparty.
|
|
* Falls back to prefix + invoiceNumber if name is not provided (backward compat).
|
|
*/
|
|
function buildInvoiceDescription(
|
|
prefix: string, invoiceNumber: string | null, counterpartyName?: string,
|
|
invoiceId?: string,
|
|
): string {
|
|
const tag = invoiceNumber ?? (invoiceId ? `utkast ${invoiceId.slice(0, 8)}` : null)
|
|
const tagPart = tag ? ` ${tag}` : ''
|
|
return counterpartyName
|
|
? `${prefix}${tagPart}, ${counterpartyName}`
|
|
: `${prefix}${tagPart}`
|
|
}
|
|
|
|
/**
|
|
* Group invoice items by VAT rate and generate per-rate revenue + VAT lines.
|
|
* Returns credit lines only (revenue + VAT). The caller adds the debit side.
|
|
*
|
|
* options.deferAccruals: substitute the 29xx interim account for lines with a
|
|
* periodisering period. Only the callers that also create/cancel accrual
|
|
* schedules may pass true (invoice entry + credit note): the cash-method
|
|
* entry books revenue directly even if a line carries stale accrual fields,
|
|
* since no schedule would ever dissolve the interim balance.
|
|
*
|
|
* options.defaultDimensions (dimensions PR7): the invoice-level bag. Revenue
|
|
* lines carry item.dimensions merged over it (item wins per key): the merged
|
|
* bag is part of the aggregation identity, so two items on the same
|
|
* rate+account but different tags stay on separate lines. VAT lines carry
|
|
* the default only (the VAT account is a function of the treatment, never of
|
|
* a specific item).
|
|
*/
|
|
function generatePerRateLines(
|
|
items: InvoiceItem[],
|
|
invoiceVatTreatment: VatTreatment,
|
|
entityType: EntityType,
|
|
invoiceTagText: string,
|
|
currency?: string | null,
|
|
exchangeRate?: number | null,
|
|
options?: { deferAccruals?: boolean; defaultDimensions?: LineDimensions }
|
|
): CreateJournalEntryLineInput[] {
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = currency != null && currency !== 'SEK'
|
|
|
|
// Free-text / blank rows carry no amounts and never book: drop them before
|
|
// grouping so they can't produce a zero-amount revenue line.
|
|
items = items.filter((item) => item.line_type !== 'text')
|
|
|
|
// Helper: convert item amount to SEK when dealing with foreign currency.
|
|
// Refuses (InvoiceFxRateMissingError) rather than relabelling the foreign
|
|
// number as kronor: see itemToSekOrThrow above.
|
|
const toSek = (amount: number): number =>
|
|
itemToSekOrThrow(amount, currency, exchangeRate)
|
|
|
|
// Check if items have per-line vat_rate set (new invoices)
|
|
const hasPerLineVat = items.some((item) => item.vat_rate !== undefined && item.vat_rate !== null)
|
|
|
|
if (!hasPerLineVat) {
|
|
// Legacy fallback: single rate from invoice level. All items collapse
|
|
// into one revenue line, so only the invoice default can apply here:
|
|
// legacy rows predate per-item tagging anyway.
|
|
const revenueAccount = getRevenueAccount(invoiceVatTreatment, entityType)
|
|
const subtotal = items.reduce((sum, item) => sum + item.line_total, 0)
|
|
const subtotalSek = toSek(subtotal)
|
|
lines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
|
|
const totalVat = items.reduce((sum, item) => sum + (item.vat_amount || 0), 0)
|
|
if (totalVat > 0) {
|
|
if (isForeign) {
|
|
// For foreign currency, compute VAT in SEK directly
|
|
const vatSek = toSek(totalVat)
|
|
const vatAccount = getOutputVatAccount(invoiceVatTreatment)
|
|
lines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
} else {
|
|
const vatLines = generateSalesVatLines({
|
|
vatTreatment: invoiceVatTreatment,
|
|
baseAmount: subtotal,
|
|
direction: 'sales',
|
|
})
|
|
lines.push(...vatLines.map((line) => ({
|
|
...line,
|
|
dimensions: options?.defaultDimensions,
|
|
})))
|
|
}
|
|
}
|
|
return lines
|
|
}
|
|
|
|
// Group items by vat_rate (preserve first-seen rate order). Within each rate,
|
|
// sub-group revenue by the resolved BAS account + merged dimensions bag so a
|
|
// per-line/article account override (or a per-item dimension tag) produces
|
|
// its own credit line. VAT stays aggregated per rate (the VAT account is a
|
|
// function of the treatment, never of the revenue override).
|
|
type RevenueBucket = {
|
|
account: string
|
|
dimensions?: LineDimensions
|
|
subtotal: number
|
|
}
|
|
type RateGroup = {
|
|
vatAmount: number
|
|
// account + dims bag -> bucket (first-seen order)
|
|
buckets: Map<string, RevenueBucket>
|
|
}
|
|
const rateGroups = new Map<number, RateGroup>()
|
|
|
|
for (const item of items) {
|
|
const rate = item.vat_rate ?? 0
|
|
const treatment = rate === 0 && (invoiceVatTreatment === 'reverse_charge' || invoiceVatTreatment === 'export')
|
|
? invoiceVatTreatment
|
|
: getVatTreatmentForRate(rate)
|
|
// reverse_charge / export force the statutory revenue account (3308/3305);
|
|
// a per-line override only applies to ordinary domestic rates so EU/export
|
|
// sales keep landing in the right VAT-declaration ruta.
|
|
const isSpecialTreatment = treatment === 'reverse_charge' || treatment === 'export'
|
|
const plAccount = !isSpecialTreatment && item.revenue_account
|
|
? item.revenue_account
|
|
: getRevenueAccount(treatment, entityType)
|
|
// Periodiserade lines credit the 29xx interim account (förutbetalda
|
|
// intäkter) instead of revenue; the schedule dissolves it monthly. Output
|
|
// VAT below is untouched. Moms is never deferred. Special treatments are
|
|
// never deferred (ruta 39/40 must reflect the full period's sales).
|
|
const account = isSpecialTreatment || !options?.deferAccruals
|
|
? plAccount
|
|
: resolveBookingAccount('revenue', item, plAccount)
|
|
|
|
const dimensions = mergeDimensionBags(options?.defaultDimensions, item.dimensions)
|
|
const bucketKey = `${account}\u0000${dimensionsBagKey(dimensions)}`
|
|
|
|
const group = rateGroups.get(rate) ?? { vatAmount: 0, buckets: new Map<string, RevenueBucket>() }
|
|
group.vatAmount += item.vat_amount || 0
|
|
const bucket = group.buckets.get(bucketKey) ?? { account, dimensions, subtotal: 0 }
|
|
bucket.subtotal += item.line_total
|
|
group.buckets.set(bucketKey, bucket)
|
|
rateGroups.set(rate, group)
|
|
}
|
|
|
|
// Generate revenue + VAT lines per rate group.
|
|
for (const [rate, group] of rateGroups) {
|
|
const treatment = rate === 0 && (invoiceVatTreatment === 'reverse_charge' || invoiceVatTreatment === 'export')
|
|
? invoiceVatTreatment
|
|
: getVatTreatmentForRate(rate)
|
|
|
|
// The rate-level rounded subtotal is the balance anchor: identical to the
|
|
// pre-override single-account behaviour. When a rate splits across multiple
|
|
// buckets (account and/or dimensions), distribute that exact total so
|
|
// independent per-bucket rounding can never introduce a 1-öre imbalance
|
|
// against the 1510 debit: every bucket but the last rounds normally; the
|
|
// last absorbs the remainder.
|
|
const rateSubtotalSek = Math.round(
|
|
toSek(Array.from(group.buckets.values()).reduce((sum, b) => sum + b.subtotal, 0)) * 100
|
|
) / 100
|
|
|
|
const buckets = Array.from(group.buckets.values())
|
|
let allocated = 0
|
|
buckets.forEach((bucket, idx) => {
|
|
const isLast = idx === buckets.length - 1
|
|
const credit = isLast
|
|
? Math.round((rateSubtotalSek - allocated) * 100) / 100
|
|
: Math.round(toSek(bucket.subtotal) * 100) / 100
|
|
allocated = Math.round((allocated + credit) * 100) / 100
|
|
lines.push({
|
|
account_number: bucket.account,
|
|
debit_amount: 0,
|
|
credit_amount: credit,
|
|
line_description: `Försäljning faktura ${invoiceTagText}`,
|
|
dimensions: bucket.dimensions,
|
|
})
|
|
})
|
|
|
|
const roundedVat = Math.round(toSek(group.vatAmount) * 100) / 100
|
|
if (roundedVat !== 0) {
|
|
const vatAccount = getOutputVatAccount(treatment)
|
|
lines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: roundedVat,
|
|
line_description: `Utgående moms ${rate}% faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
return lines
|
|
}
|
|
|
|
/**
|
|
* Generate ROT/RUT-avdrag debit lines from invoice items.
|
|
*
|
|
* For each item flagged with `deduction_type`, produces a debit on BAS 1513
|
|
* (Övriga kortfristiga fordringar, Skatteverket) for the computed
|
|
* deduction amount. The caller must REDUCE the 1510 debit (kundfordringar)
|
|
* by the same total: the customer only owes the post-deduction amount;
|
|
* Skatteverket pays the rest via Husavdragstjänsten. Returns both the
|
|
* lines and the total so callers can apply both adjustments atomically.
|
|
*
|
|
* Foreign-currency invoices: ROT/RUT-avdrag is a Sweden-only rule, so
|
|
* receivables on 1513 are always recorded in SEK. We use the same SEK
|
|
* conversion as the rest of the entry (the shared itemToSekOrThrow helper, so
|
|
* this function and generatePerRateLines cannot drift).
|
|
*/
|
|
function generateRotRutLines(
|
|
items: InvoiceItem[],
|
|
invoiceTagText: string,
|
|
currency?: string | null,
|
|
exchangeRate?: number | null,
|
|
defaultDimensions?: LineDimensions,
|
|
side: 'debit' | 'credit' = 'debit',
|
|
): { lines: CreateJournalEntryLineInput[]; totalSek: number } {
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
|
|
// Same refusal as generatePerRateLines: 1513 is a kronor receivable on
|
|
// Skatteverket, so an unconvertible foreign amount must not land there.
|
|
const toSek = (amount: number): number =>
|
|
itemToSekOrThrow(amount, currency, exchangeRate)
|
|
|
|
let totalSek = 0
|
|
|
|
for (const item of items) {
|
|
if (!item.deduction_type) continue
|
|
// Recompute server-side to defend against tampered client values.
|
|
const amount = computeDeduction({
|
|
unit_price: side === 'credit' ? Math.abs(item.unit_price) : item.unit_price,
|
|
quantity: side === 'credit' ? Math.abs(item.quantity) : item.quantity,
|
|
// The deduction base is the NET line total (rabatt reduces what the
|
|
// customer pays); omitting this books 1513 on the gross while the
|
|
// stored deduction_total and the Skatteverket claim carry the net.
|
|
discount_percent: item.discount_percent ?? 0,
|
|
deduction_type: item.deduction_type,
|
|
vat_rate: item.vat_rate,
|
|
})
|
|
if (amount <= 0) continue
|
|
const amountSek = Math.round(toSek(amount) * 100) / 100
|
|
if (amountSek <= 0) continue
|
|
totalSek += amountSek
|
|
const kind = item.deduction_type === 'rot' ? 'ROT' : 'RUT'
|
|
lines.push({
|
|
account_number: '1513',
|
|
debit_amount: side === 'debit' ? amountSek : 0,
|
|
credit_amount: side === 'credit' ? amountSek : 0,
|
|
line_description: side === 'credit'
|
|
? `${kind}-avdrag kreditfaktura ${invoiceTagText}`
|
|
: `${kind}-avdrag faktura ${invoiceTagText}`,
|
|
// Per-item line: carries the item's merged bag like its revenue line.
|
|
dimensions: mergeDimensionBags(defaultDimensions, item.dimensions),
|
|
})
|
|
}
|
|
|
|
return { lines, totalSek: Math.round(totalSek * 100) / 100 }
|
|
}
|
|
|
|
/**
|
|
* Create journal entry when an invoice is created (status != draft)
|
|
*
|
|
* Supports mixed VAT rates per line item. Groups items by vat_rate
|
|
* and creates separate revenue + VAT lines per rate.
|
|
*
|
|
* Standard domestic invoice (25% VAT):
|
|
* Debit 1510 Kundfordringar [total incl VAT]
|
|
* Credit 30xx Försäljning [subtotal per rate]
|
|
* Credit 26xx Utgående moms [vat per rate]
|
|
*
|
|
* EU reverse charge:
|
|
* Debit 1510 Kundfordringar [subtotal]
|
|
* Credit 3308 Försäljning tjänst EU [subtotal]
|
|
*
|
|
* Export (non-EU):
|
|
* Debit 1510 Kundfordringar [subtotal]
|
|
* Credit 3305 Försäljning tjänst Export [subtotal]
|
|
*/
|
|
export async function createInvoiceJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
/**
|
|
* Overrides for non-standard sales that still book identically to a customer
|
|
* invoice. Used by self-billing received (mottagen självfaktura): the
|
|
* verifikation should read "Självfaktura <external number>" rather than
|
|
* "Kundfaktura <our number>", and the number tag must be the counterparty's
|
|
* external number because the row has no own `invoice_number`.
|
|
*
|
|
* customLines: user-edited rows from the send dialog. Booked verbatim
|
|
* (caller validates balance); line generation is skipped entirely.
|
|
*/
|
|
options?: {
|
|
descriptionPrefix?: string
|
|
numberOverride?: string | null
|
|
customLines?: CreateJournalEntryLineInput[]
|
|
}
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, invoice.invoice_date)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for invoice date:', invoice.invoice_date)
|
|
return null
|
|
}
|
|
|
|
if (options?.customLines && options.customLines.length > 0) {
|
|
return createJournalEntry(supabase, companyId, userId, {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: invoice.invoice_date,
|
|
description: buildInvoiceDescription(
|
|
options?.descriptionPrefix ?? 'Kundfaktura',
|
|
options?.numberOverride ?? invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
),
|
|
source_type: 'invoice_created',
|
|
source_id: invoice.id,
|
|
lines: options.customLines,
|
|
})
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = invoice.currency !== 'SEK'
|
|
const tag = options?.numberOverride ?? invoiceTag(invoice)
|
|
// Dimensions PR7: the invoice default rides every generated line; item bags
|
|
// merge over it inside generatePerRateLines/generateRotRutLines.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// Credit lines: revenue + VAT per rate group (compute first to guarantee balance)
|
|
const creditLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (invoice.items && invoice.items.length > 0) {
|
|
creditLines.push(...generatePerRateLines(
|
|
invoice.items, invoice.vat_treatment, entityType, tag,
|
|
invoice.currency, invoice.exchange_rate,
|
|
// Schedules are created right after this entry commits (send/mark-sent
|
|
// flows), so deferring to 29xx here is safe.
|
|
{ deferAccruals: true, defaultDimensions }
|
|
))
|
|
} else {
|
|
// Fallback: no items available, use invoice-level amounts. Strict
|
|
// conversion: a rate-less foreign header must refuse exactly like the
|
|
// item-driven path, not post the raw foreign number as kronor.
|
|
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
|
|
const subtotalSek = headerToSekOrThrow(invoice.subtotal, invoice.subtotal_sek, invoice.currency, invoice.exchange_rate)
|
|
|
|
creditLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (invoice.vat_amount > 0) {
|
|
if (isForeign) {
|
|
const vatSek = headerToSekOrThrow(invoice.vat_amount, invoice.vat_amount_sek, invoice.currency, invoice.exchange_rate)
|
|
const vatAccount = getOutputVatAccount(invoice.vat_treatment)
|
|
creditLines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
} else {
|
|
const vatLines = generateSalesVatLines({
|
|
vatTreatment: invoice.vat_treatment,
|
|
baseAmount: invoice.subtotal,
|
|
direction: 'sales',
|
|
})
|
|
creditLines.push(...vatLines.map((line) => ({
|
|
...line,
|
|
dimensions: defaultDimensions,
|
|
})))
|
|
}
|
|
}
|
|
}
|
|
|
|
// ROT/RUT-avdrag debit lines (1513 Skatteverket). When present, they
|
|
// reduce the 1510 debit by the same total so the verifikation stays
|
|
// balanced (debits 1510 + 1513 = credits revenue + VAT). The customer
|
|
// only owes the post-deduction amount; Skatteverket pays the rest.
|
|
const rotRut = invoice.items && invoice.items.length > 0
|
|
? generateRotRutLines(invoice.items, tag, invoice.currency, invoice.exchange_rate, defaultDimensions)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Debit: Kundfordringar, balance guarantee: debit = sum of all credit
|
|
// lines MINUS the ROT/RUT total which goes to 1513 instead.
|
|
const totalCredits = creditLines.reduce((sum, l) => sum + l.credit_amount, 0)
|
|
const debitAmount = isForeign
|
|
? Math.round(totalCredits * 100) / 100
|
|
: headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
const arAmount = Math.round((debitAmount - rotRut.totalSek) * 100) / 100
|
|
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: arAmount,
|
|
credit_amount: 0,
|
|
line_description: `Faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
...buildCurrencyMetadata(invoice.currency, isForeign ? invoice.total : undefined, invoice.exchange_rate),
|
|
})
|
|
|
|
lines.push(...rotRut.lines)
|
|
lines.push(...creditLines)
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: invoice.invoice_date,
|
|
description: buildInvoiceDescription(
|
|
options?.descriptionPrefix ?? 'Kundfaktura',
|
|
options?.numberOverride ?? invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
),
|
|
source_type: 'invoice_created',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* What the customer still owes on an invoice, in invoice currency:
|
|
* remaining_amount when the row carries it, else total minus paid_amount.
|
|
* remaining_amount is written as total minus the ROT/RUT deduction at
|
|
* creation (build-invoice-write.ts) and decremented per payment, so it is the
|
|
* one figure that already knows about both partial payments and the 1513
|
|
* share. Never falls back to the bare total when paid_amount is present.
|
|
*/
|
|
function invoiceOutstandingAmount(invoice: Invoice): number {
|
|
const inv = invoice as Invoice & {
|
|
remaining_amount?: number | null
|
|
paid_amount?: number | null
|
|
deduction_total?: number | null
|
|
}
|
|
// A payment is being booked, so a stored 0 cannot mean "settled": rows
|
|
// written by paths that bypass buildInvoiceWriteData (imports, sandbox seed,
|
|
// legacy migrations) leave the NOT NULL DEFAULT 0 in place. Treat 0 as
|
|
// unmaintained and derive: total minus prior payments minus the ROT/RUT
|
|
// share that was never the customer's to pay.
|
|
if (typeof inv.remaining_amount === 'number' && Number.isFinite(inv.remaining_amount) && inv.remaining_amount > 0) {
|
|
return roundOre(inv.remaining_amount)
|
|
}
|
|
const paid = typeof inv.paid_amount === 'number' ? inv.paid_amount : 0
|
|
const deduction = typeof inv.deduction_total === 'number' ? inv.deduction_total : 0
|
|
return roundOre(invoice.total - paid - deduction)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry when an invoice is marked as paid
|
|
*
|
|
* Debit 1930 Företagskonto [total]
|
|
* Credit 1510 Kundfordringar [total]
|
|
*
|
|
* `settlementAccountNumber` overrides the debit side for payments that land
|
|
* somewhere other than the bank account: e.g. '1686' (Fordringar för
|
|
* kontokort) when a Stripe payment settles into the PSP balance and only
|
|
* reaches 1930 with the later payout.
|
|
*/
|
|
export async function createInvoicePaymentJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
paymentDate: string,
|
|
exchangeRateDifference?: number,
|
|
customerName?: string,
|
|
paymentAmount?: number,
|
|
settlementAccountNumber: string = '1930'
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, paymentDate)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for payment date:', paymentDate)
|
|
return null
|
|
}
|
|
|
|
const isPartial = paymentAmount != null
|
|
const desc = buildInvoiceDescription(
|
|
isPartial ? 'Delbetalning kundfaktura' : 'Inbetalning kundfaktura',
|
|
invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
)
|
|
// Dimensions PR7: the payment voucher re-propagates the linked invoice's
|
|
// default bag onto every leg: incl. the FX result lines, so a project's
|
|
// kursvinst/kursförlust stays inside the project P&L.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// When paymentAmount is provided, use it for the 1930/1510 line amounts.
|
|
// Otherwise the payment settles what is still outstanding on the invoice:
|
|
// remaining_amount (total minus prior partial payments minus any ROT/RUT
|
|
// deduction, which sits on 1513 and is never the customer's to pay). Booking
|
|
// invoice.total here, as this path did before, credited 1510 for money that
|
|
// never arrived: 1510 went negative by the avdrag on every ROT/RUT invoice
|
|
// settled through mark-paid without lines, and 1930 was overstated by the
|
|
// same amount. Strict conversion on all three: a rate-less foreign payment
|
|
// would otherwise clear 1510 with the raw foreign number relabelled as
|
|
// kronor (balanced against an equally wrong 1930 debit, so nothing
|
|
// downstream could catch it). A fully outstanding invoice still converts via
|
|
// total_sek exactly as before, so legacy rows without a rate keep working.
|
|
const outstanding = invoiceOutstandingAmount(invoice)
|
|
const settlesFullTotal = Math.abs(outstanding - invoice.total) < 0.005
|
|
const bookedSekAmount = isPartial
|
|
? headerToSekOrThrow(paymentAmount, null, invoice.currency, invoice.exchange_rate)
|
|
: settlesFullTotal
|
|
? headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
: headerToSekOrThrow(outstanding, null, invoice.currency, invoice.exchange_rate)
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (!isPartial && exchangeRateDifference && exchangeRateDifference !== 0) {
|
|
// Foreign currency with exchange rate difference
|
|
// For receivables: positive diff = gain (received more), negative = loss (received less)
|
|
const actualSekReceived = bookedSekAmount + exchangeRateDifference
|
|
|
|
// Debit: settlement account (bank by default) at actual SEK received
|
|
lines.push({
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: Math.round(actualSekReceived * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: desc,
|
|
})
|
|
|
|
// Credit: Clear kundfordringar at original booked SEK amount
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
line_description: desc,
|
|
})
|
|
|
|
// Exchange rate difference
|
|
if (exchangeRateDifference > 0) {
|
|
// Gain: Credit 3960 (received more than booked)
|
|
lines.push({
|
|
account_number: '3960',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(exchangeRateDifference * 100) / 100,
|
|
line_description: 'Valutakursvinst',
|
|
})
|
|
} else {
|
|
// Loss: Debit 7960 (received less than booked)
|
|
lines.push({
|
|
account_number: '7960',
|
|
debit_amount: Math.round(Math.abs(exchangeRateDifference) * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: 'Valutakursförlust',
|
|
})
|
|
}
|
|
} else {
|
|
// Standard SEK payment or no exchange rate difference
|
|
lines.push(
|
|
{
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: desc,
|
|
},
|
|
{
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
line_description: desc,
|
|
}
|
|
)
|
|
}
|
|
|
|
if (defaultDimensions) {
|
|
// Copy per line: a shared bag object would let one line's mutation
|
|
// leak into every other line (same contract as proposal stamping).
|
|
for (const line of lines) line.dimensions = { ...defaultDimensions }
|
|
}
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: paymentDate,
|
|
description: desc,
|
|
source_type: 'invoice_paid',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry for a credit note (reversed version of original invoice entry)
|
|
* Supports per-item VAT rates with reversed debit/credit sides.
|
|
*
|
|
* Debit 30xx Försäljning [subtotal per rate]
|
|
* Debit 26xx Utgående moms [vat per rate]
|
|
* Credit 1510 Kundfordringar [total]
|
|
*/
|
|
export async function createCreditNoteJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
creditNote: Invoice,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
/**
|
|
* Original voucher reference (e.g. "A-42") to embed in the JE description and
|
|
* line-level descriptions. BFL 5 kap. 5 § requires a correction to point back
|
|
* to the corrected verifikation; the invoice number alone is insufficient
|
|
* because it doesn't identify the entry in the verifikationsserie.
|
|
*/
|
|
originalVoucherRef?: string
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, creditNote.invoice_date)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for credit note date:', creditNote.invoice_date)
|
|
return null
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const tag = invoiceTag(creditNote)
|
|
const lineSuffix = originalVoucherRef ? ` (avser ${originalVoucherRef})` : ''
|
|
// Dimensions PR7: the credit note's bag (copied from the original at credit
|
|
// time) so the reversal nets against the same dimension cells in reports.
|
|
const defaultDimensions = coerceDimensionsBag(creditNote.default_dimensions)
|
|
|
|
// Generate reversed revenue + VAT lines per rate group (debit side for credit notes)
|
|
const debitLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (creditNote.items && creditNote.items.length > 0) {
|
|
// Use absolute items for generatePerRateLines, then swap debit/credit
|
|
const creditLines = generatePerRateLines(
|
|
creditNote.items, creditNote.vat_treatment, entityType, tag,
|
|
creditNote.currency, creditNote.exchange_rate,
|
|
// Credit-note items carry the original's accrual fields so the reversal
|
|
// hits the same 29xx interim account; the original's schedule is
|
|
// cancelled/stornoed by the credit flow.
|
|
{ deferAccruals: true, defaultDimensions }
|
|
)
|
|
for (const line of creditLines) {
|
|
debitLines.push({
|
|
...line,
|
|
debit_amount: Math.abs(line.credit_amount),
|
|
credit_amount: Math.abs(line.debit_amount),
|
|
line_description: `Kreditfaktura ${tag}${lineSuffix}`,
|
|
})
|
|
}
|
|
} else {
|
|
// Fallback: invoice-level amounts. Same strict conversion as the
|
|
// createInvoiceJournalEntry fallback: a rate-less foreign credit note
|
|
// must refuse, not reverse the receivable with a mislabelled number.
|
|
const revenueAccount = getRevenueAccount(creditNote.vat_treatment, entityType)
|
|
const absSubtotal = Math.abs(headerToSekOrThrow(creditNote.subtotal, creditNote.subtotal_sek, creditNote.currency, creditNote.exchange_rate))
|
|
const absVat = Math.abs(headerToSekOrThrow(creditNote.vat_amount, creditNote.vat_amount_sek, creditNote.currency, creditNote.exchange_rate))
|
|
|
|
debitLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: absSubtotal,
|
|
credit_amount: 0,
|
|
line_description: `Kreditfaktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (absVat > 0) {
|
|
const vatAccount = getOutputVatAccount(creditNote.vat_treatment)
|
|
debitLines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: absVat,
|
|
credit_amount: 0,
|
|
line_description: `Moms kreditfaktura ${tag}${lineSuffix}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
lines.push(...debitLines)
|
|
|
|
// ROT/RUT reverses the exact receivable split used by the original invoice:
|
|
// 1510 for the customer portion and 1513 for the Skatteverket portion.
|
|
const rotRut = creditNote.items && creditNote.items.length > 0
|
|
? generateRotRutLines(
|
|
creditNote.items,
|
|
tag,
|
|
creditNote.currency,
|
|
creditNote.exchange_rate,
|
|
defaultDimensions,
|
|
'credit',
|
|
)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Credit: Kundfordringar, balance guarantee: 1510 + 1513 equals debits.
|
|
const totalDebits = debitLines.reduce((sum, l) => sum + l.debit_amount, 0)
|
|
const customerReceivable = roundOre(totalDebits - rotRut.totalSek)
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: customerReceivable,
|
|
line_description: `Kreditfaktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
lines.push(...rotRut.lines)
|
|
|
|
const baseDescription = buildInvoiceDescription('Kreditfaktura', creditNote.invoice_number, customerName, creditNote.id)
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: creditNote.invoice_date,
|
|
description: originalVoucherRef
|
|
? `${baseDescription} (avser verifikation ${originalVoucherRef})`
|
|
: baseDescription,
|
|
source_type: 'credit_note',
|
|
source_id: creditNote.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry for kontantmetoden (cash method) when payment is received.
|
|
* Supports per-item VAT rates. Revenue + VAT recognised at payment.
|
|
*
|
|
* Debit 1930 Företagskonto [total]
|
|
* Credit 30xx Försäljning [subtotal per rate]
|
|
* Credit 26xx Utgående moms [vat per rate] (if applicable)
|
|
*/
|
|
export async function createInvoiceCashEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
paymentDate: string,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
settlementAccountNumber: string = '1930'
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, paymentDate)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for payment date:', paymentDate)
|
|
return null
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = invoice.currency !== 'SEK'
|
|
const tag = invoiceTag(invoice)
|
|
// Dimensions PR7: kontantmetoden books revenue at payment, so this IS the
|
|
// producer path for cash-method companies: same merge rules as issuance.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// Credit lines: revenue + VAT per rate group (compute first to guarantee balance)
|
|
const creditLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (invoice.items && invoice.items.length > 0) {
|
|
creditLines.push(...generatePerRateLines(
|
|
invoice.items, invoice.vat_treatment, entityType, tag,
|
|
invoice.currency, invoice.exchange_rate,
|
|
{ defaultDimensions }
|
|
))
|
|
} else {
|
|
// Fallback: invoice-level amounts. Strict conversion, same rationale as
|
|
// the createInvoiceJournalEntry fallback above.
|
|
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
|
|
const subtotalSek = headerToSekOrThrow(invoice.subtotal, invoice.subtotal_sek, invoice.currency, invoice.exchange_rate)
|
|
|
|
creditLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (invoice.vat_amount > 0) {
|
|
const vatSek = headerToSekOrThrow(invoice.vat_amount, invoice.vat_amount_sek, invoice.currency, invoice.exchange_rate)
|
|
const vatAccount = getOutputVatAccount(invoice.vat_treatment)
|
|
creditLines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
// ROT/RUT-avdrag debit lines (1513 Skatteverket). On cash method the
|
|
// bank account (1930) receives only the post-deduction amount in real
|
|
// life; the rest comes from Skatteverket later. We model that by
|
|
// splitting the debit: 1930 = total - deduction, 1513 = deduction.
|
|
const rotRut = invoice.items && invoice.items.length > 0
|
|
? generateRotRutLines(invoice.items, tag, invoice.currency, invoice.exchange_rate, defaultDimensions)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Debit: Företagskonto, balance guarantee: debit = sum of credit lines
|
|
// minus the ROT/RUT total which goes to 1513 instead.
|
|
const totalCredits = creditLines.reduce((sum, l) => sum + l.credit_amount, 0)
|
|
const cashDebit = isForeign
|
|
? Math.round(totalCredits * 100) / 100
|
|
: headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
const bankAmount = Math.round((cashDebit - rotRut.totalSek) * 100) / 100
|
|
lines.push({
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: bankAmount,
|
|
credit_amount: 0,
|
|
line_description: buildInvoiceDescription('Kontantbetalning kundfaktura', invoice.invoice_number, customerName, invoice.id),
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
lines.push(...rotRut.lines)
|
|
lines.push(...creditLines)
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: paymentDate,
|
|
description: buildInvoiceDescription('Kontantbetalning kundfaktura', invoice.invoice_number, customerName, invoice.id),
|
|
source_type: 'invoice_cash_payment',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|