Fix BWA Calc

frontend/components/displayIncomeAndExpenditure.vue

@@ -2,6 +2,10 @@
 import customParseFormat from "dayjs/plugin/customParseFormat";
 import dayjs from "dayjs";
 import { Line } from "vue-chartjs";
+import {
+  getIncomingInvoiceImmediateExpenseGross,
+  getIncomingInvoiceImmediateExpenseNet
+} from "~/composables/useDepreciation";
 
 dayjs.extend(customParseFormat)
 
@@ -84,7 +88,7 @@ const loadData = async () => {
   ])
 
   incomeDocuments.value = (docs || []).filter((item) => item.state === "Gebucht" && ["invoices", "advanceInvoices", "cancellationInvoices"].includes(item.type))
-  expenseInvoices.value = (incoming || []).filter((item) => item.date)
+  expenseInvoices.value = (incoming || []).filter((item) => item.state === "Gebucht" && item.date)
 }
 
 const yearsInData = computed(() => {
@@ -128,18 +132,9 @@ const computeDocumentAmount = (doc) => {
 }
 
 const computeIncomingInvoiceAmount = (invoice) => {
-  let amount = 0
-
-  ;(invoice.accounts || []).forEach((account) => {
-    const net = Number(account.amountNet || 0)
-    const tax = Number(account.amountTax || 0)
-    const grossValue = Number(account.amountGross)
-    const gross = Number.isFinite(grossValue) ? grossValue : (net + tax)
-
-    amount += amountMode.value === "gross" ? gross : net
-  })
-
-  return Number(amount.toFixed(2))
+  return amountMode.value === "gross"
+    ? getIncomingInvoiceImmediateExpenseGross(invoice)
+    : getIncomingInvoiceImmediateExpenseNet(invoice)
 }
 
 const buckets = computed(() => {