Fix/build (#1041)
* fix(bookkeeping): harden correction account changes * feat(tax): enhance tax deadline generation with new settings and filing methods - Added new company settings: tax_turnover_over_40m, vat_has_eu_trade, vat_filing_method, periodisk_sammanstallning_enabled, and periodisk_sammanstallning_filing_method. - Updated deadline generation logic to accommodate new settings affecting VAT and employer declaration deadlines. - Implemented tests for new functionality, ensuring that completed obligations are preserved and not replaced by new pending rows. - Introduced a cron job to backfill missing tax deadlines for companies with settings but no upcoming deadlines. - Updated API routes for generating tax deadlines and handling cron jobs. - Modified database schema to include new columns for tax filing profiles and constraints for filing methods. * fix(invoices): record credit note reconciliation guard * fix(tax): correct automatic deadline settings * fix(tax): key AGI deadline to VAT taxable base and add storforetag payment deadline The 26th filing day for the skattedeklaration (AGI and VAT together) hinges on one statutory measure, a VAT taxable base above SEK 40 million (SFL 26 kap.), not a separate employer turnover. Drop employer_turnover_over_40m and derive the AGI schedule from vat_registered plus vat_taxable_base_over_40m, so a non-VAT-reporting employer is never shown the 26th when its binding date is the 12th. Also: - add a skatteinbetalning deadline row (12th, 17 January) for storforetag, whose deducted tax and employer contributions are due before the 26th filing date - normalize legally incoherent over-40m flag combinations to the earlier small-company schedule in a follow-up migration - replace hardcoded 27 December dates with the banking-day adjustment - extend the 40m help text to cover the SKV-decided early filing election and the payment-still-on-the-12th rule - document the regeneration race repaired by the daily backfill cron Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(migrations): add AGI and VAT filing logic with employer column removal * feat(settings): implement VAT registration logic and update related flags; enhance deadline handling --------- 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
1443235cec
commit
a5e37d3510
@@ -19,14 +19,21 @@ vi.mock('@/lib/auth/require-write', () => ({
|
||||
requireWritePermission: (...args: unknown[]) => requireWriteMock(...args),
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/tax/deadline-generator', () => ({
|
||||
didTaxFieldsChange: vi.fn().mockReturnValue(false),
|
||||
regenerateTaxDeadlinesForUser: vi.fn().mockResolvedValue(undefined),
|
||||
shouldRegenerateTaxDeadlines: vi.fn(
|
||||
(changed: boolean, count: number) => changed || count === 0,
|
||||
),
|
||||
const deadlineMocks = vi.hoisted(() => ({
|
||||
regenerate: vi.fn().mockResolvedValue(undefined),
|
||||
}))
|
||||
|
||||
// Mock only the function that writes to the database. The field detector,
|
||||
// settings normalizer, and regeneration predicate stay real so these tests
|
||||
// fail if a new tax-relevant field stops triggering regeneration.
|
||||
vi.mock('@/lib/tax/deadline-generator', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('@/lib/tax/deadline-generator')>()
|
||||
return {
|
||||
...actual,
|
||||
regenerateTaxDeadlinesForUser: deadlineMocks.regenerate,
|
||||
}
|
||||
})
|
||||
|
||||
import { PUT } from '../route'
|
||||
import { regenerateTaxDeadlinesForUser } from '@/lib/tax/deadline-generator'
|
||||
|
||||
@@ -87,6 +94,37 @@ describe('PUT /api/settings', () => {
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.company_name).toBe('New Name')
|
||||
expect(deadlineMocks.regenerate).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('regenerates deadlines when unchanged tax settings are saved', async () => {
|
||||
const settings = {
|
||||
company_id: 'company-1',
|
||||
entity_type: 'aktiebolag',
|
||||
moms_period: 'monthly',
|
||||
f_skatt: true,
|
||||
vat_registered: false,
|
||||
pays_salaries: false,
|
||||
fiscal_year_start_month: 1,
|
||||
onboarding_complete: true,
|
||||
}
|
||||
enqueueMany([
|
||||
{ data: settings },
|
||||
{ data: { id: 's1', ...settings } },
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { f_skatt: true, vat_registered: false },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
expect(deadlineMocks.regenerate).toHaveBeenCalledWith(
|
||||
supabase,
|
||||
'company-1',
|
||||
expect.objectContaining({ entity_type: 'aktiebolag', f_skatt: true }),
|
||||
)
|
||||
})
|
||||
|
||||
it('updates all three reminder thresholds', async () => {
|
||||
@@ -149,9 +187,11 @@ describe('PUT /api/settings', () => {
|
||||
{ data: null, count: 0 }, // no system deadlines -> self-heal generation
|
||||
])
|
||||
|
||||
// A save with NO tax-relevant field: only the zero-count self-heal path
|
||||
// can trigger regeneration here.
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { f_skatt: true },
|
||||
body: { company_name: 'Self Heal AB' },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
const { status } = await parseJsonResponse(response)
|
||||
@@ -160,6 +200,65 @@ describe('PUT /api/settings', () => {
|
||||
expect(vi.mocked(regenerateTaxDeadlinesForUser)).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('clears VAT-dependent flags when VAT registration is turned off', async () => {
|
||||
const settings = {
|
||||
company_id: 'company-1',
|
||||
entity_type: 'aktiebolag',
|
||||
vat_registered: true,
|
||||
vat_number: 'SE556012579001',
|
||||
moms_period: 'quarterly',
|
||||
vat_taxable_base_over_40m: false,
|
||||
vat_has_eu_trade: true,
|
||||
periodisk_sammanstallning_enabled: true,
|
||||
onboarding_complete: true,
|
||||
}
|
||||
enqueueMany([
|
||||
{ data: settings },
|
||||
{
|
||||
data: {
|
||||
...settings,
|
||||
id: 's1',
|
||||
vat_registered: false,
|
||||
vat_has_eu_trade: false,
|
||||
periodisk_sammanstallning_enabled: false,
|
||||
},
|
||||
},
|
||||
])
|
||||
|
||||
// Without the coercion this request 400s: the stored PS flag stays
|
||||
// effective while registration is being switched off.
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { vat_registered: false },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
const { status } = await parseJsonResponse(response)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(deadlineMocks.regenerate).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('still rejects explicitly enabling the EU sales list without EU trade', async () => {
|
||||
enqueue({
|
||||
data: {
|
||||
entity_type: 'aktiebolag',
|
||||
vat_registered: true,
|
||||
vat_number: 'SE556012579001',
|
||||
moms_period: 'quarterly',
|
||||
vat_has_eu_trade: false,
|
||||
onboarding_complete: true,
|
||||
},
|
||||
})
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { periodisk_sammanstallning_enabled: true },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
|
||||
expect(response.status).toBe(400)
|
||||
})
|
||||
|
||||
it('does not regenerate tax deadlines when the company already has some', async () => {
|
||||
enqueueMany([
|
||||
{ data: { entity_type: 'aktiebolag', onboarding_complete: true } }, // oldSettings
|
||||
@@ -202,6 +301,54 @@ describe('PUT /api/settings', () => {
|
||||
expect(supabase.from).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('rejects quarterly VAT when the VAT taxable base is above SEK 40 million', async () => {
|
||||
enqueue({
|
||||
data: {
|
||||
entity_type: 'aktiebolag',
|
||||
vat_registered: true,
|
||||
vat_number: 'SE556012579001',
|
||||
moms_period: 'quarterly',
|
||||
vat_taxable_base_over_40m: false,
|
||||
onboarding_complete: true,
|
||||
},
|
||||
})
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { vat_taxable_base_over_40m: true },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
|
||||
expect(response.status).toBe(400)
|
||||
expect(supabase.from).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('allows EU-trade changes with quarterly VAT and regenerates deadlines', async () => {
|
||||
const settings = {
|
||||
company_id: 'company-1',
|
||||
entity_type: 'aktiebolag',
|
||||
vat_registered: true,
|
||||
vat_number: 'SE556012579001',
|
||||
moms_period: 'quarterly',
|
||||
vat_taxable_base_over_40m: false,
|
||||
vat_has_eu_trade: true,
|
||||
onboarding_complete: true,
|
||||
}
|
||||
enqueueMany([
|
||||
{ data: { ...settings, vat_has_eu_trade: false } },
|
||||
{ data: settings },
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { vat_has_eu_trade: true },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
expect(deadlineMocks.regenerate).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('returns 404 when the settings row does not exist', async () => {
|
||||
enqueueMany([
|
||||
{ data: { onboarding_complete: false } },
|
||||
|
||||
Reference in New Issue
Block a user