MattssonandClaude Fable 5
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>
71 lines
2.3 KiB
TypeScript
71 lines
2.3 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import { buildCreditNoteItem } from '@/lib/invoices/build-credit-note-item'
|
|
import type { InvoiceItem } from '@/types'
|
|
|
|
function item(overrides: Partial<InvoiceItem> = {}): InvoiceItem {
|
|
return {
|
|
id: 'item-1',
|
|
invoice_id: 'invoice-1',
|
|
sort_order: 0,
|
|
description: 'Arbete',
|
|
quantity: 2,
|
|
unit: 'tim',
|
|
unit_price: 1000,
|
|
line_total: 2000,
|
|
vat_rate: 25,
|
|
vat_amount: 500,
|
|
created_at: '2026-07-14T00:00:00Z',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe('buildCreditNoteItem', () => {
|
|
it('negates amounts, keeps the deduction magnitude positive, and preserves ROT/RUT, account, accrual, and dimension metadata', () => {
|
|
const result = buildCreditNoteItem('credit-1', item({
|
|
deduction_type: 'rot',
|
|
deduction_amount: 600,
|
|
labor_hours: 2,
|
|
work_type: 'BYGG',
|
|
housing_designation: 'Test 1:2',
|
|
revenue_account: '3041',
|
|
accrual_period_start: '2026-07-01',
|
|
accrual_period_end: '2026-12-31',
|
|
accrual_balance_account: '2970',
|
|
dimensions: { '6': 'P001' },
|
|
}))
|
|
|
|
expect(result).toMatchObject({
|
|
invoice_id: 'credit-1',
|
|
quantity: -2,
|
|
line_total: -2000,
|
|
vat_amount: -500,
|
|
deduction_type: 'rot',
|
|
// Positive magnitude: invoice_items has CHECK (deduction_amount >= 0).
|
|
deduction_amount: 600,
|
|
labor_hours: 2,
|
|
work_type: 'BYGG',
|
|
housing_designation: 'Test 1:2',
|
|
revenue_account: '3041',
|
|
accrual_period_start: '2026-07-01',
|
|
accrual_period_end: '2026-12-31',
|
|
accrual_balance_account: '2970',
|
|
dimensions: { '6': 'P001' },
|
|
})
|
|
})
|
|
|
|
it('carries discount_percent so the kreditfaktura face arithmetic multiplies out', () => {
|
|
// Original: 2 x 1000 with 10% rabatt → net 1800. The credit row must keep
|
|
// the discount, or -2 x 1000 next to Summa -1800 prints with no visible
|
|
// prisnedsättning (ML 17 kap 24 §) and violates the stored net invariant.
|
|
const result = buildCreditNoteItem('credit-1', item({ discount_percent: 10, line_total: 1800, vat_amount: 450 }))
|
|
expect(result).toMatchObject({
|
|
quantity: -2,
|
|
discount_percent: 10,
|
|
line_total: -1800,
|
|
vat_amount: -450,
|
|
})
|
|
// Legacy rows without the column default to 0.
|
|
expect(buildCreditNoteItem('credit-1', item()).discount_percent).toBe(0)
|
|
})
|
|
})
|