flfeders/FEDEO
2
1
Fork 0
Code Issues 116 Pull Requests Actions Packages Projects 23 Releases 20 Wiki Activity

3.0.0 #220

Merged
flfeders merged 676 commits from dev into main 2026-09-20 16:10:48 +00:00
Conversation 0 Commits 676 Files Changed 768 +11 -3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36969e272d - Show all commits

14
frontend/pages/accounting/bwa.vue
View File

@@ -154,12 +154,21 @@ const filteredStatementAllocations = computed(() => {
return statementAllocations.value.filter((allocation) => matchesSelectedPeriod(getStatementDate(allocation))) return statementAllocations.value.filter((allocation) => matchesSelectedPeriod(getStatementDate(allocation)))
}) })
const filteredAccountStatementAllocations = computed(() => { const filteredDirectAccountStatementAllocations = computed(() => {
return filteredStatementAllocations.value.filter((allocation) => { return filteredStatementAllocations.value.filter((allocation) => {
if (allocation.account === null || allocation.account === undefined) { if (allocation.account === null || allocation.account === undefined) {
return false return false
} }
return !allocation?.incominginvoice
&& !allocation?.createddocument
&& !allocation?.ii_id
&& !allocation?.cd_id
})
})
const filteredAccountStatementAllocations = computed(() => {
return filteredDirectAccountStatementAllocations.value.filter((allocation) => {
return getStatementAllocationImmediateExpenseAmount(allocation) > 0 return getStatementAllocationImmediateExpenseAmount(allocation) > 0
}) })
}) })
@@ -298,8 +307,7 @@ const accountRows = computed(() => {
})) }))
}) })
const directBookings = filteredAccountStatementAllocations.value const directBookings = filteredDirectAccountStatementAllocations.value
.filter((allocation) => getStatementAllocationImmediateExpenseAmount(allocation) > 0)
.filter((allocation) => sameId(allocation.account?.id || allocation.account, account.id)) .filter((allocation) => sameId(allocation.account?.id || allocation.account, account.id))
.map((allocation) => { .map((allocation) => {
const amount = Number(allocation.amount || 0) const amount = Number(allocation.amount || 0)