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

Merge branch 'devCorrected' into 'beta'

Browse Source 
Dev corrected

See merge request fedeo/software!34
This commit is contained in:
Florian Federspiel
2025-11-10 14:05:48 +00:00
parent 4f01d2407b 94aee4540a
commit 7cd9a3e074
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/banking/index.vue
View File

@@ -76,7 +76,7 @@ const calculateOpenSum = (statement) => {
return (statement.amount - startingAmount).toFixed(2)
}
const selectedFilters = ref(tempStore.filters["banking"] ? tempStore.filters["banking"] : ['Nur offene anzeigen'])
const selectedFilters = ref(tempStore.filters?.["banking"]?.["main"] ? tempStore.filters["banking"]["main"] : ['Nur offene anzeigen'])
const filteredRows = computed(() => {
let temp = bankstatements.value
@@ -170,7 +170,7 @@ setupPage()
:options="['Nur offene anzeigen','Nur positive anzeigen','Nur negative anzeigen']"
:color="selectedFilters.length > 0 ? 'primary' : 'white'"
:ui-menu="{ width: 'min-w-max' }"
@change="tempStore.modifyFilter('banking',selectedFilters)"
@change="tempStore.modifyFilter('banking','main',selectedFilters)"
>
<template #label>
Filter

3
pages/incomingInvoices/edit/[id].vue
View File

@@ -152,6 +152,7 @@ const findIncomingInvoiceErrors = computed(() => {
itemInfo.value.accounts.forEach(account => {
if(account.account === null) errors.push({message: "Es ist keine Kategorie ausgewählt", type: "breaking"})
if(!accounts.value.find(i => i.id === account.account)) errors.push({message: "Es ist keine Kategorie ausgewählt", type: "breaking"})
if(account.amountNet === null) errors.push({message: "Es ist kein Nettobetrag angegeben", type: "breaking"})
if(account.taxType === null) errors.push({message: "Es ist kein Steuertyp ausgewählt", type: "breaking"})
if(account.costCentre === null) errors.push({message: "Es ist keine Kostenstelle ausgewählt", type: "info"})
@@ -379,7 +380,7 @@ const findIncomingInvoiceErrors = computed(() => {
:search-attributes="['label']"
searchable-placeholder="Suche..."
v-model="item.account"
:color="!item.account ? 'rose' : 'primary'"
:color="(item.account && accounts.find(i => i.id === item.account)) ? 'primary' : 'rose'"
>
<template #label>
{{accounts.find(account => account.id === item.account) ? accounts.find(account => account.id === item.account).label : "Keine Kategorie ausgewählt" }}