Files
accounted/lib/bookkeeping/propose-payment-lines.ts
T
Jakob WennbergandClaude Opus 4.6 3e82295cce feat: semi-manual invoice payment booking dialog (#37)
* fix: include reversed entries in all reports (general ledger, trial balance, VAT, SIE, NE, INK2)

Reversed entries (storno) must appear alongside their original posted entries
in reports for a complete audit trail. Previously, filtering by status='posted'
excluded them, causing discrepancies when corrections had been made.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat: semi-manual invoice payment booking with editable journal lines

When marking an invoice as paid, users now see a dialog where they can:
- Choose which bank/cash account the payment goes to (1910, 1920, 1930, etc.)
- Review and edit the proposed journal entry lines before committing
- The happy path remains fast — lines are pre-filled correctly

Implementation:
- Pure proposePaymentLines() function for line computation (accrual + cash)
- PaymentBookingDialog with AccountCombobox, balance validation, date picker
- API accepts optional custom lines, falls back to auto-generation without them
- 18 tests (8 unit + 10 API) all passing

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: address Greptile review — validation fallback, balance check, error handling

- P1: Return 400 on invalid body instead of silently falling back to
  auto-generated lines (split JSON parse from schema validation)
- P1: Add server-side balance check for custom lines before committing
  (debit must equal credit, totalDebit > 0)
- P2: Wrap PaymentBookingDialog init() in try/catch with toast on
  failure and auto-close instead of silent empty state
- Add 2 new tests: unbalanced lines → 400, invalid schema → 400

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-17 11:20:29 +01:00

240 lines
7.8 KiB
TypeScript

/**
* Pure function to compute proposed journal entry lines for an invoice payment.
* Used by the PaymentBookingDialog to pre-fill the editable line grid.
*
* No DB or Supabase dependency — all inputs are plain data.
*/
import { resolveSekAmount } from './currency-utils'
import { getRevenueAccount, getOutputVatAccount } from './invoice-entries'
import { getVatTreatmentForRate } from '@/lib/invoices/vat-rules'
import type { FormLine } from '@/components/bookkeeping/JournalEntryForm'
import type { EntityType, InvoiceItem, VatTreatment } from '@/types'
export interface ProposePaymentLinesInput {
invoice: {
invoice_number: string
total: number
total_sek?: number | null
subtotal: number
subtotal_sek?: number | null
vat_amount: number
vat_amount_sek?: number | null
currency: string
exchange_rate?: number | null
vat_treatment: VatTreatment
items?: InvoiceItem[]
}
accountingMethod: 'accrual' | 'cash'
entityType: EntityType
paymentAccount?: string
exchangeRateDifference?: number
}
function toFormAmount(n: number): string {
const rounded = Math.round(n * 100) / 100
return rounded === 0 ? '' : rounded.toString()
}
/**
* Propose journal entry lines for an invoice payment.
*
* Accrual: Debit paymentAccount, Credit 1510, optional exchange rate diff.
* Cash: Debit paymentAccount, Credit 30xx + 26xx per VAT rate group.
*/
export function proposePaymentLines(input: ProposePaymentLinesInput): FormLine[] {
const { invoice, accountingMethod, entityType, exchangeRateDifference } = input
const paymentAccount = input.paymentAccount || '1930'
const desc = `Betalning faktura ${invoice.invoice_number}`
if (accountingMethod === 'accrual') {
return proposeAccrualLines(invoice, paymentAccount, desc, exchangeRateDifference)
}
return proposeCashLines(invoice, paymentAccount, desc, entityType)
}
function proposeAccrualLines(
invoice: ProposePaymentLinesInput['invoice'],
paymentAccount: string,
desc: string,
exchangeRateDifference?: number
): FormLine[] {
const bookedSekAmount = resolveSekAmount(
invoice.total,
invoice.total_sek,
invoice.currency,
invoice.exchange_rate
)
const lines: FormLine[] = []
if (exchangeRateDifference && exchangeRateDifference !== 0) {
const actualSekReceived = bookedSekAmount + exchangeRateDifference
lines.push({
account_number: paymentAccount,
debit_amount: toFormAmount(actualSekReceived),
credit_amount: '',
line_description: desc,
})
lines.push({
account_number: '1510',
debit_amount: '',
credit_amount: toFormAmount(bookedSekAmount),
line_description: desc,
})
if (exchangeRateDifference > 0) {
lines.push({
account_number: '3960',
debit_amount: '',
credit_amount: toFormAmount(exchangeRateDifference),
line_description: 'Valutakursvinst',
})
} else {
lines.push({
account_number: '7960',
debit_amount: toFormAmount(Math.abs(exchangeRateDifference)),
credit_amount: '',
line_description: 'Valutakursförlust',
})
}
} else {
const amount = Math.round(bookedSekAmount * 100) / 100
lines.push({
account_number: paymentAccount,
debit_amount: toFormAmount(amount),
credit_amount: '',
line_description: desc,
})
lines.push({
account_number: '1510',
debit_amount: '',
credit_amount: toFormAmount(amount),
line_description: desc,
})
}
return lines
}
function proposeCashLines(
invoice: ProposePaymentLinesInput['invoice'],
paymentAccount: string,
desc: string,
entityType: EntityType
): FormLine[] {
const lines: FormLine[] = []
const isForeign = invoice.currency !== 'SEK'
const toSek = (amount: number): number => {
if (!isForeign) return amount
if (invoice.exchange_rate != null && invoice.exchange_rate > 0) {
return Math.round(amount * invoice.exchange_rate * 100) / 100
}
return amount
}
// Build credit lines per VAT rate group
const creditLines: FormLine[] = []
if (invoice.items && invoice.items.length > 0) {
const hasPerLineVat = invoice.items.some((item) => item.vat_rate !== undefined && item.vat_rate !== null)
if (!hasPerLineVat) {
// Legacy: single rate from invoice level
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
const subtotal = invoice.items.reduce((sum, item) => sum + item.line_total, 0)
creditLines.push({
account_number: revenueAccount,
debit_amount: '',
credit_amount: toFormAmount(toSek(subtotal)),
line_description: `Försäljning faktura ${invoice.invoice_number}`,
})
const totalVat = invoice.items.reduce((sum, item) => sum + (item.vat_amount || 0), 0)
if (totalVat > 0) {
const vatAccount = getOutputVatAccount(invoice.vat_treatment)
creditLines.push({
account_number: vatAccount,
debit_amount: '',
credit_amount: toFormAmount(toSek(totalVat)),
line_description: 'Utgående moms',
})
}
} else {
// Group items by vat_rate
const rateGroups = new Map<number, { subtotal: number; vatAmount: number }>()
for (const item of invoice.items) {
const rate = item.vat_rate ?? 0
const group = rateGroups.get(rate) || { subtotal: 0, vatAmount: 0 }
group.subtotal += item.line_total
group.vatAmount += item.vat_amount || 0
rateGroups.set(rate, group)
}
for (const [rate, group] of rateGroups) {
const treatment = rate === 0 && (invoice.vat_treatment === 'reverse_charge' || invoice.vat_treatment === 'export')
? invoice.vat_treatment
: getVatTreatmentForRate(rate)
const revenueAccount = getRevenueAccount(treatment, entityType)
creditLines.push({
account_number: revenueAccount,
debit_amount: '',
credit_amount: toFormAmount(Math.round(toSek(group.subtotal) * 100) / 100),
line_description: `Försäljning faktura ${invoice.invoice_number}`,
})
const roundedVat = Math.round(toSek(group.vatAmount) * 100) / 100
if (roundedVat !== 0) {
const vatAccount = getOutputVatAccount(treatment)
creditLines.push({
account_number: vatAccount,
debit_amount: '',
credit_amount: toFormAmount(roundedVat),
line_description: `Utgående moms ${rate}%`,
})
}
}
}
} else {
// Fallback: invoice-level amounts
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
const subtotalSek = resolveSekAmount(invoice.subtotal, invoice.subtotal_sek, invoice.currency, invoice.exchange_rate)
creditLines.push({
account_number: revenueAccount,
debit_amount: '',
credit_amount: toFormAmount(subtotalSek),
line_description: `Försäljning faktura ${invoice.invoice_number}`,
})
if (invoice.vat_amount > 0) {
const vatSek = resolveSekAmount(invoice.vat_amount, invoice.vat_amount_sek, invoice.currency, invoice.exchange_rate)
const vatAccount = getOutputVatAccount(invoice.vat_treatment)
creditLines.push({
account_number: vatAccount,
debit_amount: '',
credit_amount: toFormAmount(vatSek),
line_description: `Utgående moms faktura ${invoice.invoice_number}`,
})
}
}
// Debit: balance guarantee
const totalCredits = creditLines.reduce((sum, l) => sum + (parseFloat(l.credit_amount) || 0), 0)
const debitAmount = isForeign
? Math.round(totalCredits * 100) / 100
: resolveSekAmount(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
lines.push({
account_number: paymentAccount,
debit_amount: toFormAmount(debitAmount),
credit_amount: '',
line_description: desc,
})
lines.push(...creditLines)
return lines
}