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>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5.1
Claude Fable 5.1
parent
80b87c55fc
commit
3918ff6620
@@ -17,6 +17,12 @@ import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import { eventBus } from '@/lib/events'
|
||||
import { bulkBookMatchedInboxItems, categorizeMatchedTransaction } from '@/lib/transactions/categorize-core'
|
||||
import { getVatRules, getPermittedVatRates } from '@/lib/invoices/vat-rules'
|
||||
import {
|
||||
COUNTRY_CONSISTENCY_MESSAGES,
|
||||
checkCountryConsistency,
|
||||
defaultCountryForParty,
|
||||
normalizeCountryCode,
|
||||
} from '@/lib/vat/country-codes'
|
||||
import { fetchExchangeRate } from '@/lib/currency/riksbanken'
|
||||
import {
|
||||
resolveSupplierInvoiceExchangeRate,
|
||||
@@ -471,6 +477,31 @@ async function commitCreateCustomer(
|
||||
typeof params.payment_terms === 'number' ? params.payment_terms : undefined,
|
||||
)
|
||||
|
||||
// Country: ISO 3166-1 alpha-2, consistent with the type and VAT prefix.
|
||||
// Staging already checked this; re-checked here so a tampered or
|
||||
// pre-2026-09 pending_operations row cannot write a name or a
|
||||
// contradiction (#2025, #2028).
|
||||
const countryParam = typeof params.country === 'string' ? params.country.trim() : ''
|
||||
const country = countryParam
|
||||
? normalizeCountryCode(countryParam)
|
||||
: defaultCountryForParty(params.customer_type as string, (params.vat_number as string) || null)
|
||||
if (!country) {
|
||||
return {
|
||||
error: countryParam
|
||||
? `country "${countryParam}" is not an ISO 3166-1 alpha-2 code or a known country name`
|
||||
: 'country is required for this customer type',
|
||||
status: 400,
|
||||
}
|
||||
}
|
||||
const countryIssue = checkCountryConsistency({
|
||||
partyType: params.customer_type as string,
|
||||
country,
|
||||
vatNumber: (params.vat_number as string) || null,
|
||||
})
|
||||
if (countryIssue) {
|
||||
return { error: COUNTRY_CONSISTENCY_MESSAGES[countryIssue].sv, status: 400 }
|
||||
}
|
||||
|
||||
const { data, error } = await supabase
|
||||
.from('customers')
|
||||
.insert({
|
||||
@@ -487,7 +518,7 @@ async function commitCreateCustomer(
|
||||
address_line1: (params.address as string) || null,
|
||||
postal_code: (params.postal_code as string) || null,
|
||||
city: (params.city as string) || null,
|
||||
country: (params.country as string) || 'Sweden',
|
||||
country,
|
||||
})
|
||||
.select()
|
||||
.single()
|
||||
@@ -536,7 +567,7 @@ async function commitUpdateCustomer(
|
||||
const { customer_id: customerId, changes } = validated
|
||||
const { data: current, error: currentError } = await supabase
|
||||
.from('customers')
|
||||
.select('customer_type')
|
||||
.select('customer_type, country, vat_number')
|
||||
.eq('id', customerId)
|
||||
.eq('company_id', companyId)
|
||||
.maybeSingle()
|
||||
@@ -544,6 +575,22 @@ async function commitUpdateCustomer(
|
||||
if (currentError) return { error: currentError.message, status: 500 }
|
||||
if (!current) return { error: 'Customer not found', status: 404 }
|
||||
|
||||
// Country vs type vs VAT prefix on the row as it will end up (same check
|
||||
// as staging; repeated here as the tamper gate), only when one of the
|
||||
// three is part of the update.
|
||||
const countryRuleTouched =
|
||||
changes.customer_type !== undefined || changes.country !== undefined || changes.vat_number !== undefined
|
||||
const countryIssue = countryRuleTouched
|
||||
? checkCountryConsistency({
|
||||
partyType: changes.customer_type ?? current.customer_type,
|
||||
country: changes.country ?? current.country,
|
||||
vatNumber: changes.vat_number ?? current.vat_number,
|
||||
})
|
||||
: null
|
||||
if (countryIssue) {
|
||||
return { error: COUNTRY_CONSISTENCY_MESSAGES[countryIssue].sv, status: 400 }
|
||||
}
|
||||
|
||||
// personal_number never travels in plaintext: staging validated the input
|
||||
// and stored AES-256-GCM ciphertext under personal_number_encrypted (see
|
||||
// CustomerChangesSchema). Map it onto the customers.personal_number column
|
||||
@@ -1901,14 +1948,14 @@ async function commitCreateInvoice(
|
||||
return { error: 'Customer not found: they may have been deleted.', status: 404 }
|
||||
}
|
||||
|
||||
const vatRules = getVatRules(customer.customer_type, customer.vat_number_validated)
|
||||
const vatRules = getVatRules(customer.customer_type, customer.vat_number_validated, customer.country)
|
||||
// Gate on the PERMITTED set, not the picker default, exactly like
|
||||
// buildInvoiceWriteData: the ML 6 kap. supplies taxed where they are performed
|
||||
// (hotel/restaurang 12%, persontransport and event admission 6%,
|
||||
// fastighetstjänst and korttidsuthyrning 25%) carry Swedish VAT even to a
|
||||
// foreign business customer. The default is still 0% (vatRules.rate is the
|
||||
// fallback below), so a Swedish rate only lands here when staged explicitly.
|
||||
const permittedRates = getPermittedVatRates(customer.customer_type, customer.vat_number_validated)
|
||||
const permittedRates = getPermittedVatRates(customer.customer_type, customer.vat_number_validated, customer.country)
|
||||
const allowedRates = new Set(permittedRates.map((r) => r.rate))
|
||||
|
||||
// VAT registration gate (mirrors app/api/invoices/route.ts). A
|
||||
|
||||
Reference in New Issue
Block a user