Merge branch 'devCorrected' into 'beta'

Dev corrected

See merge request fedeo/software!56

components/MainNav.vue

@@ -339,8 +339,7 @@ const links = computed(() => {
         },{
           label: "Export",
           to: "/export",
-          icon: "i-heroicons-clipboard-document-list",
+          icon: "i-heroicons-clipboard-document-list"
-          disabled: true
         }
       ]
     }

pages/accounts/index.vue

@@ -26,13 +26,13 @@ const setupPage = async () => {
   incominginvoices.value = (await useEntities("incominginvoices").select("*, vendor(*)"))
 
   items.value = await Promise.all(items.value.map(async (i) => {
-    let renderedAllocationsTemp = await renderedAllocations(i.id)
+    // let renderedAllocationsTemp = await renderedAllocations(i.id)
-    let saldo = getSaldo(renderedAllocationsTemp)
+    // let saldo = getSaldo(renderedAllocationsTemp)
 
     return {
       ...i,
-      saldo: saldo,
+      // saldo: saldo,
-      allocations: renderedAllocationsTemp.length,
+      // allocations: renderedAllocationsTemp.length,
     }
 
   }))
@@ -103,13 +103,13 @@ const templateColumns = [
   },{
     key: "label",
     label: "Name"
-  },{
+  },/*{
     key: "allocations",
     label: "Buchungen"
   },{
     key: "saldo",
     label: "Saldo"
-  }, {
+  },*/ {
     key: "description",
     label: "Beschreibung"
   },
@@ -166,7 +166,7 @@ setupPage()
   </UDashboardNavbar>
   <UDashboardToolbar>
     <template #right>
-      <USelectMenu
+<!--      <USelectMenu
           v-model="selectedColumns"
           icon="i-heroicons-adjustments-horizontal-solid"
           :options="templateColumns"
@@ -178,7 +178,7 @@ setupPage()
         <template #label>
           Spalten
         </template>
-      </USelectMenu>
+      </USelectMenu>-->
       <USelectMenu
           icon="i-heroicons-adjustments-horizontal-solid"
           multiple

pages/banking/index.vue

@@ -16,10 +16,13 @@ const route = useRoute()
 
 const bankstatements = ref([])
 const bankaccounts = ref([])
+const filterAccount = ref([])
+
 
 const setupPage = async () => {
   bankstatements.value = (await useEntities("bankstatements").select("*, statementallocations(*)", "date", false))
   bankaccounts.value = await useEntities("bankaccounts").select()
+  if(bankaccounts.value.length > 0) filterAccount.value = bankaccounts.value
 }
 
 const templateColumns = [
@@ -58,7 +61,6 @@ const clearSearchString = () => {
   searchString.value = ''
 }
 
-const filterAccount = ref(bankaccounts.value || [])
 
 const displayCurrency = (value, currency = "€") => {
   return `${Number(value).toFixed(2).replace(".",",")} ${currency}`

pages/createDocument/edit/[[id]].vue

@@ -1281,6 +1281,7 @@ const saveSerialInvoice = async () => {
     payment_type: itemInfo.value.payment_type,
     deliveryDateType: "Leistungszeitraum",
     createdBy: itemInfo.value.createdBy,
+    created_by: itemInfo.value.created_by,
     title: itemInfo.value.title,
     description: itemInfo.value.description,
     startText: itemInfo.value.startText,