3918ff6620
* 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>
213 lines
6.6 KiB
TypeScript
213 lines
6.6 KiB
TypeScript
import type { SupplierType } from '@/types'
|
|
import { detectSupplierColumns } from './column-detector'
|
|
import { cellOrNull, parsePaymentTerms } from '../shared/column-utils'
|
|
import { classifySupplier } from '../shared/classify'
|
|
import { normalizeCountryCode } from '@/lib/vat/country-codes'
|
|
import { readBestSheet } from '../shared/workbook-reader'
|
|
import type {
|
|
DetectedSupplierColumns,
|
|
ParsedSupplierRow,
|
|
} from './types'
|
|
|
|
const VALID_SUPPLIER_TYPES: SupplierType[] = [
|
|
'swedish_business',
|
|
'eu_business',
|
|
'non_eu_business',
|
|
]
|
|
|
|
const VALID_CURRENCIES = new Set(['SEK', 'EUR', 'USD', 'GBP', 'NOK', 'DKK'])
|
|
|
|
const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
|
|
|
|
function normalizeSupplierType(value: string | null): SupplierType | null {
|
|
if (!value) return null
|
|
const lower = value.toLowerCase().trim()
|
|
if (lower === 'swedish_business' || lower === 'swedish' || lower === 'svensk' || lower === 'företag' || lower === 'foretag' || lower === 'business' || lower === 'ab' || lower === 'aktiebolag') {
|
|
return 'swedish_business'
|
|
}
|
|
if (lower === 'eu_business' || lower === 'eu') {
|
|
return 'eu_business'
|
|
}
|
|
if (lower === 'non_eu_business' || lower === 'non-eu' || lower === 'utomeu' || lower === 'utländsk' || lower === 'utlandsk') {
|
|
return 'non_eu_business'
|
|
}
|
|
return VALID_SUPPLIER_TYPES.includes(lower as SupplierType)
|
|
? (lower as SupplierType)
|
|
: null
|
|
}
|
|
|
|
/**
|
|
* ISO 3166-1 alpha-2 (suppliers.country is a code). A name the register
|
|
* cannot map is kept as typed so the preview can show it; the row is then
|
|
* flagged invalid below and the execute route refuses it.
|
|
*/
|
|
function normalizeCountry(value: string | null): string {
|
|
if (!value) return 'SE'
|
|
return normalizeCountryCode(value) ?? value.trim()
|
|
}
|
|
|
|
function normalizeCurrency(value: string | null): string {
|
|
if (!value) return 'SEK'
|
|
const upper = value.trim().toUpperCase()
|
|
return VALID_CURRENCIES.has(upper) ? upper : 'SEK'
|
|
}
|
|
|
|
function cleanGiroNumber(value: string | null): string | null {
|
|
if (!value) return null
|
|
const cleaned = value.replace(/[\s.]/g, '')
|
|
return cleaned === '' ? null : cleaned
|
|
}
|
|
|
|
export function parseSuppliersFile(
|
|
buffer: ArrayBuffer,
|
|
filename: string,
|
|
columnOverrides?: DetectedSupplierColumns,
|
|
): {
|
|
filename: string
|
|
sheet_name: string
|
|
total_rows: number
|
|
detected_columns: DetectedSupplierColumns
|
|
headers: string[]
|
|
preview_rows: string[][]
|
|
rows: ParsedSupplierRow[]
|
|
warnings: string[]
|
|
} {
|
|
const { sheetName, rawData } = readBestSheet(buffer, filename)
|
|
|
|
if (rawData.length < 2) {
|
|
const fallbackColumns: DetectedSupplierColumns = columnOverrides ?? {
|
|
name_col: 0,
|
|
org_number_col: null,
|
|
supplier_type_col: null,
|
|
email_col: null,
|
|
phone_col: null,
|
|
address_line1_col: null,
|
|
address_line2_col: null,
|
|
postal_code_col: null,
|
|
city_col: null,
|
|
country_col: null,
|
|
vat_number_col: null,
|
|
bankgiro_col: null,
|
|
plusgiro_col: null,
|
|
bank_account_col: null,
|
|
iban_col: null,
|
|
bic_col: null,
|
|
payment_terms_col: null,
|
|
default_currency_col: null,
|
|
notes_col: null,
|
|
confidence: 0,
|
|
}
|
|
return {
|
|
filename,
|
|
sheet_name: sheetName,
|
|
total_rows: 0,
|
|
detected_columns: fallbackColumns,
|
|
headers: rawData[0]?.map((h) => String(h)) || [],
|
|
preview_rows: [],
|
|
rows: [],
|
|
warnings: ['Filen innehåller för få rader.'],
|
|
}
|
|
}
|
|
|
|
const headers = rawData[0].map((h) => String(h))
|
|
const dataRows = rawData.slice(1)
|
|
const columns = columnOverrides || detectSupplierColumns(headers)
|
|
|
|
const rows: ParsedSupplierRow[] = []
|
|
const warnings: string[] = []
|
|
|
|
for (let i = 0; i < dataRows.length; i++) {
|
|
const row = dataRows[i]
|
|
const name = cellOrNull(row[columns.name_col])
|
|
if (!name) continue
|
|
|
|
const get = (col: number | null) =>
|
|
col !== null ? cellOrNull(row[col]) : null
|
|
|
|
const orgNumber = get(columns.org_number_col)
|
|
const email = get(columns.email_col)
|
|
const phone = get(columns.phone_col)
|
|
const addressLine1 = get(columns.address_line1_col)
|
|
const addressLine2 = get(columns.address_line2_col)
|
|
const postalCode = get(columns.postal_code_col)
|
|
const city = get(columns.city_col)
|
|
const countryRaw = get(columns.country_col)
|
|
const country = normalizeCountry(countryRaw)
|
|
const vatNumber = get(columns.vat_number_col)
|
|
const bankgiro = cleanGiroNumber(get(columns.bankgiro_col))
|
|
const plusgiro = cleanGiroNumber(get(columns.plusgiro_col))
|
|
const bankAccount = get(columns.bank_account_col)
|
|
const iban = get(columns.iban_col)?.replace(/\s/g, '').toUpperCase() ?? null
|
|
const bic = get(columns.bic_col)?.replace(/\s/g, '').toUpperCase() ?? null
|
|
const paymentTermsRaw = columns.payment_terms_col !== null
|
|
? row[columns.payment_terms_col]
|
|
: null
|
|
const currencyRaw = get(columns.default_currency_col)
|
|
const notes = get(columns.notes_col)
|
|
|
|
const explicitType = columns.supplier_type_col !== null
|
|
? normalizeSupplierType(cellOrNull(row[columns.supplier_type_col]))
|
|
: null
|
|
const supplierType: SupplierType =
|
|
explicitType ?? classifySupplier({
|
|
org_number: orgNumber,
|
|
vat_number: vatNumber,
|
|
country: countryRaw,
|
|
})
|
|
|
|
const validationErrors: string[] = []
|
|
if (email && !EMAIL_RE.test(email)) {
|
|
validationErrors.push('Ogiltig e-postadress')
|
|
}
|
|
if (countryRaw && !normalizeCountryCode(countryRaw)) {
|
|
validationErrors.push(`Okänt land: ${countryRaw.trim()} (ange landskod, t.ex. SE eller DE)`)
|
|
}
|
|
if (orgNumber && !/^[\d\s\-]{6,20}$/.test(orgNumber)) {
|
|
validationErrors.push('Ogiltigt org-/personnummer')
|
|
}
|
|
if (iban && !/^[A-Z]{2}\d{2}[A-Z0-9]{11,30}$/.test(iban)) {
|
|
validationErrors.push('Ogiltigt IBAN')
|
|
}
|
|
|
|
rows.push({
|
|
row_index: i + 2,
|
|
name,
|
|
supplier_type: supplierType,
|
|
org_number: orgNumber,
|
|
email,
|
|
phone,
|
|
address_line1: addressLine1,
|
|
address_line2: addressLine2,
|
|
postal_code: postalCode,
|
|
city,
|
|
country,
|
|
vat_number: vatNumber,
|
|
bankgiro,
|
|
plusgiro,
|
|
bank_account: bankAccount,
|
|
iban,
|
|
bic,
|
|
default_payment_terms: parsePaymentTerms(paymentTermsRaw, 30),
|
|
default_currency: normalizeCurrency(currencyRaw),
|
|
notes,
|
|
is_valid: validationErrors.length === 0,
|
|
validation_errors: validationErrors,
|
|
})
|
|
}
|
|
|
|
if (rows.length === 0) {
|
|
warnings.push('Inga giltiga leverantörsrader hittades. Kontrollera att namnkolumnen är korrekt mappad.')
|
|
}
|
|
|
|
return {
|
|
filename,
|
|
sheet_name: sheetName,
|
|
total_rows: rows.length,
|
|
detected_columns: columns,
|
|
headers,
|
|
preview_rows: dataRows.slice(0, 5),
|
|
rows,
|
|
warnings,
|
|
}
|
|
}
|