f3eacb436d
* fix(security): gate replace_sie_import behind owner/admin membership The RPC was SECURITY DEFINER with EXECUTE granted to PUBLIC and anon, no company_members lookup, no auth.uid() reference and no unauthorized raise, while setting gnubok.allow_delete to disarm the BFL immutability and retention triggers. Any caller holding a company_id and an import id could hard delete another tenant's verifikationer. Confirmed live in production. Applies the same fail closed owner/admin guard that undo_sie_import already carries (migration 20260624120000), resolving the actor from COALESCE(p_user_id, auth.uid()) so it denies when the role is NULL, then revokes EXECUTE from PUBLIC and anon. search_path and the raised statement_timeout are restated, since CREATE OR REPLACE drops settings that are not repeated. userId is a required parameter on replaceSIEImport: the service client has a NULL auth.uid(), so a caller without an explicit actor now fails to compile rather than hitting the closed gate at runtime. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): validate arcim OAuth callback state server side The callback route is skipAuth and decoded the state parameter as plain base64url JSON, trusting consentId and provider from it. A one time code was minted at flow start and never read. An unauthenticated attacker who learned a consent id could run an OAuth flow on their own provider account and post the callback with a forged state, landing their tokens on another tenant's consent, so the victim's next migration imported the attacker's ledger. State is now an opaque randomBytes(32) pointer to a provider_otc row, consumed by a single atomic UPDATE guarded on used_at IS NULL and expires_at, so a replay loses the row lock race and updates nothing. provider is read from provider_consents rather than trusted from the client. provider_otc already existed for exactly this purpose and was never wired up. Also scopes getConsent to an owning company, closing a cross tenant status oracle where the preview and migrate paths echoed a consent's status before the scoped check ran. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): scope documents storage to company_id (phase A) The documents bucket policies matched on auth.uid(), and upload keys were documents/{userId}/..., so company membership was never consulted. Removing a member revoked nothing: their session still authenticated and they kept direct Storage read access to every receipt, supplier invoice and bank statement they had uploaded. The same bug was fixed for sie-files in 20260416120000; this bucket was left behind. Phase A is additive. Company scoped policies are added alongside the uploader scoped ones, uploads move to documents/{companyId}/{userId}/..., and reads accept either layout so nothing breaks mid migration. Phase C, which drops the old policies, is gated on the backfill reporting zero remaining legacy prefix objects. The policy compares the company segment as text rather than casting to uuid the way sie-files does: this bucket holds keys whose second segment is not a uuid (MCP audit packages), and Postgres does not guarantee the bucket prefix qual runs before the cast, so a planner reordering would raise 22P02 and fail the whole query instead of filtering the row out. deleteDocument now removes both candidate keys. Removing only the stored pointer would leave a readable orphan copy of a document the user asked to erase. The backfill script is included but has never been run. It defaults to dry run, refuses .env.local by name, and verifies each copy is readable and SHA-256 identical before repointing the row. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): enforce events:read scope and membership on /api/events This was the only one of the three validateApiKey call sites with no downstream guard: v1 and the MCP server both check scope and re-verify company membership, this route did neither. An events:read scope existed and was documented as gating the endpoint but was never called, so a legacy key falling back to DEFAULT_SCOPES read the full log. The bound company id went straight from the api_keys row into a service role query, so a key whose user had been removed from the company kept reading. Adds the scope check before any database access, re-verifies company_members with archived_at IS NULL, honours test mode by stamping X-Gnubok-Mode instead of ignoring it, applies minimisePayload so the pull surface can never return a wider payload than the push surface, and replaces the three flat error strings with the canonical envelope. Test key reads are served rather than blocked: TEST_KEY_WRITE_BLOCKED is gated on mutations in with-api-v1, so a read gets the same treatment as every other v1 read endpoint. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * perf(bookkeeping): sweep remaining journal_entries!inner embeds A previous refactor removed this pattern from lib/reports and introduced fetchEntryLines, but the class was never swept. Seventeen sites remained and had become the top application consumer of production database time: measured across the resulting query shapes, 32,694 calls and 25,848 seconds of execution, mean 790ms, with shapes averaging 2.6s and 3.0s and maxing at 7,962ms against the 8s statement_timeout, which surfaced to users as 500s on the booking path. PostgREST compiles an embed with filters on the embedded side into a correlated INNER JOIN LATERAL with a parameterized LIMIT, which stops Postgres reordering the join, so each query walked the whole journal_entry_lines table across all tenants. Driving from the entries side instead turns that into two indexed round trips. Converted sites keep their existing shape: the helper reattaches the parent entry under the same key the embed produced. Several conversions also remove a latent silent truncation where an unpaginated query was capped at PostgREST's 1000 row ceiling. Two deliberate exceptions. The free text ilike legs of the MCP display query stay on the embed, because each is capped at legLimit and that cap drives the truncation contract the tool reports, while the helper is unbounded. The accounts route moves to the existing get_account_usage_counts RPC instead, since its embed was a head count and the helper returns rows. commitEntry's write path is untouched: the change there is confined to the read query of the pre-commit dimension rule check. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(api): anchor v1 list cursors on created_at Page two returned page one, forever, while still advertising a fresh next_cursor. The three routes sorted by and encoded a Postgres date column, which serializes as YYYY-MM-DD, but decodeDefaultCursor validates the cursor timestamp as full ISO-8601 and returned null, so the keyset filter was never applied and has_more never went false. An integrator syncing verifikat looped on the newest rows indefinitely. The transactions route already solved this and its comment names the trap; the fix was never ported. All three now order and encode on created_at with an id tie break, matching the transactions keyset predicate exactly. ISO_TIMESTAMP is deliberately left alone: relaxing it would silently change sort semantics on the route that currently works. Default ordering therefore moves from business date to insert order. Every business date is still on the row, and the invoices list gains date_from and date_to filters so a date range is still reachable; the other two already had them. The tests use an in-memory PostgREST that actually evaluates the filters, because the repo's pass-through mock cannot catch this class of bug: the bug is that the filter is never sent. They walk to exhaustion with a hard iteration cap, so an unterminated walk fails instead of hanging. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(api): separate dry run from commit in the idempotency hash The request hash was built from url.pathname, which excludes the query string, so a dry run and its commit hashed identically. Following the flow documented in dry-run.ts, re-issuing the request with the same Idempotency-Key returned the cached preview with Idempotent-Replayed set and wrote nothing, while reporting 200. An agent or integrator saw success for a write that never happened. dry_run is folded into the hash only when true, not as an unconditional boolean. Including it as false would change the hash of every ordinary write, and with a 24h idempotency TTL any key in flight across the deploy would fail the request_hash comparison and 409 on a legitimate retry. Both hash call sites now go through one shared helper so they cannot drift into a permanent cache miss, and dry run responses are no longer stored at all. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * ci: install the Bedrock SDK out of tree in the compliance review The Swedish accounting compliance gate had failed ten consecutive runs and so was posting nothing. With --no-package-lock npm discarded the lockfile and re-resolved the whole tree from package.json, floating @hookform/resolvers to 5.4.3, whose valibot ^1 peer conflicts with the pinned valibot 0.39.0. Installing into the parent of the checkout resolves only that one package, so an unrelated peer conflict can never take the gate down again. Node still finds it because ESM bare specifiers walk up parent node_modules; NODE_PATH would not have worked, as it is CommonJS only. --legacy-peer-deps was rejected because it masks future genuine peer conflicts and still reifies the full tree. The same step's SDK version is aligned from 0.31.0 back to the 0.29.1 that package.json and check:guards enforce after the streaming outage. That drift went unnoticed because the pin guard only inspects package.json and the lockfile, never workflow files. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * build(docker): generate crontabs from vercel.json vercel.json defines 16 cron jobs; both Docker crontabs carried 9, and were byte identical to each other. Self hosted deployments therefore never sent recurring invoices, never dispatched webhooks and never cleaned up idempotency keys. tax-deadlines also ran once a year on 2 January instead of daily, and documents/verify weekly instead of daily. Extension crons are included rather than excluded. The Dockerfile copies the whole tree before building, so every extension cron route is compiled into the image regardless of the enabled preset, and each returns 200 when its extension is unconfigured, so curl -sf logs no failure. Two such entries were already present in the crontab for extensions absent from the preset, which settles the intent. documents/verify is treated as drift rather than a self hosted concession: the weekly cadence was present in the hosted crontab too, and the run is capped at 200 documents walking a nulls-first queue, so weekly drains the integrity queue seven times slower on a check that exists for BFL retention. webhooks/dispatch keeps its per minute cadence, adding 1,440 requests a day on self hosted. A gentler tick would silently stretch the first retry, since the retry ladder opens at 60 seconds. SCHEDULE_OVERRIDES is the one line place to change that. A parity test asserts the path sets match minus a documented exclusion list, and ratchets three cron routes that are currently scheduled nowhere so they are named rather than silently rotting. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * chore(observability): add a provider agnostic error sink There is no error tracking in this codebase: logs go to console and Vercel retention and nowhere else, nothing alerts on the 16 cron jobs, and seven code comments across lib, app, components and extensions asserted that Sentry captures errors when Sentry is not a dependency. The two most recent bug fixes on this repo were both discovered by customer email. This adds the sink, not a vendor. No dependency is taken: the interface has a no-op default and a registration point, so behaviour is unchanged until an adapter is registered. Releases are tagged from the build id already inlined by next.config.ts. Redaction moved out of lib/logger.ts into a leaf module that both the logger and the sink import, so there is one denylist and no path from application data to a third party can skip the personnummer regex, including direct sink calls that bypass the logger. That matters here because these logs carry personnummer and financial data. verifyCronSecret now reports its own 401s, which covers all 16 jobs without touching a route file and catches the case where CRON_SECRET is rotated without updating the scheduler and every job silently 401s forever. The threshold is one failure rather than the backup alert's three: suppressing the first occurrence is precisely how an outage stays invisible. The seven misleading comments are corrected to describe what the code actually does, including the two cases that still are not covered: the client side one, since the sink is server side, and a warn level call that is not forwarded. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix: remediate the 2026-07-26 similar-sweep findings across all surfaces Resolves the ~150-finding sweep (dev_docs/similar-sweep-2026-07-26.md) with one agent per finding; every behavioural fix carries a regression test proven to fail at HEAD. Full status, corrections to the sweep, refusals and open decisions in dev_docs/similar-sweep-2026-07-26-remediation-status.md. Structural roots closed: - resolveSekAmountOrNull(): honest SEK resolution refuses instead of booking 1:1; four duplicated toSek closures now refuse via INVOICE_FX_RATE_MISSING - ledger-line-amount.ts: journal_entry_lines.currency labels the document, not the amount; SQL pre-filter decoy proven and fixed - sparse-patch.ts: .partial() does not strip .default() in Zod 4.4.3; the exploitable salary payslip-line PATCH and KPI preferences sinks fixed - tests/schema: migration-replay phantom-column guard (13k+ refs, closed CHECK sets, onConflict targets); found 28 real defects, all fixed, all four baselines now empty - three new ratchet guards: sek-labelled-amount, cross-extension-import, ungated-extension-route Highlights: lawful VAT-rate set on all seven invoice surfaces (ML 6 kap), RC input VAT mismatch wired on web + both MCP callers, missing-underlag resource delegates to the shared RPC predicate, push-notifications consent polarity fail-closed, deadlines undo honours requested state, silent-failure and read-side-fabrication classes fixed across settings/KPI/inbox/Stripe/ Arcim/kassaflodesanalys, error-envelope stringification fixed at 10+ sites with isSwedishUserMessage extended. Also includes the parallel session's MCP invoice tools (update_invoice, recurring schedules, invoice deliveries) which share files with the sweep work and are verified green together. 13 new migrations are NOT applied anywhere; they apply via branch merge. 20260726120000 backfills 1247 supplier-invoice rows. pg tests for new DDL are written but unrun (no local Postgres). Verified: 11088 tests / 881 files green, tsc 0 non-test errors, lint 0 errors, check:guards passing, MCP payload 57475/57500. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(migrations): rename replace_sie_import migration off main's 20260726090000 version origin/main shipped 20260726090000_agent_quota_rpc_caller_guard.sql; keeping our replace_sie_import migration on the same version would abort the Supabase apply with a schema_migrations_pkey duplicate at merge time. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): remediate pre-publish deep-review findings across all slices A 13-agent review of the full branch diff surfaced 1 critical, 5 high and ~45 further findings; this commit resolves them in one pass: - replace_sie_import / undo_sie_import: p_user_id honored only for service_role callers; any other caller is pinned to auth.uid() (impersonation gate bypass), authz raise errcode 42501 mapped to a Swedish 403 in the route, new caller-guard migration for undo - bulk_book_transactions refuses homogeneous non-SEK batches instead of writing foreign magnitudes into SEK ledger columns - credit-note cap trigger: company-match on credited_invoice_id, no cross-tenant figures in exception text - link_voucher RPCs resolve NULL invoice currency as SEK end to end - personal-number ciphertext CHECK split into NOT VALID + VALIDATE - same-currency foreign settlements clear 1510 at booking rate and book realized diff to 3960/7960; rate-less foreign write paths refuse - receivables revaluation covers partially_paid and outstanding amounts - period lock guard paginates candidates past the PostgREST 1000 cap - documents: service-client storage removals after authz, dual-layout reads in integrity cron and archive export, backfill delete-source sweep actually deletes with hash verification and shared-key grouping - invoice matching normalizes NULL/lowercase currencies (regression), duplicate candidates stop claiming amount matches they never ran - match-invoice aborts on any booking failure (no paid-without-verifikat) - refresh-exchange-rate reverts on concurrent booking (TOCTOU window) - KPI preferences upsert arbiter aligned to the company-scoped constraint - personnummer_last4 stripped from all salary responses incl. MCP tools - worked-hours batch restores destroyed rows on conflict and error paths - MCP: shared duplicate-claim builder (no more 'null kr'), short-circuit on tag_journal_lines overflow, auto_send schedules stage as high risk - observability sink redacts emails/IBANs/API keys and keeps redacted stacks in prod; assorted small guards (safe-return-to /@, dry_run=True, cursor helper off-by-one, OAuth state TTL 10 min, arcim saveMappings call removed) Full dispositions, deferred items and hand-verified accounting numbers are documented in the PR body and DECISIONS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(personnummer): implement masking and encryption for personal numbers with tests * fix(review): address CI and compliance-bot findings for PR #1215 pg-real: the CI image's auth shim reads the legacy request.jwt.claim.role GUC, so both service-role simulations (runAsServiceRole and the invoice-delivery test's local helper) never satisfied auth.role() = 'service_role' and every legitimate p_user_id path failed closed; the shared helper now sets both GUC shapes plus SET LOCAL ROLE with a fail-loud sanity check, and the delivery test reuses it. The link-voucher migration had recreated both RPCs from pre-rewrite file text, reintroducing the NULL-unsafe membership pattern the null-safe-tenant-guards ratchet bans; both guards now use public.caller_is_company_member() with all currency changes preserved. Compliance bots: the customers export now emits the standard masked form instead of raw AES-256-GCM ciphertext in the Org-/personnummer column, and maskCustomerRow returns a non-round-trippable placeholder on decrypt failure instead of 500ing the list. MCP parity: gnubok_lock_period's staging pre-check now runs the exact countUnbookedInPeriod the commit path enforces (exported from period-service; local mirror deleted), and gnubok_agi_status resolves AGI state run-scoped so a correction run no longer renders as already filed. Declined with evidence: PR-Agent's opening-balances null-zeroing concern (all mergeable columns are NOT NULL with defaults per 20260713101000). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): address codex review findings on PR #1215 - restore 20260726140000 to its preview-recorded content and restate the NULL-safe tenant guard under 20260727130000: a recorded migration version never re-runs, so the in-place edit could not reach the preview branch - replace toFixed() with sv-SE two-decimal formatting in the ROT/RUT cap warning texts and update the pinned test expectations - drop the em dash in the fiscal-periods route comment - strip trailing whitespace in import-existing.test.ts Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(reports): raise timeout on real PDF render tests renderToBuffer does real @react-pdf layout work and exceeds the 5s default when the full suite saturates the CPU; tests pass in isolation. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): remediate the 2026-07-27 compliance and security review findings - ROT/RUT deduction base is arbetskostnaden INKLUSIVE moms (HUSFL 2009:194 6-9 par.): computeDeduction takes the line vat_rate, all five call sites pass it, and tests pin Skatteverkets worked example (18 000 kr excl = 22 500 incl, ROT 6 750). - Momsdeklaration: new SALES_OUTPUT_VAT_SHORTFALL warning catches output VAT short of the reported sales base (one-directional, never filing-blocking). - SIE import: #RAR records validated for every year index (dates, ordering, 18-month BFL cap as warn-and-keep). - build-invoice-write: SEK invoices populate the *_sek twin columns (rate 1) so both creation paths produce the same row shape. - CI: daily Trivy SCA scan of the npm lockfile (replaces removed Dependabot); compliance review fails loudly on empty review.md. - arcim migration FX logging routed through the redacting structured logger. - docs/security/: authorization policy for the SIE bulk-delete RPC pair and the observability redaction contract. - Rewrote the swedish-payroll ob-overtime reference (was a byte-identical copy of sick-pay.md); skills:generate emitted the atom-body seed migration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
950 lines
37 KiB
TypeScript
950 lines
37 KiB
TypeScript
import { createJournalEntry, findFiscalPeriod } from './engine'
|
|
import { resolveSekAmountOrNull, buildCurrencyMetadata } from './currency-utils'
|
|
import { resolveBookingAccount } from './accruals/account-suggestions'
|
|
import {
|
|
coerceDimensionsBag,
|
|
dimensionsBagKey,
|
|
mergeDimensionBags,
|
|
type LineDimensions,
|
|
} from './dimension-resolver'
|
|
import { generateSalesVatLines } from './vat-entries'
|
|
import { getVatTreatmentForRate } from '@/lib/invoices/vat-rules'
|
|
import { computeDeduction } from '@/lib/invoices/rot-rut-rules'
|
|
import { createLogger } from '@/lib/logger'
|
|
import { roundOre } from '@/lib/money'
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type {
|
|
CreateJournalEntryInput,
|
|
CreateJournalEntryLineInput,
|
|
EntityType,
|
|
Invoice,
|
|
InvoiceItem,
|
|
JournalEntry,
|
|
VatTreatment,
|
|
} from '@/types'
|
|
|
|
const log = createLogger('invoice-entries')
|
|
|
|
/**
|
|
* Stable code for the "foreign-currency customer invoice without a rate"
|
|
* refusal. Registered in lib/errors/structured-errors.ts so REST routes, the
|
|
* MCP server and getErrorMessage() all translate it the same way.
|
|
*
|
|
* Sales-side twin of SI_FX_RATE_MISSING (supplier-invoice-entries.ts).
|
|
*/
|
|
export const INVOICE_FX_RATE_MISSING = 'INVOICE_FX_RATE_MISSING' as const
|
|
|
|
/**
|
|
* Raised when an invoice booking path is asked to translate a foreign-currency
|
|
* amount that has no usable exchange rate.
|
|
*
|
|
* The generators below derive every FX leg from the per-item amounts, and items
|
|
* carry no `*_sek` column: `exchange_rate` is the only SEK source they have. The
|
|
* old per-file fallback returned the RAW foreign amount, and because the 1510
|
|
* debit is derived from the sum of the credits on the FX branch, every leg was
|
|
* scaled by the same wrong factor: the verifikation still balanced, no DB
|
|
* trigger fired and nothing errored. A 1 000 EUR sale posted 1 000 kr to 3001
|
|
* and 250 kr to 2611 instead of 11 500 kr and 2 875 kr at 11,50 SEK/EUR,
|
|
* understating ruta 05 and ruta 10 of the momsdeklaration by the same amount:
|
|
* an oriktig uppgift exposed to skattetillägg under SFL 49 kap 4 §.
|
|
*
|
|
* Refusing instead of guessing follows the `match_batch_allocate` RPC
|
|
* (BATCH_FX_RATE_MISSING) and `toSekOrThrow()` in supplier-invoice-entries.ts.
|
|
*
|
|
* The same refusal covers the header-level fallbacks (no-items bookings and
|
|
* the payment entry) via `headerToSekOrThrow` below: those paths DO honour a
|
|
* populated `*_sek` column, so only rows with no SEK source at all refuse.
|
|
*/
|
|
export class InvoiceFxRateMissingError extends Error {
|
|
readonly code = INVOICE_FX_RATE_MISSING
|
|
constructor(public readonly currency: string) {
|
|
super(
|
|
`Invoice is in ${currency} but has no exchange rate on file; refusing to post it as if 1 ${currency} = 1 SEK.`
|
|
)
|
|
this.name = 'InvoiceFxRateMissingError'
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Convert an invoice-currency item amount to SEK for a journal entry line.
|
|
*
|
|
* SEK invoices short-circuit exactly as before, and so does any invoice with a
|
|
* legitimately supplied positive rate: the only new behaviour is the refusal
|
|
* above when a foreign invoice reaches a booking path with no rate at all.
|
|
* `amountSek` is deliberately null: an InvoiceItem has no per-item SEK column,
|
|
* so the rate is the only honest source at item granularity.
|
|
*/
|
|
function itemToSekOrThrow(
|
|
amount: number,
|
|
currency: string | null | undefined,
|
|
exchangeRate: number | null | undefined
|
|
): number {
|
|
const sek = resolveSekAmountOrNull(amount, null, currency, exchangeRate)
|
|
if (sek === null) throw new InvoiceFxRateMissingError(currency || 'okänd valuta')
|
|
return sek
|
|
}
|
|
|
|
/**
|
|
* Convert an invoice-level (header) amount to SEK for a journal entry line.
|
|
*
|
|
* Same refusal contract as `itemToSekOrThrow`, but honours a pre-computed
|
|
* `*_sek` column when the row carries one: header amounts (subtotal /
|
|
* vat_amount / total) have SEK twins that items lack. Rows that DO carry a
|
|
* `*_sek` value or a usable rate convert exactly as before; only the "foreign
|
|
* amount with no SEK source at all" case changes, from silently relabelling
|
|
* the foreign number as kronor (the lenient `resolveSekAmount` ladder, which
|
|
* currency-utils marks READ-ONLY CODE ONLY) to the same INVOICE_FX_RATE_MISSING
|
|
* refusal the item-driven generators raise. Without this, a rate-less foreign
|
|
* invoice booked through a caller without hydrated items posted its raw
|
|
* foreign number as kronor (1 250 EUR → 1 250 kr on 1510): balanced, so no
|
|
* trigger fired, and undetectable downstream.
|
|
*/
|
|
function headerToSekOrThrow(
|
|
amount: number,
|
|
amountSek: number | null | undefined,
|
|
currency: string | null | undefined,
|
|
exchangeRate: number | null | undefined
|
|
): number {
|
|
const sek = resolveSekAmountOrNull(amount, amountSek, currency, exchangeRate)
|
|
if (sek === null) throw new InvoiceFxRateMissingError(currency || 'okänd valuta')
|
|
return sek
|
|
}
|
|
|
|
/**
|
|
* Build the invoice identifier used in line_description. Prefers the assigned
|
|
* invoice number; falls back to a draft tag with the first 8 chars of the
|
|
* invoice UUID so the verifikation still identifies *vad affärshändelsen avser*
|
|
* per BFL 5 kap 6§ p.3 even if a journal entry is somehow created against an
|
|
* unnumbered invoice. The send path always assigns a number first, so this
|
|
* fallback is defensive, but it leaves no ambiguity if a future caller skips
|
|
* ensureInvoiceNumber.
|
|
*/
|
|
function invoiceTag(invoice: Pick<Invoice, 'id' | 'invoice_number'>): string {
|
|
return invoice.invoice_number ?? `utkast ${invoice.id.slice(0, 8)}`
|
|
}
|
|
|
|
/**
|
|
* Build a BFL-compliant verifikation description with event type and counterparty.
|
|
* Falls back to prefix + invoiceNumber if name is not provided (backward compat).
|
|
*/
|
|
function buildInvoiceDescription(
|
|
prefix: string, invoiceNumber: string | null, counterpartyName?: string,
|
|
invoiceId?: string,
|
|
): string {
|
|
const tag = invoiceNumber ?? (invoiceId ? `utkast ${invoiceId.slice(0, 8)}` : null)
|
|
const tagPart = tag ? ` ${tag}` : ''
|
|
return counterpartyName
|
|
? `${prefix}${tagPart}, ${counterpartyName}`
|
|
: `${prefix}${tagPart}`
|
|
}
|
|
|
|
/**
|
|
* Group invoice items by VAT rate and generate per-rate revenue + VAT lines.
|
|
* Returns credit lines only (revenue + VAT). The caller adds the debit side.
|
|
*
|
|
* options.deferAccruals: substitute the 29xx interim account for lines with a
|
|
* periodisering period. Only the callers that also create/cancel accrual
|
|
* schedules may pass true (invoice entry + credit note): the cash-method
|
|
* entry books revenue directly even if a line carries stale accrual fields,
|
|
* since no schedule would ever dissolve the interim balance.
|
|
*
|
|
* options.defaultDimensions (dimensions PR7): the invoice-level bag. Revenue
|
|
* lines carry item.dimensions merged over it (item wins per key): the merged
|
|
* bag is part of the aggregation identity, so two items on the same
|
|
* rate+account but different tags stay on separate lines. VAT lines carry
|
|
* the default only (the VAT account is a function of the treatment, never of
|
|
* a specific item).
|
|
*/
|
|
function generatePerRateLines(
|
|
items: InvoiceItem[],
|
|
invoiceVatTreatment: VatTreatment,
|
|
entityType: EntityType,
|
|
invoiceTagText: string,
|
|
currency?: string | null,
|
|
exchangeRate?: number | null,
|
|
options?: { deferAccruals?: boolean; defaultDimensions?: LineDimensions }
|
|
): CreateJournalEntryLineInput[] {
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = currency != null && currency !== 'SEK'
|
|
|
|
// Free-text / blank rows carry no amounts and never book: drop them before
|
|
// grouping so they can't produce a zero-amount revenue line.
|
|
items = items.filter((item) => item.line_type !== 'text')
|
|
|
|
// Helper: convert item amount to SEK when dealing with foreign currency.
|
|
// Refuses (InvoiceFxRateMissingError) rather than relabelling the foreign
|
|
// number as kronor: see itemToSekOrThrow above.
|
|
const toSek = (amount: number): number =>
|
|
itemToSekOrThrow(amount, currency, exchangeRate)
|
|
|
|
// Check if items have per-line vat_rate set (new invoices)
|
|
const hasPerLineVat = items.some((item) => item.vat_rate !== undefined && item.vat_rate !== null)
|
|
|
|
if (!hasPerLineVat) {
|
|
// Legacy fallback: single rate from invoice level. All items collapse
|
|
// into one revenue line, so only the invoice default can apply here:
|
|
// legacy rows predate per-item tagging anyway.
|
|
const revenueAccount = getRevenueAccount(invoiceVatTreatment, entityType)
|
|
const subtotal = items.reduce((sum, item) => sum + item.line_total, 0)
|
|
const subtotalSek = toSek(subtotal)
|
|
lines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
|
|
const totalVat = items.reduce((sum, item) => sum + (item.vat_amount || 0), 0)
|
|
if (totalVat > 0) {
|
|
if (isForeign) {
|
|
// For foreign currency, compute VAT in SEK directly
|
|
const vatSek = toSek(totalVat)
|
|
const vatAccount = getOutputVatAccount(invoiceVatTreatment)
|
|
lines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
} else {
|
|
const vatLines = generateSalesVatLines({
|
|
vatTreatment: invoiceVatTreatment,
|
|
baseAmount: subtotal,
|
|
direction: 'sales',
|
|
})
|
|
lines.push(...vatLines.map((line) => ({
|
|
...line,
|
|
dimensions: options?.defaultDimensions,
|
|
})))
|
|
}
|
|
}
|
|
return lines
|
|
}
|
|
|
|
// Group items by vat_rate (preserve first-seen rate order). Within each rate,
|
|
// sub-group revenue by the resolved BAS account + merged dimensions bag so a
|
|
// per-line/article account override (or a per-item dimension tag) produces
|
|
// its own credit line. VAT stays aggregated per rate (the VAT account is a
|
|
// function of the treatment, never of the revenue override).
|
|
type RevenueBucket = {
|
|
account: string
|
|
dimensions?: LineDimensions
|
|
subtotal: number
|
|
}
|
|
type RateGroup = {
|
|
vatAmount: number
|
|
// account + dims bag -> bucket (first-seen order)
|
|
buckets: Map<string, RevenueBucket>
|
|
}
|
|
const rateGroups = new Map<number, RateGroup>()
|
|
|
|
for (const item of items) {
|
|
const rate = item.vat_rate ?? 0
|
|
const treatment = rate === 0 && (invoiceVatTreatment === 'reverse_charge' || invoiceVatTreatment === 'export')
|
|
? invoiceVatTreatment
|
|
: getVatTreatmentForRate(rate)
|
|
// reverse_charge / export force the statutory revenue account (3308/3305);
|
|
// a per-line override only applies to ordinary domestic rates so EU/export
|
|
// sales keep landing in the right VAT-declaration ruta.
|
|
const isSpecialTreatment = treatment === 'reverse_charge' || treatment === 'export'
|
|
const plAccount = !isSpecialTreatment && item.revenue_account
|
|
? item.revenue_account
|
|
: getRevenueAccount(treatment, entityType)
|
|
// Periodiserade lines credit the 29xx interim account (förutbetalda
|
|
// intäkter) instead of revenue; the schedule dissolves it monthly. Output
|
|
// VAT below is untouched. Moms is never deferred. Special treatments are
|
|
// never deferred (ruta 39/40 must reflect the full period's sales).
|
|
const account = isSpecialTreatment || !options?.deferAccruals
|
|
? plAccount
|
|
: resolveBookingAccount('revenue', item, plAccount)
|
|
|
|
const dimensions = mergeDimensionBags(options?.defaultDimensions, item.dimensions)
|
|
const bucketKey = `${account}\u0000${dimensionsBagKey(dimensions)}`
|
|
|
|
const group = rateGroups.get(rate) ?? { vatAmount: 0, buckets: new Map<string, RevenueBucket>() }
|
|
group.vatAmount += item.vat_amount || 0
|
|
const bucket = group.buckets.get(bucketKey) ?? { account, dimensions, subtotal: 0 }
|
|
bucket.subtotal += item.line_total
|
|
group.buckets.set(bucketKey, bucket)
|
|
rateGroups.set(rate, group)
|
|
}
|
|
|
|
// Generate revenue + VAT lines per rate group.
|
|
for (const [rate, group] of rateGroups) {
|
|
const treatment = rate === 0 && (invoiceVatTreatment === 'reverse_charge' || invoiceVatTreatment === 'export')
|
|
? invoiceVatTreatment
|
|
: getVatTreatmentForRate(rate)
|
|
|
|
// The rate-level rounded subtotal is the balance anchor: identical to the
|
|
// pre-override single-account behaviour. When a rate splits across multiple
|
|
// buckets (account and/or dimensions), distribute that exact total so
|
|
// independent per-bucket rounding can never introduce a 1-öre imbalance
|
|
// against the 1510 debit: every bucket but the last rounds normally; the
|
|
// last absorbs the remainder.
|
|
const rateSubtotalSek = Math.round(
|
|
toSek(Array.from(group.buckets.values()).reduce((sum, b) => sum + b.subtotal, 0)) * 100
|
|
) / 100
|
|
|
|
const buckets = Array.from(group.buckets.values())
|
|
let allocated = 0
|
|
buckets.forEach((bucket, idx) => {
|
|
const isLast = idx === buckets.length - 1
|
|
const credit = isLast
|
|
? Math.round((rateSubtotalSek - allocated) * 100) / 100
|
|
: Math.round(toSek(bucket.subtotal) * 100) / 100
|
|
allocated = Math.round((allocated + credit) * 100) / 100
|
|
lines.push({
|
|
account_number: bucket.account,
|
|
debit_amount: 0,
|
|
credit_amount: credit,
|
|
line_description: `Försäljning faktura ${invoiceTagText}`,
|
|
dimensions: bucket.dimensions,
|
|
})
|
|
})
|
|
|
|
const roundedVat = Math.round(toSek(group.vatAmount) * 100) / 100
|
|
if (roundedVat !== 0) {
|
|
const vatAccount = getOutputVatAccount(treatment)
|
|
lines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: 0,
|
|
credit_amount: roundedVat,
|
|
line_description: `Utgående moms ${rate}% faktura ${invoiceTagText}`,
|
|
dimensions: options?.defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
return lines
|
|
}
|
|
|
|
/**
|
|
* Generate ROT/RUT-avdrag debit lines from invoice items.
|
|
*
|
|
* For each item flagged with `deduction_type`, produces a debit on BAS 1513
|
|
* (Övriga kortfristiga fordringar, Skatteverket) for the computed
|
|
* deduction amount. The caller must REDUCE the 1510 debit (kundfordringar)
|
|
* by the same total: the customer only owes the post-deduction amount;
|
|
* Skatteverket pays the rest via Husavdragstjänsten. Returns both the
|
|
* lines and the total so callers can apply both adjustments atomically.
|
|
*
|
|
* Foreign-currency invoices: ROT/RUT-avdrag is a Sweden-only rule, so
|
|
* receivables on 1513 are always recorded in SEK. We use the same SEK
|
|
* conversion as the rest of the entry (the shared itemToSekOrThrow helper, so
|
|
* this function and generatePerRateLines cannot drift).
|
|
*/
|
|
function generateRotRutLines(
|
|
items: InvoiceItem[],
|
|
invoiceTagText: string,
|
|
currency?: string | null,
|
|
exchangeRate?: number | null,
|
|
defaultDimensions?: LineDimensions,
|
|
side: 'debit' | 'credit' = 'debit',
|
|
): { lines: CreateJournalEntryLineInput[]; totalSek: number } {
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
|
|
// Same refusal as generatePerRateLines: 1513 is a kronor receivable on
|
|
// Skatteverket, so an unconvertible foreign amount must not land there.
|
|
const toSek = (amount: number): number =>
|
|
itemToSekOrThrow(amount, currency, exchangeRate)
|
|
|
|
let totalSek = 0
|
|
|
|
for (const item of items) {
|
|
if (!item.deduction_type) continue
|
|
// Recompute server-side to defend against tampered client values.
|
|
const amount = computeDeduction({
|
|
unit_price: side === 'credit' ? Math.abs(item.unit_price) : item.unit_price,
|
|
quantity: side === 'credit' ? Math.abs(item.quantity) : item.quantity,
|
|
deduction_type: item.deduction_type,
|
|
vat_rate: item.vat_rate,
|
|
})
|
|
if (amount <= 0) continue
|
|
const amountSek = Math.round(toSek(amount) * 100) / 100
|
|
if (amountSek <= 0) continue
|
|
totalSek += amountSek
|
|
const kind = item.deduction_type === 'rot' ? 'ROT' : 'RUT'
|
|
lines.push({
|
|
account_number: '1513',
|
|
debit_amount: side === 'debit' ? amountSek : 0,
|
|
credit_amount: side === 'credit' ? amountSek : 0,
|
|
line_description: side === 'credit'
|
|
? `${kind}-avdrag kreditfaktura ${invoiceTagText}`
|
|
: `${kind}-avdrag faktura ${invoiceTagText}`,
|
|
// Per-item line: carries the item's merged bag like its revenue line.
|
|
dimensions: mergeDimensionBags(defaultDimensions, item.dimensions),
|
|
})
|
|
}
|
|
|
|
return { lines, totalSek: Math.round(totalSek * 100) / 100 }
|
|
}
|
|
|
|
/**
|
|
* Create journal entry when an invoice is created (status != draft)
|
|
*
|
|
* Supports mixed VAT rates per line item. Groups items by vat_rate
|
|
* and creates separate revenue + VAT lines per rate.
|
|
*
|
|
* Standard domestic invoice (25% VAT):
|
|
* Debit 1510 Kundfordringar [total incl VAT]
|
|
* Credit 30xx Försäljning [subtotal per rate]
|
|
* Credit 26xx Utgående moms [vat per rate]
|
|
*
|
|
* EU reverse charge:
|
|
* Debit 1510 Kundfordringar [subtotal]
|
|
* Credit 3308 Försäljning tjänst EU [subtotal]
|
|
*
|
|
* Export (non-EU):
|
|
* Debit 1510 Kundfordringar [subtotal]
|
|
* Credit 3305 Försäljning tjänst Export [subtotal]
|
|
*/
|
|
export async function createInvoiceJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
/**
|
|
* Overrides for non-standard sales that still book identically to a customer
|
|
* invoice. Used by self-billing received (mottagen självfaktura): the
|
|
* verifikation should read "Självfaktura <external number>" rather than
|
|
* "Kundfaktura <our number>", and the number tag must be the counterparty's
|
|
* external number because the row has no own `invoice_number`.
|
|
*
|
|
* customLines: user-edited rows from the send dialog. Booked verbatim
|
|
* (caller validates balance); line generation is skipped entirely.
|
|
*/
|
|
options?: {
|
|
descriptionPrefix?: string
|
|
numberOverride?: string | null
|
|
customLines?: CreateJournalEntryLineInput[]
|
|
}
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, invoice.invoice_date)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for invoice date:', invoice.invoice_date)
|
|
return null
|
|
}
|
|
|
|
if (options?.customLines && options.customLines.length > 0) {
|
|
return createJournalEntry(supabase, companyId, userId, {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: invoice.invoice_date,
|
|
description: buildInvoiceDescription(
|
|
options?.descriptionPrefix ?? 'Kundfaktura',
|
|
options?.numberOverride ?? invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
),
|
|
source_type: 'invoice_created',
|
|
source_id: invoice.id,
|
|
lines: options.customLines,
|
|
})
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = invoice.currency !== 'SEK'
|
|
const tag = options?.numberOverride ?? invoiceTag(invoice)
|
|
// Dimensions PR7: the invoice default rides every generated line; item bags
|
|
// merge over it inside generatePerRateLines/generateRotRutLines.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// Credit lines: revenue + VAT per rate group (compute first to guarantee balance)
|
|
const creditLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (invoice.items && invoice.items.length > 0) {
|
|
creditLines.push(...generatePerRateLines(
|
|
invoice.items, invoice.vat_treatment, entityType, tag,
|
|
invoice.currency, invoice.exchange_rate,
|
|
// Schedules are created right after this entry commits (send/mark-sent
|
|
// flows), so deferring to 29xx here is safe.
|
|
{ deferAccruals: true, defaultDimensions }
|
|
))
|
|
} else {
|
|
// Fallback: no items available, use invoice-level amounts. Strict
|
|
// conversion: a rate-less foreign header must refuse exactly like the
|
|
// item-driven path, not post the raw foreign number as kronor.
|
|
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
|
|
const subtotalSek = headerToSekOrThrow(invoice.subtotal, invoice.subtotal_sek, invoice.currency, invoice.exchange_rate)
|
|
|
|
creditLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (invoice.vat_amount > 0) {
|
|
if (isForeign) {
|
|
const vatSek = headerToSekOrThrow(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: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
} else {
|
|
const vatLines = generateSalesVatLines({
|
|
vatTreatment: invoice.vat_treatment,
|
|
baseAmount: invoice.subtotal,
|
|
direction: 'sales',
|
|
})
|
|
creditLines.push(...vatLines.map((line) => ({
|
|
...line,
|
|
dimensions: defaultDimensions,
|
|
})))
|
|
}
|
|
}
|
|
}
|
|
|
|
// ROT/RUT-avdrag debit lines (1513 Skatteverket). When present, they
|
|
// reduce the 1510 debit by the same total so the verifikation stays
|
|
// balanced (debits 1510 + 1513 = credits revenue + VAT). The customer
|
|
// only owes the post-deduction amount; Skatteverket pays the rest.
|
|
const rotRut = invoice.items && invoice.items.length > 0
|
|
? generateRotRutLines(invoice.items, tag, invoice.currency, invoice.exchange_rate, defaultDimensions)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Debit: Kundfordringar, balance guarantee: debit = sum of all credit
|
|
// lines MINUS the ROT/RUT total which goes to 1513 instead.
|
|
const totalCredits = creditLines.reduce((sum, l) => sum + l.credit_amount, 0)
|
|
const debitAmount = isForeign
|
|
? Math.round(totalCredits * 100) / 100
|
|
: headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
const arAmount = Math.round((debitAmount - rotRut.totalSek) * 100) / 100
|
|
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: arAmount,
|
|
credit_amount: 0,
|
|
line_description: `Faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
...buildCurrencyMetadata(invoice.currency, isForeign ? invoice.total : undefined, invoice.exchange_rate),
|
|
})
|
|
|
|
lines.push(...rotRut.lines)
|
|
lines.push(...creditLines)
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: invoice.invoice_date,
|
|
description: buildInvoiceDescription(
|
|
options?.descriptionPrefix ?? 'Kundfaktura',
|
|
options?.numberOverride ?? invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
),
|
|
source_type: 'invoice_created',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry when an invoice is marked as paid
|
|
*
|
|
* Debit 1930 Företagskonto [total]
|
|
* Credit 1510 Kundfordringar [total]
|
|
*
|
|
* `settlementAccountNumber` overrides the debit side for payments that land
|
|
* somewhere other than the bank account: e.g. '1686' (Fordringar för
|
|
* kontokort) when a Stripe payment settles into the PSP balance and only
|
|
* reaches 1930 with the later payout.
|
|
*/
|
|
export async function createInvoicePaymentJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
paymentDate: string,
|
|
exchangeRateDifference?: number,
|
|
customerName?: string,
|
|
paymentAmount?: number,
|
|
settlementAccountNumber: string = '1930'
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, paymentDate)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for payment date:', paymentDate)
|
|
return null
|
|
}
|
|
|
|
const isPartial = paymentAmount != null
|
|
const desc = buildInvoiceDescription(
|
|
isPartial ? 'Delbetalning kundfaktura' : 'Inbetalning kundfaktura',
|
|
invoice.invoice_number,
|
|
customerName,
|
|
invoice.id,
|
|
)
|
|
// Dimensions PR7: the payment voucher re-propagates the linked invoice's
|
|
// default bag onto every leg: incl. the FX result lines, so a project's
|
|
// kursvinst/kursförlust stays inside the project P&L.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// When paymentAmount is provided, use it for the 1930/1510 line amounts.
|
|
// Otherwise use the full invoice total (backward compatible). Strict
|
|
// conversion on both: a rate-less foreign payment would otherwise clear
|
|
// 1510 with the raw foreign number relabelled as kronor (balanced against
|
|
// an equally wrong 1930 debit, so nothing downstream could catch it).
|
|
// Rows carrying total_sek or a usable rate convert exactly as before.
|
|
const bookedSekAmount = isPartial
|
|
? headerToSekOrThrow(paymentAmount, null, invoice.currency, invoice.exchange_rate)
|
|
: headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (!isPartial && exchangeRateDifference && exchangeRateDifference !== 0) {
|
|
// Foreign currency with exchange rate difference
|
|
// For receivables: positive diff = gain (received more), negative = loss (received less)
|
|
const actualSekReceived = bookedSekAmount + exchangeRateDifference
|
|
|
|
// Debit: settlement account (bank by default) at actual SEK received
|
|
lines.push({
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: Math.round(actualSekReceived * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: desc,
|
|
})
|
|
|
|
// Credit: Clear kundfordringar at original booked SEK amount
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
line_description: desc,
|
|
})
|
|
|
|
// Exchange rate difference
|
|
if (exchangeRateDifference > 0) {
|
|
// Gain: Credit 3960 (received more than booked)
|
|
lines.push({
|
|
account_number: '3960',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(exchangeRateDifference * 100) / 100,
|
|
line_description: 'Valutakursvinst',
|
|
})
|
|
} else {
|
|
// Loss: Debit 7960 (received less than booked)
|
|
lines.push({
|
|
account_number: '7960',
|
|
debit_amount: Math.round(Math.abs(exchangeRateDifference) * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: 'Valutakursförlust',
|
|
})
|
|
}
|
|
} else {
|
|
// Standard SEK payment or no exchange rate difference
|
|
lines.push(
|
|
{
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
credit_amount: 0,
|
|
line_description: desc,
|
|
},
|
|
{
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: Math.round(bookedSekAmount * 100) / 100,
|
|
line_description: desc,
|
|
}
|
|
)
|
|
}
|
|
|
|
if (defaultDimensions) {
|
|
// Copy per line: a shared bag object would let one line's mutation
|
|
// leak into every other line (same contract as proposal stamping).
|
|
for (const line of lines) line.dimensions = { ...defaultDimensions }
|
|
}
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: paymentDate,
|
|
description: desc,
|
|
source_type: 'invoice_paid',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry for a credit note (reversed version of original invoice entry)
|
|
* Supports per-item VAT rates with reversed debit/credit sides.
|
|
*
|
|
* Debit 30xx Försäljning [subtotal per rate]
|
|
* Debit 26xx Utgående moms [vat per rate]
|
|
* Credit 1510 Kundfordringar [total]
|
|
*/
|
|
export async function createCreditNoteJournalEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
creditNote: Invoice,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
/**
|
|
* Original voucher reference (e.g. "A-42") to embed in the JE description and
|
|
* line-level descriptions. BFL 5 kap. 5 § requires a correction to point back
|
|
* to the corrected verifikation; the invoice number alone is insufficient
|
|
* because it doesn't identify the entry in the verifikationsserie.
|
|
*/
|
|
originalVoucherRef?: string
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, creditNote.invoice_date)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for credit note date:', creditNote.invoice_date)
|
|
return null
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const tag = invoiceTag(creditNote)
|
|
const lineSuffix = originalVoucherRef ? ` (avser ${originalVoucherRef})` : ''
|
|
// Dimensions PR7: the credit note's bag (copied from the original at credit
|
|
// time) so the reversal nets against the same dimension cells in reports.
|
|
const defaultDimensions = coerceDimensionsBag(creditNote.default_dimensions)
|
|
|
|
// Generate reversed revenue + VAT lines per rate group (debit side for credit notes)
|
|
const debitLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (creditNote.items && creditNote.items.length > 0) {
|
|
// Use absolute items for generatePerRateLines, then swap debit/credit
|
|
const creditLines = generatePerRateLines(
|
|
creditNote.items, creditNote.vat_treatment, entityType, tag,
|
|
creditNote.currency, creditNote.exchange_rate,
|
|
// Credit-note items carry the original's accrual fields so the reversal
|
|
// hits the same 29xx interim account; the original's schedule is
|
|
// cancelled/stornoed by the credit flow.
|
|
{ deferAccruals: true, defaultDimensions }
|
|
)
|
|
for (const line of creditLines) {
|
|
debitLines.push({
|
|
...line,
|
|
debit_amount: Math.abs(line.credit_amount),
|
|
credit_amount: Math.abs(line.debit_amount),
|
|
line_description: `Kreditfaktura ${tag}${lineSuffix}`,
|
|
})
|
|
}
|
|
} else {
|
|
// Fallback: invoice-level amounts. Same strict conversion as the
|
|
// createInvoiceJournalEntry fallback: a rate-less foreign credit note
|
|
// must refuse, not reverse the receivable with a mislabelled number.
|
|
const revenueAccount = getRevenueAccount(creditNote.vat_treatment, entityType)
|
|
const absSubtotal = Math.abs(headerToSekOrThrow(creditNote.subtotal, creditNote.subtotal_sek, creditNote.currency, creditNote.exchange_rate))
|
|
const absVat = Math.abs(headerToSekOrThrow(creditNote.vat_amount, creditNote.vat_amount_sek, creditNote.currency, creditNote.exchange_rate))
|
|
|
|
debitLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: absSubtotal,
|
|
credit_amount: 0,
|
|
line_description: `Kreditfaktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (absVat > 0) {
|
|
const vatAccount = getOutputVatAccount(creditNote.vat_treatment)
|
|
debitLines.push({
|
|
account_number: vatAccount,
|
|
debit_amount: absVat,
|
|
credit_amount: 0,
|
|
line_description: `Moms kreditfaktura ${tag}${lineSuffix}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
lines.push(...debitLines)
|
|
|
|
// ROT/RUT reverses the exact receivable split used by the original invoice:
|
|
// 1510 for the customer portion and 1513 for the Skatteverket portion.
|
|
const rotRut = creditNote.items && creditNote.items.length > 0
|
|
? generateRotRutLines(
|
|
creditNote.items,
|
|
tag,
|
|
creditNote.currency,
|
|
creditNote.exchange_rate,
|
|
defaultDimensions,
|
|
'credit',
|
|
)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Credit: Kundfordringar, balance guarantee: 1510 + 1513 equals debits.
|
|
const totalDebits = debitLines.reduce((sum, l) => sum + l.debit_amount, 0)
|
|
const customerReceivable = roundOre(totalDebits - rotRut.totalSek)
|
|
lines.push({
|
|
account_number: '1510',
|
|
debit_amount: 0,
|
|
credit_amount: customerReceivable,
|
|
line_description: `Kreditfaktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
lines.push(...rotRut.lines)
|
|
|
|
const baseDescription = buildInvoiceDescription('Kreditfaktura', creditNote.invoice_number, customerName, creditNote.id)
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: creditNote.invoice_date,
|
|
description: originalVoucherRef
|
|
? `${baseDescription} (avser verifikation ${originalVoucherRef})`
|
|
: baseDescription,
|
|
source_type: 'credit_note',
|
|
source_id: creditNote.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Create journal entry for kontantmetoden (cash method) when payment is received.
|
|
* Supports per-item VAT rates. Revenue + VAT recognised at payment.
|
|
*
|
|
* Debit 1930 Företagskonto [total]
|
|
* Credit 30xx Försäljning [subtotal per rate]
|
|
* Credit 26xx Utgående moms [vat per rate] (if applicable)
|
|
*/
|
|
export async function createInvoiceCashEntry(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
invoice: Invoice,
|
|
paymentDate: string,
|
|
entityType: EntityType = 'enskild_firma',
|
|
customerName?: string,
|
|
settlementAccountNumber: string = '1930'
|
|
): Promise<JournalEntry | null> {
|
|
const fiscalPeriodId = await findFiscalPeriod(supabase, companyId, paymentDate)
|
|
if (!fiscalPeriodId) {
|
|
log.warn('No open fiscal period found for payment date:', paymentDate)
|
|
return null
|
|
}
|
|
|
|
const lines: CreateJournalEntryLineInput[] = []
|
|
const isForeign = invoice.currency !== 'SEK'
|
|
const tag = invoiceTag(invoice)
|
|
// Dimensions PR7: kontantmetoden books revenue at payment, so this IS the
|
|
// producer path for cash-method companies: same merge rules as issuance.
|
|
const defaultDimensions = coerceDimensionsBag(invoice.default_dimensions)
|
|
|
|
// Credit lines: revenue + VAT per rate group (compute first to guarantee balance)
|
|
const creditLines: CreateJournalEntryLineInput[] = []
|
|
|
|
if (invoice.items && invoice.items.length > 0) {
|
|
creditLines.push(...generatePerRateLines(
|
|
invoice.items, invoice.vat_treatment, entityType, tag,
|
|
invoice.currency, invoice.exchange_rate,
|
|
{ defaultDimensions }
|
|
))
|
|
} else {
|
|
// Fallback: invoice-level amounts. Strict conversion, same rationale as
|
|
// the createInvoiceJournalEntry fallback above.
|
|
const revenueAccount = getRevenueAccount(invoice.vat_treatment, entityType)
|
|
const subtotalSek = headerToSekOrThrow(invoice.subtotal, invoice.subtotal_sek, invoice.currency, invoice.exchange_rate)
|
|
|
|
creditLines.push({
|
|
account_number: revenueAccount,
|
|
debit_amount: 0,
|
|
credit_amount: subtotalSek,
|
|
line_description: `Försäljning faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
if (invoice.vat_amount > 0) {
|
|
const vatSek = headerToSekOrThrow(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: 0,
|
|
credit_amount: vatSek,
|
|
line_description: `Utgående moms faktura ${tag}`,
|
|
dimensions: defaultDimensions,
|
|
})
|
|
}
|
|
}
|
|
|
|
// ROT/RUT-avdrag debit lines (1513 Skatteverket). On cash method the
|
|
// bank account (1930) receives only the post-deduction amount in real
|
|
// life; the rest comes from Skatteverket later. We model that by
|
|
// splitting the debit: 1930 = total - deduction, 1513 = deduction.
|
|
const rotRut = invoice.items && invoice.items.length > 0
|
|
? generateRotRutLines(invoice.items, tag, invoice.currency, invoice.exchange_rate, defaultDimensions)
|
|
: { lines: [], totalSek: 0 }
|
|
|
|
// Debit: Företagskonto, balance guarantee: debit = sum of credit lines
|
|
// minus the ROT/RUT total which goes to 1513 instead.
|
|
const totalCredits = creditLines.reduce((sum, l) => sum + l.credit_amount, 0)
|
|
const cashDebit = isForeign
|
|
? Math.round(totalCredits * 100) / 100
|
|
: headerToSekOrThrow(invoice.total, invoice.total_sek, invoice.currency, invoice.exchange_rate)
|
|
const bankAmount = Math.round((cashDebit - rotRut.totalSek) * 100) / 100
|
|
lines.push({
|
|
account_number: settlementAccountNumber,
|
|
debit_amount: bankAmount,
|
|
credit_amount: 0,
|
|
line_description: buildInvoiceDescription('Kontantbetalning kundfaktura', invoice.invoice_number, customerName, invoice.id),
|
|
dimensions: defaultDimensions,
|
|
})
|
|
|
|
lines.push(...rotRut.lines)
|
|
lines.push(...creditLines)
|
|
|
|
const input: CreateJournalEntryInput = {
|
|
fiscal_period_id: fiscalPeriodId,
|
|
entry_date: paymentDate,
|
|
description: buildInvoiceDescription('Kontantbetalning kundfaktura', invoice.invoice_number, customerName, invoice.id),
|
|
source_type: 'invoice_cash_payment',
|
|
source_id: invoice.id,
|
|
lines,
|
|
}
|
|
|
|
return createJournalEntry(supabase, companyId, userId, input)
|
|
}
|
|
|
|
/**
|
|
* Get the appropriate revenue account based on VAT treatment
|
|
*
|
|
* For 'exempt': AB uses 3004 (Försäljning inom Sverige, momsfri),
|
|
* EF uses 3100 (Momsfria intäkter, mapped to R2 in NE engine).
|
|
*/
|
|
export function getRevenueAccount(vatTreatment: VatTreatment, entityType: EntityType = 'enskild_firma'): string {
|
|
switch (vatTreatment) {
|
|
case 'standard_25':
|
|
return '3001' // Försäljning 25%
|
|
case 'reduced_12':
|
|
return '3002' // Försäljning 12%
|
|
case 'reduced_6':
|
|
return '3003' // Försäljning 6%
|
|
case 'reverse_charge':
|
|
return '3308' // Försäljning tjänst EU
|
|
case 'export':
|
|
return '3305' // Försäljning tjänst Export
|
|
case 'exempt':
|
|
return entityType === 'aktiebolag' ? '3004' : '3100'
|
|
default:
|
|
return '3001'
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the output VAT account based on VAT treatment
|
|
*/
|
|
export function getOutputVatAccount(vatTreatment: VatTreatment): string {
|
|
switch (vatTreatment) {
|
|
case 'standard_25':
|
|
return '2611'
|
|
case 'reduced_12':
|
|
return '2621'
|
|
case 'reduced_6':
|
|
return '2631'
|
|
default:
|
|
return '2611'
|
|
}
|
|
}
|