Mattsson
f216a60bf8
* feat(invoices): per-line percentage discount and separate fakturamarkning User request: rabatt i procent per artikelrad, and a marking field separate from Er referens. - invoice_items.discount_percent (0-100, default 0): line_total and vat_amount are stored NET of the discount. Shared exact-ore math in lib/invoices/line-amounts.ts (gross, discount, net) used by the web builder, staged-operation commit, editor preview, PDF, and Peppol. Undiscounted lines keep the legacy unrounded qty*price byte-identical. - ROT/RUT deduction computes on the discounted net line total. - invoices.invoice_marking: printed on the PDF next to the references and mapped to Peppol BT-10 BuyerReference (marking wins over your_reference; either satisfies the BT-10 requirement). - Peppol renders the discount as a BG-27 line AllowanceCharge (reason code 95, MultiplierFactorNumeric, Amount, BaseAmount). - Editor: "Lagg till rabatt" in the row menu (same reveal pattern as ROT/RUT), Markning row next to Er referens, forval chip, review dialog shows discounts and marking. - Plumbed through v1 REST projections, MCP create/get/update invoice tools, pending-operations update path, and copy-invoice (discount copied; marking deliberately not, it is recipient-specific). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JJAt9yM7tgZ69f1XnNnq52 * fix(invoices): carry discount_percent through every deduction, credit, convert and preview path Skeptic + CI findings on the discount/marking feature, one pass: - generateRotRutLines and propose-send-lines now pass discount_percent into computeDeduction: the send/credit/cash verifikat booked 1513 on the GROSS line while deduction_total, the PDF and the Skatteverket claim carried the net, stranding the difference on 1513 and pushing 1510 negative once the customer paid. Test pins 1513=3000/1510=7000 for a 20%-discounted 10 000 kr ROT line. - preview-pdf route accepts discount_percent (net totals + net-based deduction) and invoice_marking; the editor now sends the marking, so the preview equals the invoice it becomes. - Credit notes carry discount_percent (buildCreditNoteItem, v1 credit route select+insert, MCP credit executor) and invoice_marking, so the kreditfaktura face arithmetic multiplies out and shows the Rabatt column (ML 17 kap 24 §). - Proforma->invoice convert copies discount_percent + invoice_marking: the converted invoice previously failed Peppol LINE_TOTAL_MISMATCH and lost the rebate on the next builder pass. - Editor hides the discount menu in self-billed mode (the self-billed wire shape has no discount; previewed net would book gross). - MCP staging and commitCreateInvoice reject a non-number discount_percent (a string coerced past the range check but was ignored by the totals math and still stored). - Regenerated skills/accounted-api (apiskill:check CI failure). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JJAt9yM7tgZ69f1XnNnq52 --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
31 lines
1.5 KiB
SQL
31 lines
1.5 KiB
SQL
-- Per-line percentage discount (rabatt i procent per artikelrad) and a
|
|
-- fakturamärkning field separate from Er referens (your_reference).
|
|
--
|
|
-- invoice_items.discount_percent: 0-100, default 0. The stored line_total is
|
|
-- always the NET amount (after discount); VAT is computed on the net, so the
|
|
-- bookkeeping generators need no change. Server code recomputes the discount
|
|
-- via lib/invoices/line-amounts.ts and never trusts a client-sent total.
|
|
--
|
|
-- invoices.invoice_marking: the buyer-required marking (kostnadsstalle,
|
|
-- project code, PO label) printed on the invoice and mapped to Peppol BT-10
|
|
-- BuyerReference when set. Distinct from your_reference, which stays the
|
|
-- contact person (Er referens).
|
|
|
|
ALTER TABLE public.invoice_items
|
|
ADD COLUMN IF NOT EXISTS discount_percent NUMERIC NOT NULL DEFAULT 0;
|
|
|
|
ALTER TABLE public.invoice_items DROP CONSTRAINT IF EXISTS invoice_items_discount_percent_check;
|
|
ALTER TABLE public.invoice_items ADD CONSTRAINT invoice_items_discount_percent_check
|
|
CHECK (discount_percent >= 0 AND discount_percent <= 100);
|
|
|
|
COMMENT ON COLUMN public.invoice_items.discount_percent IS
|
|
'Percentage discount on the line (0-100). line_total and vat_amount are stored net of this discount.';
|
|
|
|
ALTER TABLE public.invoices
|
|
ADD COLUMN IF NOT EXISTS invoice_marking TEXT;
|
|
|
|
COMMENT ON COLUMN public.invoices.invoice_marking IS
|
|
'Fakturamarkning: buyer-required marking (cost center/project/PO), separate from your_reference (Er referens). Feeds Peppol BT-10 BuyerReference when set.';
|
|
|
|
NOTIFY pgrst, 'reload schema';
|