Files
accounted/lib/sales-orders/lines.ts
T
Mattsson 3918ff6620 fix(customers): make country ISO-2 everywhere and check it against the customer type (#2241)
* fix(customers): make country ISO-2 everywhere and check it against the customer type (#2025, #2028)

customers.country and suppliers.country were read as ISO codes by the
periodisk sammanstallning (SKV 5740), Peppol and the provider importers but
written as English names by the customer form and the v1 API, so a correct
German customer produced GERMANY811234567 in the SKV file plus two false
warnings, and an EU customer saved with land Sverige got reverse charge with
nothing objecting until after the invoice was sent.

- lib/vat/country-codes.ts: one helper that normalises codes and the
  Swedish/English names the writers used to store, the country-vs-type
  rule (swedish_business = SE, eu_business = EU member other than SE that
  matches the VAT prefix, non_eu_business = outside the EU), and the
  reverse-charge country gate.
- Writers: customer form and supplier form get a country select; internal
  REST, v1 REST, bulk-create, MCP create/update, CSV/Excel import and the
  provider migration mapper normalise to a code and refuse unknown text;
  the consistency rule is a form error and an API 400
  (CUSTOMER_COUNTRY_MISMATCH on update). An omitted country is SE for
  Swedish types, derived from the VAT prefix for eu_business, required
  for non_eu_business.
- vat-rules.ts: getVatRules and friends take the country as a third
  argument and grant reverse charge only for an EU country other than SE;
  every invoice/sales-order/MCP call site passes customer.country.
- periodisk sammanstallning reads legacy names through the same helper.
- Migration 20260903170000: normalize_country_code() SQL twin, country_raw
  rollback column on both tables, backfill of every non-code row; unknown
  text is left as-is. pg-real test for the function.

Closes #2025, closes #2028

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D5EmmndLyDCmY5NHYAvYkE

* fix(customers): keep reverse charge for defaulted-SE EU rows, gate the country rule on the fields it reads, fix build

Skeptic and CI findings on #2241, one pass:

- Migration step 4: eu_business rows whose country was null or only the old
  writer default (SE) while the VAT number names another EU member take the
  country from the prefix. The pre-2026-09 rules granted reverse charge on
  type + VIES validation alone, so these rows invoiced at 0% and would have
  flipped to 25% on the next invoice. country_raw = '' marks a null origin;
  rollback uses nullif(country_raw, '').
- countryPermitsReverseCharge refuses SE only: a VIES-validated number
  outweighs a non-EU address (Swiss company registered in DE, Monaco with a
  FR number, Northern Ireland XI).
- checkCountryConsistency: an eu_business outside the EU VAT area is
  accepted when the VAT prefix is an EU-trade registration (incl. XI);
  Monaco maps to the FR prefix.
- Internal PATCH, MCP update and the commit executor judge the country rule
  only when customer_type, country or vat_number is part of the update, so
  a contradictory legacy row can still change its email (v1 already did).
- Webshop-order customers get the order's billing country; spreadsheet
  import derives a missing country from the type and flags contradictions
  (parser row error + execute schema refine).
- Build: v1 [id] route typed the existing row through a narrowed alias
  (never) and passed messageSv/messageEn the v1 error context lacks; the
  self-billed customer projection lacked country.
- Checks: regenerated skills/accounted-api (customer example country SE).
- New parity test holds the migration's SQL name table to the TS table.
- DECISIONS.md: correct migration version and the revised rule.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D5EmmndLyDCmY5NHYAvYkE

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-03 18:09:46 +02:00

117 lines
3.6 KiB
TypeScript

import type { Customer, SalesOrderItemInput } from '@/types'
import { getVatRules, getPermittedVatRates } from '@/lib/invoices/vat-rules'
import { computeLineNet } from '@/lib/invoices/line-amounts'
import { roundOre } from '@/lib/money'
/**
* Order-line normalisation + totals.
*
* Same line math as invoices (computeLineNet: net of the percentage
* discount, öre-exact) and the same per-customer VAT gating, so an order
* that saves here always converts into an invoice buildInvoiceWriteData()
* accepts. Order totals are informational (the order never books); the
* invoice recomputes its own totals from the lines it is given.
*/
export interface SalesOrderLineRow {
id?: string
sort_order: number
line_type: 'product' | 'text'
description: string
quantity: number
unit: string
unit_price: number
discount_percent: number
vat_rate: number
line_total: number
article_id: string | null
revenue_account: string | null
dimensions: Record<string, string>
}
export interface SalesOrderTotals {
subtotal: number
vat_amount: number
total: number
}
export type NormalizeLinesResult =
| { ok: true; rows: SalesOrderLineRow[]; totals: SalesOrderTotals }
| { ok: false; code: string; details?: Record<string, unknown> }
export function normalizeSalesOrderLines(
items: SalesOrderItemInput[],
customer: Pick<Customer, 'customer_type' | 'vat_number_validated'> & { country?: string | null },
): NormalizeLinesResult {
const vatRules = getVatRules(customer.customer_type, customer.vat_number_validated, customer.country)
const allowed = new Set(
getPermittedVatRates(customer.customer_type, customer.vat_number_validated, customer.country).map((r) => r.rate),
)
const rows: SalesOrderLineRow[] = []
let subtotal = 0
let vat = 0
for (let index = 0; index < items.length; index++) {
const item = items[index]
if (item.line_type === 'text') {
rows.push({
id: item.id,
sort_order: index,
line_type: 'text',
description: item.description,
quantity: 0,
unit: '',
unit_price: 0,
discount_percent: 0,
vat_rate: 0,
line_total: 0,
article_id: null,
revenue_account: null,
dimensions: {},
})
continue
}
const rate = item.vat_rate !== undefined ? item.vat_rate : vatRules.rate
if (!allowed.has(rate)) {
// Same envelope the invoice builder answers for a rate the customer
// type does not permit (e.g. 25 % to a validated EU business).
return {
ok: false,
code: 'INVOICE_CREATE_VAT_RULE_VIOLATION',
details: {
attemptedRate: rate,
allowedRates: Array.from(allowed),
customerType: customer.customer_type,
line: index,
},
}
}
const discount = item.discount_percent ?? 0
const lineTotal = computeLineNet(item.quantity, item.unit_price, discount)
const lineVat = roundOre((lineTotal * rate) / 100)
subtotal = roundOre(subtotal + lineTotal)
vat = roundOre(vat + lineVat)
rows.push({
id: item.id,
sort_order: index,
line_type: 'product',
description: item.description,
quantity: item.quantity,
unit: item.unit,
unit_price: item.unit_price,
discount_percent: discount,
vat_rate: rate,
line_total: lineTotal,
article_id: item.article_id ?? null,
revenue_account: item.revenue_account ?? null,
dimensions: item.dimensions ?? {},
})
}
return {
ok: true,
rows,
totals: { subtotal, vat_amount: vat, total: roundOre(subtotal + vat) },
}
}