Files
accounted/lib/invoices/convert-to-invoice.ts
T
MattssonandClaude Fable 5.1 1c82baf553 feat(invoices): offert (quote) document type with own OF-series, decisions, conversion, MCP and v1 (#2163)
* 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>
2026-09-02 22:40:25 +02:00

350 lines
13 KiB
TypeScript

import type { SupabaseClient } from '@supabase/supabase-js'
import { eventBus } from '@/lib/events'
import { ensureInvoiceNumber } from '@/lib/invoices/ensure-invoice-number'
import { convertToSEK, fetchExchangeRate } from '@/lib/currency/riksbanken'
import type { Invoice } from '@/types'
/**
* Convert a proforma or a quote (offert) into a real invoice.
*
* ONE implementation for every caller (the dashboard route, the MCP staged
* commit, v1): the proforma conversion used to exist twice and had drifted
* (one copy dropped per-line VAT and revenue accounts, the other dropped
* discounts and fakturamarkning). Both now flow through here.
*
* Source handling differs by document type:
* - proforma: the source is marked cancelled (it was a pre-invoice for the
* same sale) and its due_date is carried over.
* - quote: the source stays, flips to quote_status = 'accepted', and the
* invoice links back via converted_from_id. A quote has no due date, so
* the invoice gets invoice_date + the customer's payment terms (falling
* back to company_settings.invoice_default_days, then 30). A second
* conversion is refused while an active converted invoice exists; a
* declined quote must be re-accepted first.
*
* Ordering: ensureInvoiceNumber() is the LAST side effect. The F-series
* counter only advances after items are inserted and the source is updated,
* so a partial failure in any earlier step rolls back the orphan row without
* leaking a number (ML 17 kap 24 paragraph: gap-free lopnummer).
*/
export type ConvertToInvoiceFailureCode =
| 'INVOICE_NOT_FOUND'
| 'INVOICE_CONVERT_NOT_CONVERTIBLE'
| 'INVOICE_CONVERT_SOURCE_CANCELLED'
| 'INVOICE_CONVERT_SOURCE_CHANGED'
| 'INVOICE_CONVERT_QUOTE_DECLINED'
| 'INVOICE_QUOTE_ALREADY_INVOICED'
export type ConvertToInvoiceResult =
| { ok: true; invoice: Invoice }
| { ok: false; code: ConvertToInvoiceFailureCode }
| { ok: false; code: 'INVOICE_CONVERT_FAILED'; cause: Error | { message: string } }
interface SourceItem {
sort_order: number
line_type?: 'product' | 'text' | null
description: string
quantity: number
unit: string
unit_price: number
discount_percent?: number | null
line_total: number
vat_rate?: number | null
vat_amount?: number | null
revenue_account?: string | null
article_id?: string | null
sales_order_item_id?: string | null
dimensions?: Record<string, string> | null
}
type SourceRow = Invoice & {
items?: SourceItem[] | null
customer?: { default_payment_terms?: number | null } | null
}
const DEFAULT_PAYMENT_TERMS_DAYS = 30
function isoDate(d: Date): string {
return d.toISOString().split('T')[0]
}
function addDays(iso: string, days: number): string {
const d = new Date(`${iso}T00:00:00Z`)
d.setUTCDate(d.getUTCDate() + days)
return isoDate(d)
}
export async function convertToInvoice(params: {
supabase: SupabaseClient
userId: string
companyId: string
sourceId: string
}): Promise<ConvertToInvoiceResult> {
const { supabase, userId, companyId, sourceId } = params
const { data: sourceRaw, error: sourceError } = await supabase
.from('invoices')
.select('*, items:invoice_items(*), customer:customers(default_payment_terms)')
.eq('id', sourceId)
.eq('company_id', companyId)
.single()
if (sourceError || !sourceRaw) {
return { ok: false, code: 'INVOICE_NOT_FOUND' }
}
const source = sourceRaw as SourceRow
const isQuote = source.document_type === 'quote'
if (source.document_type !== 'proforma' && !isQuote) {
return { ok: false, code: 'INVOICE_CONVERT_NOT_CONVERTIBLE' }
}
if (source.status === 'cancelled') {
return { ok: false, code: 'INVOICE_CONVERT_SOURCE_CANCELLED' }
}
const today = isoDate(new Date())
let dueDate: string = source.due_date
if (isQuote) {
if (source.quote_status === 'declined') {
return { ok: false, code: 'INVOICE_CONVERT_QUOTE_DECLINED' }
}
// One invoice per quote while that invoice lives. A cancelled converted
// invoice frees the quote for another attempt.
const { data: existing, error: existingError } = await supabase
.from('invoices')
.select('id')
.eq('company_id', companyId)
.eq('converted_from_id', sourceId)
.neq('status', 'cancelled')
.limit(1)
.maybeSingle()
if (existingError) {
return { ok: false, code: 'INVOICE_CONVERT_FAILED', cause: existingError }
}
if (existing) {
return { ok: false, code: 'INVOICE_QUOTE_ALREADY_INVOICED' }
}
// 0 days is a real term (due on receipt); only a missing value falls
// through to the company default and then to 30.
let termsDays: number | null = source.customer?.default_payment_terms ?? null
if (termsDays == null) {
const { data: settings, error: settingsError } = await supabase
.from('company_settings')
.select('invoice_default_days')
.eq('company_id', companyId)
.maybeSingle()
// A failed read must not silently become "30 days": that would date
// the receivable wrong. Only a successful empty result falls back.
if (settingsError) {
return { ok: false, code: 'INVOICE_CONVERT_FAILED', cause: settingsError }
}
termsDays = (settings as { invoice_default_days?: number | null } | null)?.invoice_default_days ?? null
}
dueDate = addDays(today, termsDays ?? DEFAULT_PAYMENT_TERMS_DAYS)
}
// The invoice is a new taxable event dated today (ML 8 kap 21-23 §): a
// quote can sit for weeks, so the SEK twins must use today's rate, not
// the one stamped when the offer was written. Fail closed if no rate can
// be had (the create paths refuse a NULL rate for the same reason).
let exchangeRate = source.exchange_rate
let exchangeRateDate = source.exchange_rate_date
let subtotalSek = source.subtotal_sek
let vatAmountSek = source.vat_amount_sek
let totalSek = source.total_sek
if (source.currency !== 'SEK') {
const rate = await fetchExchangeRate(source.currency, new Date(`${today}T00:00:00Z`), supabase)
if (!rate) {
return {
ok: false,
code: 'INVOICE_CONVERT_FAILED',
cause: { message: `Exchange rate for ${source.currency} unavailable; try again later` },
}
}
exchangeRate = rate.rate
exchangeRateDate = rate.date
subtotalSek = convertToSEK(source.subtotal, rate.rate)
vatAmountSek = convertToSEK(source.vat_amount, rate.rate)
totalSek = convertToSEK(source.total, rate.rate)
}
const { data: invoice, error: invoiceError } = await supabase
.from('invoices')
.insert({
user_id: userId,
company_id: companyId,
customer_id: source.customer_id,
invoice_number: null,
invoice_date: today,
due_date: dueDate,
currency: source.currency,
exchange_rate: exchangeRate,
exchange_rate_date: exchangeRateDate,
subtotal: source.subtotal,
subtotal_sek: subtotalSek,
vat_amount: source.vat_amount,
vat_amount_sek: vatAmountSek,
total: source.total,
total_sek: totalSek,
// The converted invoice is a fresh unpaid receivable: proformas and
// quotes carry no ROT/RUT deduction, so the customer owes the full
// total. Omitting this left the NOT NULL DEFAULT 0, which every payment
// surface reads as "nothing open".
remaining_amount: source.total,
paid_amount: 0,
vat_treatment: source.vat_treatment,
vat_rate: source.vat_rate,
moms_ruta: source.moms_ruta,
reverse_charge_text: source.reverse_charge_text,
your_reference: source.your_reference,
our_reference: source.our_reference,
// Buyer routing survives conversion (Peppol BT-10 may rely on it alone).
invoice_marking: source.invoice_marking ?? null,
notes: source.notes,
document_type: 'invoice',
converted_from_id: sourceId,
// Quote-only columns must not travel: the CHECK pairs quote_status
// with document_type = 'quote'.
valid_until: null,
quote_status: null,
quote_decided_at: null,
// Dimensions PR7: the converted invoice books with the source's bag.
default_dimensions: source.default_dimensions ?? {},
})
.select()
.single()
if (invoiceError) {
// idx_invoices_one_live_conversion: a concurrent conversion won the race.
if ((invoiceError as { code?: string }).code === '23505') {
return { ok: false, code: isQuote ? 'INVOICE_QUOTE_ALREADY_INVOICED' : 'INVOICE_CONVERT_SOURCE_CHANGED' }
}
return { ok: false, code: 'INVOICE_CONVERT_FAILED', cause: invoiceError }
}
const items = (source.items ?? []).map((item) => ({
invoice_id: invoice.id,
sort_order: item.sort_order,
line_type: item.line_type ?? 'product',
description: item.description,
quantity: item.quantity,
unit: item.unit,
unit_price: item.unit_price,
// The stored line_total is net of this; dropping it would make the
// converted invoice fail the Peppol line check and lose the rebate on
// the next builder pass.
discount_percent: item.discount_percent ?? 0,
line_total: item.line_total,
// Per-line VAT and any article / revenue-account override travel too, so
// the invoice books exactly as the source showed (mixed rates and
// per-article accounts both rely on these).
vat_rate: item.vat_rate ?? 0,
vat_amount: item.vat_amount ?? 0,
revenue_account: item.revenue_account ?? null,
article_id: item.article_id ?? null,
// A kundorder link on a proforma line moves to the invoice, so the order
// keeps counting the quantity as invoiced once the proforma is cancelled.
sales_order_item_id: item.sales_order_item_id ?? null,
dimensions: item.dimensions ?? {},
}))
if (items.length > 0) {
const { error: itemsError } = await supabase.from('invoice_items').insert(items)
if (itemsError) {
await supabase.from('invoices').delete().eq('id', invoice.id)
return { ok: false, code: 'INVOICE_CONVERT_FAILED', cause: itemsError }
}
}
// Update the source. If this fails, the new (still unnumbered) invoice is
// an orphan: delete it so the user can retry without ending up with two
// active invoices for the same source. invoice_items cascade.
const previousSource = {
status: source.status,
quote_status: source.quote_status ?? null,
quote_decided_at: source.quote_decided_at ?? null,
}
// Literal payloads on purpose: the phantom-column schema guard
// (tests/schema/no-phantom-columns.test.ts) can only check object literals.
// Compare-and-set on the state read above: a concurrent cancel, a
// concurrent proforma-to-order conversion (which cancels the proforma) or
// a concurrent decision on the quote turns this into a 0-row update, and
// the orphan invoice is removed instead of a second document for the
// same sale surviving.
const { data: sourceRows, error: sourceUpdateError } = isQuote
? await supabase
.from('invoices')
.update({
quote_status: 'accepted',
quote_decided_at: source.quote_decided_at ?? new Date().toISOString(),
})
.eq('id', sourceId)
.eq('quote_status', source.quote_status)
.neq('status', 'cancelled')
.select('id')
: await supabase
.from('invoices')
.update({ status: 'cancelled' })
.eq('id', sourceId)
.neq('status', 'cancelled')
.select('id')
if (sourceUpdateError) {
await supabase.from('invoices').delete().eq('id', invoice.id)
return { ok: false, code: 'INVOICE_CONVERT_FAILED', cause: sourceUpdateError }
}
if (!sourceRows || sourceRows.length === 0) {
await supabase.from('invoices').delete().eq('id', invoice.id)
return { ok: false, code: 'INVOICE_CONVERT_SOURCE_CHANGED' }
}
// Allocate the F-series number last. If allocation fails, restore the
// source and delete the orphan invoice. The F-counter is unaffected because
// generate_invoice_number only commits on success.
try {
await ensureInvoiceNumber(supabase, companyId, invoice as Invoice)
} catch (err) {
if (isQuote) {
await supabase
.from('invoices')
.update({
quote_status: previousSource.quote_status,
quote_decided_at: previousSource.quote_decided_at,
})
.eq('id', sourceId)
} else {
await supabase
.from('invoices')
.update({ status: previousSource.status })
.eq('id', sourceId)
}
await supabase.from('invoices').delete().eq('id', invoice.id)
return {
ok: false,
code: 'INVOICE_CONVERT_FAILED',
cause: err instanceof Error ? err : { message: 'Failed to assign invoice number' },
}
}
const { data: completeInvoice } = await supabase
.from('invoices')
.select('*, customer:customers(*), items:invoice_items(*)')
.eq('id', invoice.id)
.single()
const result = (completeInvoice ?? invoice) as Invoice
if (completeInvoice) {
await eventBus.emit({
type: 'invoice.created',
payload: { invoice: result, companyId, userId },
})
}
return { ok: true, invoice: result }
}