diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue index cb7f612..7231861 100644 --- a/pages/createDocument/edit/[[id]].vue +++ b/pages/createDocument/edit/[[id]].vue @@ -1290,6 +1290,7 @@ const saveSerialInvoice = async () => { contactPerson: itemInfo.value.contactPerson, serialConfig: itemInfo.value.serialConfig, letterhead: itemInfo.value.letterhead, + taxType:itemInfo.value.taxType } let data = null @@ -1693,7 +1694,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = { - {{ filteredRows.filter(i => item.key === 'invoices' ? ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(i.type) : item.key === i.type).length }} + {{ getRowsForTab(item.key).length }} - \ No newline at end of file diff --git a/pages/createDocument/serialInvoice.vue b/pages/createDocument/serialInvoice.vue index 8900d36..cd0c893 100644 --- a/pages/createDocument/serialInvoice.vue +++ b/pages/createDocument/serialInvoice.vue @@ -14,6 +14,23 @@ + + + + + @@ -21,20 +38,9 @@ + + +
+

+ + Laufende Ausführungen +

+
+ +
+
+

Start: {{ dayjs(exec.createdAt).format('DD.MM.YYYY HH:mm') }}

+
+ Läuft +
+ +
+ {{exec.summary}} +
+ +
+ +
+
+
+
+ + + @@ -67,23 +119,6 @@ {{row.customer ? row.customer.name : ""}} - @@ -100,25 +135,231 @@ + + + + +
+ + + + + + +
+ + + + + +
+ +
+ {{ selectedExecutionRows.length }} Vorlage(n) ausgewählt. +
+
+ + +
+
+ + + + + +
+
+ +
+ +
+ Keine abgeschlossenen Ausführungen gefunden. +
+ +
+
+ {{ dayjs(exec.createdAt).format('DD.MM.YYYY HH:mm') }} + + {{ getStatusLabel(exec.status) }} + +
+
+
+ + {{exec.summary}} +
+
+
+
+
+
+ - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/incomingInvoices/[mode]/[id].vue b/pages/incomingInvoices/[mode]/[id].vue index 51488ba..ed07dbf 100644 --- a/pages/incomingInvoices/[mode]/[id].vue +++ b/pages/incomingInvoices/[mode]/[id].vue @@ -43,6 +43,10 @@ const setup = async () => { accounts.value = await useEntities("accounts").selectSpecial() itemInfo.value = await useEntities("incominginvoices").selectSingle(route.params.id, "*, files(*)") + + //TODO: Dirty Fix + itemInfo.value.vendor = itemInfo.value.vendor?.id + await loadFile(itemInfo.value.files[itemInfo.value.files.length-1].id) if(itemInfo.value.date && !itemInfo.value.dueDate) itemInfo.value.dueDate = itemInfo.value.date @@ -412,7 +416,7 @@ const findIncomingInvoiceErrors = computed(() => { value-attribute="id" searchable :disabled="mode === 'show'" - :search-attributes="['label']" + :search-attributes="['label','number']" searchable-placeholder="Suche..." v-model="item.account" :color="(item.account && accounts.find(i => i.id === item.account)) ? 'primary' : 'rose'" @@ -420,6 +424,9 @@ const findIncomingInvoiceErrors = computed(() => { +
diff --git a/stores/data.js b/stores/data.js index dd805a7..a28952b 100644 --- a/stores/data.js +++ b/stores/data.js @@ -2608,7 +2608,7 @@ export const useDataStore = defineStore('data', () => { }, cancellationInvoices: { label: "Stornorechnungen", - labelSingle: "Stornorechnung" + labelSingle: "Storno" }, quotes: { label: "Angebote",