diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index 3448c19..dfc1e2d 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -82,26 +82,39 @@
   >
     <template #type-data="{row}">
       {{dataStore.documentTypesForCreation[row.type].labelSingle}}
+      <span v-if="row.type === 'cancellationInvoices'"> zu {{row.linkedDocument.documentNumber}}</span>
     </template>
     <template #state-data="{row}">
-        <span
-            v-if="row.state === 'Entwurf'"
-            class="text-rose-500"
-        >
-          {{row.state}}
-        </span>
       <span
+        v-if="row.state === 'Entwurf'"
+        class="text-rose-500"
+      >
+        {{row.state}}
+      </span>
+<!--      <span
           v-if="row.state === 'Gebucht'"
           class="text-cyan-500"
       >
           {{row.state}}
-        </span>
+      </span>-->
       <span
-          v-if="row.state === 'Abgeschlossen'"
+          v-if="row.state === 'Gebucht' && !items.find(i => i.linkedDocument && i.linkedDocument.id === row.id)"
           class="text-primary-500"
       >
           {{row.state}}
-        </span>
+      </span>
+      <span
+          v-else-if="row.state === 'Gebucht' && items.find(i => i.linkedDocument && i.linkedDocument.id === row.id) && ['invoices','advanceInvoices'].includes(row.type)"
+          class="text-cyan-500"
+      >
+          Storniert mit {{items.find(i => i.linkedDocument && i.linkedDocument.id === row.id).documentNumber}}
+      </span>
+      <span
+          v-else-if="row.state === 'Gebucht'"
+          class="text-primary-500"
+      >
+          {{row.state}}
+      </span>
     </template>
     <template #partner-data="{row}">
       <span v-if="row.customer">{{row.customer ? row.customer.name : ""}}</span>
@@ -116,10 +129,10 @@
       <span v-if="row.documentDate">{{row.documentDate ? dayjs(row.documentDate).format("DD.MM.YY") : ''}}</span>
     </template>
     <template #dueDate-data="{row}">
-      <span v-if="row.state === 'Gebucht' && row.paymentDays && ['invoices','advanceInvoices'].includes(row.type)" :class="dayjs(row.documentDate).add(row.paymentDays,'day').diff(dayjs()) <= 0 && !isPaid(row) ? ['text-rose-500'] : '' ">{{row.documentDate ? dayjs(row.documentDate).add(row.paymentDays,'day').format("DD.MM.YY") : ''}}</span>
+      <span v-if="row.state === 'Gebucht' && row.paymentDays && ['invoices','advanceInvoices'].includes(row.type) && !items.find(i => i.linkedDocument && i.linkedDocument.id === row.id)" :class="dayjs(row.documentDate).add(row.paymentDays,'day').diff(dayjs()) <= 0 && !isPaid(row) ? ['text-rose-500'] : '' ">{{row.documentDate ? dayjs(row.documentDate).add(row.paymentDays,'day').format("DD.MM.YY") : ''}}</span>
     </template>
     <template #paid-data="{row}">
-      <div v-if="(row.type === 'invoices' ||row.type === 'advanceInvoices') && row.state === 'Gebucht'">
+      <div v-if="(row.type === 'invoices' ||row.type === 'advanceInvoices') && row.state === 'Gebucht' && !items.find(i => i.linkedDocument && i.linkedDocument.id === row.id)">
         <span v-if="useSum().getIsPaid(row,items)" class="text-primary-500">Bezahlt</span>
         <span v-else class="text-rose-600">Offen</span>
       </div>
@@ -128,7 +141,7 @@
       <span v-if="row.type !== 'deliveryNotes'">{{displayCurrency(useSum().getCreatedDocumentSum(row,items))}}</span>
     </template>
     <template #amountOpen-data="{row}">
-      <span v-if="row.type !== 'deliveryNotes' && row.state !== 'Entwurf' && !useSum().getIsPaid(row,items) ">{{displayCurrency(useSum().getCreatedDocumentSum(row, items) - row.statementallocations.reduce((n,{amount}) => n + amount, 0))}}</span>
+      <span v-if="!['deliveryNotes','cancellationInvoices','quotes','confirmationOrders'].includes(row.type) && row.state !== 'Entwurf' && !useSum().getIsPaid(row,items) && !items.find(i => i.linkedDocument && i.linkedDocument.id === row.id) ">{{displayCurrency(useSum().getCreatedDocumentSum(row, items) - row.statementallocations.reduce((n,{amount}) => n + amount, 0))}}</span>
     </template>
   </UTable>
 
@@ -180,7 +193,7 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  items.value = (await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount)","documentNumber")).filter(i => !i.archived)
+  items.value = (await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount),linkedDocument(*)","documentNumber")).filter(i => !i.archived)
 }
 
 setupPage()