Files
accounted/lib/invoices/line-amounts.ts
T
MattssonandClaude Fable 5 f216a60bf8 feat(invoices): per-line percentage discount and separate fakturamarkning (#2084)
* 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>
2026-08-31 15:34:06 +02:00

61 lines
2.3 KiB
TypeScript

import { roundOre } from '@/lib/money'
/**
* Shared per-line amount math for invoice items with an optional percentage
* discount (rabatt i procent per artikelrad).
*
* The formula set is deliberately exact in öre so every surface (editor
* preview, build-invoice-write, staged-operation commit, PDF, Peppol BG-27
* line allowance) agrees to the öre:
*
* gross = roundOre(quantity * unit_price)
* discount = roundOre(gross * discount_percent / 100)
* net = roundOre(gross - discount)
*
* `net` is what is stored as invoice_items.line_total and what VAT is
* computed on (the discount reduces the beskattningsunderlag, ML 8 kap 13 §).
* Because `discount` is rounded before the subtraction, gross - discount is
* exact 2-decimal arithmetic and the UBL line check
* LineExtensionAmount = base - allowance holds without a tolerance.
*
* A line with no discount keeps the legacy unrounded `quantity * unit_price`
* as its net so existing invoices, stored line_totals and the Peppol
* LINE_TOTAL_MISMATCH check stay byte-identical.
*/
export interface LineAmounts {
/** Line amount before discount (rounded to öre when a discount applies). */
gross: number
/** Discount amount in invoice currency (0 when no discount). */
discount: number
/** Line amount after discount: what line_total stores and VAT applies to. */
net: number
}
/** True when the value is a discount that actually changes the line. */
export function hasLineDiscount(discountPercent: number | null | undefined): boolean {
return typeof discountPercent === 'number' && discountPercent > 0
}
export function computeLineAmounts(
quantity: number,
unitPrice: number,
discountPercent?: number | null,
): LineAmounts {
const raw = (quantity || 0) * (unitPrice || 0)
if (!hasLineDiscount(discountPercent)) {
return { gross: raw, discount: 0, net: raw }
}
const gross = roundOre(raw)
const discount = roundOre((gross * (discountPercent as number)) / 100)
return { gross, discount, net: roundOre(gross - discount) }
}
/** Convenience: the net line total (what invoice_items.line_total stores). */
export function computeLineNet(
quantity: number,
unitPrice: number,
discountPercent?: number | null,
): number {
return computeLineAmounts(quantity, unitPrice, discountPercent).net
}