* fix(errors): close remaining raw-message leaks after #1048 (#337) Follow-up to PR #1048. No user-visible toast or response field can now carry a raw engine or DB message; everything maps through getErrorMessage or the structured-errors registry. - get-error-message: only normalize a code-carrying Error instance into the structured path when the registry knows the code; unknown codes (Node system errors, stray third-party codes, Error-wrapped Postgres SQLSTATEs) fall through to pattern match, Swedish check, Postgres map and the status/context/generic fallbacks instead of returning the raw message. New Swedish-detection pattern for "ar last" phrases and a known-pattern row for "already has a journal entry". - structured-errors: add CANNOT_EDIT_NON_DRAFT (409) and MANDATORY_DIMENSION_MISSING (400) rows, plus common Node network codes (ECONNREFUSED, ECONNRESET, ETIMEDOUT, ENOTFOUND, EAI_AGAIN, EPIPE) as retryable 503 transients with a Swedish message. - pending-operations commit + bulk-commit routes: map executor error strings through getErrorMessage before responding (raw stays in logs); Swedish passes through, English falls to status-appropriate Swedish. - pending page: toast via getErrorMessage, fixing raw English toasts and "[object Object]" for structured envelopes on commit/bulk/reject. - transactions book + journal-entries routes: untyped catch and DB list errors no longer return err.message; mapped or static Swedish instead. - invoice send + issue-credit-note: partial_failures reasons are now Swedish (raw provider/DB text logged, never returned). - Tests: new unknown-code/Error-instance suite, registry rows asserted, route tests updated off the pinned raw-English expectations. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(skatteverket): target the räkenskapsår for yearly VAT redovisningsperiod A yearly filer with a broken fiscal year has a Skatteverket period ending in its FY-end month, not December, and the panel's year state is never maintained in yearly mode (the year picker is replaced by the räkenskapsår selector), so calls targeted the wrong period even for calendar-FY companies filing after year end. The selected fiscal period now rides through the whole chain: panel query strings, draft/validate/ submit bodies, buildMomsuppgift (which resolves the FY bounds so the period id and the figures describe the same räkenskapsår), and the staged-commit path. MCP callers without a fiscal period keep the calendar fallback. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(deadlines): group same-day skattekonto deadlines into one card Moms, AGI and preliminärskatt legally share the skattekonto date (den 12:e), so a small monthly-moms employer saw 2-3 near-identical rows per month. Two or more pending system rows of the skattekonto family on the same due date now render as one grouped card with the date block once and each obligation as a sub-row keeping its own confirm-to-complete flow. Presentation only: rows, statuses, ICS feed unchanged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(deadlines): KU + ROT/RUT + long-tail opt-in deadlines, rolling horizon Follow-ups from the #1028 audit left out of the #1057-#1060 fix stack, each with its own condition modeling: - kontrolluppgifter (KU10/KU20/KU31), due 31 Jan (SFL 24 kap. 1 §): opt-in flag suggested from ledger signals (2898 utdelning, 2393/2893 ägarlån; deliberately not 2091, see DECISIONS.md), AB only, mirroring the #1059 EU-sales suggest-and-confirm pattern. - rot_rut_begaran, due 31 Jan after the payment year (Lag 2009:194 8 §): rows generated only for years with actually PAID ROT/RUT invoices, resolved inside the generator; invoice-derived suggestion. - Long tail, explicit opt-in ('Fler deadlines'): OSS quarterly and IOSS monthly with a skipBankingDayAdjustment config flag (EU-law dates stand on weekends), Intrastat (10th banking day of the following month), punktskatt (ordinary skattedeklaration schedule), and fyllnadsinbetalning (12th of 2nd month over 30k / 3rd of 5th month, SFL 62:8 + 65 kap.). Kvarskatt deferred: needs a slutskattebesked date the app does not hold. - Rolling generation horizon: recurring types ~6 months ahead, annual 12 months, mirrored in the backfill expectation keys so the nightly cron never thrashes; regeneration now preserves manual in_progress status; one-time cleanup migration removes existing far-future rows. Migrations also applied to the staging branch, together with the previously missing 20260717xxxxxx deadline migrations (staging had drifted and lacked dismissed_at). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(arsredovisning): keep narrative editable after year-end close The narrative save endpoint refused writes whenever the fiscal period was closed/locked, but Verkstall bokslut closes the period before the arsredovisning text is ever written, so every legitimate save failed with PERIOD_LOCKED and the PDF fell back to placeholder text. The narrative is arsredovisning document text (ARL 6 kap.), not journal rakenskapsinformation, so the bookkeeping period lock does not apply. Saves are now refused only once a Bolagsverket submission for the period is registrerad (ARSREDOVISNING_REGISTERED, 409); the filed artifact was already frozen separately by the submissions immutability trigger. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(skatteverket): surface dead SKV connections and nudge reconnect Prod has ~70 companies that connected Skatteverket before the post-connect sync fix (#1010) and silently never synced skattekonto: the only reconnect prompt lived in the settings panel nobody revisits. - transactions-page banner when the connection is needs_reconsent or expired without refresh, linking to /settings/tax - pre-connect note in the connect panel: approve ALL behorigheter on Skatteverket's consent page (previously only shown after a failure) - wire the inert skattekonto.connection.expired event to an email nudge to the token owner; one send per consent episode via claim-first dedup in notification_log (type skv_connection_expired, partial unique index in migration 20260720090000, applied to staging) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(archive): per-year behandlingshistorik covers late-booked vouchers + Drive backup disclaimer The per-fiscal-year archive filtered audit rows by created_at within the period, dropping treatment history for bokslut entries, stornos and SIE imports booked after year end (BFNAR 2013:2 kap 8). The year archive now unions the date window with every audit row touching the period's journal entries and lines, deduped by audit id; line rows (company_id NULL by trigger design) are admitted via a scoped OR and reachable on the service-role backup path. ARCHIVE_FORMAT_VERSION 2->3 forces a one-time Drive re-upload so existing archives pick up the complete history. The Drive card on /import Exportera and the LASMIG texts now state the Drive copy is a convenience backup, not the BFL 7 kap legal archive. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(decisions): clarify Arsredovisning narrative save behavior on submission status * feat(invoices): gate payment links behind invoice settings opt-in The payment-link section (manual URL field + Stripe auto-create toggle) was visible on every invoice and auto-created Stripe links on send for any connected company. It is now opt-in per company: - new company_settings.invoice_payment_links_enabled, default false for everyone (no grandfathering of Stripe-connected companies) - invoice editor hides the whole section unless enabled; a draft that already carries a link still shows it so old links stay clearable - enforced server-side in maybeCreatePaymentLinkForInvoice (after the provider lookup, so the extension-free core build never queries), so dashboard, v1, MCP and recurring sends all obey it - new toggle on Settings -> Invoicing, saves instantly; sv/en strings Migration applied to the staging branch; prod gets it on merge. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(tests): add invoice_payment_links_enabled to company settings fixture The makeCompanySettings fixture missed the new required boolean, failing the core-only build's type check of tests/helpers.ts. Default false, matching the migration default. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(review): address CodeRabbit, compliance and Swedish review findings Round 2 of PR #1076 review feedback, one change per accepted finding: - pending page: res.json() safe fallback in both commit paths so a non-JSON proxy response cannot surface a raw parser error - bulk-commit: map operation status enums to Swedish display labels in the 'Redan hanterad' skip message - payment-link settings: disable the toggle while a save is in flight to prevent out-of-order PUT responses - deadlines group card: route all UI strings through next-intl (deadlines namespace, sv + en) - archive export: scope the period audit entry lookup to posted/reversed, matching the rest of the export - error tests: assert the exact registry English message for ECONNREFUSED to lock the no-leakage contract - signal routes: log.warn when best-effort lookups swallow a Supabase error (forensics), keep fail-closed behavior - narrative route: document that 'avslutad' submissions deliberately stay editable (never registered at Bolagsverket) - VAT: yearly declarations without an explicit fiscalPeriodId now resolve the räkenskapsår ending in the target year from fiscal_periods instead of assuming a calendar FY (SFL 26 kap 10-11 §§); calendar fallback only when no fiscal period exists - deadlines: IOSS deadline no longer requires vat_registered (Art. 369s has no Swedish VAT registration prerequisite) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Emil <emilmattsson14@gmail.com> --------- Signed-off-by: Emil <emilmattsson14@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
552 lines
21 KiB
TypeScript
552 lines
21 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type {
|
|
VatDeclaration,
|
|
VatDeclarationRutor,
|
|
VatPeriodType,
|
|
AccountingMethod,
|
|
} from '@/types'
|
|
|
|
/**
|
|
* Calculate VAT declaration (Momsdeklaration) for a given period.
|
|
*
|
|
* Reads directly from the general ledger: sums posted journal entry lines
|
|
* on 26xx (VAT) and 3xxx (revenue) accounts for the period. This makes the
|
|
* momsdeklaration a pure projection from the double-entry bookkeeping ledger.
|
|
*
|
|
* The accounting method (accrual vs cash) is already reflected in when
|
|
* journal entries were created by the entry generators, so no separate
|
|
* filtering logic is needed here.
|
|
*/
|
|
|
|
/**
|
|
* Account-to-ruta mapping for the Swedish momsdeklaration (SKV 4700).
|
|
*
|
|
* Pure ledger projection: every Ruta on the SKV 4700 form maps to one or more
|
|
* BAS account balances aggregated over the period. The mapping below follows
|
|
* the BAS 2026 chart and Skatteverket's published BAS-to-Ruta spec
|
|
* (`.claude/skills/swedish-vat/references/vat-compliance-reference.md` §7).
|
|
*
|
|
* Output VAT (261x/262x/263x) → ruta 10/11/12 per rate (credit balance)
|
|
* Includes parent/summary accounts (2610/2620/2630) for users who post
|
|
* directly to the group account, and vilande accounts (2618/2628/2638)
|
|
* used by cash-method bookkeepers for invoices not yet paid.
|
|
* Reverse charge output (2614/2624/2634) → ruta 30/31/32 (credit)
|
|
* Import VAT (2615/2625/2635) → ruta 60/61/62 (credit)
|
|
* Input VAT (2640-2649) → ruta 48 (debit), incl. parent 2640
|
|
* Domestic taxable sales (3001-3003) → ruta 05 (credit)
|
|
* Uttag (3401-3403) → ruta 06 (credit)
|
|
* EU goods (3108) → ruta 35; EU services (3308) → ruta 39 (credit)
|
|
* Export (3105/3305) → ruta 36/40; Exempt (3004/3100/3404/3994/3980) → ruta 42 (credit)
|
|
* Reverse-charge purchase bases: read from the cost account the journal
|
|
* entry posted to (debit balance), not from supplier classification:
|
|
* 4515/4516/4517 (EU goods 25/12/6%) → ruta 20
|
|
* 4535/4536/4537 (EU services 25/12/6%) → ruta 21
|
|
* 4531/4532/4533 (non-EU services 25/12/6%) → ruta 22
|
|
* 4415/4416/4417 (domestic goods reverse charge) → ruta 23
|
|
* 4425/4426/4427 (domestic services reverse charge) → ruta 24
|
|
* 4545/4546/4547 (import) → ruta 50
|
|
*/
|
|
export const ACCOUNT_RUTA: Record<string, { box: keyof VatDeclarationRutor; side: 'credit' | 'debit' }> = {
|
|
// Output VAT 25% → ruta 10
|
|
'2610': { box: 'ruta10', side: 'credit' }, // Utgående moms 25% (summary/parent)
|
|
'2611': { box: 'ruta10', side: 'credit' }, // Försäljning inom Sverige
|
|
'2612': { box: 'ruta10', side: 'credit' }, // Egna uttag
|
|
'2613': { box: 'ruta10', side: 'credit' }, // Uthyrning (frivillig skattskyldighet)
|
|
'2616': { box: 'ruta10', side: 'credit' }, // Vinstmarginalbeskattning
|
|
'2618': { box: 'ruta10', side: 'credit' }, // Vilande utgående moms 25%
|
|
// Output VAT 12% → ruta 11
|
|
'2620': { box: 'ruta11', side: 'credit' }, // Utgående moms 12% (summary/parent)
|
|
'2621': { box: 'ruta11', side: 'credit' },
|
|
'2622': { box: 'ruta11', side: 'credit' }, // Egna uttag
|
|
'2623': { box: 'ruta11', side: 'credit' }, // Uthyrning
|
|
'2626': { box: 'ruta11', side: 'credit' }, // VMB
|
|
'2628': { box: 'ruta11', side: 'credit' }, // Vilande utgående moms 12%
|
|
// Output VAT 6% → ruta 12
|
|
'2630': { box: 'ruta12', side: 'credit' }, // Utgående moms 6% (summary/parent)
|
|
'2631': { box: 'ruta12', side: 'credit' },
|
|
'2632': { box: 'ruta12', side: 'credit' }, // Egna uttag
|
|
'2633': { box: 'ruta12', side: 'credit' }, // Uthyrning
|
|
'2636': { box: 'ruta12', side: 'credit' }, // VMB
|
|
'2638': { box: 'ruta12', side: 'credit' }, // Vilande utgående moms 6%
|
|
// Reverse charge output VAT → ruta 30/31/32
|
|
'2614': { box: 'ruta30', side: 'credit' },
|
|
'2624': { box: 'ruta31', side: 'credit' },
|
|
'2634': { box: 'ruta32', side: 'credit' },
|
|
// Input VAT → ruta 48
|
|
'2640': { box: 'ruta48', side: 'debit' }, // Ingående moms (summary/parent)
|
|
'2641': { box: 'ruta48', side: 'debit' }, // Debiterad ingående moms
|
|
'2642': { box: 'ruta48', side: 'debit' }, // Frivillig skattskyldighet
|
|
'2645': { box: 'ruta48', side: 'debit' }, // Förvärv utlandet (EU/non-EU RC)
|
|
'2646': { box: 'ruta48', side: 'debit' }, // Uthyrning
|
|
'2647': { box: 'ruta48', side: 'debit' }, // Omvänd skattskyldighet i Sverige
|
|
'2649': { box: 'ruta48', side: 'debit' }, // Blandad verksamhet
|
|
// Import VAT (since 2015, via momsdeklaration) → ruta 60/61/62
|
|
'2615': { box: 'ruta60', side: 'credit' }, // Import 25%
|
|
'2625': { box: 'ruta61', side: 'credit' }, // Import 12%
|
|
'2635': { box: 'ruta62', side: 'credit' }, // Import 6%
|
|
// Revenue: domestic taxable sales → ruta 05
|
|
'3001': { box: 'ruta05', side: 'credit' },
|
|
'3002': { box: 'ruta05', side: 'credit' },
|
|
'3003': { box: 'ruta05', side: 'credit' },
|
|
// Revenue: momspliktiga uttag → ruta 06
|
|
'3401': { box: 'ruta06', side: 'credit' },
|
|
'3402': { box: 'ruta06', side: 'credit' },
|
|
'3403': { box: 'ruta06', side: 'credit' },
|
|
// Revenue: EU goods/services → ruta 35/39
|
|
'3108': { box: 'ruta35', side: 'credit' }, // Varuförsäljning till EU
|
|
'3308': { box: 'ruta39', side: 'credit' }, // Tjänsteförsäljning till EU
|
|
// Revenue: export/other → ruta 36/40/42
|
|
'3105': { box: 'ruta36', side: 'credit' }, // Varuförsäljning export
|
|
'3305': { box: 'ruta40', side: 'credit' }, // Tjänsteförsäljning export
|
|
'3004': { box: 'ruta42', side: 'credit' }, // Momsfri försäljning (AB)
|
|
'3100': { box: 'ruta42', side: 'credit' }, // Momsfria intäkter (EF)
|
|
'3404': { box: 'ruta42', side: 'credit' }, // Momsfria uttag
|
|
'3980': { box: 'ruta42', side: 'credit' }, // Erhållna offentliga stöd m.m.
|
|
'3994': { box: 'ruta42', side: 'credit' }, // Övriga rörelseintäkter momsfria
|
|
// Reverse-charge purchase bases (debit on cost accounts) → ruta 20-24, 50
|
|
'4515': { box: 'ruta20', side: 'debit' }, // Inköp varor EU 25%
|
|
'4516': { box: 'ruta20', side: 'debit' }, // Inköp varor EU 12%
|
|
'4517': { box: 'ruta20', side: 'debit' }, // Inköp varor EU 6%
|
|
'4535': { box: 'ruta21', side: 'debit' }, // Inköp tjänster EU 25%
|
|
'4536': { box: 'ruta21', side: 'debit' }, // Inköp tjänster EU 12%
|
|
'4537': { box: 'ruta21', side: 'debit' }, // Inköp tjänster EU 6%
|
|
'4531': { box: 'ruta22', side: 'debit' }, // Inköp tjänster utanför EU 25%
|
|
'4532': { box: 'ruta22', side: 'debit' }, // Inköp tjänster utanför EU 12%
|
|
'4533': { box: 'ruta22', side: 'debit' }, // Inköp tjänster utanför EU 6%
|
|
'4415': { box: 'ruta23', side: 'debit' }, // Inköp varor SE reverse charge 25%
|
|
'4416': { box: 'ruta23', side: 'debit' }, // Inköp varor SE reverse charge 12%
|
|
'4417': { box: 'ruta23', side: 'debit' }, // Inköp varor SE reverse charge 6%
|
|
'4425': { box: 'ruta24', side: 'debit' }, // Inköp tjänster SE reverse charge 25%
|
|
'4426': { box: 'ruta24', side: 'debit' }, // Inköp tjänster SE reverse charge 12%
|
|
'4427': { box: 'ruta24', side: 'debit' }, // Inköp tjänster SE reverse charge 6%
|
|
'4545': { box: 'ruta50', side: 'debit' }, // Beskattningsunderlag import 25%
|
|
'4546': { box: 'ruta50', side: 'debit' }, // Beskattningsunderlag import 12%
|
|
'4547': { box: 'ruta50', side: 'debit' }, // Beskattningsunderlag import 6%
|
|
}
|
|
|
|
const VAT_ACCOUNTS = Object.keys(ACCOUNT_RUTA)
|
|
|
|
/**
|
|
* 26xx output VAT accounts feeding rutor 10/11/12, 30/31/32 and 60/61/62.
|
|
* Derived from ACCOUNT_RUTA so the KPI vatLiability widget can never drift
|
|
* from the momsdeklaration (ruta 49) calculation.
|
|
*/
|
|
export const VAT_OUTPUT_ACCOUNTS = Object.entries(ACCOUNT_RUTA)
|
|
.filter(([account, mapping]) => account.startsWith('26') && mapping.side === 'credit')
|
|
.map(([account]) => account)
|
|
|
|
/** Input VAT accounts feeding ruta 48 (2640-2649 series). */
|
|
export const VAT_INPUT_ACCOUNTS = Object.entries(ACCOUNT_RUTA)
|
|
.filter(([, mapping]) => mapping.box === 'ruta48')
|
|
.map(([account]) => account)
|
|
|
|
/**
|
|
* Calculate period start and end dates
|
|
*/
|
|
export function calculatePeriodDates(
|
|
periodType: VatPeriodType,
|
|
year: number,
|
|
period: number
|
|
): { start: string; end: string } {
|
|
let startMonth: number
|
|
let endMonth: number
|
|
|
|
switch (periodType) {
|
|
case 'monthly':
|
|
// period is 1-12
|
|
startMonth = period
|
|
endMonth = period
|
|
break
|
|
case 'quarterly':
|
|
// period is 1-4
|
|
startMonth = (period - 1) * 3 + 1
|
|
endMonth = period * 3
|
|
break
|
|
case 'yearly':
|
|
// period is 1
|
|
startMonth = 1
|
|
endMonth = 12
|
|
break
|
|
default:
|
|
startMonth = 1
|
|
endMonth = 12
|
|
}
|
|
|
|
const startDate = new Date(year, startMonth - 1, 1)
|
|
const endDate = new Date(year, endMonth, 0) // Last day of end month
|
|
|
|
return {
|
|
start: formatDate(startDate),
|
|
end: formatDate(endDate),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Format date as YYYY-MM-DD
|
|
*/
|
|
function formatDate(date: Date): string {
|
|
const y = date.getFullYear()
|
|
const m = String(date.getMonth() + 1).padStart(2, '0')
|
|
const d = String(date.getDate()).padStart(2, '0')
|
|
return `${y}-${m}-${d}`
|
|
}
|
|
|
|
/**
|
|
* Round to 2 decimal places
|
|
*/
|
|
function round(value: number): number {
|
|
return Math.round(value * 100) / 100
|
|
}
|
|
|
|
/**
|
|
* Resolve the start/end dates for a VAT period.
|
|
*
|
|
* Monthly and quarterly VAT periods are always calendar months/quarters
|
|
* (kalendermånad / kalenderkvartal per SFL 26 kap), so they use the plain
|
|
* calendar calculation.
|
|
*
|
|
* Annual VAT (helårsmoms), however, is reported per *räkenskapsår* (the
|
|
* beskattningsår), not per calendar year (SFL 26 kap 10-11 §§). A räkenskapsår
|
|
* can be extended or shortened (up to 18 months for a first/changed year per
|
|
* BFL 3 kap 3 §), so a calendar Jan-Dec span would silently drop part of an
|
|
* extended year (e.g. a first year 2025-07-03 → 2026-12-31). When the caller
|
|
* supplies the fiscal period we therefore use its actual bounds. If the period
|
|
* can't be resolved we fall back to the calendar span so behaviour degrades
|
|
* gracefully instead of erroring.
|
|
*/
|
|
export async function resolvePeriodDates(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
periodType: VatPeriodType,
|
|
year: number,
|
|
period: number,
|
|
fiscalPeriodId?: string
|
|
): Promise<{ start: string; end: string }> {
|
|
if (periodType === 'yearly') {
|
|
if (fiscalPeriodId) {
|
|
const { data: fp } = await supabase
|
|
.from('fiscal_periods')
|
|
.select('period_start, period_end')
|
|
.eq('id', fiscalPeriodId)
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
if (fp?.period_start && fp?.period_end) {
|
|
return { start: fp.period_start, end: fp.period_end }
|
|
}
|
|
} else {
|
|
// No explicit fiscal period: resolve the räkenskapsår ending in `year`
|
|
// instead of assuming a calendar FY. Helårsmoms is filed per
|
|
// räkenskapsår (SFL 26 kap 10-11 §§), so for a broken fiscal year the
|
|
// calendar-year assumption would put both the redovisningsperiod and
|
|
// the figures on the wrong period. For calendar-FY companies this
|
|
// resolves to Jan-Dec of `year`, identical to the arithmetic fallback.
|
|
const { data: fp } = await supabase
|
|
.from('fiscal_periods')
|
|
.select('period_start, period_end')
|
|
.eq('company_id', companyId)
|
|
.gte('period_end', `${year}-01-01`)
|
|
.lte('period_end', `${year}-12-31`)
|
|
.order('period_end', { ascending: false })
|
|
.limit(1)
|
|
.maybeSingle()
|
|
if (fp?.period_start && fp?.period_end) {
|
|
return { start: fp.period_start, end: fp.period_end }
|
|
}
|
|
}
|
|
}
|
|
return calculatePeriodDates(periodType, year, period)
|
|
}
|
|
|
|
/**
|
|
* Accounts a momsredovisning settles the period's net against: 2650
|
|
* (Redovisningskonto för moms, att betala) and 1650 (Momsfordran, att återfå).
|
|
* Mirrors VAT_SETTLEMENT_ACCOUNT/VAT_REFUND_ACCOUNT in vat-settlement.ts,
|
|
* which imports from this module and therefore cannot be imported here.
|
|
*/
|
|
export const VAT_SETTLEMENT_NET_ACCOUNTS = ['2650', '1650']
|
|
|
|
/** A momsredovisning entry detected by shape rather than source_type. */
|
|
export interface VatSettlementShapedEntry {
|
|
id: string
|
|
status: string
|
|
entry_date: string
|
|
source_type: string | null
|
|
voucher_series: string | null
|
|
voucher_number: number | null
|
|
}
|
|
|
|
export interface VatAccountTotals {
|
|
totals: Map<string, { debit: number; credit: number }>
|
|
/**
|
|
* Untagged momsredovisning entries found in the period (manual vouchers,
|
|
* SIE-imported settlements, stornos of a settlement). Already excluded
|
|
* from `totals`; surfaced so the settlement proposal can warn and gate.
|
|
*/
|
|
settlementShapedEntries: VatSettlementShapedEntry[]
|
|
/**
|
|
* Posted/reversed entry counts per source_type for the whole period,
|
|
* INCLUDING tagged vat_settlement entries (they never match the
|
|
* invoice/transaction buckets, and the metadata scan always counted them).
|
|
* Comes back in the same RPC round trip so the declaration metadata no
|
|
* longer needs its own paginated entry scan.
|
|
*/
|
|
sourceTypeCounts: Record<string, number>
|
|
}
|
|
|
|
/** Wire shape of the get_vat_declaration_totals RPC jsonb payload. */
|
|
interface VatTotalsRpcPayload {
|
|
totals: Array<{ account_number: string; debit: number; credit: number }>
|
|
settlement_shaped_entries: VatSettlementShapedEntry[]
|
|
source_type_counts: Record<string, number>
|
|
}
|
|
|
|
/**
|
|
* Fetch and aggregate debit/credit totals per VAT-relevant account
|
|
* (ACCOUNT_RUTA) for a period. Shared by the declaration calculation and the
|
|
* settlement proposal (lib/reports/vat-settlement.ts) so the two can never
|
|
* disagree on which ledger lines count.
|
|
*
|
|
* Momsredovisning entries are excluded. They are bookkeeping about the
|
|
* declaration, not VAT-bearing business activity; including them would zero
|
|
* out the rutor the moment the settlement is booked, turning the report, its
|
|
* exports, and a later Skatteverket submission into an empty declaration
|
|
* (#984). Two detection paths:
|
|
*
|
|
* - tagged: source_type 'vat_settlement' (the app's own settlement flow),
|
|
* filtered in the query;
|
|
* - shaped: an entry with at least one line on a declaration account
|
|
* (ACCOUNT_RUTA) and at least one on 2650/1650. This catches settlements
|
|
* booked before the tagged flow existed, manual vouchers, SIE-imported
|
|
* settlements, and storno reversals of a settlement (source_type
|
|
* 'storno', which would otherwise re-inflate the rutor after annullera).
|
|
*
|
|
* Opening-balance entries are exempt from the shape rule: 26xx balances
|
|
* carried in by a migrating company are unsettled VAT that belongs in the
|
|
* next declaration, even when the same entry carries a 2650/1650 balance.
|
|
*/
|
|
export async function fetchVatAccountTotals(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
start: string,
|
|
end: string
|
|
): Promise<VatAccountTotals> {
|
|
// Aggregation, settlement-shape detection, and source_type counts all
|
|
// happen in one SQL pass (get_vat_declaration_totals). The previous
|
|
// implementation paged every entry + line for the period through PostgREST
|
|
// and reduced in JS: dozens of round trips for a busy quarter. The account
|
|
// lists are parameters so ACCOUNT_RUTA stays the single source of truth.
|
|
const { data, error } = await supabase.rpc('get_vat_declaration_totals', {
|
|
p_company_id: companyId,
|
|
p_start: start,
|
|
p_end: end,
|
|
p_accounts: [...VAT_ACCOUNTS, ...VAT_SETTLEMENT_NET_ACCOUNTS],
|
|
p_ruta_accounts: VAT_ACCOUNTS,
|
|
p_net_accounts: VAT_SETTLEMENT_NET_ACCOUNTS,
|
|
})
|
|
if (error) {
|
|
throw new Error(`get_vat_declaration_totals failed: ${error.message}`)
|
|
}
|
|
|
|
const payload = (data ?? {}) as Partial<VatTotalsRpcPayload>
|
|
const totals = new Map<string, { debit: number; credit: number }>()
|
|
for (const row of payload.totals ?? []) {
|
|
totals.set(row.account_number, {
|
|
debit: Number(row.debit) || 0,
|
|
credit: Number(row.credit) || 0,
|
|
})
|
|
}
|
|
|
|
return {
|
|
totals,
|
|
settlementShapedEntries: payload.settlement_shaped_entries ?? [],
|
|
sourceTypeCounts: payload.source_type_counts ?? {},
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Map aggregated per-account totals to the momsdeklaration boxes, including
|
|
* the recomputed ruta 49 net (FK009). Pure projection over ACCOUNT_RUTA.
|
|
*/
|
|
export function rutorFromTotals(
|
|
totals: Map<string, { debit: number; credit: number }>
|
|
): VatDeclarationRutor {
|
|
const rutor: VatDeclarationRutor = {
|
|
ruta05: 0, ruta06: 0, ruta07: 0, ruta08: 0,
|
|
ruta10: 0, ruta11: 0, ruta12: 0,
|
|
ruta20: 0, ruta21: 0, ruta22: 0, ruta23: 0, ruta24: 0,
|
|
ruta30: 0, ruta31: 0, ruta32: 0,
|
|
ruta35: 0, ruta36: 0, ruta37: 0, ruta38: 0,
|
|
ruta39: 0, ruta40: 0, ruta41: 0, ruta42: 0,
|
|
ruta48: 0, ruta49: 0,
|
|
ruta50: 0, ruta60: 0, ruta61: 0, ruta62: 0,
|
|
}
|
|
|
|
for (const [account, mapping] of Object.entries(ACCOUNT_RUTA)) {
|
|
const t = totals.get(account)
|
|
if (!t) continue
|
|
const balance = mapping.side === 'credit'
|
|
? t.credit - t.debit
|
|
: t.debit - t.credit
|
|
rutor[mapping.box] = round(rutor[mapping.box] + balance)
|
|
}
|
|
|
|
// FK009: summaMoms = (10 + 11 + 12 + 30 + 31 + 32 + 60 + 61 + 62) - 48
|
|
rutor.ruta49 = round(
|
|
rutor.ruta10 + rutor.ruta11 + rutor.ruta12 +
|
|
rutor.ruta30 + rutor.ruta31 + rutor.ruta32 +
|
|
rutor.ruta60 + rutor.ruta61 + rutor.ruta62 -
|
|
rutor.ruta48
|
|
)
|
|
|
|
return rutor
|
|
}
|
|
|
|
/**
|
|
* Calculate VAT declaration from the general ledger.
|
|
*
|
|
* Sums posted journal entry lines on the BAS accounts in ACCOUNT_RUTA per the
|
|
* SKV 4700 form mapping. Pure ledger projection: no supplier classification
|
|
* or other side-channel signals.
|
|
*
|
|
* - ruta 49 = (10 + 11 + 12 + 30 + 31 + 32 + 60 + 61 + 62) - 48
|
|
*
|
|
* The accounting method parameter is accepted for backward compatibility
|
|
* but not used: the method is already baked into journal entry timing.
|
|
*/
|
|
export async function calculateVatDeclaration(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
periodType: VatPeriodType,
|
|
year: number,
|
|
period: number,
|
|
_accountingMethod: AccountingMethod = 'accrual',
|
|
options: { fiscalPeriodId?: string } = {}
|
|
): Promise<VatDeclaration> {
|
|
// For yearly VAT this resolves to the räkenskapsår bounds (when a fiscal
|
|
// period is supplied), not the calendar year: see resolvePeriodDates.
|
|
const { start, end } = await resolvePeriodDates(
|
|
supabase, companyId, periodType, year, period, options.fiscalPeriodId
|
|
)
|
|
|
|
// Fetch and aggregate posted VAT-account activity for the period. The same
|
|
// RPC round trip carries the per-source_type entry counts for the metadata.
|
|
const { totals, sourceTypeCounts } = await fetchVatAccountTotals(supabase, companyId, start, end)
|
|
|
|
// Map account balances to momsdeklaration boxes
|
|
const rutor = rutorFromTotals(totals)
|
|
|
|
// Compute per-rate base amounts from individual revenue accounts
|
|
const revenueByRate = {
|
|
base25: 0, // 3001
|
|
base12: 0, // 3002
|
|
base6: 0, // 3003
|
|
}
|
|
for (const [account, rate] of [['3001', 'base25'], ['3002', 'base12'], ['3003', 'base6']] as const) {
|
|
const t = totals.get(account)
|
|
if (t) revenueByRate[rate] = round(t.credit - t.debit)
|
|
}
|
|
|
|
// Entry counts by source type for metadata: aggregated by the RPC in the
|
|
// same round trip as the totals (SQL GROUP BY, so a busy VAT period can
|
|
// never truncate the counts).
|
|
const invoiceSources = new Set([
|
|
'invoice_created', 'invoice_paid', 'invoice_cash_payment', 'credit_note',
|
|
])
|
|
let invoiceCount = 0
|
|
let transactionCount = 0
|
|
for (const [sourceType, n] of Object.entries(sourceTypeCounts)) {
|
|
if (invoiceSources.has(sourceType)) invoiceCount += n
|
|
else if (sourceType === 'bank_transaction') transactionCount += n
|
|
}
|
|
|
|
return {
|
|
period: { type: periodType, year, period, start, end },
|
|
rutor,
|
|
invoiceCount,
|
|
transactionCount,
|
|
breakdown: {
|
|
invoices: {
|
|
ruta05: rutor.ruta05,
|
|
ruta06: rutor.ruta06,
|
|
ruta07: rutor.ruta07,
|
|
ruta10: rutor.ruta10,
|
|
ruta11: rutor.ruta11,
|
|
ruta12: rutor.ruta12,
|
|
ruta39: rutor.ruta39,
|
|
ruta40: rutor.ruta40,
|
|
base25: revenueByRate.base25,
|
|
base12: revenueByRate.base12,
|
|
base6: revenueByRate.base6,
|
|
},
|
|
transactions: { ruta48: rutor.ruta48 },
|
|
receipts: { ruta48: 0 },
|
|
reverseCharge: {
|
|
ruta20: rutor.ruta20,
|
|
ruta21: rutor.ruta21,
|
|
ruta22: rutor.ruta22,
|
|
ruta23: rutor.ruta23,
|
|
ruta24: rutor.ruta24,
|
|
ruta30: rutor.ruta30,
|
|
ruta31: rutor.ruta31,
|
|
ruta32: rutor.ruta32,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get a summary of the VAT declaration for display
|
|
*/
|
|
export function getVatDeclarationSummary(declaration: VatDeclaration): {
|
|
totalOutputVat: number
|
|
totalInputVat: number
|
|
vatToPay: number
|
|
isRefund: boolean
|
|
} {
|
|
const totalOutputVat = round(
|
|
declaration.rutor.ruta10 +
|
|
declaration.rutor.ruta11 +
|
|
declaration.rutor.ruta12 +
|
|
declaration.rutor.ruta30 +
|
|
declaration.rutor.ruta31 +
|
|
declaration.rutor.ruta32 +
|
|
declaration.rutor.ruta60 +
|
|
declaration.rutor.ruta61 +
|
|
declaration.rutor.ruta62
|
|
)
|
|
|
|
const totalInputVat = declaration.rutor.ruta48
|
|
const vatToPay = declaration.rutor.ruta49
|
|
|
|
return {
|
|
totalOutputVat,
|
|
totalInputVat,
|
|
vatToPay,
|
|
isRefund: vatToPay < 0,
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Format period label for display
|
|
*/
|
|
export function formatPeriodLabel(
|
|
periodType: VatPeriodType,
|
|
year: number,
|
|
period: number
|
|
): string {
|
|
switch (periodType) {
|
|
case 'monthly':
|
|
const monthNames = [
|
|
'Januari', 'Februari', 'Mars', 'April', 'Maj', 'Juni',
|
|
'Juli', 'Augusti', 'September', 'Oktober', 'November', 'December'
|
|
]
|
|
return `${monthNames[period - 1]} ${year}`
|
|
case 'quarterly':
|
|
return `Kvartal ${period} ${year}`
|
|
case 'yearly':
|
|
return `Helår ${year}`
|
|
default:
|
|
return `${year}`
|
|
}
|
|
}
|