Files
accounted/lib/bookkeeping/accruals/from-invoices.ts
T
MattssonandClaude Fable 5.1 7a30f623ba fix(invoices): invoice PDF draft stamp, page breaks, wrapping, units, multi-line descriptions (#2369)
* fix(invoices): draft stamp out of flow, page-break control, whole-word wrapping, English units, multi-line descriptions

A user reported five things about the invoice PDF after the English
translation shipped:

- The yellow draft banner pushed the whole document down, so a draft
  previewed differently from the final invoice. It is now a small stamp in
  the page's top margin (absolute, fixed), repeated on every page, out of
  the flow.
- Table rows, totals, the payment box and the notice boxes could split
  across a page break, and a section heading could be left alone at the
  bottom of a page. Those blocks now carry wrap={false}; headings and the
  table header carry minPresenceAhead.
- react-pdf hyphenated Swedish words with English patterns ("Septem-ber").
  Descriptions, notes, notices and the footer now wrap whole words.
- "st" printed verbatim on an English invoice. The editor's known units map
  to English labels at render time; user-typed units print as stored.
- Descriptions were single-line inputs, so a user could never choose where
  a line breaks. The editor field is now an auto-growing textarea; the PDF
  and the on-screen views keep the line breaks; the Peppol item name
  collapses them (single-line field).

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* fix(invoices): keep long tokens printable and oversize text splittable in the invoice PDF

Skeptic findings on the first commit:

- A word wider than its column was dropped from the page or overprinted the
  quantity column, because the no-hyphenation callback gave react-pdf no
  break point inside it. Words up to 16 characters still wrap whole; longer
  tokens (URLs, e-mail addresses, references) break after separators and
  every 16 characters.
- wrap={false} on a text row or notes taller than a page clipped everything
  past the page edge. Line descriptions and notes are now kept together only
  while a line estimate says they fit; past that they split.
- A multi-line description reached the periodisering voucher text and broke
  the SIE export (one record per line). The accrual builder and the Peppol
  item name share toSingleLine(); the SIE writer collapses line breaks in
  quoted text as a format guard.
- The English no-number draft stamp ended 1.3pt below the top margin.

Tests lay the document out with @react-pdf/layout and assert that no text
node ends past the page edge and that every line's ink stays inside its
column, for 80-line descriptions and notes, a 3000-character description,
and four long tokens.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* fix(invoices): count rendered lines and cap the kept-together budget so no font can clip a row

Skeptic cycle 2: with the bundled Source Serif 4 font (13.7pt per line)
and a description of 20 source lines of wide glyphs, the estimate said
"fits" while the chunked token wrapping produced 58 rendered lines; the
non-splittable row then ran off the page. The estimate now counts the
chunks a long token is broken into, and the cap is 12 lines: at 20pt per
line that is under a third of the page for any font a company can pick.

The page-edge test now measures absolute positions (box.top is
parent-relative) and covers the bundled serif case through
prepareInvoiceFont().

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* fix(invoices): keep words whole by estimated ink width, not a character cap

Skeptic cycle 2 (regression): the flat 16-character cap gave react-pdf a
break point inside ordinary Swedish compounds (Fastighetsskötse-l,
Företagsförsäkri-ng), which the breaker used whenever it filled the line
better. Words are now kept whole whenever a rough per-glyph width estimate
says they fit the column; only a token wider than the column gets parts,
after separators and where the column is full. The page-fit estimate uses
the same widths.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* fix(invoices): estimate word width from real Helvetica metrics

Skeptic cycle 3: the hand-rolled per-glyph estimate over-counted ordinary
lowercase (6.5pt for a 5.56pt glyph), so 24 to 28 character compounds
(Momskompensationsansökan, Mervärdesskattedeklarationen) were still handed
a break point while they fit the column, and under-counted rare glyphs
(æ, œ, Cyrillic) so a token of those could overflow. The estimate now uses
Helvetica advances measured through react-pdf's own metrics
(lib/invoices/pdf-glyph-widths.ts) with a 10% margin for the bundled
fonts, and counts any glyph outside Helvetica at the widest Latin advance.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* docs(invoices): state the bundled-font width margin accurately

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

* fix(invoices): review round: SIE backslash escaping, text-row budget, ROT/RUT box keep-together

- CodeQL: the SIE quoted-text escaper left backslashes alone while backslash
  is the escape character. It now writes a literal backslash as two, and the
  parser unescapes both that and the escaped quote, so text round-trips.
- CodeRabbit: a free-text row renders at full table width but was budgeted
  at the description column, so it could split unnecessarily. It uses the
  full-width budget now.
- CodeRabbit: the ROT/RUT box was unconditionally kept on one page although
  its per-line breakdown carries the (possibly multi-line) descriptions. It
  uses the same keep-together estimate as rows and notes, and its line texts
  wrap whole words.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BuYbae3WWwYzBucTUVayoW

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-07 14:45:38 +02:00

215 lines
7.6 KiB
TypeScript

/**
* Bridges invoice flows to accrual schedules: after the registration/revenue
* entry is committed, every line that carries a periodisering period gets a
* schedule (+ synchronous catch-up posting for months that already began).
*
* Idempotent per line: lines already covered by a schedule are skipped, so
* event replays (supplier_invoice.confirmed) can never double-schedule.
* Failures are logged and counted, never thrown: the origin entry is already
* committed and must not be rolled back by a schedule hiccup; the caller
* surfaces a warning instead.
*/
import type { SupabaseClient } from '@supabase/supabase-js'
import type { Invoice, InvoiceItem, SupplierInvoice, SupplierInvoiceItem } from '@/types'
import { resolveSekAmount } from '@/lib/bookkeeping/currency-utils'
import { createAccrualSchedule } from '@/lib/bookkeeping/accruals/service'
import {
coerceDimensionsBag,
mergeDimensionBags,
} from '@/lib/bookkeeping/dimension-resolver'
import {
itemHasAccrual,
suggestBalanceAccount,
} from '@/lib/bookkeeping/accruals/account-suggestions'
import { getRevenueAccount } from '@/lib/bookkeeping/invoice-entries'
import { getVatTreatmentForRate } from '@/lib/invoices/vat-rules'
import { toSingleLine } from '@/lib/invoices/display'
import type { EntityType } from '@/types'
import { createLogger } from '@/lib/logger'
const log = createLogger('bookkeeping.accruals.from-invoices')
export interface ScheduleCreationResult {
created: number
failed: number
}
export async function createSchedulesForSupplierInvoice(
supabase: SupabaseClient,
companyId: string,
userId: string,
invoice: SupplierInvoice,
items: SupplierInvoiceItem[],
originJournalEntryId: string,
): Promise<ScheduleCreationResult> {
const accrualItems = items.filter(itemHasAccrual)
const result: ScheduleCreationResult = { created: 0, failed: 0 }
if (accrualItems.length === 0) return result
const { data: existing } = await supabase
.from('accrual_schedules')
.select('supplier_invoice_item_id')
.eq('company_id', companyId)
.eq('supplier_invoice_id', invoice.id)
const covered = new Set(
((existing ?? []) as Array<{ supplier_invoice_item_id: string | null }>).map(
(row) => row.supplier_invoice_item_id,
),
)
// Same merge the registration entry used for the item's interim 17xx line
// (groupExpenseBuckets): the schedule's bag must match the origin so the
// dissolutions keep the per-dimension interim balance at zero.
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
for (const item of accrualItems) {
if (item.id && covered.has(item.id)) continue
try {
const totalSek =
Math.round(
resolveSekAmount(item.line_total, null, invoice.currency, invoice.exchange_rate) *
100,
) / 100
await createAccrualSchedule(
supabase,
companyId,
userId,
{
direction: 'expense',
supplierInvoiceId: invoice.id,
supplierInvoiceItemId: item.id ?? null,
balanceAccount:
item.accrual_balance_account ??
suggestBalanceAccount('expense', item.account_number),
targetAccount: item.account_number,
totalAmountSek: totalSek,
periodStart: item.accrual_period_start as string,
periodEnd: item.accrual_period_end as string,
description: `${toSingleLine(item.description)} (leverantörsfaktura ${invoice.supplier_invoice_number})`,
dimensions: mergeDimensionBags(defaultDimensions, item.dimensions),
},
{
originJournalEntryId,
// The registration entry is dated invoice_date: dissolutions may
// never precede it.
postingFloorDate: invoice.invoice_date,
},
)
result.created++
} catch (error) {
result.failed++
log.error('failed to create accrual schedule for supplier invoice line', error, {
companyId,
entityId: invoice.id,
})
}
}
return result
}
export async function createSchedulesForCustomerInvoice(
supabase: SupabaseClient,
companyId: string,
userId: string,
invoice: Invoice,
items: InvoiceItem[],
originJournalEntryId: string,
entityType: EntityType = 'enskild_firma',
): Promise<ScheduleCreationResult> {
const accrualItems = items.filter(
(item) => itemHasAccrual(item) && item.line_type !== 'text' && !item.deduction_type,
)
const result: ScheduleCreationResult = { created: 0, failed: 0 }
if (accrualItems.length === 0) return result
const { data: existing } = await supabase
.from('accrual_schedules')
.select('invoice_item_id')
.eq('company_id', companyId)
.eq('invoice_id', invoice.id)
const covered = new Set(
((existing ?? []) as Array<{ invoice_item_id: string | null }>).map(
(row) => row.invoice_item_id,
),
)
// Same merge the revenue entry used for the item's interim 29xx line
// (generatePerRateLines): item bag wins per key over the invoice default.
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
for (const item of accrualItems) {
if (item.id && covered.has(item.id)) continue
const target = resolveRevenueTarget(item, invoice.vat_treatment, entityType)
// reverse_charge/export lines keep their statutory account (3308/3305) so
// ruta 39/40 in the momsdeklaration stay correct: never deferred. The
// generator applies the same exclusion, so the net stays on 3308/3305.
if (target.special) continue
try {
const targetAccount = target.account
const totalSek =
Math.round(
resolveSekAmount(item.line_total, null, invoice.currency, invoice.exchange_rate) *
100,
) / 100
await createAccrualSchedule(
supabase,
companyId,
userId,
{
direction: 'revenue',
invoiceId: invoice.id,
invoiceItemId: item.id ?? null,
balanceAccount:
item.accrual_balance_account ?? suggestBalanceAccount('revenue', targetAccount),
targetAccount,
totalAmountSek: totalSek,
periodStart: item.accrual_period_start as string,
periodEnd: item.accrual_period_end as string,
// Voucher text is one line by format (SIE #VER is one record per
// line); the line description may carry line breaks.
description: `${toSingleLine(item.description)} (faktura ${invoice.invoice_number ?? ''})`.trim(),
dimensions: mergeDimensionBags(defaultDimensions, item.dimensions),
},
{
originJournalEntryId,
postingFloorDate: invoice.invoice_date,
},
)
result.created++
} catch (error) {
result.failed++
log.error('failed to create accrual schedule for invoice line', error, {
companyId,
entityId: invoice.id,
})
}
}
return result
}
/**
* Resolve a line's revenue account exactly the way generatePerRateLines does:
* per-line override only for ordinary domestic rates; reverse_charge/export
* force the statutory account and are flagged `special` (never deferrable).
*/
function resolveRevenueTarget(
item: InvoiceItem,
invoiceTreatment: Invoice['vat_treatment'],
entityType: EntityType,
): { account: string; special: boolean } {
const rate = item.vat_rate ?? 0
const treatment =
rate === 0 && (invoiceTreatment === 'reverse_charge' || invoiceTreatment === 'export')
? invoiceTreatment
: getVatTreatmentForRate(rate)
const special = treatment === 'reverse_charge' || treatment === 'export'
const account =
!special && item.revenue_account
? item.revenue_account
: getRevenueAccount(treatment, entityType)
return { account, special }
}