* feat(company): ideell förening as a third legal form, behind a flag (#2072 step 1) Why the problem occurred: the legal form was modelled as a binary flag in ~300 files. `EntityType` was a two-member union, but nothing dispatched on it exhaustively: 28 sites defaulted `?? 'enskild_firma'` (invoice, categorize, match, stripe, invoice-inbox) or `?? 'aktiebolag'` (year-end, bokslut, MCP), and every form-dependent choice was an `=== 'aktiebolag' ? A : B` ternary. Widening the union compiled everywhere and changed nothing, so a förening would have booked as an enskild firma in the app and as an aktiebolag in bokslut and MCP, with no error anywhere. The lookup refused föreningar at the door (mapEntityType returned null), which is what the tester hit. What was removed or simplified: the silent defaults. One module, lib/company/entity-type.ts, now holds the list (ENTITY_TYPES), the parser (never defaults), the resolver (settings hint, then companies.entity_type, then throw) and `byEntityType`, whose Record arms make the compiler refuse the next widening until each site has an answer. The form-dependent facts (closing account, owner settlement account, calendar-year lock, default method, K1/K2 label, personnummer vs 16-prefix) live there once instead of in the ternaries. On the SQL side supported_entity_types() replaces four copies of the literal list in the create RPCs. Why this shape and not the proposed one: the tracker asked for the enum widening plus a chart; that alone was the dangerous version (compiles, books wrong). Bundling stiftelse was considered and dropped: identical plumbing but no chart block. Creation sits behind NEXT_PUBLIC_IDEELL_FORENING_ENABLED so the CHECK, RPCs and seed can ship now and the first partner is switched on without a migration; the flag goes when Phase 2 (packs, INK3, årsbokslut, Swish) lands on the tracker. Domain choices (DECISIONS.md 2026-09-08, verify with an accountant before Phase 2): result closes to 2069 with 2068 as prior-year carry; no owner accounts, member settlement on 2890; accrual default; brutet räkenskapsår allowed; K1 label for the 5 000 kr accrual threshold (BFNAR 2010:1); org number gets the 16 prefix. Migration 20260908110835 widens the three CHECK constraints, adds supported_entity_types(), re-creates the three create RPCs with the widened guard and adds the förening block to seed_chart_of_accounts. Applied to staging and covered by ideell-forening-entity-type.pg.test.ts. Part of #2072 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * fix(company): close the förening paths the skeptic refuted (#2072) Five refutations from the /skeptic pass on 7a05c54d2, each fixed at the shared definition rather than the reported site: 1. Privately paid supplier invoices and the utlägg dialog resolved the owner account in lib/expenses/payer.ts with its own AB/EF ternary, so a förening member's invoice was built on 2893 and then refused by the expense-claim service (which already said 2890), burning an ankomstnummer. The helper now uses ownerSettlementAccount. 2. Booking templates substitute their `_ab` accounts only for an aktiebolag; the `private_expense` template kept its base 2013 for a förening. Template accounts now resolve through templateAccountForForm: EF base, AB override, förening base with owner accounts translated to 2890 (booking-templates.ts and proposal-lines.ts share it). 3. A VAT-registered förening with helårsmoms got no momsdeklaration deadline: the annual VAT rule bailed on anything but AB/EF. A förening is a juridisk person and follows the räkenskapsår schedule (SFL 26 kap 33 §), so the rule now keys on fiscalYearLockedToCalendar instead of the two literals; same in the MCP VAT report. 4. 2069 would have accumulated across years: the year-open omföring was AB-only with 2099/2098 hard-coded. planResultAppropriation now takes the pair from resultClosingAccounts (AB 2099 -> 2098, förening 2069 -> 2068) and skips forms with no carry (EF). 5. With the flag off, a registry lookup that returned "Ideell förening" was prefilled into the onboarding journey, the form picker was skipped and the create step answered "Ogiltig företagsform" with no way back. The journey, the BankID picker, the onboarding page and the MCP lookup now use mapSetupEntityType, which maps only creatable forms, so a flagged-off form falls through to the picker as before. Also: form picker keeps its AB-first order; tests for each fix. Part of #2072 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * chore(migrations): move ideell förening migration after main's latest version (20260908143051) Two migrations landed on main after the branch forked; a lower version would be skipped by the merge-time apply. Staging history row renamed to match. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * chore(skills): regenerate accounted-api reference for the widened entity_type enum Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
139 lines
5.1 KiB
TypeScript
139 lines
5.1 KiB
TypeScript
import { z } from 'zod'
|
|
import { accountNumberSchema } from '@/lib/invariants/zod'
|
|
|
|
/**
|
|
* The konteringspaket (pack) contract.
|
|
*
|
|
* ## What a pack is
|
|
*
|
|
* One reusable bookkeeping pattern, as data: the accounts it touches, which
|
|
* side each lands on, and how a total amount is split across them. A pack is
|
|
* pure data forever. It never carries executable code or DDL, which is the
|
|
* lock recorded in `dev_docs/niche_factory.md` and what makes a pack safe to
|
|
* accept from an author who is not us.
|
|
*
|
|
* ## Why the catalogue moved out of a migration
|
|
*
|
|
* The 26 system templates were seeded inside
|
|
* `supabase/migrations/20260413160000_booking_template_library.sql`. Under the
|
|
* never-modify-a-shipped-migration rule that froze them: correcting a wrong BAS
|
|
* account or a Swedish typo needed a whole new migration, and nothing checked
|
|
* that a seeded account existed in the chart or that a template balanced. PR
|
|
* #1321 was exactly that failure with seeded chart names. As data files with a
|
|
* validator, a correction is a one-line edit plus a green CI run.
|
|
*
|
|
* ## The line model
|
|
*
|
|
* `applyTemplate()` in `lib/bookkeeping/template-library.ts` turns a total
|
|
* amount into lines, and the three types are not decorative:
|
|
*
|
|
* - `vat`: carries `vat_rate` and never `ratio`. Amount is
|
|
* `total * vat_rate / (1 + vat_rate)`, except on fiktiv-moms accounts
|
|
* (reverse charge/import, e.g. 2614/2645) where the total is the tax base
|
|
* and the amount is `total * vat_rate` on top.
|
|
* - `business` and `settlement`: amount is `total * ratio`, so they carry
|
|
* `ratio` and never `vat_rate`.
|
|
*
|
|
* That split is enforced below rather than left as a convention, because a
|
|
* `vat` line with a `ratio` silently computes the wrong amount.
|
|
*/
|
|
|
|
/** Categories a pack can be filed under. Mirrors the `booking_template_library.category` CHECK. */
|
|
export const PACK_CATEGORIES = [
|
|
'eu_trade',
|
|
'tax_account',
|
|
'private_transfer',
|
|
'salary',
|
|
'representation',
|
|
'year_end',
|
|
'vat',
|
|
'financial',
|
|
'other',
|
|
] as const
|
|
|
|
/** Which entity types a pack applies to. Mirrors the `entity_type` CHECK. */
|
|
export const PACK_ENTITY_TYPES = ['all', 'enskild_firma', 'aktiebolag', 'ideell_forening'] as const
|
|
|
|
/** Line roles. Drives the amount maths in `applyTemplate()`. */
|
|
export const PACK_LINE_TYPES = ['business', 'vat', 'settlement'] as const
|
|
|
|
/**
|
|
* Slug: lowercase kebab-case. This is the **public lookup key**, used as the
|
|
* filename, in the docs URL, and by the assistant to name a pack. Renaming one
|
|
* breaks every reference, so treat it as an identifier, not a label.
|
|
*/
|
|
export const PACK_SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
|
|
|
|
export const PackLineSchema = z
|
|
.object({
|
|
// From lib/invariants: the same BAS account rule the API, the MCP surface
|
|
// and the SIE importer use. A pack cannot disagree with the rest of the app
|
|
// about what an account number is.
|
|
account: accountNumberSchema,
|
|
label: z.string().min(1).max(200),
|
|
side: z.enum(['debit', 'credit']),
|
|
type: z.enum(PACK_LINE_TYPES),
|
|
ratio: z.number().min(0).max(10).optional(),
|
|
vat_rate: z.number().min(0).max(1).optional(),
|
|
})
|
|
.strict()
|
|
.superRefine((line, ctx) => {
|
|
if (line.type === 'vat') {
|
|
if (line.vat_rate === undefined) {
|
|
ctx.addIssue({ code: 'custom', message: 'a vat line must carry vat_rate', path: ['vat_rate'] })
|
|
}
|
|
if (line.ratio !== undefined) {
|
|
ctx.addIssue({
|
|
code: 'custom',
|
|
message: 'a vat line must not carry ratio: its amount comes from vat_rate',
|
|
path: ['ratio'],
|
|
})
|
|
}
|
|
return
|
|
}
|
|
if (line.ratio === undefined) {
|
|
ctx.addIssue({ code: 'custom', message: `a ${line.type} line must carry ratio`, path: ['ratio'] })
|
|
}
|
|
if (line.vat_rate !== undefined) {
|
|
ctx.addIssue({
|
|
code: 'custom',
|
|
message: `a ${line.type} line must not carry vat_rate`,
|
|
path: ['vat_rate'],
|
|
})
|
|
}
|
|
})
|
|
|
|
export const PackMetaSchema = z
|
|
.object({
|
|
slug: z.string().regex(PACK_SLUG_RE, 'slug must be lowercase kebab-case'),
|
|
/**
|
|
* Single source of truth for display order, unique across the catalogue.
|
|
* The in-app gallery and the docs site both sort on it, so the two surfaces
|
|
* cannot disagree. Renumber deliberately.
|
|
*/
|
|
order: z.number().int().positive(),
|
|
name: z.string().min(1).max(200),
|
|
description: z.string().max(2000).default(''),
|
|
/**
|
|
* Optional Swedish note on the statutory rule behind the pattern, e.g. the
|
|
* 300 kr per person cap on representation VAT. Rendered next to the pack so
|
|
* a user knows *when* the template applies, not just what it posts.
|
|
* Stays Swedish in both locales: it is statutory content, per
|
|
* `.claude/rules/i18n.md`.
|
|
*/
|
|
legal_note: z.string().max(2000).optional(),
|
|
category: z.enum(PACK_CATEGORIES),
|
|
entity_type: z.enum(PACK_ENTITY_TYPES).default('all'),
|
|
})
|
|
.strict()
|
|
|
|
export const PackSchema = z
|
|
.object({
|
|
meta: PackMetaSchema,
|
|
// Two lines is the minimum that can balance.
|
|
lines: z.array(PackLineSchema).min(2).max(50),
|
|
})
|
|
.strict()
|
|
|
|
export type Pack = z.infer<typeof PackSchema>
|