a8801430f4
* fix(reports): drive report line queries from journal_entries, not the unfiltered lines side
Every report generator fetched journal_entry_lines with a
journal_entries!inner(...) embed and put the tenant filter on the
embedded side (.eq('journal_entries.company_id', ...)). PostgREST
compiles that to a correlated INNER JOIN LATERAL with a parameterized
LIMIT inside, which blocks join reordering: Postgres walked the ENTIRE
journal_entry_lines table (603k rows, all tenants) per report query.
Measured in production: 13.6 s vs 2.7 ms for the equivalent plain join,
against Supabase's 8 s statement_timeout; nightly cloud backups failed
for 5 of 11 companies on 2026-07-09 and a GL report 500'd.
Introduce lib/bookkeeping/entry-lines.ts with a shared two-step fetch:
1. fetch matching journal_entries (id + caller-selected columns)
filtered by company_id / fiscal_period_id / status / entry_date /
source_type, paginated via fetchAllRows;
2. fetch journal_entry_lines with .in('journal_entry_id', chunk) in
chunks of 100 ids (URL-length safety), paginated per chunk;
3. reattach the parent entry to each line under the embed's key shape
(line.journal_entries = {...}, aliasable) and sort lines by id
ascending to preserve the old .order('id') semantics.
Converted call sites (selected columns and filters preserved):
trial-balance (x2), general-ledger, journal-register, sie-export
(reuses its existing entry list via fetchLinesByEntryIds),
vat-declaration, dimension-pnl, opening-balances, monthly-breakdown,
periodisk-sammanstallning, rc-basis-gaps (sibling-line fetch now also
chunked), ar-reconciliation, supplier-reconciliation,
bank-reconciliation, asset-service (x2), bolagsskatt-calculator,
sarskild-loneskatt-calculator.
Tests: unit tests for the helper (chunk size, reattachment shape,
forced id/journal_entry_id columns, empty result, cross-chunk sort,
error propagation); existing report/reconciliation/bokslut test mocks
updated to the two-step query shape, preserving every assertion about
report output.
From the 2026-07-09 production log triage.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* fix(reports): stop echoing raw error messages from the general-ledger route
The catch handler returned err.message to the client in
details.reason; internal error strings (SQL fragments, table names,
timeout messages) must not reach the browser. The error is already
logged server-side with the request id, so the client envelope keeps
only the REPORT_GENERATION_FAILED code.
From the 2026-07-09 production log triage.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
128 lines
5.4 KiB
TypeScript
128 lines
5.4 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { resolveSekAmount } from '@/lib/bookkeeping/currency-utils'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
|
|
|
|
export interface ARReconciliationResult {
|
|
ar_ledger_total: number
|
|
/**
|
|
* Sum of posted balances on accounts 1510 (Kundfordringar) and 1513
|
|
* (Kundfordringar: delad faktura). 1513 covers the Skatteverket portion
|
|
* of ROT/RUT fakturamodellen invoices and is zero today (no fakturamodellen
|
|
* postings yet): included for forward compatibility.
|
|
*/
|
|
account_1510_balance: number
|
|
difference: number
|
|
is_reconciled: boolean
|
|
/**
|
|
* Number of foreign-currency invoices that lacked an exchange_rate, so their
|
|
* outstanding amount could not be converted to SEK. When > 0 the difference
|
|
* field may be misleading: any reported gap could be missing-data rather
|
|
* than a true reconciliation break.
|
|
*/
|
|
unconverted_fx_count: number
|
|
}
|
|
|
|
/**
|
|
* Compare sum of open customer invoices against account 1510 balance.
|
|
* Account 1510 is debit-normal (asset): balance = debits - credits.
|
|
*
|
|
* Conversion uses each invoice's stored exchange_rate (the invoice-date rate),
|
|
* which matches what was originally posted to 1510. This means the report will
|
|
* diverge from the GL once partial payments settle at a different rate (the
|
|
* delta is correctly booked as valutakursvinst/-förlust to 3960/7960 per
|
|
* ML 8 kap 21-23 §). A subledger-derived total would reconcile through that
|
|
* difference; deferred to a follow-up.
|
|
*/
|
|
export async function generateARReconciliation(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
periodId: string
|
|
): Promise<ARReconciliationResult> {
|
|
|
|
// total/paid_amount are stored in invoice currency; account 1510 is in SEK
|
|
// (booked at invoice-date rate), so convert each row before summing.
|
|
// Paginated: a company with >1000 open invoices would otherwise be silently
|
|
// truncated, manufacturing a phantom reconciliation gap.
|
|
const invoices = await fetchAllRows<{
|
|
id: string
|
|
total: number | null
|
|
paid_amount: number | null
|
|
currency: string | null
|
|
exchange_rate: number | null
|
|
}>(({ from, to }) =>
|
|
supabase
|
|
.from('invoices')
|
|
.select('id, total, paid_amount, currency, exchange_rate')
|
|
.eq('company_id', companyId)
|
|
.in('status', ['sent', 'overdue'])
|
|
.order('id', { ascending: true })
|
|
.range(from, to)
|
|
)
|
|
|
|
let unconvertedFxCount = 0
|
|
const arLedgerTotal = (invoices || [])
|
|
.reduce((sum, inv) => {
|
|
const isFx = inv.currency && inv.currency !== 'SEK'
|
|
const hasRate = inv.exchange_rate != null && Number(inv.exchange_rate) > 0
|
|
// Skip unconvertible FX rows from the sum: adding raw foreign amounts
|
|
// to a SEK total is arithmetically unsound. Counted instead.
|
|
if (isFx && !hasRate) {
|
|
unconvertedFxCount += 1
|
|
return sum
|
|
}
|
|
const outstanding = (Number(inv.total) || 0) - (Number(inv.paid_amount) || 0)
|
|
const sek = resolveSekAmount(outstanding, null, inv.currency, inv.exchange_rate)
|
|
return Math.round((sum + sek) * 100) / 100
|
|
}, 0)
|
|
|
|
// Get AR receivable balance from the ledger in this period. We sum 1510
|
|
// (Kundfordringar) AND 1513 (Kundfordringar: delad faktura) so the comparison
|
|
// stays correct under ROT/RUT fakturamodellen, where the customer portion sits
|
|
// on 1510 and the Skatteverket claim on 1513: both are open AR receivable
|
|
// from the company's perspective. 1513 is zero today (no fakturamodellen
|
|
// postings yet) so this is a forward-looking defense.
|
|
//
|
|
// We count posted AND reversed entries together: the SAME inclusion rule the
|
|
// trial balance / balance sheet use. A corrected invoice flips its original to
|
|
// status='reversed'; that reversed leg is cancelled by the posted storno, so
|
|
// both must be summed or a corrected invoice manufactures a phantom gap.
|
|
// Fetched via the two-step entry-lines helper (entries first, then lines
|
|
// chunked by entry id, both paginated): see lib/bookkeeping/entry-lines.ts.
|
|
const journalLines = await fetchEntryLines<{
|
|
id: string
|
|
debit_amount: number | null
|
|
credit_amount: number | null
|
|
}>({
|
|
supabase,
|
|
lineColumns: 'id, debit_amount, credit_amount',
|
|
filterEntries: (q: EntryLinesQuery) =>
|
|
q
|
|
.eq('company_id', companyId)
|
|
.eq('fiscal_period_id', periodId)
|
|
.in('status', ['posted', 'reversed']),
|
|
filterLines: (q: EntryLinesQuery) => q.in('account_number', ['1510', '1513']),
|
|
attachEntriesAs: null,
|
|
})
|
|
|
|
// Both 1510 and 1513 are debit-normal assets: balance = debits - credits
|
|
let account1510Balance = 0
|
|
for (const line of journalLines) {
|
|
account1510Balance = Math.round((account1510Balance + (Number(line.debit_amount) || 0) - (Number(line.credit_amount) || 0)) * 100) / 100
|
|
}
|
|
|
|
const difference = Math.round((arLedgerTotal - account1510Balance) * 100) / 100
|
|
|
|
return {
|
|
ar_ledger_total: Math.round(arLedgerTotal * 100) / 100,
|
|
account_1510_balance: Math.round(account1510Balance * 100) / 100,
|
|
difference,
|
|
// BFL 5 kap requires the reconciliation to cover all affärshändelser. If
|
|
// any row was excluded for a missing exchange rate, the calculation is
|
|
// incomplete by construction and we cannot honestly stamp the period
|
|
// Avstämd: the user must fix the underlying data first.
|
|
is_reconciled: Math.abs(difference) < 0.01 && unconvertedFxCount === 0,
|
|
unconverted_fx_count: unconvertedFxCount,
|
|
}
|
|
}
|