* 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>
398 lines
15 KiB
TypeScript
398 lines
15 KiB
TypeScript
'use client'
|
|
|
|
import { useMemo } from 'react'
|
|
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 { useLocale, useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Label } from '@/components/ui/label'
|
|
import { Textarea } from '@/components/ui/textarea'
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
|
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 {
|
|
onSubmit: (data: CreateSupplierInput) => Promise<void>
|
|
isLoading: boolean
|
|
initialData?: Partial<CreateSupplierInput>
|
|
}
|
|
|
|
export default function SupplierForm({
|
|
onSubmit,
|
|
isLoading,
|
|
initialData,
|
|
}: 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.
|
|
const { accounts } = useAccounts()
|
|
|
|
// The default account seeds expense lines on supplier invoices, so the
|
|
// browsable list is cost classes 4-7. Any other 4-digit number can still be
|
|
// typed in; the API only enforces the format.
|
|
const expenseAccounts = useMemo(
|
|
() => accounts.filter((a) => a.account_class >= 4 && a.account_class <= 7),
|
|
[accounts]
|
|
)
|
|
const accountNameByNumber = useMemo(
|
|
() => new Map(accounts.map((a) => [a.account_number, a.account_name])),
|
|
[accounts]
|
|
)
|
|
|
|
const schema = useMemo(() => z.object({
|
|
name: z.string().min(1, t('name_required')),
|
|
supplier_type: z.enum(['swedish_business', 'eu_business', 'non_eu_business']),
|
|
email: z.string().email(t('email_invalid')).optional().or(z.literal('')),
|
|
phone: z.string().optional(),
|
|
address_line1: z.string().optional(),
|
|
address_line2: z.string().optional(),
|
|
postal_code: z.string().optional(),
|
|
city: 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(),
|
|
plusgiro: z.string().optional(),
|
|
iban: z.string().optional(),
|
|
bic: z.string().optional(),
|
|
clearing_number: z.string().optional(),
|
|
account_number: z.string().optional(),
|
|
default_expense_account: z.string().optional(),
|
|
default_payment_terms: z.number().min(1).optional(),
|
|
default_currency: z.string().optional(),
|
|
notes: z.string().optional(),
|
|
}), [t])
|
|
|
|
type FormData = z.infer<typeof schema>
|
|
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
control,
|
|
watch,
|
|
formState: { errors },
|
|
} = useForm<FormData>({
|
|
resolver: zodResolver(schema),
|
|
defaultValues: {
|
|
name: initialData?.name || '',
|
|
supplier_type: initialData?.supplier_type || 'swedish_business',
|
|
email: initialData?.email || '',
|
|
phone: initialData?.phone || '',
|
|
address_line1: initialData?.address_line1 || '',
|
|
postal_code: initialData?.postal_code || '',
|
|
city: initialData?.city || '',
|
|
country: normalizeCountryCode(initialData?.country) ?? initialData?.country ?? 'SE',
|
|
org_number: initialData?.org_number || '',
|
|
vat_number: initialData?.vat_number || '',
|
|
bankgiro: initialData?.bankgiro || '',
|
|
plusgiro: initialData?.plusgiro || '',
|
|
iban: initialData?.iban || '',
|
|
bic: initialData?.bic || '',
|
|
clearing_number: initialData?.clearing_number || '',
|
|
account_number: initialData?.account_number || '',
|
|
default_expense_account: initialData?.default_expense_account || '',
|
|
default_payment_terms: initialData?.default_payment_terms || 30,
|
|
default_currency: initialData?.default_currency || 'SEK',
|
|
notes: initialData?.notes || '',
|
|
},
|
|
})
|
|
|
|
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) => {
|
|
onSubmit(data)
|
|
}
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit(onFormSubmit)} className="space-y-6">
|
|
{/* Supplier Type */}
|
|
<div className="space-y-2">
|
|
<Label>{t('type_label')}</Label>
|
|
<Controller
|
|
name="supplier_type"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder={t('type_label')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="swedish_business">{t('type_swedish_business')}</SelectItem>
|
|
<SelectItem value="eu_business">{t('type_eu_business')}</SelectItem>
|
|
<SelectItem value="non_eu_business">{t('type_non_eu_business')}</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
|
|
{/* Name */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="name">{t('name_label')}</Label>
|
|
<Input
|
|
id="name"
|
|
placeholder={t('name_placeholder')}
|
|
{...register('name')}
|
|
/>
|
|
{errors.name && (
|
|
<p className="text-sm text-destructive">{errors.name.message}</p>
|
|
)}
|
|
</div>
|
|
|
|
{/* Contact */}
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="email">{t('email_label')}</Label>
|
|
<Input
|
|
id="email"
|
|
type="email"
|
|
placeholder={t('email_placeholder')}
|
|
{...register('email')}
|
|
/>
|
|
{errors.email && (
|
|
<p className="text-sm text-destructive">{errors.email.message}</p>
|
|
)}
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="phone">{t('phone_label')}</Label>
|
|
<Input
|
|
id="phone"
|
|
placeholder="+46 8 123 45 67"
|
|
{...register('phone')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Business info */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('business_section')}</h3>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="org_number">{t('org_number_label')}</Label>
|
|
<Input
|
|
id="org_number"
|
|
placeholder={t('org_number_placeholder')}
|
|
{...register('org_number')}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="vat_number">{t('vat_label')}</Label>
|
|
<Input
|
|
id="vat_number"
|
|
placeholder={t('vat_placeholder_se')}
|
|
{...register('vat_number')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Address */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('address_section')}</h3>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="address_line1">{t('street_label')}</Label>
|
|
<Input
|
|
id="address_line1"
|
|
placeholder="Storgatan 1"
|
|
{...register('address_line1')}
|
|
/>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="postal_code">{t('postal_label')}</Label>
|
|
<Input id="postal_code" placeholder="123 45" {...register('postal_code')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="city">{t('city_label')}</Label>
|
|
<Input id="city" placeholder="Stockholm" {...register('city')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="country">{t('country_label')}</Label>
|
|
<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>
|
|
|
|
{/* Payment details */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('payment_section')}</h3>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="bankgiro">{t('bankgiro_label')}</Label>
|
|
<Input id="bankgiro" placeholder={t('bankgiro_placeholder')} {...register('bankgiro')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="plusgiro">{t('plusgiro_label')}</Label>
|
|
<Input id="plusgiro" placeholder="XXXXXXX-X" {...register('plusgiro')} />
|
|
</div>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="clearing_number">{t('clearing_label')}</Label>
|
|
<Input id="clearing_number" placeholder="XXXX" {...register('clearing_number')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="account_number">{t('account_number_label')}</Label>
|
|
<Input id="account_number" placeholder="XXXXXXXXX" {...register('account_number')} />
|
|
</div>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="iban">{t('iban_label')}</Label>
|
|
<Input id="iban" placeholder={t('iban_placeholder')} {...register('iban')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="bic">{t('swift_label')}</Label>
|
|
<Input id="bic" placeholder="SWEDSESS" {...register('bic')} />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Defaults */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<div className="space-y-2">
|
|
<Label>{t('default_account_label')}</Label>
|
|
<Controller
|
|
name="default_expense_account"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<div className="flex items-start gap-1">
|
|
<div className="min-w-0 flex-1">
|
|
<AccountCombobox
|
|
value={field.value || ''}
|
|
accounts={expenseAccounts}
|
|
onChange={field.onChange}
|
|
selectedName={accountNameByNumber.get(field.value || '')}
|
|
/>
|
|
</div>
|
|
{field.value ? (
|
|
<Button
|
|
type="button"
|
|
variant="ghost"
|
|
size="icon"
|
|
aria-label={t('default_account_clear')}
|
|
onClick={() => field.onChange('')}
|
|
>
|
|
<X className="h-4 w-4" />
|
|
</Button>
|
|
) : null}
|
|
</div>
|
|
)}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="payment_terms">{t('default_payment_terms_label')}</Label>
|
|
<Input
|
|
id="payment_terms"
|
|
type="number"
|
|
{...register('default_payment_terms', { valueAsNumber: true })}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="default_currency">{t('default_currency_label')}</Label>
|
|
<Controller
|
|
name="default_currency"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="SEK">SEK</SelectItem>
|
|
<SelectItem value="EUR">EUR</SelectItem>
|
|
<SelectItem value="USD">USD</SelectItem>
|
|
<SelectItem value="GBP">GBP</SelectItem>
|
|
<SelectItem value="NOK">NOK</SelectItem>
|
|
<SelectItem value="DKK">DKK</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Notes */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="notes">{t('notes_label')}</Label>
|
|
<Textarea
|
|
id="notes"
|
|
placeholder={t('notes_placeholder')}
|
|
{...register('notes')}
|
|
/>
|
|
</div>
|
|
|
|
{/* Submit */}
|
|
<div className="flex justify-end gap-2">
|
|
<Button
|
|
type="submit"
|
|
disabled={isLoading || !canWrite}
|
|
title={!canWrite ? t('viewer_disabled_tooltip') : undefined}
|
|
>
|
|
{isLoading ? (
|
|
<>
|
|
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
|
{t('submit_saving')}
|
|
</>
|
|
) : !canWrite ? (
|
|
<>
|
|
<Lock className="mr-2 h-4 w-4" />
|
|
{t('submit_save')}
|
|
</>
|
|
) : (
|
|
t('submit_save')
|
|
)}
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
)
|
|
}
|