Fixes

2026-03-04 20:44:19 +01:00
parent 9cef3964e9
commit 52c182cb5f
14 changed files with 569 additions and 372 deletions
--- a/backend/db/migrations/0018_account_chart.sql
+++ b/backend/db/migrations/0018_account_chart.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "accounts" ADD COLUMN "accountChart" text DEFAULT 'skr03' NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "tenants" ADD COLUMN "accountChart" text DEFAULT 'skr03' NOT NULL;
--- a/backend/db/migrations/0019_custom_surcharge_percentage_decimal.sql
+++ b/backend/db/migrations/0019_custom_surcharge_percentage_decimal.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "createddocuments"
+ALTER COLUMN "customSurchargePercentage" TYPE double precision
+USING "customSurchargePercentage"::double precision;
--- a/backend/db/schema/createddocuments.ts
+++ b/backend/db/schema/createddocuments.ts
@@ -6,6 +6,7 @@ import {
    jsonb,
    boolean,
    smallint,
+    doublePrecision,
    uuid,
 } from "drizzle-orm/pg-core"

@@ -96,7 +97,7 @@ export const createddocuments = pgTable("createddocuments", {

    taxType: text("taxType"),

-    customSurchargePercentage: smallint("customSurchargePercentage")
+    customSurchargePercentage: doublePrecision("customSurchargePercentage")
        .notNull()
        .default(0),

--- a/backend/db/schema/tenants.ts
+++ b/backend/db/schema/tenants.ts
@@ -74,6 +74,48 @@ export const tenants = pgTable(
            timeTracking: true,
            planningBoard: true,
            workingTimeTracking: true,
+            dashboard: true,
+            historyitems: true,
+            tasks: true,
+            wiki: true,
+            files: true,
+            createdletters: true,
+            documentboxes: true,
+            helpdesk: true,
+            email: true,
+            members: true,
+            customers: true,
+            vendors: true,
+            contactsList: true,
+            staffTime: true,
+            createDocument: true,
+            serialInvoice: true,
+            incomingInvoices: true,
+            costcentres: true,
+            accounts: true,
+            ownaccounts: true,
+            banking: true,
+            spaces: true,
+            customerspaces: true,
+            customerinventoryitems: true,
+            inventoryitems: true,
+            inventoryitemgroups: true,
+            products: true,
+            productcategories: true,
+            services: true,
+            servicecategories: true,
+            memberrelations: true,
+            staffProfiles: true,
+            hourrates: true,
+            projecttypes: true,
+            contracttypes: true,
+            plants: true,
+            settingsNumberRanges: true,
+            settingsEmailAccounts: true,
+            settingsBanking: true,
+            settingsTexttemplates: true,
+            settingsTenant: true,
+            export: true,
        }),

        ownFields: jsonb("ownFields"),
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,7 +11,8 @@
    "start": "node dist/src/index.js",
    "schema:index": "ts-node scripts/generate-schema-index.ts",
    "bankcodes:update": "tsx scripts/generate-de-bank-codes.ts",
-    "members:import:csv": "tsx scripts/import-members-csv.ts"
+    "members:import:csv": "tsx scripts/import-members-csv.ts",
+    "accounts:import:skr42": "ts-node scripts/import-skr42-accounts.ts"
  },
  "repository": {
    "type": "git",
--- a/backend/src/modules/service-price-recalculation.service.ts
+++ b/backend/src/modules/service-price-recalculation.service.ts
@@ -38,6 +38,11 @@ function normalizeUuid(value: unknown): string | null {
    return trimmed.length ? trimmed : null;
 }

+function sanitizeCompositionRows(value: unknown): CompositionRow[] {
+    if (!Array.isArray(value)) return [];
+    return value.filter((entry): entry is CompositionRow => !!entry && typeof entry === "object");
+}
+
 export async function recalculateServicePricesForTenant(server: FastifyInstance, tenantId: number, updatedBy?: string | null) {
    const [services, products, hourrates] = await Promise.all([
        server.db.select().from(schema.services).where(eq(schema.services.tenant, tenantId)),
@@ -88,21 +93,36 @@ export async function recalculateServicePricesForTenant(server: FastifyInstance,
                materialPurchaseTotal: getJsonNumber(service.purchasePriceComposed, "material"),
                workerTotal: getJsonNumber(service.sellingPriceComposed, "worker"),
                workerPurchaseTotal: getJsonNumber(service.purchasePriceComposed, "worker"),
-                materialComposition: Array.isArray(service.materialComposition) ? service.materialComposition as CompositionRow[] : [],
-                personalComposition: Array.isArray(service.personalComposition) ? service.personalComposition as CompositionRow[] : [],
+                materialComposition: sanitizeCompositionRows(service.materialComposition),
+                personalComposition: sanitizeCompositionRows(service.personalComposition),
            };
            memo.set(serviceId, lockedResult);
            return lockedResult;
        }

        stack.add(serviceId);
+        try {
+            const materialComposition = sanitizeCompositionRows(service.materialComposition);
+            const personalComposition = sanitizeCompositionRows(service.personalComposition);
+            const hasMaterialComposition = materialComposition.length > 0;
+            const hasPersonalComposition = personalComposition.length > 0;

-        const materialComposition: CompositionRow[] = Array.isArray(service.materialComposition)
-            ? (service.materialComposition as CompositionRow[])
-            : [];
-        const personalComposition: CompositionRow[] = Array.isArray(service.personalComposition)
-            ? (service.personalComposition as CompositionRow[])
-            : [];
+            // Ohne Zusammensetzung keine automatische Überschreibung:
+            // manuell gepflegte Preise sollen erhalten bleiben.
+            if (!hasMaterialComposition && !hasPersonalComposition) {
+                const manualResult = {
+                    sellingTotal: getJsonNumber(service.sellingPriceComposed, "total") || toNumber(service.sellingPrice),
+                    purchaseTotal: getJsonNumber(service.purchasePriceComposed, "total"),
+                    materialTotal: getJsonNumber(service.sellingPriceComposed, "material"),
+                    materialPurchaseTotal: getJsonNumber(service.purchasePriceComposed, "material"),
+                    workerTotal: getJsonNumber(service.sellingPriceComposed, "worker"),
+                    workerPurchaseTotal: getJsonNumber(service.purchasePriceComposed, "worker"),
+                    materialComposition,
+                    personalComposition,
+                };
+                memo.set(serviceId, manualResult);
+                return manualResult;
+            }

            let materialTotal = 0;
            let materialPurchaseTotal = 0;
@@ -174,8 +194,10 @@ export async function recalculateServicePricesForTenant(server: FastifyInstance,
            };

            memo.set(serviceId, result);
-        stack.delete(serviceId);
            return result;
+        } finally {
+            stack.delete(serviceId);
+        }
    };

    for (const service of services) {
--- a/backend/src/plugins/queryconfig.ts
+++ b/backend/src/plugins/queryconfig.ts
@@ -58,8 +58,6 @@ const queryConfigPlugin: FastifyPluginAsync<QueryConfigPluginOptions> = async (

        const query = req.query as Record<string, any>

-        console.log(query)
-
        // Pagination deaktivieren?
        const disablePagination =
            query.noPagination === 'true' ||
--- a/backend/src/routes/auth/me.ts
+++ b/backend/src/routes/auth/me.ts
@@ -51,6 +51,7 @@ export default async function meRoutes(server: FastifyInstance) {
                    name: tenants.name,
                    short: tenants.short,
                    locked: tenants.locked,
+                    features: tenants.features,
                    extraModules: tenants.extraModules,
                    businessInfo: tenants.businessInfo,
                    numberRanges: tenants.numberRanges,
--- a/frontend/components/MainNav.vue
+++ b/frontend/components/MainNav.vue
@@ -15,8 +15,241 @@ const showMembersNav = computed(() => {
 const showMemberRelationsNav = computed(() => {
  return tenantExtraModules.value.includes("verein") && has("members")
 })
+const tenantFeatures = computed(() => auth.activeTenantData?.features || {})
+const featureEnabled = (key) => tenantFeatures.value?.[key] !== false

 const links = computed(() => {
+  const organisationChildren = [
+    has("tasks") && featureEnabled("tasks") ? {
+      label: "Aufgaben",
+      to: "/tasks",
+      icon: "i-heroicons-rectangle-stack"
+    } : null,
+    featureEnabled("wiki") ? {
+      label: "Wiki",
+      to: "/wiki",
+      icon: "i-heroicons-book-open"
+    } : null,
+  ].filter(Boolean)
+
+  const documentChildren = [
+    featureEnabled("files") ? {
+      label: "Dateien",
+      to: "/files",
+      icon: "i-heroicons-document"
+    } : null,
+    featureEnabled("createdletters") ? {
+      label: "Anschreiben",
+      to: "/createdletters",
+      icon: "i-heroicons-document",
+      disabled: true
+    } : null,
+    featureEnabled("documentboxes") ? {
+      label: "Boxen",
+      to: "/standardEntity/documentboxes",
+      icon: "i-heroicons-archive-box",
+      disabled: true
+    } : null,
+  ].filter(Boolean)
+
+  const communicationChildren = [
+    featureEnabled("helpdesk") ? {
+      label: "Helpdesk",
+      to: "/helpdesk",
+      icon: "i-heroicons-chat-bubble-left-right",
+      disabled: true
+    } : null,
+    featureEnabled("email") ? {
+      label: "E-Mail",
+      to: "/email/new",
+      icon: "i-heroicons-envelope",
+      disabled: true
+    } : null,
+  ].filter(Boolean)
+
+  const contactsChildren = [
+    showMembersNav.value && featureEnabled("members") ? {
+      label: "Mitglieder",
+      to: "/standardEntity/members",
+      icon: "i-heroicons-user-group"
+    } : null,
+    has("customers") && featureEnabled("customers") ? {
+      label: "Kunden",
+      to: "/standardEntity/customers",
+      icon: "i-heroicons-user-group"
+    } : null,
+    has("vendors") && featureEnabled("vendors") ? {
+      label: "Lieferanten",
+      to: "/standardEntity/vendors",
+      icon: "i-heroicons-truck"
+    } : null,
+    has("contacts") && featureEnabled("contactsList") ? {
+      label: "Ansprechpartner",
+      to: "/standardEntity/contacts",
+      icon: "i-heroicons-user-group"
+    } : null,
+  ].filter(Boolean)
+
+  const staffChildren = [
+    featureEnabled("staffTime") ? {
+      label: "Zeiten",
+      to: "/staff/time",
+      icon: "i-heroicons-clock",
+    } : null,
+  ].filter(Boolean)
+
+  const accountingChildren = [
+    featureEnabled("createDocument") ? {
+      label: "Ausgangsbelege",
+      to: "/createDocument",
+      icon: "i-heroicons-document-text"
+    } : null,
+    featureEnabled("serialInvoice") ? {
+      label: "Serienvorlagen",
+      to: "/createDocument/serialInvoice",
+      icon: "i-heroicons-document-text"
+    } : null,
+    featureEnabled("incomingInvoices") ? {
+      label: "Eingangsbelege",
+      to: "/incomingInvoices",
+      icon: "i-heroicons-document-text",
+    } : null,
+    featureEnabled("costcentres") ? {
+      label: "Kostenstellen",
+      to: "/standardEntity/costcentres",
+      icon: "i-heroicons-document-currency-euro"
+    } : null,
+    featureEnabled("accounts") ? {
+      label: "Buchungskonten",
+      to: "/accounts",
+      icon: "i-heroicons-document-text",
+    } : null,
+    featureEnabled("ownaccounts") ? {
+      label: "zusätzliche Buchungskonten",
+      to: "/standardEntity/ownaccounts",
+      icon: "i-heroicons-document-text"
+    } : null,
+    featureEnabled("banking") ? {
+      label: "Bank",
+      to: "/banking",
+      icon: "i-heroicons-document-text",
+    } : null,
+  ].filter(Boolean)
+
+  const inventoryChildren = [
+    has("spaces") && featureEnabled("spaces") ? {
+      label: "Lagerplätze",
+      to: "/standardEntity/spaces",
+      icon: "i-heroicons-square-3-stack-3d"
+    } : null,
+    has("inventoryitems") && featureEnabled("customerspaces") ? {
+      label: "Kundenlagerplätze",
+      to: "/standardEntity/customerspaces",
+      icon: "i-heroicons-squares-plus"
+    } : null,
+    has("inventoryitems") && featureEnabled("customerinventoryitems") ? {
+      label: "Kundeninventar",
+      to: "/standardEntity/customerinventoryitems",
+      icon: "i-heroicons-qr-code"
+    } : null,
+    has("inventoryitems") && featureEnabled("inventoryitems") ? {
+      label: "Inventar",
+      to: "/standardEntity/inventoryitems",
+      icon: "i-heroicons-puzzle-piece"
+    } : null,
+    has("inventoryitems") && featureEnabled("inventoryitemgroups") ? {
+      label: "Inventargruppen",
+      to: "/standardEntity/inventoryitemgroups",
+      icon: "i-heroicons-puzzle-piece"
+    } : null,
+  ].filter(Boolean)
+
+  const masterDataChildren = [
+    has("products") && featureEnabled("products") ? {
+      label: "Artikel",
+      to: "/standardEntity/products",
+      icon: "i-heroicons-puzzle-piece"
+    } : null,
+    has("productcategories") && featureEnabled("productcategories") ? {
+      label: "Artikelkategorien",
+      to: "/standardEntity/productcategories",
+      icon: "i-heroicons-puzzle-piece"
+    } : null,
+    has("services") && featureEnabled("services") ? {
+      label: "Leistungen",
+      to: "/standardEntity/services",
+      icon: "i-heroicons-wrench-screwdriver"
+    } : null,
+    has("servicecategories") && featureEnabled("servicecategories") ? {
+      label: "Leistungskategorien",
+      to: "/standardEntity/servicecategories",
+      icon: "i-heroicons-wrench-screwdriver"
+    } : null,
+    showMemberRelationsNav.value && featureEnabled("memberrelations") ? {
+      label: "Mitgliedsverhältnisse",
+      to: "/standardEntity/memberrelations",
+      icon: "i-heroicons-identification"
+    } : null,
+    featureEnabled("staffProfiles") ? {
+      label: "Mitarbeiter",
+      to: "/staff/profiles",
+      icon: "i-heroicons-user-group"
+    } : null,
+    featureEnabled("hourrates") ? {
+      label: "Stundensätze",
+      to: "/standardEntity/hourrates",
+      icon: "i-heroicons-user-group"
+    } : null,
+    featureEnabled("projecttypes") ? {
+      label: "Projekttypen",
+      to: "/projecttypes",
+      icon: "i-heroicons-clipboard-document-list",
+    } : null,
+    featureEnabled("contracttypes") ? {
+      label: "Vertragstypen",
+      to: "/standardEntity/contracttypes",
+      icon: "i-heroicons-document-duplicate",
+    } : null,
+    has("vehicles") && featureEnabled("vehicles") ? {
+      label: "Fahrzeuge",
+      to: "/standardEntity/vehicles",
+      icon: "i-heroicons-truck"
+    } : null,
+  ].filter(Boolean)
+
+  const settingsChildren = [
+    featureEnabled("settingsNumberRanges") ? {
+      label: "Nummernkreise",
+      to: "/settings/numberRanges",
+      icon: "i-heroicons-clipboard-document-list",
+    } : null,
+    featureEnabled("settingsEmailAccounts") ? {
+      label: "E-Mail Konten",
+      to: "/settings/emailaccounts",
+      icon: "i-heroicons-envelope",
+    } : null,
+    featureEnabled("settingsBanking") ? {
+      label: "Bankkonten",
+      to: "/settings/banking",
+      icon: "i-heroicons-currency-euro",
+    } : null,
+    featureEnabled("settingsTexttemplates") ? {
+      label: "Textvorlagen",
+      to: "/settings/texttemplates",
+      icon: "i-heroicons-clipboard-document-list",
+    } : null,
+    featureEnabled("settingsTenant") ? {
+      label: "Firmeneinstellungen",
+      to: "/settings/tenant",
+      icon: "i-heroicons-building-office",
+    } : null,
+    featureEnabled("export") ? {
+      label: "Export",
+      to: "/export",
+      icon: "i-heroicons-clipboard-document-list"
+    } : null,
+  ].filter(Boolean)
+
  return [
    ...(auth.profile?.pinned_on_navigation || []).map(pin => {
      if (pin.type === "external") {
@@ -37,290 +270,89 @@ const links = computed(() => {
      }
    }),

-    {
+    featureEnabled("dashboard") ? {
      id: 'dashboard',
      label: "Dashboard",
      to: "/",
      icon: "i-heroicons-home"
-    },
-    {
+    } : null,
+    featureEnabled("historyitems") ? {
      id: 'historyitems',
      label: "Logbuch",
      to: "/historyitems",
      icon: "i-heroicons-book-open"
-    },
-    {
+    } : null,
+    ...(organisationChildren.length > 0 ? [{
      label: "Organisation",
      icon: "i-heroicons-rectangle-stack",
      defaultOpen: false,
-      children: [
-        ...has("tasks") ? [{
-          label: "Aufgaben",
-          to: "/tasks",
-          icon: "i-heroicons-rectangle-stack"
-        }] : [],
-        ...true ? [{
-          label: "Wiki",
-          to: "/wiki",
-          icon: "i-heroicons-book-open"
-        }] : [],
-      ]
-    },
-    {
+      children: organisationChildren
+    }] : []),
+    ...(documentChildren.length > 0 ? [{
      label: "Dokumente",
      icon: "i-heroicons-rectangle-stack",
      defaultOpen: false,
-      children: [
-        {
-          label: "Dateien",
-          to: "/files",
-          icon: "i-heroicons-document"
-        }, {
-          label: "Anschreiben",
-          to: "/createdletters",
-          icon: "i-heroicons-document",
-          disabled: true
-        }, {
-          label: "Boxen",
-          to: "/standardEntity/documentboxes",
-          icon: "i-heroicons-archive-box",
-          disabled: true
-        },
-      ]
-    },
-    {
+      children: documentChildren
+    }] : []),
+    ...(communicationChildren.length > 0 ? [{
      label: "Kommunikation",
      icon: "i-heroicons-megaphone",
      defaultOpen: false,
-      children: [
-        {
-          label: "Helpdesk",
-          to: "/helpdesk",
-          icon: "i-heroicons-chat-bubble-left-right",
-          disabled: true
-        },
-        {
-          label: "E-Mail",
-          to: "/email/new",
-          icon: "i-heroicons-envelope",
-          disabled: true
-        }
-      ]
-    },
-    ...(has("customers") || has("vendors") || has("contacts") || showMembersNav.value) ? [{
+      children: communicationChildren
+    }] : []),
+    ...(contactsChildren.length > 0 ? [{
      label: "Kontakte",
      defaultOpen: false,
      icon: "i-heroicons-user-group",
-      children: [
-        ...showMembersNav.value ? [{
-          label: "Mitglieder",
-          to: "/standardEntity/members",
-          icon: "i-heroicons-user-group"
-        }] : [],
-        ...has("customers") ? [{
-          label: "Kunden",
-          to: "/standardEntity/customers",
-          icon: "i-heroicons-user-group"
-        }] : [],
-        ...has("vendors") ? [{
-          label: "Lieferanten",
-          to: "/standardEntity/vendors",
-          icon: "i-heroicons-truck"
-        }] : [],
-        ...has("contacts") ? [{
-          label: "Ansprechpartner",
-          to: "/standardEntity/contacts",
-          icon: "i-heroicons-user-group"
-        }] : [],
-      ]
-    }] : [],
-    {
+      children: contactsChildren
+    }] : []),
+    ...(staffChildren.length > 0 ? [{
      label: "Mitarbeiter",
      defaultOpen: false,
      icon: "i-heroicons-user-group",
-      children: [
-        ...true ? [{
-          label: "Zeiten",
-          to: "/staff/time",
-          icon: "i-heroicons-clock",
-        }] : [],
-      ]
-    },
-    ...[{
+      children: staffChildren
+    }] : []),
+    ...(accountingChildren.length > 0 ? [{
      label: "Buchhaltung",
      defaultOpen: false,
      icon: "i-heroicons-chart-bar-square",
-      children: [
-        {
-          label: "Ausgangsbelege",
-          to: "/createDocument",
-          icon: "i-heroicons-document-text"
-        }, {
-          label: "Serienvorlagen",
-          to: "/createDocument/serialInvoice",
-          icon: "i-heroicons-document-text"
-        }, {
-          label: "Eingangsbelege",
-          to: "/incomingInvoices",
-          icon: "i-heroicons-document-text",
-        }, {
-          label: "Kostenstellen",
-          to: "/standardEntity/costcentres",
-          icon: "i-heroicons-document-currency-euro"
-        }, {
-          label: "Buchungskonten",
-          to: "/accounts",
-          icon: "i-heroicons-document-text",
-        }, {
-          label: "zusätzliche Buchungskonten",
-          to: "/standardEntity/ownaccounts",
-          icon: "i-heroicons-document-text"
-        },
-        {
-          label: "Bank",
-          to: "/banking",
-          icon: "i-heroicons-document-text",
-        },
-      ]
-    }],
-    ...has("inventory") ? [{
+      children: accountingChildren
+    }] : []),
+    ...(inventoryChildren.length > 0 ? [{
      label: "Lager",
      icon: "i-heroicons-puzzle-piece",
      defaultOpen: false,
-      children: [
-        ...has("spaces") ? [{
-          label: "Lagerplätze",
-          to: "/standardEntity/spaces",
-          icon: "i-heroicons-square-3-stack-3d"
-        }] : [],
-        ...has("inventoryitems") ? [{
-          label: "Kundenlagerplätze",
-          to: "/standardEntity/customerspaces",
-          icon: "i-heroicons-squares-plus"
-        }] : [],
-        ...has("inventoryitems") ? [{
-          label: "Kundeninventar",
-          to: "/standardEntity/customerinventoryitems",
-          icon: "i-heroicons-qr-code"
-        }] : [],
-        ...has("inventoryitems") ? [{
-          label: "Inventar",
-          to: "/standardEntity/inventoryitems",
-          icon: "i-heroicons-puzzle-piece"
-        }] : [],
-        ...has("inventoryitems") ? [{
-          label: "Inventargruppen",
-          to: "/standardEntity/inventoryitemgroups",
-          icon: "i-heroicons-puzzle-piece"
-        }] : [],
-      ]
-    }] : [],
-    {
+      children: inventoryChildren
+    }] : []),
+    ...(masterDataChildren.length > 0 ? [{
      label: "Stammdaten",
      defaultOpen: false,
      icon: "i-heroicons-clipboard-document",
-      children: [
-        ...has("products") ? [{
-          label: "Artikel",
-          to: "/standardEntity/products",
-          icon: "i-heroicons-puzzle-piece"
-        }] : [],
-        ...has("productcategories") ? [{
-          label: "Artikelkategorien",
-          to: "/standardEntity/productcategories",
-          icon: "i-heroicons-puzzle-piece"
-        }] : [],
-        ...has("services") ? [{
-          label: "Leistungen",
-          to: "/standardEntity/services",
-          icon: "i-heroicons-wrench-screwdriver"
-        }] : [],
-        ...has("servicecategories") ? [{
-          label: "Leistungskategorien",
-          to: "/standardEntity/servicecategories",
-          icon: "i-heroicons-wrench-screwdriver"
-        }] : [],
-        ...showMemberRelationsNav.value ? [{
-          label: "Mitgliedsverhältnisse",
-          to: "/standardEntity/memberrelations",
-          icon: "i-heroicons-identification"
-        }] : [],
-        {
-          label: "Mitarbeiter",
-          to: "/staff/profiles",
-          icon: "i-heroicons-user-group"
-        },
-        {
-          label: "Stundensätze",
-          to: "/standardEntity/hourrates",
-          icon: "i-heroicons-user-group"
-        },
-        {
-          label: "Projekttypen",
-          to: "/projecttypes",
-          icon: "i-heroicons-clipboard-document-list",
-        },
-        {
-          label: "Vertragstypen",
-          to: "/standardEntity/contracttypes",
-          icon: "i-heroicons-document-duplicate",
-        },
-        ...has("vehicles") ? [{
-          label: "Fahrzeuge",
-          to: "/standardEntity/vehicles",
-          icon: "i-heroicons-truck"
-        }] : [],
-      ]
-    },
+      children: masterDataChildren
+    }] : []),

-    ...has("projects") ? [{
+    ...(has("projects") && featureEnabled("projects")) ? [{
      label: "Projekte",
      to: "/standardEntity/projects",
      icon: "i-heroicons-clipboard-document-check"
    }] : [],
-    ...has("contracts") ? [{
+    ...(has("contracts") && featureEnabled("contracts")) ? [{
      label: "Verträge",
      to: "/standardEntity/contracts",
      icon: "i-heroicons-clipboard-document"
    }] : [],
-    ...has("plants") ? [{
+    ...(has("plants") && featureEnabled("plants")) ? [{
      label: "Objekte",
      to: "/standardEntity/plants",
      icon: "i-heroicons-clipboard-document"
    }] : [],
-    {
+    ...(settingsChildren.length > 0 ? [{
      label: "Einstellungen",
      defaultOpen: false,
      icon: "i-heroicons-cog-8-tooth",
-      children: [
-        {
-          label: "Nummernkreise",
-          to: "/settings/numberRanges",
-          icon: "i-heroicons-clipboard-document-list",
-        }, {
-          label: "E-Mail Konten",
-          to: "/settings/emailaccounts",
-          icon: "i-heroicons-envelope",
-        }, {
-          label: "Bankkonten",
-          to: "/settings/banking",
-          icon: "i-heroicons-currency-euro",
-        }, {
-          label: "Textvorlagen",
-          to: "/settings/texttemplates",
-          icon: "i-heroicons-clipboard-document-list",
-        }, {
-          label: "Firmeneinstellungen",
-          to: "/settings/tenant",
-          icon: "i-heroicons-building-office",
-        }, {
-          label: "Export",
-          to: "/export",
-          icon: "i-heroicons-clipboard-document-list"
-        }
-      ]
-    },
-  ]
+      children: settingsChildren
+    }] : []),
+  ].filter(Boolean)
 })

 const accordionItems = computed(() =>
--- a/frontend/components/columnRenderings/description.vue
+++ b/frontend/components/columnRenderings/description.vue
@@ -6,8 +6,20 @@ const props = defineProps({
    default: {}
  }
 })
+
+const descriptionText = computed(() => {
+  const description = props.row?.description
+  if (!description) return ""
+  if (typeof description === "string") return description
+  if (typeof description === "object") {
+    if (typeof description.text === "string" && description.text.trim().length) {
+      return description.text
+    }
+  }
+  return String(description)
+})
 </script>

 <template>
-  <div v-if="props.row.description" v-html="props.row.description.html"/>
+  <div v-if="descriptionText">{{ descriptionText }}</div>
 </template>
--- a/frontend/pages/createDocument/edit/[[id]].vue
+++ b/frontend/pages/createDocument/edit/[[id]].vue
@@ -2073,6 +2073,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                >
                  <UInput
                      type="number"
+                      step="0.01"
                      v-model="itemInfo.customSurchargePercentage"
                      @change="updateCustomSurcharge"
                  >
--- a/frontend/pages/settings/tenant.vue
+++ b/frontend/pages/settings/tenant.vue
@@ -1,6 +1,108 @@
 <script setup>

 const auth = useAuthStore()
+const defaultFeatures = {
+  objects: true,
+  calendar: true,
+  contacts: true,
+  projects: true,
+  vehicles: true,
+  contracts: true,
+  inventory: true,
+  accounting: true,
+  timeTracking: true,
+  planningBoard: true,
+  workingTimeTracking: true,
+  dashboard: true,
+  historyitems: true,
+  tasks: true,
+  wiki: true,
+  files: true,
+  createdletters: true,
+  documentboxes: true,
+  helpdesk: true,
+  email: true,
+  members: true,
+  customers: true,
+  vendors: true,
+  contactsList: true,
+  staffTime: true,
+  createDocument: true,
+  serialInvoice: true,
+  incomingInvoices: true,
+  costcentres: true,
+  accounts: true,
+  ownaccounts: true,
+  banking: true,
+  spaces: true,
+  customerspaces: true,
+  customerinventoryitems: true,
+  inventoryitems: true,
+  inventoryitemgroups: true,
+  products: true,
+  productcategories: true,
+  services: true,
+  servicecategories: true,
+  memberrelations: true,
+  staffProfiles: true,
+  hourrates: true,
+  projecttypes: true,
+  contracttypes: true,
+  plants: true,
+  settingsNumberRanges: true,
+  settingsEmailAccounts: true,
+  settingsBanking: true,
+  settingsTexttemplates: true,
+  settingsTenant: true,
+  export: true,
+}
+const featureOptions = [
+  { key: "dashboard", label: "Dashboard" },
+  { key: "historyitems", label: "Logbuch" },
+  { key: "tasks", label: "Aufgaben" },
+  { key: "wiki", label: "Wiki" },
+  { key: "files", label: "Dateien" },
+  { key: "createdletters", label: "Anschreiben" },
+  { key: "documentboxes", label: "Boxen" },
+  { key: "helpdesk", label: "Helpdesk" },
+  { key: "email", label: "E-Mail" },
+  { key: "members", label: "Mitglieder" },
+  { key: "customers", label: "Kunden" },
+  { key: "vendors", label: "Lieferanten" },
+  { key: "contactsList", label: "Ansprechpartner" },
+  { key: "staffTime", label: "Mitarbeiter: Zeiten" },
+  { key: "createDocument", label: "Buchhaltung: Ausgangsbelege" },
+  { key: "serialInvoice", label: "Buchhaltung: Serienvorlagen" },
+  { key: "incomingInvoices", label: "Buchhaltung: Eingangsbelege" },
+  { key: "costcentres", label: "Buchhaltung: Kostenstellen" },
+  { key: "accounts", label: "Buchhaltung: Buchungskonten" },
+  { key: "ownaccounts", label: "Buchhaltung: Zusätzliche Buchungskonten" },
+  { key: "banking", label: "Buchhaltung: Bank" },
+  { key: "spaces", label: "Lagerplätze" },
+  { key: "customerspaces", label: "Kundenlagerplätze" },
+  { key: "customerinventoryitems", label: "Kundeninventar" },
+  { key: "inventoryitems", label: "Inventar" },
+  { key: "inventoryitemgroups", label: "Inventargruppen" },
+  { key: "products", label: "Stammdaten: Artikel" },
+  { key: "productcategories", label: "Stammdaten: Artikelkategorien" },
+  { key: "services", label: "Stammdaten: Leistungen" },
+  { key: "servicecategories", label: "Stammdaten: Leistungskategorien" },
+  { key: "memberrelations", label: "Stammdaten: Mitgliedsverhältnisse" },
+  { key: "staffProfiles", label: "Stammdaten: Mitarbeiter" },
+  { key: "hourrates", label: "Stammdaten: Stundensätze" },
+  { key: "projecttypes", label: "Stammdaten: Projekttypen" },
+  { key: "contracttypes", label: "Stammdaten: Vertragstypen" },
+  { key: "vehicles", label: "Stammdaten: Fahrzeuge" },
+  { key: "projects", label: "Projekte" },
+  { key: "contracts", label: "Verträge" },
+  { key: "plants", label: "Objekte" },
+  { key: "settingsNumberRanges", label: "Einstellungen: Nummernkreise" },
+  { key: "settingsEmailAccounts", label: "Einstellungen: E-Mail Konten" },
+  { key: "settingsBanking", label: "Einstellungen: Bankkonten" },
+  { key: "settingsTexttemplates", label: "Einstellungen: Textvorlagen" },
+  { key: "settingsTenant", label: "Einstellungen: Firmeneinstellungen" },
+  { key: "export", label: "Einstellungen: Export" },
+]

 const itemInfo = ref({
  features: {},
@@ -13,7 +115,7 @@ const setupPage = async () => {
  console.log(itemInfo.value)
 }

-const features = ref(auth.activeTenantData.features)
+const features = ref({ ...defaultFeatures, ...(auth.activeTenantData?.features || {}) })
 const businessInfo = ref(auth.activeTenantData.businessInfo)
 const accountChart = ref(auth.activeTenantData.accountChart || "skr03")
 const accountChartOptions = [
@@ -33,8 +135,12 @@ const updateTenant = async (newData) => {
  if (res) {
    itemInfo.value = res
    auth.activeTenantData = res
+    features.value = { ...defaultFeatures, ...(res?.features || {}) }
  }
 }
+const saveFeatures = async () => {
+  await updateTenant({features: features.value})
+}

 setupPage()
 </script>
@@ -50,6 +156,8 @@ setupPage()
          label: 'Dokubox'
        },{
          label: 'Rechnung & Kontakt'
+        },{
+          label: 'Funktionen'
        }
    ]"
  >
@@ -131,59 +239,11 @@ setupPage()
              class="mb-5"
          />
          <UCheckbox
-              label="Kalendar"
-              v-model="features.calendar"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Kontakte"
-              v-model="features.contacts"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Plantafel"
-              v-model="features.planningBoard"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Zeiterfassung"
-              v-model="features.timeTracking"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Anwesenheiten"
-              v-model="features.workingTimeTracking"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Lager"
-              v-model="features.inventory"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Fahrzeuge"
-              v-model="features.vehicles"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Buchhaltung"
-              v-model="features.accounting"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Projekte"
-              v-model="features.projects"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Verträge"
-              v-model="features.contracts"
-              @change="updateTenant({features: features})"
-          />
-          <UCheckbox
-              label="Objekte"
-              v-model="features.objects"
-              @change="updateTenant({features: features})"
+              v-for="option in featureOptions"
+              :key="option.key"
+              :label="option.label"
+              v-model="features[option.key]"
+              @change="saveFeatures"
          />
        </UCard>
      </div>
--- a/frontend/stores/data.js
+++ b/frontend/stores/data.js
@@ -1237,9 +1237,9 @@ export const useDataStore = defineStore('data', () => {
                    selectOptionAttribute: "name",
                    selectSearchAttributes: ['name'],
                },{
-                    key: "description",
+                    key: "description.text",
                    label: "Beschreibung",
-                    inputType:"editor",
+                    inputType:"textarea",
                    component: description
                },
            ],
--- a/mobile/src/lib/api.ts
+++ b/mobile/src/lib/api.ts
@@ -502,9 +502,22 @@ export async function createCustomerInventoryItem(
 }

 export async function fetchPlants(token: string, includeArchived = false): Promise<Plant[]> {
-  const plants = await apiRequest<Plant[]>('/api/resource/plants', { token });
-  if (includeArchived) return plants || [];
-  return (plants || []).filter((plant) => !plant.archived);
+  const plants = await apiRequest<Array<Plant & { description?: unknown }>>('/api/resource/plants', { token });
+  const normalized = (plants || []).map((plant) => {
+    const legacyDescription = typeof plant.description === 'string'
+      ? plant.description
+      : (plant.description && typeof plant.description === 'object' && 'text' in (plant.description as Record<string, unknown>)
+          ? String((plant.description as Record<string, unknown>).text || '')
+          : null);
+
+    return {
+      ...plant,
+      description: legacyDescription || null,
+    } as Plant;
+  });
+
+  if (includeArchived) return normalized;
+  return normalized.filter((plant) => !plant.archived);
 }

 export async function createPlant(
@@ -518,7 +531,15 @@ export async function createPlant(
  return apiRequest<Plant>('/api/resource/plants', {
    method: 'POST',
    token,
-    body: payload,
+    body: {
+      name: payload.name,
+      customer: payload.customer ?? null,
+      description: {
+        text: payload.description?.trim() || '',
+        html: '',
+        json: [],
+      },
+    },
  });
 }