flfeders/FEDEO
2
1
Fork 0
Code Issues 106 Pull Requests Actions Packages Projects 22 Releases Wiki Activity

feat: correct total tax on incoming invoices

Browse Source
This commit is contained in:
Florian Federspiel
2026-08-09 16:35:47 +02:00
parent 94008e8072
commit 8301d8777e
14 changed files with 129 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/db/migrations/0062_incoming_invoice_tax_override.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "incominginvoices" ADD COLUMN "tax_amount_override" numeric(12, 2);

7
backend/db/migrations/meta/_journal.json
View File

@@ -414,6 +414,13 @@
"when": 1786280400000,
"tag": "0061_additional_skr03_accounts",
"breakpoints": true
},
{
"idx": 59,
"version": "7",
"when": 1786284000000,
"tag": "0062_incoming_invoice_tax_override",
"breakpoints": true
}
]
}

3
backend/db/schema/incominginvoices.ts
View File

@@ -5,6 +5,7 @@ import {
text,
boolean,
jsonb,
numeric,
uuid,
} from "drizzle-orm/pg-core"
@@ -55,6 +56,8 @@ export const incominginvoices = pgTable("incominginvoices", {
},
]),
taxAmountOverride: numeric("tax_amount_override", { precision: 12, scale: 2 }),
paid: boolean("paid").notNull().default(false),
expense: boolean("expense").notNull().default(true),

35
backend/src/utils/export/datev.ts
View File

@@ -80,18 +80,17 @@ const formatDatevDate = (date: dayjs.ConfigType, format: string) => {
return parsed.isValid() ? parsed.tz(DATEV_TIMEZONE).format(format) : "";
};
const getIncomingInvoiceTaxReview = (account: any) => {
const taxRate = account.taxType === "19" ? 19 : account.taxType === "7" ? 7 : null;
if (taxRate === null) return null;
const getIncomingInvoiceTaxOverride = (invoice: any) => {
if (invoice.taxAmountOverride === null || invoice.taxAmountOverride === undefined || invoice.taxAmountOverride === "") return null;
const amountNet = Number(account.amountNet);
const amountTax = Number(account.amountTax);
if (!Number.isFinite(amountNet) || !Number.isFinite(amountTax)) return null;
const calculatedTax = (invoice.accounts as any[] || []).reduce((sum, account) => sum + Number(account.amountTax || 0), 0);
const overriddenTax = Number(invoice.taxAmountOverride);
if (!Number.isFinite(overriddenTax) || Math.abs(overriddenTax - calculatedTax) < 0.005) return null;
const calculatedTax = Number((amountNet * (taxRate / 100)).toFixed(2));
if (Math.abs(amountTax - calculatedTax) < 0.005) return null;
return `USt pruefen ${displayCurrency(amountTax, true)}`;
return {
amount: overriddenTax,
correction: Number((overriddenTax - calculatedTax).toFixed(2)),
};
};
const getCreatedDocumentRevenueLines = (document: any) => {
@@ -368,7 +367,12 @@ export async function buildExportZip(
// ER
incominginvoicesList.forEach(ii => {
const accs = ii.accounts as any[] || [];
accs.forEach(account => {
const taxOverride = getIncomingInvoiceTaxOverride(ii);
const correctionAccountIndex = taxOverride
? Math.max(0, accs.findIndex(account => account.taxType === "19" || account.taxType === "7"))
: -1;
accs.forEach((account, accountIndex) => {
let file = filesIncomingInvoices.find(i => i.incominginvoice === ii.id);
let accountData = accountsList.find(i => i.id === account.account);
if (!accountData) return;
@@ -381,10 +385,13 @@ export async function buildExportZip(
else if(account.taxType === '7I') buschluessel = "18";
else buschluessel = "-";
let amountGross =/* account.amountGross ? account.amountGross : */(account.amountNet || 0) + (account.amountTax || 0);
let amountGross = Number(account.amountNet || 0) + Number(account.amountTax || 0);
if (taxOverride && accountIndex === correctionAccountIndex) amountGross += taxOverride.correction;
let shSelector = Math.sign(amountGross) === -1 ? "H" : "S";
const taxReview = getIncomingInvoiceTaxReview(account);
let text = `${taxReview ? `${taxReview} - ` : ""}ER ${ii.reference}: ${escapeString(ii.description)}`.substring(0,59);
const taxReview = taxOverride && accountIndex === correctionAccountIndex
? `USt pruefen ${displayCurrency(taxOverride.amount, true)} - `
: "";
let text = `${taxReview}ER ${ii.reference}: ${escapeString(ii.description)}`.substring(0,59);
const vend = ii.vendor; // durch Mapping verfügbar
bookingLines.push(`${Math.abs(amountGross).toFixed(2).replace(".",",")};"${shSelector}";;;;;${accountData.number};${vend?.vendorNumber || ""};"${buschluessel}";${formatDatevDate(ii.date, "DDMM")};"${ii.reference}";;;"${text}";;;;;;${file ? `"BEDI ""${file.id}"""` : ""};"Geschäftspartner";"${vend?.name || ""}";"Kundennummer";"${vend?.vendorNumber || ""}";"Belegnummer";"${ii.reference}";"Leistungsdatum";"${formatDatevDate(ii.date, "DD.MM.YYYY")}";"Belegdatum";"${formatDatevDate(ii.date, "DD.MM.YYYY")}";;;;;;;;;;"";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0;;;;"";;;;;;;`);

17
backend/src/utils/liquidityForecast.ts
View File

@@ -287,6 +287,12 @@ const getIncomingInvoiceTaxBreakdown = (invoice: any): TaxBreakdown => {
}
});
if (invoice?.taxAmountOverride !== null && invoice?.taxAmountOverride !== undefined && invoice?.taxAmountOverride !== "") {
const correction = Number(invoice.taxAmountOverride) - breakdown.tax19 - breakdown.tax7;
if (breakdown.tax19 !== 0 || breakdown.net19 !== 0) breakdown.tax19 += correction;
else if (breakdown.tax7 !== 0 || breakdown.net7 !== 0) breakdown.tax7 += correction;
}
return {
net19: roundMoney(breakdown.net19),
tax19: roundMoney(breakdown.tax19),
@@ -297,9 +303,14 @@ const getIncomingInvoiceTaxBreakdown = (invoice: any): TaxBreakdown => {
};
const getIncomingInvoiceSignedAmount = (invoice: any) => {
const amount = (invoice.accounts || []).reduce((sum: number, account: any) => {
return sum + Number(account.amountNet || 0) + Number(account.amountTax || 0);
}, 0);
const totals = (invoice.accounts || []).reduce((result: { net: number, tax: number }, account: any) => ({
net: result.net + Number(account.amountNet || 0),
tax: result.tax + Number(account.amountTax || 0),
}), { net: 0, tax: 0 });
const tax = invoice.taxAmountOverride !== null && invoice.taxAmountOverride !== undefined && invoice.taxAmountOverride !== ""
? Number(invoice.taxAmountOverride)
: totals.tax;
const amount = totals.net + tax;
return roundMoney(invoice.expense === false ? amount : amount * -1);
};