diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 6257b26..c031e21 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1097,7 +1097,7 @@ const saveDocument = async (state,resetup = false) => {
 
   let createData = {
     type: itemInfo.value.type,
-    taxType: itemInfo.value.type === "invoices" ? itemInfo.value.taxType : null,
+    taxType: (itemInfo.value.type === "invoices" || itemInfo.value.type === "quotes") ? itemInfo.value.taxType : null,
     state: itemInfo.value.state || "Entwurf",
     customer: itemInfo.value.customer,
     contact: itemInfo.value.contact,
@@ -1632,7 +1632,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                 </UFormGroup>
                 <UFormGroup
                     :label="`${itemInfo.deliveryDateType}${['Lieferzeitraum', 'Leistungszeitraum'].includes(itemInfo.deliveryDateType) ? ' Start' : ''}:`"
-                    v-if="itemInfo.type !== 'serialInvoices'"
+                    v-if="itemInfo.type !== 'serialInvoices' && itemInfo.deliveryDateType !== 'Kein Lieferdatum anzeigen'"
                     class="mr-1"
                 >
                   <UPopover :popper="{ placement: 'bottom-start' }">