diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 66f0ee8..1e0cf78 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -11,6 +11,7 @@ const route = useRoute()
 const router = useRouter()
 const supabase = useSupabaseClient()
 const modal = useModal()
+const auth = useAuthStore()
 
 
 
@@ -35,16 +36,14 @@ const itemInfo = ref({
   deliveryDateEnd: null,
   deliveryDateType: "Lieferdatum",
   dateOfPerformance: null,
-  paymentDays: profileStore.ownTenant.standardPaymentDays,
+  paymentDays: auth.activeTenantData.standardPaymentDays,
   customSurchargePercentage: 0,
   createdBy: profileStore.activeProfile.id,
   title: null,
   description: null,
   startText: null,
   endText: null,
-  rows: [
-
-  ],
+  rows: [],
   contactPerson: profileStore.activeProfile.id,
   contactPersonName: null,
   contactTel: null,
@@ -61,7 +60,7 @@ const itemInfo = ref({
   usedAdvanceInvoices: []
 })
 
-console.log(profileStore.ownTenant)
+console.log(auth.activeTenantData)
 
 const letterheads = ref([])
 const createddocuments = ref([])
@@ -76,6 +75,8 @@ const selectedServicecategorie = ref(null)
 const customers = ref([])
 const contacts = ref([])
 const texttemplates = ref([])
+const units = ref([])
+const tenantUsers = ref([])
 
 
 const loaded = ref(false)
@@ -90,47 +91,50 @@ const setupPage = async () => {
   servicecategories.value = await useEntities("servicecategories").select("*")
   products.value = await useEntities("products").select("*")
   productcategories.value = await useEntities("productcategories").select("*")
-  customers.value = await useEntities("customers").select("*","customerNumber")
+  customers.value = await useEntities("customers").select("*", "customerNumber")
   contacts.value = await useEntities("contacts").select("*")
-  texttemplates.value = await useEntities("texttemplactes").select("*")
-  if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
-  if(servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
+  texttemplates.value = await useEntities("texttemplates").select("*")
+  units.value = await useEntities("units").selectSpecial("*")
+  tenantUsers.value = (await useNuxtApp().$api(`/api/tenant/users`, {
+    method: "GET"
+  })).users
+  if (productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
+  if (servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
 
-  if(route.params) {
-    if(route.params.id) {
+  if (route.params) {
+    if (route.params.id) {
+      console.log(route.params)
       itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id)
       checkCompatibilityWithInputPrice()
     }
 
-    if(itemInfo.value.project) await checkForOpenAdvanceInvoices()
 
-    if(!itemInfo.value.deliveryDateType) itemInfo.value.deliveryDateType = "Lieferdatum"
+    if (!itemInfo.value.deliveryDateType) itemInfo.value.deliveryDateType = "Lieferdatum"
 
-    if(itemInfo.value.rows.find(i => i.agriculture)) {
+    if (itemInfo.value.rows.find(i => i.agriculture)) {
       processDieselPosition()
     }
 
   }
 
-  if(route.query) {
-    if(route.query.type) itemInfo.value.type = route.query.type
+  if (route.query) {
+    if (route.query.type) itemInfo.value.type = route.query.type
 
-    if(!itemInfo.value.startText && !itemInfo.value.endText) {
+    if (!itemInfo.value.startText && !itemInfo.value.endText) {
       setDocumentTypeConfig(true)
     } else {
       setDocumentTypeConfig(false)
     }
 
 
-
     setContactPersonData()
 
-    if(route.query.linkedDocuments) {
+    if (route.query.linkedDocuments) {
 
       console.log(route.query.loadMode)
 
-      if(route.query.loadMode === "deliveryNotes") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id",JSON.parse(route.query.linkedDocuments))).data
+      if (route.query.loadMode === "deliveryNotes") {
+        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project
 
@@ -146,15 +150,15 @@ const setupPage = async () => {
         linkedDocuments.forEach(doc => {
           let lastId = 0
           itemInfo.value.rows.forEach(row => {
-            if(row.id > lastId) lastId = row.id
+            if (row.id > lastId) lastId = row.id
           })
 
-          if(dayjs(doc.documentDate).isBefore(firstDate) || !firstDate) firstDate = doc.documentDate
-          if(dayjs(doc.documentDate).isAfter(lastDate) || !lastDate) lastDate = doc.documentDate
+          if (dayjs(doc.documentDate).isBefore(firstDate) || !firstDate) firstDate = doc.documentDate
+          if (dayjs(doc.documentDate).isAfter(lastDate) || !lastDate) lastDate = doc.documentDate
 
           itemInfo.value.rows.push(...[
             {
-              id:uuidv4(),
+              id: uuidv4(),
               mode: "title",
               text: `${doc.title} vom ${dayjs(doc.documentDate).format("DD.MM.YYYY")}`
             },
@@ -179,7 +183,7 @@ const setupPage = async () => {
 
         console.log(linkedDocuments)
 
-        if(linkedDocuments.find(i => i.rows.find( x => x.agriculture.dieselUsage))){
+        if (linkedDocuments.find(i => i.rows.find(x => x.agriculture.dieselUsage))) {
           console.log("has diesel")
 
           //Remove Existing Total Diesel Pos
@@ -189,7 +193,7 @@ const setupPage = async () => {
 
           //Add Total Title
           itemInfo.value.rows.push({
-            id:uuidv4(),
+            id: uuidv4(),
             mode: "title",
             text: "Allgemein"
           })
@@ -197,8 +201,8 @@ const setupPage = async () => {
           processDieselPosition()
         }
 
-      } else if(route.query.loadMode === "finalInvoice") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id",JSON.parse(route.query.linkedDocuments))).data
+      } else if (route.query.loadMode === "finalInvoice") {
+        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project
 
@@ -245,7 +249,7 @@ const setupPage = async () => {
             taxPercent: 19, // TODO TAX PERCENTAGE
             discountPercent: 0,
             unit: 10,
-            inputPrice: useSum().getCreatedDocumentSumDetailed(doc).totalNet *-1,
+            inputPrice: useSum().getCreatedDocumentSumDetailed(doc).totalNet * -1,
             linkedEntitys: [
               {
                 type: "createddocuments",
@@ -264,53 +268,49 @@ const setupPage = async () => {
         setPosNumbers()
 
 
-
-
       }
 
 
-
-
     }
 
-    if(route.query.linkedDocument) {
+    if (route.query.linkedDocument) {
       itemInfo.value.linkedDocument = route.query.linkedDocument
       let linkedDocument = await useEntities("createddocuments").selectSingle(itemInfo.value.linkedDocument)
 
-      if(route.query.optionsToImport) {
+      if (route.query.optionsToImport) {
         //Import only true
         let optionsToImport = JSON.parse(route.query.optionsToImport)
 
         console.log(optionsToImport)
         console.log(linkedDocument)
 
-        if(optionsToImport.taxType) itemInfo.value.taxType = linkedDocument.taxType
-        if(optionsToImport.customer) itemInfo.value.customer = linkedDocument.customer
-        if(optionsToImport.letterhead) itemInfo.value.letterhead = linkedDocument.letterhead
-        if(optionsToImport.contact) itemInfo.value.contact = linkedDocument.contact
-        if(optionsToImport.deliveryDateType) itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
-        if(optionsToImport.deliveryDate) itemInfo.value.deliveryDate = linkedDocument.deliveryDate
-        if(optionsToImport.deliveryDateEnd) itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
-        if(optionsToImport.documentDate) itemInfo.value.documentDate = linkedDocument.documentDate
-        if(optionsToImport.paymentDays) itemInfo.value.paymentDays = linkedDocument.paymentDays
-        if(optionsToImport.customSurchargePercentage) itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
-        if(optionsToImport.contactPerson) itemInfo.value.contactPerson = linkedDocument.contactPerson
-        if(optionsToImport.plant) itemInfo.value.plant = linkedDocument.plant
-        if(optionsToImport.project) itemInfo.value.project = linkedDocument.project
-        if(optionsToImport.title) itemInfo.value.title = linkedDocument.title
-        if(optionsToImport.description) itemInfo.value.description = linkedDocument.description
-        if(optionsToImport.startText) itemInfo.value.startText = linkedDocument.startText
-        if(optionsToImport.rows) itemInfo.value.rows = linkedDocument.rows
-        if(optionsToImport.endText) itemInfo.value.endText = linkedDocument.endText
+        if (optionsToImport.taxType) itemInfo.value.taxType = linkedDocument.taxType
+        if (optionsToImport.customer) itemInfo.value.customer = linkedDocument.customer
+        if (optionsToImport.letterhead) itemInfo.value.letterhead = linkedDocument.letterhead
+        if (optionsToImport.contact) itemInfo.value.contact = linkedDocument.contact
+        if (optionsToImport.deliveryDateType) itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
+        if (optionsToImport.deliveryDate) itemInfo.value.deliveryDate = linkedDocument.deliveryDate
+        if (optionsToImport.deliveryDateEnd) itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
+        if (optionsToImport.documentDate) itemInfo.value.documentDate = linkedDocument.documentDate
+        if (optionsToImport.paymentDays) itemInfo.value.paymentDays = linkedDocument.paymentDays
+        if (optionsToImport.customSurchargePercentage) itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
+        if (optionsToImport.contactPerson) itemInfo.value.contactPerson = linkedDocument.contactPerson
+        if (optionsToImport.plant) itemInfo.value.plant = linkedDocument.plant
+        if (optionsToImport.project) itemInfo.value.project = linkedDocument.project
+        if (optionsToImport.title) itemInfo.value.title = linkedDocument.title
+        if (optionsToImport.description) itemInfo.value.description = linkedDocument.description
+        if (optionsToImport.startText) itemInfo.value.startText = linkedDocument.startText
+        if (optionsToImport.rows) itemInfo.value.rows = linkedDocument.rows
+        if (optionsToImport.endText) itemInfo.value.endText = linkedDocument.endText
 
       } else {
         // Import all
 
-        if(process.dev) console.log(linkedDocument)
+        if (process.dev) console.log(linkedDocument)
 
         itemInfo.value.taxType = linkedDocument.taxType
         itemInfo.value.customer = linkedDocument.customer
-        await setCustomerData(null,true)
+        await setCustomerData(null, true)
         itemInfo.value.letterhead = linkedDocument.letterhead
         itemInfo.value.contact = linkedDocument.contact
         itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
@@ -330,10 +330,9 @@ const setupPage = async () => {
       }
 
 
-
       checkCompatibilityWithInputPrice()
 
-      if(route.query.loadMode === "storno") {
+      if (route.query.loadMode === "storno") {
         itemInfo.value.rows.forEach(row => {
           row.price = row.price * -1
         })
@@ -342,7 +341,6 @@ const setupPage = async () => {
 
         itemInfo.value.usedAdvanceInvoices = linkedDocument.usedAdvanceInvoices
 
-        checkForOpenAdvanceInvoices()
 
         itemInfo.value.description = `Stornorechnung zu Rechnung ${linkedDocument.documentNumber} vom ${dayjs(linkedDocument.documentDate).format('DD.MM.YYYY')}`
 
@@ -355,31 +353,29 @@ const setupPage = async () => {
 
     }
 
-    if(route.query.project) {
+    if (route.query.project) {
       itemInfo.value.project = Number(route.query.project)
 
       let project = await useEntities("projects").selectSingle(itemInfo.value.project)
 
-      if(!itemInfo.value.description){
+      if (!itemInfo.value.description) {
         itemInfo.value.description = project.customerRef
       }
 
-      checkForOpenAdvanceInvoices()
 
     }
 
-    if(route.query.plant) {
+    if (route.query.plant) {
       itemInfo.value.plant = Number(route.query.plant)
     }
 
-    if(route.query.contact) itemInfo.value.contact = Number(route.query.contact)
-    if(route.query.customer) {
+    if (route.query.contact) itemInfo.value.contact = Number(route.query.contact)
+    if (route.query.customer) {
       itemInfo.value.customer = Number(route.query.customer)
       setCustomerData()
     }
   }
 
-  //if(itemInfo.value.project) checkForOpenAdvanceInvoices()
 
   loaded.value = true
 
@@ -388,21 +384,21 @@ const setupPage = async () => {
 setupPage()
 
 const setDocumentTypeConfig = (withTexts = false) => {
-  if(itemInfo.value.type === "invoices" ||itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices"|| itemInfo.value.type === "cancellationInvoices") {
+  if (itemInfo.value.type === "invoices" || itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices" || itemInfo.value.type === "cancellationInvoices") {
     itemInfo.value.documentNumberTitle = "Rechnungsnummer"
     itemInfo.value.title = `Rechnung-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "quotes") {
+  } else if (itemInfo.value.type === "quotes") {
     itemInfo.value.documentNumberTitle = "Angebotsnummer"
     itemInfo.value.title = `Angebot-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "deliveryNotes") {
+  } else if (itemInfo.value.type === "deliveryNotes") {
     itemInfo.value.documentNumberTitle = "Lieferscheinnummer"
     itemInfo.value.title = `Lieferschein-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "confirmationOrders") {
+  } else if (itemInfo.value.type === "confirmationOrders") {
     itemInfo.value.documentNumberTitle = "Auftragsbestätigungsnr."
     itemInfo.value.title = `Auftragsbestätigung-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
   }
 
-  if(withTexts) {
+  if (withTexts) {
     itemInfo.value.startText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "startText").text
     itemInfo.value.endText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "endText").text
     //itemInfo.value.startText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "startText").text
@@ -411,7 +407,7 @@ const setDocumentTypeConfig = (withTexts = false) => {
 
   itemInfo.value.letterhead = letterheads.value[0].id
 
-  if(itemInfo.value.type === "advanceInvoices" && !itemInfo.value.rows.find(i => i.text === "Abschlagszahlung")) {
+  if (itemInfo.value.type === "advanceInvoices" && !itemInfo.value.rows.find(i => i.text === "Abschlagszahlung")) {
 
 
     itemInfo.value.rows.push({
@@ -432,11 +428,11 @@ const setDocumentTypeConfig = (withTexts = false) => {
 }
 
 const setTaxType = () => {
-  if(itemInfo.value.taxType === "19 UStG") {
+  if (itemInfo.value.taxType === "19 UStG") {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0
     })
-  } else if(itemInfo.value.taxType === "12.3 UStG") {
+  } else if (itemInfo.value.taxType === "12.3 UStG") {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0
     })
@@ -445,7 +441,7 @@ const setTaxType = () => {
 
 const setCustomerData = async (customerId, loadOnlyAdress = false) => {
 
-  if(customerId){
+  if (customerId) {
     itemInfo.value.customer = customerId
   }
 
@@ -455,20 +451,20 @@ const setCustomerData = async (customerId, loadOnlyAdress = false) => {
   let customer = customers.value.find(i => i.id === itemInfo.value.customer)
   console.log(customer)
   itemInfo.value.contact = null
-  if(customer) {
+  if (customer) {
     itemInfo.value.address.street = customer.infoData.street
     itemInfo.value.address.zip = customer.infoData.zip
     itemInfo.value.address.city = customer.infoData.city
     itemInfo.value.address.special = customer.infoData.special
 
-    if(!loadOnlyAdress && customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
+    if (!loadOnlyAdress && customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
 
-    if(!loadOnlyAdress && customer.customSurchargePercentage) {
+    if (!loadOnlyAdress && customer.customSurchargePercentage) {
       itemInfo.value.customSurchargePercentage = customer.customSurchargePercentage
       updateCustomSurcharge()
     }
 
-    if(!loadOnlyAdress && contacts.value.filter(i => i.customer === itemInfo.value.customer).length === 1) {
+    if (!loadOnlyAdress && contacts.value.filter(i => i.customer === itemInfo.value.customer).length === 1) {
       itemInfo.value.contact = contacts.value.filter(i => i.customer === itemInfo.value.customer)[0].id
     }
 
@@ -478,10 +474,12 @@ const setCustomerData = async (customerId, loadOnlyAdress = false) => {
 }
 
 const setContactPersonData = async () => {
-  //console.log(itemInfo.value.contactPerson) //TODO Set Profile
-  let profile = await useSupabaseSelectSingle("profiles",itemInfo.value.contactPerson, '*')
+  //console.log(itemInfo.value.contactPerson) //TODO: BACKEND CHANGE Set Profile
+  let profile = (await useNuxtApp().$api(`/api/user/${itemInfo.value.created_by}`, {
+    method: "GET"
+  })).profile
 
-  itemInfo.value.contactPersonName = profile.fullName
+  itemInfo.value.contactPersonName = auth.profile.full_name
   itemInfo.value.contactTel = profile.mobileTel || profile.fixedTel || ""
   itemInfo.value.contactEMail = profile.email
 
@@ -494,17 +492,17 @@ const advanceInvoiceData = ref({
   part: 0
 })
 const importPositions = () => {
-  if(itemInfo.value.type === 'advanceInvoices') {
-    if(advanceInvoiceData.value.totalSumNet !== 0 && advanceInvoiceData.value.partPerPecentage !== 0 && advanceInvoiceData.value.part !== 0) {
+  if (itemInfo.value.type === 'advanceInvoices') {
+    if (advanceInvoiceData.value.totalSumNet !== 0 && advanceInvoiceData.value.partPerPecentage !== 0 && advanceInvoiceData.value.part !== 0) {
       showAdvanceInvoiceCalcModal.value = false
 
       let lastId = 0
       itemInfo.value.rows.forEach(row => {
-        if(row.id > lastId) lastId = row.id
+        if (row.id > lastId) lastId = row.id
       })
 
       itemInfo.value.rows.push({
-        id: lastId +1,
+        id: lastId + 1,
         mode: "free",
         text: "Abschlagszahlung",
         quantity: 1,
@@ -522,27 +520,27 @@ const importPositions = () => {
 }
 
 const getRowAmount = (row) => {
-  return String(Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(2)).replace('.',',')
+  return String(Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100)).toFixed(2)).replace('.', ',')
 }
 
 const getRowAmountUndiscounted = (row) => {
-  return String(Number(Number(row.quantity) * Number(row.price)).toFixed(2)).replace('.',',')
+  return String(Number(Number(row.quantity) * Number(row.price)).toFixed(2)).replace('.', ',')
 }
 
 const addPosition = (mode) => {
 
   let lastId = 0
   itemInfo.value.rows.forEach(row => {
-    if(row.id > lastId) lastId = row.id
+    if (row.id > lastId) lastId = row.id
   })
 
   let taxPercentage = 19
 
-  if(['13b UStG','19 UStG','12.3 UStG'].includes(itemInfo.value.taxType)) {
+  if (['13b UStG', '19 UStG', '12.3 UStG'].includes(itemInfo.value.taxType)) {
     taxPercentage = 0
   }
 
-  if(mode === 'free'){
+  if (mode === 'free') {
     let rowData = {
       id: uuidv4(),
       mode: "free",
@@ -556,9 +554,9 @@ const addPosition = (mode) => {
       linkedEntitys: []
     }
 
-    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
+    itemInfo.value.rows.push({...rowData, ...auth.activeTenantData.extraModules.includes("agriculture") ? {agriculture: {}} : {}})
 
-  } else if(mode === 'normal'){
+  } else if (mode === 'normal') {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "normal",
@@ -570,7 +568,7 @@ const addPosition = (mode) => {
       unit: 1,
       linkedEntitys: []
     })
-  } else if(mode === 'service'){
+  } else if (mode === 'service') {
     let rowData = {
       id: uuidv4(),
       mode: "service",
@@ -584,20 +582,20 @@ const addPosition = (mode) => {
     }
 
     //Push Agriculture Holder only if Module is activated
-    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
-  } else if(mode === "pagebreak") {
+    itemInfo.value.rows.push({...rowData, ...auth.activeTenantData.extraModules.includes("agriculture") ? {agriculture: {}} : {}})
+  } else if (mode === "pagebreak") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "pagebreak",
       linkedEntitys: []
     })
-  } else if(mode === "title") {
+  } else if (mode === "title") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "title",
       linkedEntitys: []
     })
-  } else if(mode === "text") {
+  } else if (mode === "text") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "text",
@@ -618,69 +616,115 @@ const removePosition = (id) => {
 }
 
 const findDocumentErrors = computed(() => {
-    let errors = []
+  let errors = []
 
-    if(itemInfo.value.customer === null) errors.push({message: "Es ist kein Kunde ausgewählt", type: "breaking"})
-    if(itemInfo.value.contact === null) errors.push({message: "Es ist kein Kontakt ausgewählt", type: "info"})
-    if(itemInfo.value.letterhead === null) errors.push({message: "Es ist kein Briefpapier ausgewählt", type: "breaking"})
-    if(itemInfo.value.address.street === null) errors.push({message: "Es ist keine Straße im Adressat angegeben", type: "breaking"})
-    if(itemInfo.value.address.zip === null) errors.push({message: "Es ist keine Postleitzahl im Adressat angegeben", type: "breaking"})
-    if(itemInfo.value.address.city === null) errors.push({message: "Es ist keine Stadt im Adressat angegeben", type: "breaking"})
+  if (itemInfo.value.customer === null) errors.push({message: "Es ist kein Kunde ausgewählt", type: "breaking"})
+  if (itemInfo.value.contact === null) errors.push({message: "Es ist kein Kontakt ausgewählt", type: "info"})
+  if (itemInfo.value.letterhead === null) errors.push({message: "Es ist kein Briefpapier ausgewählt", type: "breaking"})
+  if (itemInfo.value.address.street === null) errors.push({
+    message: "Es ist keine Straße im Adressat angegeben",
+    type: "breaking"
+  })
+  if (itemInfo.value.address.zip === null) errors.push({
+    message: "Es ist keine Postleitzahl im Adressat angegeben",
+    type: "breaking"
+  })
+  if (itemInfo.value.address.city === null) errors.push({
+    message: "Es ist keine Stadt im Adressat angegeben",
+    type: "breaking"
+  })
 
-    if(itemInfo.value.project === null) errors.push({message: "Es ist kein Projekt ausgewählt", type: "info"})
+  if (itemInfo.value.project === null) errors.push({message: "Es ist kein Projekt ausgewählt", type: "info"})
 
-    if(['Lieferzeitraum','Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) && itemInfo.value.type !== "serialInvoices") {
-      if(itemInfo.value.deliveryDateEnd === null) errors.push({message: `Es ist kein Enddatum für den ${itemInfo.value.deliveryDateType} angegeben`, type: "breaking"})
-    }
+  if (['Lieferzeitraum', 'Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) && itemInfo.value.type !== "serialInvoices") {
+    if (itemInfo.value.deliveryDateEnd === null) errors.push({
+      message: `Es ist kein Enddatum für den ${itemInfo.value.deliveryDateType} angegeben`,
+      type: "breaking"
+    })
+  }
 
 
-    if(itemInfo.value.rows.length === 0) {
-      errors.push({message: "Es sind keine Positionen angegeben", type: "breaking"})
-    } else {
-      itemInfo.value.rows.forEach(row => {
+  if (itemInfo.value.rows.length === 0) {
+    errors.push({message: "Es sind keine Positionen angegeben", type: "breaking"})
+  } else {
+    itemInfo.value.rows.forEach(row => {
 
-        if(itemInfo.value.type !== "quotes" && row.optional) {
-          errors.push({message: `Position ${row.pos} ist als Optional markiert. Dies wird nur in Angeboten unterstützt.`, type: "breaking"})
-        }
+      if (itemInfo.value.type !== "quotes" && row.optional) {
+        errors.push({
+          message: `Position ${row.pos} ist als Optional markiert. Dies wird nur in Angeboten unterstützt.`,
+          type: "breaking"
+        })
+      }
 
-        if(itemInfo.value.type !== "quotes" && row.alternative) {
-          errors.push({message: `Position ${row.pos} ist als Alternativ markiert. Dies wird nur in Angeboten unterstützt.`, type: "breaking"})
-        }
-
-        if(row.mode === "normal" && !row.product) errors.push({message: `In Position ${row.pos} ist kein Artikel ausgewählt`, type: "breaking"})
-        if(row.mode === "service" && !row.service) errors.push({message: `In Position ${row.pos} ist keine Leistung ausgewählt`, type: "breaking"})
-        if(row.mode === "title" && !row.text) errors.push({message: `In Position ${row.pos} ist kein Titel hinterlegt`, type: "breaking"})
-        //if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
-        if(row.mode === "free" && !row.text) errors.push({message: `In einer freien Position ist kein Titel hinterlegt`, type: "breaking"})
-
-        if(["normal","service","free"].includes(row.mode)){
-
-          if(!row.taxPercent && typeof row.taxPercent !== "number") errors.push({message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`, type: "breaking"})
-          if(!row.price && typeof row.price !== "number") errors.push({message: `In Position ${row.pos} ist kein Preis hinterlegt`, type: "breaking"})
-          if(!row.unit) errors.push({message: `In Position ${row.pos} ist keine Einheit hinterlegt`, type: "breaking"})
-
-        }
-
-        if(row.agriculture){
-          if(row.agriculture.dieselUsage && (!row.agriculture.dieselPrice && typeof row.agriculture.dieselPrice !== "number")) {
-            errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
-          } else if(row.agriculture.dieselUsage && row.agriculture.dieselPrice === 0) {
-            errors.push({message: `In Position ${row.pos} ist 0,00 € als Dieselpreis hinterlegt`, type: "info"})
-          }
-        }
+      if (itemInfo.value.type !== "quotes" && row.alternative) {
+        errors.push({
+          message: `Position ${row.pos} ist als Alternativ markiert. Dies wird nur in Angeboten unterstützt.`,
+          type: "breaking"
+        })
+      }
 
+      if (row.mode === "normal" && !row.product) errors.push({
+        message: `In Position ${row.pos} ist kein Artikel ausgewählt`,
+        type: "breaking"
       })
-    }
+      if (row.mode === "service" && !row.service) errors.push({
+        message: `In Position ${row.pos} ist keine Leistung ausgewählt`,
+        type: "breaking"
+      })
+      if (row.mode === "title" && !row.text) errors.push({
+        message: `In Position ${row.pos} ist kein Titel hinterlegt`,
+        type: "breaking"
+      })
+      //if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
+      if (row.mode === "free" && !row.text) errors.push({
+        message: `In einer freien Position ist kein Titel hinterlegt`,
+        type: "breaking"
+      })
+
+      if (["normal", "service", "free"].includes(row.mode)) {
+
+        if (!row.taxPercent && typeof row.taxPercent !== "number") errors.push({
+          message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`,
+          type: "breaking"
+        })
+        if (!row.price && typeof row.price !== "number") errors.push({
+          message: `In Position ${row.pos} ist kein Preis hinterlegt`,
+          type: "breaking"
+        })
+        if (!row.unit) errors.push({message: `In Position ${row.pos} ist keine Einheit hinterlegt`, type: "breaking"})
+
+      }
+
+      if (row.agriculture) {
+        if (row.agriculture.dieselUsage && (!row.agriculture.dieselPrice && typeof row.agriculture.dieselPrice !== "number")) {
+          errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
+        } else if (row.agriculture.dieselUsage && row.agriculture.dieselPrice === 0) {
+          errors.push({message: `In Position ${row.pos} ist 0,00 € als Dieselpreis hinterlegt`, type: "info"})
+        }
+      }
+
+    })
+  }
 
 
-
-
-    if(itemInfo.value.type === "serialInvoices") {
-      if(!itemInfo.value.serialConfig.intervall) errors.push({message: `Kein Intervall für die Ausführung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.dateDirection) errors.push({message: `Kein Richtung für die Datierung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.firstExecution) errors.push({message: `Kein Datum für die erste Ausführung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.executionUntil) errors.push({message: `Kein Datum für die letzte Ausführung festgelegt`, type: "info"})
-    }
+  if (itemInfo.value.type === "serialInvoices") {
+    if (!itemInfo.value.serialConfig.intervall) errors.push({
+      message: `Kein Intervall für die Ausführung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.dateDirection) errors.push({
+      message: `Kein Richtung für die Datierung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.firstExecution) errors.push({
+      message: `Kein Datum für die erste Ausführung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.executionUntil) errors.push({
+      message: `Kein Datum für die letzte Ausführung festgelegt`,
+      type: "info"
+    })
+  }
 
 
   return errors.sort((a) => (a.type === "breaking") ? -1 : 1)
@@ -713,17 +757,17 @@ const documentTotal = computed(() => {
   let totalNet0 = 0
 
   itemInfo.value.rows.filter(i => !i.optional && !i.alternative).forEach(row => {
-    if(!['pagebreak','title','text'].includes(row.mode)){
-      let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(3)
+    if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100)).toFixed(3)
       totalNet = totalNet + Number(rowPrice)
 
-      if(row.taxPercent === 19) {
+      if (row.taxPercent === 19) {
         total19 = total19 + Number(rowPrice * 0.19)
         totalNet19 += Number(rowPrice)
-      } else if(row.taxPercent === 7) {
+      } else if (row.taxPercent === 7) {
         total7 = total7 + Number(rowPrice * 0.07)
         totalNet7 += Number(rowPrice)
-      } else if(row.taxPercent === 0) {
+      } else if (row.taxPercent === 0) {
         totalNet0 += Number(rowPrice)
       }
     }
@@ -737,18 +781,18 @@ const documentTotal = computed(() => {
   let transferCounter = 0
 
   itemInfo.value.rows.forEach(row => {
-    if(row.mode === 'title'){
+    if (row.mode === 'title') {
       let title = `${row.pos} - ${row.text}`
       titleSums[title] = 0
       lastTitle = title
 
       //Übertrag berechnen
-      titleSumsTransfer[Object.keys(titleSums)[row.pos-2]] = transferCounter
+      titleSumsTransfer[Object.keys(titleSums)[row.pos - 2]] = transferCounter
 
 
-    } else if(!['pagebreak','text'].includes(row.mode) && lastTitle !== "" && !row.optional && !row.alternative){
-      titleSums[lastTitle] = Number(titleSums[lastTitle]) + Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) )
-      transferCounter += Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) )
+    } else if (!['pagebreak', 'text'].includes(row.mode) && lastTitle !== "" && !row.optional && !row.alternative) {
+      titleSums[lastTitle] = Number(titleSums[lastTitle]) + Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100))
+      transferCounter += Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100))
       console.log(transferCounter)
     }
   })
@@ -756,8 +800,6 @@ const documentTotal = computed(() => {
   console.log(titleSumsTransfer)
 
 
-
-
   let totalGross = Number(totalNet.toFixed(2)) + Number(total19.toFixed(2)) + Number(total7.toFixed(2))
 
   let totalGrossAlreadyPaid = 0
@@ -776,21 +818,14 @@ const documentTotal = computed(() => {
 
   let sumToPay = 0
 
-  if(itemInfo.value.type === "invoices") {
+  if (itemInfo.value.type === "invoices") {
     sumToPay = totalGross - totalGrossAlreadyPaid
-  } else if(itemInfo.value.type === "cancellationInvoices") {
+  } else if (itemInfo.value.type === "cancellationInvoices") {
     sumToPay = totalGross + totalGrossAlreadyPaid
 
   }
 
 
-
-
-
-
-
-
-
   return {
     titleSums: titleSums,
     titleSumsTransfer: titleSumsTransfer,
@@ -820,15 +855,15 @@ const documentReport = computed(() => {
 
 
   itemInfo.value.rows.filter(i => !i.optional && !i.alternative).forEach(row => {
-    if(row.product) {
+    if (row.product) {
       let product = products.value.find(i => i.id === row.product)
 
       totalProductsPurchasePrice += product.purchasePrice * row.quantity
 
-    } else if(row.service) {
+    } else if (row.service) {
       let service = services.value.find(i => i.id === row.service)
 
-      if(service.materialComposition) {
+      if (service.materialComposition) {
         service.materialComposition.forEach(entry => {
           let productData = products.value.find(i => i.id === entry.product)
 
@@ -836,21 +871,20 @@ const documentReport = computed(() => {
         })
       }
 
-      if(service.personalComposition) {
+      if (service.personalComposition) {
         service.personalComposition.forEach(entry => {
           totalHoursFromServices.total += entry.quantity * row.quantity
 
           totalHoursFromServices.totalPurchasePrice += entry.quantity * entry.purchasePrice * row.quantity
           totalHoursSellingPrice += entry.quantity * entry.price * row.quantity
 
-          if(totalHoursFromServices.byName[entry.name]) {
+          if (totalHoursFromServices.byName[entry.name]) {
             totalHoursFromServices.byName[entry.name] += entry.quantity * row.quantity
           } else {
             totalHoursFromServices.byName[entry.name] = entry.quantity * row.quantity
           }
 
 
-
         })
       } else {
         //totalHoursSellingPrice += service.sellingPriceComposed.totalWorker * row.quantity
@@ -883,7 +917,7 @@ const processDieselPosition = () => {
   }
 
   itemInfo.value.rows.forEach(row => {
-    if(row.agriculture && row.agriculture.dieselUsage) {
+    if (row.agriculture && row.agriculture.dieselUsage) {
       console.log(row.agriculture)
       agricultureData.dieselUsageTotal += Number(row.agriculture.dieselUsage)
       agricultureData.dieselPriceTotal += Number(row.agriculture.dieselPrice || 0) * Number(row.agriculture.dieselUsage)
@@ -894,9 +928,9 @@ const processDieselPosition = () => {
   })
   console.log(agricultureData)
 
-  if(agricultureData.dieselUsageTotal !== 0) {
+  if (agricultureData.dieselUsageTotal !== 0) {
 
-    if(itemInfo.value.rows.find(i => i.key === "dieselPos")){
+    if (itemInfo.value.rows.find(i => i.key === "dieselPos")) {
       let existingIndex = itemInfo.value.rows.findIndex(i => i.key === "dieselPos")
 
       itemInfo.value.rows[existingIndex] = {
@@ -916,7 +950,7 @@ const processDieselPosition = () => {
     } else {
       itemInfo.value.rows.push({
         mode: "free",
-        text: `${(agricultureData.dieselUsageTotal).toFixed(2).replace(".",",")} L Diesel`,
+        text: `${(agricultureData.dieselUsageTotal).toFixed(2).replace(".", ",")} L Diesel`,
         quantity: 1,
         unit: 10,
         price: agricultureData.dieselPriceTotal,
@@ -927,7 +961,7 @@ const processDieselPosition = () => {
 
       itemInfo.value.rows.push({
         mode: "free",
-        text: `${(agricultureData.adblueUsageTotal).toFixed(2).replace(".",",")} L AdBlue`,
+        text: `${(agricultureData.adblueUsageTotal).toFixed(2).replace(".", ",")} L AdBlue`,
         quantity: 1,
         unit: 10,
         price: agricultureData.adbluePriceTotal,
@@ -943,15 +977,15 @@ const processDieselPosition = () => {
   itemInfo.value.agriculture = {...itemInfo.value.agriculture, ...agricultureData}
 }
 
-const getDocumentData = () => {
+const getDocumentData = async () => {
 
   let customerData = customers.value.find(i => i.id === itemInfo.value.customer)
-  let contactData = dataStore.getContactById(itemInfo.value.contact)
-  let businessInfo = profileStore.ownTenant.businessInfo
+  let contactData = contacts.value.find(i => i.id === itemInfo.value.contact)
+  let businessInfo = auth.activeTenantData.businessInfo
 
-  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
+  if (auth.activeTenantData.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
-      if(row.agriculture && row.agriculture.dieselUsage) {
+      if (row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
       }
     })
@@ -959,25 +993,25 @@ const getDocumentData = () => {
 
   let rows = itemInfo.value.rows
 
-  if(itemInfo.value.taxType === "13b UStG" || itemInfo.value.taxType === "19 UStG") {
-      rows = rows.map(row => {
-        return {
-          ...row,
-          taxPercent: 0
-        }
-      })
+  if (itemInfo.value.taxType === "13b UStG" || itemInfo.value.taxType === "19 UStG") {
+    rows = rows.map(row => {
+      return {
+        ...row,
+        taxPercent: 0
+      }
+    })
   }
 
 
   rows = itemInfo.value.rows.map(row => {
 
-    let unit = dataStore.units.find(i => i.id === row.unit)
+    let unit = units.value.find(i => i.id === row.unit)
 
-    if(!['pagebreak','title'].includes(row.mode)){
-      if(row.agriculture && row.agriculture.description) {
+    if (!['pagebreak', 'title'].includes(row.mode)) {
+      if (row.agriculture && row.agriculture.description) {
         console.log("Row has Agri")
         row.descriptionText = row.agriculture.description
-      } else if(row.description) {
+      } else if (row.description) {
         console.log("Row has no Agri")
         row.descriptionText = row.description
       } else {
@@ -985,18 +1019,18 @@ const getDocumentData = () => {
       }
     }
 
-    if(!['pagebreak','title','text'].includes(row.mode)) {
-      if(row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
-      if(row.mode === 'service') row.text = services.value.find(i => i.id === row.service).name
+    if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      if (row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
+      if (row.mode === 'service') row.text = services.value.find(i => i.id === row.service).name
 
 
       return {
         ...row,
         rowAmount: `${getRowAmount(row)} €`,
-        quantity: String(row.quantity).replace(".",","),
+        quantity: String(row.quantity).replace(".", ","),
         unit: unit.short,
         pos: String(row.pos),
-        price: `${String(row.price.toFixed(2)).replace(".",",")} €`,
+        price: `${String(row.price.toFixed(2)).replace(".", ",")} €`,
         discountText: `(Rabatt: ${row.discountPercent} %)`
       }
     } else {
@@ -1011,27 +1045,29 @@ const getDocumentData = () => {
   const generateContext = (itemInfo, contactData) => {
     return {
       lohnkosten: documentReport.value.totalHoursSellingPrice ? useCurrency(documentReport.value.totalHoursSellingPrice) : null,
-      anrede:(contactData && contactData.salutation) || (customerData && customerData.salutation),
-      titel:(contactData && contactData.title) || (customerData && customerData.title),
-      vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname),
+      anrede: (contactData && contactData.salutation) || (customerData && customerData.salutation),
+      titel: (contactData && contactData.title) || (customerData && customerData.title),
+      vorname: (contactData && contactData.firstName) || (customerData && customerData.firstname),
       nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
       kundenname: customerData && customerData.name,
-      zahlungsziel_in_tagen:itemInfo.paymentDays,
+      zahlungsziel_in_tagen: itemInfo.paymentDays,
       diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
     }
   }
 
-  let contactPerson = profileStore.getProfileById(itemInfo.value.contactPerson)
+  let contactPerson = (await useNuxtApp().$api(`/api/user/${itemInfo.value.created_by}`, {
+    method: "GET"
+  })).profile
 
   let returnTitleSums = {}
-  if(Object.keys(documentTotal.value.titleSums).length > 0) {
+  if (Object.keys(documentTotal.value.titleSums).length > 0) {
     Object.keys(documentTotal.value.titleSums).forEach(key => {
       returnTitleSums[key] = renderCurrency(documentTotal.value.titleSums[key])
     })
   }
 
   let returnTitleSumsTransfer = {}
-  if(Object.keys(documentTotal.value.titleSumsTransfer).length > 0) {
+  if (Object.keys(documentTotal.value.titleSumsTransfer).length > 0) {
     Object.keys(documentTotal.value.titleSumsTransfer).forEach(key => {
       returnTitleSumsTransfer[key] = renderCurrency(documentTotal.value.titleSumsTransfer[key])
     })
@@ -1054,12 +1090,12 @@ const getDocumentData = () => {
       zip: itemInfo.value.address.zip || customerData.infoData.zip
     },*/
     recipient: [
-        customerData.name,
-        ... customerData.nameAddition ? [customerData.nameAddition] : [],
-        ... contactData ? [`${contactData.firstName} ${contactData.lastName}`] : [],
-        itemInfo.value.address.street,
-        ... itemInfo.value.address.special ? [itemInfo.value.address.special] : [],
-        `${itemInfo.value.address.zip} ${itemInfo.value.address.city}`,
+      customerData.name,
+      ...customerData.nameAddition ? [customerData.nameAddition] : [],
+      ...contactData ? [`${contactData.firstName} ${contactData.lastName}`] : [],
+      itemInfo.value.address.street,
+      ...itemInfo.value.address.special ? [itemInfo.value.address.special] : [],
+      `${itemInfo.value.address.zip} ${itemInfo.value.address.city}`,
 
     ],
     /*info: {
@@ -1080,16 +1116,16 @@ const getDocumentData = () => {
       {
         label: itemInfo.value.documentNumberTitle,
         content: itemInfo.value.documentNumber || "XXXX",
-      },{
+      }, {
         label: "Kundennummer",
         content: customerData.customerNumber,
-      },{
+      }, {
         label: "Belegdatum",
         content: itemInfo.value.documentDate ? dayjs(itemInfo.value.documentDate).format("DD.MM.YYYY") : "XXXX",
       },
-      ... itemInfo.value.deliveryDateType !== "Kein Lieferdatum anzeigen" ? [{
-        label:  itemInfo.value.deliveryDateType,
-        content: !['Lieferzeitraum','Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) ? (itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX") : `${itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX"} - ${itemInfo.value.deliveryDateEnd ? dayjs(itemInfo.value.deliveryDateEnd).format("DD.MM.YYYY") : "XXXX"}`,
+      ...itemInfo.value.deliveryDateType !== "Kein Lieferdatum anzeigen" ? [{
+        label: itemInfo.value.deliveryDateType,
+        content: !['Lieferzeitraum', 'Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) ? (itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX") : `${itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX"} - ${itemInfo.value.deliveryDateEnd ? dayjs(itemInfo.value.deliveryDateEnd).format("DD.MM.YYYY") : "XXXX"}`,
       }] : [],
       /*{
         label: itemInfo.value.deliveryDateType,
@@ -1097,24 +1133,24 @@ const getDocumentData = () => {
       },*/
       {
         label: "Ansprechpartner",
-        content: contactPerson.fullName,
+        content: contactPerson.full_name,
       },
-      ... contactPerson.fixedTel || contactPerson.mobileTel ? [{
+      ...contactPerson.fixedTel || contactPerson.mobileTel ? [{
         label: "Telefon",
         content: contactPerson.fixedTel || contactPerson.mobileTel,
       }] : [],
-      ... contactPerson.email ? [{
+      ...contactPerson.email ? [{
         label: "E-Mail",
         content: contactPerson.email,
-      }]: [],
-      ... itemInfo.value.plant ? [{
+      }] : [],
+      ...itemInfo.value.plant ? [{
         label: "Objekt",
         content: plants.value.find(i => i.id === itemInfo.value.plant).name,
-      }]  : [],
-      ... itemInfo.value.project ? [{
+      }] : [],
+      ...itemInfo.value.project ? [{
         label: "Projekt",
         content: projects.value.find(i => i.id === itemInfo.value.project).name
-      }]: []
+      }] : []
     ],
     title: itemInfo.value.title,
     description: itemInfo.value.description,
@@ -1126,18 +1162,18 @@ const getDocumentData = () => {
         label: "Nettobetrag",
         content: renderCurrency(documentTotal.value.totalNet),
       },
-      ... rows.find(i => i.taxPercent === 19) ? [{
+      ...rows.find(i => i.taxPercent === 19) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 19% USt auf ${renderCurrency(documentTotal.value.totalNet19)}`,
         content: renderCurrency(documentTotal.value.total19),
       }] : [],
-      ... rows.find(i => i.taxPercent === 7) ? [{
+      ...rows.find(i => i.taxPercent === 7) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 7% USt auf ${renderCurrency(documentTotal.value.totalNet7)}`,
         content: renderCurrency(documentTotal.value.total7),
-      }]: [],
-      ...rows.find(i => i.taxPercent === 0) ? [{
+      }] : [],
+      ...rows.find(i => i.taxPercent === 0) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 0% USt auf ${renderCurrency(documentTotal.value.totalNet0)}`,
         content: renderCurrency(documentTotal.value.total0),
-      }]  : [],
+      }] : [],
       {
         label: "Gesamtbetrag",
         content: renderCurrency(documentTotal.value.totalGross),
@@ -1169,13 +1205,20 @@ const uri = ref("")
 const generateDocument = async () => {
   const path = letterheads.value.find(i => i.id === itemInfo.value.letterhead).path
 
-  uri.value = await useFunctions().useCreatePDF(getDocumentData(), path)
+  uri.value = await useFunctions().useCreatePDF(await getDocumentData(), path)
+  /*uri.value = await useNuxtApp().$api("/api/functions/createinvoicepdf",{
+    method: "POST",
+    body: {
+      invoiceData: await getDocumentData(),
+      backgroundPath: path
+    }
+  })*/
 
   showDocument.value = true
 }
 
 const onChangeTab = (index) => {
-  if(index === 1) {
+  if (index === 1) {
     generateDocument()
   }
 }
@@ -1184,16 +1227,16 @@ const setPosNumbers = () => {
   let mainIndex = 1
   let subIndex = 1
   let rows = itemInfo.value.rows.map(row => {
-    if(row.mode === 'title') {
+    if (row.mode === 'title') {
       row.pos = mainIndex
       mainIndex += 1
       subIndex = 1
-    } else if(!['pagebreak','title','text'].includes(row.mode)) {
-      row.pos = itemInfo.value.rows.filter(i => i.mode === "title").length === 0 ? `${subIndex}` :`${ mainIndex - 1}.${subIndex}`
+    } else if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      row.pos = itemInfo.value.rows.filter(i => i.mode === "title").length === 0 ? `${subIndex}` : `${mainIndex - 1}.${subIndex}`
       subIndex += 1
     }
 
-    if(!row.id) {
+    if (!row.id) {
       row.id = uuidv4()
     }
 
@@ -1224,7 +1267,7 @@ const saveSerialInvoice = async () => {
 
   let data = null
 
-  if(route.params.id) {
+  if (route.params.id) {
     data = await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
   } else {
     data = await dataStore.createNewItem("createddocuments", createData)
@@ -1233,15 +1276,15 @@ const saveSerialInvoice = async () => {
   await router.push(`/createDocument/edit/${data.id}`)
 }
 
-const saveDocument = async (state,resetup = false) => {
+const saveDocument = async (state, resetup = false) => {
 
   itemInfo.value.state = state
 
-  if(state !== "Entwurf") {
+  if (state !== "Entwurf") {
     console.log("???")
 
     let type = ""
-    if(itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "cancellationInvoices"){
+    if (itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "cancellationInvoices") {
       type = "invoices"
     } else {
       type = itemInfo.value.type
@@ -1256,13 +1299,11 @@ const saveDocument = async (state,resetup = false) => {
     }
 
 
-
-
   }
 
-  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
+  if (auth.activeTenantData.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
-      if(row.agriculture && row.agriculture.dieselUsage) {
+      if (row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
       }
     })
@@ -1273,7 +1314,7 @@ const saveDocument = async (state,resetup = false) => {
 
     let descriptionText = ""
 
-    if(row.agriculture && row.agriculture.description) {
+    if (row.agriculture && row.agriculture.description) {
       descriptionText = row.agriculture.description
     } else {
       descriptionText = row.description ? row.description : null
@@ -1287,7 +1328,7 @@ const saveDocument = async (state,resetup = false) => {
 
   let createData = {
     type: itemInfo.value.type,
-    taxType: ['invoices','cancellationInvoices','advanceInvoices','qoutes','confirmationOrders'].includes(itemInfo.value.type) ? itemInfo.value.taxType : null,
+    taxType: ['invoices', 'cancellationInvoices', 'advanceInvoices', 'qoutes', 'confirmationOrders'].includes(itemInfo.value.type) ? itemInfo.value.taxType : null,
     state: itemInfo.value.state || "Entwurf",
     customer: itemInfo.value.customer,
     contact: itemInfo.value.contact,
@@ -1302,6 +1343,7 @@ const saveDocument = async (state,resetup = false) => {
     deliveryDateType: itemInfo.value.deliveryDateType,
     info: {},
     createdBy: itemInfo.value.createdBy,
+    created_by: itemInfo.value.created_by,
     title: itemInfo.value.title,
     description: itemInfo.value.description,
     startText: itemInfo.value.startText,
@@ -1316,15 +1358,16 @@ const saveDocument = async (state,resetup = false) => {
     report: documentReport.value
   }
 
-  if(route.params.id) {
-    await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
+  if (route.params.id) {
+    //await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
+    await useEntities("createddocuments").update(itemInfo.value.id, {...createData, id: itemInfo.value.id})
   } else {
-    const data = await dataStore.createNewItem("createddocuments", createData)
+    const data = await useEntities("createddocuments").create(createData)
     console.log(data)
     await router.push(`/createDocument/edit/${data.id}`)
   }
 
-  if(resetup) await setupPage()
+  if (resetup) await setupPage()
 }
 
 const closeDocument = async () => {
@@ -1342,13 +1385,16 @@ const closeDocument = async () => {
 
   let mappedType = itemInfo.value.type
 
-  if(mappedType === "advanceInvoices" || mappedType === "cancellationInvoices"){
+  if (mappedType === "advanceInvoices" || mappedType === "cancellationInvoices") {
     mappedType = "invoices"
   }
 
-  fileData.folder = (await supabase.from("folders").select("id").eq("tenant", profileStore.currentTenant).eq("function", mappedType).eq("year",dayjs().format("YYYY")).single()).data.id
+  const folders = await useEntities("folders").select()
+  console.log(folders)
+  fileData.folder = folders.find(i => i.function === mappedType && i.year === Number(dayjs().format("YYYY"))).id
 
-  let tag  = (await supabase.from("filetags").select("id").eq("tenant", profileStore.currentTenant).eq("createddocumenttype", mappedType).single()).data
+  const tags = await useEntities("filetags").select()
+  fileData.type = tags.find(i => i.createddocumenttype === mappedType).id
 
   function dataURLtoFile(dataurl, filename) {
     var arr = dataurl.split(","),
@@ -1359,12 +1405,12 @@ const closeDocument = async () => {
     while (n--) {
       u8arr[n] = bstr.charCodeAt(n);
     }
-    return new File([u8arr], filename, { type: mime });
+    return new File([u8arr], filename, {type: mime});
   }
 
   let file = dataURLtoFile(uri.value, `${itemInfo.value.documentNumber}.pdf`)
 
-  await dataStore.uploadFiles(fileData,  [file],[tag.id], true)
+  await useFiles().uploadFiles(fileData, [file])
 
   await router.push(`/createDocument/show/${itemInfo.value.id}`)
 
@@ -1374,11 +1420,11 @@ const getTextTemplateByType = (type, pos) => {
 
   let finalType = type
 
-  if(type === "serialInvoices") {
+  if (type === "serialInvoices") {
     finalType = "invoices"
   }
 
-  if(pos) {
+  if (pos) {
     return texttemplates.value.filter(i => i.documentType === finalType && i.pos === pos)
   } else {
     return texttemplates.value.filter(i => i.documentType === finalType)
@@ -1389,7 +1435,7 @@ const getTextTemplateByType = (type, pos) => {
 
 const checkCompatibilityWithInputPrice = () => {
   itemInfo.value.rows.forEach(row => {
-    if(!row.inputPrice) {
+    if (!row.inputPrice) {
       row.inputPrice = row.price
     }
   })
@@ -1397,10 +1443,10 @@ const checkCompatibilityWithInputPrice = () => {
 
 const updateCustomSurcharge = () => {
   itemInfo.value.rows.forEach(row => {
-    if(!["pagebreak","title","text"].includes(row.mode) /*&& !row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*/) {
+    if (!["pagebreak", "title", "text"].includes(row.mode) /*&& !row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*/) {
       //setRowData(row)
 
-      row.price = Number((row.inputPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2))
+      row.price = Number((row.inputPrice * (1 + itemInfo.value.customSurchargePercentage / 100)).toFixed(2))
 
 
     }/* else if(!["pagebreak","title","text"].includes(row.mode) /!*&& row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*!/) {
@@ -1411,36 +1457,36 @@ const updateCustomSurcharge = () => {
 
 const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {}) => {
   console.log("Set Row Data")
-  if(service && service.id) {
+  if (service && service.id) {
     row.service = service.id
     services.value = await useEntities("services").select("*")
   }
 
-  if(product && product.id) {
+  if (product && product.id) {
     row.product = product.id
     product.value = await useEntities("products").select("*")
   }
 
-  if(row.service) {
+  if (row.service) {
     row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit
     row.inputPrice = ((service.sellingPriceComposed.total || service.sellingPrice) ? (service.sellingPriceComposed.total || service.sellingPrice) : (services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice))
     row.description = service.description ? service.description : (services.value.find(i => i.id === row.service) ? services.value.find(i => i.id === row.service).description : "")
 
-    if(['13b UStG','19 UStG'].includes(itemInfo.value.taxType)) {
+    if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) {
       row.taxPercent = 0
     } else {
       row.taxPercent = service.taxPercentage ? service.taxPercentage : services.value.find(i => i.id === row.service).taxPercentage
     }
   }
 
-  if(row.product) {
+  if (row.product) {
     console.log("Product Detected")
     row.unit = product.unit ? product.unit : products.value.find(i => i.id === row.product).unit
     row.inputPrice = (product.sellingPrice ? product.sellingPrice : products.value.find(i => i.id === row.product).sellingPrice)
     //row.price = Number((row.originalPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2))
     row.description = product.description ? product.description : (products.value.find(i => i.id === row.product) ? products.value.find(i => i.id === row.product).description : "")
 
-    if(['13b UStG','19 UStG'].includes(itemInfo.value.taxType)) {
+    if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) {
       row.taxPercent = 0
     } else {
       row.taxPercent = product.taxPercentage ? product.taxPercentage : products.value.find(i => i.id === row.product).taxPercentage
@@ -1495,9 +1541,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
         Fertigstellen
       </UButton>
       <UButton
-        icon="i-mdi-content-save"
-        @click="saveSerialInvoice"
-        v-if="itemInfo.type === 'serialInvoices'"
+          icon="i-mdi-content-save"
+          @click="saveSerialInvoice"
+          v-if="itemInfo.type === 'serialInvoices'"
       >
         Serienrechnung
       </UButton>
@@ -1510,15 +1556,16 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
 
           <UAlert
               class="my-5"
-            title="Vorhandene Probleme und Informationen:"
-            :color="findDocumentErrors.filter(i => i.type === 'breaking').length > 0 ? 'rose' : 'white'"
-            variant="outline"
+              title="Vorhandene Probleme und Informationen:"
+              :color="findDocumentErrors.filter(i => i.type === 'breaking').length > 0 ? 'rose' : 'white'"
+              variant="outline"
               v-if="findDocumentErrors.length > 0"
           >
             <template #description>
               <ul class="list-disc ml-5">
-                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
-                  {{error.message}}
+                <li v-for="error in findDocumentErrors"
+                    :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
+                  {{ error.message }}
                 </li>
               </ul>
             </template>
@@ -1541,19 +1588,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       class="flex-auto"
                   >
                     <template #label>
-                      {{dataStore.documentTypesForCreation[itemInfo.type].labelSingle}}
+                      {{ dataStore.documentTypesForCreation[itemInfo.type].labelSingle }}
                     </template>
                   </USelectMenu>
-<!--                  <UButton
-                      variant="outline"
-                      v-if="itemInfo.type === 'advanceInvoices'"
-                      icon="i-heroicons-arrow-down-tray"
-                      @click="showAdvanceInvoiceCalcModal = true"
-                  >Auto Positionen</UButton>-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        v-if="itemInfo.type === 'advanceInvoices'"
+                                        icon="i-heroicons-arrow-down-tray"
+                                        @click="showAdvanceInvoiceCalcModal = true"
+                                    >Auto Positionen</UButton>-->
                 </InputGroup>
 
                 <USlideover
-                  v-model="showAdvanceInvoiceCalcModal"
+                    v-model="showAdvanceInvoiceCalcModal"
                 >
                   <UCard class="h-full">
                     <template #header>
@@ -1561,13 +1608,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     </template>
 
                     <UFormGroup
-                      label="Gesamtsumme:"
+                        label="Gesamtsumme:"
                     >
                       <UInput
-                        type="number"
-                        :step="0.01"
-                        v-model="advanceInvoiceData.totalSumNet"
-                        @focusout="advanceInvoiceData.part = advanceInvoiceData.totalSumNet / 100 * advanceInvoiceData.partPerPecentage"
+                          type="number"
+                          :step="0.01"
+                          v-model="advanceInvoiceData.totalSumNet"
+                          @focusout="advanceInvoiceData.part = advanceInvoiceData.totalSumNet / 100 * advanceInvoiceData.partPerPecentage"
                       />
                     </UFormGroup>
                     <UFormGroup
@@ -1593,7 +1640,6 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     </UFormGroup>
 
 
-
                   </UCard>
 
                 </USlideover>
@@ -1629,7 +1675,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     :color="itemInfo.letterhead ? 'primary' : 'rose'"
                 >
                   <template #label>
-                    {{itemInfo.letterhead ? letterheads.find(i => i.id === itemInfo.letterhead).name : "Kein Briefpapier gewählt"}}
+                    {{ itemInfo.letterhead ? letterheads.find(i => i.id === itemInfo.letterhead).name : "Kein Briefpapier gewählt" }}
                   </template>
                 </USelectMenu>
               </UFormGroup>
@@ -1650,16 +1696,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       class="flex-auto"
                   >
                     <template #option="{option}">
-                      {{option.name}}{{option.nameAddition}}
+                      {{ option.name }}{{ option.nameAddition }}
                     </template>
                     <UButton
                         :color="itemInfo.customer ? 'primary' : 'rose'"
                         variant="outline"
                         class="w-full"
                     >
-                      {{customers.find(i => i.id === itemInfo.customer) ? customers.find(i => i.id === itemInfo.customer).name : "Kein Kunde ausgewählt"}}
+                      {{ customers.find(i => i.id === itemInfo.customer) ? customers.find(i => i.id === itemInfo.customer).name : "Kein Kunde ausgewählt" }}
 
-                      <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
+                      <UIcon name="i-heroicons-chevron-right-20-solid"
+                             class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500"
+                             :class="['transform rotate-90']"/>
                     </UButton>
                   </USelectMenu>
                   <EntityModalButtons
@@ -1667,59 +1715,58 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :id="itemInfo.customer"
                       @return-data="(data) => setCustomerData(data.id)"
                   />
-<!--                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="itemInfo.customer"
-                      icon="i-heroicons-eye"
-                      @click="modal.open(StandardEntityModal, {
-                        id: itemInfo.customer,
-                        type: 'customers',
-                        mode: 'show',
-                      })"
-                  />
-                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="itemInfo.customer"
-                      icon="i-heroicons-pencil-solid"
-                      @click="modal.open(StandardEntityModal, {
-                        id: itemInfo.customer,
-                        type: 'customers',
-                        mode: 'edit',
-                        onReturnData(data) {
-                          setCustomerData()
-                        }
-                      })"
-                  />
-                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="!itemInfo.customer"
-                      icon="i-heroicons-plus"
-                      @click="modal.open(StandardEntityModal, {
-                        type: 'customers',
-                        mode: 'create',
-                        onReturnData(data) {
-                          setCustomerData(data.id)
-                        }
-                      })"
-                  />-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="itemInfo.customer"
+                                        icon="i-heroicons-eye"
+                                        @click="modal.open(StandardEntityModal, {
+                                          id: itemInfo.customer,
+                                          type: 'customers',
+                                          mode: 'show',
+                                        })"
+                                    />
+                                    <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="itemInfo.customer"
+                                        icon="i-heroicons-pencil-solid"
+                                        @click="modal.open(StandardEntityModal, {
+                                          id: itemInfo.customer,
+                                          type: 'customers',
+                                          mode: 'edit',
+                                          onReturnData(data) {
+                                            setCustomerData()
+                                          }
+                                        })"
+                                    />
+                                    <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="!itemInfo.customer"
+                                        icon="i-heroicons-plus"
+                                        @click="modal.open(StandardEntityModal, {
+                                          type: 'customers',
+                                          mode: 'create',
+                                          onReturnData(data) {
+                                            setCustomerData(data.id)
+                                          }
+                                        })"
+                                    />-->
                 </div>
 
 
-
                 <UAlert
-                  v-if="customers.find(i => i.id === itemInfo.customer)"
-                  class="mt-2"
-                  variant="solid"
-                  color="white"
-                  title="Info"
+                    v-if="customers.find(i => i.id === itemInfo.customer)"
+                    class="mt-2"
+                    variant="solid"
+                    color="white"
+                    title="Info"
                 >
                   <template #description>
-                    Kundennr: {{customers.find(i => i.id === itemInfo.customer).customerNumber}}<br>
-                    Typ: {{customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat'}}<br>
-                    Notizen: <span class="truncate">{{customers.find(i => i.id === itemInfo.customer).notes}}</span>
+                    Kundennr: {{ customers.find(i => i.id === itemInfo.customer).customerNumber }}<br>
+                    Typ: {{ customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat' }}<br>
+                    Notizen: <span class="truncate">{{ customers.find(i => i.id === itemInfo.customer).notes }}</span>
                   </template>
 
                 </UAlert>
@@ -1744,23 +1791,26 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         :color="itemInfo.contact ? 'primary' : 'none'"
                         variant="outline"
                         class="w-full"
-                      :disabled="!itemInfo.customer"
+                        :disabled="!itemInfo.customer"
                     >
-                      <span class="truncate">{{itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt"}}</span>
+                      <span
+                          class="truncate">{{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt" }}</span>
 
 
-                      <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
+                      <UIcon name="i-heroicons-chevron-right-20-solid"
+                             class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500"
+                             :class="['transform rotate-90']"/>
                     </UButton>
                     <template #label>
-                      {{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt"}}
+                      {{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt" }}
                     </template>
                   </USelectMenu>
-<!--                  <UButton
-                      variant="outline"
-                      v-if="itemInfo.contact"
-                      icon="i-heroicons-arrow-right-end-on-rectangle"
-                      @click="router.push(`/standardEntity/contacts/show/${itemInfo.contact}`)"
-                  >Kontakt</UButton>-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        v-if="itemInfo.contact"
+                                        icon="i-heroicons-arrow-right-end-on-rectangle"
+                                        @click="router.push(`/standardEntity/contacts/show/${itemInfo.contact}`)"
+                                    >Kontakt</UButton>-->
                   <EntityModalButtons
                       type="contacts"
                       :id="itemInfo.contact"
@@ -1839,7 +1889,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.deliveryDate" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.deliveryDate" @close="close"/>
                     </template>
                   </UPopover>
 
@@ -1858,7 +1908,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.deliveryDateEnd" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.deliveryDateEnd" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -1878,29 +1928,29 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.documentDate" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.documentDate" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
 
 
                 <UFormGroup
-                  class="w-full"
-                  label="Zahlungsziel in Tagen:"
+                    class="w-full"
+                    label="Zahlungsziel in Tagen:"
                 >
                   <UInput
-                    type="number"
-                    v-model="itemInfo.paymentDays"
+                      type="number"
+                      v-model="itemInfo.paymentDays"
                   />
                 </UFormGroup>
                 <UFormGroup
-                  class="w-full"
-                  label="Individueller Aufschlag:"
+                    class="w-full"
+                    label="Individueller Aufschlag:"
                 >
                   <UInput
-                    type="number"
-                    v-model="itemInfo.customSurchargePercentage"
-                    @change="updateCustomSurcharge"
+                      type="number"
+                      v-model="itemInfo.customSurchargePercentage"
+                      @change="updateCustomSurcharge"
                   >
                     <template #trailing>
                       <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
@@ -1912,9 +1962,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   label="Ansprechpartner:"
               >
                 <USelectMenu
-                    :options="profileStore.profiles"
-                    v-model="itemInfo.contactPerson"
-                    option-attribute="fullName"
+                    :options="tenantUsers"
+                    v-model="itemInfo.created_by"
+                    option-attribute="full_name"
                     value-attribute="id"
                     @change="setContactPersonData"
                 />
@@ -1947,13 +1997,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @change="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
-                      {{plants.find(i => i.id === itemInfo.plant) ? plants.find(i => i.id === itemInfo.plant).name : "Kein Objekt ausgewählt"}}
+                      {{ plants.find(i => i.id === itemInfo.plant) ? plants.find(i => i.id === itemInfo.plant).name : "Kein Objekt ausgewählt" }}
                     </template>
                     <template #option="{option: plant}">
-                      {{plant.name}}
+                      {{ plant.name }}
                     </template>
                   </USelectMenu>
                   <UButton
@@ -1986,20 +2035,20 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @change="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
-                      {{itemInfo.project ? projects.find(i => i.id === itemInfo.project).name : "Kein Projekt ausgewählt"}}
+                      {{ itemInfo.project ? projects.find(i => i.id === itemInfo.project).name : "Kein Projekt ausgewählt" }}
                     </template>
                     <template #option="{option: project}">
-                      {{dataStore.getCustomerById(project.customer).name}} - {{project.name}}
+                      {{ customers.find(i => i.id === project.customer) ? customers.find(i => i.id === project.customer).name : "" }}
+                      - {{ project.name }}
                     </template>
                   </USelectMenu>
                   <UButton
                       variant="outline"
                       color="rose"
                       v-if="itemInfo.project"
-                    icon="i-heroicons-x-mark"
+                      icon="i-heroicons-x-mark"
                       @click="itemInfo.project = null"
                   />
                   <EntityModalButtons
@@ -2033,7 +2082,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.serialConfig.firstExecution" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.serialConfig.firstExecution" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -2048,7 +2097,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.serialConfig.executionUntil" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.serialConfig.executionUntil" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -2077,9 +2126,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   />
                 </UFormGroup>
                 <UAlert
-                  title="Anfangs- und Enddatum"
-                  description="Für das Anfangs- und Enddatum werden jeweils der ersten und letzte Tag des ausgewählten Intervalls und der Richtung automatisch ausgewählt"
-                  class="mt-5"
+                    title="Anfangs- und Enddatum"
+                    description="Für das Anfangs- und Enddatum werden jeweils der ersten und letzte Tag des ausgewählten Intervalls und der Richtung automatisch ausgewählt"
+                    class="mt-5"
                 />
 
 
@@ -2118,10 +2167,10 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                 value-attribute="text"
             >
               <template #option="{option}">
-                {{option.name}} - {{option.text}}
+                {{ option.name }} - {{ option.text }}
               </template>
               <template #label>
-                {{dataStore.texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? dataStore.texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
+                {{ texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert" }}
               </template>
             </USelectMenu>
           </UFormGroup>
@@ -2143,18 +2192,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
 
           <table class="w-full" v-if="itemInfo.rows.length > 0">
             <thead>
-              <tr>
-                <th></th>
-                <th>Pos.</th>
-                <th class="pl-2">Name</th>
-                <th class="pl-2">Menge</th>
-                <th class="pl-2">Einheit</th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
-<!--                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>-->
-                <th class="pl-2"> </th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
-              </tr>
+            <tr>
+              <th></th>
+              <th>Pos.</th>
+              <th class="pl-2">Name</th>
+              <th class="pl-2">Menge</th>
+              <th class="pl-2">Einheit</th>
+              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
+              <!--                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
+                              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>-->
+              <th class="pl-2"></th>
+              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
+            </tr>
             </thead>
             <draggable
                 v-model="itemInfo.rows"
@@ -2182,11 +2231,11 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       v-if="row.mode === 'text'"
                       colspan="9"
                   >
-<!--                    <UInput
-                        v-model="row.text"
-                        placeholder="Titel"
-                        maxlength="60"
-                    />-->
+                    <!--                    <UInput
+                                            v-model="row.text"
+                                            placeholder="Titel"
+                                            maxlength="60"
+                                        />-->
                     <UTextarea
                         v-model="row.description"
                         placeholder="Text"
@@ -2194,7 +2243,8 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   </td>
                   <td
                       v-if="!['pagebreak','text'].includes(row.mode)"
-                  >{{row.pos}}</td>
+                  >{{ row.pos }}
+                  </td>
                   <td
                       class="w-120"
                       v-if="row.mode === 'free'"
@@ -2225,7 +2275,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           @change="setRowData(row)"
                       >
                         <template #label>
-                          <span class="truncate">{{products.find(i => i.id === row.product) ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
+                          <span class="truncate">{{
+                              products.find(i => i.id === row.product) ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt"
+                            }}</span>
                         </template>
                       </USelectMenu>
                       <EntityModalButtons
@@ -2233,46 +2285,46 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           :id="row.product"
                           @return-data="(data) => setRowData(row,null,data)"
                       />
-<!--                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showProductSelectionModal = true"
-                      />
-                      <UModal v-model="showProductSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Artikel Auswählen
-                          </template>
+                      <!--                      <UButton
+                                                icon="i-heroicons-magnifying-glass"
+                                                @click="showProductSelectionModal = true"
+                                            />
+                                            <UModal v-model="showProductSelectionModal">
+                                              <UCard>
+                                                <template #header>
+                                                  Artikel Auswählen
+                                                </template>
 
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Artikelkategorie:">
-                              <USelectMenu
-                                  v-if="productcategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedProductcategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                              :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
-                              :columns="[
-                                  {key: 'name',label:'Name'},
-                                  {key: 'manufacturer',label:'Hersteller'},
-                                  {key: 'articleNumber',label:'Artikelnummer'},
-                              ]"
-                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
-                              @select=" (i) => {
-                               row.product = i.id
-                               row.unit = products.find(i => i.id === row.product).unit,
-                               row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
-                               row.description = products.find(i => i.id === row.product).description
-                                showProductSelectionModal = false}"
-                          >
+                                                <InputGroup class="w-full">
+                                                  <UFormGroup label="Artikelkategorie:">
+                                                    <USelectMenu
+                                                        v-if="productcategories.length > 0"
+                                                        :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
+                                                        value-attribute="id"
+                                                        option-attribute="name"
+                                                        v-model="selectedProductcategorie"
+                                                    />
+                                                  </UFormGroup>
+                                                </InputGroup>
+                                                <UTable
+                                                    :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
+                                                    :columns="[
+                                                        {key: 'name',label:'Name'},
+                                                        {key: 'manufacturer',label:'Hersteller'},
+                                                        {key: 'articleNumber',label:'Artikelnummer'},
+                                                    ]"
+                                                    :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
+                                                    @select=" (i) => {
+                                                     row.product = i.id
+                                                     row.unit = products.find(i => i.id === row.product).unit,
+                                                     row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                                                     row.description = products.find(i => i.id === row.product).description
+                                                      showProductSelectionModal = false}"
+                                                >
 
-                          </UTable>
-                        </UCard>
-                      </UModal>-->
+                                                </UTable>
+                                              </UCard>
+                                            </UModal>-->
                     </InputGroup>
 
                   </td>
@@ -2295,7 +2347,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           @change="setRowData(row)"
                       >
                         <template #label>
-                          <span class="truncate">{{services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt" }}</span>
+                          <span class="truncate">{{
+                              services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt"
+                            }}</span>
                         </template>
                       </USelectMenu>
                       <EntityModalButtons
@@ -2303,44 +2357,44 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           :id="row.service"
                           @return-data="(data) => setRowData(row,data,null)"
                       />
-<!--                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showServiceSelectionModal = true"
-                      />
-                      <UModal v-model="showServiceSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Leistung Auswählen
-                          </template>
+                      <!--                      <UButton
+                                                icon="i-heroicons-magnifying-glass"
+                                                @click="showServiceSelectionModal = true"
+                                            />
+                                            <UModal v-model="showServiceSelectionModal">
+                                              <UCard>
+                                                <template #header>
+                                                  Leistung Auswählen
+                                                </template>
 
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Leistungskategorie:">
-                              <USelectMenu
-                                  v-if="servicecategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedServicecategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                              :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
-                              :columns="[
-                                    {key: 'name',label:'Name'},
-                                    {key: 'serviceNumber',label:'Leistungsnummer'},
-                                    {key: 'sellingPrice',label:'Verkaufspreis'},
-                                ]"
-                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
-                              @select=" (i) => {
-                                 row.service = i.id
-                                 setRowData(row)
-                                  showServiceSelectionModal = false}"
-                          >
+                                                <InputGroup class="w-full">
+                                                  <UFormGroup label="Leistungskategorie:">
+                                                    <USelectMenu
+                                                        v-if="servicecategories.length > 0"
+                                                        :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
+                                                        value-attribute="id"
+                                                        option-attribute="name"
+                                                        v-model="selectedServicecategorie"
+                                                    />
+                                                  </UFormGroup>
+                                                </InputGroup>
+                                                <UTable
+                                                    :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
+                                                    :columns="[
+                                                          {key: 'name',label:'Name'},
+                                                          {key: 'serviceNumber',label:'Leistungsnummer'},
+                                                          {key: 'sellingPrice',label:'Verkaufspreis'},
+                                                      ]"
+                                                    :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
+                                                    @select=" (i) => {
+                                                       row.service = i.id
+                                                       setRowData(row)
+                                                        showServiceSelectionModal = false}"
+                                                >
 
-                          </UTable>
-                        </UCard>
-                      </UModal>-->
+                                                </UTable>
+                                              </UCard>
+                                            </UModal>-->
                     </InputGroup>
                   </td>
                   <td
@@ -2351,7 +2405,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         v-model="row.quantity"
                         :disabled="itemInfo.type === 'cancellationInvoices'"
                         type="number"
-                        :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+                        :step="units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).step : '1' "
 
                     />
                   </td>
@@ -2362,12 +2416,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     <USelectMenu
                         v-model="row.unit"
                         :disabled="itemInfo.type === 'cancellationInvoices'"
-                        :options="dataStore.units"
+                        :options="units"
                         option-attribute="name"
                         value-attribute="id"
                     >
                       <template #label>
-                        {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                        {{ units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).name : "Keine Einheit gewählt" }}
                       </template>
                     </USelectMenu>
                   </td>
@@ -2382,19 +2436,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         step="0.001"
                         @change="updateCustomSurcharge"
                     >
-                      <template  #leading>
+                      <template #leading>
                         <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
                       </template>
                       <template #trailing>
                         <span
                             v-if="row.price > row.inputPrice"
                             class="text-primary text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                         <span
                             v-else-if="row.price < row.inputPrice"
                             class="text-rose-600 text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                         <span
                             v-else
@@ -2402,40 +2456,40 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       </template>
                     </UInput>
                   </td>
-<!--                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                  <!--                  <td
+                                        class="w-40"
+                                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
 
-                  >
-                    <USelectMenu
-                        :options="[19,7,0]"
-                        v-model="row.taxPercent"
-                        :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
-                    >
-                      <template #option="{option}">
-                        {{option}} %
-                      </template>
-                      <template #label>
-                        {{row.taxPercent}} %
-                      </template>
-                    </USelectMenu>
+                                    >
+                                      <USelectMenu
+                                          :options="[19,7,0]"
+                                          v-model="row.taxPercent"
+                                          :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
+                                      >
+                                        <template #option="{option}">
+                                          {{option}} %
+                                        </template>
+                                        <template #label>
+                                          {{row.taxPercent}} %
+                                        </template>
+                                      </USelectMenu>
 
-                  </td>-->
-<!--                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-                  >
-                    <UInput
-                        v-model="row.discountPercent"
-                        type="number"
-                        step="0.01"
-                        placeholder="0"
-                    >
-                      <template #trailing>
-                        <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
-                      </template>
-                    </UInput>
-                  </td>-->
+                                    </td>-->
+                  <!--                  <td
+                                        class="w-40"
+                                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                                    >
+                                      <UInput
+                                          v-model="row.discountPercent"
+                                          type="number"
+                                          step="0.01"
+                                          placeholder="0"
+                                      >
+                                        <template #trailing>
+                                          <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
+                                        </template>
+                                      </UInput>
+                                    </td>-->
                   <td
                       class="w-40"
                       v-if="!['pagebreak','title','text'].includes(row.mode)"
@@ -2454,15 +2508,16 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
                     <UModal v-model="row.showEdit">
                       <UCard>
-<!--                        <template #header>
-                          Zeile bearbeiten
-                        </template>-->
+                        <!--                        <template #header>
+                                                  Zeile bearbeiten
+                                                </template>-->
                         <template #header>
                           <div class="flex items-center justify-between">
                             <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
                               Zeile bearbeiten
                             </h3>
-                            <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="row.showEdit = false" />
+                            <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1"
+                                     @click="row.showEdit = false"/>
                           </div>
                         </template>
                         <InputGroup>
@@ -2473,7 +2528,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                             <UInput
                                 v-model="row.quantity"
                                 type="number"
-                                :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+                                :step="units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).step : '1' "
 
                             />
                           </UFormGroup>
@@ -2483,13 +2538,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           >
                             <USelectMenu
                                 v-model="row.unit"
-                                :options="dataStore.units"
+                                :options="units"
                                 option-attribute="name"
 
                                 value-attribute="id"
                             >
                               <template #label>
-                                {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                                {{ units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).name : "Keine Einheit gewählt" }}
                               </template>
                             </USelectMenu>
                           </UFormGroup>
@@ -2505,19 +2560,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                               step="0.001"
                               @change="updateCustomSurcharge"
                           >
-                            <template  #leading>
+                            <template #leading>
                               <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
                             </template>
                             <template #trailing>
                         <span
                             v-if="row.price > row.inputPrice"
                             class="text-primary text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                               <span
                                   v-else-if="row.price < row.inputPrice"
                                   class="text-rose-600 text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                               <span
                                   v-else
@@ -2526,9 +2581,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           </UInput>
                         </UFormGroup>
                         <UFormGroup
-                          label="Umsatzsteuer:"
-                          class="mt-3"
-                          v-if="itemInfo.type !== 'deliveryNotes'"
+                            label="Umsatzsteuer:"
+                            class="mt-3"
+                            v-if="itemInfo.type !== 'deliveryNotes'"
                         >
                           <USelectMenu
                               :options="[19,7,0]"
@@ -2536,18 +2591,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                               :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
                           >
                             <template #option="{option}">
-                              {{option}} %
+                              {{ option }} %
                             </template>
                             <template #label>
-                              {{row.taxPercent}} %
+                              {{ row.taxPercent }} %
                             </template>
                           </USelectMenu>
                         </UFormGroup>
 
                         <UFormGroup
-                          label="Rabatt:"
-                          class="mt-3"
-                          v-if="itemInfo.type !== 'deliveryNotes'"
+                            label="Rabatt:"
+                            class="mt-3"
+                            v-if="itemInfo.type !== 'deliveryNotes'"
                         >
                           <UInput
                               v-model="row.discountPercent"
@@ -2581,28 +2636,28 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         </InputGroup>
 
                         <UAlert
-                          v-if="row.linkedEntitys && row.linkedEntitys.find(i => i.type === 'createddocuments' && i.subtype === 'advanceInvoices')"
-                          title="Berechnung des Individuellen Aufschlags für die Zeile gesperrt"
-                          color="orange"
-                          variant="subtle"
-                          class="my-3"
+                            v-if="row.linkedEntitys && row.linkedEntitys.find(i => i.type === 'createddocuments' && i.subtype === 'advanceInvoices')"
+                            title="Berechnung des Individuellen Aufschlags für die Zeile gesperrt"
+                            color="orange"
+                            variant="subtle"
+                            class="my-3"
                         />
 
                         Verknüpfungen:
                         <ul>
                           <li
-                            v-for="linkedEntity in row.linkedEntitys"
+                              v-for="linkedEntity in row.linkedEntitys"
                           >
                             - <a
-                                v-if="linkedEntity.subtype === 'advanceInvoices'"
-                                :to="`/createddocuments/show/${linkedEntity.id}`"
-                            >Abschlagsrechnung</a>
+                              v-if="linkedEntity.subtype === 'advanceInvoices'"
+                              :to="`/createddocuments/show/${linkedEntity.id}`"
+                          >Abschlagsrechnung</a>
                           </li>
                         </ul>
 
                         <UFormGroup
-                          label="Beschreibung:"
-                          class="mt-3"
+                            label="Beschreibung:"
+                            class="mt-3"
                         >
                           <UTextarea
                               v-model="row.description"
@@ -2612,13 +2667,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           </UTextarea>
                         </UFormGroup>
 
-<!--                        <template #footer>
-                          <UButton
-                              @click="row.showEdit = false"
-                          >
-                            Speichern
-                          </UButton>
-                        </template>-->
+                        <!--                        <template #footer>
+                                                  <UButton
+                                                      @click="row.showEdit = false"
+                                                  >
+                                                    Speichern
+                                                  </UButton>
+                                                </template>-->
                       </UCard>
 
 
@@ -2701,12 +2756,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   >
 
                     <p class="text-right font-bold whitespace-nowrap">
-                      {{row.optional || row.alternative ? "(" : ""}}
+                      {{ row.optional || row.alternative ? "(" : "" }}
                       <span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">
-                        {{getRowAmountUndiscounted(row)}} €
+                        {{ getRowAmountUndiscounted(row) }} €
                       </span>
-                      {{getRowAmount(row)}} €
-                      {{row.optional || row.alternative ? ")" : ""}}
+                      {{ getRowAmount(row) }} €
+                      {{ row.optional || row.alternative ? ")" : "" }}
                     </p>
                   </td>
                   <td
@@ -2733,11 +2788,11 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
             </draggable>
           </table>
           <UAlert
-            v-else
-            title="Keine Positionen hinzugefügt"
-            color="rose"
-            variant="outline"
-            icon="i-heroicons-light-bulb"
+              v-else
+              title="Keine Positionen hinzugefügt"
+              color="rose"
+              variant="outline"
+              icon="i-heroicons-light-bulb"
           ></UAlert>
 
           <InputGroup>
@@ -2785,150 +2840,150 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
             </UButton>
           </InputGroup>
 
-<!--          <UDivider
-              class="mt-5 mb-3"
-              v-if="openAdvanceInvoices.length > 0 || itemInfo.usedAdvanceInvoices.length > 0"
-          >
-            Noch nicht abgerechnete Abschlagsrechnungen
-          </UDivider>
+          <!--          <UDivider
+                        class="mt-5 mb-3"
+                        v-if="openAdvanceInvoices.length > 0 || itemInfo.usedAdvanceInvoices.length > 0"
+                    >
+                      Noch nicht abgerechnete Abschlagsrechnungen
+                    </UDivider>
 
-          <div
-              v-for="advanceInvoice in openAdvanceInvoices"
-              :key="advanceInvoice.id"
-              class="flex flex-row justify-between my-2"
-          >
-            <span>{{advanceInvoice.documentNumber}}</span>
-            <span>Summe: {{renderCurrency(advanceInvoice.rows[0].price * (1 + advanceInvoice.rows[0].taxPercent/100))}}</span>
-            <InputGroup>
-              <UButton
-                @click="addAdvanceInvoiceToInvoice(advanceInvoice.id)"
-                :disabled="itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
-                class="mr-2"
-              >
-                Verwenden
-              </UButton>
-              <UButton
-                @click="itemInfo.usedAdvanceInvoices = itemInfo.usedAdvanceInvoices.filter(i => i !== advanceInvoice.id)"
-                :disabled="!itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
-                color="rose"
-                variant="outline"
-              >
-                X
-              </UButton>
-            </InputGroup>
-          </div>-->
+                    <div
+                        v-for="advanceInvoice in openAdvanceInvoices"
+                        :key="advanceInvoice.id"
+                        class="flex flex-row justify-between my-2"
+                    >
+                      <span>{{advanceInvoice.documentNumber}}</span>
+                      <span>Summe: {{renderCurrency(advanceInvoice.rows[0].price * (1 + advanceInvoice.rows[0].taxPercent/100))}}</span>
+                      <InputGroup>
+                        <UButton
+                          @click="addAdvanceInvoiceToInvoice(advanceInvoice.id)"
+                          :disabled="itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
+                          class="mr-2"
+                        >
+                          Verwenden
+                        </UButton>
+                        <UButton
+                          @click="itemInfo.usedAdvanceInvoices = itemInfo.usedAdvanceInvoices.filter(i => i !== advanceInvoice.id)"
+                          :disabled="!itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
+                          color="rose"
+                          variant="outline"
+                        >
+                          X
+                        </UButton>
+                      </InputGroup>
+                    </div>-->
 
           <UDivider class="my-3" v-if="Object.keys(documentTotal.titleSums).length > 0">Überschriften</UDivider>
 
           <table>
             <tr v-for="sumKey in Object.keys(documentTotal.titleSums) ">
-              <td>{{sumKey}}</td>
-              <td>{{useCurrency(documentTotal.titleSums[sumKey])}}</td>
+              <td>{{ sumKey }}</td>
+              <td>{{ useCurrency(documentTotal.titleSums[sumKey]) }}</td>
             </tr>
           </table>
 
           <UDivider class="my-3" v-if="itemInfo.rows.length > 0">Auswertung & Gesamt</UDivider>
 
 
-          <div class="w-full flex justify-between"  v-if="itemInfo.type !== 'deliveryNotes'">
+          <div class="w-full flex justify-between" v-if="itemInfo.type !== 'deliveryNotes'">
             <table class="w-1/2" v-if="itemInfo.rows.length > 0">
               <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
                 <td>Einkaufspreis Artikel Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalProductsPurchasePrice) }}</td>
               </tr>
               <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
                 <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalProductsFromServicesPurchasePrice) }}</td>
               </tr>
               <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
                 <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice) }}</td>
               </tr>
               <tr>
                 <td>Gewinn Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalMargin) }}</td>
               </tr>
               <tr v-if="documentReport.totalHoursSellingPrice !== 0">
                 <td>Lohnkosten Verkauf:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalHoursSellingPrice) }}</td>
               </tr>
               <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
-                <td>{{key}}</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
+                <td>{{ key }}</td>
+                <td class="text-right">{{ documentReport.totalHoursFromServices.byName[key] }} h</td>
               </tr>
               <tr v-if="documentReport.totalHoursFromServices.total !== 0">
                 <td>Stunden Gesamt:</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
+                <td class="text-right">{{ documentReport.totalHoursFromServices.total }} h</td>
               </tr>
             </table>
             <table class="w-1/3 h-full" v-if="itemInfo.rows.length > 0">
               <tr>
                 <td class="font-bold">Netto:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalNet)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalNet) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 19)">
-                <td class="font-bold">zzgl. 19 % USt auf {{renderCurrency(documentTotal.totalNet19)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total19)}}</td>
+                <td class="font-bold">zzgl. 19 % USt auf {{ renderCurrency(documentTotal.totalNet19) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total19) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 7)">
-                <td class="font-bold">zzgl. 7 % USt auf {{renderCurrency(documentTotal.totalNet7)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total7)}}</td>
+                <td class="font-bold">zzgl. 7 % USt auf {{ renderCurrency(documentTotal.totalNet7) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total7) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 0)">
-                <td class="font-bold">zzgl. 0 % USt auf {{renderCurrency(documentTotal.totalNet0)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total0)}}</td>
+                <td class="font-bold">zzgl. 0 % USt auf {{ renderCurrency(documentTotal.totalNet0) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total0) }}</td>
               </tr>
               <tr>
                 <td class="font-bold">Brutto:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalGross)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalGross) }}</td>
               </tr>
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== 0">
                 <td class="font-bold">Bereits bezahlt:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalGrossAlreadyPaid)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalGrossAlreadyPaid) }}</td>
               </tr>
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== 0">
                 <td class="font-bold">Offene Summe:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalSumToPay)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalSumToPay) }}</td>
               </tr>
             </table>
           </div>
 
-<!--          <UDivider
-              class="my-3"
-          >Auswertung</UDivider>
+          <!--          <UDivider
+                        class="my-3"
+                    >Auswertung</UDivider>
 
-          <div class="w-full flex justify-end">
-            <table class="w-1/3">
-              <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
-                <td>Einkaufspreis Artikel Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
-                <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
-                <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
-              </tr>
-              <tr>
-                <td>Gewinn Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursSellingPrice !== 0">
-                <td>Lohnkosten Verkauf:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
-              </tr>
-              <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
-                <td>{{key}}</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursFromServices.total !== 0">
-                <td>Stunden Gesamt:</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
-              </tr>
-            </table>
-          </div>-->
+                    <div class="w-full flex justify-end">
+                      <table class="w-1/3">
+                        <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
+                          <td>Einkaufspreis Artikel Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
+                          <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
+                          <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
+                        </tr>
+                        <tr>
+                          <td>Gewinn Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursSellingPrice !== 0">
+                          <td>Lohnkosten Verkauf:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
+                        </tr>
+                        <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
+                          <td>{{key}}</td>
+                          <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursFromServices.total !== 0">
+                          <td>Stunden Gesamt:</td>
+                          <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
+                        </tr>
+                      </table>
+                    </div>-->
 
 
 
@@ -2949,7 +3004,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                 {{option.name}} - {{option.text}}
               </template>
               <template #label>
-                {{dataStore.texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? dataStore.texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
+                {{texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
               </template>
             </USelectMenu>
           </UFormGroup>
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index 671495c..abe8e0b 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -31,11 +31,11 @@
   </UDashboardNavbar>
   <UDashboardToolbar>
     <template #left>
-<!--      <UCheckbox
-          v-model="showDrafts"
-          label="Entwürfe Anzeigen"
-          class="my-auto mr-3"
-      />-->
+      <!--      <UCheckbox
+                v-model="showDrafts"
+                label="Entwürfe Anzeigen"
+                class="my-auto mr-3"
+            />-->
       <USelectMenu
           v-model="selectedTypes"
           icon="i-heroicons-adjustments-horizontal-solid"
@@ -204,7 +204,6 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  //items.value = (await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount),linkedDocument(*)","documentNumber")).filter(i => !i.archived)
   items.value = (await useEntities("createddocuments").select("*, customer(id,name), statementallocations(id,amount),linkedDocument(*)","documentNumber")).filter(i => !i.archived)
 }
 
@@ -220,7 +219,7 @@ const templateColumns = [
     key: 'type',
     label: "Typ",
     sortable: true
-  },{
+  }, {
     key: 'state',
     label: "Status",
     sortable: true
@@ -288,19 +287,19 @@ const types = computed(() => {
 const selectItem = (item) => {
   console.log(item)
 
-  if(item.state === "Entwurf"){
+  if (item.state === "Entwurf") {
     router.push(`/createDocument/edit/${item.id}`)
-  } else if(item.state !== "Entwurf") {
+  } else if (item.state !== "Entwurf") {
     router.push(`/createDocument/show/${item.id}`)
   }
 }
 
 const displayCurrency = (value, currency = "€") => {
-  return `${Number(value).toFixed(2).replace(".",",")} ${currency}`
+  return `${Number(value).toFixed(2).replace(".", ",")} ${currency}`
 }
 
 
-const searchString = ref(tempStore.searchStrings['createddocuments'] ||'')
+const searchString = ref(tempStore.searchStrings['createddocuments'] || '')
 
 const clearSearchString = () => {
   tempStore.clearSearchString('createddocuments')
@@ -309,7 +308,7 @@ const clearSearchString = () => {
 const selectedFilters = ref([])
 const filteredRows = computed(() => {
 
-  let temp = items.value.filter(i => types.value.find(x => x.key === 'invoices' ? ['invoices','advanceInvoices','cancellationInvoices'].includes(i.type) : x.key === i.type))
+  let temp = items.value.filter(i => types.value.find(x => x.key === 'invoices' ? ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(i.type) : x.key === i.type))
   temp = temp.filter(i => i.type !== "serialInvoices")
 
   /*if(showDrafts.value === true) {
@@ -318,7 +317,7 @@ const filteredRows = computed(() => {
     temp = temp.filter(i => i.state !== "Entwurf")
   }*/
 
-  if(selectedFilters.value.includes("Nur offene anzeigen")){
+  if (selectedFilters.value.includes("Nur offene anzeigen")) {
     temp = temp.filter(i => !isPaid(i))
   }
 
diff --git a/pages/createDocument/serialInvoice.vue b/pages/createDocument/serialInvoice.vue
index 332148b..9d794ad 100644
--- a/pages/createDocument/serialInvoice.vue
+++ b/pages/createDocument/serialInvoice.vue
@@ -126,7 +126,6 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  //items.value = await useSupabaseSelect("createddocuments","*, customer(id,name)","documentDate")
   items.value = await useEntities("createddocuments").select("*, customer(id,name)","documentDate")
 }
 
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 94579c2..2d16156 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -9,41 +9,28 @@ defineShortcuts({
   },
 })
 
-const supabase = useSupabaseClient()
 const modal = useModal()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
+const auth = useAuthStore()
 
 const itemInfo = ref({})
 const linkedDocument =ref({})
-const currentTenant = ref({})
 const setupPage = async () => {
   if(route.params) {
-    if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*, files(*)")
+    if(route.params.id) itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id,"*, files(*)")
 
     console.log(itemInfo.value)
 
     linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id)
-
-
-
-    //const {data,error} = await supabase.from("files").select("id").eq("createddocument", route.params.id).order("id",{ascending:true})
-    //linkedDocument.value = data[data.length -1]
-
   }
-
-  currentTenant.value = (await supabase.from("tenants").select().eq("id",profileStore.currentTenant).single()).data
-  console.log(currentTenant.value)
-
 }
 
 setupPage()
 
 const openEmail = () => {
   if(["invoices","advanceInvoices"].includes(itemInfo.value.type)){
-    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(currentTenant.value.standardEmailForInvoices || "")}`)
+    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(auth.activeTenantData.standardEmailForInvoices || "")}`)
   } else {
     router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]`)
   }
@@ -52,7 +39,7 @@ const openEmail = () => {
 
 <template>
   <UDashboardNavbar
-    title="Erstelltes Dokument anzeigen"
+      title="Erstelltes Dokument anzeigen"
   >
 
   </UDashboardNavbar>
@@ -64,10 +51,10 @@ const openEmail = () => {
       >
         Bearbeiten
       </UButton>
-<!--      <UButton
-          :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''"
-          target="_blank"
-      >In neuen Tab anzeigen</UButton>-->
+      <!--      <UButton
+                :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''"
+                target="_blank"
+            >In neuen Tab anzeigen</UButton>-->
       <UButton
           icon="i-heroicons-arrow-right-end-on-rectangle"
           @click="modal.open(CopyCreatedDocumentModal, {
@@ -79,8 +66,8 @@ const openEmail = () => {
         Kopieren
       </UButton>
       <UButton
-        @click="openEmail"
-        icon="i-heroicons-envelope"
+          @click="openEmail"
+          icon="i-heroicons-envelope"
       >
         E-Mail
       </UButton>
@@ -94,16 +81,16 @@ const openEmail = () => {
       </UButton>
       <UButton
           v-if="itemInfo.project"
-        @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
-        icon="i-heroicons-link"
+          @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
+          icon="i-heroicons-link"
           variant="outline"
       >
         Projekt
       </UButton>
       <UButton
           v-if="itemInfo.customer"
-        @click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)"
-        icon="i-heroicons-link"
+          @click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)"
+          icon="i-heroicons-link"
           variant="outline"
       >
         Kunde