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 +29 -27
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13936db100 - Show all commits

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

@@ -717,29 +717,31 @@ setup()
</div>
</div>
<div class="mt-4 grid grid-cols-1 md:grid-cols-3 gap-3">
<UFormField label="Aufwandsart" size="sm">
<USelectMenu
v-model="allocationBookingMode"
:items="EXPENSE_BOOKING_MODE_ITEMS"
value-key="value"
label-key="label"
/>
</UFormField>
<div v-if="showMoreWithoutRecipe"
class="mt-4 p-3 bg-gray-50 dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700">
<div class="grid grid-cols-1 md:grid-cols-3 gap-3">
<UFormField label="Aufwandsart" size="sm">
<USelectMenu
v-model="allocationBookingMode"
:items="EXPENSE_BOOKING_MODE_ITEMS"
value-key="value"
label-key="label"
/>
</UFormField>
<UFormField label="Abschreibungsdauer (Monate)" size="sm" v-if="isDepreciationAllocation">
<UInput v-model="allocationDepreciationMonths" type="number" min="1" step="1" />
</UFormField>
<UFormField label="Abschreibungsdauer (Monate)" size="sm" v-if="isDepreciationAllocation">
<UInput v-model="allocationDepreciationMonths" type="number" min="1" step="1" />
</UFormField>
<UFormField label="Methode" size="sm" v-if="isDepreciationAllocation">
<USelectMenu
v-model="allocationDepreciationMethod"
:items="DEPRECIATION_METHOD_ITEMS"
value-key="value"
label-key="label"
/>
</UFormField>
</div>
<UFormField label="Methode" size="sm" v-if="isDepreciationAllocation">
<USelectMenu
v-model="allocationDepreciationMethod"
:items="DEPRECIATION_METHOD_ITEMS"
value-key="value"
label-key="label"
/>
</UFormField>
</div>
<div class="mt-3 grid grid-cols-1 md:grid-cols-3 gap-3" v-if="isDepreciationAllocation">
<UFormField label="Start Abschreibung" size="sm">
@@ -767,9 +769,8 @@ setup()
/>
</div>
<div v-if="showMoreWithoutRecipe"
class="mt-4 p-3 bg-gray-50 dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 grid grid-cols-1 md:grid-cols-3 gap-3">
<USelectMenu :items="ownaccounts" value-key="id" label-key="name" v-model="ownAccountToSave"
<div class="mt-3 grid grid-cols-1 md:grid-cols-3 gap-3">
<USelectMenu :items="ownaccounts" value-key="id" label-key="name" v-model="ownAccountToSave"
:search-input="{ placeholder: 'Eigenes Konto' }" :filter-fields="['number','name']" placeholder="Eigenes Konto">
<template #default>
{{ ownAccountToSave ? ownaccounts.find(i => i.id === ownAccountToSave).name : 'Eigenes Konto' }}
@@ -787,9 +788,10 @@ setup()
{{ vendorAccountToSave ? vendors.find(i => i.id === vendorAccountToSave).name : 'Lieferant' }}
</template>
</USelectMenu>
<div class="md:col-span-3 flex justify-end">
<UButton size="xs" label="Zuweisen"
@click="saveAllocation({bankstatement: itemInfo.id, amount: manualAllocationSum, ownaccount: ownAccountToSave ? ownAccountToSave : null, customer: customerAccountToSave ? customerAccountToSave : null, vendor: vendorAccountToSave ? vendorAccountToSave : null, description: allocationDescription })"/>
<div class="md:col-span-3 flex justify-end">
<UButton size="xs" label="Zuweisen"
@click="saveAllocation({bankstatement: itemInfo.id, amount: manualAllocationSum, ownaccount: ownAccountToSave ? ownAccountToSave : null, customer: customerAccountToSave ? customerAccountToSave : null, vendor: vendorAccountToSave ? vendorAccountToSave : null, description: allocationDescription })"/>
</div>
</div>
</div>