Move expense options into advanced booking
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 24s
Build and Push Docker Images / build-frontend (push) Successful in 1m45s
Build and Push Docker Images / build-website (push) Successful in 27s
Build and Push Docker Images / build-central-services-api (push) Successful in 24s
Build and Push Docker Images / build-central-services-admin (push) Successful in 24s
Build and Push Docker Images / build-docs (push) Successful in 23s
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 24s
Build and Push Docker Images / build-frontend (push) Successful in 1m45s
Build and Push Docker Images / build-website (push) Successful in 27s
Build and Push Docker Images / build-central-services-api (push) Successful in 24s
Build and Push Docker Images / build-central-services-admin (push) Successful in 24s
Build and Push Docker Images / build-docs (push) Successful in 23s
This commit is contained in:
@@ -717,29 +717,31 @@ setup()
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-4 grid grid-cols-1 md:grid-cols-3 gap-3">
|
<div v-if="showMoreWithoutRecipe"
|
||||||
<UFormField label="Aufwandsart" size="sm">
|
class="mt-4 p-3 bg-gray-50 dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700">
|
||||||
<USelectMenu
|
<div class="grid grid-cols-1 md:grid-cols-3 gap-3">
|
||||||
v-model="allocationBookingMode"
|
<UFormField label="Aufwandsart" size="sm">
|
||||||
:items="EXPENSE_BOOKING_MODE_ITEMS"
|
<USelectMenu
|
||||||
value-key="value"
|
v-model="allocationBookingMode"
|
||||||
label-key="label"
|
:items="EXPENSE_BOOKING_MODE_ITEMS"
|
||||||
/>
|
value-key="value"
|
||||||
</UFormField>
|
label-key="label"
|
||||||
|
/>
|
||||||
|
</UFormField>
|
||||||
|
|
||||||
<UFormField label="Abschreibungsdauer (Monate)" size="sm" v-if="isDepreciationAllocation">
|
<UFormField label="Abschreibungsdauer (Monate)" size="sm" v-if="isDepreciationAllocation">
|
||||||
<UInput v-model="allocationDepreciationMonths" type="number" min="1" step="1" />
|
<UInput v-model="allocationDepreciationMonths" type="number" min="1" step="1" />
|
||||||
</UFormField>
|
</UFormField>
|
||||||
|
|
||||||
<UFormField label="Methode" size="sm" v-if="isDepreciationAllocation">
|
<UFormField label="Methode" size="sm" v-if="isDepreciationAllocation">
|
||||||
<USelectMenu
|
<USelectMenu
|
||||||
v-model="allocationDepreciationMethod"
|
v-model="allocationDepreciationMethod"
|
||||||
:items="DEPRECIATION_METHOD_ITEMS"
|
:items="DEPRECIATION_METHOD_ITEMS"
|
||||||
value-key="value"
|
value-key="value"
|
||||||
label-key="label"
|
label-key="label"
|
||||||
/>
|
/>
|
||||||
</UFormField>
|
</UFormField>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-3 grid grid-cols-1 md:grid-cols-3 gap-3" v-if="isDepreciationAllocation">
|
<div class="mt-3 grid grid-cols-1 md:grid-cols-3 gap-3" v-if="isDepreciationAllocation">
|
||||||
<UFormField label="Start Abschreibung" size="sm">
|
<UFormField label="Start Abschreibung" size="sm">
|
||||||
@@ -767,9 +769,8 @@ setup()
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="showMoreWithoutRecipe"
|
<div class="mt-3 grid grid-cols-1 md:grid-cols-3 gap-3">
|
||||||
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"
|
||||||
<USelectMenu :items="ownaccounts" value-key="id" label-key="name" v-model="ownAccountToSave"
|
|
||||||
:search-input="{ placeholder: 'Eigenes Konto' }" :filter-fields="['number','name']" placeholder="Eigenes Konto">
|
:search-input="{ placeholder: 'Eigenes Konto' }" :filter-fields="['number','name']" placeholder="Eigenes Konto">
|
||||||
<template #default>
|
<template #default>
|
||||||
{{ ownAccountToSave ? ownaccounts.find(i => i.id === ownAccountToSave).name : 'Eigenes Konto' }}
|
{{ ownAccountToSave ? ownaccounts.find(i => i.id === ownAccountToSave).name : 'Eigenes Konto' }}
|
||||||
@@ -787,9 +788,10 @@ setup()
|
|||||||
{{ vendorAccountToSave ? vendors.find(i => i.id === vendorAccountToSave).name : 'Lieferant' }}
|
{{ vendorAccountToSave ? vendors.find(i => i.id === vendorAccountToSave).name : 'Lieferant' }}
|
||||||
</template>
|
</template>
|
||||||
</USelectMenu>
|
</USelectMenu>
|
||||||
<div class="md:col-span-3 flex justify-end">
|
<div class="md:col-span-3 flex justify-end">
|
||||||
<UButton size="xs" label="Zuweisen"
|
<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 })"/>
|
@click="saveAllocation({bankstatement: itemInfo.id, amount: manualAllocationSum, ownaccount: ownAccountToSave ? ownAccountToSave : null, customer: customerAccountToSave ? customerAccountToSave : null, vendor: vendorAccountToSave ? vendorAccountToSave : null, description: allocationDescription })"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user