* feat: multi-tenant company refactor (GNU-19) Introduce companies table, company_members, and user_preferences to support multiple companies per user. All data scoping changes from user_id to company_id across the entire codebase. Key changes: - Database migration: new tables, company_id on 40+ tables, backfill, RLS rewrite from user_id to company-member-based, updated RPCs - Types: Company, CompanyMember, CompanyRole, UserPreferences types; company_id added to all entity interfaces; companyId on all events - Engine: all 7 core functions take companyId; storno, period, year-end services updated; 16 report generators updated - Middleware: company context resolution (cookie → prefs → first company) - API routes: ~120 routes updated with requireCompanyId() - Frontend: CompanyProvider context, layout/dashboard/onboarding updated - Extensions: context factory, 9 extensions, all lib files updated - Tests: 1880 tests passing, all helpers updated with company_id defaults Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add database migrations for multi-tenant company and team system (GNU-19) Adds company_invitations, company creation RPC, team_members, account deletion RPC, and teams table refactor migrations. Updates base multi-tenant migration with cascading FKs and onboarding_step column. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add team types and update core infrastructure for multi-tenancy (GNU-19) Adds TeamRole, MemberSource, and Team types. Refactors Supabase service client to be stateless, updates middleware for team-aware routing, extends CompanyContext with team/role fields, and updates extension service types to accept companyId. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: thread company_id through business logic functions (GNU-19) Replaces user_id scoping with company_id across all lib modules: bookkeeping, documents, transactions, invoices, reconciliation, tax, deadlines, and import. Updates corresponding tests. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: thread company_id through API routes and extensions (GNU-19) Updates all existing API routes to extract and pass companyId. Updates enable-banking and arcim-migration extensions for company-scoped transaction ingestion and sync. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add company and team management API routes (GNU-19) Adds CRUD endpoints for company members, company invitations, team members, and team invitations. Includes invite token utilities, email templates, and company switch server action. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add team/company UI components, pages, and dashboard updates (GNU-19) Adds CompanySwitcher, ConsultantEmptyState, Step0RoleChoice, company members and team management panels. Updates dashboard layout for team-aware routing, onboarding for multi-step role choice, and auth callback for team invite acceptance. Ignores supabase/.branches/. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add null guards for company in import page (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: move appUrl declaration to outer scope in invite route (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add optional chaining for company.name in members section (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add optional chaining for second company.name in members section (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add null guards for company in extension components (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: pass companyId to executeSIEImport in arcim-migration extension (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update tests to use companyId instead of userId and improve type handling --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
163 lines
5.5 KiB
TypeScript
163 lines
5.5 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
|
|
): Promise<IncomeStatementReport> {
|
|
const { rows } = await generateTrialBalance(supabase, companyId, fiscalPeriodId)
|
|
|
|
// 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)
|
|
const financialSections = buildSections(
|
|
incomeExpenseRows.filter((r) => r.account_class === 8),
|
|
{
|
|
'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
|
|
}
|