diff --git a/spaces/components/DocumentUpload.vue b/spaces/components/DocumentUpload.vue index b31b0c7..0d15b27 100644 --- a/spaces/components/DocumentUpload.vue +++ b/spaces/components/DocumentUpload.vue @@ -18,7 +18,8 @@ const uploadModalOpen = ref(false) const uploadInProgress = ref(false) const fileUploadFormData = ref({ tags: ["Dokument"], - project: null + project: null, + tenant: dataStore.currentTenant }) const openModal = () => { diff --git a/spaces/layouts/default.vue b/spaces/layouts/default.vue index 89b2f07..2d77075 100644 --- a/spaces/layouts/default.vue +++ b/spaces/layouts/default.vue @@ -248,11 +248,11 @@ const links = [[{ to: "/receipts", icon: "i-heroicons-document-text" }, - { + /* { label: "Bank", to: "/banking", icon: "i-heroicons-currency-euro" - }], [{ + }*/], [{ label: "Projekte", to: "/projects", icon: "i-heroicons-clipboard-document-check" @@ -445,16 +445,16 @@ const links = [[{ /> - + /> -
+
diff --git a/spaces/pages/documents.vue b/spaces/pages/documents.vue index e5c2086..90489b1 100644 --- a/spaces/pages/documents.vue +++ b/spaces/pages/documents.vue @@ -16,9 +16,8 @@ const uploadModalOpen = ref(false) const uploadInProgress = ref(false) const fileUploadFormData = ref({ tags: ["Eingang"], - project: null, - customer: null, - path: "" + path: "", + tenant: dataStore.currentTenant }) @@ -40,7 +39,7 @@ const filteredDocuments = computed(() => { const uploadFiles = async () => { uploadInProgress.value = true; - await dataStore.uploadFiles(fileUploadFormData.value, document.getElementById("fileUploadInput").files) + await dataStore.uploadFiles(fileUploadFormData.value, document.getElementById("fileUploadInput").files, true) uploadModalOpen.value = false; uploadInProgress.value = false; diff --git a/spaces/pages/receipts/incomingInvoices/[mode]/[[id]].vue b/spaces/pages/receipts/incomingInvoices/[mode]/[[id]].vue index 2252a35..aba3738 100644 --- a/spaces/pages/receipts/incomingInvoices/[mode]/[[id]].vue +++ b/spaces/pages/receipts/incomingInvoices/[mode]/[[id]].vue @@ -63,6 +63,35 @@ const itemInfo = ref({ ] }) +const taxOptions = ref([ + { + label: "19% USt", + percentage: 19, + key: "19" + },{ + label: "7% USt", + percentage: 7, + key: "7" + },{ + label: "Innergemeintschaftlicher Erwerb 19%", + percentage: 0, + key: "19I" + },{ + label: "Innergemeintschaftlicher Erwerb 7%", + percentage: 0, + key: "7I" + },{ + label: "§13b UStG", + percentage: 0, + key: "13B" + },{ + label: "Keine USt", + percentage: 0, + key: "null" + }, +]) + + const totalCalculated = computed(() => { let totalNet = 0 let totalAmount19Tax = 0 @@ -90,9 +119,9 @@ const totalCalculated = computed(() => { const setState = async (newState) => { if(mode.value === 'show') { - await dataStore.updateItem('incomingInvoices',{...currentVendorInvoice.value, state: newState}) + await dataStore.updateItem('incominginvoices',{...currentVendorInvoice.value, state: newState}) } else if(mode.value === 'edit') { - await dataStore.updateItem('incomingInvoices',{...itemInfo.value, state: newState}) + await dataStore.updateItem('incominginvoices',{...itemInfo.value, state: newState}) } await router.push("/receipts") } @@ -113,7 +142,7 @@ setupPage()
Speichern @@ -303,12 +332,14 @@ setupPage() :help="`Betrag: ${item.amountTax ? String(item.amountTax).replace('.',',') : '0,00'} €`" > diff --git a/spaces/pages/settings/index.vue b/spaces/pages/settings/index.vue index 6a9c75d..722d55f 100644 --- a/spaces/pages/settings/index.vue +++ b/spaces/pages/settings/index.vue @@ -1,8 +1,12 @@