Rechnungsentwürfe optional in Prognose anzeigen
Zeigt Rechnungsentwürfe eingeklammert als optionalen Einfluss in der Liquiditätsprognose an, ohne den eigentlichen Endstand zu verändern.
This commit is contained in:
@@ -15,7 +15,7 @@ import {
|
|||||||
} from "../../db/schema";
|
} from "../../db/schema";
|
||||||
import { secrets } from "./secrets";
|
import { secrets } from "./secrets";
|
||||||
|
|
||||||
type ForecastEventSource = "open_createddocument" | "open_incominginvoice" | "recurring_bankstatement";
|
type ForecastEventSource = "open_createddocument" | "open_incominginvoice" | "recurring_bankstatement" | "draft_createddocument";
|
||||||
|
|
||||||
type ForecastEvent = {
|
type ForecastEvent = {
|
||||||
date: string;
|
date: string;
|
||||||
@@ -372,6 +372,7 @@ export const generateLiquidityForecast = async (
|
|||||||
|
|
||||||
const cancelledDocumentIds = findCancellationDocumentIds(activeDocuments);
|
const cancelledDocumentIds = findCancellationDocumentIds(activeDocuments);
|
||||||
const openEvents: ForecastEvent[] = [];
|
const openEvents: ForecastEvent[] = [];
|
||||||
|
const draftEvents: ForecastEvent[] = [];
|
||||||
|
|
||||||
activeDocuments
|
activeDocuments
|
||||||
.filter((document) => ["invoices", "advanceInvoices"].includes(document.type))
|
.filter((document) => ["invoices", "advanceInvoices"].includes(document.type))
|
||||||
@@ -395,6 +396,27 @@ export const generateLiquidityForecast = async (
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
activeDocuments
|
||||||
|
.filter((document) => ["invoices", "advanceInvoices"].includes(document.type))
|
||||||
|
.filter((document) => document.state === "Entwurf" && !cancelledDocumentIds.has(document.id))
|
||||||
|
.forEach((document) => {
|
||||||
|
const total = getCreatedDocumentGrossAmount(document, activeDocuments);
|
||||||
|
if (total <= 0.01) return;
|
||||||
|
|
||||||
|
const dueDate = dayjs(document.documentDate).isValid()
|
||||||
|
? dayjs(document.documentDate).add(Number(document.paymentDays || 0), "day")
|
||||||
|
: today;
|
||||||
|
|
||||||
|
draftEvents.push({
|
||||||
|
date: dueDate.isBefore(today, "day") ? today.format("YYYY-MM-DD") : dueDate.format("YYYY-MM-DD"),
|
||||||
|
amount: total,
|
||||||
|
label: document.documentNumber || document.title || `Rechnungsentwurf ${document.id}`,
|
||||||
|
source: "draft_createddocument",
|
||||||
|
sourceId: document.id,
|
||||||
|
confidence: 0.35,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
activeIncomingInvoices
|
activeIncomingInvoices
|
||||||
.filter((invoice) => invoice.state === "Gebucht" || invoice.state === "Vorbereitet")
|
.filter((invoice) => invoice.state === "Gebucht" || invoice.state === "Vorbereitet")
|
||||||
.filter((invoice) => !invoice.paid)
|
.filter((invoice) => !invoice.paid)
|
||||||
@@ -459,6 +481,7 @@ export const generateLiquidityForecast = async (
|
|||||||
const lowestPoint = points.reduce((lowest, point) => point.balance < lowest.balance ? point : lowest, points[0]);
|
const lowestPoint = points.reduce((lowest, point) => point.balance < lowest.balance ? point : lowest, points[0]);
|
||||||
const totalIncome = roundMoney(events.filter((event) => event.amount > 0).reduce((sum, event) => sum + event.amount, 0));
|
const totalIncome = roundMoney(events.filter((event) => event.amount > 0).reduce((sum, event) => sum + event.amount, 0));
|
||||||
const totalExpense = roundMoney(events.filter((event) => event.amount < 0).reduce((sum, event) => sum + event.amount, 0));
|
const totalExpense = roundMoney(events.filter((event) => event.amount < 0).reduce((sum, event) => sum + event.amount, 0));
|
||||||
|
const draftIncome = roundMoney(draftEvents.filter((event) => event.amount > 0).reduce((sum, event) => sum + event.amount, 0));
|
||||||
|
|
||||||
return {
|
return {
|
||||||
generatedAt: new Date().toISOString(),
|
generatedAt: new Date().toISOString(),
|
||||||
@@ -479,6 +502,8 @@ export const generateLiquidityForecast = async (
|
|||||||
})),
|
})),
|
||||||
recurring,
|
recurring,
|
||||||
events: events.sort((a, b) => a.date.localeCompare(b.date)),
|
events: events.sort((a, b) => a.date.localeCompare(b.date)),
|
||||||
|
draftEvents: draftEvents.sort((a, b) => a.date.localeCompare(b.date)),
|
||||||
|
draftIncome,
|
||||||
points,
|
points,
|
||||||
ai: {
|
ai: {
|
||||||
enabled: Boolean(secrets.OPENAI_API_KEY),
|
enabled: Boolean(secrets.OPENAI_API_KEY),
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ const storeDismissedRecurringKeys = (keys) => {
|
|||||||
const sourceLabels = {
|
const sourceLabels = {
|
||||||
open_createddocument: "Offene Ausgangsrechnung",
|
open_createddocument: "Offene Ausgangsrechnung",
|
||||||
open_incominginvoice: "Offener Eingangsbeleg",
|
open_incominginvoice: "Offener Eingangsbeleg",
|
||||||
recurring_bankstatement: "Regelmäßige Bankbewegung"
|
recurring_bankstatement: "Regelmäßige Bankbewegung",
|
||||||
|
draft_createddocument: "Rechnungsentwurf"
|
||||||
}
|
}
|
||||||
|
|
||||||
const intervalLabels = {
|
const intervalLabels = {
|
||||||
@@ -270,6 +271,12 @@ const topExpenseDrivers = computed(() => {
|
|||||||
.slice(0, 12)
|
.slice(0, 12)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const draftIncomeDrivers = computed(() => {
|
||||||
|
return [...(forecast.value?.draftEvents || [])]
|
||||||
|
.sort((a, b) => Number(b.amount || 0) - Number(a.amount || 0))
|
||||||
|
.slice(0, 12)
|
||||||
|
})
|
||||||
|
|
||||||
const detailedDays = computed(() => {
|
const detailedDays = computed(() => {
|
||||||
let previousBalance = Number(forecast.value?.startingBalance || 0)
|
let previousBalance = Number(forecast.value?.startingBalance || 0)
|
||||||
|
|
||||||
@@ -424,6 +431,10 @@ onMounted(() => {
|
|||||||
<span class="text-sm text-gray-500">Geplante Einzahlungen</span>
|
<span class="text-sm text-gray-500">Geplante Einzahlungen</span>
|
||||||
<span class="font-semibold text-primary-600">+ {{ useCurrency(forecast.totalIncome) }}</span>
|
<span class="font-semibold text-primary-600">+ {{ useCurrency(forecast.totalIncome) }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="forecast.draftIncome" class="flex items-center justify-between gap-3">
|
||||||
|
<span class="text-sm text-gray-500">Rechnungsentwürfe optional</span>
|
||||||
|
<span class="font-semibold text-gray-500">(+ {{ useCurrency(forecast.draftIncome) }})</span>
|
||||||
|
</div>
|
||||||
<div class="flex items-center justify-between gap-3">
|
<div class="flex items-center justify-between gap-3">
|
||||||
<span class="text-sm text-gray-500">Geplante Auszahlungen</span>
|
<span class="text-sm text-gray-500">Geplante Auszahlungen</span>
|
||||||
<span class="font-semibold text-rose-600">{{ useCurrency(forecast.totalExpense) }}</span>
|
<span class="font-semibold text-rose-600">{{ useCurrency(forecast.totalExpense) }}</span>
|
||||||
@@ -467,6 +478,46 @@ onMounted(() => {
|
|||||||
</UCard>
|
</UCard>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<UCard v-if="draftIncomeDrivers.length">
|
||||||
|
<template #header>
|
||||||
|
<div>
|
||||||
|
<h2 class="font-semibold">Rechnungsentwürfe in Klammern</h2>
|
||||||
|
<p class="text-sm text-gray-500">Optionaler Einfluss, noch nicht im Endstand enthalten</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<div class="mb-4 rounded-lg border border-dashed border-gray-300 p-4 dark:border-gray-700">
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<span class="text-sm text-gray-500">Optionale Zusatzliquidität aus Entwürfen</span>
|
||||||
|
<span class="text-lg font-semibold text-gray-600">(+ {{ useCurrency(forecast.draftIncome) }})</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<div
|
||||||
|
v-for="event in draftIncomeDrivers"
|
||||||
|
:key="`draft-${event.sourceId || event.label}-${event.date}`"
|
||||||
|
class="grid gap-3 rounded-lg border border-gray-200 p-3 sm:grid-cols-[120px_minmax(0,1fr)_auto_auto] dark:border-gray-800"
|
||||||
|
>
|
||||||
|
<span class="text-sm text-gray-500">{{ formatDate(event.date) }}</span>
|
||||||
|
<div class="min-w-0">
|
||||||
|
<p class="truncate font-medium">{{ event.label }}</p>
|
||||||
|
<p class="text-xs text-gray-500">Noch nicht gebucht · {{ sourceLabels[event.source] }}</p>
|
||||||
|
</div>
|
||||||
|
<span class="text-right font-semibold text-gray-600">(+ {{ useCurrency(event.amount) }})</span>
|
||||||
|
<UButton
|
||||||
|
v-if="getEventRoute(event)"
|
||||||
|
size="xs"
|
||||||
|
variant="ghost"
|
||||||
|
icon="i-heroicons-arrow-top-right-on-square"
|
||||||
|
@click="openEvent(event)"
|
||||||
|
>
|
||||||
|
Öffnen
|
||||||
|
</UButton>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</UCard>
|
||||||
|
|
||||||
<UCard>
|
<UCard>
|
||||||
<template #header>
|
<template #header>
|
||||||
<div class="flex flex-wrap items-center justify-between gap-2">
|
<div class="flex flex-wrap items-center justify-between gap-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user