Merge branch 'beta' into dev

This commit is contained in:
2025-03-04 17:10:36 +01:00
4 changed files with 13 additions and 7 deletions

View File

@@ -355,6 +355,7 @@ const moveFile = async () => {
<UButton <UButton
@click="moveFile" @click="moveFile"
variant="outline" variant="outline"
:disabled="!folderToMoveTo"
>Verschieben</UButton> >Verschieben</UButton>
</InputGroup> </InputGroup>

View File

@@ -85,7 +85,7 @@ const separateIBAN = (input = "") => {
const getDocumentSum = (doc,advanceInvoices = []) => { const getDocumentSum = (doc,advanceInvoices = []) => {
let sum = 0 let sum = 0
console.log(advanceInvoices) //console.log(advanceInvoices)
doc.rows.forEach(row => { doc.rows.forEach(row => {
if(row.mode === "normal" || row.mode === "service" || row.mode === "free") { if(row.mode === "normal" || row.mode === "service" || row.mode === "free") {
@@ -93,7 +93,7 @@ const getDocumentSum = (doc,advanceInvoices = []) => {
} }
}) })
console.log(sum) //console.log(sum)
if(advanceInvoices.length > 0) { if(advanceInvoices.length > 0) {
advanceInvoices.forEach(i => { advanceInvoices.forEach(i => {
@@ -102,7 +102,7 @@ const getDocumentSum = (doc,advanceInvoices = []) => {
}) })
} }
console.log(sum) //console.log(sum)
@@ -152,6 +152,9 @@ const selectAccount = (id) => {
const manualAllocationSum = ref(itemInfo.value.amount || 0) const manualAllocationSum = ref(itemInfo.value.amount || 0)
const saveAllocation = async (allocation) => { const saveAllocation = async (allocation) => {
console.log(allocation)
const {data,error} = await supabase.from("statementallocations").insert({ const {data,error} = await supabase.from("statementallocations").insert({
...allocation, ...allocation,
tenant: profileStore.currentTenant tenant: profileStore.currentTenant
@@ -376,7 +379,7 @@ setup()
</div> </div>
<div class="scrollList mt-3 px-2"> <div class="scrollList mt-3 px-2 pb-3" style="height: 45vh">
<UDivider>Vorhandene Buchungen</UDivider> <UDivider>Vorhandene Buchungen</UDivider>
<UCard <UCard
@@ -612,7 +615,7 @@ setup()
variant="outline" variant="outline"
class="mr-3" class="mr-3"
v-if="!itemInfo.statementallocations.find(i => i.ii_id === item.id)" v-if="!itemInfo.statementallocations.find(i => i.ii_id === item.id)"
@click="saveAllocation({ii_id: item.id, bs_id: itemInfo.id, amount: Number(itemInfo.amount)})" @click="saveAllocation({ii_id: item.id, bs_id: itemInfo.id, amount: Number(getInvoiceSum(item))})"
/> />
<UButton <UButton
variant="outline" variant="outline"

View File

@@ -426,6 +426,7 @@ const selectAll = () => {
<tr> <tr>
<td> <td>
<UCheckbox <UCheckbox
v-if="renderedFileList.find(i => i.type === 'file')"
@change="selectAll" @change="selectAll"
/> />
</td> </td>
@@ -436,6 +437,7 @@ const selectAll = () => {
<tr v-for="(entry,index) in renderedFileList"> <tr v-for="(entry,index) in renderedFileList">
<td> <td>
<UCheckbox <UCheckbox
v-if="entry.type === 'file'"
v-model="selectedFiles[entry.id]" v-model="selectedFiles[entry.id]"
/> />
</td> </td>

View File

@@ -31,7 +31,7 @@
> >
<template #right> <template #right>
<UButton <UButton
@click="editTemplateModalOpen = true" @click="editTemplateModalOpen = true, itemInfo = {}"
> >
+ Erstellen + Erstellen
</UButton> </UButton>
@@ -149,7 +149,7 @@
> >
<USelectMenu <USelectMenu
:options="Object.keys(dataStore.documentTypesForCreation).map(i => { :options="Object.keys(dataStore.documentTypesForCreation).filter(i => i !== 'serialInvoices').map(i => {
return { return {
label: dataStore.documentTypesForCreation[i].label, label: dataStore.documentTypesForCreation[i].label,
key: i key: i