fbe4e18730
* feat(mcp): book on custom accounts via account_override; fix kontoplan settings link gnubok_categorize_transaction only spoke a 19-category enum mapping to 21 hardcoded BAS accounts, so company-custom accounts (e.g. VMB) were unreachable from the agent surface even when active in the chart. - add account_override to gnubok_categorize_transaction with v1 REST semantics via a shared helper (lib/bookkeeping/account-override.ts): business-side replacement, class-2 auto-VAT drop with the 2610-2649 moms-line exception, plus a same-account degenerate guard; validated at staging and re-validated at commit - align the gnubok_create_voucher staging gate with the engine's seeding semantics: BAS 2026 accounts merely absent from the chart pass (the engine backfills them at commit) and the preview lists will_activate_accounts with BAS-name fallback; non-BAS unknown and inactive accounts still rejected - stop suggest_categories silently dropping mapping rules whose account is outside the fixed category maps; they surface with the rule's own account and an explanatory match_reason - correct the create_account next-step hint (categorize could never use the new account before; now true via account_override) - point the settings "Kontoplan (BAS)" link at /chart-of-accounts and redirect the orphaned /bookkeeping?tab=accounts URL (tab removed in #850; the deep link never worked after the #854 merge collision) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(mcp): address review findings on account_override - commit executor rejects a present-but-malformed stored account_override loudly instead of degrading to the category default (CodeRabbit major; the approver approved a preview showing the override account); with commitPendingOperation regression tests - accountToCategory returns null for unknown income accounts so custom income accounts get the same diagnostic as expenses (CodeRabbit minor), with income + reason-accumulation tests (CodeRabbit nit) - pin the class-2 VAT-drop balance invariant with a test through buildTransactionEntryLines (Swedish compliance review: gross booking, never an unbalanced net + missing VAT leg) - account_override description asks the agent to state the actual affärshändelse in notes when overriding (BFL 5 kap description concern) - eventBus.clear() in the two new test suites (CodeRabbit minor) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(mcp): never guess a moms leg onto an account_override without explicit VAT intent Round-2 Swedish compliance finding: the class-2 VAT drop did not cover margin-scheme (VMB) accounts in class 3/4, which are the override's flagship use case, so a forgotten vat_treatment attached the category default standard_25 and booked an ingående-moms deduction on a transaction where input VAT is not deductible (ML 2023:200). applyAccountOverride now takes explicit VAT intent (vat_treatment or vat_amount present) and books GROSS with no auto-VAT line without it: forgetting the flag under-deducts (lawful), never over-deducts. Both call sites (MCP staging preview, commit core) derive the flag the same way; the tool description states the enforced behavior. Deliberate divergence from v1 REST recorded in DECISIONS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: move stray decision-log entry to the root DECISIONS.md The round-2 entry was appended from the wrong working directory and landed as lib/bookkeeping/__tests__/DECISIONS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
195 lines
8.1 KiB
TypeScript
195 lines
8.1 KiB
TypeScript
'use client'
|
|
|
|
import Link from 'next/link'
|
|
import { useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { SettingsFormWrapper } from '@/components/settings/SettingsFormWrapper'
|
|
import { SettingsLoadError } from '@/components/settings/SettingsLoadError'
|
|
import { SettingsLoadingSkeleton } from '@/components/settings/SettingsLoadingSkeleton'
|
|
import { PeriodLockingSettings } from '@/components/settings/PeriodLockingSettings'
|
|
import { FiscalYearsManager } from '@/components/settings/FiscalYearsManager'
|
|
import { VoucherSeriesManager } from '@/components/settings/VoucherSeriesManager'
|
|
import { VoucherSeriesPerSourceTypeForm } from '@/components/settings/VoucherSeriesPerSourceTypeForm'
|
|
import { applyDefaultSeriesToMap } from '@/lib/bookkeeping/voucher-series-resolver'
|
|
import { PeriodiseringAutoDetectToggle } from '@/components/settings/PeriodiseringAutoDetectToggle'
|
|
import { DimensionsToggle } from '@/components/settings/DimensionsToggle'
|
|
import { MileageToggle } from '@/components/settings/MileageToggle'
|
|
import { AccountingFrameworkForm } from '@/components/settings/AccountingFrameworkForm'
|
|
import {
|
|
SettingsGroup,
|
|
SettingsRow,
|
|
SettingsSectionHeader,
|
|
SettingsSelect,
|
|
} from '@/components/settings/SettingsRows'
|
|
import { useSettings } from '@/components/settings/useSettings'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import { ExternalLink } from 'lucide-react'
|
|
import type { AccountingFramework, CompanySettings } from '@/types'
|
|
|
|
const SERIES_OPTIONS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
|
|
|
|
export function BookkeepingSettingsContent() {
|
|
const t = useTranslations('settings_bookkeeping')
|
|
const tNav = useTranslations('settings_nav')
|
|
const tIntro = useTranslations('settings_intro')
|
|
const { settings, isLoading, updateSettings, refetch } = useSettings()
|
|
const { company } = useCompany()
|
|
// Local mirror of the company-level accounting_framework so the K2/K3
|
|
// selector can reflect its own saves without waiting for the layout to
|
|
// re-render through the server. Falls back to k2 (matches the column
|
|
// default) until the company row is loaded.
|
|
const [framework, setFramework] = useState<AccountingFramework>(
|
|
company?.accounting_framework ?? 'k2',
|
|
)
|
|
|
|
if (isLoading) return <SettingsLoadingSkeleton />
|
|
if (!settings) return <SettingsLoadError onRetry={refetch} />
|
|
|
|
function handleSave(formData: FormData) {
|
|
const autoLockValue = formData.get('auto_lock_period_days') as string
|
|
const lockedThrough = (formData.get('bookkeeping_locked_through') as string) || null
|
|
const accountingMethod = (formData.get('accounting_method') as string) || 'accrual'
|
|
const defaultVoucherSeries = (formData.get('default_voucher_series') as string) || 'A'
|
|
// Deferred booking is an accrual-only concept (#967): normalize to false
|
|
// under kontantmetoden so switching back to accrual can never re-activate
|
|
// a stale flag the user set in a mode where it had no effect.
|
|
const deferInvoiceBooking =
|
|
accountingMethod === 'accrual' && formData.get('defer_invoice_booking') === 'true'
|
|
|
|
const updates: Record<string, unknown> = {
|
|
bookkeeping_locked_through: lockedThrough,
|
|
auto_lock_period_days: autoLockValue === 'none' ? null : parseInt(autoLockValue),
|
|
accounting_method: accountingMethod,
|
|
default_voucher_series: defaultVoucherSeries,
|
|
defer_invoice_booking: deferInvoiceBooking,
|
|
}
|
|
|
|
// Write-through: the booking engine resolves the series from the
|
|
// per-source-type map, NOT from default_voucher_series. So when the user
|
|
// changes the global default, propagate it across the map, but only for
|
|
// types that were still following the previous default, leaving explicit
|
|
// per-type overrides (set via VoucherSeriesPerSourceTypeForm) untouched.
|
|
// Without this the "Standardserie" dropdown is a no-op for bookkeeping.
|
|
// Only runs when the series actually changed, so saving the form for an
|
|
// unrelated reason (e.g. the lock date) never rewrites the map.
|
|
const prevDefault = settings?.default_voucher_series || 'A'
|
|
const currentMap = settings?.default_voucher_series_per_source_type
|
|
if (currentMap && defaultVoucherSeries !== prevDefault) {
|
|
updates.default_voucher_series_per_source_type = applyDefaultSeriesToMap(
|
|
currentMap,
|
|
prevDefault,
|
|
defaultVoucherSeries,
|
|
)
|
|
}
|
|
|
|
return {
|
|
updates,
|
|
onSuccess: (data: Record<string, unknown>) => {
|
|
updateSettings(data as Partial<CompanySettings>)
|
|
},
|
|
}
|
|
}
|
|
|
|
// K2/K3 selector is only meaningful for AB. EF stays on EF rules and never
|
|
// picks a framework. Use the company row (source of truth) since
|
|
// company_settings.entity_type can be stale on legacy data.
|
|
const isAktiebolag = company?.entity_type === 'aktiebolag'
|
|
|
|
return (
|
|
<div>
|
|
<SettingsSectionHeader title={tNav('bookkeeping')} intro={tIntro('bookkeeping')} />
|
|
|
|
<SettingsFormWrapper onSave={handleSave}>
|
|
{/* Grunder: framework (AB only), method, deferred booking, default
|
|
series. The framework row saves through its own PATCH and opts out
|
|
of this wrapper's dirty tracking; the rest read via FormData. */}
|
|
<SettingsGroup label={t('group_basics')}>
|
|
{isAktiebolag && (
|
|
<AccountingFrameworkForm
|
|
current={framework}
|
|
onSaved={(next) => setFramework(next)}
|
|
/>
|
|
)}
|
|
<SettingsRow
|
|
label={t('method_label')}
|
|
htmlFor="accounting_method"
|
|
help={t('method_help')}
|
|
>
|
|
<SettingsSelect
|
|
id="accounting_method"
|
|
name="accounting_method"
|
|
defaultValue={settings.accounting_method || 'accrual'}
|
|
>
|
|
<option value="accrual">{t('method_accrual')}</option>
|
|
<option value="cash">{t('method_cash')}</option>
|
|
</SettingsSelect>
|
|
</SettingsRow>
|
|
{/* #967: register/send without booking; ekonomi books in a separate
|
|
explicit step. Only meaningful under faktureringsmetoden. */}
|
|
<SettingsRow
|
|
label={t('defer_booking_label')}
|
|
htmlFor="defer_invoice_booking"
|
|
help={t('defer_booking_help')}
|
|
>
|
|
<SettingsSelect
|
|
id="defer_invoice_booking"
|
|
name="defer_invoice_booking"
|
|
defaultValue={settings.defer_invoice_booking ? 'true' : 'false'}
|
|
>
|
|
<option value="false">{t('defer_booking_off')}</option>
|
|
<option value="true">{t('defer_booking_on')}</option>
|
|
</SettingsSelect>
|
|
</SettingsRow>
|
|
<SettingsRow
|
|
label={t('series_label')}
|
|
htmlFor="default_voucher_series"
|
|
help={t('series_help')}
|
|
>
|
|
<SettingsSelect
|
|
id="default_voucher_series"
|
|
name="default_voucher_series"
|
|
defaultValue={settings.default_voucher_series || 'A'}
|
|
className="font-mono"
|
|
>
|
|
{SERIES_OPTIONS.map((letter) => (
|
|
<option key={letter} value={letter}>
|
|
{letter}
|
|
</option>
|
|
))}
|
|
</SettingsSelect>
|
|
</SettingsRow>
|
|
</SettingsGroup>
|
|
|
|
<PeriodLockingSettings settings={settings} />
|
|
</SettingsFormWrapper>
|
|
|
|
<FiscalYearsManager />
|
|
|
|
<VoucherSeriesPerSourceTypeForm
|
|
settings={settings}
|
|
onSettingsUpdated={updateSettings}
|
|
/>
|
|
|
|
<VoucherSeriesManager defaultSeries={settings.default_voucher_series || 'A'} />
|
|
|
|
<SettingsGroup label={t('group_automation')}>
|
|
<PeriodiseringAutoDetectToggle />
|
|
<DimensionsToggle />
|
|
<MileageToggle />
|
|
</SettingsGroup>
|
|
|
|
<SettingsGroup>
|
|
<SettingsRow label={t('related_heading')} borderless>
|
|
<Link
|
|
href="/chart-of-accounts"
|
|
className="inline-flex items-center gap-1.5 text-sm text-muted-foreground transition-colors hover:text-foreground"
|
|
>
|
|
<ExternalLink className="h-3.5 w-3.5" />
|
|
{t('related_chart_of_accounts')}
|
|
</Link>
|
|
</SettingsRow>
|
|
</SettingsGroup>
|
|
</div>
|
|
)
|
|
}
|