14f7478abb
Kundreskontra and leverantörsreskontra were effectively always "as of today": the UI never passed a date, the xlsx export ignored the chosen fiscal year, and no PDF existed. - Both ledger generators reconstruct the ledger as it stood on a backdated as-of date: invoices dated on or before it (including ones fully paid since) with outstanding recomputed from the payment-row history; paid_at dates row-less full payments; undateable legacy amounts degrade to the live values. Today/future dates keep the live computation byte-identical. - New shared reskontra PDF template (aging per counterparty + invoice detail for kundreskontra) with PDF routes for both ledgers. - Both report views get a "Per datum" date control; the export menu offers PDF + Excel and passes the chosen date through. Note: the PDF template deliberately avoids react-pdf's `break` prop: it deadlocks layout when the section spills across pages (reproduced at 40+ rows, documented in the template). Fixes #1020 Fixes #1021 Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
178 lines
6.2 KiB
TypeScript
178 lines
6.2 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import { resolveSekAmount } from '@/lib/bookkeeping/currency-utils'
|
|
import { fetchPaymentsAsOf, outstandingAsOf, todayIsoDate, type PaymentsAsOf } from './reskontra-payments'
|
|
|
|
export interface SupplierLedgerEntry {
|
|
supplier_id: string
|
|
supplier_name: string
|
|
current: number
|
|
days_1_30: number
|
|
days_31_60: number
|
|
days_61_90: number
|
|
days_90_plus: number
|
|
total_outstanding: number
|
|
}
|
|
|
|
export interface SupplierLedgerReport {
|
|
entries: SupplierLedgerEntry[]
|
|
total_outstanding: number
|
|
total_current: number
|
|
total_overdue: number
|
|
unpaid_count: number
|
|
/**
|
|
* Number of foreign-currency invoices excluded from the SEK totals because
|
|
* they had no exchange_rate. Adding them would mix currencies; surfacing
|
|
* the count lets the UI tell the user a row could not be converted.
|
|
*/
|
|
unconverted_fx_count: number
|
|
}
|
|
|
|
/**
|
|
* Generate supplier ledger (leverantörsreskontra) with aging analysis.
|
|
*
|
|
* With a backdated `asOfDate` the ledger is reconstructed as it stood on that
|
|
* date: invoices dated on or before it (including ones fully paid since) with
|
|
* outstanding amounts recomputed from the payment history (#1021). Without an
|
|
* `asOfDate`, or with today/future, the live open-invoice state is used as-is.
|
|
*/
|
|
export async function generateSupplierLedger(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
asOfDate?: string
|
|
): Promise<SupplierLedgerReport> {
|
|
const refDate = asOfDate ? new Date(asOfDate) : new Date()
|
|
// Backdated reconstruction only for genuinely historical dates: for
|
|
// today/future the stored open-invoice state IS the as-of state.
|
|
const isHistorical = !!asOfDate && asOfDate < todayIsoDate()
|
|
|
|
// Fetch the ledger population. Live view: open invoices only. Historical
|
|
// view: also invoices paid since the as-of date, restricted to invoice
|
|
// dates on or before it. Disputed/credited/reversed invoices stay excluded,
|
|
// matching the live view's semantics.
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
let invoices: any[]
|
|
let payments: PaymentsAsOf | null = null
|
|
try {
|
|
invoices = await fetchAllRows(({ from, to }) => {
|
|
let query = supabase
|
|
.from('supplier_invoices')
|
|
.select('*, supplier:suppliers(id, name)')
|
|
.eq('company_id', companyId)
|
|
query = isHistorical
|
|
? query
|
|
.in('status', ['registered', 'approved', 'partially_paid', 'overdue', 'paid'])
|
|
.lte('invoice_date', asOfDate!)
|
|
: query.in('status', ['registered', 'approved', 'partially_paid', 'overdue'])
|
|
return query
|
|
// Stable total order for correct paging (see fetch-all.ts).
|
|
.order('id', { ascending: true })
|
|
.range(from, to)
|
|
})
|
|
|
|
if (isHistorical) {
|
|
payments = await fetchPaymentsAsOf(
|
|
supabase,
|
|
'supplier_invoice_payments',
|
|
'supplier_invoice_id',
|
|
companyId,
|
|
asOfDate!
|
|
)
|
|
}
|
|
} catch {
|
|
return {
|
|
entries: [],
|
|
total_outstanding: 0,
|
|
total_current: 0,
|
|
total_overdue: 0,
|
|
unpaid_count: 0,
|
|
unconverted_fx_count: 0,
|
|
}
|
|
}
|
|
|
|
// Group by supplier and calculate aging
|
|
const bySupplier = new Map<string, SupplierLedgerEntry>()
|
|
let unconvertedFxCount = 0
|
|
let settledSkipped = 0
|
|
|
|
for (const inv of invoices) {
|
|
const supplierId = inv.supplier_id
|
|
const supplierName = inv.supplier?.name || 'Okänd leverantör'
|
|
|
|
// Foreign-currency invoice with no exchange_rate cannot be converted to
|
|
// SEK; adding the raw foreign amount to a SEK total would be unsound, so
|
|
// the row is excluded from sums and only counted.
|
|
const isFx = inv.currency && inv.currency !== 'SEK'
|
|
const hasRate = inv.exchange_rate != null && Number(inv.exchange_rate) > 0
|
|
if (isFx && !hasRate) {
|
|
unconvertedFxCount += 1
|
|
continue
|
|
}
|
|
|
|
// Outstanding in invoice currency: live view trusts the stored
|
|
// remaining_amount; a historical view recomputes it from the payment
|
|
// history as of the reconstruction date.
|
|
const liveOutstanding = Number(inv.remaining_amount) || 0
|
|
const outstandingRaw = payments
|
|
? outstandingAsOf(inv, Number(inv.total) || 0, liveOutstanding, payments, asOfDate!)
|
|
: liveOutstanding
|
|
|
|
// Historical view: 'paid' invoices are only fetched to catch ones still
|
|
// open at the as-of date. One already settled by then adds nothing.
|
|
if (payments && inv.status === 'paid' && outstandingRaw === 0) {
|
|
settledSkipped += 1
|
|
continue
|
|
}
|
|
|
|
if (!bySupplier.has(supplierId)) {
|
|
bySupplier.set(supplierId, {
|
|
supplier_id: supplierId,
|
|
supplier_name: supplierName,
|
|
current: 0,
|
|
days_1_30: 0,
|
|
days_31_60: 0,
|
|
days_61_90: 0,
|
|
days_90_plus: 0,
|
|
total_outstanding: 0,
|
|
})
|
|
}
|
|
|
|
const entry = bySupplier.get(supplierId)!
|
|
const dueDate = new Date(inv.due_date)
|
|
const daysOverdue = Math.floor((refDate.getTime() - dueDate.getTime()) / (1000 * 60 * 60 * 24))
|
|
// Outstanding is in invoice currency. The 2440 GL line was posted in SEK
|
|
// at the invoice-date rate, so we convert here for the reconciliation.
|
|
const amount = resolveSekAmount(outstandingRaw, null, inv.currency, inv.exchange_rate)
|
|
|
|
if (daysOverdue <= 0) {
|
|
entry.current += amount
|
|
} else if (daysOverdue <= 30) {
|
|
entry.days_1_30 += amount
|
|
} else if (daysOverdue <= 60) {
|
|
entry.days_31_60 += amount
|
|
} else if (daysOverdue <= 90) {
|
|
entry.days_61_90 += amount
|
|
} else {
|
|
entry.days_90_plus += amount
|
|
}
|
|
|
|
entry.total_outstanding += amount
|
|
}
|
|
|
|
const entries = Array.from(bySupplier.values())
|
|
.sort((a, b) => b.total_outstanding - a.total_outstanding)
|
|
|
|
const total_outstanding = entries.reduce((sum, e) => sum + e.total_outstanding, 0)
|
|
const total_current = entries.reduce((sum, e) => sum + e.current, 0)
|
|
const total_overdue = total_outstanding - total_current
|
|
|
|
return {
|
|
entries,
|
|
total_outstanding: Math.round(total_outstanding * 100) / 100,
|
|
total_current: Math.round(total_current * 100) / 100,
|
|
total_overdue: Math.round(total_overdue * 100) / 100,
|
|
unpaid_count: invoices.length - settledSkipped,
|
|
unconverted_fx_count: unconvertedFxCount,
|
|
}
|
|
}
|