* fix(invoices): reminders, AR ledger, AR reconciliation and deadlines only read fakturor The overdue-reminder run, the kundreskontra, the 1510 reconciliation and the deadlines page selected invoices by status alone. A sent proforma past its due date was chased with a betalningspaminnelse and flipped to 'overdue', and it appeared as a receivable. All four now filter document_type = 'invoice', which is also the precondition for adding quotes (offert): a quote carries a date but never a receivable. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * feat(invoices): offert (quote) document type with its own OF-series, decisions and conversion Adds document_type 'quote' with valid_until, quote_status (open / accepted / declined; expired is derived from valid_until, never stored) and quote_decided_at. Quotes are numbered OF-nnn at insert from company_settings.next_quote_number via generate_quote_number(), the same pattern as delivery notes, so a declined quote never leaves a hole in the F-series the way a proforma does. The column next_quote_number already existed on prod and staging without a migration; the migration adopts it. Engine: build-invoice-write writes the quote columns and keeps remaining_amount at 0; the draft editor refuses accepted or declined quotes; PATCH refuses changing a quote's or delivery note's document type since the number belongs to the series; mark-paid refuses quotes. New POST /api/invoices/[id]/quote-status records the decision and locks once an invoice exists. Conversion is extracted into lib/invoices/convert-to-invoice.ts (one implementation for the route and the MCP staged commit, which had drifted): a converted quote stays and flips to accepted, the invoice links back via converted_from_id and gets its due date from the customer's payment terms; a declined or already invoiced quote is refused. next-number previews the OF-series for quotes. Migration applied to the staging branch and registered as 20260902140000; the pg test runs in CI (pg-real). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * feat(invoices): quote PDF, email and filename surfaces The customer-facing surfaces get a quote sibling for every proforma branch: PDF title OFFERT / QUOTE with Offertdatum and Giltig till instead of the due date, a notice that the document is not an invoice or a payment request, and no payment box, OCR, bankgiro, Swish, QR or payment link. The email says the quote is attached and valid until the expiry, drops the payment details and pay-online button, and asks about the quote rather than the invoice. Filenames read "Offert nr OF-001". Seller VAT number and payment accounts are skipped for quotes as for proformas: a quote is not a faktura under ML 17 kap. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * feat(invoices): offert in the editor, list and detail pages Editor: "Offert" document type with a required "Giltig till" field (default today + 30 days) in place of the due date; the wire body mirrors it into due_date so the shared schema is satisfied. Payment link, ROT/RUT, periodisering and the bank box are already gated on real invoices. The type cannot be switched on an existing quote (its OF-number belongs to the series). List: an Offerter tab beside Proforma, "Ny offert" in the split button, and a status column that shows the decision or the derived expiry: Utgången and Avböjd are exception chips, Öppen and Accepterad muted text. Detail: Acceptera and Skapa faktura in the header, Avböj in the overflow menu; an expired quote asks before accepting or invoicing (bypassable); once an invoice exists the page links to it as Fakturerad and hides the decision actions. Strings in both sv and en. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * feat(mcp,v1): expose offert on the MCP tools and the v1 REST surface MCP: create_invoice takes document_type quote with a required valid_until and allocates the OF-number at insert; the convert tool keeps its id and accepts quotes with the registry refusal codes; new set_quote_status; list_invoices and get_invoice expose valid_until and the effective quote status, including a derived expired filter. The tools/list payload stays under its ceiling without a ledger change. The MCP staged convert now uses the shared converter. v1: POST /invoices/{id}/quote-status (registered in the endpoint registry, scope map and route loader), valid_until and quote_status in the list, create and detail shapes, and a quote_status list filter. Skill atoms mention offert. Decision log lines for the own number series, derived expiry, accepted-not-cancelled conversion and the header action layout. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * test(invoices): pass route params and period id in the new quote tests Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * refactor(invoices): literal update payloads in the converter so the phantom-column guard can read them Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W45yD8NfQ97JhyYaXpzN56 * fix(invoices): close the quote review findings in one pass Skeptics (correctness, compliance, regression) and CodeRabbit on #2163: - quote_status is no longer a write-builder output, so a v1 PATCH or MCP update_invoice can never reset a recorded accept/decline; new quotes are opened by the invoices_quote_defaults trigger (20260902141000), which also keeps due_date and valid_until equal. v1 PATCH and the MCP update executor now use the shared editable-draft predicate. - One live invoice per converted source, enforced by a partial unique index; the converter maps 23505 to INVOICE_QUOTE_ALREADY_INVOICED and both quote-status routes compare-and-set on the decision they read. - MCP-created quotes carry remaining_amount 0; mark-paid, transaction match and voucher link refuse non-invoices on the MCP staging tools, the executors and the dashboard link route. - Conversion of a foreign-currency source refetches the rate for the conversion day (ML 8 kap 21-23 paragraphs) and fails closed without one; 0-day payment terms mean due on receipt. - bulk-create refuses quotes per item; list_invoices rejects a quote_status filter combined with another document_type; an omitted document_type on PATCH means unchanged. - attention, push notifications, open-AR count, FX revaluation, year-end and accrual auto-detect and bank-match suggestions only read fakturor. - Quote PDF and email print Summa / Total instead of Att betala. - Regenerated skills/accounted-api for the new v1 endpoint. Declined with reasons in DECISIONS.md: NOT VALID + VALIDATE and CONCURRENTLY on the migrations (repo precedent, 13.8k rows, transactional apply); re-validating VAT treatment at conversion (the converted invoice is a draft the user reviews; follow-up). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0111fYAUxKtpxU1BHiBioqzs * fix(invoices): second review round: migration versions, order links, batch allocation, races - Migrations renamed to 20260902220000 / 20260902221000: #2166 shipped its own 20260902141000 to prod while this PR was in review and prod's head moved past both files; below-head versions are skipped by branching, which would have left the quote trigger off prod. Staging rows renamed. - Quote lines never carry sales_order_item_id (an offer must not count as invoiced kundorder quantity); the converter carries a proforma line's order link onto the invoice. - Converter compare-and-sets the source (proforma cancel, quote accept): a concurrent cancel, proforma-to-order conversion or decision removes the orphan invoice with INVOICE_CONVERT_SOURCE_CHANGED instead of a second document for the same sale. - MCP set_quote_status gets the same compare-and-set as the HTTP routes; 0-row updates report INVOICE_QUOTE_CHANGED_CONCURRENTLY everywhere. quote-status (dashboard, v1, MCP) accepts valid_until so an expired sent quote can be reopened, as the docs promised. - MCP mark-paid refuses only quotes, parity with the dashboard route (a sent proforma marked paid is a supported prepayment record). - Batch allocation (dashboard route and MCP tool) refuses non-invoices before the RPC, which gates on status alone. - Customer AR drill-down, v1 customer open invoices and archive guard, and the calendar feed read fakturor only. - Draft quote PDF says "UTKAST" instead of "not a valid invoice"; the editor locks the document type on existing quotes and delivery notes. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0111fYAUxKtpxU1BHiBioqzs * chore(invoices): use roundOre in the quote MCP summaries and FX test after main tightened the guard baseline Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0111fYAUxKtpxU1BHiBioqzs * fix(invoices): third review round: atomic decision lock, viewer gate, lookup errors, quote payment terms - 20260902222000: BEFORE UPDATE trigger locks an accepted quote while a live converted invoice exists (the compare-and-set in the three decision writers could still be beaten by a conversion landing in between); the routes and the MCP tool map the raise to 409 INVOICE_QUOTE_ALREADY_INVOICED. generate_quote_number now also requires a non-viewer membership so a viewer's session token cannot burn OF-numbers through PostgREST. - Converter checks quote eligibility before the Riksbanken call and treats a failed company_settings read as a failure instead of a 30-day default. - Re-sending the same decision keeps quote_decided_at (idempotent). - gnubok_find_voucher_candidates_for_invoice refuses non-invoices like its write sibling; the dashboard link route surfaces a failed lookup. - Late-fee and credit-term texts never print on a quote. Applied and registered on staging; pg tests added. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0111fYAUxKtpxU1BHiBioqzs * fix(invoices): review nits: fail-closed batch lookup, dry-run expiry, quote heading, quote-date CHECK - match-batch surfaces a failed document lookup instead of allocating. - v1 quote-status dry-run preview carries the new valid_until. - Quote PDF heading reads Offertinformation / Quote information. - 20260902222000 also pins the date invariants the trigger maintains as a CHECK: a quote always has valid_until = due_date, nothing else has one. Applied on staging. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0111fYAUxKtpxU1BHiBioqzs --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
243 lines
9.0 KiB
TypeScript
243 lines
9.0 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import { resolveSekAmount } from '@/lib/bookkeeping/currency-utils'
|
|
import { roundOre } from '@/lib/money'
|
|
import { fetchPaymentsAsOf, outstandingAsOf, todayIsoDate, type PaymentsAsOf } from './reskontra-payments'
|
|
|
|
export interface ARInvoiceDetail {
|
|
invoice_id: string
|
|
invoice_number: string
|
|
invoice_date: string
|
|
due_date: string
|
|
total: number
|
|
paid_amount: number
|
|
/** Outstanding in the invoice's original currency. Use for display only. */
|
|
outstanding: number
|
|
/**
|
|
* Outstanding converted to SEK using the invoice-date exchange_rate. `null`
|
|
* when conversion failed (FX invoice with no rate). Callers summing across
|
|
* customers must use this field, never `outstanding`, to avoid mixing
|
|
* currencies.
|
|
*/
|
|
outstanding_sek: number | null
|
|
days_overdue: number
|
|
currency: string
|
|
}
|
|
|
|
export interface ARLedgerEntry {
|
|
customer_id: string
|
|
customer_name: string
|
|
invoices: ARInvoiceDetail[]
|
|
current: number
|
|
days_1_30: number
|
|
days_31_60: number
|
|
days_61_90: number
|
|
days_90_plus: number
|
|
total_outstanding: number
|
|
}
|
|
|
|
export interface ARLedgerReport {
|
|
entries: ARLedgerEntry[]
|
|
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. Their detail rows are still listed (with
|
|
* outstanding_sek = null) so the user can see them.
|
|
*/
|
|
unconverted_fx_count: number
|
|
}
|
|
|
|
/**
|
|
* Generate AR ledger (kundreskontra) with aging analysis.
|
|
* BFL 5 kap. 4 §: sidoordnad bokföring: outstanding customer invoices with aging.
|
|
*
|
|
* 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 (#1020). Without an
|
|
* `asOfDate`, or with today/future, the live open-invoice state is used as-is.
|
|
*/
|
|
export async function generateARLedger(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
asOfDate?: string
|
|
): Promise<ARLedgerReport> {
|
|
const refDate = asOfDate ? new Date(asOfDate) : new Date()
|
|
// Backdated reconstruction only kicks in for genuinely historical dates:
|
|
// for today/future the stored open-invoice state IS the as-of state, and
|
|
// the live view must stay byte-identical to what it always showed.
|
|
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. Invoices cancelled since are treated as never
|
|
// having existed (their cancellation is not reliably dated).
|
|
// 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('invoices')
|
|
.select('*, customer:customers(id, name)')
|
|
.eq('company_id', companyId)
|
|
// Proformas, delivery notes and quotes are never receivables.
|
|
.eq('document_type', 'invoice')
|
|
query = isHistorical
|
|
? query.in('status', ['sent', 'overdue', 'credited', 'paid']).lte('invoice_date', asOfDate!)
|
|
: query.in('status', ['sent', 'overdue', 'credited'])
|
|
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, 'invoice_payments', '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 customer and calculate aging
|
|
const byCustomer = new Map<string, ARLedgerEntry>()
|
|
let unconvertedFxCount = 0
|
|
|
|
for (const inv of invoices) {
|
|
const customerId = inv.customer_id
|
|
const customerName = inv.customer?.name || 'Okänd kund'
|
|
|
|
if (!byCustomer.has(customerId)) {
|
|
byCustomer.set(customerId, {
|
|
customer_id: customerId,
|
|
customer_name: customerName,
|
|
invoices: [],
|
|
current: 0,
|
|
days_1_30: 0,
|
|
days_31_60: 0,
|
|
days_61_90: 0,
|
|
days_90_plus: 0,
|
|
total_outstanding: 0,
|
|
})
|
|
}
|
|
|
|
const entry = byCustomer.get(customerId)!
|
|
const dueDate = new Date(inv.due_date)
|
|
const daysOverdue = Math.floor((refDate.getTime() - dueDate.getTime()) / (1000 * 60 * 60 * 24))
|
|
const total = Number(inv.total) || 0
|
|
const liveOutstanding = roundOre(total - (Number(inv.paid_amount) || 0))
|
|
const outstanding = payments
|
|
? outstandingAsOf(inv, total, liveOutstanding, payments, asOfDate!)
|
|
: liveOutstanding
|
|
const paidAmount = roundOre(total - outstanding)
|
|
|
|
// Historical view: 'paid' invoices are only fetched to catch ones still
|
|
// open at the as-of date. One already settled by then adds nothing to the
|
|
// reskontra, so skip its zero row instead of listing it.
|
|
if (isHistorical && inv.status === 'paid' && outstanding === 0) continue
|
|
|
|
// Aging buckets and totals must be in SEK so they reconcile with account 1510.
|
|
// Foreign-currency invoices without an exchange_rate cannot be converted:
|
|
// adding the raw foreign amount to a SEK total is unsound, so the row is
|
|
// counted but excluded from the buckets. The detail row is still pushed so
|
|
// the user can see the invoice in the expandable list, with outstanding_sek
|
|
// = null to flag the missing conversion.
|
|
const isFx = inv.currency && inv.currency !== 'SEK'
|
|
const hasRate = inv.exchange_rate != null && Number(inv.exchange_rate) > 0
|
|
const outstandingSek =
|
|
isFx && !hasRate
|
|
? null
|
|
: resolveSekAmount(outstanding, null, inv.currency, inv.exchange_rate)
|
|
|
|
if (outstandingSek === null) unconvertedFxCount += 1
|
|
|
|
// Add invoice detail (always: even if unconvertible, so it's visible)
|
|
entry.invoices.push({
|
|
invoice_id: inv.id,
|
|
// Self-billing invoices we received have no own number: show the
|
|
// counterparty's external number instead.
|
|
invoice_number: inv.invoice_number || inv.external_invoice_number || '',
|
|
invoice_date: inv.invoice_date || '',
|
|
due_date: inv.due_date,
|
|
total,
|
|
paid_amount: paidAmount,
|
|
outstanding,
|
|
outstanding_sek: outstandingSek,
|
|
days_overdue: Math.max(0, daysOverdue),
|
|
currency: inv.currency || 'SEK',
|
|
})
|
|
|
|
if (outstandingSek === null) continue
|
|
|
|
// Bucket by aging (in SEK)
|
|
if (daysOverdue <= 0) {
|
|
entry.current += outstandingSek
|
|
} else if (daysOverdue <= 30) {
|
|
entry.days_1_30 += outstandingSek
|
|
} else if (daysOverdue <= 60) {
|
|
entry.days_31_60 += outstandingSek
|
|
} else if (daysOverdue <= 90) {
|
|
entry.days_61_90 += outstandingSek
|
|
} else {
|
|
entry.days_90_plus += outstandingSek
|
|
}
|
|
|
|
entry.total_outstanding += outstandingSek
|
|
}
|
|
|
|
// Round all amounts and sort invoices within each customer.
|
|
const entries = Array.from(byCustomer.values())
|
|
.map((entry) => ({
|
|
...entry,
|
|
invoices: entry.invoices.sort((a, b) => a.due_date.localeCompare(b.due_date)),
|
|
current: Math.round(entry.current * 100) / 100,
|
|
days_1_30: Math.round(entry.days_1_30 * 100) / 100,
|
|
days_31_60: Math.round(entry.days_31_60 * 100) / 100,
|
|
days_61_90: Math.round(entry.days_61_90 * 100) / 100,
|
|
days_90_plus: Math.round(entry.days_90_plus * 100) / 100,
|
|
total_outstanding: Math.round(entry.total_outstanding * 100) / 100,
|
|
}))
|
|
// Drop customers whose credit notes fully offset their open invoices
|
|
// (net 0): a settled customer is noise in the reskontra. A total of 0
|
|
// means two different things, though, and only one of them is "settled":
|
|
// a customer whose open invoices were all unconvertible never accumulated
|
|
// into the buckets at all, so its 0 is "unknown", not "nothing". Those
|
|
// rows are the ones `unconverted_fx_count` promises the user can find, so
|
|
// they must stay listed (with outstanding_sek = null) even though they
|
|
// add nothing to the SEK totals.
|
|
.filter(
|
|
(entry) =>
|
|
entry.total_outstanding !== 0 ||
|
|
entry.invoices.some((inv) => inv.outstanding_sek === null)
|
|
)
|
|
|
|
// Sort by total outstanding descending
|
|
entries.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
|
|
const unpaid_count = entries.reduce(
|
|
(sum, e) => sum + e.invoices.filter((i) => i.outstanding !== 0).length,
|
|
0
|
|
)
|
|
|
|
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,
|
|
unconverted_fx_count: unconvertedFxCount,
|
|
}
|
|
}
|