85e039035d
* feat(reports): custom date ranges on report endpoints in REST v1 and MCP, plus PDF export via API
Requested by a v1/MCP user: the web UI can produce resultat- and
balansrapport for a custom period with PDF export, but REST v1 and the
MCP tools only served whole fiscal years and silently ignored
from_date/to_date.
- v1 income-statement: optional from_date/to_date (validated against the
fiscal period via the same parseReportDateRange the dashboard uses)
- v1 balance-sheet: same, plus as_of as the natural alias for to_date
(mutually exclusive with it)
- Unknown query params on these report routes now return
VALIDATION_ERROR with the unknown and allowed names instead of being
silently dropped (scoped to these routes, not a global v1 change)
- MCP gnubok_get_income_statement: from_date/to_date;
gnubok_get_balance_sheet: as_of_date; both validate format, in-period
and ordering, and reject unknown args (tools/list payload bench held
under the ceiling by trimming the same tools' descriptions)
- New v1 PDF endpoints reports/{income-statement,balance-sheet}/pdf,
byte-equivalent to the dashboard export: the K2/K3 grouping and the
balance gate moved to lib/reports/financial-statement-pdf.ts, shared
by both surfaces
- Both JSON endpoints echo the effective range in data.period
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* fix(reports): range semantics, empty-date validation, and review findings on PR #1909
Consolidated resolution of the skeptic refutations, CI failures, and
CodeRabbit findings:
- Ranged income statement summed closing balances, so from_date after
period start returned year-to-date figures mislabeled as the range
(July revenue reported as Jan-Jul on JSON, PDF, and MCP). The trial
balance rolls pre-range P&L activity into opening columns, so
generateIncomeStatement now builds from period movements whenever
fromDate is set, matching the resultatrapport convention. Full-period
behavior is unchanged; generator-level regression tests added.
- from_date dropped from the v1 balance-sheet routes (JSON + PDF): a
balansraking is a cumulative position, not a flow over a window
(ÅRL 3 kap); matches the MCP tool's as_of_date-only surface.
- Empty date values (from_date=) now fail validation instead of
silently producing a full-period report with an empty period echo
(null-check instead of truthiness in parseReportDateRange).
- dry_run, read by the withApiV1 wrapper on every request, is tolerated
by the strict param check instead of being rejected as unknown.
- Unbalanced balansrakning on the v1 PDF route returns 400 (caller-data
condition), matching the dashboard export, instead of 500.
- skills/accounted-api regenerated (apiskill:check gate).
- Removed the ISO_DATE_RE import that collided with the pre-existing
local declaration in the MCP server (TS2440 on core build).
- CodeRabbit: 401 tests for both PDF endpoints; event bus cleared in
the new MCP test's beforeEach.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
245 lines
9.4 KiB
TypeScript
245 lines
9.4 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { generateTrialBalance } from './trial-balance'
|
|
import type { IncomeStatementReport, IncomeStatementSection, TrialBalanceRow } from '@/types'
|
|
|
|
/**
|
|
* Generate Income Statement (Resultaträkning)
|
|
*
|
|
* Filters to class 3-8 accounts:
|
|
* - Rörelseintäkter (3xxx): Revenue
|
|
* - Rörelsekostnader (4-7xxx): Operating expenses
|
|
* - Finansiella poster (8xxx): Financial items
|
|
* - Årets resultat: Net result
|
|
*/
|
|
export async function generateIncomeStatement(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
fiscalPeriodId: string,
|
|
options?: {
|
|
fromDate?: string
|
|
toDate?: string
|
|
/** SIE dim → code filter ({"6":"P001"}). P&L-safe: see trial-balance.ts. */
|
|
dimensions?: Record<string, string>
|
|
}
|
|
): Promise<IncomeStatementReport> {
|
|
// Exclude year-end closing entries: after closing, P&L accounts (3-8) are
|
|
// zeroed by the closing verifikat (8999 → 2099). Including them collapses
|
|
// the resultaträkning to zero. The income statement must reflect the
|
|
// pre-closing activity for the year.
|
|
const { rows } = await generateTrialBalance(supabase, companyId, fiscalPeriodId, {
|
|
// Operational convention, unchanged. Moving this to 'exclude-final' is
|
|
// Stage 2 of #1051 and deliberately deferred: see DECISIONS.md:632.
|
|
closingEntry: 'exclude-all-year-end',
|
|
fromDate: options?.fromDate,
|
|
toDate: options?.toDate,
|
|
dimensions: options?.dimensions,
|
|
})
|
|
|
|
// With a fromDate after period start, the trial balance rolls all earlier
|
|
// activity (P&L accounts included) into the opening columns, so the closing
|
|
// columns hold year-to-date figures, not the requested window. A ranged
|
|
// resultaträkning must therefore sum period movements only: the same
|
|
// convention resultatrapport uses. Without a fromDate the closing columns
|
|
// equal the movements for P&L accounts and behavior is unchanged.
|
|
return buildIncomeStatementFromRows(rows, {
|
|
periodMovements: Boolean(options?.fromDate),
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Pure income-statement assembly from trial balance rows. Extracted so
|
|
* callers that already hold pre-computed rows (e.g. the KPI route's
|
|
* single-round-trip aggregate path) can reuse the section/rounding logic
|
|
* without re-fetching journal lines. The rows must come from a trial
|
|
* balance generated with excludeYearEndClosing (see generateIncomeStatement
|
|
* above for why).
|
|
*/
|
|
export function buildIncomeStatementFromRows(
|
|
rows: TrialBalanceRow[],
|
|
buildOptions?: {
|
|
/**
|
|
* Sum period movements (period_debit/period_credit) instead of closing
|
|
* balances. Required whenever the rows were generated with a fromDate
|
|
* after period start: the roll-forward puts pre-range P&L activity into
|
|
* the opening columns and the closing columns become year-to-date.
|
|
*/
|
|
periodMovements?: boolean
|
|
}
|
|
): IncomeStatementReport {
|
|
const periodMovements = buildOptions?.periodMovements ?? false
|
|
// Filter to income/expense accounts (class 3-8)
|
|
const incomeExpenseRows = rows.filter(
|
|
(r) => r.account_class >= 3 && r.account_class <= 8
|
|
)
|
|
|
|
// Revenue sections (class 3)
|
|
const revenueSections = buildSections(
|
|
incomeExpenseRows.filter((r) => r.account_class === 3),
|
|
{
|
|
'30': 'Huvudintäkter',
|
|
'31': 'Momsfria intäkter',
|
|
'32': 'Förmåner',
|
|
'33': 'Försäljning tjänster utanför Sverige',
|
|
'34': 'Egna uttag',
|
|
'35': 'Fakturerade kostnader',
|
|
'36': 'Sidointäkter',
|
|
'37': 'Intäktskorrigeringar',
|
|
'38': 'Aktiverat arbete',
|
|
'39': 'Övriga rörelseintäkter',
|
|
},
|
|
'credit', // Revenue has credit normal balance
|
|
'Övriga intäkter',
|
|
periodMovements,
|
|
)
|
|
|
|
// Expense sections (class 4-7)
|
|
const expenseSections = buildSections(
|
|
incomeExpenseRows.filter((r) => r.account_class >= 4 && r.account_class <= 7),
|
|
{
|
|
'40': 'Varor och material',
|
|
'41': 'Förändring lager',
|
|
'42': 'Sålda handelsvaror VMB',
|
|
'43': 'Råvaror och material',
|
|
'44': 'Inköp omvänd betalningsskyldighet',
|
|
'45': 'Inköp utlandet',
|
|
'46': 'Underentreprenader och legoarbeten',
|
|
'47': 'Erhållna rabatter',
|
|
'48': 'Andra produktionskostnader',
|
|
'49': 'Lagerförändringar',
|
|
'50': 'Lokalkostnader',
|
|
'51': 'Fastighetskostnader',
|
|
'52': 'Hyra av tillgångar',
|
|
'53': 'Energikostnader',
|
|
'54': 'Förbrukningsinventarier',
|
|
'55': 'Reparation och underhåll',
|
|
'56': 'Transportkostnader',
|
|
'57': 'Frakter och transporter',
|
|
'58': 'Resekostnader',
|
|
'59': 'Reklam och PR',
|
|
'60': 'Övriga försäljningskostnader',
|
|
'61': 'Kontorsmateriel',
|
|
'62': 'Tele och post',
|
|
'63': 'Försäkringar och riskkostnader',
|
|
'64': 'Förvaltningskostnader',
|
|
'65': 'Övriga externa tjänster',
|
|
'67': 'Särskilt för ideella föreningar och stiftelser',
|
|
'68': 'Inhyrd personal',
|
|
'69': 'Övriga kostnader',
|
|
'70': 'Löner kollektivanställda',
|
|
'72': 'Löner tjänstemän/företagsledare',
|
|
'73': 'Kostnadsersättningar och förmåner',
|
|
'74': 'Pensionskostnader',
|
|
'75': 'Sociala avgifter',
|
|
'76': 'Övriga personalkostnader',
|
|
'77': 'Nedskrivningar',
|
|
'78': 'Avskrivningar',
|
|
'79': 'Övriga rörelsekostnader',
|
|
},
|
|
'debit', // Expenses have debit normal balance
|
|
'Övriga kostnader',
|
|
periodMovements,
|
|
)
|
|
|
|
// Financial sections (class 8): exclude 8999 "Årets resultat".
|
|
// 8999 is a closing account: when year-end posts "8999 debit → 2099 credit"
|
|
// to move the computed profit into equity, including 8999's debit balance
|
|
// here cancels out the revenue/expense difference and drives net_result to
|
|
// zero. The income statement shows the *computed* årets resultat as
|
|
// (revenue - expenses + financial), so 8999's own balance must stay out.
|
|
const financialSections = buildSections(
|
|
incomeExpenseRows.filter(
|
|
(r) => r.account_class === 8 && r.account_number !== '8999'
|
|
),
|
|
{
|
|
'80': 'Resultat andelar koncernföretag',
|
|
'81': 'Resultat andelar intresseföretag',
|
|
'82': 'Resultat övriga värdepapper',
|
|
'83': 'Ränteintäkter',
|
|
'84': 'Räntekostnader',
|
|
'88': 'Bokslutsdispositioner',
|
|
'89': 'Skatter och årets resultat',
|
|
},
|
|
'mixed',
|
|
'Övriga finansiella poster',
|
|
periodMovements,
|
|
)
|
|
|
|
const totalRevenue = revenueSections.reduce((sum, s) => sum + s.subtotal, 0)
|
|
const totalExpenses = expenseSections.reduce((sum, s) => sum + s.subtotal, 0)
|
|
const totalFinancial = financialSections.reduce((sum, s) => sum + s.subtotal, 0)
|
|
|
|
return {
|
|
revenue_sections: revenueSections.filter((s) => s.rows.length > 0),
|
|
total_revenue: Math.round(totalRevenue * 100) / 100,
|
|
expense_sections: expenseSections.filter((s) => s.rows.length > 0),
|
|
total_expenses: Math.round(totalExpenses * 100) / 100,
|
|
financial_sections: financialSections.filter((s) => s.rows.length > 0),
|
|
total_financial: Math.round(totalFinancial * 100) / 100,
|
|
net_result: Math.round((totalRevenue - totalExpenses + totalFinancial) * 100) / 100,
|
|
period: { start: '', end: '' }, // Will be filled by caller
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Build report sections from trial balance rows.
|
|
*
|
|
* Every row is assigned to exactly one section: either a known 2-digit group
|
|
* (from `groupLabels`) or the `fallbackTitle` catch-all for any group not in
|
|
* the map. The catch-all is what keeps the report complete: without it, an
|
|
* account whose group code is missing from `groupLabels` (e.g. 53xx
|
|
* energikostnader, 48xx, 67xx) would be silently dropped from both the
|
|
* breakdown and the computed subtotal/total/net_result.
|
|
*/
|
|
function buildSections(
|
|
rows: TrialBalanceRow[],
|
|
groupLabels: Record<string, string>,
|
|
normalBalance: 'debit' | 'credit' | 'mixed',
|
|
fallbackTitle: string,
|
|
periodMovements = false
|
|
): IncomeStatementSection[] {
|
|
const makeSection = (title: string, groupRows: TrialBalanceRow[]): IncomeStatementSection => {
|
|
const sectionRows = groupRows.map((r) => {
|
|
// Expenses (debit) use debit - credit; revenue (credit) and financial
|
|
// (mixed) use credit - debit. Ranged reports sum the window's movements
|
|
// (period columns); full-period reports keep the closing columns.
|
|
const debit = periodMovements ? r.period_debit : r.closing_debit
|
|
const credit = periodMovements ? r.period_credit : r.closing_credit
|
|
const amount =
|
|
normalBalance === 'debit'
|
|
? debit - credit
|
|
: credit - debit
|
|
|
|
return {
|
|
account_number: r.account_number,
|
|
account_name: r.account_name,
|
|
amount: Math.round(amount * 100) / 100,
|
|
}
|
|
})
|
|
|
|
const subtotal = sectionRows.reduce((sum, r) => sum + r.amount, 0)
|
|
|
|
return {
|
|
title,
|
|
rows: sectionRows.filter((r) => Math.abs(r.amount) > 0.005),
|
|
subtotal: Math.round(subtotal * 100) / 100,
|
|
}
|
|
}
|
|
|
|
const sections: IncomeStatementSection[] = []
|
|
const matched = new Set<string>()
|
|
|
|
for (const [groupCode, title] of Object.entries(groupLabels)) {
|
|
const groupRows = rows.filter((r) => r.account_number.startsWith(groupCode))
|
|
if (groupRows.length === 0) continue
|
|
for (const r of groupRows) matched.add(r.account_number)
|
|
sections.push(makeSection(title, groupRows))
|
|
}
|
|
|
|
// Catch-all: any row whose 2-digit group is not in groupLabels. Guarantees no
|
|
// account is ever excluded from the subtotal/total/net_result.
|
|
const orphans = rows.filter((r) => !matched.has(r.account_number))
|
|
if (orphans.length > 0) sections.push(makeSection(fallbackTitle, orphans))
|
|
|
|
return sections
|
|
}
|