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
@@ -4,7 +4,7 @@ import { useMemo, useState } from 'react'
|
||||
import { useForm, Controller } from 'react-hook-form'
|
||||
import { zodResolver } from '@hookform/resolvers/zod'
|
||||
import { z } from 'zod'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { useLocale, useTranslations } from 'next-intl'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
@@ -26,6 +26,12 @@ import {
|
||||
isMaskedPersonalNumber,
|
||||
} from '@/lib/customers/mask-personal-number'
|
||||
import { looksLikeSwedishPersonalNumber } from '@/lib/customers/personal-number-shape'
|
||||
import {
|
||||
COUNTRY_CONSISTENCY_MESSAGES,
|
||||
checkCountryConsistency,
|
||||
getCountryOptions,
|
||||
normalizeCountryCode,
|
||||
} from '@/lib/vat/country-codes'
|
||||
import type { CreateCustomerInput } from '@/types'
|
||||
|
||||
interface CustomerFormProps {
|
||||
@@ -42,6 +48,8 @@ export default function CustomerForm({
|
||||
const { canWrite } = useCanWrite()
|
||||
const { toast } = useToast()
|
||||
const t = useTranslations('form_customer')
|
||||
const locale = useLocale() === 'en' ? 'en' : 'sv'
|
||||
const countryOptions = useMemo(() => getCountryOptions(locale), [locale])
|
||||
const [isValidatingVat, setIsValidatingVat] = useState(false)
|
||||
const [vatValidationResult, setVatValidationResult] = useState<{
|
||||
valid: boolean
|
||||
@@ -61,7 +69,10 @@ export default function CustomerForm({
|
||||
address_line2: z.string().optional(),
|
||||
postal_code: z.string().optional(),
|
||||
city: z.string().optional(),
|
||||
country: z.string().optional(),
|
||||
// ISO 3166-1 alpha-2. A row from before 2026-09 can still carry a name
|
||||
// the backfill could not map; it is shown as-is in the picker and has to
|
||||
// be replaced before the form saves.
|
||||
country: z.string().refine((v) => normalizeCountryCode(v) !== null, t('country_invalid')),
|
||||
org_number: z.string().optional(),
|
||||
vat_number: z.string().optional(),
|
||||
// Accepts a plaintext personnummer or either mask the API returns. The
|
||||
@@ -78,6 +89,23 @@ export default function CustomerForm({
|
||||
default_payment_terms: z.number().min(1).optional(),
|
||||
notes: z.string().optional(),
|
||||
}).superRefine((customer, ctx) => {
|
||||
// Country vs customer type vs VAT prefix (#2025): an EU customer with
|
||||
// land Sverige got reverse charge and nothing objected until the
|
||||
// periodisk sammanställning, after the invoice was sent. The API refuses
|
||||
// the same combinations with a 400; saying it here keeps the fix one
|
||||
// click away instead of one failed save away.
|
||||
const countryIssue = checkCountryConsistency({
|
||||
partyType: customer.customer_type,
|
||||
country: customer.country,
|
||||
vatNumber: customer.vat_number,
|
||||
})
|
||||
if (countryIssue) {
|
||||
ctx.addIssue({
|
||||
code: 'custom',
|
||||
path: ['country'],
|
||||
message: COUNTRY_CONSISTENCY_MESSAGES[countryIssue][locale],
|
||||
})
|
||||
}
|
||||
// A personnummer entered as a business org number would be shown
|
||||
// unmasked in every list (only individual customers are masked).
|
||||
if (
|
||||
@@ -113,7 +141,7 @@ export default function CustomerForm({
|
||||
message: t('invoice_email_too_many', { count: MAX_INVOICE_EMAIL_COPY_RECIPIENTS }),
|
||||
})
|
||||
}
|
||||
}), [t])
|
||||
}), [t, locale])
|
||||
|
||||
type FormData = z.infer<typeof schema>
|
||||
|
||||
@@ -137,7 +165,7 @@ export default function CustomerForm({
|
||||
address_line1: initialData?.address_line1 || '',
|
||||
postal_code: initialData?.postal_code || '',
|
||||
city: initialData?.city || '',
|
||||
country: initialData?.country || 'Sweden',
|
||||
country: normalizeCountryCode(initialData?.country) ?? initialData?.country ?? 'SE',
|
||||
org_number: initialData?.org_number || '',
|
||||
vat_number: initialData?.vat_number || '',
|
||||
personal_number: initialData?.personal_number || '',
|
||||
@@ -149,6 +177,12 @@ export default function CustomerForm({
|
||||
|
||||
const customerType = watch('customer_type')
|
||||
const vatNumber = watch('vat_number')
|
||||
const countryValue = watch('country')
|
||||
// A stored value the picker does not list (an unmapped legacy name, or a
|
||||
// code outside the curated list) still has to be visible, or the field
|
||||
// would look empty while holding something.
|
||||
const countryValueUnlisted =
|
||||
countryValue && !countryOptions.some((option) => option.code === countryValue)
|
||||
// The stored value could not be decrypted. The field is editable (typing a
|
||||
// fresh personnummer replaces it); say so, because the placeholder on its own
|
||||
// reads like a rendering fault.
|
||||
@@ -392,11 +426,34 @@ export default function CustomerForm({
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="country">{t('country_label')}</Label>
|
||||
<Input
|
||||
id="country"
|
||||
placeholder={t('country_placeholder')}
|
||||
{...register('country')}
|
||||
<Controller
|
||||
name="country"
|
||||
control={control}
|
||||
render={({ field }) => (
|
||||
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
||||
<SelectTrigger id="country">
|
||||
<SelectValue placeholder={t('country_placeholder')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{countryValueUnlisted && (
|
||||
<SelectItem value={countryValue}>
|
||||
{normalizeCountryCode(countryValue)
|
||||
? countryValue
|
||||
: t('country_unknown_option', { value: countryValue })}
|
||||
</SelectItem>
|
||||
)}
|
||||
{countryOptions.map((option) => (
|
||||
<SelectItem key={option.code} value={option.code}>
|
||||
{locale === 'en' ? option.nameEn : option.name}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
/>
|
||||
{errors.country && (
|
||||
<p className="text-sm text-destructive">{errors.country.message}</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1155,7 +1155,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
}, 0)
|
||||
|
||||
const vatRules = selectedCustomer
|
||||
? getVatRules(selectedCustomer.customer_type, selectedCustomer.vat_number_validated)
|
||||
? getVatRules(selectedCustomer.customer_type, selectedCustomer.vat_number_validated, selectedCustomer.country)
|
||||
: null
|
||||
|
||||
// Rendered options and the default are deliberately two different sets:
|
||||
|
||||
@@ -33,6 +33,8 @@ import type { CustomerType } from '@/types'
|
||||
export interface VatRateCustomer {
|
||||
customer_type: CustomerType
|
||||
vat_number_validated?: boolean | null
|
||||
/** ISO 3166-1 alpha-2; gates reverse charge together with the two above. */
|
||||
country?: string | null
|
||||
}
|
||||
|
||||
/** One invoice line as the editor's form holds it. */
|
||||
@@ -73,8 +75,8 @@ export function resolveLineVatRates(
|
||||
}
|
||||
}
|
||||
const validated = customer.vat_number_validated ?? false
|
||||
const defaultRates = getAvailableVatRates(customer.customer_type, validated)
|
||||
const options = getPermittedVatRates(customer.customer_type, validated)
|
||||
const defaultRates = getAvailableVatRates(customer.customer_type, validated, customer.country)
|
||||
const options = getPermittedVatRates(customer.customer_type, validated, customer.country)
|
||||
return {
|
||||
options,
|
||||
defaultRates,
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useAccounts } from '@/lib/reference-data/hooks'
|
||||
import { useForm, Controller } from 'react-hook-form'
|
||||
import { zodResolver } from '@hookform/resolvers/zod'
|
||||
import { z } from 'zod'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { useLocale, useTranslations } from 'next-intl'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
@@ -14,6 +14,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
|
||||
import { Loader2, Lock, X } from 'lucide-react'
|
||||
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
||||
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
||||
import { getCountryOptions, normalizeCountryCode } from '@/lib/vat/country-codes'
|
||||
import type { CreateSupplierInput } from '@/types'
|
||||
|
||||
interface SupplierFormProps {
|
||||
@@ -29,6 +30,8 @@ export default function SupplierForm({
|
||||
}: SupplierFormProps) {
|
||||
const { canWrite } = useCanWrite()
|
||||
const t = useTranslations('form_supplier')
|
||||
const locale = useLocale() === 'en' ? 'en' : 'sv'
|
||||
const countryOptions = useMemo(() => getCountryOptions(locale), [locale])
|
||||
// Chart of accounts from the session cache (lib/reference-data): the
|
||||
// konto combobox is populated on the first paint; without the chart it
|
||||
// still accepts a typed 4-digit number.
|
||||
@@ -55,7 +58,9 @@ export default function SupplierForm({
|
||||
address_line2: z.string().optional(),
|
||||
postal_code: z.string().optional(),
|
||||
city: z.string().optional(),
|
||||
country: z.string().optional(),
|
||||
// ISO 3166-1 alpha-2; an unmapped legacy name is shown as-is and has to
|
||||
// be replaced before the form saves.
|
||||
country: z.string().refine((v) => normalizeCountryCode(v) !== null, t('country_invalid')),
|
||||
org_number: z.string().optional(),
|
||||
vat_number: z.string().optional(),
|
||||
bankgiro: z.string().optional(),
|
||||
@@ -76,6 +81,7 @@ export default function SupplierForm({
|
||||
register,
|
||||
handleSubmit,
|
||||
control,
|
||||
watch,
|
||||
formState: { errors },
|
||||
} = useForm<FormData>({
|
||||
resolver: zodResolver(schema),
|
||||
@@ -87,7 +93,7 @@ export default function SupplierForm({
|
||||
address_line1: initialData?.address_line1 || '',
|
||||
postal_code: initialData?.postal_code || '',
|
||||
city: initialData?.city || '',
|
||||
country: initialData?.country || 'SE',
|
||||
country: normalizeCountryCode(initialData?.country) ?? initialData?.country ?? 'SE',
|
||||
org_number: initialData?.org_number || '',
|
||||
vat_number: initialData?.vat_number || '',
|
||||
bankgiro: initialData?.bankgiro || '',
|
||||
@@ -103,6 +109,13 @@ export default function SupplierForm({
|
||||
},
|
||||
})
|
||||
|
||||
const countryValue = watch('country')
|
||||
// A stored value the picker does not list (an unmapped legacy name, or a
|
||||
// code outside the curated list) still has to be visible, or the field
|
||||
// would look empty while holding something.
|
||||
const countryValueUnlisted =
|
||||
countryValue && !countryOptions.some((option) => option.code === countryValue)
|
||||
|
||||
// Empty strings go through as-is: the API schemas normalize them (dropped on
|
||||
// create, null on update so a cleared field actually clears the column).
|
||||
const onFormSubmit = (data: FormData) => {
|
||||
@@ -214,7 +227,34 @@ export default function SupplierForm({
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="country">{t('country_label')}</Label>
|
||||
<Input id="country" placeholder="SE" {...register('country')} />
|
||||
<Controller
|
||||
name="country"
|
||||
control={control}
|
||||
render={({ field }) => (
|
||||
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
||||
<SelectTrigger id="country">
|
||||
<SelectValue placeholder={t('country_placeholder')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{countryValueUnlisted && (
|
||||
<SelectItem value={countryValue}>
|
||||
{normalizeCountryCode(countryValue)
|
||||
? countryValue
|
||||
: t('country_unknown_option', { value: countryValue })}
|
||||
</SelectItem>
|
||||
)}
|
||||
{countryOptions.map((option) => (
|
||||
<SelectItem key={option.code} value={option.code}>
|
||||
{locale === 'en' ? option.nameEn : option.name}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
/>
|
||||
{errors.country && (
|
||||
<p className="text-sm text-destructive">{errors.country.message}</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user