50b6299699
* feat(rot-rut): match Skatteverket's payout against the begäran from the bank row A ROT/RUT invoice is stored with remaining_amount net of the deduction, so once the customer pays it flips to paid and drops out of the matchable set. Skatteverket's payout for the 1513 share then lands as an income row with no candidate: the only clearing path was a headless settle endpoint that never linked the bank row. The candidate is the payout request (one lump sum per begäran, possibly covering several invoices), modelled exactly like the supplier-invoice hint: - migration 20260904020000: transactions.potential_rot_rut_payout_request_id - pure matcher (exact amount vs decided_total ?? requested_total, boosted when Skatteverket is named, ambiguous when two requests share the amount) - hint written at bank ingest and by batch-match-invoices; cleared by the link and reconciliation paths and by clearSettledInvoiceSuggestions - shared settle service (lib/invoices/rot-rut-settle.ts) used by the existing settle route and the new POST /api/transactions/[id]/match-rot-rut-payout, which books debit 19xx / credit 1513 and links the row in one call - transactions inbox pill, own confirm dialog listing the covered invoices, manual fallback section in the invoice picker, worklist and Att göra rows Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(rot-rut): cap the payout at the begäran, CAS on the request and on stale pointers Skeptic findings on 6aa7b2e5c: - a bank row larger than the begäran was booked in full, driving 1513 into a credit balance and rewriting decided_total to the bank amount: refuse amount > decided_total ?? requested_total in the service and block the dialog's confirm with the reason - two concurrent settles could both attach and credit 1513 twice: the request update now locks on settlement_journal_entry_id IS NULL and the loser returns ROT_RUT_SETTLE_RACE (409) with its orphan voucher id - a row with a stale (reversed) journal_entry_id passed the route guard but always lost the null-only link CAS: the route forwards the pointer it read and the service locks on that value, as link-journal-entry does - the pinned underlag on the bank row now propagates onto the voucher Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(rot-rut): review round: SEK gate, voucher-less paid matchable, hint-write errors, one live voucher per begäran CodeRabbit findings on a93dc46b8, one batch: - picker and dialog only offer a begäran to SEK rows (the route refuses other currencies, so the manual flow no longer dead-ends) - a voucher-less `paid` request (beslut recorded via PATCH, money not yet booked) is matchable; settled means a settlement voucher exists - ingest and batch-match check the hint update's error before draining the pool or counting the match - the invoice.match_confirmed payload clears the payout hint like the row - migration 20260904021000: partial unique index on journal_entries (company_id, source_id) for live rot_rut_payout entries, so two racing settles cannot both book a voucher; pg test included Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> --------- Signed-off-by: Emil <emilmattsson14@gmail.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
105 lines
5.8 KiB
TypeScript
105 lines
5.8 KiB
TypeScript
import type { Transaction, TransactionCategory, Invoice, Customer, SupplierInvoice, VatTreatment } from '@/types'
|
|
import type { RotRutPayoutRequestCandidate } from '@/lib/invoices/rot-rut-payout-matching'
|
|
|
|
/** Open ROT/RUT begäran hung onto an income row as a match suggestion, with
|
|
* the invoices it covers (so the user sees which fakturor the payout settles). */
|
|
export interface PotentialRotRutPayout extends RotRutPayoutRequestCandidate {
|
|
invoices: Array<{ invoice_number: string | null; requested_amount: number | string }>
|
|
}
|
|
|
|
/** Revalidated journal-entry match suggestion hung onto a row (mirrors
|
|
* potential_invoice): present only when the suggested entry is still posted. */
|
|
export interface PotentialVoucher {
|
|
journal_entry_id: string
|
|
voucher_series: string
|
|
voucher_number: number
|
|
entry_date: string
|
|
description: string | null
|
|
}
|
|
|
|
// Shared transaction type with potential invoice data
|
|
export interface TransactionWithInvoice extends Transaction {
|
|
potential_invoice?: Invoice & { customer?: Customer }
|
|
potential_supplier_invoice?: SupplierInvoice
|
|
potential_rot_rut_payout?: PotentialRotRutPayout
|
|
potential_voucher?: PotentialVoucher
|
|
}
|
|
|
|
// Page view modes. 'review' is the migrator surface: rows whose sweep
|
|
// suggestion awaits confirmation ("Granska migrerad historik"); the tab only
|
|
// renders while such rows exist.
|
|
export type ViewMode = 'inbox' | 'history' | 'review'
|
|
export type HistoryFilter = 'all' | 'business' | 'private'
|
|
// Source filter (concept scene 10 account chooser), shared by both view modes:
|
|
// everything, one cash account ('acct:<id>'), bank rows not yet tied to a
|
|
// registered cash account ('bank:other'), all bank rows ('bank': the fallback
|
|
// split when no cash accounts are registered), or the skattekonto side.
|
|
export type SourceFilter = 'all' | 'bank' | 'bank:other' | 'skatteverket' | `acct:${string}`
|
|
|
|
// Handler types
|
|
// Returns the journal_entry_id on success, null on failure
|
|
export type CategorizeHandler = (
|
|
id: string,
|
|
isBusiness: boolean,
|
|
category?: TransactionCategory,
|
|
vatTreatment?: VatTreatment,
|
|
accountOverride?: string,
|
|
templateId?: string,
|
|
inboxItemId?: string,
|
|
// Dimensions bag {sie_dim_no: code} for the business lines of the booking.
|
|
dimensions?: Record<string, string>
|
|
) => Promise<string | null>
|
|
|
|
// Category option type. `label` retains the Swedish text for back-compat and
|
|
// non-React consumers; `labelKey` is the next-intl key under the `tx_categories`
|
|
// namespace that React components should prefer.
|
|
export interface CategoryOption {
|
|
value: TransactionCategory
|
|
label: string
|
|
labelKey: string
|
|
account?: string
|
|
}
|
|
|
|
// Shared category arrays
|
|
export const EXPENSE_CATEGORIES: CategoryOption[] = [
|
|
{ value: 'expense_representation', label: 'Representation', labelKey: 'expense_representation', account: '6071' },
|
|
{ value: 'expense_equipment', label: 'Utrustning', labelKey: 'expense_equipment', account: '5410' },
|
|
{ value: 'expense_software', label: 'Programvara', labelKey: 'expense_software', account: '5420' },
|
|
{ value: 'expense_consumables', label: 'Material', labelKey: 'expense_consumables', account: '5460' },
|
|
{ value: 'expense_travel', label: 'Resor', labelKey: 'expense_travel', account: '5800' },
|
|
{ value: 'expense_office', label: 'Kontor', labelKey: 'expense_office', account: '6110' },
|
|
{ value: 'expense_vehicle', label: 'Bil & drivmedel', labelKey: 'expense_vehicle', account: '5611' },
|
|
{ value: 'expense_telecom', label: 'Telefon & internet', labelKey: 'expense_telecom', account: '6200' },
|
|
{ value: 'expense_marketing', label: 'Marknadsföring', labelKey: 'expense_marketing', account: '5910' },
|
|
{ value: 'expense_professional_services', label: 'Konsulter', labelKey: 'expense_professional_services', account: '6530' },
|
|
{ value: 'expense_education', label: 'Utbildning', labelKey: 'expense_education', account: '6991' },
|
|
{ value: 'expense_bank_fees', label: 'Bankavgift', labelKey: 'expense_bank_fees', account: '6570' },
|
|
{ value: 'expense_card_fees', label: 'Kortavgift', labelKey: 'expense_card_fees', account: '6570' },
|
|
{ value: 'expense_currency_exchange', label: 'Valutaväxling', labelKey: 'expense_currency_exchange', account: '7960' },
|
|
{ value: 'expense_other', label: 'Övrigt', labelKey: 'expense_other', account: '6991' },
|
|
]
|
|
|
|
export const INCOME_CATEGORIES: CategoryOption[] = [
|
|
{ value: 'income_services', label: 'Tjänster', labelKey: 'income_services', account: '3001' },
|
|
{ value: 'income_products', label: 'Produkter', labelKey: 'income_products', account: '3001' },
|
|
{ value: 'income_other', label: 'Övrigt', labelKey: 'income_other', account: '3900' },
|
|
]
|
|
|
|
export interface VatTreatmentOption {
|
|
value: VatTreatment | 'none'
|
|
label: string
|
|
labelKey: string
|
|
description?: string
|
|
descriptionKey?: string
|
|
}
|
|
|
|
export const VAT_TREATMENT_OPTIONS: VatTreatmentOption[] = [
|
|
{ value: 'standard_25', label: 'Moms 25%', labelKey: 'vat_standard_25' },
|
|
{ value: 'reduced_12', label: 'Moms 12%', labelKey: 'vat_reduced_12', description: 'Livsmedel, hotell, camping', descriptionKey: 'vat_reduced_12_desc' },
|
|
{ value: 'reduced_6', label: 'Moms 6%', labelKey: 'vat_reduced_6', description: 'Böcker, tidningar, kollektivtrafik', descriptionKey: 'vat_reduced_6_desc' },
|
|
{ value: 'reverse_charge', label: 'Omvänd skattskyldighet', labelKey: 'vat_reverse_charge', description: 'Köparen redovisar momsen (EU-tjänster m.m.)', descriptionKey: 'vat_reverse_charge_desc' },
|
|
{ value: 'export', label: 'Export', labelKey: 'vat_export', description: 'Försäljning utanför EU (behåller avdragsrätt)', descriptionKey: 'vat_export_desc' },
|
|
{ value: 'exempt', label: 'Momsfri', labelKey: 'vat_exempt', description: 'Undantaget enligt ML (vård, utbildning, finans)', descriptionKey: 'vat_exempt_desc' },
|
|
{ value: 'none', label: 'Ingen moms', labelKey: 'vat_none', description: 'Ej momspliktigt (t.ex. lön, privata uttag)', descriptionKey: 'vat_none_desc' },
|
|
]
|