* 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>
183 lines
5.2 KiB
TypeScript
183 lines
5.2 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
createQueuedMockSupabase,
|
|
makeInvoice,
|
|
makeSupplierInvoice,
|
|
} from '@/tests/helpers'
|
|
import {
|
|
createSchedulesForCustomerInvoice,
|
|
createSchedulesForSupplierInvoice,
|
|
} from '@/lib/bookkeeping/accruals/from-invoices'
|
|
import { createAccrualSchedule } from '@/lib/bookkeeping/accruals/service'
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type { AccrualSchedule, InvoiceItem, SupplierInvoiceItem } from '@/types'
|
|
|
|
vi.mock('@/lib/bookkeeping/accruals/service', () => ({
|
|
createAccrualSchedule: vi.fn(),
|
|
}))
|
|
|
|
const mockCreateAccrualSchedule = vi.mocked(createAccrualSchedule)
|
|
|
|
const COMPANY = 'company-1'
|
|
const USER = 'user-1'
|
|
|
|
function makeSupplierItem(
|
|
overrides: Partial<SupplierInvoiceItem> = {},
|
|
): SupplierInvoiceItem {
|
|
return {
|
|
id: 'sii-1',
|
|
supplier_invoice_id: 'si-1',
|
|
sort_order: 0,
|
|
description: 'Försäkring 2026',
|
|
quantity: 1,
|
|
unit: 'st',
|
|
unit_price: 12000,
|
|
line_total: 12000,
|
|
account_number: '6310',
|
|
vat_code: null,
|
|
vat_rate: 0.25,
|
|
vat_amount: 3000,
|
|
reverse_charge_rate: null,
|
|
accrual_period_start: '2026-01-01',
|
|
accrual_period_end: '2026-12-31',
|
|
accrual_balance_account: '1730',
|
|
created_at: '2026-01-15T00:00:00Z',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
function makeInvoiceItem(overrides: Partial<InvoiceItem> = {}): InvoiceItem {
|
|
return {
|
|
id: 'ii-1',
|
|
invoice_id: 'inv-1',
|
|
sort_order: 0,
|
|
description: 'Serviceavtal 2026',
|
|
quantity: 1,
|
|
unit: 'st',
|
|
unit_price: 12000,
|
|
line_total: 12000,
|
|
vat_rate: 25,
|
|
vat_amount: 3000,
|
|
accrual_period_start: '2026-01-01',
|
|
accrual_period_end: '2026-12-31',
|
|
accrual_balance_account: '2970',
|
|
created_at: '2026-01-15T00:00:00Z',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockCreateAccrualSchedule.mockResolvedValue({ id: 'sched-1' } as AccrualSchedule)
|
|
})
|
|
|
|
describe('createSchedulesForSupplierInvoice', () => {
|
|
it('passes the invoice default merged with the item bag as the spec dimensions', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([{ data: [] }]) // no existing schedules
|
|
|
|
const invoice = makeSupplierInvoice({
|
|
id: 'si-1',
|
|
default_dimensions: { '1': 'KS01', '6': 'P000' },
|
|
})
|
|
const item = makeSupplierItem({ dimensions: { '6': 'P001' } })
|
|
|
|
const result = await createSchedulesForSupplierInvoice(
|
|
supabase as unknown as SupabaseClient,
|
|
COMPANY,
|
|
USER,
|
|
invoice,
|
|
[item],
|
|
'je-origin',
|
|
)
|
|
|
|
expect(result).toEqual({ created: 1, failed: 0 })
|
|
// Item bag wins per key over the invoice default: identical merge to the
|
|
// registration entry's interim 17xx line (groupExpenseBuckets).
|
|
expect(mockCreateAccrualSchedule).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
COMPANY,
|
|
USER,
|
|
expect.objectContaining({ dimensions: { '1': 'KS01', '6': 'P001' } }),
|
|
expect.anything(),
|
|
)
|
|
})
|
|
|
|
it('passes undefined dimensions when neither invoice nor item is tagged', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([{ data: [] }])
|
|
|
|
await createSchedulesForSupplierInvoice(
|
|
supabase as unknown as SupabaseClient,
|
|
COMPANY,
|
|
USER,
|
|
makeSupplierInvoice({ id: 'si-1' }),
|
|
[makeSupplierItem()],
|
|
'je-origin',
|
|
)
|
|
|
|
const spec = mockCreateAccrualSchedule.mock.calls[0][3]
|
|
expect(spec.dimensions).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
describe('createSchedulesForCustomerInvoice', () => {
|
|
it('passes the invoice default merged with the item bag as the spec dimensions', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([{ data: [] }]) // no existing schedules
|
|
|
|
const invoice = makeInvoice({
|
|
id: 'inv-1',
|
|
status: 'sent',
|
|
default_dimensions: { '1': 'KS01' },
|
|
})
|
|
const item = makeInvoiceItem({ dimensions: { '6': 'P001' } })
|
|
|
|
const result = await createSchedulesForCustomerInvoice(
|
|
supabase as unknown as SupabaseClient,
|
|
COMPANY,
|
|
USER,
|
|
invoice,
|
|
[item],
|
|
'je-origin',
|
|
)
|
|
|
|
expect(result).toEqual({ created: 1, failed: 0 })
|
|
expect(mockCreateAccrualSchedule).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
COMPANY,
|
|
USER,
|
|
expect.objectContaining({
|
|
direction: 'revenue',
|
|
dimensions: { '1': 'KS01', '6': 'P001' },
|
|
}),
|
|
expect.anything(),
|
|
)
|
|
})
|
|
|
|
it('collapses a multi-line description to one line of voucher text', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([{ data: [] }])
|
|
|
|
const invoice = makeInvoice({ id: 'inv-1', status: 'sent', invoice_number: '1042' })
|
|
const item = makeInvoiceItem({ description: 'Konsultation\nSeptember 2026' })
|
|
|
|
await createSchedulesForCustomerInvoice(
|
|
supabase as unknown as SupabaseClient,
|
|
COMPANY,
|
|
USER,
|
|
invoice,
|
|
[item],
|
|
'je-origin',
|
|
)
|
|
|
|
expect(mockCreateAccrualSchedule).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
COMPANY,
|
|
USER,
|
|
expect.objectContaining({ description: 'Konsultation September 2026 (faktura 1042)' }),
|
|
expect.anything(),
|
|
)
|
|
})
|
|
})
|