feat(invoices,year-end): four byrå-feedback fixes (validation feedback, moms gate, klarmarkera, article search) (#1641)
* fix(invoices): surface validation errors instead of a silent dead submit button A missing unit (or any other Zod failure) blocked both Granska & skapa and Spara som utkast with zero feedback: handleSubmit had no onInvalid callback, the buttons stayed enabled, and the unit field rendered no inline error. Reported by a byra user whose client could not save any invoice. - onInvalid handler on all three submit paths: destructive toast plus scroll to the first inline error - inline error text under the unit select and quantity input (the only line fields that had none) - same treatment in NewRecurringScheduleDialog, including inline errors on its item rows Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(supplier-invoices): stop defaulting 25 % moms for icke momsregistrerade companies The registration form hard-coded vat_rate 0.25 on the initial line, added rows, AI prefill fallback and konto defaults, regardless of company_settings.vat_registered. A non-VAT-registered business that missed the prefilled rate booked ingaende moms (2641) it has no right to deduct (ML 8 kap. 3 \u00a7). The customer-invoice side already gates on the same flag; the supplier side ignored it. - form: read vat_registered from /api/settings; when false, all moms controls (rate cells, per-line moms, totals rows) are hidden and every line is forced to 0 %, including late AI prefills - reverse charge keeps its rate controls: self-assessment is a separate obligation from deduction - route: 400 SI_CREATE_INVALID_INPUT when a non-registered company posts a line with vat_rate/vat_amount > 0 (API/MCP defense in depth), and an omitted vat_rate now defaults to 0 instead of 25 % for those companies - tests: guard rejection, reverse-charge pass-through, 0-default; existing POST tests updated for the new settings lookup Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(year-end): klarmarkera imported years already closed in a previous system SIE-imported historical fiscal years land with is_closed = false and no closing entry, so the year-end page lists every migrated year as pending bokslut even though the bokslut was done in the old software. There was no sanctioned way to mark them done: closePeriod hard-requires locked_at and closing_entry_id. - migration: fiscal_periods.closed_externally boolean (audit clarity: distinguishes a year-end run here from a close done elsewhere) - markPeriodClosedExternally(): closes + locks without a closing entry; refuses already-closed periods, periods with their own closing entry, periods that have not ended, and periods with unbooked bank transactions (same stranding guard as lockPeriod); writes the immutable audit_log entry - POST /api/bookkeeping/fiscal-periods/[id]/close-external (requireWrite) - year-end page: one attn line on the preflight step with a confirm dialog describing the outcome; the marked year drops out of the eligible list Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): searchable article picker on invoice lines The article field was a plain Radix Select whose only matching is label-prefix typeahead: for numbered articles that means number-only lookup, and typing "skruv" found nothing. Byra feedback: name search would help a lot for users with real article catalogs. New ArticleCombobox (input-trigger dropdown, same pattern as AccountCombobox): free-text search over name + article number, diacritics-folded via foldText, keyboard navigation, pinned "Egen rad" free-text option, browse-all on focus like the Select it replaces. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: log klarmarkera pg-test decision Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: address skeptic and compliance-review findings on PR #1641 - ArticleCombobox: keyboard focus no longer auto-opens the list, opening highlights the committed selection, typing highlights the first match, and re-selecting the current value is a no-op. Previously Tab+Enter silently detached the article and wiped its revenue-account override. - Supplier invoice prefill for icke momsregistrerade: the zeroing effect now grosses the net amount up by the extracted rate before forcing 0 %, so the booked cost and 2440 keep the full att-betala amount instead of understating both by the moms. - markPeriodClosedExternally: only migrated periods qualify (must contain SIE-imported verifikat or no verifikat at all); the update carries an is_closed=false predicate so a concurrent normal close cannot be overwritten; confirm dialog now names the reporting consequences. - Route comment: honest scope (this route only; v1/inbox/MCP sweep is a follow-up) and current-law citation (13 kap. ML 2023:200). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: use roundOre for the icke-momsregistrerad gross-up (ratchet guard) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
caa0c3b41d
commit
dfb34a01d9
@@ -31,6 +31,7 @@ import {
|
||||
} from '@/components/invoices/line-vat-rates'
|
||||
import { AttnLine } from '@/components/ui/attn-line'
|
||||
import { sortArticles } from '@/lib/articles/sort'
|
||||
import ArticleCombobox from '@/components/invoices/ArticleCombobox'
|
||||
import { getAmountToPay } from '@/lib/invoices/rounding'
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog'
|
||||
import { Loader2, Plus, Trash2, ArrowLeft, Send, Eye, Landmark, Lock, AlertTriangle, MoreVertical, CalendarClock, Tags, Copy } from 'lucide-react'
|
||||
@@ -1243,6 +1244,24 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
}
|
||||
}
|
||||
|
||||
// A failed Zod validation is otherwise invisible: handleSubmit never reaches
|
||||
// onSubmit, the buttons stay enabled and look normal, and the only signal is
|
||||
// inline error text the user may have scrolled past. Toast + scroll so a
|
||||
// blocked "Granska & skapa" / "Spara som utkast" never reads as a dead button.
|
||||
function onInvalidSubmit(_errors: unknown, event?: React.BaseSyntheticEvent) {
|
||||
toast({
|
||||
title: t('validation_toast_title'),
|
||||
description: t('validation_toast_description'),
|
||||
variant: 'destructive',
|
||||
})
|
||||
const root = (event?.target as HTMLElement | null)?.closest('form')
|
||||
// The inline error paragraphs render on the next React commit; scroll after.
|
||||
setTimeout(() => {
|
||||
const firstError = (root ?? document).querySelector('p.text-destructive')
|
||||
firstError?.scrollIntoView({ behavior: 'smooth', block: 'center' })
|
||||
}, 100)
|
||||
}
|
||||
|
||||
// "Spara som utkast": save an unnumbered draft (save_as_draft) without the
|
||||
// review dialog. The invoice gets no F-number and fires no invoice.created
|
||||
// until the user opens it and clicks "Granska & skapa" (finalize). Same
|
||||
@@ -1539,7 +1558,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={handleSubmit(onSubmit)} className={bare ? 'space-y-6' : 'space-y-6 pb-28 md:pb-0'}>
|
||||
<form onSubmit={handleSubmit(onSubmit, onInvalidSubmit)} className={bare ? 'space-y-6' : 'space-y-6 pb-28 md:pb-0'}>
|
||||
<div className="grid gap-6 lg:grid-cols-3 lg:items-start">
|
||||
{/* Main content */}
|
||||
<div className="lg:col-span-2 space-y-6">
|
||||
@@ -1777,22 +1796,15 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
name={`items.${index}.article_id`}
|
||||
control={control}
|
||||
render={({ field }) => (
|
||||
<Select
|
||||
value={field.value ?? 'none'}
|
||||
onValueChange={(v) => applyArticle(index, v)}
|
||||
>
|
||||
<SelectTrigger>
|
||||
<SelectValue placeholder={t('article_placeholder')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="none">{t('article_free_text')}</SelectItem>
|
||||
{articles.map((a) => (
|
||||
<SelectItem key={a.id} value={a.id}>
|
||||
{a.article_number ? `${a.article_number}: ${a.name}` : a.name}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<ArticleCombobox
|
||||
value={field.value ?? null}
|
||||
articles={articles}
|
||||
onChange={(v) => applyArticle(index, v)}
|
||||
freeTextLabel={t('article_free_text')}
|
||||
placeholder={t('article_placeholder')}
|
||||
emptyLabel={t('article_search_empty')}
|
||||
ariaLabel={t('article_label')}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
@@ -1843,6 +1855,11 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
className="text-right tabular-nums"
|
||||
{...register(`items.${index}.quantity`, { valueAsNumber: true })}
|
||||
/>
|
||||
{errors.items?.[index]?.quantity && (
|
||||
<p className="text-sm text-destructive">
|
||||
{errors.items[index].quantity?.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="space-y-1 md:col-span-2 md:space-y-2">
|
||||
<Label className="text-xs text-muted-foreground md:text-sm md:text-foreground">{t('unit_label')}</Label>
|
||||
@@ -1864,6 +1881,11 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
</Select>
|
||||
)}
|
||||
/>
|
||||
{errors.items?.[index]?.unit && (
|
||||
<p className="text-sm text-destructive">
|
||||
{errors.items[index].unit?.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="space-y-1 md:col-span-2 md:space-y-2">
|
||||
<Label className="text-xs text-muted-foreground md:text-sm md:text-foreground">{t('unit_price_label')}</Label>
|
||||
@@ -2544,7 +2566,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
size="lg"
|
||||
disabled={isSubmitting || isSavingDraft || isFormSubmitting || !canWrite}
|
||||
title={!canWrite ? t('viewer_disabled_tooltip') : t('save_as_draft_tooltip')}
|
||||
onClick={handleSubmit(saveDraftData)}
|
||||
onClick={handleSubmit(saveDraftData, onInvalidSubmit)}
|
||||
>
|
||||
{isSavingDraft ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : null}
|
||||
{t('save_as_draft')}
|
||||
@@ -2572,7 +2594,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
type="button"
|
||||
variant="outline"
|
||||
disabled={isSubmitting || isSavingDraft || isFormSubmitting || !canWrite}
|
||||
onClick={handleSubmit(saveDraftData)}
|
||||
onClick={handleSubmit(saveDraftData, onInvalidSubmit)}
|
||||
>
|
||||
{isSavingDraft ? <Loader2 className="h-4 w-4 animate-spin" /> : t('save_as_draft_short')}
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user