From a161306359a31aaf63f66c03eb5ed95d55a3370f Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Tue, 9 Dec 2025 11:05:56 +0100 Subject: [PATCH 1/4] BETA for new DB --- pages/createDocument/edit/[[id]].vue | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue index 047fa9c..4e761ac 100644 --- a/pages/createDocument/edit/[[id]].vue +++ b/pages/createDocument/edit/[[id]].vue @@ -1506,7 +1506,20 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = { } if (row.service) { - row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit + console.log(service) + if(service.unit) { + row.unit = service.unit + } else { + let selectedService = services.value.find(i => i.id === row.service) + console.log(selectedService) + if(selectedService.unit?.id) { + row.unit = selectedService.unit.id + } else { + row.unit = selectedService.unit + } + } + + //row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit row.inputPrice = ((service.sellingPriceComposed.total || service.sellingPrice) ? (service.sellingPriceComposed.total || service.sellingPrice) : (services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice)) row.description = service.description ? service.description : (services.value.find(i => i.id === row.service) ? services.value.find(i => i.id === row.service).description : "") @@ -1520,14 +1533,14 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = { if (row.product) { console.log("Product Detected") row.unit = product.unit ? product.unit : products.value.find(i => i.id === row.product).unit - row.inputPrice = (product.sellingPrice ? product.sellingPrice : products.value.find(i => i.id === row.product).sellingPrice) + row.inputPrice = (product.selling_price ? product.selling_price : products.value.find(i => i.id === row.product).selling_price) //row.price = Number((row.originalPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2)) row.description = product.description ? product.description : (products.value.find(i => i.id === row.product) ? products.value.find(i => i.id === row.product).description : "") if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) { row.taxPercent = 0 } else { - row.taxPercent = product.taxPercentage ? product.taxPercentage : products.value.find(i => i.id === row.product).taxPercentage + row.taxPercent = product.tax_percentage ? product.tax_percentage : products.value.find(i => i.id === row.product).tax_percentage } } From 76941abbf28a66997550a20a5f4c0adbf3741a68 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Tue, 9 Dec 2025 11:36:12 +0100 Subject: [PATCH 2/4] BETA for new DB --- components/displayOpenBalances.vue | 2 +- pages/createDocument/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue index e0e6a11..c19dfdf 100644 --- a/components/displayOpenBalances.vue +++ b/components/displayOpenBalances.vue @@ -22,7 +22,7 @@ const setupPage = async () => { finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== useSum().getCreatedDocumentSum(i, documents).toFixed(2)) - finalizedDocuments = finalizedDocuments.filter(x => (x.type === 'invoices' || x.type === 'advanceInvoices') && x.state === 'Gebucht' && !items.find(i => i.linkedDocument && i.linkedDocument.id === x.id)) + finalizedDocuments = finalizedDocuments.filter(x => (x.type === 'invoices' || x.type === 'advanceInvoices') && x.state === 'Gebucht' && !items.find(i => i.createddocument && i.createddocument.id === x.id)) diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue index 81fb7b7..65c0e77 100644 --- a/pages/createDocument/index.vue +++ b/pages/createDocument/index.vue @@ -101,16 +101,16 @@ {{row.state}} --> {{row.state}} - Storniert mit {{items.find(i => i.linkedDocument && i.linkedDocument.id === row.id).documentNumber}} + Storniert mit {{items.find(i => i.createddocument && i.createddocument.id === row.id).documentNumber}} Date: Tue, 9 Dec 2025 11:41:21 +0100 Subject: [PATCH 3/4] Added Buttons for all connected Documents --- pages/createDocument/show/[id].vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue index 81ae4dc..d1a61ba 100644 --- a/pages/createDocument/show/[id].vue +++ b/pages/createDocument/show/[id].vue @@ -105,12 +105,21 @@ const openBankstatements = () => { Kunde - {{dataStore.documentTypesForCreation[itemInfo.linkedDocument.type].labelSingle}} - {{itemInfo.linkedDocument.documentNumber}} + {{dataStore.documentTypesForCreation[itemInfo.createddocument.type].labelSingle}} - {{itemInfo.createddocument.documentNumber}} + + + {{dataStore.documentTypesForCreation[item.type].labelSingle}} - {{item.documentNumber}} Date: Tue, 9 Dec 2025 12:07:00 +0100 Subject: [PATCH 4/4] Added Buttons for all connected Documents --- pages/banking/statements/[mode]/[[id]].vue | 16 ++++++++-------- pages/createDocument/show/[id].vue | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue index 5f90098..97943e8 100644 --- a/pages/banking/statements/[mode]/[[id]].vue +++ b/pages/banking/statements/[mode]/[[id]].vue @@ -509,11 +509,11 @@ const archiveStatement = async () => { @@ -529,11 +529,11 @@ const archiveStatement = async () => { @@ -810,8 +810,8 @@ const archiveStatement = async () => { icon="i-heroicons-check" variant="outline" class="mr-3" - v-if="!itemInfo.statementallocations.find(i => i.cd_id === document.id)" - @click="saveAllocation({cd_id: document.id, bankstatement: itemInfo.id, amount: Number(Number(document.openSum) < manualAllocationSum ? document.openSum : manualAllocationSum), description: allocationDescription})" + v-if="!itemInfo.statementallocations.find(i => i.createddocument === document.id)" + @click="saveAllocation({createddocument: document.id, bankstatement: itemInfo.id, amount: Number(Number(document.openSum) < manualAllocationSum ? document.openSum : manualAllocationSum), description: allocationDescription})" /> { icon="i-heroicons-check" variant="outline" class="mr-3" - v-if="!itemInfo.statementallocations.find(i => i.ii_id === item.id)" - @click="saveAllocation({ii_id: item.id, bankstatement: itemInfo.id, amount: Number(Math.abs(getInvoiceSum(item,true)) > Math.abs(manualAllocationSum) ? manualAllocationSum : getInvoiceSum(item,true)), description: allocationDescription})" + v-if="!itemInfo.statementallocations.find(i => i.incominginvoice === item.id)" + @click="saveAllocation({incominginvoice: item.id, bankstatement: itemInfo.id, amount: Number(Math.abs(getInvoiceSum(item,true)) > Math.abs(manualAllocationSum) ? manualAllocationSum : getInvoiceSum(item,true)), description: allocationDescription})" /> { const openBankstatements = () => { if(itemInfo.value.statementallocations.length > 1) { - navigateTo(`/banking/?filter=${JSON.stringify(itemInfo.value.statementallocations.map(i => i.bs_id))}`) + navigateTo(`/banking/?filter=${JSON.stringify(itemInfo.value.statementallocations.map(i => i.bankstatement))}`) } else { - navigateTo(`/banking/statements/edit/${itemInfo.value.statementallocations[0].bs_id}`) + navigateTo(`/banking/statements/edit/${itemInfo.value.statementallocations[0].bankstatement}`) } }