Introduced OwnAccounts

Introduced CostCentres Rebuild
Added EntityModalButtons to IncomingInvoice Create

components/EntityShow.vue

@@ -560,6 +560,13 @@ const getAvailableQueryStringData = (keys) => {
 
           </UCard>
         </div>
+        <div v-else-if="tab.label === 'Auswertung Kostenstelle'">
+          <UCard class="mt-5">
+
+            <costcentre-display :item="props.item"/>
+
+          </UCard>
+        </div>
       </div>
 
 

components/costcentreDisplay.vue

@@ -0,0 +1,30 @@
+<script setup>
+
+const supabase = useSupabaseClient()
+const profileStore = useProfileStore()
+
+const props = defineProps({
+  item: {
+    required: true,
+    type: String
+  }
+})
+
+const incomingInvoices = ref({})
+
+const setupPage = async () => {
+  incomingInvoices.value = (await supabase.from("incominginvoices").select().eq("tenant", profileStore.currentTenant)).data.filter(i => i.accounts.find(x => x.costCentre === props.item.id))
+}
+
+setupPage()
+
+</script>
+
+<template>
+  {{props.item}}
+  {{incomingInvoices}}
+</template>
+
+<style scoped>
+
+</style>

composables/useRole.js

@@ -222,6 +222,30 @@ export const useRole = () => {
             label: "Aufgaben erstellen",
             parent: "tasks"
         },
+        costcentres: {
+            label: "Kostenstellen",
+            showToAllUsers: false
+        },
+        "costcentres-viewAll": {
+            label: "Alle Kostenstellen einsehen",
+            parent: "costcentres"
+        },
+        "costcentres-create": {
+            label: "Kostenstellen erstellen",
+            parent: "costcentres"
+        },
+        ownaccounts: {
+            label: "Buchungskonten",
+            showToAllUsers: false
+        },
+        "ownaccounts-viewAll": {
+            label: "Alle Buchungskonten einsehen",
+            parent: "ownaccounts"
+        },
+        "ownaccounts-create": {
+            label: "Buchungskonten erstellen",
+            parent: "ownaccounts"
+        },
         "inventory": {
             label: "Lager",
         },

pages/banking/statements/[mode]/[[id]].vue

@@ -31,6 +31,7 @@ const allocatedIncomingInvoices = ref([])
 const createddocuments = ref([])
 
 const accounts = ref([])
+const ownaccounts = ref([])
 
 const loading = ref(true)
 const setup = async () => {
@@ -46,6 +47,7 @@ const setup = async () => {
   const incominginvoices = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(id,name)")).filter(i => i.state === "Gebucht")
 
   accounts.value = (await supabase.from("accounts").select()).data
+  ownaccounts.value = (await supabase.from("ownaccounts").select()).data
 
   openDocuments.value = documents.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== useSum().getCreatedDocumentSum(i,createddocuments.value).toFixed(2))
   openDocuments.value = openDocuments.value.map(i => {
@@ -118,6 +120,7 @@ const saveAllocations = async () =>  {
 
 const showAccountSelection = ref(false)
 const accountToSave = ref("")
+const ownAccountToSave = ref("")
 
 const selectAccount = (id) => {
   accountToSave.value = id
@@ -376,6 +379,24 @@ setup()
               @click="removeAllocation(item.id)"
           />
         </UCard>
+        <UCard
+            class="mt-5"
+            v-for="item in itemInfo.statementallocations.filter(i => i.ownaccount)"
+        >
+          <template #header>
+            <div class="flex flex-row justify-between">
+              <span>{{ownaccounts.find(i => i.id === item.ownaccount).number}} - {{ownaccounts.find(i => i.id === item.ownaccount).name}}</span>
+              <span class="font-semibold text-nowrap">{{displayCurrency(item.amount)}}</span>
+            </div>
+          </template>
+          <UButton
+              icon="i-heroicons-x-mark"
+              variant="outline"
+              color="rose"
+              class="mr-3"
+              @click="removeAllocation(item.id)"
+          />
+        </UCard>
         <UCard
             class="mt-5"
             :ui="{ring: itemInfo.statementallocations.find(i => i.cd_id === item.cd_id) ? 'ring-primary-500' : 'ring-gray-200 dark:ring-gray-800'}"
@@ -452,77 +473,124 @@ setup()
 
     <div class="w-2/5 mx-auto">
       <div class="px-2">
-        <UDivider class="my-3">Ohne Beleg buchen</UDivider>
+        <UDivider class="my-3">Buchungssumme</UDivider>
 
-        <InputGroup class="mt-3 w-full">
-          <USelectMenu
-              class="w-full"
-              :options="accounts"
-              value-attribute="id"
-              option-attribute="label"
-              :ui-menu="{ width: 'min-w-max' }"
-              v-model="accountToSave"
-              searchable
-              :search-attributes="['number','label']"
-          >
-            <template #label>
-              <span v-if="accountToSave">{{accounts.find(i => i.id === accountToSave).number}} - {{accounts.find(i => i.id === accountToSave).label}}</span>
-              <span v-else>Kein Konto ausgewählt</span>
-            </template>
-            <template #option="{option}">
-              {{option.number}} - {{option.label}}
-            </template>
-          </USelectMenu>
-          <UInput
+        <UInput
             v-model="manualAllocationSum"
             type="number"
             step="0.01"
-          >
-            <template #trailing>
-              <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-            </template>
-          </UInput>
-          <UButton
-              @click="showAccountSelection = true"
-              icon="i-heroicons-magnifying-glass"
-              variant="outline"
-          />
-          <UButton
-              variant="outline"
-              icon="i-heroicons-check"
-              :disabled="!accountToSave"
-              @click="saveAllocation({bs_id: itemInfo.id, amount: manualAllocationSum, account: accountToSave })"
-          />
-          <UButton
-              @click="accountToSave = ''"
-              icon="i-heroicons-x-mark"
-              variant="outline"
-              color="rose"
-          />
-        </InputGroup>
-        <UModal
-            v-model="showAccountSelection"
         >
-          <UCard>
-            <template #header>
-              <div class="flex items-center justify-between">
-                <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
-                  Konto auswählen
-                </h3>
-                <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="showAccountSelection = false" />
-              </div>
-            </template>
-            <UButton
-                v-for="selectableAccount in accounts"
-                variant="outline"
-                class="m-3"
-                @click="selectAccount(selectableAccount.id)"
-            >
-              {{selectableAccount.label}}
-            </UButton>
-          </UCard>
+          <template #trailing>
+            <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
+          </template>
+        </UInput>
+
+        <UDivider class="my-3">Ohne Beleg buchen</UDivider>
+
+        <UFormGroup
+          label="Buchungskonten"
+          class="mt-3"
+        >
+          <InputGroup class="mt-3 w-full">
+            <USelectMenu
+                class="w-full"
+                :options="accounts"
+                value-attribute="id"
+                option-attribute="label"
+                :ui-menu="{ width: 'min-w-max' }"
+                v-model="accountToSave"
+                searchable
+                :search-attributes="['number','label']"
+            >
+              <template #label>
+                <span v-if="accountToSave">{{accounts.find(i => i.id === accountToSave).number}} - {{accounts.find(i => i.id === accountToSave).label}}</span>
+                <span v-else>Kein Konto ausgewählt</span>
+              </template>
+              <template #option="{option}">
+                {{option.number}} - {{option.label}}
+              </template>
+            </USelectMenu>
+            <UButton
+                @click="showAccountSelection = true"
+                icon="i-heroicons-magnifying-glass"
+                variant="outline"
+            />
+            <UButton
+                variant="outline"
+                icon="i-heroicons-check"
+                :disabled="!accountToSave"
+                @click="saveAllocation({bs_id: itemInfo.id, amount: manualAllocationSum, account: accountToSave })"
+            />
+            <UButton
+                @click="accountToSave = ''"
+                icon="i-heroicons-x-mark"
+                variant="outline"
+                color="rose"
+            />
+          </InputGroup>
+          <UModal
+              v-model="showAccountSelection"
+          >
+            <UCard>
+              <template #header>
+                <div class="flex items-center justify-between">
+                  <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
+                    Konto auswählen
+                  </h3>
+                  <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="showAccountSelection = false" />
+                </div>
+              </template>
+              <UButton
+                  v-for="selectableAccount in accounts"
+                  variant="outline"
+                  class="m-3"
+                  @click="selectAccount(selectableAccount.id)"
+              >
+                {{selectableAccount.label}}
+              </UButton>
+            </UCard>
+
+          </UModal>
+        </UFormGroup>
+        <UFormGroup
+          label="zusätzliche Buchungskonten"
+          class="mt-3"
+        >
+          <InputGroup class="w-full">
+            <USelectMenu
+                class="w-full"
+                :options="ownaccounts"
+                value-attribute="id"
+                option-attribute="label"
+                :ui-menu="{ width: 'min-w-max' }"
+                v-model="ownAccountToSave"
+                searchable
+                :search-attributes="['number','label']"
+            >
+              <template #label>
+                <span v-if="ownAccountToSave">{{ownaccounts.find(i => i.id === ownAccountToSave).number}} - {{ownaccounts.find(i => i.id === ownAccountToSave).name}}</span>
+                <span v-else>Kein Konto ausgewählt</span>
+              </template>
+              <template #option="{option}">
+                {{option.number}} - {{option.name}}
+              </template>
+            </USelectMenu>
+            <UButton
+                variant="outline"
+                icon="i-heroicons-check"
+                :disabled="!ownAccountToSave"
+                @click="saveAllocation({bs_id: itemInfo.id, amount: manualAllocationSum, ownaccount: ownAccountToSave })"
+            />
+            <UButton
+                @click="accountToSave = ''"
+                icon="i-heroicons-x-mark"
+                variant="outline"
+                color="rose"
+            />
+          </InputGroup>
+        </UFormGroup>
+
 
-        </UModal>
 
         <UDivider
             class="my-3"

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

@@ -82,6 +82,7 @@ const customers = ref([])
 const contacts = ref([])
 const texttemplates = ref([])
 
+
 const loaded = ref(false)
 const setupPage = async () => {
 

pages/incomingInvoices/create.vue

@@ -2,6 +2,7 @@
 import InputGroup from "~/components/InputGroup.vue";
 import dayjs from "dayjs";
 import HistoryDisplay from "~/components/HistoryDisplay.vue";
+import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
 definePageMeta({
   middleware: "auth"
@@ -35,16 +36,24 @@ const itemInfo = ref({
 })
 
 const availableDocuments = ref([])
+const costcentres = ref([])
 const setup = async () => {
   let filetype = (await supabase.from("filetags").select().eq("tenant",profileStore.currentTenant).eq("incomingDocumentType","invoices").single()).data.id
   console.log(filetype)
   let ids = (await supabase.from("files").select("id").eq("tenant",profileStore.currentTenant).eq("type", filetype).is("incominginvoice",null)).data.map(i => i.id)
   availableDocuments.value = await useFiles().selectSomeDocuments(ids)
 
+
 }
 
 setup()
 
+const loadCostCentres = async () => {
+  costcentres.value = await useSupabaseSelect("costcentres")
+
+}
+loadCostCentres()
+
 const useNetMode = ref(false)
 
 const loadedFile = ref(null)
@@ -129,6 +138,11 @@ const createIncomingInvoice = async () => {
 
 }
 
+const setCostCentre = async (item,data) => {
+  await loadCostCentres()
+  item.costCentre = data.id
+}
+
 
 </script>
 
@@ -145,10 +159,14 @@ const createIncomingInvoice = async () => {
   <UDashboardPanelContent>
     <div v-if="!loadedFile">
       <DocumentList
+          v-if="availableDocuments.length > 0"
           :documents="availableDocuments"
           :return-document-id="true"
           @selectDocument="(documentId) => loadFile(documentId)"
       />
+      <div v-else class="w-full text-center">
+        <span class="text-xl font-medium mt-10">Keine Dateien zum zuweisen verfügbar</span>
+      </div>
     </div>
     <div
         v-else
@@ -219,11 +237,11 @@ const createIncomingInvoice = async () => {
                   {{dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor) ? dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor).name : 'Lieferant auswählen'}}
                 </template>
               </USelectMenu>
-              <UButton
-                  @click="router.push('/standardEntity/vendors/create')"
-              >
-                + Lieferant
-              </UButton>
+              <EntityModalButtons
+                type="vendors"
+                :id="itemInfo.vendor"
+                @return-data="(data) => itemInfo.vendor = data.id"
+              />
             </InputGroup>
 
 
@@ -345,6 +363,9 @@ const createIncomingInvoice = async () => {
                 <template #label>
                   {{dataStore.accounts.find(account => account.id === item.account) ? dataStore.accounts.find(account => account.id === item.account).label : "Keine Kategorie ausgewählt" }}
                 </template>
+                <template #option="{option}">
+                  {{option.number}} - {{option.label}}
+                </template>
 
               </USelectMenu>
             </UFormGroup>
@@ -352,18 +373,25 @@ const createIncomingInvoice = async () => {
                 label="Kostenstelle"
                 class=" mb-3"
             >
-              <InputGroup>
+              <InputGroup class="w-full">
                 <USelectMenu
-                    :options="dataStore.getCostCentresComposed"
-                    option-attribute="label"
+                    :options="costcentres"
+                    option-attribute="name"
                     value-attribute="id"
                     searchable
                     :search-attributes="['label']"
                     searchable-placeholder="Suche..."
                     v-model="item.costCentre"
+                    class="flex-auto"
                 >
                   <template #label>
-                    {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
+                    {{costcentres.find(i => i.id === item.costCentre) ? costcentres.find(i => i.id === item.costCentre).name : "Keine Kostenstelle ausgewählt" }}
+                  </template>
+                  <template #option="{option}">
+                    <span v-if="option.vehicle">{{option.number}} - Fahrzeug - {{option.name}}</span>
+                    <span v-else-if="option.project">{{option.number}} - Projekt - {{option.name}}</span>
+                    <span v-else-if="option.inventoryitem">{{option.number}} - Inventarartikel - {{option.name}}</span>
+                    <span v-else>{{option.number}} - {{option.name}}</span>
                   </template>
 
                 </USelectMenu>
@@ -374,6 +402,11 @@ const createIncomingInvoice = async () => {
                     icon="i-heroicons-x-mark"
                     @click="item.costCentre = null"
                 />
+                <EntityModalButtons
+                    type="costcentres"
+                    :id="item.costCentre"
+                    @return-data="(data) => setCostCentre(item,data)"
+                />
               </InputGroup>
 
             </UFormGroup>

pages/incomingInvoices/edit/[id].vue

@@ -2,6 +2,7 @@
 import InputGroup from "~/components/InputGroup.vue";
 import dayjs from "dayjs";
 import HistoryDisplay from "~/components/HistoryDisplay.vue";
+import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
 definePageMeta({
   middleware: "auth"
@@ -34,10 +35,14 @@ const itemInfo = ref({
   ]
 })
 
+const costcentres = ref([])
+
 const setup = async () => {
   let filetype = (await supabase.from("filetags").select().eq("tenant",profileStore.currentTenant).eq("incomingDocumentType","invoices").single()).data.id
   console.log(filetype)
 
+  costcentres.value = await useSupabaseSelect("costcentres")
+
   itemInfo.value = await useSupabaseSelectSingle("incominginvoices", route.params.id, "*, files(*)")
   await loadFile(itemInfo.value.files[itemInfo.value.files.length-1].id)
 
@@ -322,20 +327,27 @@ const updateIncomingInvoice = async () => {
             </UFormGroup>
             <UFormGroup
                 label="Kostenstelle"
-                class=" mb-3"
+                class="w-full mb-3"
             >
-              <InputGroup>
+              <InputGroup class="w-full">
                 <USelectMenu
-                    :options="dataStore.getCostCentresComposed"
-                    option-attribute="label"
+                    :options="costcentres"
+                    option-attribute="name"
                     value-attribute="id"
                     searchable
                     :search-attributes="['label']"
                     searchable-placeholder="Suche..."
                     v-model="item.costCentre"
+                    class="flex-auto"
                 >
                   <template #label>
-                    {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
+                    {{costcentres.find(i => i.id === item.costCentre) ? costcentres.find(i => i.id === item.costCentre).name : "Keine Kostenstelle ausgewählt" }}
+                  </template>
+                  <template #option="{option}">
+                    <span v-if="option.vehicle">Fahrzeug - {{option.name}}</span>
+                    <span v-else-if="option.project">Projekt - {{option.name}}</span>
+                    <span v-else-if="option.inventoryitem">Inventarartikel - {{option.name}}</span>
+                    <span v-else>{{option.name}}</span>
                   </template>
 
                 </USelectMenu>

pages/settings/numberRanges.vue

@@ -39,6 +39,9 @@ const resources = {
   },
   deliveryNotes: {
     label: "Lieferscheine"
+  },
+  costcentres: {
+    label: "Kostenstellen"
   }
 }
 

stores/data.js

@@ -1957,6 +1957,134 @@ export const useDataStore = defineStore('data', () => {
                 }
             ]
         },
+        costcentres: {
+            isArchivable: true,
+            label: "Kostenstellen",
+            labelSingle: "Kostenstelle",
+            isStandardEntity: true,
+            redirect:true,
+            numberRangeHolder: "number",
+            historyItemHolder: "costcentre",
+            supabaseSortColumn: "number",
+            supabaseSelectWithInformation: "*, project(*), vehicle(*), inventoryitem(*)",
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
+            templateColumns: [
+                {
+                    key: 'number',
+                    label: "Nummer",
+                    inputIsNumberRange: true,
+                    inputType: "text"
+                }, {
+                    key: "name",
+                    label: "Name",
+                    required: true,
+                    title: true,
+                    inputType: "text",
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType: "textarea"
+                },
+                {
+                    key: "vehicle",
+                    label: "Fahrzeug",
+                    component: vehicle,
+                    inputType: "select",
+                    selectDataType: "vehicles",
+                    selectOptionAttribute: "licensePlate",
+                    selectSearchAttributes: ['licensePlate'],
+                },
+                {
+                    key: "inventoryitem",
+                    label: "Inventarartikel",
+                    inputType: "select",
+                    selectDataType: "inventoryitems",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "project",
+                    label: "Projekt",
+                    component: project,
+                    inputType: "select",
+                    selectDataType: "projects",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true,
+                    component: profiles
+                },
+            ],
+            showTabs: [{label: 'Informationen'},{label: 'Auswertung Kostenstelle'}]
+        },
+        ownaccounts: {
+            isArchivable: true,
+            label: "zusätzliche Buchungskonten",
+            labelSingle: "zusätzliches Buchungskonto",
+            isStandardEntity: true,
+            redirect:true,
+            historyItemHolder: "ownaccount",
+            supabaseSortColumn: "number",
+            supabaseSelectWithInformation: "*",
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
+            templateColumns: [
+                {
+                    key: 'number',
+                    label: "Nummer",
+                    inputType: "text"
+                }, {
+                    key: "name",
+                    label: "Name",
+                    required: true,
+                    title: true,
+                    inputType: "text",
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType: "textarea"
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true,
+                    component: profiles
+                },
+            ],
+            showTabs: [{label: 'Informationen'}]
+        },
     }
 
     const documentTypesForCreation = ref({