26e29f47bc
* 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>
55 lines
2.4 KiB
TypeScript
55 lines
2.4 KiB
TypeScript
/**
|
|
* Who paid for an underlag: the one question that decides how it is booked.
|
|
*
|
|
* 'company' -> the bank line is matched (or the supplier invoice is
|
|
* registered and marked paid against a picked transaction); 'unpaid' -> a
|
|
* supplier invoice on 2440 with a due date; 'owner' / 'employee' -> an
|
|
* utlägg: cost + moms are booked at once against that person's liability
|
|
* account and an expense_claims row keeps the debt open until it is repaid.
|
|
*
|
|
* Shared by the Underlag pane, the supplier-invoice form and the
|
|
* supplier-invoice route so the answer has one vocabulary and one account
|
|
* rule. Framework-free on purpose: routes import it too.
|
|
*/
|
|
|
|
export type ExpensePayer = 'owner' | 'employee'
|
|
export type PayerChoice = 'company' | 'unpaid' | ExpensePayer
|
|
|
|
/** Display order of the answers in the "Vem betalade?" select. */
|
|
export const PAYER_ORDER: readonly PayerChoice[] = ['company', 'owner', 'employee', 'unpaid']
|
|
|
|
export function isPersonPayer(choice: PayerChoice | null | undefined): choice is ExpensePayer {
|
|
return choice === 'owner' || choice === 'employee'
|
|
}
|
|
|
|
/**
|
|
* The owner's claims are grouped by name on Hem (there is no employee row for
|
|
* the owner), so every writer that lets the name default must default to the
|
|
* same string or one person shows up as two.
|
|
*/
|
|
import { isEntityType, ownerSettlementAccount } from '@/lib/company/entity-type'
|
|
|
|
export const OWNER_FALLBACK_NAME = 'Ägare'
|
|
|
|
export type ExpenseLiabilityAccount = '2893' | '2820' | '2018' | '2890'
|
|
|
|
/**
|
|
* Liability account for an utlägg. An employee is always 2820 (kortfristiga
|
|
* skulder till anställda). The owner's account follows the entity type: an AB
|
|
* owner is a creditor (2893 skulder till närstående); an enskild firma owner
|
|
* makes an egen insättning (2018), which is equity, not a debt; a member of an
|
|
* ideell förening is a plain short-term creditor (2890).
|
|
*
|
|
* Same resolver as lib/expenses/expense-claims-service.ts, which is the
|
|
* authority at booking time; an unknown form here (a dialog rendering before
|
|
* the company context loads) previews the AB account, never books it.
|
|
*/
|
|
export function resolveExpenseLiabilityAccount(
|
|
entityType: string | null | undefined,
|
|
payer: ExpensePayer,
|
|
): ExpenseLiabilityAccount {
|
|
if (payer === 'employee') return '2820'
|
|
if (!isEntityType(entityType)) return '2893'
|
|
return ownerSettlementAccount(entityType, 'contribution') as ExpenseLiabilityAccount
|
|
}
|