* feat(salary): repay utlägg with the salary as a tax-free payslip line (#2331) - expense_reimbursement line type: kostnadsersättning outside gross, tax, avgifter and the AGI. The engine adds tax-free reimbursements (utlägg, skattefritt traktamente, skattefri milersättning) to the net payout only. - booking debits the claim's liability account (2820) on top of gross, never a 7xxx cost; a run that only repays utlägg posts 2820 D / 1930 K instead of being treated as a nollkörning - salary_line_items.source_expense_claim_id (tenant-scoped FK, cascade, one payslip line per claim); settle_expense_claims_via_salary_run marks the claims paid with an expense_payout_batches row pointing at the salary verifikat, no second verifikat, idempotent on retry; wired into bookLoadedRun and the v1 book route with a pre-check before posting - create_expense_payout_batch refuses claims scheduled on a payslip (ON_PAYSLIP); deleteExpenseClaim refuses once the run has left draft - "Lägg till utlägg" on the employee row of a draft run; the payslip page labels and removes the lines - pg-real: tests/pg/utlagg-via-lon.pg.test.ts + ON_PAYSLIP case Claude-Session: https://claude.ai/code/session_01LvMaHcTnwAfxzgYD1fGYX1 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(salary): PR #2361 review: claim delete cannot cascade into a booked payslip; AGI excludes the utlägg line - salary_line_items_source_expense_claim_fkey is ON DELETE RESTRICT (edited in the unmerged 20260906210300): the database refuses to delete a claim a payslip line still references, whichever path issues the DELETE - deleteExpenseClaim removes the draft line first (before the storno) and keeps refusing with ON_PAYSLIP once the run has left draft - pg-real: delete refused with 23503 on a booked and on a draft run; the app order (line, then claim) succeeds - unit: AGI builder keeps FK011/FK001/FK487 and emits no benefit field for an expense_reimbursement line (FK011 derives from sre.gross_salary; only benefit_* types are read from line items) Claude-Session: https://claude.ai/code/session_01LvMaHcTnwAfxzgYD1fGYX1 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
150 lines
5.6 KiB
TypeScript
150 lines
5.6 KiB
TypeScript
import type { SalaryLineItemType } from '@/types'
|
|
|
|
/**
|
|
* Salary account mapping: maps line item types and calculation results
|
|
* to BAS accounts per Swedish chart of accounts standards.
|
|
*/
|
|
|
|
/**
|
|
* Kostnadsersättning (travel-expenses.md, "Utlägg vs kostnadsersättning"):
|
|
* paid out with the salary but outside bruttolön. No skatteavdrag, no
|
|
* arbetsgivaravgifter, no semesterunderlag, not in the AGI gross (FK011).
|
|
* The calculation engine adds these to the net payout only; the booking
|
|
* debits their mapped account on top of the gross reconciliation.
|
|
*/
|
|
export const TAX_FREE_REIMBURSEMENT_TYPES: readonly SalaryLineItemType[] = [
|
|
'expense_reimbursement',
|
|
'traktamente_taxfree',
|
|
'mileage_taxfree',
|
|
]
|
|
|
|
export function isTaxFreeReimbursementType(itemType: string): boolean {
|
|
return (TAX_FREE_REIMBURSEMENT_TYPES as readonly string[]).includes(itemType)
|
|
}
|
|
|
|
/** Default BAS account for each salary line item type */
|
|
const LINE_ITEM_ACCOUNTS: Record<SalaryLineItemType, string> = {
|
|
// Salary components
|
|
monthly_salary: '7210',
|
|
hourly_salary: '7210',
|
|
overtime: '7210',
|
|
overtime_50: '7210',
|
|
overtime_100: '7210',
|
|
// OB-tillägg: bookat på samma lönekonto som grundlönen; differentieras via
|
|
// rad-text på verifikatet och lönespecifikationen.
|
|
ob_weekday_evening: '7210',
|
|
ob_weekend: '7210',
|
|
ob_night: '7210',
|
|
ob_holiday: '7210',
|
|
bonus: '7210',
|
|
commission: '7210',
|
|
// Gross deductions
|
|
gross_deduction_pension: '7218',
|
|
gross_deduction_other: '7210',
|
|
// Benefits (förmånsvärden: not a cash payment, just tax base)
|
|
benefit_car: '7385',
|
|
benefit_housing: '7381',
|
|
benefit_meals: '7382',
|
|
benefit_wellness: '7699',
|
|
benefit_bike: '7388',
|
|
benefit_other: '7389',
|
|
// Absence
|
|
sick_karens: '7281',
|
|
sick_day2_14: '7281',
|
|
sick_day15_plus: '7281',
|
|
vab: '7210',
|
|
parental_leave: '7210',
|
|
unpaid_leave: '7210',
|
|
vacation: '7285',
|
|
semesterersattning: '7285',
|
|
// Travel
|
|
traktamente_taxfree: '7321',
|
|
traktamente_taxable: '7322',
|
|
mileage_taxfree: '7331',
|
|
mileage_taxable: '7332',
|
|
// Utlägg repaid with the salary (#2331): the cost and moms were booked when
|
|
// the claim was registered against 2820, so the payslip line relieves that
|
|
// liability, never a 7xxx cost. The line normally carries the claim's own
|
|
// liability account in account_number; this is the fallback.
|
|
expense_reimbursement: '2820',
|
|
// Net deductions (nettolöneavdrag): withheld from the payout and owed to a
|
|
// third party, so the default account is the credit-side settlement account,
|
|
// not a 7xxx salary expense. Advance repayments credit the receivable (1613),
|
|
// union fees credit 2794, everything unmapped lands on 2799 Övriga
|
|
// löneavdrag. There is a single benefit-payment item type, so its default
|
|
// credits 7385 Kostnader för fri bil, the dominant co-payment case;
|
|
// co-payments for other benefit kinds must set account_number on the line
|
|
// (7381/7382/7388/7389/7699).
|
|
net_deduction_advance: '1613',
|
|
net_deduction_union: '2794',
|
|
net_deduction_benefit_payment: '7385',
|
|
net_deduction_other: '2799',
|
|
// Öresavrundning: net payout rounded up to whole kronor; the 0-99 öre diff
|
|
// debits the standard rounding account (same account the invoice flows use).
|
|
oresavrundning: '3740',
|
|
// Other
|
|
correction: '7210',
|
|
other: '7210',
|
|
}
|
|
|
|
/**
|
|
* Get the BAS account number for a salary line item type.
|
|
* Can be overridden per line item via account_number field.
|
|
*/
|
|
export function getLineItemAccount(
|
|
itemType: SalaryLineItemType,
|
|
employmentType: string = 'employee'
|
|
): string {
|
|
// Company owner uses 7220 instead of 7210
|
|
if (employmentType === 'company_owner') {
|
|
const baseAccount = LINE_ITEM_ACCOUNTS[itemType]
|
|
if (baseAccount === '7210') return '7220'
|
|
if (baseAccount === '7281') return '7282'
|
|
if (baseAccount === '7285') return '7286'
|
|
}
|
|
|
|
// Board member uses 7240
|
|
if (employmentType === 'board_member') {
|
|
const baseAccount = LINE_ITEM_ACCOUNTS[itemType]
|
|
if (baseAccount === '7210') return '7240'
|
|
}
|
|
return LINE_ITEM_ACCOUNTS[itemType]
|
|
}
|
|
|
|
/** Journal entry accounts for salary booking */
|
|
export const SALARY_ACCOUNTS = {
|
|
// Salary expense (debit)
|
|
SALARY_EMPLOYEE: '7210', // Löner till tjänstemän
|
|
SALARY_OWNER: '7220', // Löner till företagsledare
|
|
SALARY_BOARD: '7240', // Styrelsearvoden
|
|
SICK_PAY: '7281', // Sjuklöner
|
|
VACATION_PAY: '7285', // Semesterlöner
|
|
|
|
// Tax withholding (credit)
|
|
TAX_WITHHELD: '2710', // Personalskatt
|
|
|
|
// Bank / payment (credit)
|
|
BANK: '1930', // Företagskonto
|
|
|
|
// Employer contributions
|
|
AVGIFTER_EXPENSE: '7510', // Lagstadgade sociala avgifter (debit)
|
|
AVGIFTER_LIABILITY: '2731', // Avräkning sociala avgifter (credit)
|
|
// Whole-krona remainder: 2731 holds what Skatteverket actually draws
|
|
// (hela kronor, öretal bortfaller), the öre difference lands here.
|
|
ORESUTJAMNING: '3740', // Öres- och kronutjämning (credit)
|
|
|
|
// Vacation accrual
|
|
VACATION_ACCRUAL_EXPENSE: '7290', // Förändring semesterlöneskuld (debit)
|
|
VACATION_ACCRUAL_LIABILITY: '2920', // Upplupna semesterlöner (credit)
|
|
|
|
// Vacation accrual avgifter
|
|
VACATION_AVGIFTER_EXPENSE: '7519', // Sociala avgifter semester (debit)
|
|
VACATION_AVGIFTER_LIABILITY: '2940', // Upplupna sociala avgifter (credit)
|
|
|
|
// Pension provisions (löneväxling)
|
|
PENSION_EXPENSE: '7410', // Pensionsförsäkringspremier (debit)
|
|
PENSION_LIABILITY: '2740', // Skuld pensionsförsäkringar (credit)
|
|
SLP_EXPENSE: '7533', // Särskild löneskatt på pensionskostnader (debit)
|
|
SLP_LIABILITY: '2514', // Beräknad särskild löneskatt (credit)
|
|
} as const
|