* refactor: update VAT handling logic for non-registered sellers and improve related comments * chore: gate automated email flows behind 503 responses Disables user-facing access to invoice payment reminders and salary payslip email sending. Underlying lib code (reminder-processor, PDF templates, notification_settings) is preserved for easy re-enable. - Invoice reminders cron route returns 503; settings UI section removed. - Payslip send route returns 503; original implementation kept as _sendPayslipsImpl for future re-enable. - Push notifications were already extension-disabled, no change needed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: remove Recapt feedback widget Strips the third-party Recapt SDK and its floating feedback bubble from the app. The in-app contact form keeps working via the existing email channel (/api/support/contact). Drops the Recapt entries from the CSP and the subprocessor list in the privacy policy. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat: reject meaningless rättelser in correctEntry Guard against zero-economic-effect corrections in the storno engine: - Reject when proposed lines net to zero on every account (e.g. 1930 debit 100 / 1930 credit 100), which would erase the original posting without representing any affärshändelse (BFL 5 kap. 5 §). - Reject when proposed lines are an exact multiset match of the original entry — a rättelse must actually change something. New MeaninglessCorrectionError wired through bookkeepingErrorResponse (HTTP 400) and the Swedish error translator. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat: add date-range picker to resultat- and balansrapport Adds optional from/to date filtering to the four operational financial reports (resultatrapport, balansrapport, income-statement, balance-sheet) so users can view a month, quarter, or custom range inside a fiscal year without leaving the report. Defaults to YTD; "Hela året" preserves the prior full-period behaviour (URL-identical, cache-stable). - trial-balance engine accepts optional fromDate/toDate, rolling prior in-period activity into IB and clamping period activity to the window - 12 API routes accept and validate from_date/to_date query params - ReportDateRange chip picker persists preset per company, only renders on the four relevant tabs - FiscalYearSelector now emits the period object so the range picker has bounds without an extra fetch - PDF/XLSX filenames reflect the chosen range - Resultatrapport drops the prior-year column when narrowed (full-year vs partial-year would mislead) - 11 new tests (engine + parser); all existing report tests pass Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat: add support for marking journal entries as "no document required" - Introduced a new sidecar table `journal_entry_no_doc_required` to track entries that do not require separate documentation (e.g., bank fees, interest). - Implemented API routes for creating and deleting exemptions, including validation and authorization checks. - Added a toggle component in the UI to allow users to mark entries as exempt, with an optional reason. - Updated relevant tests to cover the new functionality, including RLS checks and cascading deletes. - Enhanced existing schemas and types to accommodate the new `vat_amount` field for supplier invoice items. * fix: address PR review findings on no-doc-required + VAT changes - pg-real cascade test wraps DELETE in gnubok.allow_delete='true' txn so the immutability trigger bypass fires (mirrors delete_last_voucher RPC). - Clamp supplier-invoice item vat_amount to <= line_total * vat_rate via Zod refinement (with 1-öre rounding tolerance) so the manual override can't inflate the 2641 debit beyond the statutory ceiling. - groupVatByRate falls back to line_total * rate when stored vat_amount is 0 with a positive rate, so legacy/import paths leaving the column at its NOT NULL DEFAULT 0 don't silently understate ruta 48. - ReportDateRange todayIso() and preset endpoints use local date components instead of toISOString() (UTC) — fixes the midnight-to-02:00 off-by-one that truncated a day from YTD / this-month / this-quarter for Swedish users. - NoDocRequiredToggle restores the previous reason on failed POST/DELETE so the rolled-back toggle state stays consistent with the rendered reason. - Document the company-scoped (not user-scoped) DELETE authorization policy on the no-document-required route. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
179 lines
6.3 KiB
TypeScript
179 lines
6.3 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 }
|
|
): 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, {
|
|
excludeYearEndClosing: true,
|
|
fromDate: options?.fromDate,
|
|
toDate: options?.toDate,
|
|
})
|
|
|
|
// 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
|
|
)
|
|
|
|
// 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',
|
|
'49': 'Lagerförändringar',
|
|
'50': 'Lokalkostnader',
|
|
'51': 'Fastighetskostnader',
|
|
'52': 'Hyra av tillgångar',
|
|
'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',
|
|
'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
|
|
)
|
|
|
|
// 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'
|
|
)
|
|
|
|
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
|
|
*/
|
|
function buildSections(
|
|
rows: TrialBalanceRow[],
|
|
groupLabels: Record<string, string>,
|
|
normalBalance: 'debit' | 'credit' | 'mixed'
|
|
): IncomeStatementSection[] {
|
|
const sections: IncomeStatementSection[] = []
|
|
|
|
for (const [groupCode, title] of Object.entries(groupLabels)) {
|
|
const groupRows = rows.filter((r) => r.account_number.startsWith(groupCode))
|
|
if (groupRows.length === 0) continue
|
|
|
|
const sectionRows = groupRows.map((r) => {
|
|
let amount: number
|
|
if (normalBalance === 'credit') {
|
|
// Revenue: credit - debit (positive = revenue)
|
|
amount = r.closing_credit - r.closing_debit
|
|
} else if (normalBalance === 'debit') {
|
|
// Expense: debit - credit (positive = expense)
|
|
amount = r.closing_debit - r.closing_credit
|
|
} else {
|
|
// Mixed: net balance (financial items)
|
|
amount = r.closing_credit - r.closing_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)
|
|
|
|
sections.push({
|
|
title,
|
|
rows: sectionRows.filter((r) => Math.abs(r.amount) > 0.005),
|
|
subtotal: Math.round(subtotal * 100) / 100,
|
|
})
|
|
}
|
|
|
|
return sections
|
|
}
|