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

Fixed Booking Sum

Browse Source
This commit is contained in:
florianfederspiel
2025-04-30 15:13:06 +02:00
parent 1679bfdc7d
commit 57b7d0b35b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pages/banking/statements/[mode]/[[id]].vue
View File

@@ -71,7 +71,8 @@ const setup = async () => {
allocatedIncomingInvoices.value = incominginvoices.filter(i => i.statementallocations.find(x => x.bs_id === itemInfo.value.id)) allocatedIncomingInvoices.value = incominginvoices.filter(i => i.statementallocations.find(x => x.bs_id === itemInfo.value.id))
console.log(allocatedDocuments.value) console.log(allocatedDocuments.value)
console.log(allocatedIncomingInvoices.value) console.log(allocatedIncomingInvoices.value)
openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.length === 0 ) //openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.length === 0 )
openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false))
//console.log(openIncomingInvoices.value) //console.log(openIncomingInvoices.value)
// return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0) // return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0)
@@ -92,7 +93,8 @@ const separateIBAN = (input = "") => {
return separates.join(" ") return separates.join(" ")
} }
const getInvoiceSum = (invoice) => { const getInvoiceSum = (invoice, onlyOpenSum) => {
console.log(invoice)
let sum = 0 let sum = 0
invoice.accounts.forEach(account => { invoice.accounts.forEach(account => {
sum += account.amountTax sum += account.amountTax
@@ -100,6 +102,8 @@ const getInvoiceSum = (invoice) => {
}) })
console.log(sum) console.log(sum)
if(onlyOpenSum) sum = sum + Number(invoice.statementallocations.reduce((n,{amount}) => n + amount, 0))
if(invoice.expense) { if(invoice.expense) {
return (sum * -1).toFixed(2) return (sum * -1).toFixed(2)
} else { } else {
@@ -425,7 +429,7 @@ const archiveStatement = async () => {
> >
<template #description> <template #description>
<UProgress <UProgress
:value="Math.abs(itemInfo.amount) - calculateOpenSum" :value="Math.abs(itemInfo.amount) - Math.abs(calculateOpenSum)"
:max="Math.abs(itemInfo.amount)" :max="Math.abs(itemInfo.amount)"
:color="calculateOpenSum != 0 ? 'rose' : 'primary'" :color="calculateOpenSum != 0 ? 'rose' : 'primary'"
/> />
@@ -838,7 +842,7 @@ const archiveStatement = async () => {
<template #header> <template #header>
<div class="flex flex-row justify-between"> <div class="flex flex-row justify-between">
<span>{{item.vendor ? item.vendor.name : ''}} - {{item.reference}}</span> <span>{{item.vendor ? item.vendor.name : ''}} - {{item.reference}}</span>
<span class="font-semibold text-rose-600 text-nowrap">{{displayCurrency(getInvoiceSum(item))}}</span> <span class="font-semibold text-rose-600 text-nowrap">{{displayCurrency(getInvoiceSum(item,true))}}</span>
</div> </div>
</template> </template>
<UButton <UButton
@@ -846,7 +850,7 @@ const archiveStatement = async () => {
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(getInvoiceSum(item)), description: allocationDescription})" @click="saveAllocation({ii_id: item.id, bs_id: itemInfo.id, amount: Number(Math.abs(getInvoiceSum(item,true)) > Math.abs(manualAllocationSum) ? manualAllocationSum : getInvoiceSum(item,true)), description: allocationDescription})"
/> />
<UButton <UButton
variant="outline" variant="outline"