Session.Logout

2.8.7.1
FORMEL_SQL release Candidate
2026-03-27 13:50:30 +01:00 · 2026-03-27 12:48:25 +01:00 · 2026-03-25 15:20:39 +01:00 · 2026-03-20 13:43:09 +01:00 · 2026-03-11 16:43:34 +01:00 · 2026-03-11 12:08:46 +01:00
88 changed files with 15796 additions and 4579 deletions
--- a/app/README.md
+++ b/app/README.md
@@ -0,0 +1,62 @@
+Here's the improved `README.md` file incorporating the new content while maintaining the existing structure and coherence:
+
+
+# Project Title
+
+## Overview
+Provide a brief description of the project, its purpose, and its main features.
+
+## Installation
+Instructions on how to install and set up the project.
+
+## Usage
+How to use the project, including code examples and explanations.
+
+## DataColumn.Expression (Formelsprachen-Übersicht)
+
+Die dynamischen Grid-Formeln verwenden die ADO.NET **`DataColumn.Expression`**-Sprache. Spalten werden immer über den **Spaltennamen** referenziert (in eckigen Klammern).
+
+### Grundoperatoren
+| Typ | Ausdruck | Beispiel |
+|---|---|---|
+| Arithmetik | `+ - * /` | `[A] * [B]` |
+| Vergleich | `= <> > >= < <=` | `[MENGE] > 0` |
+| Logik | `AND OR NOT` | `[A] > 0 AND [B] < 10` |
+| Klammern | `(...)` | `([A] + [B]) * 2` |
+
+### String-Verkettung
+| Ausdruck | Beispiel |
+|---|---|
+| `+` | `[VORNAME] + ' - ' + [NACHNAME]` |
+| `Convert` | `Convert([NUMMER], 'System.String')` |
+
+### Bedingungen
+| Ausdruck | Beispiel |
+|---|---|
+| `IIF` | `IIF([A] = 'Harry', 'Blume', 'Tier')` |
+
+### Häufige Funktionen
+| Funktion | Beispiel |
+|---|---|
+| `Len` | `Len([TEXT])` |
+| `Trim` | `Trim([TEXT])` |
+| `Substring` | `Substring([TEXT], 0, 3)` |
+| `IsNull` | `IsNull([WERT], 0)` |
+| `Convert` | `Convert([WERT], 'System.Double')` |
+
+### Beispiele (FORMULA_EXPRESSION)
+- **Multiplikation:** `[MENGE] * [PREIS]`
+- **Addieren:** `[A] + [B]`
+- **Division:** `[A] / [B]`
+- **Text zusammensetzen:** `[SAKNR] + ' - ' + [KST]`
+- **Bedingung:** `IIF([STATUS] = 'X', 'OK', 'NOK')`
+
+## Contributing
+Guidelines for contributing to the project.
+
+## License
+Information about the project's license.
+
+## Contact
+How to contact the project maintainers for questions or support.
+
--- a/app/SetupVS19/Product.wxs
+++ b/app/SetupVS19/Product.wxs
@@ -123,7 +123,6 @@
 				<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll"/>
 				<File Id="DDInterfaces" Name="DigitalData.Modules.Interfaces.dll" Source="DigitalData.Modules.Interfaces.dll"/>
 				<File Id="DDBase" Name="DigitalData.Modules.Base.dll" Source="DigitalData.Modules.Base.dll"/>
-				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll"/>
 				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll"/>
 				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" Source="DigitalData.Modules.Encryption.dll"/>
 				<File Id="DDWindream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll"/>
@@ -138,7 +137,27 @@
 				<File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
 				<File Id="NLog" Name="NLog.dll" Source="NLog.dll"/>
 			</Component>
-
+      <Component Id="RuntimeLibs" Guid="F7170744-3DB5-4275-ACCD-7F3B9BDE1D6E">
+        <File Id="Newtonsoft.Json" Name="Newtonsoft.Json.dll" Source="Newtonsoft.Json.dll" KeyPath="yes" />
+        <File Id="System.Memory" Name="System.Memory.dll" Source="System.Memory.dll" />
+        <File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" Source="System.Runtime.CompilerServices.Unsafe.dll" />
+        <File Id="System.Buffers" Name="System.Buffers.dll" Source="System.Buffers.dll" />
+        <File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" Source="System.Collections.Immutable.dll" />
+        <File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" Source="System.Numerics.Vectors.dll" />
+        <File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" Source="System.Security.Cryptography.Pkcs.dll" />
+        <File Id="System.Text.Json" Name="System.Text.Json.dll" Source="System.Text.Json.dll" />
+        <File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" Source="System.Text.Encodings.Web.dll" />
+        <File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" Source="System.Threading.Tasks.Extensions.dll" />
+        <File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" Source="Microsoft.Bcl.AsyncInterfaces.dll" />
+        <File Id="protobuf_net" Name="protobuf-net.dll" Source="protobuf-net.dll" />
+        <File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" Source="DocumentFormat.OpenXml.dll" />
+        <File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" Source="DocumentFormat.OpenXml.Framework.dll" />
+        <File Id="FirebirdSql.Data.FirebirdClient" Name="FirebirdSql.Data.FirebirdClient.dll" Source="FirebirdSql.Data.FirebirdClient.dll" />
+        <File Id="EntityFramework" Name="EntityFramework.dll" Source="EntityFramework.dll" />
+        <File Id="EntityFramework.SqlServer" Name="EntityFramework.SqlServer.dll" Source="EntityFramework.SqlServer.dll" />
+        <File Id="EntityFramework.Firebird" Name="EntityFramework.Firebird.dll" Source="EntityFramework.Firebird.dll" />
+      </Component>
+      
 			<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
 				<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
 			</Component>
@@ -150,7 +169,7 @@
 			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
 				<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
 				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
-				<File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
+				<File Id="GdPicture.NET.14.filters.64" Name="GdPicture.NET.14.filters.64.dll" />
 				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
 				<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
 				<File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
@@ -277,23 +296,24 @@
 					</RegistryKey>
 				</RegistryKey>

-				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="INSTALLDIR" />
 			</Component>
 		</DirectoryRef>

 		<Feature Id="MainApplication" Title="Main Application" Level="1">
 			<ComponentRef Id="MainApplicationExe" />
 			<ComponentRef Id="RegistryKeys" />
-			<!--<ComponentRef Id="ReleaseNotes" />-->
 			<ComponentRef Id="WindreamLibs" />
 			<ComponentRef Id="FormsUtilsLibs"/>
 			<ComponentRef Id="DDLibs" />
+			<ComponentRef Id="RuntimeLibs" />
 			<ComponentRef Id="Oracle" />
 			<ComponentRef Id="PDFsharp" />
 			<ComponentRef Id="IndependentsoftLibs" />
 			<ComponentRef Id="DevExpressLibs" />
 			<ComponentRef Id="GDPictureLibs" />
 			<ComponentRef Id="Devexpress.Locales.de" />
+      <ComponentRef Id="ProtocolHandlerMachine" />
 		</Feature>

 		<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
@@ -305,7 +325,28 @@
 			<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
 			<ComponentRef Id="ApplicationShortcut_StartMenu" />
 		</Feature>
+    <!-- #######################-->
+    <!-- Beginn Aufruf über Link-->
+    <!-- Per-user ProtocolHandler (HKCU) -->
+    <Component Id="ProtocolHandlerMachine" Guid="F2817163-DAAA-4EB2-A8D9-A9EF00E910C0" Directory="INSTALLDIR">
+      <!-- Basis-Schlüssel -->
+      <RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+        <RegistryValue Type="string" Value="URL:ddtaskflow Protocol" KeyPath="yes"/>
+        <RegistryValue Type="string" Name="URL Protocol" Value="" />
+      </RegistryKey>

+      <!-- Icon -->
+      <RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW\DefaultIcon" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+        <RegistryValue Type="string" Value="[INSTALLDIR]taskFLOW.exe,1" />
+      </RegistryKey>
+
+      <!-- Kommando -->
+      <RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW\shell\open\command" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+        <RegistryValue Type="string" Value="&quot;[INSTALLDIR]taskFLOW.exe&quot; &quot;%1&quot;" />
+      </RegistryKey>
+    </Component>
+    <!-- Ende Aufruf über Link-->
+    <!-- #######################-->
 		<!-- Legt das Standard-Installationsverzeichnis fest-->
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
 		<Property Id="_BrowseProperty" Value="INSTALLDIR" />
--- a/app/TaskFlow.sln
+++ b/app/TaskFlow.sln
@@ -7,6 +7,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "..\..\..\2_DLL Projekte\Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -61,6 +63,26 @@ Global
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.Build.0 = Debug|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.Build.0 = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.ActiveCfg = Release|Any CPU
+		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/app/TaskFlow/App.config
+++ b/app/TaskFlow/App.config
@@ -102,7 +102,8 @@
    </DevExpress.LookAndFeel.Design.AppSettings>
  </applicationSettings>
  <connectionStrings>
-    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" />
+    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
+      providerName="System.Data.SqlClient" />
  </connectionStrings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@@ -143,7 +144,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
@@ -151,15 +152,15 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
@@ -229,7 +230,7 @@
        <value>0, 0</value>
      </setting>
      <setting name="frmValSearchSplitterDistance" serializeAs="String">
-        <value>563</value>
+        <value>346</value>
      </setting>
      <setting name="frmMainWindowState" serializeAs="String">
        <value>Normal</value>
--- a/app/TaskFlow/ClassAllgemeineFunktionen.vb
+++ b/app/TaskFlow/ClassAllgemeineFunktionen.vb
@@ -366,4 +366,55 @@ Public Class ClassAllgemeineFunktionen
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file")
        End Try
    End Sub
+    Public Shared Function NotNull(Of T)(value As Object, defaultValue As T) As T
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+
+        ' Versuche den Wert in den gewünschten Typ zu konvertieren
+        Try
+            Return CType(value, T)
+        Catch ex As InvalidCastException
+            ' Falls die Konvertierung fehlschlägt, gib den Default zurück
+            Return defaultValue
+        End Try
+    End Function
+    Public Shared Function NotNullNullable(Of T As Structure)(value As Object, defaultValue As Nullable(Of T)) As Nullable(Of T)
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+        Try
+            ' Direkte Casts sind robust, wandeln aber DBNull nicht – das ist bereits oben abgefangen.
+            Return DirectCast(value, Nullable(Of T))
+        Catch
+            Try
+                ' Fallback: in T casten und zu Nullable machen
+                Return New Nullable(Of T)(DirectCast(value, T))
+            Catch
+                Return defaultValue
+            End Try
+        End Try
+    End Function
+    Public Shared Function NotNullString(value As Object, defaultValue As Object) As String
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return CStr(value)
+    End Function
+
+    Public Shared Function NotNullDate(value As Object, defaultValue As DateTime) As DateTime?
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return DirectCast(value, DateTime)
+    End Function
+    Public Shared Function NewShortGuid() As String
+        ' Neue GUID erzeugen
+        Dim g As Guid = Guid.NewGuid()
+
+        ' In Base64 umwandeln
+        Dim b64 As String = Convert.ToBase64String(g.ToByteArray())
+
+        ' Unerwünschte Zeichen ersetzen/entfernen
+        b64 = b64.Replace("=", "").Replace("+", "-").Replace("/", "_")
+
+        ' Ergebnis zurückgeben
+        Return b64
+    End Function
 End Class
--- a/app/TaskFlow/ClassControlCreator.vb
+++ b/app/TaskFlow/ClassControlCreator.vb
@@ -1,6 +1,5 @@
 Imports System.ComponentModel
 Imports System.Text.RegularExpressions
-Imports DD_LIB_Standards
 Imports DevExpress.Utils
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Controls
@@ -11,13 +10,10 @@ Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
 Imports DigitalData.Modules.EDMI.API.Constants
-Imports DigitalData.Modules.Language.DataTableEx
 Imports DigitalData.Modules.Base

 Public Class ClassControlCreator
@@ -72,6 +68,18 @@ Public Class ClassControlCreator
    ''' </summary>
    Public Property GridTables As New Dictionary(Of Integer, Dictionary(Of String, RepositoryItem))
    Public Property GridColumns As New Dictionary(Of Integer, DataTable)
+    Private _globalLookupEventGuard As Boolean = False
+
+    Public Property GlobalLookupEventGuard As Boolean
+        Get
+            Return _globalLookupEventGuard
+        End Get
+        Set(value As Boolean)
+            _globalLookupEventGuard = value
+            Logger.Debug($"GlobalLookupEventGuard -> gesetzt auf [{value}]")
+        End Set
+    End Property
+

    ''' <summary>
    ''' Standard Eigenschaften für alle Controls
@@ -93,7 +101,7 @@ Public Class ClassControlCreator
        Public Attribute As String
        Public [ReadOnly] As Boolean = False
        Public BackColor As Color = Color.White
-
+        Public Property IsDirty As Boolean = False
    End Class

    Public Sub New(pLogConfig As LogConfig)
@@ -104,17 +112,17 @@ Public Class ClassControlCreator
    Private Function TransformDataRow(row As DataRow) As ControlDBProps
        Dim x As Integer = row.Item("X_LOC")
        Dim y As Integer = row.Item("Y_LOC")
-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
+        Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
+        Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
+        Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
        Dim family As FontFamily = New FontFamily(familyString)

        Dim oGuid As Integer = row.Item("GUID")
-        Dim oControlName As String = NotNull(row.Item("NAME"), "")
-        Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "")
+        Dim oControlName As String = ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), "")
+        Dim oAttribute As String = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
        Dim oLocation As New Point(x, y)
        Dim oFont As New Font(family, size, style, GraphicsUnit.Point)
-        Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        Dim oColor As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
        Dim oReadOnly As Boolean = row.Item("READ_ONLY")
        Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM")
        If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then
@@ -122,7 +130,6 @@ Public Class ClassControlCreator
            oReadOnly = True
        End If

-
        Return New ControlDBProps() With {
            .Guid = oGuid,
            .Name = oControlName,
@@ -149,8 +156,6 @@ Public Class ClassControlCreator
            ctrl.Location = props.Location
            ctrl.Font = props.Font
            ctrl.ForeColor = props.Color
-
-
            If designMode Then
                ctrl.Cursor = Cursors.Hand
            End If
@@ -171,7 +176,7 @@ Public Class ClassControlCreator

    Public Function CreateNewTextBox(location As Point) As TextEdit
        Dim control As New TextEdit With {
-            .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}",
+            .Name = $"{PREFIX_TEXTBOX}_{ClassAllgemeineFunktionen.NewShortGuid()}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
            .Location = location,
            .ReadOnly = True,
@@ -184,7 +189,7 @@ Public Class ClassControlCreator

    Public Function CreateNewLabel(location As Point) As Label
        Dim control As New Label With {
-            .Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LABEL}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Text = DEFAULT_TEXT,
            .AutoSize = True,
            .Location = location,
@@ -196,7 +201,7 @@ Public Class ClassControlCreator

    Public Function CreateNewCheckbox(location As Point) As CheckBox
        Dim control As New CheckBox With {
-            .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_CHECKBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .AutoSize = True,
            .Text = DEFAULT_TEXT,
            .Cursor = Cursors.Hand,
@@ -209,7 +214,7 @@ Public Class ClassControlCreator

    Public Function CreateNewCombobox(location As Point) As Windows.Forms.ComboBox
        Dim control As New Windows.Forms.ComboBox With {
-            .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_COMBOBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
            .Cursor = Cursors.Hand,
            .Location = location
@@ -220,7 +225,7 @@ Public Class ClassControlCreator

    Public Function CreateNewDatetimepicker(location As Point) As DateTimePicker
        Dim control As New DateTimePicker With {
-            .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATETIMEPICKER}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
            .Cursor = Cursors.Hand,
            .Location = location,
@@ -232,7 +237,7 @@ Public Class ClassControlCreator

    Public Function CreateNewDatagridview(location As Point) As DataGridView
        Dim control As New DataGridView With {
-            .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATAGRIDVIEW}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
            .Cursor = Cursors.Hand,
            .Location = location,
@@ -252,7 +257,7 @@ Public Class ClassControlCreator

    Friend Function CreateNewLookupControl(location As Point) As LookupControl3
        Dim control As New LookupControl3 With {
-            .Name = $"{PREFIX_LOOKUP}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LOOKUP}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
            .Cursor = Cursors.Hand,
            .Location = location
@@ -262,7 +267,7 @@ Public Class ClassControlCreator

    Public Function CreateNewTable(location As Point) As GridControl
        Dim oControl As New GridControl With {
-            .Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_TABLE}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
            .Cursor = Cursors.Hand,
            .Location = location,
@@ -282,7 +287,7 @@ Public Class ClassControlCreator

    Public Function CreateNewLine(location As Point) As LineLabel
        Dim control As New LineLabel With {
-            .Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LINE}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Text = "---------------------------------",
            .Size = New Size(100, 5),
            .Location = location
@@ -292,7 +297,7 @@ Public Class ClassControlCreator
    End Function
    Public Function CreateNewButton(location As Point) As Button
        Dim control As New Button With {
-            .Name = $"{PREFIX_BUTTON}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_BUTTON}_{ClassAllgemeineFunktionen.NewShortGuid}",
            .Size = New Size(108, 28),
            .Cursor = Cursors.Hand,
            .Location = location
@@ -311,6 +316,7 @@ Public Class ClassControlCreator
            Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty)
            Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty)
            Dim oIndexname = oControlRow.ItemEx("INDEX_NAME", String.Empty)
+            Dim oAlignment = oControlRow.ItemEx("TEXT_ALIGNMENT", "Near")
            Dim oControl As BaseEdit = Nothing
            If oHeight >= 27 Then
                oControl = CreateBaseControl(New MemoEdit(), oControlRow, designMode)
@@ -325,9 +331,16 @@ Public Class ClassControlCreator

            oControl.Height = oHeight
            oControl.Width = oWidth
+            If oAlignment = "Near" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+            ElseIf oAlignment = "Center" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+            ElseIf oAlignment = "Far" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
+            End If

            If Not designMode Then
-                'oControl.ReadOnly = oReadOnly
+                oControl.ReadOnly = oReadOnly
                oControl.TabStop = Not oReadOnly
                oControl.BackColor = IIf(oReadOnly, Color.LightGray, Color.White)

@@ -353,17 +366,24 @@ Public Class ClassControlCreator
    End Function

    Public Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
-        Dim control As Label = CreateBaseControl(New Label(), row, designMode)
+        Dim oControl As Label = CreateBaseControl(New Label(), row, designMode)
        Try
-            control.Text = row.Item("CTRL_CAPTION_LANG")
+            oControl.Text = row.Item("CTRL_CAPTION_LANG")
        Catch ex As Exception
-            Logger.Warn("Label [{0}] does not have a translation!", control.Name)
-            control.Text = row.Item("CTRL_TEXT")
+            Logger.Warn("⚠️ Label [{0}] does not have a translation!", oControl.Name)
+            oControl.Text = row.Item("CTRL_TEXT")
        End Try
+        Dim oAlignment = row.ItemEx("TEXT_ALIGNMENT", "Near")
+        If oAlignment = "Near" Then
+            oControl.TextAlign = ContentAlignment.MiddleLeft
+        ElseIf oAlignment = "Center" Then
+            oControl.TextAlign = ContentAlignment.MiddleCenter
+        ElseIf oAlignment = "Far" Then
+            oControl.TextAlign = ContentAlignment.MiddleRight
+        End If
+        oControl.AutoSize = True

-        control.AutoSize = True
-
-        Return control
+        Return oControl
    End Function

    Public Function CreateExistingButton(row As DataRow, designMode As Boolean) As Button
@@ -395,21 +415,53 @@ Public Class ClassControlCreator

        Return oControl
    End Function
-    Public Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
-        Dim control As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), row, designMode)
-
-        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+    Public Function CreateExistingCombobox(pRow As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
+        Dim oControl As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), pRow, designMode)
+        oControl.Size = New Size(pRow.Item("WIDTH"), pRow.Item("HEIGHT"))

        If Not designMode Then
-            control.Enabled = Not row.Item("READ_ONLY")
-            control.TabStop = Not row.Item("READ_ONLY")
-            control.BackColor = IIf(row.Item("READ_ONLY"), Color.LightGray, Color.White)
+            oControl.Enabled = Not pRow.Item("READ_ONLY")
+            oControl.TabStop = Not pRow.Item("READ_ONLY")
+            oControl.BackColor = IIf(pRow.Item("READ_ONLY"), Color.LightGray, Color.White)

-            control.AutoCompleteMode = AutoCompleteMode.SuggestAppend
-            control.AutoCompleteSource = AutoCompleteSource.ListItems
+            oControl.AutoCompleteMode = AutoCompleteMode.SuggestAppend
+            oControl.AutoCompleteSource = AutoCompleteSource.ListItems
        End If

-        Return control
+        '' Apply text alignment by owner-drawing based on oAlignment
+        'Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near")
+
+        '' Ensure owner-draw so we can control text alignment
+        'oControl.DrawMode = Global.System.Windows.Forms.DrawMode.OwnerDrawFixed
+
+        '' Attach handler with inline drawing logic respecting alignment
+        'AddHandler oControl.DrawItem,
+        'Sub(sender As Object, e As DrawItemEventArgs)
+        '    Dim cmb = TryCast(sender, Windows.Forms.ComboBox)
+        '    If cmb Is Nothing Then Return
+        '    e.DrawBackground()
+        '    If e.Index >= 0 AndAlso e.Index < cmb.Items.Count Then
+        '        Dim text As String = cmb.GetItemText(cmb.Items(e.Index))
+        '        Dim sf As New StringFormat(StringFormatFlags.NoWrap)
+        '        Select Case oAlignment
+        '            Case "Near"
+        '                sf.Alignment = StringAlignment.Near
+        '            Case "Center"
+        '                sf.Alignment = StringAlignment.Center
+        '            Case "Far"
+        '                sf.Alignment = StringAlignment.Far
+        '            Case Else
+        '                sf.Alignment = StringAlignment.Near
+        '        End Select
+        '        sf.LineAlignment = StringAlignment.Center
+        '        Using foreBrush As New SolidBrush(If((e.State And DrawItemState.Selected) = DrawItemState.Selected, SystemColors.HighlightText, cmb.ForeColor))
+        '            e.Graphics.DrawString(text, e.Font, foreBrush, e.Bounds, sf)
+        '        End Using
+        '    End If
+        '    e.DrawFocusRectangle()
+        'End Sub
+
+        Return oControl
    End Function

    Public Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
@@ -469,27 +521,35 @@ Public Class ClassControlCreator
        Return control
    End Function

-    Public Function CreateExistingLookupControl(row As DataRow, designMode As Boolean) As LookupControl3
-        Dim control As LookupControl3 = CreateBaseControl(New LookupControl3(), row, designMode)
-        control.Properties.Name = control.Name
-        control.Width = row.Item("WIDTH")
-        control.ReadOnly = row.Item("READ_ONLY")
-        control.Properties.AllowAddNewValues = row.Item("VKT_ADD_ITEM")
+    Public Function CreateExistingLookupControl(pRow As DataRow, pDesignMode As Boolean) As LookupControl3
+        Dim oControl As LookupControl3 = CreateBaseControl(New LookupControl3(), pRow, pDesignMode)
+        oControl.Properties.Name = oControl.Name
+        oControl.Width = pRow.Item("WIDTH")
+        oControl.ReadOnly = pRow.Item("READ_ONLY")
+        oControl.Properties.AllowAddNewValues = pRow.Item("VKT_ADD_ITEM")
+        Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near")

-        If designMode Then
-            control.Cursor = Cursors.Hand
+        If oAlignment = "Near" Then
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+        ElseIf oAlignment = "Center" Then
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+        ElseIf oAlignment = "Far" Then
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
        End If

-        Return control
+        If pDesignMode Then
+            oControl.Cursor = Cursors.Hand
+        End If
+
+        Return oControl
    End Function

-    Public Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean) As GridControl
-        Dim oGridControlCreator = New ControlCreator.GridControl(LogConfig, GridTables)
+    Public Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean, pcurrencySymbol As String) As GridControl
+        Dim oGridControlCreator = New ControlCreator.GridControl(LogConfig, GridTables, pcurrencySymbol)
        Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode)
        Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid
        Dim oView As GridView
-
-
+        Dim oControlName = oControl.Name
        oControl.ForceInitialize()

        oView = oControl.MainView
@@ -529,7 +589,6 @@ Public Class ClassControlCreator
        End If

        oControl.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-
        ' Add and configure navigator to delete rows
        oControl.UseEmbeddedNavigator = True
        With oControl.EmbeddedNavigator.Buttons
@@ -559,8 +618,8 @@ Public Class ClassControlCreator

        Dim oDataTable = oGridControlCreator.CreateGridColumns(DT_MY_COLUMNS)
        GridTables = oGridControlCreator.FillGridTables(DT_MY_COLUMNS, oControlId, oControl.Name)
-        oView.PopulateColumns(oDatatable)
-        oControl.DataSource = oDatatable
+        oView.PopulateColumns(oDataTable)
+        oControl.DataSource = oDataTable
        oControl.RefreshDataSource()
        oControl.ForceInitialize()

@@ -587,10 +646,13 @@ Public Class ClassControlCreator
            End Try
        End If

+        ' *** KORRIGIERT: ConfigureViewColumns OHNE currencySymbol-Parameter ***
        oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl)
-        oGridControlCreator.ConfigureViewEvents(DT_MY_COLUMNS, oView, oControl, oControlId)

-        ' 08.11.2021: Fix editor being empty on first open
+        ' *** NEU: ConfigureViewColumnsCurrency() für editierbare Währungsspalten ***
+        oGridControlCreator.ConfigureViewColumnsCurrency(DT_MY_COLUMNS, oView, oControl)
+
+        oGridControlCreator.ConfigureViewEvents(DT_MY_COLUMNS, oView, oControl, oControlId)
        oView.FocusInvalidRow()

        Return oControl
@@ -605,7 +667,7 @@ Public Class ClassControlCreator
        control.Text = "------------------------------"
        control.BorderStyle = BorderStyle.None
        control.AutoSize = False
-        control.BackColor = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        control.BackColor = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))

        Return control
@@ -801,49 +863,239 @@ Public Class ClassControlCreator
    End Function

    Public Sub GridTables_HandleControlValueChange(pControlPanel As XtraScrollableControl, pColumnsWithSqlAndControlPlaceholders As DataTable)
-        If Not IsNothing(pColumnsWithSqlAndControlPlaceholders) AndAlso pColumnsWithSqlAndControlPlaceholders.Rows.Count > 0 Then
-            For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows
+        If pColumnsWithSqlAndControlPlaceholders Is Nothing OrElse pColumnsWithSqlAndControlPlaceholders.Rows.Count = 0 Then
+            Logger.Debug("No depending controls with SQL statements defined, skipping handling control value change.")
+            Return
+        End If
+
+        ' ============================================================================
+        ' Schritt 1 - Sichere ALLE Lookup-Werte VOR SQL-Reload
+        ' ============================================================================
+        Dim lookupBackups As New Dictionary(Of String, Object)
+
+        For Each oControl As Control In pControlPanel.Controls
+            If TypeOf oControl Is LookupControl3 Then
                Try
-                    Dim oSqlStatement = oRow.ItemEx("SQL_COMMAND", String.Empty)
-                    Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", -1)
-                    Dim oControlId = oRow.Item("CONTROL_ID")
-                    Dim oColumnName = oRow.Item("SPALTENNAME")
-                    Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP")
-
-                    If oSqlStatement <> String.Empty And oConnectionId > -1 Then
-                        oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True)
-
-                        GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)
-
-
-                        ' === Block to force setting the editor for GridColumns
-                        Logger.Debug("Force-setting Editor for all Gridcells..")
-                        For Each oControl As Control In pControlPanel.Controls
-                            Try
-                                Dim oMeta = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata)
-                                If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then
-                                    Dim oGrid As GridControl = DirectCast(oControl, GridControl)
-                                    DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow()
-                                    Logger.Info("Force-setting Editor for Grid [{0}]", oGrid.Name)
-                                    Exit For
-                                End If
-                            Catch ex As Exception
-                                Logger.Error(ex)
-                            End Try
-                        Next
-                        ' === End
-
+                    Dim lookup = DirectCast(oControl, LookupControl3)
+                    ' Speichere den aktuellen EditValue (kann einzelner Wert oder Liste sein)
+                    If lookup.EditValue IsNot Nothing Then
+                        Dim controlName As String = lookup.Name
+                        lookupBackups(controlName) = lookup.EditValue
+                        Logger.Debug($"GridTables_HandleControlValueChange -> Backup für Lookup [{controlName}]: [{lookup.EditValue}]")
                    End If
                Catch ex As Exception
-                    Logger.Error(ex)
-                    Logger.Info("Unexpected Error in Display SQL result for grid column: " & oRow.Item("CONTROL_ID") & " - ERROR: " & ex.Message)
+                    Logger.Error($"GridTables_HandleControlValueChange -> Fehler beim Backup von Lookup: {ex.Message}")
                End Try
+            End If
+        Next
+
+        ' ============================================================================
+        ' Schritt 2 - Verarbeite Grid-Columns mit SQL-Abhängigkeiten
+        ' ============================================================================
+        For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows
+            Try
+                Dim oSqlStatement = oRow.ItemEx("SQL_COMMAND", String.Empty)
+                Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", -1)
+                Dim oControlId = oRow.Item("CONTROL_ID")
+                Dim oColumnName = oRow.Item("SPALTENNAME")
+                Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP")
+
+                If oSqlStatement <> String.Empty AndAlso oConnectionId > -1 Then
+                    oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True)
+                    GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)
+
+                    ' Force-setting Editor for GridColumns
+                    Logger.Debug("Force-setting Editor for all Gridcells..")
+                    For Each oControl As Control In pControlPanel.Controls
+                        Try
+                            If oControl.Tag IsNot Nothing AndAlso TypeOf oControl.Tag Is ControlMetadata Then
+                                Dim oMeta = DirectCast(oControl.Tag, ControlMetadata)
+                                If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then
+                                    Dim oGrid As GridControl = DirectCast(oControl, GridControl)
+                                    If oGrid.FocusedView IsNot Nothing AndAlso TypeOf oGrid.FocusedView Is GridView Then
+                                        DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow()
+                                        Logger.Debug($"Force-setting Editor for Grid [{oGrid.Name}]")
+                                    End If
+                                    Exit For
+                                End If
+                            End If
+                        Catch ex As Exception
+                            Logger.Error($"GridTables_HandleControlValueChange -> Fehler beim Force-setting Editor: {ex.Message}")
+                        End Try
+                    Next
+                End If
+            Catch ex As Exception
+                Logger.Error(ex)
+                Logger.Info($"Unexpected Error in Display SQL result for grid column: {oRow.Item("CONTROL_ID")} - ERROR: {ex.Message}")
+            End Try
+        Next
+
+        ' ============================================================================
+        ' Schritt 3 - Prüfe und restauriere Lookup-Werte mit SQL-Abhängigkeiten
+        ' ============================================================================
+        If lookupBackups.Count > 0 Then
+            Logger.Debug($"GridTables_HandleControlValueChange -> Prüfe {lookupBackups.Count} Lookups auf Wiederherstellung...")
+
+            For Each oControl As Control In pControlPanel.Controls
+                If TypeOf oControl Is LookupControl3 Then
+                    Try
+                        Dim lookup = DirectCast(oControl, LookupControl3)
+                        Dim controlName As String = lookup.Name
+
+                        ' Wenn wir einen Backup für dieses Lookup haben
+                        If lookupBackups.ContainsKey(controlName) Then
+                            Dim oldValue = lookupBackups(controlName)
+
+                            ' Prüfe ob Lookup ein DataSource hat (könnte durch SQL neu geladen worden sein)
+                            If lookup.Properties.DataSource IsNot Nothing AndAlso TypeOf lookup.Properties.DataSource Is DataTable Then
+                                Dim currentDataSource = DirectCast(lookup.Properties.DataSource, DataTable)
+
+                                ' Wenn DataSource Rows hat, versuche Werte wiederherzustellen
+                                If currentDataSource.Rows.Count > 0 Then
+                                    RestoreLookupValues(lookup, oldValue, currentDataSource, controlName)
+                                End If
+                            End If
+                        End If
+
+                    Catch ex As Exception
+                        Logger.Error($"GridTables_HandleControlValueChange -> Fehler beim Prüfen von Lookup: {ex.Message}")
+                        Logger.Error(ex)
+                    End Try
+                End If
            Next
        End If
    End Sub

+    Private Sub RestoreLookupValues(lookup As LookupControl3, oldValue As Object,
+                                  newDataSource As DataTable, controlName As String)
+        If lookup Is Nothing OrElse oldValue Is Nothing OrElse newDataSource Is Nothing Then
+            Logger.Warn($"RestoreLookupValues -> [{controlName}] Ungültige Parameter")
+            Return
+        End If

+        Try
+            ' Bestimme ValueColumn
+            Dim valueColumn As String = String.Empty
+            If String.IsNullOrEmpty(lookup.Properties.ValueMember) AndAlso newDataSource.Columns.Count > 0 Then
+                valueColumn = newDataSource.Columns(0).ColumnName
+            ElseIf Not String.IsNullOrEmpty(lookup.Properties.ValueMember) Then
+                valueColumn = lookup.Properties.ValueMember
+            Else
+                Logger.Warn($"RestoreLookupValues -> [{controlName}] Keine ValueColumn verfügbar")
+                Return
+            End If

+            ' Build HashSet für effiziente Suche
+            Dim availableValues As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase)
+            For Each row As DataRow In newDataSource.Rows
+                If Not IsDBNull(row(valueColumn)) Then
+                    availableValues.Add(row(valueColumn).ToString())
+                End If
+            Next

+            ' Prüfe ob der alte Wert noch in der neuen DataSource existiert
+            Dim validValue As Object = Nothing

+            ' Behandle verschiedene Datentypen (String, List, Array, etc.)
+            If TypeOf oldValue Is String Then
+                Dim valueStr As String = oldValue.ToString()
+                If availableValues.Contains(valueStr) Then
+                    validValue = oldValue
+                    Logger.Debug($"RestoreLookupValues -> [{controlName}] Wert [{valueStr}] ✓ gefunden")
+                Else
+                    Logger.Warn($"RestoreLookupValues -> [{controlName}] Wert [{valueStr}] ✗ nicht mehr vorhanden")
+                End If
+            ElseIf TypeOf oldValue Is IEnumerable Then
+                ' Behandle Listen/Arrays
+                Dim validValues As New List(Of Object)
+                For Each item As Object In DirectCast(oldValue, IEnumerable)
+                    If item IsNot Nothing Then
+                        Dim itemStr As String = item.ToString()
+                        If availableValues.Contains(itemStr) Then
+                            validValues.Add(item)
+                            Logger.Debug($"RestoreLookupValues -> [{controlName}] Wert [{itemStr}] ✓ gefunden")
+                        Else
+                            Logger.Warn($"RestoreLookupValues -> [{controlName}] Wert [{itemStr}] ✗ nicht mehr vorhanden")
+                        End If
+                    End If
+                Next
+
+                If validValues.Count > 0 Then
+                    validValue = validValues
+                End If
+            Else
+                ' Fallback für andere Typen
+                Dim valueStr As String = oldValue.ToString()
+                If availableValues.Contains(valueStr) Then
+                    validValue = oldValue
+                    Logger.Debug($"RestoreLookupValues -> [{controlName}] Wert [{valueStr}] ✓ gefunden")
+                Else
+                    Logger.Warn($"RestoreLookupValues -> [{controlName}] Wert [{valueStr}] ✗ nicht mehr vorhanden")
+                End If
+            End If
+
+            ' Gültige Werte wiederherstellen
+            If validValue IsNot Nothing Then
+                ' Event-Guard temporär aktivieren um Endlosschleifen zu vermeiden
+                Dim oldGuard As Boolean = GlobalLookupEventGuard
+                GlobalLookupEventGuard = True
+
+                Try
+                    ' Prüfe ob bereits korrekt gesetzt
+                    Dim currentValue = lookup.EditValue
+                    If currentValue IsNot Nothing AndAlso currentValue.Equals(validValue) Then
+                        Logger.Debug($"RestoreLookupValues -> [{controlName}] Wert bereits korrekt gesetzt")
+                        Return
+                    End If
+
+                    ' Setze den Wert neu
+                    lookup.EditValue = Nothing
+                    Application.DoEvents()
+
+                    lookup.EditValue = validValue
+                    lookup.Refresh()
+                    Application.DoEvents()
+
+                    ' Validierung
+                    Dim newValue = lookup.EditValue
+                    If newValue IsNot Nothing AndAlso newValue.Equals(validValue) Then
+                        Logger.Debug($"RestoreLookupValues -> [{controlName}] ✓ erfolgreich wiederhergestellt: [{validValue}]")
+                    Else
+                        Logger.Error($"RestoreLookupValues -> [{controlName}] ✗ Fehler beim Wiederherstellen! Erwartet: [{validValue}], Ist: [{If(newValue, "NULL")}]")
+
+                        ' Retry mit BeginUpdate/EndUpdate
+                        Logger.Debug($"RestoreLookupValues -> [{controlName}] Versuche alternative Methode mit BeginUpdate...")
+                        lookup.Properties.BeginUpdate()
+                        Try
+                            lookup.EditValue = Nothing
+                            Application.DoEvents()
+                            lookup.EditValue = validValue
+                        Finally
+                            lookup.Properties.EndUpdate()
+                        End Try
+
+                        lookup.Refresh()
+                        Application.DoEvents()
+
+                        Dim retryValue = lookup.EditValue
+                        If retryValue IsNot Nothing AndAlso retryValue.Equals(validValue) Then
+                            Logger.Debug($"RestoreLookupValues -> [{controlName}] ✓ Alternative Methode erfolgreich")
+                        Else
+                            Logger.Error($"RestoreLookupValues -> [{controlName}] ✗ Auch alternative Methode fehlgeschlagen!")
+                        End If
+                    End If
+
+                Finally
+                    ' Event-Guard wiederherstellen
+                    GlobalLookupEventGuard = oldGuard
+                End Try
+            Else
+                Logger.Info($"RestoreLookupValues -> [{controlName}] Keine gültigen Werte zum Wiederherstellen")
+            End If
+
+        Catch ex As Exception
+            Logger.Error($"RestoreLookupValues -> Fehler bei [{controlName}]: {ex.Message}")
+            Logger.Error(ex)
+        End Try
+    End Sub
 End Class
--- a/app/TaskFlow/ClassFinalIndex.vb
+++ b/app/TaskFlow/ClassFinalIndex.vb
@@ -114,12 +114,12 @@ Public Class ClassFinalIndex
            props.VectorIndex = isVector

            If type = INDEX_TYPE_STRING Or type = INDEX_TYPE_VECTOR_STRING Then
-                value = NotNull(value, "")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "")

                props.StringValue = value
            ElseIf type = INDEX_TYPE_INTEGER Or type = INDEX_TYPE_INTEGER64 Or type = INDEX_TYPE_VECTOR_INTEGER_64 Then
                Try
-                    value = NotNull(Of Integer)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)
                    If value = String.Empty Then
                        props.IntegerValue = 0
                    Else
@@ -138,7 +138,7 @@ Public Class ClassFinalIndex
                If value = "SQL-Command" Then
                    props.FloatValue = 0
                Else
-                    value = NotNull(Of Double)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)

                    If value = String.Empty Then
                        props.FloatValue = 0
@@ -148,7 +148,7 @@ Public Class ClassFinalIndex
                End If

            ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then
-                value = NotNull(value, "False")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "False")

                If value = "1" Or value.ToLower = "true" Then
                    props.BoolValue = True
--- a/app/TaskFlow/ClassFinalizeDoc.vb
+++ b/app/TaskFlow/ClassFinalizeDoc.vb
@@ -156,7 +156,7 @@ Public Class ClassFinalizeDoc
            End If
            Return indexierung_erfolgreich
        Catch ex As Exception
-            LOGGER.Warn("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString)
+            LOGGER.Warn("⚠️ Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString)
            Return False
        End Try

--- a/app/TaskFlow/ClassFormat.vb
+++ b/app/TaskFlow/ClassFormat.vb
@@ -28,6 +28,99 @@ Public Class ClassFormat

        End Select
    End Function
+    ''' <summary>
+    ''' Normalisiert einen numerischen String für die invariante Kultur-Konvertierung.
+    ''' Entfernt Tausendertrennzeichen und ersetzt Dezimaltrennzeichen durch Punkt.
+    ''' </summary>
+    Private Shared Function NormalizeNumericString(pValue As String) As String
+        If String.IsNullOrWhiteSpace(pValue) Then
+            Return pValue
+        End If
+
+        Dim normalized As String = pValue.Trim()
+
+        LOGGER.Debug($"[NormalizeNumericString] Input: [{pValue}]")
+
+        ' Entferne Währungssymbole und Leerzeichen
+        normalized = System.Text.RegularExpressions.Regex.Replace(normalized, "[€$£¥\s]", "")
+
+        Dim hasDot As Boolean = normalized.Contains(".")
+        Dim hasComma As Boolean = normalized.Contains(",")
+
+        LOGGER.Debug($"[NormalizeNumericString] After cleanup: [{normalized}], HasDot={hasDot}, HasComma={hasComma}")
+
+        If hasDot AndAlso hasComma Then
+            ' Beide vorhanden: Das letzte ist der Dezimaltrenner
+            Dim lastDotPos As Integer = normalized.LastIndexOf(".")
+            Dim lastCommaPos As Integer = normalized.LastIndexOf(",")
+
+            LOGGER.Debug($"[NormalizeNumericString] Both separators found: LastDotPos={lastDotPos}, LastCommaPos={lastCommaPos}")
+
+            If lastDotPos > lastCommaPos Then
+                normalized = normalized.Replace(",", "")
+            Else
+                normalized = normalized.Replace(".", "").Replace(",", ".")
+            End If
+
+        ElseIf hasComma Then
+            Dim commaCount As Integer = normalized.Count(Function(c) c = ","c)
+            LOGGER.Debug($"[NormalizeNumericString] Only comma found: CommaCount={commaCount}")
+
+            If commaCount = 1 Then
+                Dim lastCommaPos As Integer = normalized.LastIndexOf(",")
+                Dim digitsAfterComma As Integer = normalized.Length - lastCommaPos - 1
+                LOGGER.Debug($"[NormalizeNumericString] Single comma: DigitsAfterComma={digitsAfterComma}")
+
+                If digitsAfterComma <= 3 Then
+                    normalized = normalized.Replace(",", ".")
+                Else
+                    normalized = normalized.Replace(",", "")
+                End If
+            Else
+                normalized = normalized.Replace(",", "")
+            End If
+
+        ElseIf hasDot Then
+            Dim dotCount As Integer = normalized.Count(Function(c) c = "."c)
+            LOGGER.Debug($"[NormalizeNumericString] Only dot found: DotCount={dotCount}")
+
+            If dotCount = 1 Then
+                Dim lastDotPos As Integer = normalized.LastIndexOf(".")
+                Dim digitsAfterDot As Integer = normalized.Length - lastDotPos - 1
+
+                LOGGER.Debug($"[NormalizeNumericString] Single dot: DigitsAfterDot={digitsAfterDot}")
+
+                ' ✅ KRITISCHE ÄNDERUNG: Prüfe auch Stellen VOR dem Punkt
+                Dim digitsBeforeDot As Integer = lastDotPos
+
+                ' Heuristik: Wenn <= 3 Stellen nach Punkt UND >= 1 Stelle davor → Dezimaltrenner
+                ' Wenn > 3 Stellen davor UND <= 3 Stellen nach Punkt → unklar, vermutlich Dezimal
+                ' Wenn > 3 Stellen nach Punkt → definitiv KEIN Dezimaltrenner
+
+                If digitsAfterDot > 3 Then
+                    LOGGER.Warn($"⚠️ [NormalizeNumericString] Dot with {digitsAfterDot} digits after → treating as THOUSAND separator!")
+                    normalized = normalized.Replace(".", "")
+                ElseIf digitsAfterDot >= 1 AndAlso digitsAfterDot <= 3 Then
+                    ' Wahrscheinlich Dezimaltrenner (z.B. 5464.17 oder 120.5)
+                    LOGGER.Debug($"[NormalizeNumericString] Dot treated as decimal separator ({digitsBeforeDot} digits before, {digitsAfterDot} after)")
+                Else
+                    ' digitsAfterDot = 0 → Punkt am Ende, vermutlich Fehler
+                    LOGGER.Warn($"⚠️ [NormalizeNumericString] Dot at end of string → removing")
+                    normalized = normalized.Replace(".", "")
+                End If
+            Else
+                ' Mehrere Punkte → Tausendertrenner
+                LOGGER.Debug($"[NormalizeNumericString] Multiple dots → removing all")
+                normalized = normalized.Replace(".", "")
+            End If
+        Else
+            LOGGER.Debug($"[NormalizeNumericString] No separators found → integer or already normalized")
+        End If
+
+        LOGGER.Debug($"[NormalizeNumericString] Output: [{normalized}]")
+
+        Return normalized
+    End Function

    ''' <summary>
    ''' Converts a string according to the type information, using the invariant culture
@@ -41,25 +134,40 @@ Public Class ClassFormat

        Select Case pType
            Case ClassControlCreator.CONTROL_TYPE_DOUBLE
-                If Double.TryParse(pValue, NumberStyles.Float, CultureInfo.InvariantCulture, oConvertedValue) Then
-                    Return oConvertedValue
-                End If
-
-            Case ClassControlCreator.CONTROL_TYPE_CURRENCY
                Try
-                    LOGGER.Debug($"GetConvertedValue: Converting {pValue.ToString} to Currency ")
-                    If Double.TryParse(pValue, NumberStyles.Currency, CultureInfo.InvariantCulture, oConvertedValue) Then
+                    ' ✅ IMMER normalisieren – auch für DB-Werte!
+                    Dim normalizedValue As String = NormalizeNumericString(pValue?.ToString())
+                    If Double.TryParse(normalizedValue, NumberStyles.Float, CultureInfo.InvariantCulture, oConvertedValue) Then
                        Return oConvertedValue
                    End If
                Catch ex As Exception
                    LOGGER.Error(ex)
                End Try

+            Case ClassControlCreator.CONTROL_TYPE_CURRENCY
+                Try
+                    ' ✅ KRITISCH: Normalisierung VOR Konvertierung
+                    Dim normalizedValue As String = NormalizeNumericString(pValue?.ToString())
+                    LOGGER.Debug($"GetConvertedValue CURRENCY: Original=[{pValue}], Normalized=[{normalizedValue}]")
+
+                    If Double.TryParse(normalizedValue, NumberStyles.Float, CultureInfo.InvariantCulture, oConvertedValue) Then
+                        Return oConvertedValue
+                    End If
+                Catch ex As Exception
+                    LOGGER.Error($"Currency conversion failed for [{pValue}]: {ex.Message}")
+                    LOGGER.Error(ex)
+                End Try

            Case ClassControlCreator.CONTROL_TYPE_INTEGER
-                If Integer.TryParse(pValue, NumberStyles.Integer, CultureInfo.InvariantCulture, oConvertedValue) Then
-                    Return oConvertedValue
-                End If
+                Try
+                    Dim normalizedValue As String = NormalizeNumericString(pValue?.ToString())
+                    If Integer.TryParse(normalizedValue, NumberStyles.Integer, CultureInfo.InvariantCulture, oConvertedValue) Then
+                        Return oConvertedValue
+                    End If
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                End Try
+
            Case Else
                LOGGER.Debug($"GetConvertedValue - Case ELSE - pType is {pType}")
                Try
@@ -68,7 +176,6 @@ Public Class ClassFormat
                    LOGGER.Warn($"Error in GetConvertedValue:  pType is {pType} - converting value to String")
                    oConvertedValue = ""
                End Try
-
        End Select

        Return oConvertedValue
@@ -76,26 +183,32 @@ Public Class ClassFormat

    ''' <summary>
    ''' Converts values to their respective data type and then back to string 
-    ''' according to the current culture
+    ''' using INVARIANT culture for consistency across systems.
    ''' </summary>
    ''' <param name="pValue"></param>
    ''' <returns></returns>
    Public Shared Function GetStringValue(pValue As Object) As String
+        ' ✅ FIX: Immer InvariantCulture verwenden für DB-Speicherung
        Select Case pValue.GetType
            Case GetType(Single)
-                Return DirectCast(pValue, Single).ToString(CultureInfo.CurrentCulture)
+                ' ✅ NEU: InvariantCulture statt CurrentCulture
+                Return DirectCast(pValue, Single).ToString(CultureInfo.InvariantCulture)

            Case GetType(Double)
-                Return DirectCast(pValue, Double).ToString(CultureInfo.CurrentCulture)
+                ' ✅ NEU: InvariantCulture statt CurrentCulture
+                Return DirectCast(pValue, Double).ToString(CultureInfo.InvariantCulture)

            Case GetType(Decimal)
-                Return DirectCast(pValue, Decimal).ToString(CultureInfo.CurrentCulture)
+                ' ✅ NEU: InvariantCulture statt CurrentCulture
+                Return DirectCast(pValue, Decimal).ToString(CultureInfo.InvariantCulture)

            Case GetType(Date)
-                Return DirectCast(pValue, Date).ToString(CultureInfo.CurrentCulture)
+                ' Datum: ISO 8601 Format für Culture-Unabhängigkeit
+                Return DirectCast(pValue, Date).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)

            Case GetType(DateTime)
-                Return DirectCast(pValue, DateTime).ToString(CultureInfo.CurrentCulture)
+                ' DateTime: ISO 8601 Format
+                Return DirectCast(pValue, DateTime).ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture)

            Case Else
                Return pValue.ToString
--- a/app/TaskFlow/ClassIDBData.vb
+++ b/app/TaskFlow/ClassIDBData.vb
@@ -1,5 +1,75 @@
 Public Class ClassIDBData
    Public DTVWIDB_BE_ATTRIBUTE As DataTable
+    Public IDBSystemIndices As List(Of String)
+    ''' <summary>
+    ''' Wenn True, werden SQL-Statements nicht sofort ausgeführt,
+    ''' sondern in <see cref="_sqlBatch"/> gesammelt.
+    ''' </summary>
+    Public Property BatchMode As Boolean = False
+    Private _sqlBatch As New List(Of String)
+
+    ''' <summary>
+    ''' Startet den Batch-Sammelmodus.
+    ''' </summary>
+    Public Sub BeginBatch()
+        _sqlBatch.Clear()
+        BatchMode = True
+    End Sub
+    ''' <summary>
+    ''' Führt alle gesammelten SQL-Statements als einen einzigen String
+    ''' an ExecuteNonQueryIDB weiter. Jeder Block wird in BEGIN...END
+    ''' gekapselt, damit DECLARE-Variablen nicht kollidieren.
+    ''' </summary>
+    ''' <returns>True wenn erfolgreich</returns>
+    Public Function CommitBatch() As Boolean
+        BatchMode = False
+        If _sqlBatch.Count = 0 Then Return True
+        Try
+            Dim oStatements = _sqlBatch.
+                Where(Function(s) Not String.IsNullOrWhiteSpace(s)).
+                ToList()
+
+            ' @NEW_OBJ_MD_ID pro Statement eindeutig umbenennen → kein Namenskonflikt im Batch
+            Dim oNumberedStatements As New List(Of String)
+            Dim oIndex As Integer = 0
+            For Each oStatement As String In oStatements
+                Dim oNumbered = oStatement.Replace("@NEW_OBJ_MD_ID", $"@NEW_OBJ_MD_ID_{oIndex}")
+                oNumberedStatements.Add(oNumbered)
+                oIndex += 1
+            Next
+
+            Dim oBatchSQL = String.Join(vbNewLine, oNumberedStatements)
+            LOGGER.Debug($"⚡ CommitBatch - Executing {oStatements.Count} statements as one batch:{vbNewLine}{oBatchSQL}")
+            Dim oResult = DatabaseFallback.ExecuteNonQueryIDB(oBatchSQL)
+            _sqlBatch.Clear()
+            Return oResult
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            _sqlBatch.Clear()
+            Return False
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Verwirft alle gesammelten Statements ohne Ausführung.
+    ''' </summary>
+    Public Sub RollbackBatch()
+        _sqlBatch.Clear()
+        BatchMode = False
+    End Sub
+
+    ''' <summary>
+    ''' Führt ein SQL-Statement aus – sofort oder gesammelt je nach BatchMode.
+    ''' </summary>
+    Private Function ExecuteOrQueue(oSQL As String) As Boolean
+        If BatchMode Then
+            _sqlBatch.Add(oSQL)
+            LOGGER.Debug($"BatchMode - Queued statement: {oSQL}")
+            Return True
+        Else
+            Return DatabaseFallback.ExecuteNonQueryIDB(oSQL)
+        End If
+    End Function
    ''' <summary>
    ''' Gets all indices by BusinessEntity.
    ''' </summary>
@@ -7,15 +77,16 @@
    ''' <returns>Array with all Indices</returns>
    ''' <remarks></remarks>
    ''' 
-    Public Function Init()
+    Public Function Init() As Boolean
        Dim oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE WHERE SYS_ATTRIBUTE = 0 ORDER BY ATTR_TITLE"
        DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL)
        If IsNothing(DTVWIDB_BE_ATTRIBUTE) Then
            oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE ORDER BY ATTR_TITLE "
            DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL)
        End If
+        Return True
    End Function
-    Public IDBSystemIndices As List(Of String)
+
    Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String()
        Try
            Dim aNames(4) As String
@@ -118,7 +189,7 @@
                LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ")
            End If
            Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
-            LOGGER.Debug($"GetVariableValue: {oFNSQL}")
+            LOGGER.Debug($": {oFNSQL}")
            oAttributeValue = DatabaseFallback.GetDatatableIDB(oFNSQL)
            Dim odt As DataTable = oAttributeValue
            If odt.Rows.Count = 1 Then
@@ -138,10 +209,11 @@
            If IDB_USES_WMFILESTORE Then
                oID_IS_FOREIGN = 1
            End If
-
-            Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}"
-            DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
-
+            oTerm2Delete = oTerm2Delete.Replace("'", "''")
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN};"
+            LOGGER.Debug($"Delete_Term_Object_From_Metadata: {oDELSQL}")
+            'DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
+            Return ExecuteOrQueue(oDELSQL)
        Catch ex As Exception
            LOGGER.Error(ex)
            Return Nothing
@@ -150,9 +222,10 @@
    End Function
    Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object
        Try
-            Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'"
-            DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
-
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}';"
+            LOGGER.Debug($"Delete_Attribute_Data: {oDELSQL}")
+            ' DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
+            Return ExecuteOrQueue(oDELSQL)
        Catch ex As Exception
            LOGGER.Error(ex)
            Return Nothing
@@ -162,18 +235,23 @@

    Public Function SetVariableValue(oAttributeName As String, oNewValue As Object, Optional CheckDeleted As Boolean = False, Optional oIDBTyp As Integer = 0)
        Try
+            Dim omsg = $"IDBData - SetVariableValue - Attribute: [{oAttributeName}] - NewValue: [{oNewValue}] - CheckDeleted: [{CheckDeleted.ToString}] - oIDBTyp: [{oIDBTyp}]"
+            LOGGER.Debug(omsg)
            Dim omytype = oNewValue.GetType.ToString
            If omytype = "System.Data.DataTable" Then
                Dim oDTMyNewValues As DataTable = oNewValue
-                Dim oOldAttributeResult
+                Dim oAttributeResultFromDB
                Dim oTypeOldResult
+                ' Für DataTable (Mehrfachauswahl/Vektor) IMMER auf gelöschte Werte prüfen,
+                ' unabhängig vom übergebenen CheckDeleted-Parameter.
+                Dim oEffectiveCheckDeleted As Boolean = True

-                If CheckDeleted = True Then
-                    oOldAttributeResult = GetVariableValue(oAttributeName, oIDBTyp)
-                    oTypeOldResult = oOldAttributeResult.GetType.ToString
-                    If oTypeOldResult = "System.Data.DataTable" Then
-                        Dim myOldValues As DataTable = oOldAttributeResult
-                        If myOldValues.Rows.Count > 1 Then
+                If oEffectiveCheckDeleted = True Then
+                    oAttributeResultFromDB = GetVariableValue(oAttributeName, oIDBTyp)
+                    oTypeOldResult = oAttributeResultFromDB.GetType.ToString
+                    If TypeOf oAttributeResultFromDB Is DataTable Then
+                        Dim myOldValues As DataTable = oAttributeResultFromDB
+                        If myOldValues.Rows.Count >= 1 Then

                            'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues
                            For Each oOldValueRow As DataRow In myOldValues.Rows
@@ -199,27 +277,26 @@
                        '### Old Value is a single value ###
                        If oDTMyNewValues.Rows.Count > 1 Then
                            '### there is more than one new value ###
-                            Dim oExists As Boolean
+                            Dim oExists As Boolean = False
                            For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
-                                oExists = False
-                                Dim oInfo1 = $"Checking oldValue[{oOldAttributeResult}] vs NewValue [{oNewValueRow.Item(1)}]"
-                                If oNewValueRow.Item(1).ToString.ToUpper = oOldAttributeResult.ToString.ToUpper Then
+                                LOGGER.Debug($"Checking oldValue[{oAttributeResultFromDB}] vs NewValue [{oNewValueRow.Item(1)}]")
+                                If oNewValueRow.Item(1).ToString.ToUpper = oAttributeResultFromDB.ToString.ToUpper Then
                                    oExists = True
+                                    Exit For  ' ← sobald gefunden, abbrechen
                                End If
                            Next
                            If oExists = False Then
-                                Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
-                                LOGGER.Debug(oInfo2)
+                                LOGGER.Debug($"Value [{oAttributeResultFromDB}] no longer existing in Attribute [{oAttributeName}] - will be deleted!")
                                'SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo2)
-                                Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
+                                Delete_Term_Object_From_Metadata(oAttributeName, oAttributeResultFromDB)
                            End If
                        Else
                            '### there is only ONE new value ###
-                            If oDTMyNewValues.Rows(0).Item(1) <> oOldAttributeResult Then
-                                Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!"
+                            If oDTMyNewValues.Rows(0).Item(1) <> oAttributeResultFromDB Then
+                                Dim oInfo = $"Value [{oAttributeResultFromDB}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!"
                                LOGGER.Debug(oInfo)
                                SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo)
-                                Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
+                                Delete_Term_Object_From_Metadata(oAttributeName, oAttributeResultFromDB)
                            Else
                                LOGGER.Debug($"Attributvalue of [{oAttributeName}] did not change!")
                            End If
@@ -231,22 +308,25 @@
                End If

                For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
-                    Dim oSuccess As Boolean = False
+                    'Dim oSuccess As Boolean = False
                    Dim oVALUE = oNewValueRow.Item(1).ToString
                    oVALUE = oVALUE.Replace("'", "''")
-                    Dim oPRSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oVALUE}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
+                    Dim oPRSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oVALUE}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT;"
                    LOGGER.Debug(oPRSQL)
-                    oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL)
-                    If oSuccess = False Then
-                        Return False
-                    End If
+                    'oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL)
+                    If Not ExecuteOrQueue(oPRSQL) Then Return False
+                    'If oSuccess = False Then
+                    '    Return False
+                    'End If
                Next
                Return True
            Else
                'oNewValue = oNewValue.Replace("'", "' + NCHAR(39) + '")
-                Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
-                LOGGER.Debug(oFNSQL)
-                Return DatabaseFallback.ExecuteNonQueryIDB(oFNSQL)
+                oNewValue = oNewValue.Replace("'", "''")
+                Dim oPRIDB_NEW_OBJ_DATA = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT;"
+                LOGGER.Debug(oPRIDB_NEW_OBJ_DATA)
+                ' Return DatabaseFallback.ExecuteNonQueryIDB(oPRIDB_NEW_OBJ_DATA)
+                Return ExecuteOrQueue(oPRIDB_NEW_OBJ_DATA)
            End If

        Catch ex As Exception
--- a/app/TaskFlow/ClassInit.vb
+++ b/app/TaskFlow/ClassInit.vb
@@ -1,11 +1,12 @@
-Imports DLLLicenseManager
-Imports DigitalData.Modules.Logging
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 Imports DigitalData.Modules.Config
-Imports DigitalData.Modules.EDMI.API
-Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.Database
-Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.EDMI.API.Constants
+Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
+Imports DigitalData.Modules.Logging
+Imports DLLLicenseManager
+Imports DocumentFormat.OpenXml.Spreadsheet

 Public Class ClassInit
    Public _lizenzManager As ClassLicenseManager
@@ -20,21 +21,16 @@ Public Class ClassInit
                                        My.Application.Info.CompanyName,
                                        My.Application.Info.ProductName)

-
        LOGGER = LOGCONFIG.GetLogger("taskFLOW")
-
        LOGGER.Info("## taskFLOW started - {0}", Now)
        Try
            Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
-
            For Each file As IO.FileInfo In directory.GetFiles
                If (Now - file.CreationTime).Days > 29 Then
                    file.Delete()
                Else
                    Exit For
                End If
-
-
            Next
        Catch ex As Exception

@@ -59,6 +55,15 @@ Public Class ClassInit

            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
            LOGGER.Info("ConfigManager loaded")
+            LOGGER.Info($"oUserAppDataPath will be: {oUserAppDataPath}")
+
+            If oStartupPath <> oCommonAppDataPath Then
+                LOGGER.Info($"oCommonAppDataPath will be: {oCommonAppDataPath}")
+                LOGGER.Info($"oStartupPath will be: {oStartupPath}")
+            Else
+                LOGGER.Info($"oStartupPath is the same as oCommonAppDataPath: {oCommonAppDataPath}")
+            End If
+
            Try
                If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then
                    LOGGER.Debug("Test Connection String loaded")
@@ -85,11 +90,11 @@ Public Class ClassInit

                                LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!")
                            Else
-                                LOGGER.Warn($"#### !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###")
+                                LOGGER.Warn($"#### ⚠️ !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###")
                            End If
                        End If
                    Catch ex As Exception
-                        LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}")
+                        LOGGER.Warn($"⚠️ Could not initialize the AppServer: {ex.Message}")
                    End Try

                Else
@@ -244,12 +249,12 @@ Public Class ClassInit
            Try
                oLICDATE = CDate(split(1))
            Catch ex As Exception
-                LOGGER.Warn($"Error Converting Value {split(1)} to DATE")
+                LOGGER.Warn($"⚠️ Error Converting Value {split(1)} to DATE")
                Try
                    Dim expenddt As Date = Date.ParseExact(split(1), "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
                    oLICDATE = expenddt
                Catch ex1 As Exception
-                    LOGGER.Warn($"Second Error Converting DATE with ParseExact - Setting Date = Today")
+                    LOGGER.Warn($"⚠️Second Error Converting DATE with ParseExact - Setting Date = Today")
                    oLICDATE = Now.Date
                End Try

@@ -329,9 +334,8 @@ Public Class ClassInit
            LOGGER.Debug("Username: " & USER_USERNAME)
            Dim oFnct As New RefreshHelper.SW("FNDD_LOGIN_USER_MODULE")
            oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
+
            Dim DT_CHECKUSER_MODULE As DataTable
-
-
            DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                               .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
                           })
@@ -357,6 +361,7 @@ Public Class ClassInit
                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")

+                USER_MODULE_ID = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ID")


                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
@@ -380,18 +385,19 @@ Public Class ClassInit
                LOGGER.Debug("User Info:")
                LOGGER.Debug("Language: [{0}]", USER_LANGUAGE)
                LOGGER.Debug("Username: [{0}]", USER_USERNAME)
+                LOGGER.Debug("Environment.MachineName: [{0}]", Environment.MachineName)

                Try
                    USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL"))

                Catch ex As Exception
-                    LOGGER.Warn("Error in USER_RIGHT_FILE_DELETE: " & ex.Message)
+                    LOGGER.Warn("⚠️ Error in USER_RIGHT_FILE_DELETE: " & ex.Message)
                    USER_RIGHT_FILE_DELETE = False
                End Try
                USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")


-                ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
+                ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE, "Load")


                FINALINDICES = New ClassFinalIndex()
@@ -462,7 +468,7 @@ Public Class ClassInit
            '    DataASorDB = New ClassDataASorDB
            'End If
            Dim oStopWatch As New RefreshHelper.SW("InitBasics")
-            Dim oSql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1")
+            Dim oSql = String.Format("select * from TBPM_KONFIGURATION WITH (NOLOCK) WHERE GUID = 1")
            oStep = "TBPM_KONFIGURATION"

            BASEDATA_DT_CONFIG = DatabaseFallback.GetDatatable("TBPM_KONFIGURATION", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
@@ -492,23 +498,23 @@ Public Class ClassInit
                LOGGER.Warn($"Keine GDPICTURE-Lizenz gefunden. Version Konfiguration: {My.Settings.GDPICTURE_VERSION} - Prüfe TBDD_3RD_PARTY_MODULES")
            End If
            oStep = "TBDD_SQL_COMMANDS"
-            oSql = "Select * FROM TBDD_SQL_COMMANDS"
+            oSql = "Select * FROM TBDD_SQL_COMMANDS WITH (NOLOCK)"

            BASEDATA_DT_TBDD_SQL_COMMANDS = DatabaseFallback.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSql, DatabaseType.ECM))

            oStep = "TBDD_GUI_LANGUAGE_PHRASE"
-            oSql = $"SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')"
+            oSql = $"SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WITH (NOLOCK) WHERE MODULE IN ('PM','All Modules')"
            'BASEDATA_DT_GUI_LANGUAGE_PHRASES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_GUI_LANGUAGE_PHRASE", "")
            BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM))
            oStep = "TBPM_PROFILE_SEARCH"
-            oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
+            oSql = "select * from TBPM_PROFILE_SEARCH WITH (NOLOCK) where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
            BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
                .SortByColumn = "PROFILE_ID,TAB_INDEX"
            })
            DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()

            oStep = "TBPM_MAIN_VIEW_GROUPS"
-            oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1"
+            oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WITH (NOLOCK) WHERE ACTIVE = 1"

            BASEDATA_DTGRID_GROUPS = DatabaseFallback.GetDatatable("TBPM_MAIN_VIEW_GROUPS", New GetDatatableOptions(oSql, DatabaseType.ECM))

@@ -518,10 +524,17 @@ Public Class ClassInit

            BASEDATA_DT_CHARTS = DatabaseFallback.GetDatatable("TBPM_CHART", New GetDatatableOptions(oSql, DatabaseType.ECM))
            oStep = "TBDD_GUI_LANGUAGE"
-            oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
+            oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WITH (NOLOCK) WHERE ACTIVE = 1 ORDER BY LANG_CODE"

            BASEDATA_DT_LANGUAGE = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+            oSql = "SELECT * FROM TBDD_COLUMNS_FORMAT WITH (NOLOCK) WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
+            BASEDATA_TBDD_COLUMNS_FORMAT = DatabaseFallback.GetDatatable("TBDD_COLUMNS_FORMAT", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+
+
            oStopWatch.Done()
+
        Catch ex As Exception
            LOGGER.Error(ex)
            LOGGER.Info($"Unexpected Error in InitBasics - last Step [{oStep}]: {ex.Message}", True)
@@ -542,6 +555,48 @@ Public Class ClassInit
                LOGGER.Warn($"no profiles for user: '{USER_USERNAME}' configured - Check SQL [{oSql}]!", False)
            End If

+            oSql = "SELECT KEY_NAME, VALUE_TEXT1 
+                             FROM TBDD_USER_KEY_VALUE_PAIR WITH (NOLOCK)
+                             WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "'"
+
+            Dim oDT_USER_KEY_VALUE_PAIR As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSql, DatabaseType.ECM))
+            If UserInheritance_ConfirmationByColumn Is Nothing Then
+                UserInheritance_ConfirmationByColumn = New List(Of UserInheritanceConfirmation)()
+            End If
+            If Not IsNothing(oDT_USER_KEY_VALUE_PAIR) Then
+                For Each row As DataRow In oDT_USER_KEY_VALUE_PAIR.Rows
+                    Dim keyName As String = row("KEY_NAME").ToString()
+
+                    ' Prüfe ob es sich um einen Inheritance-Key handelt
+                    If keyName.StartsWith("INHERITANCE_CONFIRM_") Then
+                        Dim columnName As String = keyName.Replace("INHERITANCE_CONFIRM_", "")
+                        Dim countValue As Integer = Integer.Parse(row("VALUE_TEXT1").ToString())
+
+                        Dim existingEntry = UserInheritance_ConfirmationByColumn.FirstOrDefault(
+                    Function(e) String.Equals(e.ColumnName, columnName, StringComparison.OrdinalIgnoreCase))
+
+                        If existingEntry IsNot Nothing Then
+                            existingEntry.Count = countValue
+                        Else
+                            UserInheritance_ConfirmationByColumn.Add(
+                        New UserInheritanceConfirmation With {
+                            .ColumnName = columnName,
+                            .Count = countValue
+                        })
+                        End If
+
+                        LOGGER.Debug("Loaded inheritance confirmation for column [{0}] with count [{1}]", columnName, countValue)
+                    End If
+                Next
+            Else
+                LOGGER.Warn("⚠️ oDT_USER_KEY_VALUE_PAIR is nothing")
+            End If
+
+
+
+
+
+
            oStopWatch.Done()
        Catch ex As Exception
            LOGGER.Error(ex)
@@ -553,7 +608,7 @@ Public Class ClassInit
    <STAThread()>
    Private Function Settings_LoadBasicConfig()
        Try
-            Dim oSql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'"
+            Dim oSql As String = "select * from tbdd_Modules WITH (NOLOCK) where SHORT_NAME = 'PM'"
            Dim oDTtbdd_Modules As DataTable
            'oDTtbdd_Modules = DataASorDB.GetDatatable("DD_ECM", oSql, "tbdd_Modules", $" SHORT_NAME = 'PM'")
            oDTtbdd_Modules = DatabaseFallback.GetDatatable("TBDD_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
--- a/app/TaskFlow/ClassPMWindream.vb
+++ b/app/TaskFlow/ClassPMWindream.vb
@@ -155,7 +155,7 @@ Public Class ClassPMWindream
                                    Case WMObjectVariableValueTypeString
                                        LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString")
                                        If value = "DeleteWMAttributeValue" Then
-                                            LOGGER.Debug("Indexing simpleAttribute with String.Empty")
+                                            LOGGER.Debug("DeleteWMAttributeValue - simpleAttribute with String.Empty")
                                            convertValue = CStr(String.Empty)
                                        Else
                                            convertValue = CStr(value)
--- a/app/TaskFlow/ClassParamRefresh.vb
+++ b/app/TaskFlow/ClassParamRefresh.vb
@@ -1,7 +1,8 @@
 Imports DigitalData.Modules.Database

 Public Class ClassParamRefresh
-    Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable)
+    Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable, pMode As String)
+        LOGGER.Debug("Refresh_Params starting ...")
        Dim oStopwatch As New RefreshHelper.SW("Refresh_Params")
        FORCE_LAYOUT_OVERVIEW = False
        SHOW_CHARTS = True
@@ -28,16 +29,18 @@ Public Class ClassParamRefresh
            End If
        End If

-
+        LOGGER.Debug("Refresh_Params BASEDATA_DT_TBDD_SQL_COMMANDS done!")


        If DT_CHECKUSER.Rows.Count = 1 Then
            If oLicenseoverSQL = False Then
                USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                LOGGER.Debug(String.Format("Refresh_Params USERCOUNT_LOGGED_IN {0}", USERCOUNT_LOGGED_IN.ToString))
            End If

            Try
                WORKING_MODE = DT_CHECKUSER.Rows(0).Item("WORKING_MODE")
+                LOGGER.Debug(String.Format("Refresh_Params WORKING_MODE {0}", WORKING_MODE.ToString))
            Catch ex As Exception
                WORKING_MODE = ""
            End Try
@@ -47,6 +50,7 @@ Public Class ClassParamRefresh
                If ADDITIONAL_TITLE = String.Empty Then
                    ADDITIONAL_TITLE = My.Application.Info.ProductName
                End If
+                LOGGER.Debug(String.Format("Refresh_Params ADDITIONAL_TITLE {0}", ADDITIONAL_TITLE.ToString))
            Catch ex As Exception
                ADDITIONAL_TITLE = My.Application.Info.ProductName
            End Try
@@ -69,6 +73,8 @@ Public Class ClassParamRefresh
                ElseIf oMode = "PM.DEBUG_LOG" Then
                    DEBUG = True
                    LOGCONFIG.Debug = True
+                ElseIf oMode = "PM.LOG_HOTSPOTS" Then
+                    LOG_HOTSPOTS = True
                ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
                    OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
                    If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
@@ -215,6 +221,28 @@ Public Class ClassParamRefresh
                    Catch ex As Exception
                        TITLE_NOTIFICATIONS = ""
                    End Try
+                ElseIf oMode.StartsWith("TF.InheritanceMsgAmount") And pMode = "Load" Then
+                    Dim oParam = oMode.Replace("TF.InheritanceMsgAmount=", "")
+                    Try
+                        InheritanceMsgAmount = oParam
+                    Catch ex As Exception
+
+                    End Try
+                ElseIf oMode.StartsWith("TF.InheritanceCalcReset") And pMode = "Load" Then
+                    Dim oParam = oMode.Replace("TF.InheritanceCalcReset=", "")
+                    Try
+                        If CBool(oParam) = True Then
+                            LOGGER.Info("Inheritance_Counts werden  auf 0 zurückgesetzt bzw gelöscht")
+                            Dim oDELETESQL = "DELETE FROM TBDD_USER_KEY_VALUE_PAIR 
+                             WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "' AND KEY_NAME LIKE 'INHERITANCE_CONFIRM_%'"
+                            DatabaseECM.ExecuteNonQuery(oDELETESQL)
+
+                            UserInheritance_ConfirmationByColumn = Nothing
+                            CONFIG.Save()
+                        End If
+                    Catch ex As Exception
+
+                    End Try
                ElseIf oMode.StartsWith("PM.START_CW") Then
                    Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
                    Try
--- a/app/TaskFlow/ClassRegexEditor.vb
+++ b/app/TaskFlow/ClassRegexEditor.vb
@@ -12,7 +12,7 @@ Public Class ClassRegexEditor

    Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
        Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim oRegexString As String = NotNull(value, String.Empty)
+        Dim oRegexString As String = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)

        If oService IsNot Nothing Then
            Using oform As New frmRegexEditor()
--- a/app/TaskFlow/ClassWindream_allgemein.vb
+++ b/app/TaskFlow/ClassWindream_allgemein.vb
@@ -211,7 +211,7 @@ LOGGER.Error(ex)
    Public Function GetTypeOfIndex(ByVal indexname As String) As Integer
        Try
            If IsNothing(Me.oSession) Then
-                LOGGER.Warn("GetTypeOfIndex: WMSession is nothing")
+                LOGGER.Warn("⚠️ GetTypeOfIndex: WMSession is nothing")
                Return Nothing
            End If
            Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
@@ -272,7 +272,7 @@ LOGGER.Error(ex)
    Public Function GetIndicesByObjecttype(ByVal Objecttype_name As String) As String()
        Try
            If IsNothing(Me.oSession) Then
-                LOGGER.Warn("GetIndicesByObjecttype: WMSession is nothing")
+                LOGGER.Warn("⚠️ GetIndicesByObjecttype: WMSession is nothing")
                Return Nothing
            End If
            Dim oObjectType As WMObject
@@ -325,7 +325,7 @@ LOGGER.Error(ex)
    Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
        Try
            If IsNothing(Me.oSession) Then
-                LOGGER.Warn("GetObjecttypeByName: WMSession is nothing")
+                LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing")
                Return Nothing
            End If
            ' alle Objekttypen auslesen
--- a/app/TaskFlow/ControlCreator/GridControl.vb
+++ b/app/TaskFlow/ControlCreator/GridControl.vb
--- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb
+++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb
@@ -4587,6 +4587,8 @@ Partial Public Class DD_DMSLiteDataSet
        
        Private columnBACKCOLOR_IF As Global.System.Data.DataColumn
        
+        Private columnTEXT_ALIGNMENT As Global.System.Data.DataColumn
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Sub New()
@@ -4966,6 +4968,14 @@ Partial Public Class DD_DMSLiteDataSet
            End Get
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public ReadOnly Property TEXT_ALIGNMENTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnTEXT_ALIGNMENT
+            End Get
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
         Global.System.ComponentModel.Browsable(false)>  _
@@ -5045,9 +5055,10 @@ Partial Public Class DD_DMSLiteDataSet
                    ByVal TABLE_ORDER_COLUMN As String,  _
                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
                    ByVal FORMAT_STRING As String,  _
-                    ByVal BACKCOLOR_IF As String) As TBPM_PROFILE_CONTROLSRow
+                    ByVal BACKCOLOR_IF As String,  _
+                    ByVal TEXT_ALIGNMENT As String) As TBPM_PROFILE_CONTROLSRow
            Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, BACKCOLOR_IF}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, BACKCOLOR_IF, TEXT_ALIGNMENT}
            If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then
                columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0)
            End If
@@ -5122,6 +5133,7 @@ Partial Public Class DD_DMSLiteDataSet
            Me.columnSAVE_CHANGE_ON_ENABLED = MyBase.Columns("SAVE_CHANGE_ON_ENABLED")
            Me.columnFORMAT_STRING = MyBase.Columns("FORMAT_STRING")
            Me.columnBACKCOLOR_IF = MyBase.Columns("BACKCOLOR_IF")
+            Me.columnTEXT_ALIGNMENT = MyBase.Columns("TEXT_ALIGNMENT")
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5213,6 +5225,8 @@ Partial Public Class DD_DMSLiteDataSet
            MyBase.Columns.Add(Me.columnFORMAT_STRING)
            Me.columnBACKCOLOR_IF = New Global.System.Data.DataColumn("BACKCOLOR_IF", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnBACKCOLOR_IF)
+            Me.columnTEXT_ALIGNMENT = New Global.System.Data.DataColumn("TEXT_ALIGNMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnTEXT_ALIGNMENT)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
            Me.columnGUID.AutoIncrement = true
            Me.columnGUID.AllowDBNull = false
@@ -5259,7 +5273,10 @@ Partial Public Class DD_DMSLiteDataSet
            Me.columnTABLE_ORDER_COLUMN.DefaultValue = CType("",String)
            Me.columnTABLE_ORDER_COLUMN.MaxLength = 250
            Me.columnSAVE_CHANGE_ON_ENABLED.AllowDBNull = false
-            Me.columnFORMAT_STRING.AllowDBNull = false
+            Me.columnFORMAT_STRING.DefaultValue = CType("",String)
+            Me.columnTEXT_ALIGNMENT.AllowDBNull = false
+            Me.columnTEXT_ALIGNMENT.DefaultValue = CType("Near",String)
+            Me.columnTEXT_ALIGNMENT.MaxLength = 20
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5445,6 +5462,12 @@ Partial Public Class DD_DMSLiteDataSet
        
        Private columnLU_CAPTION As Global.System.Data.DataColumn
        
+        Private columnINHERIT_VALUE As Global.System.Data.DataColumn
+        
+        Private columnFORMULA_EXPRESSION As Global.System.Data.DataColumn
+        
+        Private columnFORMULA_SQL As Global.System.Data.DataColumn
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Sub New()
@@ -5672,6 +5695,30 @@ Partial Public Class DD_DMSLiteDataSet
            End Get
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public ReadOnly Property INHERIT_VALUEColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnINHERIT_VALUE
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public ReadOnly Property FORMULA_EXPRESSIONColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnFORMULA_EXPRESSION
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public ReadOnly Property FORMULA_SQLColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnFORMULA_SQL
+            End Get
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
         Global.System.ComponentModel.Browsable(false)>  _
@@ -5732,9 +5779,12 @@ Partial Public Class DD_DMSLiteDataSet
                    ByVal ADVANCED_LOOKUP As Boolean,  _
                    ByVal SUMMARY_FUNCTION As String,  _
                    ByVal TYPE_COLUMN As String,  _
-                    ByVal LU_CAPTION As String) As TBPM_CONTROL_TABLERow
+                    ByVal LU_CAPTION As String,  _
+                    ByVal INHERIT_VALUE As Boolean,  _
+                    ByVal FORMULA_EXPRESSION As String,  _
+                    ByVal FORMULA_SQL As String) As TBPM_CONTROL_TABLERow
            Dim rowTBPM_CONTROL_TABLERow As TBPM_CONTROL_TABLERow = CType(Me.NewRow,TBPM_CONTROL_TABLERow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, FORMULA_EXPRESSION, FORMULA_SQL}
            If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then
                columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0)
            End If
@@ -5790,6 +5840,9 @@ Partial Public Class DD_DMSLiteDataSet
            Me.columnSUMMARY_FUNCTION = MyBase.Columns("SUMMARY_FUNCTION")
            Me.columnTYPE_COLUMN = MyBase.Columns("TYPE_COLUMN")
            Me.columnLU_CAPTION = MyBase.Columns("LU_CAPTION")
+            Me.columnINHERIT_VALUE = MyBase.Columns("INHERIT_VALUE")
+            Me.columnFORMULA_EXPRESSION = MyBase.Columns("FORMULA_EXPRESSION")
+            Me.columnFORMULA_SQL = MyBase.Columns("FORMULA_SQL")
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5843,6 +5896,12 @@ Partial Public Class DD_DMSLiteDataSet
            MyBase.Columns.Add(Me.columnTYPE_COLUMN)
            Me.columnLU_CAPTION = New Global.System.Data.DataColumn("LU_CAPTION", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnLU_CAPTION)
+            Me.columnINHERIT_VALUE = New Global.System.Data.DataColumn("INHERIT_VALUE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnINHERIT_VALUE)
+            Me.columnFORMULA_EXPRESSION = New Global.System.Data.DataColumn("FORMULA_EXPRESSION", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnFORMULA_EXPRESSION)
+            Me.columnFORMULA_SQL = New Global.System.Data.DataColumn("FORMULA_SQL", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnFORMULA_SQL)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
            Me.columnGUID.AutoIncrement = true
            Me.columnGUID.AllowDBNull = false
@@ -5883,6 +5942,14 @@ Partial Public Class DD_DMSLiteDataSet
            Me.columnLU_CAPTION.AllowDBNull = false
            Me.columnLU_CAPTION.DefaultValue = CType("",String)
            Me.columnLU_CAPTION.MaxLength = 150
+            Me.columnINHERIT_VALUE.AllowDBNull = false
+            Me.columnINHERIT_VALUE.DefaultValue = CType(false,Boolean)
+            Me.columnFORMULA_EXPRESSION.AllowDBNull = false
+            Me.columnFORMULA_EXPRESSION.DefaultValue = CType("",String)
+            Me.columnFORMULA_EXPRESSION.MaxLength = 1000
+            Me.columnFORMULA_SQL.AllowDBNull = false
+            Me.columnFORMULA_SQL.DefaultValue = CType("",String)
+            Me.columnFORMULA_SQL.MaxLength = 3000
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -12546,7 +12613,11 @@ Partial Public Class DD_DMSLiteDataSet
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Property FORMAT_STRING() As String
            Get
-                Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn),String)
+                Try 
+                    Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn),String)
+                Catch e As Global.System.InvalidCastException
+                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FORMAT_STRING in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e)
+                End Try
            End Get
            Set
                Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) = value
@@ -12568,6 +12639,17 @@ Partial Public Class DD_DMSLiteDataSet
            End Set
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Property TEXT_ALIGNMENT() As String
+            Get
+                Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn) = value
+            End Set
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Property TBPM_PROFILERow() As TBPM_PROFILERow
@@ -12807,6 +12889,18 @@ Partial Public Class DD_DMSLiteDataSet
            Me(Me.tableTBPM_PROFILE_CONTROLS.SQL_ENABLE_ON_LOAD_CONIDColumn) = Global.System.Convert.DBNull
        End Sub
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Function IsFORMAT_STRINGNull() As Boolean
+            Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Sub SetFORMAT_STRINGNull()
+            Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) = Global.System.Convert.DBNull
+        End Sub
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Function IsBACKCOLOR_IFNull() As Boolean
@@ -13129,6 +13223,39 @@ Partial Public Class DD_DMSLiteDataSet
            End Set
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Property INHERIT_VALUE() As Boolean
+            Get
+                Return CType(Me(Me.tableTBPM_CONTROL_TABLE.INHERIT_VALUEColumn),Boolean)
+            End Get
+            Set
+                Me(Me.tableTBPM_CONTROL_TABLE.INHERIT_VALUEColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Property FORMULA_EXPRESSION() As String
+            Get
+                Return CType(Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_EXPRESSIONColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_EXPRESSIONColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Property FORMULA_SQL() As String
+            Get
+                Return CType(Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_SQLColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_SQLColumn) = value
+            End Set
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
        Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow
@@ -20284,6 +20411,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
            tableMapping.ColumnMappings.Add("TABLE_ORDER_COLUMN", "TABLE_ORDER_COLUMN")
            tableMapping.ColumnMappings.Add("SAVE_CHANGE_ON_ENABLED", "SAVE_CHANGE_ON_ENABLED")
            tableMapping.ColumnMappings.Add("FORMAT_STRING", "FORMAT_STRING")
+            tableMapping.ColumnMappings.Add("TEXT_ALIGNMENT", "TEXT_ALIGNMENT")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -20298,19 +20426,19 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "T_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VK"& _ 
                "T_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE"& _ 
                "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, "& _ 
-                "FORMAT_STRING)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_"& _ 
-                "LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATI"& _ 
-                "ON,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FO"& _ 
-                "NT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULT"& _ 
-                "ISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_D"& _ 
-                "E,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FO"& _ 
-                "RMAT_STRING);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y"& _ 
-                "_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDAT"& _ 
-                "ION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, F"& _ 
-                "ONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MUL"& _ 
-                "TISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_"& _ 
-                "DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) "& _ 
-                "ORDER BY Y_LOC, X_LOC"
+                "FORMAT_STRING, TEXT_ALIGNMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL"& _ 
+                "_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAM"& _ 
+                "E,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH"& _ 
+                ",@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEF"& _ 
+                "AULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,"& _ 
+                "@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANG"& _ 
+                "E_ON_ENABLED,@FORMAT_STRING,@TEXT_ALIGNMENT);      "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAM"& _ 
+                "E, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ 
+                "ED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEF"& _ 
+                "UNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, L"& _ 
+                "OAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VA"& _ 
+                "LUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS"& _ 
+                " WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC"
            Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20348,6 +20476,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.UpdateCommand.Connection = Me.Connection
            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                PROFIL_ID = @PROFIL_ID, NA"& _ 
@@ -20363,14 +20492,14 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "CH = @REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_"& _ 
                "DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 ="& _ 
                " @SQL2, SQL_ENABLE = @SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SAVE_CHANGE_ON_ENAB"& _ 
-                "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUI"& _ 
-                "D = @Original_GUID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_"& _ 
-                "LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, V"& _ 
-                "ALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_ST"& _ 
-                "YLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALU"& _ 
-                "E, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_ME"& _ 
-                "SSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER"& _ 
-                " BY Y_LOC, X_LOC"
+                "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = "& _ 
+                "@TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL"& _ 
+                "_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WH"& _ 
+                "O, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UE"& _ 
+                "BERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ"& _ 
+                "_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MUL"& _ 
+                "TIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_"& _ 
+                "CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20405,6 +20534,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
        End Sub
@@ -20430,8 +20560,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "             REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL"& _ 
                "2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, C"& _ 
                "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENA"& _ 
-                "BLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID ="& _ 
-                " @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "BLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHER"& _ 
+                "E        (GUID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
@@ -20480,18 +20610,20 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._commandCollection(8) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(8).Connection = Me.Connection
            Me._commandCollection(8).CommandText = "INSERT INTO TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (PROFIL_ID, NAME, CTR"& _ 
-                "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROF"& _ 
-                "IL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width)"
+                "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALU"& _ 
+                "ES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIG"& _ 
+                "HT,@Width,@TEXT_ALIGNMENT)"
            Me._commandCollection(8).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Width", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(9) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(9).Connection = Me.Connection
            Me._commandCollection(9).CommandText = "UPDATE       TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET               INDEX_NAME = @INDEX_NAME,CH"& _ 
@@ -20511,8 +20643,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "P, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, I"& _ 
                "MAGE_CONTROL, SQL2, SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SET_CONTROL_DATA, SQL"& _ 
                "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, S"& _ 
-                "AVE_CHANGE_ON_ENABLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS AS T"& _ 
-                ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "AVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFI"& _ 
+                "LE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
            Me._commandCollection(10).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@profil_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20669,7 +20801,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                    ByVal SQL2 As String,  _
                    ByVal SQL_ENABLE As String,  _
                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
-                    ByVal FORMAT_STRING As String) As Integer
+                    ByVal FORMAT_STRING As String,  _
+                    ByVal TEXT_ALIGNMENT As String) As Integer
            Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
            If (NAME Is Nothing) Then
                Throw New Global.System.ArgumentNullException("NAME")
@@ -20794,10 +20927,15 @@ Namespace DD_DMSLiteDataSetTableAdapters
            End If
            Me.Adapter.InsertCommand.Parameters(34).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean)
            If (FORMAT_STRING Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("FORMAT_STRING")
+                Me.Adapter.InsertCommand.Parameters(35).Value = Global.System.DBNull.Value
            Else
                Me.Adapter.InsertCommand.Parameters(35).Value = CType(FORMAT_STRING,String)
            End If
+            If (TEXT_ALIGNMENT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                Me.Adapter.InsertCommand.Parameters(36).Value = CType(TEXT_ALIGNMENT,String)
+            End If
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -20851,6 +20989,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                    ByVal SQL_ENABLE As String,  _
                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
                    ByVal FORMAT_STRING As String,  _
+                    ByVal TEXT_ALIGNMENT As String,  _
                    ByVal Original_GUID As Integer,  _
                    ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
@@ -20966,12 +21105,17 @@ Namespace DD_DMSLiteDataSetTableAdapters
            End If
            Me.Adapter.UpdateCommand.Parameters(31).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean)
            If (FORMAT_STRING Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("FORMAT_STRING")
+                Me.Adapter.UpdateCommand.Parameters(32).Value = Global.System.DBNull.Value
            Else
                Me.Adapter.UpdateCommand.Parameters(32).Value = CType(FORMAT_STRING,String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(34).Value = CType(GUID,Integer)
+            If (TEXT_ALIGNMENT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(33).Value = CType(TEXT_ALIGNMENT,String)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(35).Value = CType(GUID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -21184,9 +21328,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, false)>  _
-        Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short) As Integer
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
+        Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short, ByVal TEXT_ALIGNMENT As String) As Integer
            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8)
            command.Parameters(0).Value = CType(PROFIL_ID,Integer)
            If (NAME Is Nothing) Then
@@ -21213,6 +21356,11 @@ Namespace DD_DMSLiteDataSetTableAdapters
            End If
            command.Parameters(7).Value = CType(HEIGHT,Short)
            command.Parameters(8).Value = CType(Width,Short)
+            If (TEXT_ALIGNMENT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                command.Parameters(9).Value = CType(TEXT_ALIGNMENT,String)
+            End If
            Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
            If ((command.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -21414,6 +21562,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
            tableMapping.ColumnMappings.Add("SUMMARY_FUNCTION", "SUMMARY_FUNCTION")
            tableMapping.ColumnMappings.Add("TYPE_COLUMN", "TYPE_COLUMN")
            tableMapping.ColumnMappings.Add("LU_CAPTION", "LU_CAPTION")
+            tableMapping.ColumnMappings.Add("INHERIT_VALUE", "INHERIT_VALUE")
+            tableMapping.ColumnMappings.Add("FORMULA_EXPRESSION", "FORMULA_EXPRESSION")
+            tableMapping.ColumnMappings.Add("FORMULA_SQL", "FORMULA_SQL")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -21423,13 +21574,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.InsertCommand.Connection = Me.Connection
            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (CONTROL_ID, SPALTENNAME"& _ 
-                ", SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@CONTRO"& _ 
-                "L_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
-                "SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,"& _ 
-                " CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, "& _ 
-                "ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESS"& _ 
-                "AGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE ("& _ 
-                "GUID = SCOPE_IDENTITY())"
+                ", SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN, INHERIT_VALUE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ 
+                "       (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE"& _ 
+                "_COLUMN,@INHERIT_VALUE);      "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HE"& _ 
+                "ADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_O"& _ 
+                "NLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MAT"& _ 
+                "CH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP"& _ 
+                " FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY())"
            Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21437,6 +21588,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENBREITE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENBREITE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_COLUMN", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.UpdateCommand.Connection = Me.Connection
            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                CONTROL_ID = @CONTROL_ID, SPA"& _ 
@@ -21448,12 +21600,14 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "ED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_M"& _ 
                "ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SEQU"& _ 
                "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ 
-                "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Or"& _ 
-                "iginal_GUID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBR"& _ 
-                "EITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_V"& _ 
-                "ALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSA"& _ 
-                "GE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONT"& _ 
-                "ROL_TABLE WHERE (GUID = @GUID)"
+                "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT"& _ 
+                "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION "& _ 
+                "= @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Origina"& _ 
+                "l_GUID);      "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBRE"& _ 
+                "ITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VA"& _ 
+                "LUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAG"& _ 
+                "E_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTR"& _ 
+                "OL_TABLE WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21476,6 +21630,10 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADVANCED_LOOKUP", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ADVANCED_LOOKUP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_EXPRESSION", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_SQL", Global.System.Data.SqlDbType.NVarChar, 3000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_SQL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
        End Sub
@@ -21497,8 +21655,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ 
                "_WHO, ADDED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CHANGED_WHEN, REGEX_MA"& _ 
                "TCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKU"& _ 
-                "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"& _ 
-                ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (CONTROL_ID = @CONTROL_ID)"
+                "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                 "& _ 
+                "        FORMULA_EXPRESSION, FORMULA_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ 
+                "RE        (CONTROL_ID = @CONTROL_ID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
@@ -21510,7 +21669,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "SSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALU"& _ 
                "E = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SEQUENCE = @SEQUENCE, ADVANCED_LO"& _ 
                "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TY"& _ 
-                "PE_COLUMN, LU_CAPTION = @LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID)"
+                "PE_COLUMN, LU_CAPTION = @LU_CAPTION, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         INHERIT_VALUE = "& _ 
+                "@INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA"& _ 
+                "_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID)"
            Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTEN_HEADER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTEN_HEADER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21528,6 +21689,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SUMMARY_FUNCTION", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "SUMMARY_FUNCTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_COLUMN", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_EXPRESSION", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_SQL", Global.System.Data.SqlDbType.NVarChar, 3000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_SQL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
            Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(2).Connection = Me.Connection
@@ -21540,8 +21704,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ 
                "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ 
                "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ 
-                "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"& _ 
-                ""
+                "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                 "& _ 
+                "        FORMULA_EXPRESSION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"
            Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(4).Connection = Me.Connection
@@ -21549,8 +21713,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ 
                "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ 
                "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ 
-                "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"& _ 
-                ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @GUID)"
+                "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                 "& _ 
+                "        FORMULA_EXPRESSION, FORMULA_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ 
+                "RE        (GUID = @GUID)"
            Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand()
@@ -21691,7 +21856,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal CONTROL_ID As Integer, ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal ADDED_WHO As String, ByVal TYPE_COLUMN As String) As Integer
+        Public Overloads Overridable Function Insert(ByVal CONTROL_ID As Integer, ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal ADDED_WHO As String, ByVal TYPE_COLUMN As String, ByVal INHERIT_VALUE As Boolean) As Integer
            Me.Adapter.InsertCommand.Parameters(0).Value = CType(CONTROL_ID,Integer)
            If (SPALTENNAME Is Nothing) Then
                Throw New Global.System.ArgumentNullException("SPALTENNAME")
@@ -21714,6 +21879,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Else
                Me.Adapter.InsertCommand.Parameters(5).Value = CType(TYPE_COLUMN,String)
            End If
+            Me.Adapter.InsertCommand.Parameters(6).Value = CType(INHERIT_VALUE,Boolean)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -21755,6 +21921,10 @@ Namespace DD_DMSLiteDataSetTableAdapters
                    ByVal DEFAULT_VALUE As String,  _
                    ByVal ADVANCED_LOOKUP As Boolean,  _
                    ByVal SAVE_CHANGE_ON_ENABLED As Object,  _
+                    ByVal INHERIT_VALUE As Boolean,  _
+                    ByVal LU_CAPTION As String,  _
+                    ByVal FORMULA_EXPRESSION As String,  _
+                    ByVal FORMULA_SQL As String,  _
                    ByVal Original_GUID As Integer,  _
                    ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer)
@@ -21830,8 +22000,24 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(20).Value = CType(SAVE_CHANGE_ON_ENABLED,Object)
            End If
-            Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(22).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(21).Value = CType(INHERIT_VALUE,Boolean)
+            If (LU_CAPTION Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("LU_CAPTION")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(LU_CAPTION,String)
+            End If
+            If (FORMULA_EXPRESSION Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("FORMULA_EXPRESSION")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(FORMULA_EXPRESSION,String)
+            End If
+            If (FORMULA_SQL Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("FORMULA_SQL")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(FORMULA_SQL,String)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(26).Value = CType(GUID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -21867,6 +22053,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                    ByVal SUMMARY_FUNCTION As String,  _
                    ByVal TYPE_COLUMN As String,  _
                    ByVal LU_CAPTION As String,  _
+                    ByVal INHERIT_VALUE As Boolean,  _
+                    ByVal FORMULA_EXPRESSION As String,  _
+                    ByVal FORMULA_SQL As String,  _
                    ByVal Original_GUID As Integer) As Object
            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1)
            If (SPALTENNAME Is Nothing) Then
@@ -21925,7 +22114,18 @@ Namespace DD_DMSLiteDataSetTableAdapters
            Else
                command.Parameters(15).Value = CType(LU_CAPTION,String)
            End If
-            command.Parameters(16).Value = CType(Original_GUID,Integer)
+            command.Parameters(16).Value = CType(INHERIT_VALUE,Boolean)
+            If (FORMULA_EXPRESSION Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("FORMULA_EXPRESSION")
+            Else
+                command.Parameters(17).Value = CType(FORMULA_EXPRESSION,String)
+            End If
+            If (FORMULA_SQL Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("FORMULA_SQL")
+            Else
+                command.Parameters(18).Value = CType(FORMULA_SQL,String)
+            End If
+            command.Parameters(19).Value = CType(Original_GUID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
            If ((command.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
--- a/app/TaskFlow/DD_DMSLiteDataSet.xsd
+++ b/app/TaskFlow/DD_DMSLiteDataSet.xsd
@@ -972,8 +972,8 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                    <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
                         (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, 
                         HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, 
-                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING)
-VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FORMAT_STRING);     
+                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT)
+VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FORMAT_STRING,@TEXT_ALIGNMENT);      
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1011,7 +1011,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@@ -1020,7 +1021,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                    <CommandText>SELECT        GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, 
                         SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, 
                         REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, 
-                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING
+                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT
 FROM            TBPM_PROFILE_CONTROLS
 WHERE        (GUID = @guid)
 ORDER BY Y_LOC, X_LOC</CommandText>
@@ -1037,8 +1038,8 @@ SET                PROFIL_ID = @PROFIL_ID, NAME = @NAME, CTRL_TYPE = @CTRL_TYPE,
                         FONT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_SIZE, FONT_FAMILY = @FONT_FAMILY, FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, 
                         DEFAULT_VALUE = @DEFAULT_VALUE, MULTISELECT = @MULTISELECT, VKT_ADD_ITEM = @VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES = @VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH = @REGEX_MATCH, 
                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 = @SQL2, SQL_ENABLE = @SQL_ENABLE, 
-                         SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING
-WHERE        (GUID = @Original_GUID);    
+                         SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = @TEXT_ALIGNMENT
+WHERE        (GUID = @Original_GUID);     
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1073,7 +1074,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@@ -1124,6 +1126,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
              <Mapping SourceColumn="TABLE_ORDER_COLUMN" DataSetColumn="TABLE_ORDER_COLUMN" />
              <Mapping SourceColumn="SAVE_CHANGE_ON_ENABLED" DataSetColumn="SAVE_CHANGE_ON_ENABLED" />
              <Mapping SourceColumn="FORMAT_STRING" DataSetColumn="FORMAT_STRING" />
+              <Mapping SourceColumn="TEXT_ALIGNMENT" DataSetColumn="TEXT_ALIGNMENT" />
            </Mappings>
            <Sources>
              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdControlExists" Modifier="Public" Name="cmdControlExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cmdControlExists">
@@ -1211,7 +1214,7 @@ WHERE        (GUID = @Guid)</CommandText>
                  </DbCommand>
                </SelectCommand>
              </DbSource>
-              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
                <InsertCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
@@ -1230,6 +1233,25 @@ VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
+                         (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT)
+VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width,@TEXT_ALIGNMENT)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Width" ColumnName="WIDTH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@Width" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
              </DbSource>
              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdUpdateIndexname" Modifier="Public" Name="cmdUpdateIndexname" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="cmdUpdateIndexname">
                <UpdateCommand>
@@ -1251,7 +1273,7 @@ WHERE        (GUID = @Original_GUID);</CommandText>
                    <CommandText>SELECT        dbo.FNPM_LANGUAGE_CONTROL_TEXT(NAME, @USER_LANGUAGE, CTRL_TYPE, CTRL_TEXT) AS CTRL_CAPTION_LANG, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, 
                         CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, 
                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, IMAGE_CONTROL, SQL2, SQL_ENABLE, 
-                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING
+                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT
 FROM            TBPM_PROFILE_CONTROLS AS T
 WHERE        (PROFIL_ID = @profil_id)
 ORDER BY Y_LOC, X_LOC</CommandText>
@@ -1279,8 +1301,8 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                <InsertCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBPM_CONTROL_TABLE
-                         (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN)
-VALUES        (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN);    
+                         (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN, INHERIT_VALUE)
+VALUES        (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN,@INHERIT_VALUE);      
 SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1289,13 +1311,15 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_COLUMN" ColumnName="TYPE_COLUMN" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="TYPE_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="INHERIT_VALUE" ColumnName="INHERIT_VALUE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INHERIT_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INHERIT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, 
-                         CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION
+                         CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, 
+                         FORMULA_EXPRESSION, FORMULA_SQL
 FROM            TBPM_CONTROL_TABLE
 WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
                    <Parameters>
@@ -1304,38 +1328,43 @@ WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>UPDATE       TBPM_CONTROL_TABLE
 SET                CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, CHOICE_LIST = @CHOICE_LIST, 
                         CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, 
                         CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, 
-                         SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED
-WHERE        (GUID = @Original_GUID);  
+                         SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT_VALUE, 
+                         LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION = @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA_SQL
+WHERE        (GUID = @Original_GUID);      
 SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" Scale="0" Size="1024" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="INHERIT_VALUE" ColumnName="INHERIT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INHERIT_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INHERIT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LU_CAPTION" ColumnName="LU_CAPTION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@LU_CAPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="LU_CAPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORMULA_EXPRESSION" ColumnName="FORMULA_EXPRESSION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="nvarchar(1000)" DbType="String" Direction="Input" ParameterName="@FORMULA_EXPRESSION" Precision="0" ProviderType="NVarChar" Scale="0" Size="1000" SourceColumn="FORMULA_EXPRESSION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORMULA_SQL" ColumnName="FORMULA_SQL" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="nvarchar(3000)" DbType="String" Direction="Input" ParameterName="@FORMULA_SQL" Precision="0" ProviderType="NVarChar" Scale="0" Size="3000" SourceColumn="FORMULA_SQL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </UpdateCommand>
@@ -1366,6 +1395,9 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
              <Mapping SourceColumn="SUMMARY_FUNCTION" DataSetColumn="SUMMARY_FUNCTION" />
              <Mapping SourceColumn="TYPE_COLUMN" DataSetColumn="TYPE_COLUMN" />
              <Mapping SourceColumn="LU_CAPTION" DataSetColumn="LU_CAPTION" />
+              <Mapping SourceColumn="INHERIT_VALUE" DataSetColumn="INHERIT_VALUE" />
+              <Mapping SourceColumn="FORMULA_EXPRESSION" DataSetColumn="FORMULA_EXPRESSION" />
+              <Mapping SourceColumn="FORMULA_SQL" DataSetColumn="FORMULA_SQL" />
            </Mappings>
            <Sources>
              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="cmdUpdate" Modifier="Public" Name="cmdUpdate" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cmdUpdate">
@@ -1374,26 +1406,30 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                    <CommandText>UPDATE       TBPM_CONTROL_TABLE
 SET                SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, 
                         CHANGED_WHO = @CHANGED_WHO, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALUE = @DEFAULT_VALUE, 
-                         SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION
+                         SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION, 
+                         INHERIT_VALUE = @INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA_SQL
 WHERE        (GUID = @Original_GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SUMMARY_FUNCTION" ColumnName="SUMMARY_FUNCTION" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@SUMMARY_FUNCTION" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SUMMARY_FUNCTION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_COLUMN" ColumnName="TYPE_COLUMN" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="TYPE_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LU_CAPTION" ColumnName="LU_CAPTION" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@LU_CAPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="LU_CAPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SUMMARY_FUNCTION" ColumnName="SUMMARY_FUNCTION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@SUMMARY_FUNCTION" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SUMMARY_FUNCTION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_COLUMN" ColumnName="TYPE_COLUMN" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="TYPE_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LU_CAPTION" ColumnName="LU_CAPTION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@LU_CAPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="LU_CAPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="INHERIT_VALUE" ColumnName="INHERIT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INHERIT_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INHERIT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORMULA_EXPRESSION" ColumnName="FORMULA_EXPRESSION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="nvarchar(1000)" DbType="String" Direction="Input" ParameterName="@FORMULA_EXPRESSION" Precision="0" ProviderType="NVarChar" Scale="0" Size="1000" SourceColumn="FORMULA_EXPRESSION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORMULA_SQL" ColumnName="FORMULA_SQL" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="nvarchar(3000)" DbType="String" Direction="Input" ParameterName="@FORMULA_SQL" Precision="0" ProviderType="NVarChar" Scale="0" Size="3000" SourceColumn="FORMULA_SQL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </SelectCommand>
@@ -1413,7 +1449,8 @@ WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>SELECT        ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, 
-                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION
+                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, 
+                         FORMULA_EXPRESSION
 FROM            TBPM_CONTROL_TABLE</CommandText>
                    <Parameters />
                  </DbCommand>
@@ -1423,7 +1460,8 @@ FROM            TBPM_CONTROL_TABLE</CommandText>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>SELECT        ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, 
-                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION
+                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, 
+                         FORMULA_EXPRESSION, FORMULA_SQL
 FROM            TBPM_CONTROL_TABLE
 WHERE        (GUID = @GUID)</CommandText>
                    <Parameters>
@@ -2665,8 +2703,15 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                </xs:simpleType>
              </xs:element>
              <xs:element name="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnPropNameInTable="SAVE_CHANGE_ON_ENABLEDColumn" msprop:Generator_ColumnPropNameInRow="SAVE_CHANGE_ON_ENABLED" msprop:Generator_UserColumnName="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnVarNameInTable="columnSAVE_CHANGE_ON_ENABLED" type="xs:boolean" />
-              <xs:element name="FORMAT_STRING" msprop:Generator_ColumnPropNameInTable="FORMAT_STRINGColumn" msprop:Generator_ColumnPropNameInRow="FORMAT_STRING" msprop:Generator_UserColumnName="FORMAT_STRING" msprop:Generator_ColumnVarNameInTable="columnFORMAT_STRING" type="xs:string" />
+              <xs:element name="FORMAT_STRING" msprop:Generator_ColumnPropNameInTable="FORMAT_STRINGColumn" msprop:Generator_ColumnPropNameInRow="FORMAT_STRING" msprop:Generator_UserColumnName="FORMAT_STRING" msprop:Generator_ColumnVarNameInTable="columnFORMAT_STRING" type="xs:string" default="" minOccurs="0" />
              <xs:element name="BACKCOLOR_IF" msprop:Generator_ColumnPropNameInTable="BACKCOLOR_IFColumn" msprop:Generator_ColumnPropNameInRow="BACKCOLOR_IF" msprop:Generator_UserColumnName="BACKCOLOR_IF" msprop:Generator_ColumnVarNameInTable="columnBACKCOLOR_IF" type="xs:string" minOccurs="0" />
+              <xs:element name="TEXT_ALIGNMENT" msprop:Generator_ColumnPropNameInTable="TEXT_ALIGNMENTColumn" msprop:Generator_ColumnPropNameInRow="TEXT_ALIGNMENT" msprop:Generator_UserColumnName="TEXT_ALIGNMENT" msprop:Generator_ColumnVarNameInTable="columnTEXT_ALIGNMENT" default="Near">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
@@ -2769,6 +2814,21 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
+              <xs:element name="INHERIT_VALUE" msprop:Generator_ColumnPropNameInTable="INHERIT_VALUEColumn" msprop:Generator_ColumnPropNameInRow="INHERIT_VALUE" msprop:Generator_UserColumnName="INHERIT_VALUE" msprop:Generator_ColumnVarNameInTable="columnINHERIT_VALUE" type="xs:boolean" default="false" />
+              <xs:element name="FORMULA_EXPRESSION" msprop:Generator_ColumnPropNameInTable="FORMULA_EXPRESSIONColumn" msprop:Generator_ColumnPropNameInRow="FORMULA_EXPRESSION" msprop:Generator_UserColumnName="FORMULA_EXPRESSION" msprop:Generator_ColumnVarNameInTable="columnFORMULA_EXPRESSION" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="FORMULA_SQL" msprop:Generator_ColumnPropNameInRow="FORMULA_SQL" msprop:Generator_ColumnPropNameInTable="FORMULA_SQLColumn" msprop:Generator_ColumnVarNameInTable="columnFORMULA_SQL" msprop:Generator_UserColumnName="FORMULA_SQL" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="3000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
--- a/app/TaskFlow/DD_DMSLiteDataSet.xss
+++ b/app/TaskFlow/DD_DMSLiteDataSet.xss
@@ -4,7 +4,7 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-27" ViewPortY="-97" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="472" ViewPortY="90" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="14" X="1688" Y="-74" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="2" X="-17" Y="232" Height="262" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
@@ -15,8 +15,8 @@
    <Shape ID="DesignTable:TBPROFILE_USER" ZOrder="15" X="509" Y="-80" Height="267" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:TBPM_PROFILE_FILES" ZOrder="3" X="1391" Y="-70" Height="229" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
    <Shape ID="DesignTable:TBWH_CHECK_PROFILE_CONTROLS" ZOrder="23" X="0" Y="-72" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
-    <Shape ID="DesignTable:TBPM_PROFILE_CONTROLS" ZOrder="12" X="947" Y="400" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="1" X="1299" Y="326" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPM_PROFILE_CONTROLS" ZOrder="12" X="947" Y="404" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="1" X="1297" Y="391" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="17" X="19" Y="320" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
    <Shape ID="DesignTable:TBPROFILE_GROUP" ZOrder="13" X="1054" Y="47" Height="286" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
    <Shape ID="DesignTable:FNPM_GET_FREE_USER_FOR_PROFILE" ZOrder="16" X="807" Y="155" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
@@ -33,11 +33,11 @@
      <RoutePoints>
        <Point>
          <X>1247</X>
-          <Y>542</Y>
+          <Y>611</Y>
        </Point>
        <Point>
-          <X>1299</X>
-          <Y>542</Y>
+          <X>1297</X>
+          <Y>611</Y>
        </Point>
      </RoutePoints>
    </Connector>
@@ -49,11 +49,11 @@
        </Point>
        <Point>
          <X>141</X>
-          <Y>343</Y>
+          <Y>408</Y>
        </Point>
        <Point>
-          <X>1299</X>
-          <Y>343</Y>
+          <X>1297</X>
+          <Y>408</Y>
        </Point>
      </RoutePoints>
    </Connector>
@@ -65,7 +65,7 @@
        </Point>
        <Point>
          <X>965</X>
-          <Y>400</Y>
+          <Y>404</Y>
        </Point>
      </RoutePoints>
    </Connector>
--- a/app/TaskFlow/DataColumnExpression.txt
+++ b/app/TaskFlow/DataColumnExpression.txt
@@ -0,0 +1,73 @@
+ADO.NET DataColumn.Expression – Kompakte Übersicht
+
+Spalten werden über den Spaltennamen referenziert, z. B. [MENGE].
+
+GRUNDOPERATOREN
+- Arithmetik: +  -  *  /
+  Beispiel: [A] * [B]
+- Vergleich: =  <>  >  >=  <  <=
+  Beispiel: [MENGE] > 0
+- Logik: AND  OR  NOT
+  Beispiel: [A] > 0 AND [B] < 10
+- Klammern: (...)
+  Beispiel: ([A] + [B]) * 2
+
+STRING-VERKETTUNG
+- Verkettung: +
+  Beispiel: [VORNAME] + ' - ' + [NACHNAME]
+- Typkonvertierung: Convert
+  Beispiel: Convert([NUMMER], 'System.String')
+
+BEDINGUNGEN
+- IIF(Bedingung, True, False)
+  Beispiel: IIF([A] = 'Harry', 'Blume', 'Tier')
+
+HÄUFIGE FUNKTIONEN
+- Len([TEXT])
+- Trim([TEXT])
+- Substring([TEXT], 0, 3)
+- IsNull([WERT], 0)
+- Convert([WERT], 'System.Double')
+
+BEISPIELE (FORMULA_EXPRESSION)
+- Multiplikation: [MENGE] * [PREIS]
+- Addieren: [A] + [B]
+- Division: [A] / [B]
+- Text zusammensetzen: [SAKNR] + ' - ' + [KST]
+- Bedingung: IIF([STATUS] = 'X', 'OK', 'NOK')ADO.NET DataColumn.Expression – Kompakte Übersicht
+
+Spalten werden über den Spaltennamen referenziert, z. B. [MENGE].
+
+GRUNDOPERATOREN
+- Arithmetik: +  -  *  /
+  Beispiel: [A] * [B]
+- Vergleich: =  <>  >  >=  <  <=
+  Beispiel: [MENGE] > 0
+- Logik: AND  OR  NOT
+  Beispiel: [A] > 0 AND [B] < 10
+- Klammern: (...)
+  Beispiel: ([A] + [B]) * 2
+
+STRING-VERKETTUNG
+- Verkettung: +
+  Beispiel: [VORNAME] + ' - ' + [NACHNAME]
+- Typkonvertierung: Convert
+  Beispiel: Convert([NUMMER], 'System.String')
+
+BEDINGUNGEN
+- IIF(Bedingung, True, False)
+  Beispiel: IIF([A] = 'Harry', 'Blume', 'Tier')
+
+HÄUFIGE FUNKTIONEN
+- Len([TEXT])
+- Trim([TEXT])
+- Substring([TEXT], 0, 3)
+- IsNull([WERT], 0)
+- Convert([WERT], 'System.Double')
+
+BEISPIELE (FORMULA_EXPRESSION)
+- Multiplikation: [MENGE] * [PREIS]
+- Addieren: [A] + [B]
+- Division: [A] / [B]
+- Text zusammensetzen: [SAKNR] + ' - ' + [KST]
+- Bedingung: IIF([STATUS] = 'X', 'OK', 'NOK')
--- a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll
+++ b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll
--- a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll
+++ b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll
--- a/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll
+++ b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll
--- a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll
+++ b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll
--- a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll
+++ b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll
--- a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll
+++ b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll
--- a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll
+++ b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll
--- a/app/TaskFlow/GdPicture.NET.14.filters.dll
+++ b/app/TaskFlow/GdPicture.NET.14.filters.dll
--- a/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll
+++ b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll
--- a/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll
+++ b/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll
--- a/app/TaskFlow/GdPicture.NET.14.machine.vision.dll
+++ b/app/TaskFlow/GdPicture.NET.14.machine.vision.dll
--- a/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll
+++ b/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll
--- a/app/TaskFlow/GdPicture.NET.14.twain.client.dll
+++ b/app/TaskFlow/GdPicture.NET.14.twain.client.dll
--- a/app/TaskFlow/ModuleControlProperties.vb
+++ b/app/TaskFlow/ModuleControlProperties.vb
@@ -2,6 +2,7 @@
 Imports System.ComponentModel.Design
 Imports System.Drawing.Design
 Imports System.Globalization
+Imports DevExpress.XtraPrinting.Native
 Imports DigitalData.Modules.Language.Utils

 Public Module ModuleControlProperties
@@ -69,6 +70,35 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_DISPLAY)>
        Public Property TextColor As Color

+        <DisplayName("Text Alignement")>
+        <Category(ClassConstants.CAT_DISPLAY)>
+        <TypeConverter(GetType(TextAlignmentConverter))>
+        Public Property TextAlignment As String
+        ' Converter für Dropdown-Werte Near/Center/Far
+        Public Class TextAlignmentConverter
+            Inherits TypeConverter
+
+            Public Overrides Function GetStandardValuesSupported(context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            ' Optional: True, damit nur die vorgegebenen Werte erlaubt sind
+            Public Overrides Function GetStandardValuesExclusive(context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection
+                Dim values = New List(Of String) From {"Near", "Center", "Far"}
+                Return New StandardValuesCollection(values)
+            End Function
+
+            Public Overrides Function ConvertTo(context As ITypeDescriptorContext, culture As CultureInfo, value As Object, destinationType As Type) As Object
+                If destinationType Is GetType(String) Then
+                    Return If(value Is Nothing, "", value.ToString())
+                End If
+                Return MyBase.ConvertTo(context, culture, value, destinationType)
+            End Function
+        End Class
        Class FontConverter
            Inherits TypeConverter

@@ -124,7 +154,7 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_DATA)>
        Public Property SQLCommand() As SQLValue
            Get
-                Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_sql_command, "")) ', _sql_connection
            End Get
            Set(ByVal value As SQLValue)
                _sql_command = value.Value
@@ -150,7 +180,7 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_BEHAVIOUR)>
        Public Property Enable_SQL() As SQLValue
            Get
-                Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL, "")) ', _sql_connection
            End Get
            Set(ByVal value As SQLValue)
                _Enable_SQL = value.Value
@@ -163,7 +193,7 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_BEHAVIOUR)>
        Public Property Enable_SQL_OnLoad() As SQLValue
            Get
-                Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL_ONLOAD, "")) ', _sql_connection
            End Get
            Set(ByVal value As SQLValue)
                _Enable_SQL_ONLOAD = value.Value
@@ -335,7 +365,7 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_DISPLAY)>
        Public Property CtrlImage() As ImageValue
            Get
-                Return New ImageValue(NotNull(_image_Value, ""))
+                Return New ImageValue(ClassAllgemeineFunktionen.NotNullString(_image_Value, ""))
            End Get
            Set(ByVal value As ImageValue)
                _image_Value = value.Value
@@ -346,7 +376,7 @@ Public Module ModuleControlProperties
        <Category(ClassConstants.CAT_VALIDATION)>
        Public Property Override_SQL() As SQLValue
            Get
-                Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Override_SQL, "")) ', _sql_connection
            End Get
            Set(ByVal value As SQLValue)
                _Override_SQL = value.Value
--- a/app/TaskFlow/ModuleMySettings.vb
+++ b/app/TaskFlow/ModuleMySettings.vb
@@ -14,7 +14,7 @@
    Public Property NO_DETAIL_PROFILES As Boolean = False
    ' Debug Settings
    Public Property DEBUG As Boolean = False
-
+    Public Property LOG_HOTSPOTS As Boolean = False
    Public Property INDEX_DMS_ERSTELLT = "DMS erstellt"
    Public Property INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)"

--- a/app/TaskFlow/ModuleRuntimeVariables.vb
+++ b/app/TaskFlow/ModuleRuntimeVariables.vb
@@ -1,10 +1,11 @@
-Imports WINDREAMLib
-Imports DigitalData.Modules.Config
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.ZooFlow
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Windream
+Imports DigitalData.Modules.ZooFlow
+Imports taskFLOW.ClassConfig
+Imports WINDREAMLib

 Module ModuleRuntimeVariables

@@ -32,10 +33,15 @@ Module ModuleRuntimeVariables
    Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
    Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable

+    Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
+
+    Public Property BASEDATA_TBPM_PROFILE_CONTROLS As DataTable
+
    Public Property CURRENT_ProfilGUID As Integer
    Public Property CURRENT_ProfilName As String
    Public Property CURRENT_PROFILE_LOG_INDEX As String
    Public Property PROFILE_SHOW_DOCUMENT As Boolean = True
+    Public Property PROFILE_NOT_RESP_COMMENT As Boolean = True

    Public Property CURRENT_DOC_GUID As Int64
    Public Property CURRENT_DOC_ID As Int64
@@ -57,6 +63,7 @@ Module ModuleRuntimeVariables

    Public Property USER_IS_ADMIN As Boolean = False
    Public Property USER_ID = 0
+    Public Property USER_MODULE_ID = 0
    Public Property USER_PRENAME = ""
    Public Property USER_SURNAME = ""
    Public Property USER_SHORTNAME = ""
@@ -75,6 +82,11 @@ Module ModuleRuntimeVariables
    Public Property USER_USERNAME_ORG As String = ""
    Public Property USER_GHOST_MODE_ACTIVE As Boolean = False
    Public Property USER_GHOST_MODE_USRNAME As String = ""
+    Public Class UserInheritanceConfirmation
+        Public Property ColumnName As String = ""
+        Public Property Count As Integer
+    End Class
+    Public Property UserInheritance_ConfirmationByColumn As New List(Of UserInheritanceConfirmation)

    Public Property FORCE_LAYOUT_OVERVIEW As Boolean = False
    Public Property SHOW_CHARTS As Boolean = True
@@ -89,6 +101,7 @@ Module ModuleRuntimeVariables
    Public Property POPUP_REMINDER_ACTIVE As Boolean = True
    Public Property INACTIVITY_DURATION As Integer = 0
    Public Property INACTIVITYRecognized As Boolean = False
+    Public Property InheritanceMsgAmount As Integer = 5
    Public Property LAST_EDITED_COLUMN As String = "NONE"
    Public Property LAST_ADDED_COLUMN As String = "NONE"
    Public Property MON_EDITED_COLUMN As String = "NONE"
@@ -137,7 +150,6 @@ Module ModuleRuntimeVariables
    Public Property CURRENT_DT_PROFILES As DataTable
    Public Property CURRENT_DT_PROFILE_LANGUAGE As DataTable
    Public Property CURRENT_DT_PROFILE As DataTable
-
    Public Property CURRENT_CONTROL_NAME_LIST As New List(Of String)


@@ -145,7 +157,7 @@ Module ModuleRuntimeVariables
    Public Property DTVWCONTROL_INDEX As DataTable

    Public Property DTCONTROLS_WITH_SQL As DataTable
-
+    Public Property DTTBPM_PROFILE_FINAL_INDEXING As DataTable
    Public Property CURRENT_CONTROL_ID As Integer

    Public Property errormessage As String
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("taskFLOW")>
-<Assembly: AssemblyCopyright("Copyright © Digital Data 2025")>
+<Assembly: AssemblyCopyright("Digital Data 2026")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("2.8.7.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -156,7 +156,7 @@ Namespace My
        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("563")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("346")>  _
        Public Property frmValSearchSplitterDistance() As Integer
            Get
                Return CType(Me("frmValSearchSplitterDistance"),Integer)
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -27,7 +27,7 @@
      <Value Profile="(Default)">0, 0</Value>
    </Setting>
    <Setting Name="frmValSearchSplitterDistance" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">563</Value>
+      <Value Profile="(Default)">346</Value>
    </Setting>
    <Setting Name="frmMainWindowState" Type="System.String" Scope="User">
      <Value Profile="(Default)">Normal</Value>
--- a/app/TaskFlow/README.txt
+++ b/app/TaskFlow/README.txt
@@ -1,5 +0,0 @@
-BASE MODULE
-===========
-
-This module is intended for often used constants and datastructures.
-Therefor it is important that this module does not have any dependencies on other modules!!
--- a/app/TaskFlow/TaskFlow.vbproj
+++ b/app/TaskFlow/TaskFlow.vbproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -77,14 +77,16 @@
  <PropertyGroup>
    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
+  <ItemGroup>
+    <GdPictureAssemblies Include="$(SolutionDir)lib\GdPicture14*.dll" />
+  </ItemGroup>
+  <Target Name="CopyGdPictureDlls" AfterTargets="Build">
+    <Copy SourceFiles="@(GdPictureAssemblies)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+  </Target>
  <ItemGroup>
    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
    </Reference>
-    <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
-    </Reference>
    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
@@ -149,8 +151,9 @@
      <SpecificVersion>False</SpecificVersion>
    </Reference>
    <Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Controls.LookupGrid">
      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -158,48 +161,46 @@
    <Reference Include="DigitalData.Controls.SnapPanel">
      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath>
+    <Reference Include="DigitalData.GUIs.Common, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.EDMI.API">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Interfaces, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.License">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\11_2025\DigitalData.Modules.License.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Messaging">
      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -233,68 +234,95 @@
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Markdown, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Markdown.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Google.Protobuf, Version=3.33.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll</HintPath>
    </Reference>
    <Reference Include="Interop.WINDREAMLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -328,6 +356,15 @@
    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
    </Reference>
+    <Reference Include="NativeSDK.Exceptions, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Exceptions.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
+    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
@@ -386,8 +423,8 @@
    </Reference>
    <Reference Include="System.IdentityModel" />
    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
    </Reference>
    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
@@ -419,6 +456,9 @@
    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
    </Reference>
+    <Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
+    </Reference>
    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
@@ -547,12 +587,6 @@
    <Compile Include="frmColumn_Detail.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="frmDashboard1.Designer.vb">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmDashboard1.vb">
-      <SubType>Form</SubType>
-    </Compile>
    <Compile Include="frmDesignerLayout.Designer.vb">
      <DependentUpon>frmDesignerLayout.vb</DependentUpon>
    </Compile>
@@ -590,6 +624,12 @@
    <Compile Include="frmError.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmExpression_Designer.Designer.vb">
+      <DependentUpon>frmExpression_Designer.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmExpression_Designer.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmFileInfo.Designer.vb">
      <DependentUpon>frmFileInfo.vb</DependentUpon>
    </Compile>
@@ -810,10 +850,6 @@
      <DependentUpon>frmColumn_Detail.vb</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmDashboard1.resx">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
    <EmbeddedResource Include="frmDesignerLayout.resx">
      <DependentUpon>frmDesignerLayout.vb</DependentUpon>
      <SubType>Designer</SubType>
@@ -838,6 +874,9 @@
      <DependentUpon>frmError.vb</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmExpression_Designer.resx">
+      <DependentUpon>frmExpression_Designer.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmFileInfo.resx">
      <DependentUpon>frmFileInfo.vb</DependentUpon>
      <SubType>Designer</SubType>
@@ -1241,25 +1280,11 @@
    <None Include="Resources\PM_mit_slogan.JPG" />
  </ItemGroup>
  <ItemGroup>
+    <Content Include="taskFLOW-TEST-Debug.txt" />
    <None Include="Changelog.md" />
+    <Content Include="DataColumnExpression.txt" />
    <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
    <Content Include="DD_taskFLOW_ICON.ico" />
-    <Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
-    <Content Include="GdPicture.NET.14.barcode.1d.reader.dll" />
-    <Content Include="GdPicture.NET.14.barcode.2d.reader.64.dll" />
-    <Content Include="GdPicture.NET.14.barcode.2d.reader.dll" />
-    <Content Include="GdPicture.NET.14.filters.64.dll" />
-    <Content Include="GdPicture.NET.14.filters.dll" />
-    <Content Include="GdPicture.NET.14.image.gdimgplug.64.dll" />
-    <Content Include="GdPicture.NET.14.image.gdimgplug.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.ML.64.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.ML.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
-    <Content Include="GdPicture.NET.14.machine.vision.64.dll" />
-    <Content Include="GdPicture.NET.14.machine.vision.dll" />
-    <Content Include="GdPicture.NET.14.twain.client.64.dll" />
-    <Content Include="GdPicture.NET.14.twain.client.dll" />
    <Content Include="MailLicense.xml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@@ -1287,7 +1312,6 @@
    <None Include="Resources\DD_taskFLOW_BOOT.png" />
    <None Include="Resources\DD_taskFLOW_ICON.png" />
    <None Include="Resources\AttachFileHS.png" />
-    <Content Include="README.txt" />
    <Content Include="task.ico" />
    <None Include="Resources\searchFlow_icon.png" />
    <None Include="Resources\taskFlow_icon.png" />
@@ -1360,16 +1384,16 @@
    </BootstrapperPackage>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb
+++ b/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb
@@ -64,6 +64,15 @@ Namespace My.Resources
            End Set
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Bestätigung ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property Bestaetigung() As String
+            Get
+                Return ResourceManager.GetString("Bestaetigung", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Bitte validieren Sie die rot markierten Felder! ähnelt.
        '''</summary>
@@ -109,6 +118,24 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vererbung Werte Grid aktiv ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property Inheritance_Messages_Active() As String
+            Get
+                Return ResourceManager.GetString("Inheritance_Messages_Active", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vererbung Werte Grid inaktiv ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property Inheritance_Messages_Inactive() As String
+            Get
+                Return ResourceManager.GetString("Inheritance_Messages_Inactive", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Speichern - Nächster Vorgang (F2) ähnelt.
        '''</summary>
--- a/app/TaskFlow/Translations/frmValidator_Strings.en.resx
+++ b/app/TaskFlow/Translations/frmValidator_Strings.en.resx
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="Bestaetigung" xml:space="preserve">
-    <value>Confirmation</value>
-  </data>
  <data name="Bitte validieren Sie die rot markierten Felder!" xml:space="preserve">
    <value>Please validate red marked fields!</value>
  </data>
@@ -144,4 +141,13 @@
  <data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
    <value>Would You like to end this conversation?</value>
  </data>
+  <data name="Bestaetigung" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="Inheritance_Messages_Active" xml:space="preserve">
+    <value>Confirmation of inheritance Values Grid active</value>
+  </data>
+  <data name="Inheritance_Messages_Inactive" xml:space="preserve">
+    <value>Confirmation of inheritance Values Grid inactive</value>
+  </data>
 </root>
--- a/app/TaskFlow/Translations/frmValidator_Strings.fr.resx
+++ b/app/TaskFlow/Translations/frmValidator_Strings.fr.resx
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="Bestaetigung" xml:space="preserve">
-    <value>Confirmation</value>
-  </data>
  <data name="Bitte validieren Sie die rot markierten Felder!" xml:space="preserve">
    <value>Veuillez valider les champs marqués en rouge!</value>
  </data>
@@ -144,4 +141,13 @@
  <data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
    <value>Vous voulez mettre fin à la conversation?</value>
  </data>
+  <data name="Bestaetigung" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="Inheritance_Messages_Active" xml:space="preserve">
+    <value>Confirmation Héritage Valeurs Grille active</value>
+  </data>
+  <data name="Inheritance_Messages_Inactive" xml:space="preserve">
+    <value>Confirmation Héritage Valeurs Grille inactive</value>
+  </data>
 </root>
--- a/app/TaskFlow/Translations/frmValidator_Strings.resx
+++ b/app/TaskFlow/Translations/frmValidator_Strings.resx
@@ -141,4 +141,13 @@
  <data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
    <value>Wollen Sie die Konversation beenden?</value>
  </data>
+  <data name="Bestaetigung" xml:space="preserve">
+    <value>Bestätigung</value>
+  </data>
+  <data name="Inheritance_Messages_Active" xml:space="preserve">
+    <value>Vererbung Werte Grid aktiv</value>
+  </data>
+  <data name="Inheritance_Messages_Inactive" xml:space="preserve">
+    <value>Vererbung Werte Grid inaktiv</value>
+  </data>
 </root>
--- a/app/TaskFlow/Validator/Validator.vb
+++ b/app/TaskFlow/Validator/Validator.vb
@@ -163,7 +163,7 @@ Public Class Validator
    '        Logger.Error(ex)
    '        Dim st As New StackTrace(True)
    '        st = New StackTrace(ex, True)
-    '        Logger.Warn("Unexpected error in Check_UpdateIndexe  TextBox :" & ex.Message, True)
+    '        LOGGER.Warn("⚠️ Unexpected error in Check_UpdateIndexe  TextBox :" & ex.Message, True)
    '        Return False
    '    End Try
    'End Function
--- a/app/TaskFlow/clsPatterns.vb
+++ b/app/TaskFlow/clsPatterns.vb
@@ -1,11 +1,11 @@
 Imports System.Text.RegularExpressions
-Imports WINDREAMLib
-Imports DigitalData.Controls.LookupGrid
-Imports DevExpress.XtraGrid
-Imports DevExpress.XtraGrid.Views.Grid
-Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper
 Imports DevExpress.XtraEditors
-Imports DigitalData.Modules.Language
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.Grid
+Imports DigitalData.Controls.LookupGrid
+Imports WINDREAMLib
 ''' <summary>
 ''' Defines common Functions for Checking for and replacing placeholders.
 ''' This Class also includes a child class `Pattern` for passing around Patterns.
@@ -51,7 +51,7 @@ Public Class clsPatterns
    Public Const INT_VALUE_WMDocID = "WMDocID"
    Public Const INT_VALUE_IDBID = "IDBObjID"

-    Public Const MAX_TRY_COUNT = 20
+    Public Const MAX_TRY_COUNT = 5

    ''' <summary>
    ''' This value will be valid as any datatype,
@@ -64,6 +64,88 @@ Public Class clsPatterns
    Private Shared ReadOnly complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
    Private Shared ReadOnly simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}

+    Private Shared _ControlLookupCache As Dictionary(Of String, Control)
+    ''' <summary>
+    ''' Clears the control lookup cache. Call when controls are dynamically added/removed.
+    ''' </summary>
+    Public Shared Sub ClearControlCache()
+        _ControlLookupCache = Nothing
+        LOGGER.Debug("Control cache cleared")
+    End Sub
+    ''' <summary>
+    ''' Aktualisiert den Wert eines Controls im Cache
+    ''' </summary>
+    Public Shared Sub UpdateControlInCache(controlName As String, newValue As Object)
+        ' FIX: SyncLock auf Nothing ist illegal → GetType(clsPatterns) als stabilen Lock-Anker nutzen
+        SyncLock GetType(clsPatterns)
+            If _ControlLookupCache Is Nothing OrElse Not _ControlLookupCache.ContainsKey(controlName) Then
+                LOGGER.Warn($"Control [{controlName}] not found in cache for update")
+                Return
+            End If
+
+            ' Hole das Control aus dem Cache
+            Dim ctrl As Control = _ControlLookupCache(controlName)
+
+            ' Aktualisiere den WERT des Controls basierend auf seinem Typ
+            Try
+                Select Case ctrl.GetType
+                    Case GetType(TextEdit), GetType(MemoEdit)
+                        DirectCast(ctrl, BaseEdit).EditValue = newValue
+
+                    Case GetType(LookupControl3)
+                        Dim lookup = DirectCast(ctrl, LookupControl3)
+                        If TypeOf newValue Is List(Of String) Then
+                            lookup.Properties.SelectedValues = DirectCast(newValue, List(Of String))
+                        ElseIf TypeOf newValue Is String Then
+                            lookup.Properties.SelectedValues = New List(Of String) From {newValue.ToString()}
+                        End If
+
+                   ' ========== FIX START: Beide ComboBox-Typen unterstützen ==========
+                    Case GetType(System.Windows.Forms.ComboBox)
+                        DirectCast(ctrl, System.Windows.Forms.ComboBox).Text = newValue?.ToString()
+
+                    Case GetType(DevExpress.XtraEditors.ComboBoxEdit)
+                        DirectCast(ctrl, DevExpress.XtraEditors.ComboBoxEdit).Text = newValue?.ToString()
+                ' ========== FIX END ==========
+
+                    Case GetType(CheckBox)
+                        If TypeOf newValue Is Boolean Then
+                            DirectCast(ctrl, CheckBox).Checked = CBool(newValue)
+                        End If
+
+                    Case GetType(DateTimePicker)
+                        If TypeOf newValue Is Date Then
+                            DirectCast(ctrl, DateTimePicker).Value = CDate(newValue)
+                        End If
+
+                    Case Else
+                        LOGGER.Warn($"Unsupported control type for cache update: {ctrl.GetType.Name}")
+                End Select
+
+                LOGGER.Debug($"Cache updated for control [{controlName}] with value type [{newValue?.GetType().Name}]")
+
+            Catch ex As Exception
+                LOGGER.Error(ex)
+                LOGGER.Warn($"Failed to update control [{controlName}]: {ex.Message}")
+            End Try
+        End SyncLock
+    End Sub
+
+    ''' <summary>
+    ''' Batch-Update für mehrere Controls
+    ''' </summary>
+    Public Shared Sub UpdateMultipleControlsInCache(updates As Dictionary(Of String, Object))
+        If updates Is Nothing OrElse updates.Count = 0 Then Return
+
+        ' FIX: Gleicher Lock-Anker wie UpdateControlInCache → kein Deadlock
+        ' Die eigentliche Aktualisierung läuft sequenziell über UpdateControlInCache,
+        ' da SyncLock in VB.NET re-entrant auf demselben Thread ist.
+        For Each kvp In updates
+            UpdateControlInCache(kvp.Key, kvp.Value)
+        Next
+
+        LOGGER.Debug($"Batch cache update completed for {updates.Count} controls")
+    End Sub
    ''' <summary>
    ''' Wraps a pattern-type and -value in the common format: {#type#value}
    ''' </summary>
@@ -72,34 +154,39 @@ Public Class clsPatterns
    End Function

    Public Shared Function ReplaceAllValues(input As String, panel As DevExpress.XtraEditors.XtraScrollableControl, is_SQL As Boolean) As String
+        Dim oResult = input
        Try
-            Dim result = input

-            If Not HasAnyPatterns(result) Then
-                Return result
+            If Not HasAnyPatterns(oResult) Then
+                Return oResult
            End If

-            LOGGER.Debug($"input BEFORE replacing: [{result}]")
-            result = ReplaceInternalValues(result)
+            LOGGER.Debug($"input BEFORE replacing: [{oResult}]")
+            oResult = ReplaceInternalValues(oResult)

            If Not IsNothing(CURRENT_WMFILE) Then
-                result = ReplaceWindreamIndicies(result, CURRENT_WMFILE, is_SQL)
+                oResult = ReplaceWindreamIndicies(oResult, CURRENT_WMFILE, is_SQL)
            End If
            If IDB_ACTIVE = True Then
-                result = ReplaceIDBAttributes(result, is_SQL)
+                oResult = ReplaceIDBAttributes(oResult, is_SQL)
            End If
            'vorher hinter result = ReplaceInternalValues(result) 
-            result = ReplaceControlValues(result, panel, is_SQL)
+            oResult = ReplaceControlValues(oResult, panel, is_SQL)

-            If Not IsNothing(result) Then
-                result = ReplaceUserValues(result)
-                LOGGER.Debug($"input AFTER replacing: [{result}]")
+            If Not IsNothing(oResult) Then
+                oResult = ReplaceUserValues(oResult)
+                LOGGER.Debug($"input AFTER replacing: [{oResult}]")
            End If

-            Return result
+            Return oResult
        Catch ex As Exception
            LOGGER.Error(ex)
-            LOGGER.Info("Error in ReplaceAllValues:" & ex.Message)
+            LOGGER.Error($"❌ CRITICAL ERROR in ReplaceAllValues!")
+            LOGGER.Error($"   Input: [{input}]")
+            LOGGER.Error($"   Last successful result: [{oResult}]")
+            LOGGER.Error($"   Exception Type: [{ex.GetType().Name}]")
+            LOGGER.Error($"   Message: [{ex.Message}]")
+            LOGGER.Error($"   StackTrace: [{ex.StackTrace}]")
            Return input
        End Try
    End Function
@@ -186,21 +273,47 @@ Public Class clsPatterns
        Catch ex As Exception
            LOGGER.Error(ex)
            LOGGER.Info("Error in ReplaceUserValues:" & ex.Message)
+            Return input ' FIX: Originalwert zurückgeben statt implizit Nothing
        End Try
    End Function

+    Private Shared Sub RecursiveAddToCache(rootCtrl As Control, cache As Dictionary(Of String, Control))
+        Dim stack As New Stack(Of Control)()
+        stack.Push(rootCtrl)
+
+        While stack.Count > 0
+            Dim ctrl As Control = stack.Pop()
+            If Not String.IsNullOrEmpty(ctrl.Name) Then
+                cache(ctrl.Name) = ctrl
+            End If
+            For Each child As Control In ctrl.Controls
+                stack.Push(child)
+            Next
+        End While
+    End Sub
    Public Shared Function ReplaceControlValues(pInput As String, oPanel As DevExpress.XtraEditors.XtraScrollableControl, oIsSQL As Boolean) As String
        Dim oResult = pInput
+        ' Cache beim ersten Aufruf erstellen mit Lock
+        SyncLock GetType(clsPatterns) ' Class-Level Lock
+            If _ControlLookupCache Is Nothing Then
+                _ControlLookupCache = New Dictionary(Of String, Control)()
+                For Each ctrl As Control In oPanel.Controls
+                    RecursiveAddToCache(ctrl, _ControlLookupCache)
+                Next
+                LOGGER.Debug($"Control cache initialized with {_ControlLookupCache.Count} controls")
+            End If
+        End SyncLock

        Try
-
+            LOGGER.Debug($"Starting ReplaceControlValues with input: [{oResult}] for document ID: {CURRENT_DOC_ID}")
            Dim oTryCounter = 0

            While ContainsPattern(oResult, PATTERN_CTRL)
                If oTryCounter > MAX_TRY_COUNT Then
-                    LOGGER.Warn($"Max tries in ReplaceControlValues exceeded - Replacing with [0]")
+                    LOGGER.Info($"Max tries in ReplaceControlValues exceeded - Replacing PATTERN_CTRL [{PATTERN_CTRL}] with [0]")
+                    LOGGER.Info($"oResult so far is:{oResult}")
                    oResult = ReplacePattern(oResult, PATTERN_CTRL, 0)
-                    Throw New Exception($"Max tries in ReplaceControlValues exceeded - Result so far [{oResult}].")
+                    Exit While
                End If

                Dim oControlName As String = GetNextPattern(oResult, PATTERN_CTRL).Value
@@ -213,38 +326,75 @@ Public Class clsPatterns
                End If

                LOGGER.Debug("Found placeholder for control [{0}].", oControlName)
+                ' Beim Cache-Zugriff Lock verwenden
+                Dim oControl As Control = Nothing
+                SyncLock _ControlLookupCache
+                    If Not _ControlLookupCache.TryGetValue(oControlName, oControl) Then
+                        LOGGER.Warn($"Control [{oControlName}] not found in cache!")
+                        ' Fallback außerhalb des Lock
+                    End If
+                End SyncLock
+
+                ' Fallback außerhalb des Lock
+                If oControl Is Nothing Then
+                    oControl = oPanel.Controls.Find(oControlName, True).FirstOrDefault()
+                    If oControl IsNot Nothing Then
+                        LOGGER.Info($"Control [{oControlName}] found via fallback. Adding to cache.")
+                        SyncLock _ControlLookupCache
+                            _ControlLookupCache(oControlName) = oControl
+                        End SyncLock
+                    End If
+                End If

-                Dim oControl As Control = oPanel.Controls.Find(oControlName, False).FirstOrDefault()

                If oControl IsNot Nothing Then
                    Dim oReplaceValue As String
+                    LOGGER.Debug("oControl.GetType [{0}].", oControl.GetType.ToString)
                    Select Case oControl.GetType
                        Case GetType(TextBox)
                            oReplaceValue = oControl.Text
-
+                            LOGGER.Debug("TextBox- oReplaceValue will be [{0}].", oReplaceValue)
                        Case GetType(TextEdit)
                            Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, TextEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty)
                            Catch ex As Exception
                                LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                oReplaceValue = ""
                            End Try
+                            LOGGER.Debug("TextEdit- oReplaceValue will be [{0}].", oReplaceValue)
                        Case GetType(MemoEdit)
                            Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
                            Catch ex As Exception
                                LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                oReplaceValue = ""
                            End Try
+                            LOGGER.Debug("MemoEdit- oReplaceValue will be [{0}].", oReplaceValue)
                        Case GetType(LookupControl3)
                            Dim oLookupControl3 As LookupControl3 = oControl

-                            If oLookupControl3.Properties.SelectedValues.Count > 1 Then
-                                LOGGER.Debug($"LookupControl3 mit mehr als 1 Value")
-                                Dim oIndex As Integer = 0
-                                For Each oString As String In oLookupControl3.Properties.SelectedValues
-                                    If oIndex = 0 Then

+                            ' ========== FIX START: NULL-Check ==========
+                            Dim selectedValues As List(Of String) = Nothing
+                            Try
+                                selectedValues = oLookupControl3.Properties.SelectedValues
+                            Catch ex As Exception
+                                LOGGER.Warn($"⚠️ LookupControl [{oControlName}] SelectedValues not accessible: {ex.Message}")
+                                selectedValues = Nothing
+                            End Try
+
+                            If selectedValues Is Nothing Then
+                                LOGGER.Warn($"⚠️ LookupControl [{oControlName}] SelectedValues is Nothing! Using ERROR_REPLACE_VALUE")
+                                oReplaceValue = ERROR_REPLACE_VALUE
+                            ElseIf selectedValues.Count = 0 Then
+                                LOGGER.Warn($"⚠️ LookupControl [{oControlName}] SelectedValues is empty! Using ERROR_REPLACE_VALUE")
+                                oReplaceValue = ERROR_REPLACE_VALUE
+                                ' ========== FIX END ==========
+                            ElseIf selectedValues.Count > 1 Then
+                                LOGGER.Debug($"LookupControl3 [{oControlName}] mit mehr als 1 Value")
+                                Dim oIndex As Integer = 0
+                                For Each oString As String In selectedValues
+                                    If oIndex = 0 Then
                                        oReplaceValue = oString
                                    Else
                                        oReplaceValue += "', '" + oString
@@ -252,14 +402,12 @@ Public Class clsPatterns
                                    oIndex += 1
                                Next
                                oIsSQL = False
-                            ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then
-                                LOGGER.Debug($"LookupControl3 mit genau einem Value")
-                                oReplaceValue = oLookupControl3.Properties.SelectedValues(0)
-
-                            Else
-                                LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
-                                oReplaceValue = ERROR_REPLACE_VALUE
+                            Else ' Count = 1
+                                LOGGER.Debug($"LookupControl3 [{oControlName}] mit genau einem Value")
+                                oReplaceValue = selectedValues(0)
                            End If
+
+                            LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")
                            LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")

                        Case GetType(Windows.Forms.ComboBox)
@@ -267,14 +415,14 @@ Public Class clsPatterns

                        Case GetType(CheckBox)
                            Dim oCheckBox As CheckBox = oControl
-                            oReplaceValue = oCheckBox.Checked
+                            oReplaceValue = If(oCheckBox.Checked, "1", "0")  ' Explizite String-Konvertierung

                        Case GetType(GridControl)
                            Dim oGrid As GridControl = oControl
                            Dim oView As GridView = oGrid.FocusedView

                            If oColumnName = String.Empty Then
-                                LOGGER.Warn("Used placeholder for Table [{0}] but without Column Name!", oControlName)
+                                LOGGER.Warn("⚠️ Used placeholder for Table [{0}] but without Column Name!", oControlName)
                                oReplaceValue = ERROR_REPLACE_VALUE
                            End If

@@ -283,7 +431,7 @@ Public Class clsPatterns
                                SingleOrDefault()

                            If oColumn?.SummaryItem?.SummaryValue Is Nothing Then
-                                LOGGER.Warn("Column [{0}] not found in Grid!", oColumnName)
+                                LOGGER.Warn("⚠️ Column [{0}] not found in Grid!", oColumnName)
                                oReplaceValue = ERROR_REPLACE_VALUE
                            Else
                                oReplaceValue = oColumn.SummaryItem.SummaryValue
@@ -292,12 +440,22 @@ Public Class clsPatterns
                        Case Else
                            oReplaceValue = ERROR_REPLACE_VALUE
                    End Select
+                    LOGGER.Debug($"[SQL-ESCAPE CHECK] Control: [{oControlName}], oReplaceValue Type: [{If(oReplaceValue?.GetType()?.Name, "NULL")}], Value: [{oReplaceValue}], IsSQL: [{oIsSQL}]")
+                    If oReplaceValue Is Nothing Then
+                        LOGGER.Warn($"⚠️ oReplaceValue is Nothing for control [{oControlName}]! Setting to ERROR_REPLACE_VALUE")
+                        oReplaceValue = ERROR_REPLACE_VALUE
+                    End If
+
+                    If Not TypeOf oReplaceValue Is String Then
+                        LOGGER.Warn($"⚠️ oReplaceValue is not a String for control [{oControlName}]! Type: [{oReplaceValue.GetType().Name}]. Converting to String.")
+                        oReplaceValue = oReplaceValue.ToString()
+                    End If
                    If oIsSQL = True Then
-                        'LOGGER.Debug($"IS_SQL = True - oReplaceValue = {oReplaceValue}")
-                        'LOGGER.Debug($"oReplaceValue = {oReplaceValue}")
-                        oReplaceValue = oReplaceValue.Replace("'", "''")
+                        oReplaceValue = SafeSqlEscape(oReplaceValue)
                    End If
                    oResult = ReplacePattern(oResult, PATTERN_CTRL, oReplaceValue)
+                Else
+                    LOGGER.Warn("⚠️ Could not get a Control for [{0}].", oControlName)
                End If

                oTryCounter += 1
@@ -305,23 +463,56 @@ Public Class clsPatterns
            Return oResult
        Catch ex As Exception
            LOGGER.Error(ex)
-            LOGGER.Warn("Error in ReplaceControlValues:" & ex.Message)
+            LOGGER.Warn("⚠️ Error in ReplaceControlValues:" & ex.Message)
            Return oResult
        End Try
    End Function
+    Private Shared Function SafeSqlEscape(value As Object) As String
+        LOGGER.Debug($"[SafeSqlEscape] Input Type: [{If(value?.GetType()?.Name, "NULL")}], Value: [{value}]")

+        If value Is Nothing Then
+            LOGGER.Warn("[SafeSqlEscape] Value is Nothing → returning ERROR_REPLACE_VALUE")
+            Return ERROR_REPLACE_VALUE
+        End If
+
+        Dim strValue As String
+        Try
+            strValue = value.ToString()
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            LOGGER.Warn($"[SafeSqlEscape] ToString() failed: {ex.Message} → returning ERROR_REPLACE_VALUE")
+            Return ERROR_REPLACE_VALUE
+        End Try
+
+        If String.IsNullOrEmpty(strValue) Then
+            LOGGER.Warn("[SafeSqlEscape] String is empty → returning ERROR_REPLACE_VALUE")
+            Return ERROR_REPLACE_VALUE
+        End If
+
+        Dim escaped = strValue.Replace("'", "''")
+        LOGGER.Debug($"[SafeSqlEscape] Output: [{escaped}]")
+        Return escaped
+    End Function
    Public Shared Function ReplaceWindreamIndicies(pInput As String, pDocument As WMObject, pIsSQL As Boolean) As String
        Try
            Dim oResult = pInput
            Dim oTryCounter As Integer = 0
-
+            LOGGER.Debug($"Starting ReplaceWindreamIndicies with input: [{oResult}] for document ID: {CURRENT_DOC_ID}")
            While ContainsPattern(oResult, PATTERN_WMI)
-
+                Dim oWMValue As String
                Dim oIndexName As String = GetNextPattern(oResult, PATTERN_WMI).Value
-                Dim oWMValue As String = pDocument.GetVariableValue(oIndexName)

-                If IsNothing(oWMValue) And oTryCounter = MAX_TRY_COUNT Then
-                    Throw New Exception("Max tries in ReplaceWindreamIndicies exceeded.")
+                If oIndexName = "@@DISPLAY_ONLY" Then
+                    oWMValue = String.Empty
+                Else
+                    oWMValue = pDocument.GetVariableValue(oIndexName)
+                End If
+
+                ' FIX 1: >= statt = → Counter springt in 10er-Schritten, trifft niemals genau 5
+                If IsNothing(oWMValue) AndAlso oTryCounter >= MAX_TRY_COUNT Then
+                    LOGGER.Warn($"[ReplaceWindreamIndicies] Max tries for [{oIndexName}] exceeded → replacing with empty string")
+                    oResult = ReplacePattern(oResult, PATTERN_WMI, String.Empty)
+                    Continue While
                End If

                If oWMValue IsNot Nothing Then
@@ -331,6 +522,11 @@ Public Class clsPatterns
                        LOGGER.Debug($"oReplaceValue = {oWMValue}")
                    End If
                    oResult = ReplacePattern(oResult, PATTERN_WMI, oWMValue)
+                Else
+                    ' FIX 2: Else-Branch — Nothing-Wert ersetzt den Placeholder mit leerem String
+                    ' verhindert Endless Loop wenn Windream-Index keinen Wert hat
+                    LOGGER.Warn($"[ReplaceWindreamIndicies] WMI value for [{oIndexName}] is Nothing → replacing with empty string (counter: {oTryCounter})")
+                    oResult = ReplacePattern(oResult, PATTERN_WMI, String.Empty)
                End If

                ' Increase counter by 10 to avoid DDOSing the Windream Service
@@ -347,6 +543,7 @@ Public Class clsPatterns
        Try
            Dim result = input
            Dim oTryCounter As Integer = 0
+            LOGGER.Debug($"Starting ReplaceIDBAttributes with input: [{result}] for document ID: {CURRENT_DOC_ID}")
            While ContainsPattern(result, PATTERN_IDBA)

                Dim indexName As String = GetNextPattern(result, PATTERN_IDBA).Value
@@ -398,6 +595,7 @@ Public Class clsPatterns
        Catch ex As Exception
            LOGGER.Error(ex)
            LOGGER.Info("Error in ReplaceIDBAttributes:" & ex.Message)
+            Return input ' FIX: Originalwert zurückgeben statt implizit Nothing
        End Try
    End Function

--- a/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb
+++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb
@@ -40,6 +40,7 @@ Partial Class frmAdmin_notResponsibleConfig
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.cmbAttrComment = New System.Windows.Forms.ComboBox()
+        Me.checkCommentMuss = New System.Windows.Forms.CheckBox()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -193,11 +194,22 @@ Partial Class frmAdmin_notResponsibleConfig
        Me.cmbAttrComment.Size = New System.Drawing.Size(295, 24)
        Me.cmbAttrComment.TabIndex = 106
        '
+        'checkCommentMuss
+        '
+        Me.checkCommentMuss.AutoSize = True
+        Me.checkCommentMuss.Location = New System.Drawing.Point(548, 259)
+        Me.checkCommentMuss.Name = "checkCommentMuss"
+        Me.checkCommentMuss.Size = New System.Drawing.Size(208, 17)
+        Me.checkCommentMuss.TabIndex = 110
+        Me.checkCommentMuss.Text = "Begründung muss eingetragen werden"
+        Me.checkCommentMuss.UseVisualStyleBackColor = True
+        '
        'frmAdmin_notResponsibleConfig
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(778, 340)
+        Me.Controls.Add(Me.checkCommentMuss)
        Me.Controls.Add(Me.Label9)
        Me.Controls.Add(Me.cmbAttrComment)
        Me.Controls.Add(Me.txtPROFILE_NOT_RESPONSIBLE_QUEST)
@@ -236,4 +248,5 @@ Partial Class frmAdmin_notResponsibleConfig
    Friend WithEvents Label2 As Label
    Friend WithEvents Label9 As Label
    Friend WithEvents cmbAttrComment As ComboBox
+    Friend WithEvents checkCommentMuss As CheckBox
 End Class
--- a/app/TaskFlow/frmAdmin_notResponsibleConfig.resx
+++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.resx
@@ -165,52 +165,53 @@
  <data name="SimpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0
-        bGUATmV4dDtBcnJvdztEb3duKXvBAwAACnFJREFUWEeVVgdUlUcWHnfTdlNxk3WTmD0REXDFBoIUYekP
-        sGIBUaOoFHvDREMRERQQEOmIYDdqYqICFoogKErUJJIISi8qqKEpSs9+uXceDzWb3T0753xn5p+5937f
-        vVPeE/7JViJgr7UIPGAjgg/bitAjtiLsS4WI+FohIk8qRFSqQsSk24m403Yi/py9oDbgvyHmjI3YmW4l
-        Ik9ZivBvLETIV+Zi21EzseWwqfDfbyJ8U0zE57uMxGfxhmRObVOypbj3dK+of7pPNLTvF/c7Dkg86DhI
-        OCQedh5iMxXBHwh/JLxEePk34DkGr7PdgHtPD4q7Tw+IO0/2i9q2faLm8R5R/ShFVLbuFuvjx5MJNd/d
-        FmS0Rwqob1eKaJAiDvKyiliSBh+20I1KtdkSl2FbkJBl+31itqI3KUfRG59h/UPcOevLO05YBPnvMRlH
-        tq+wPUEKudNGAh7vE9UqAS3JYn2cAS1R800yJ4XJ4u6TFKoECWmnahCoqTJ+OeSIuVNUunXZnlxHnC/x
-        ws374ShrjMaDjsMSZY0xNBeGrOK1SD4/FRGnzMsCDhjPJd9XCVJIbR95VWuyqGhJEl6xfQK8E81EXVsi
-        idhFIpJIxG6elllvjDUcGnbcovBgnjN+qg9FfftuVD7ajpImfxQ3+eDGw3X44eFa/NToTfBFeUso7jzZ
-        jSKy3X9hFrYeM7nq5q+jTbG4IrIalS27REVzolgXq0+f1DYmmNDexNEexZOQBJ5i8pe8k4xttn9l0Zx7
-        61PUtEWh6OeNuHZ/Ba4/YKyU+O4hj5fj2oNl+LZhKa7UL8Hlex643rAO5a07kXXTC1uPTmheFTHWgWJy
-        NaSIsuZ4sTZaj4bUPoszElWPo0hENH9K8g0x423Dj1t1Xa/djJuNPrhCQQvrCQ2eROSJq/eVvQqFDR5E
-        7o6Ce4tx8c5C5NctQG7NfHzfsAGFVZux7YhZ97KQUf0iSptixeooXeYTYm2Uvqh8FMFDWXbPwNHagYdM
-        G6/V+uDb+hW4dMdVouDuQiJYhMv1C58Dfd/jebIh5N+Zjwt185BTOxfnq1yQWemMvBoSV7kJfnsNm5zX
-        aI4kDrkdqyLHMqcQ7sE6oqw1hIdcnle8kwwun73B5fRETo0LLtTOQR4FzKubi4t35xE+wfwtw2C0YCCM
-        FzLehomrGlyDNJFb54Lz5JNd7YyMylk4Vz4Tp8sckVO9CKe+W451MWMLieMNAh9MTliIT/yHcydLvzp8
-        zNzwr2xwtWE1MqtmIItwvnqWRE6NE2XmRCTOMFn0DqrrHqDmzkPZV9Y8gOlCNSKeRVnPJPLpOFvuiPSy
-        KUi7PQUnSibhUu1KBH9hDVf/4QuJ6zUCJyzEvE1a3PHHq16xemXZJUtxrmI6zpRPwdmKKRRsGgmZhsxq
-        R+qnE8l0mLqrobunBz29vbLv6OqRc+cqHclnKk6Tb1rpZKTenkjk9jh+U4FviifiTNFyrIgYVUFcbxH6
-        qyCzd/LSsAvYZ0bldkXqLTukldlRBg5UwokUcBKJIlROljD3UEMnEXf19KKruxedJOCfNMd26WSfWuqA
-        U7fs8XWxgshtcexHaxy5YYWM8gXw22OGacvUpxCn6lZIAa+4fK4ZGZvmRIa25GhFyq1x8rYNThHSymwJ
-        CiKwI0EOsFxKAoi0s1uZfXtnj5xLvW2Hk7co2xIiLrbFlzetcfRHS3xRZIlD35nj4HUbxKc7YfYGzVji
-        fJ3AL6xU8docH62ClFwnxF40RkKBEQkxJyEWcN40GBaearBapgbr5X1YMRBPO7rxtJNA/RMCz1sxSIgF
-        wZx8Zvp8iMMUZ/81MyRcoriXJmBv3mwQFx9G3oZ+AX928dFq3FswHdEXDLAzTx8xeeORdNkY+wsmY+ba
-        MSivqkVpVQNuVdTjdmUD2tq7JB4/VaKkogEl5co1tp2xTg8p+ZNkjLh8I8TkjycYYt+VGZjnp91EnGoE
-        PgdSxeuzvbW6k6/YIyJXF5G54/pFJBaYIuALU2yKd0fvL/9C65MutLR1orWti8bUE/i75XEnmh51SZuA
-        hCXYfMiUyM0Qd9FQkkdd0MeOXH3sKZyIub7a3cQ5kMC/olLAG84btbrjL5oj/LwuduToSRFRVI3oPAMk
-        F1phQZA2MgqO08H7BT+3dqCZCJsfd6DxERN34OeWDnkgs66cwPxALSKylhlHkT/H4XgRObq0DRZwoWSJ
-        8y8vCJj5qWbjjiwTEjAWEdl9IhgXxilFXLbDNC913L1fjSftPXjY0k7owIPmDtm3tXej/mEd2WggpcBe
-        +nDW7M9xmJwRmT0BThs0eQv6BfAZeN1x1bDL274xRniWLsIyxyAse4zSgZx35OrJLCLSLeEWaC3vPmfe
-        0NSOhsZ2OeY5zyAFwtMs5dbtpIxVWTM43g5KLPiECRxXaVwlzv4zwAL+5LBEPXpjyngy1EVo5miEZo+W
-        TrIifdsSm2+MtYm62H1iGxH+gnoirycRPE45GYI1CWNpzycoRTPIj/3Ds8dSUqNprIfP9xjCwX1IInG+
-        cAtetXD5aMrCLaPIeBxCzo1ESMZIhGaM6q+GDERILLDAHH91XL+VT1ewR+L70gI4+w3BLlpT2THYjxMJ
-        zRwlY0VQ7EWBo2A6a7AzcfI7wNzKl5Dw9uRlQyv9jo6WAoLP6cieHTnAdspge19VYs7TQfIdjUdPWiXm
-        +ekiOtOC1p6Rsn1IBpGTvyqO37ExmLJCo5q4/krgl3CAcFgylHrlW0BVcJ/nPwLbM8Zi65kR2HZ2hBQS
-        rBLSJyYsWw+BXxrBN2EuNu36BAHHjKhyenJ9u8qOk6AqBp/VkXHCKOb8zSNg5jR4OXGpyj9A2HuqUy+r
-        wCfyHQdP9Wtrdo0gASOliK3k/EyIsiosaGfOeHju1IZnpBbtuaEkk1sn15WkzzASa5NGgGLfII5n2XNT
-        uKuLs7eW8FAexjHWgwwnrxzW7H1kBIJIQNDpf8heVuQ5QYz4PDPE55thmyR8Rsq2Kp+gMzrwPqqDqSuG
-        tuiYvWtGHPx/QJk9N4Wbukgv9hBpxW78yWfhDcOpH86Ytlqje/1+LWxJH04gEaeHK8UQAk+zsBeJGHK+
-        by6Q7NiPYziu0ejWn/S+C8V+h8CVHqDwkJX/NwGqrXjLYPIHsyYuHdq6PF6zT4QSgSTkRbAgAq/T9/O2
-        KxI0MWmpxiN9+/fnUEx+evnv2IA04lO4ybOnEuD2vACViDeHG71rYLv44x+cvDWw/qAWNlPQgHRtBKRR
-        T+BvJuJ+83NzbOvsMwy2i4YUaRoMNKZYnLkkZzAX88rGA55gsBBqKhG8HXxX3zOc9uFyxeIhtY5eQ7E4
-        TAPr9mpiwyEt+KdpY3OqNjYc1sK6fVpwozVHeooVi9XrDKcOXkm+fyO8SZBlZ6h4fiPAo68KvBUePK0S
-        wYeFTyxfm0FjrAZNNp399zgr1yFF1q4fl9IBBsPGdUiplevHRaazP4ofbTloKtm+T+Cs+b8fJ9JP/rsC
-        /hOoPS+ES8gV4cDvETi7D/rAY75e/L7zKWfR/cS/F5vx/zSVEL6qHJhLyoKYiMFjnuM1tlHZ/48mxK89
-        +oEotzUUCQAAAABJRU5ErkJggg==
+        bGUATmV4dDtBcnJvdztEb3duKXvBAwAACqBJREFUWEeNlwdYVFcWx4+buptsEtxk3SRmv4gIKCoCihRh
+        GdogKoIFRI2iUuwNEw2ogKCAgEhHpIglamIHpA0gKEjUJJgI6sDQixCa9GL2n+/eeUMmbp3v+3/3vfvu
+        Ped3zj33znvkk2hBfimW5H/aigLPWVPweWsK+VpMYZfFFH5NTBE3xBSVbkMxGTYUmzWfiGjcf1PUTSs6
+        nm5B4dfNKfSKiIK+MaMjF0zp0DkT8kk1pv1JxvTlCUP6ItaA2SI6mGhOTf0p1Nx/iloGUunZ4Gmu1sEz
+        1Dp4ltqGzio7/QMRvUJErxLRay+J9TGx52zcuKb+M9TYf5oa+lKprvcU1fYkU83zJJJ1n6Q9sXPlAPtP
+        iqixP5kDNA/IIVo4xBllx9xp4DmRbsQNq0Mx2dbFcbnW38dLxC8S8sUvYrMtf4jJsiw5dlUU4JNsPJuI
+        XhdgOEhDbyrV9ZyiGgVAVyLtidEXABLMqKEvkRr7kqiJgQykcClF/FrQeTPHiHRLaXKBA/IqPPHoWSik
+        7ZFoHTzHJW2PwqNnIcgt34XEvMUIu24m9TtttIqI3lCA1AnOq7sTqaorgTyjBQCveFOq742nhr4T1NiX
+        QE39JxXOX9kXbTA55JKo9EyhE35qDkbzwEnInh9FRYcPyju8Uda2Gz+07cJP7V74qX0/KruC0dB3Eg+b
+        g5F6azkOXzS+5+ozXVPICM+GrOsEVXXG0+7oOXKAfXHGVNsTQ3W9sVTfG6dw/qpXgpHV0W9EnQWPP0dt
+        bwQe/rwP959txYNWpm1c37Wx6y2437oZ37Zswt3mjShpcseDlt2o7D6O3EeeOHxhXuf2MB1bIRscQtoZ
+        S7si9eQAX8QYUnVPBNX2RI453xs11zr0ksXwgzpfPGr3xt0md5Q2u6O0xQPftnjg3jN5q1BpizvuNruh
+        uGkDbjesQ1H9WhTUrsH3LXtRWu2LI+dNRzYHzRyDeNoRTTsidOUAuyLmkOx52FjaPfy1Nf3PmrTfr/PG
+        t81bcafBhau4cR2Km9ajpHmdktajpIn1u+BOkwuKGtbgVv1q5NetQl61M3JkTiisdcdd2UEcSDHocNqp
+        PkOxHNvDdeQAboHTSdodxC5Zel73StAvySxj6fRAfq0zbtWtRGHdKhTWr8LtxtW43fgZ1hyaAsO142G0
+        juldGLuowCVAHQX1zsirdYakxgnZsuXIqlyGDKkD8mvW4/p3W7A7SqeUiN4WCpMFTPSZz9Sx1O8InbUq
+        9Bsr3GvZgZzqpcitXoq8muVc+bWOyK9zREG9E4zXv4ea+lbUNrTxVlbbCpN1KpDULEeObBmyZUuQWemA
+        dKkd0p7Y4WrFQtyp24bAryzh4jN1HRG9KQRMtPqghiL6Nzyj9aSSik3IqlqCm5V2yKyyQ7bMHrnV9sip
+        cUBu9RJIapbAxE0FI6OjGH3xgreDw6O8L0vmgMyqxciotEPa00W48WQBrlbMx6VHYlwpX4CbD7dga9jM
+        KiJ6RzkLPHpHTzUbv1OmKKxzwY3HNkiT2iBdaosM6QJkVC5EVtVCZMkWcZm5q2BodBTDoy8wPPICQ8Oj
+        +Ie7Ch+XLl2AG09tcf3xfFwuF+PSI2tc/NES58sskF25FgeSTWG/WdVOaVdwgNedv1QPj05zxPkya1wu
+        t8DVCktce2KF60+skCa1RppUjIxKG2RIbWG+SYU7HRqRRz8wNMr7bjyxwbXHYlypEONSuTW+fmSJCz+a
+        46uH5jj7nRnOPLBCbLojVuxVjyait4QTllO8udJbozipwBHRt40QV2yI82VmuFwugtPBiRB5qMBiswos
+        twjaOh79gyPoHxrhbd/gCO+3YNqkAtEmFZh5qGCZ98c4V2aG1PumiLtjhLg785BSuAIrvTVYMbJlGAP4
+        k7O3RntK8RJE3tLH8cI5iCqci4QSI6QWL8KyXbNQWV2Hp9UteFzVjCeyFvQODHP19MtVUdWCikr5MzZ2
+        6W49JBUt5DZiigwRVTQXUUUGOHV3KVYf0OwgIhWhDjjFWyu8NEYS785HWIEuwgtmj0HEF5vA7ysTHIx1
+        w4tf/onuvmF09Q6hu3cY3X1DXOy+q2cIHc+H+Ri/uI3wPWuChBJTxNw24M4jbs3BsYI5SC5dgFX7NUeI
+        aLzwL8oB3nbapzESe9sMoXm6OJavxyEibukjslAfiaUWWBugieziSxge/QU/dw+is2cInT2DaH/OHA/i
+        565BXpC5d69ijb8GkkstecQRhfrcDrMXlq+LuDsiOHtpMIC//A5g2efq7cdyjRGap4MwiQDBdGu2HKLE
+        Bvaeqmh8VoO+gVG0dQ2grWsQrZ2DvO0dGEFzWz3sPdWQVDyfz2FRs/nMDnPOFC6ZB8e96mwJxgBYDbzl
+        sH1KyZErRgjN1UVIziyESGbJJ+Tr4ViBHo8iLN0crv6WfO+zyFs6BtDSPsCvWZ9HgBihaeZ86Y4XzB6L
+        monZOybRReBVYzhsV7unXAMM4I+2G1Uj9yXNRYhEF8E52giWaPNJPCPCskQXGWFXvC5OXj2CkdFf0Nw+
+        gOaOAX6ddC0IO+N0EHN7nhyaKU+Xzw+V6CAkRxuheXr4MtkAtm6T4l/eBW+InD+xW3doJkIlsxGUNQNB
+        2TMQnD1zLBvcUJ4O4otFWOmjigePi9A/OMr1/dNiOB2YhBPForFxTGweCyQ4Zya3FSaZjfX+M2GyfKKT
+        cA6MHUQsFe8u2jxZduCCNgcIzJrOWzaRGTiao42jQlai8kRw3q+N533dXKsP6CIyR4QQFqnglI0Pytbm
+        8xV2DlycBbutajVE9FfhJBxHthsnj50FIudP3Fb7aOFotg4O39TCkUwtDhKoABFgQiR68P/aEPvjVuHg
+        ic/gd9EQoRI9/vyoYhwLInsGAjOnczsh2TpY46sFU8eJW5TSP47me6gqssAq8j1bD9X7O09o4fDNGRzi
+        cKYyiDwrDOh4/lx4HNeER7gGwvMNuDO+dEL22JzfNAO7ErRg66Fa9rvo2U/spkqZjzeOFeMsywkGi7ZN
+        6fQ6r4WAm1oIyJjGW54RJSCm2EJTxBaZ4gh3+JtTNlYxJ+DmdHhdmI7FWyd3TTd931R4H5BHzwFcVSm9
+        3J3Syl3ZLauFtw0Wf7zUfofayJ5UDRxKn4pD6dMQkDFVDpMxDf4ZDOz3jph4v9DnnzGNz2M2HHaqjcxZ
+        +KEzy7CQ6XFid575fwFQLMU7+os+Wr5g0+TuLbHqAoRc/hkviwFNgz97nvHbOKatcepYuEnt+Zz5H64U
+        jl72OjYurdydxK689hQArsoACog/TzV8X996w6c/OHqpYc8ZDfimT4Vfuib80qZysXvmiLW+Sn1srJP3
+        FFivn/RQXX+8kRA5dy4HcOV+xwBYBxMDUYJgy8H26gcG9h9vEW+YVOfgORkbQtSwO0Ude89qwCdNE743
+        NLH3nAZ2n9KAa4gaHDzVIN6gWm+weOI2IvobC0SRdoVz5uclAHchC2wp3JUhWLGwimXbZsIsiwmLTFb8
+        PcbCZdJDS5dPn4rdVMFk5TLpqYXLpw9NVnwSq20+YTERfShEzd79FK9e3Pm/BfhPegmEpZBlhBn+QIju
+        I0Hsmm0vdr6zKld8kvH5L9tVsv9//xQgbKsqvowZEHPExK4VX8j860fQ//z9Cj36gSjD0TzyAAAAAElF
+        TkSuQmCC
 </value>
  </data>
  <data name="frmAdmin_notResponsibleConfig.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb
+++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb
@@ -21,12 +21,18 @@ Public Class frmAdmin_notResponsibleConfig
    End Sub

    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}"
+        Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_COMMENT = '{checkCommentMuss.Checked}', NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}"
        If DatabaseECM.ExecuteNonQuery(oUpd) = True Then
            oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_QUEST','{txtPROFILE_NOT_RESPONSIBLE_QUEST.Text}','','{USER_USERNAME}','{oProfilID}',0"
+            LOGGER.Debug($"oUpd: {oUpd}")
            If DatabaseECM.ExecuteNonQuery(oUpd) Then
-                oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_REJECTION_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_REJECTION_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
-                bstitmInfo.Caption = "Data saved successfully - " + Now.ToString
+
+                oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
+                If DatabaseECM.ExecuteNonQuery(oUpd) Then
+                    bstitmInfo.Caption = "Data saved successfully - " + Now.ToString
+                    LOGGER.Debug($"oUpd: {oUpd}")
+                End If
+


            End If
@@ -38,10 +44,11 @@ Public Class frmAdmin_notResponsibleConfig
    Private Sub frmAdmin_notResponsibleConfig_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
            Dim oNR_Act_Attr As String
-            Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE FROM TBPM_PROFILE WHERE GUID = {oProfilID}"
+            Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE,NOT_RESP_COMMENT FROM TBPM_PROFILE WHERE GUID = {oProfilID}"
            Dim oDT = DatabaseECM.GetDatatable(oSQL)
            oNotResponsible_SQL = oDT.Rows(0).Item("NOT_RESP_SQL")
            oNR_Act_Attr = oDT.Rows(0).Item("NOT_RESP_COMMENT_ATTRIBUTE")
+            checkCommentMuss.Checked = oDT.Rows(0).Item("NOT_RESP_COMMENT")
            LOGGER.Debug($"oNR_Act_Attr: {oNR_Act_Attr}")


--- a/app/TaskFlow/frmAdministration.vb
+++ b/app/TaskFlow/frmAdministration.vb
@@ -674,17 +674,17 @@ Public Class frmAdministration
            pgFinalIndexes.SelectedObject = Nothing

            Dim guid As Integer = focusedRow.Item("GUID")
-            Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
-            Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "")
-            ' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
-            Dim value As String = NotNull(focusedRow.Item("VALUE"), "")
-            Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True)
-            Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "")
-            Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False)
-            Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False)
-            Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
-            Dim oSequence As Int16 = NotNull(focusedRow.Item("SEQUENCE"), 0)
-            Dim oIndetermined As Boolean = NotNull(focusedRow.Item("CONTINUE_INDETERMINED"), False)
+            Dim index As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("INDEXNAME"), Nothing)
+            Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SQL_COMMAND"), "")
+            ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONNECTION_ID"), 0)
+            Dim value As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("VALUE"), "")
+            Dim active As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ACTIVE"), True)
+            Dim description As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("DESCRIPTION"), "")
+            Dim preventDuplicates As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("PREVENT_DUPLICATES"), False)
+            Dim allowNewValues As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ALLOW_NEW_VALUES"), False)
+            Dim VectorBehaviour As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
+            Dim oSequence As Int16 = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SEQUENCE"), 0)
+            Dim oIndetermined As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONTINUE_INDETERMINED"), False)
            CURRENT_INDEX_ID = guid

            Dim obj As New FinalIndexProperties With {
@@ -1074,25 +1074,25 @@ Public Class frmAdministration
                Else
                    value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex)
                End If
-                value = NotNull(value, String.Empty)
+                value = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)

                Dim guid = obj.GUID
                Dim oProfileId As Integer = PROFILGUIDTextBox.Text
                focusedRowHandle = 199
                focusedRowHandle = viewFinalIndex.FocusedRowHandle
                'Dim connectionId As Integer = obj.ConnectionId
-                ' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
-                Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
+                ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.ConnectionId, 1)
+                Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.Value, String.Empty).Replace("'", "''")

-                Dim indexName As String = NotNull(obj.IndexName, String.Empty)
+                Dim indexName As String = ClassAllgemeineFunktionen.NotNullString(obj.IndexName, String.Empty)
                Dim isVectorIndex As Boolean = obj.VectorIndex
                Dim addedWho As String = USER_USERNAME
                Dim description As String = obj.Description
                Dim active As Integer = IIf(obj.Active, 1, 0)
                Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0)
                Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0)
-                Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty)
-                Dim oDescription As String = NotNull(obj.Description, String.Empty)
+                Dim IF_VEKTOR_BEHAVIOUR As String = ClassAllgemeineFunktionen.NotNullString(obj.VectorBehaviour, String.Empty)
+                Dim oDescription As String = ClassAllgemeineFunktionen.NotNullString(obj.Description, String.Empty)
                Dim oSequence As Integer = obj.Sequence
                Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState
                If indexName = String.Empty Then
--- a/app/TaskFlow/frmColumn_Detail.Designer.vb
+++ b/app/TaskFlow/frmColumn_Detail.Designer.vb
@@ -37,6 +37,10 @@ Partial Class frmColumn_Detail
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.SimpleButton4 = New DevExpress.XtraEditors.SimpleButton()
+        Me.FORMULA_SQLTextBox = New System.Windows.Forms.TextBox()
+        Me.SimpleButton3 = New DevExpress.XtraEditors.SimpleButton()
+        Me.FORMULA_EXPRESSIONTextBox = New System.Windows.Forms.TextBox()
        Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox()
        Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit()
        Me.SPALTENNAMETextBox = New DevExpress.XtraEditors.TextEdit()
@@ -59,6 +63,7 @@ Partial Class frmColumn_Detail
        Me.SEQUENCETextBox = New DevExpress.XtraEditors.SpinEdit()
        Me.SUMMARY_FUNCTIONCombobox = New DevExpress.XtraEditors.LookUpEdit()
        Me.TYPE_COLUMNComboBox2 = New DevExpress.XtraEditors.LookUpEdit()
+        Me.CheckEditInheritValue = New DevExpress.XtraEditors.CheckEdit()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -76,13 +81,18 @@ Partial Class frmColumn_Detail
        Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem()
        CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -107,6 +117,7 @@ Partial Class frmColumn_Detail
        CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.CheckEditInheritValue.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -124,13 +135,18 @@ Partial Class frmColumn_Detail
        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'TBPM_CONTROL_TABLEBindingSource
@@ -227,6 +243,10 @@ Partial Class frmColumn_Detail
        '
        'LayoutControl1
        '
+        Me.LayoutControl1.Controls.Add(Me.SimpleButton4)
+        Me.LayoutControl1.Controls.Add(Me.FORMULA_SQLTextBox)
+        Me.LayoutControl1.Controls.Add(Me.SimpleButton3)
+        Me.LayoutControl1.Controls.Add(Me.FORMULA_EXPRESSIONTextBox)
        Me.LayoutControl1.Controls.Add(Me.LU_CAPTIONTextBox)
        Me.LayoutControl1.Controls.Add(Me.GUIDTextBox)
        Me.LayoutControl1.Controls.Add(Me.SPALTENNAMETextBox)
@@ -249,10 +269,37 @@ Partial Class frmColumn_Detail
        Me.LayoutControl1.Controls.Add(Me.SEQUENCETextBox)
        Me.LayoutControl1.Controls.Add(Me.SUMMARY_FUNCTIONCombobox)
        Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox2)
+        Me.LayoutControl1.Controls.Add(Me.CheckEditInheritValue)
        resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.Root = Me.Root
        '
+        'SimpleButton4
+        '
+        resources.ApplyResources(Me.SimpleButton4, "SimpleButton4")
+        Me.SimpleButton4.Name = "SimpleButton4"
+        Me.SimpleButton4.StyleController = Me.LayoutControl1
+        '
+        'FORMULA_SQLTextBox
+        '
+        Me.FORMULA_SQLTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "FORMULA_SQL", True))
+        resources.ApplyResources(Me.FORMULA_SQLTextBox, "FORMULA_SQLTextBox")
+        Me.FORMULA_SQLTextBox.Name = "FORMULA_SQLTextBox"
+        Me.FORMULA_SQLTextBox.ReadOnly = True
+        '
+        'SimpleButton3
+        '
+        resources.ApplyResources(Me.SimpleButton3, "SimpleButton3")
+        Me.SimpleButton3.Name = "SimpleButton3"
+        Me.SimpleButton3.StyleController = Me.LayoutControl1
+        '
+        'FORMULA_EXPRESSIONTextBox
+        '
+        Me.FORMULA_EXPRESSIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "FORMULA_EXPRESSION", True))
+        resources.ApplyResources(Me.FORMULA_EXPRESSIONTextBox, "FORMULA_EXPRESSIONTextBox")
+        Me.FORMULA_EXPRESSIONTextBox.Name = "FORMULA_EXPRESSIONTextBox"
+        Me.FORMULA_EXPRESSIONTextBox.ReadOnly = True
+        '
        'LU_CAPTIONTextBox
        '
        Me.LU_CAPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "LU_CAPTION", True))
@@ -309,7 +356,7 @@ Partial Class frmColumn_Detail
        '
        'REGEX_MESSAGE_DETextBox
        '
-        Me.REGEX_MESSAGE_DETextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "REGEX_MESSAGE_DE", True))
+        Me.REGEX_MESSAGE_DETextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True))
        resources.ApplyResources(Me.REGEX_MESSAGE_DETextBox, "REGEX_MESSAGE_DETextBox")
        Me.REGEX_MESSAGE_DETextBox.MenuManager = Me.RibbonControl1
        Me.REGEX_MESSAGE_DETextBox.Name = "REGEX_MESSAGE_DETextBox"
@@ -440,13 +487,22 @@ Partial Class frmColumn_Detail
        Me.TYPE_COLUMNComboBox2.Properties.PopupSizeable = False
        Me.TYPE_COLUMNComboBox2.StyleController = Me.LayoutControl1
        '
+        'CheckEditInheritValue
+        '
+        Me.CheckEditInheritValue.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True))
+        resources.ApplyResources(Me.CheckEditInheritValue, "CheckEditInheritValue")
+        Me.CheckEditInheritValue.MenuManager = Me.RibbonControl1
+        Me.CheckEditInheritValue.Name = "CheckEditInheritValue"
+        Me.CheckEditInheritValue.Properties.Caption = resources.GetString("CheckEditInheritValue.Properties.Caption")
+        Me.CheckEditInheritValue.StyleController = Me.LayoutControl1
+        '
        'Root
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem23, Me.LayoutControlItem21})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem23, Me.LayoutControlItem21, Me.LayoutControlItem24, Me.LayoutControlItem26, Me.LayoutControlItem27, Me.LayoutControlItem15})
        Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(573, 668)
+        Me.Root.Size = New System.Drawing.Size(630, 853)
        Me.Root.TextVisible = False
        '
        'LayoutControlItem1
@@ -455,9 +511,9 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem1.Name = "LayoutControlItem1"
        Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem1.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem2
        '
@@ -465,9 +521,9 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40)
        Me.LayoutControlItem2.Name = "LayoutControlItem2"
        Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem3
        '
@@ -475,9 +531,9 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80)
        Me.LayoutControlItem3.Name = "LayoutControlItem3"
        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem4
        '
@@ -485,9 +541,9 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
        Me.LayoutControlItem4.Name = "LayoutControlItem4"
        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(276, 40)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(304, 40)
        resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4")
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem5
        '
@@ -495,16 +551,16 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 200)
        Me.LayoutControlItem5.Name = "LayoutControlItem5"
        Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem5.Size = New System.Drawing.Size(471, 46)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(520, 46)
        resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5")
-        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem6
        '
        Me.LayoutControlItem6.Control = Me.SimpleButton1
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(471, 200)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(520, 200)
        Me.LayoutControlItem6.Name = "LayoutControlItem6"
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(82, 46)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(90, 46)
        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem6.TextVisible = False
        '
@@ -514,9 +570,9 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 326)
        Me.LayoutControlItem8.Name = "LayoutControlItem8"
        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem8.Size = New System.Drawing.Size(471, 46)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(520, 46)
        resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8")
-        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem7
        '
@@ -524,65 +580,65 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 246)
        Me.LayoutControlItem7.Name = "LayoutControlItem7"
        Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem7.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7")
-        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem9
        '
        Me.LayoutControlItem9.Control = Me.SimpleButton2
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(471, 326)
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(520, 326)
        Me.LayoutControlItem9.Name = "LayoutControlItem9"
-        Me.LayoutControlItem9.Size = New System.Drawing.Size(82, 46)
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(90, 46)
        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem9.TextVisible = False
        '
        'LayoutControlItem10
        '
        Me.LayoutControlItem10.Control = Me.TextEdit7
-        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 412)
+        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 504)
        Me.LayoutControlItem10.Name = "LayoutControlItem10"
        Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem10.Size = New System.Drawing.Size(276, 40)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(304, 40)
        resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10")
-        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem12
        '
        Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox
-        Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 452)
+        Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 544)
        Me.LayoutControlItem12.Name = "LayoutControlItem12"
        Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem12.Size = New System.Drawing.Size(276, 40)
+        Me.LayoutControlItem12.Size = New System.Drawing.Size(304, 40)
        resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12")
-        Me.LayoutControlItem12.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem12.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem11
        '
        Me.LayoutControlItem11.Control = Me.TextEdit8
-        Me.LayoutControlItem11.Location = New System.Drawing.Point(276, 412)
+        Me.LayoutControlItem11.Location = New System.Drawing.Point(304, 504)
        Me.LayoutControlItem11.Name = "LayoutControlItem11"
        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem11.Size = New System.Drawing.Size(277, 40)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(306, 40)
        resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11")
-        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem13
        '
        Me.LayoutControlItem13.Control = Me.TextEdit10
-        Me.LayoutControlItem13.Location = New System.Drawing.Point(276, 452)
+        Me.LayoutControlItem13.Location = New System.Drawing.Point(304, 544)
        Me.LayoutControlItem13.Name = "LayoutControlItem13"
        Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem13.Size = New System.Drawing.Size(277, 40)
+        Me.LayoutControlItem13.Size = New System.Drawing.Size(306, 40)
        resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13")
-        Me.LayoutControlItem13.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem13.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlGroup1
        '
-        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem20})
-        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 492)
+        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem17, Me.LayoutControlItem25, Me.LayoutControlItem20, Me.LayoutControlItem22})
+        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 584)
        Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(610, 249)
        resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
        '
        'LayoutControlItem16
@@ -590,7 +646,7 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox
        Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem16.Name = "LayoutControlItem16"
-        Me.LayoutControlItem16.Size = New System.Drawing.Size(264, 24)
+        Me.LayoutControlItem16.Size = New System.Drawing.Size(292, 24)
        Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem16.TextVisible = False
        '
@@ -599,36 +655,46 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox
        Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24)
        Me.LayoutControlItem14.Name = "LayoutControlItem14"
-        Me.LayoutControlItem14.Size = New System.Drawing.Size(529, 22)
+        Me.LayoutControlItem14.Size = New System.Drawing.Size(586, 22)
        Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem14.TextVisible = False
        '
-        'LayoutControlItem15
-        '
-        Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox
-        Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 46)
-        Me.LayoutControlItem15.Name = "LayoutControlItem15"
-        Me.LayoutControlItem15.Size = New System.Drawing.Size(529, 22)
-        Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0)
-        Me.LayoutControlItem15.TextVisible = False
-        '
        'LayoutControlItem17
        '
        Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox
-        Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 68)
+        Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 46)
        Me.LayoutControlItem17.Name = "LayoutControlItem17"
-        Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 43)
+        Me.LayoutControlItem17.Size = New System.Drawing.Size(586, 22)
        Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem17.TextVisible = False
        '
+        'LayoutControlItem25
+        '
+        Me.LayoutControlItem25.Control = Me.LOAD_IDX_VALUECheckBox
+        Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 68)
+        Me.LayoutControlItem25.Name = "LayoutControlItem25"
+        Me.LayoutControlItem25.Size = New System.Drawing.Size(586, 22)
+        Me.LayoutControlItem25.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem25.TextVisible = False
+        '
        'LayoutControlItem20
        '
        Me.LayoutControlItem20.Control = Me.SUMMARY_FUNCTIONCombobox
-        Me.LayoutControlItem20.Location = New System.Drawing.Point(264, 0)
+        Me.LayoutControlItem20.Location = New System.Drawing.Point(292, 0)
        Me.LayoutControlItem20.Name = "LayoutControlItem20"
-        Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24)
+        Me.LayoutControlItem20.Size = New System.Drawing.Size(294, 24)
        resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20")
-        Me.LayoutControlItem20.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem20.TextSize = New System.Drawing.Size(110, 13)
+        '
+        'LayoutControlItem22
+        '
+        Me.LayoutControlItem22.Control = Me.CheckEditInheritValue
+        Me.LayoutControlItem22.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True))
+        Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutControlItem22.Name = "LayoutControlItem22"
+        Me.LayoutControlItem22.Size = New System.Drawing.Size(586, 114)
+        Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem22.TextVisible = False
        '
        'LayoutControlItem18
        '
@@ -636,19 +702,19 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 372)
        Me.LayoutControlItem18.Name = "LayoutControlItem18"
        Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem18.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem18.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18")
-        Me.LayoutControlItem18.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem18.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem19
        '
        Me.LayoutControlItem19.Control = Me.SEQUENCETextBox
-        Me.LayoutControlItem19.Location = New System.Drawing.Point(276, 120)
+        Me.LayoutControlItem19.Location = New System.Drawing.Point(304, 120)
        Me.LayoutControlItem19.Name = "LayoutControlItem19"
        Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem19.Size = New System.Drawing.Size(277, 40)
+        Me.LayoutControlItem19.Size = New System.Drawing.Size(306, 40)
        resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19")
-        Me.LayoutControlItem19.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem19.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem23
        '
@@ -657,8 +723,8 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 286)
        Me.LayoutControlItem23.Name = "LayoutControlItem23"
        Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40)
-        Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem23.Size = New System.Drawing.Size(610, 40)
+        Me.LayoutControlItem23.TextSize = New System.Drawing.Size(110, 13)
        '
        'LayoutControlItem21
        '
@@ -666,9 +732,47 @@ Partial Class frmColumn_Detail
        Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 160)
        Me.LayoutControlItem21.Name = "LayoutControlItem21"
        Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem21.Size = New System.Drawing.Size(553, 40)
+        Me.LayoutControlItem21.Size = New System.Drawing.Size(610, 40)
        resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21")
-        Me.LayoutControlItem21.TextSize = New System.Drawing.Size(112, 13)
+        Me.LayoutControlItem21.TextSize = New System.Drawing.Size(110, 13)
+        '
+        'LayoutControlItem24
+        '
+        Me.LayoutControlItem24.Control = Me.FORMULA_EXPRESSIONTextBox
+        Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 412)
+        Me.LayoutControlItem24.Name = "LayoutControlItem24"
+        Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem24.Size = New System.Drawing.Size(520, 46)
+        resources.ApplyResources(Me.LayoutControlItem24, "LayoutControlItem24")
+        Me.LayoutControlItem24.TextSize = New System.Drawing.Size(110, 13)
+        '
+        'LayoutControlItem26
+        '
+        Me.LayoutControlItem26.Control = Me.SimpleButton3
+        Me.LayoutControlItem26.Location = New System.Drawing.Point(520, 412)
+        Me.LayoutControlItem26.Name = "LayoutControlItem26"
+        Me.LayoutControlItem26.Size = New System.Drawing.Size(90, 46)
+        Me.LayoutControlItem26.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem26.TextVisible = False
+        '
+        'LayoutControlItem27
+        '
+        Me.LayoutControlItem27.Control = Me.FORMULA_SQLTextBox
+        Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 458)
+        Me.LayoutControlItem27.Name = "LayoutControlItem27"
+        Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem27.Size = New System.Drawing.Size(520, 46)
+        resources.ApplyResources(Me.LayoutControlItem27, "LayoutControlItem27")
+        Me.LayoutControlItem27.TextSize = New System.Drawing.Size(110, 13)
+        '
+        'LayoutControlItem15
+        '
+        Me.LayoutControlItem15.Control = Me.SimpleButton4
+        Me.LayoutControlItem15.Location = New System.Drawing.Point(520, 458)
+        Me.LayoutControlItem15.Name = "LayoutControlItem15"
+        Me.LayoutControlItem15.Size = New System.Drawing.Size(90, 46)
+        Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem15.TextVisible = False
        '
        'frmColumn_Detail
        '
@@ -708,6 +812,7 @@ Partial Class frmColumn_Detail
        CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.CheckEditInheritValue.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -725,13 +830,18 @@ Partial Class frmColumn_Detail
        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout

@@ -779,7 +889,6 @@ End Sub
    Friend WithEvents READ_ONLYCheckBox As DevExpress.XtraEditors.CheckEdit
    Friend WithEvents LOAD_IDX_VALUECheckBox As DevExpress.XtraEditors.CheckEdit
    Friend WithEvents LayoutControlItem14 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents VALIDATIONCheckbox As DevExpress.XtraEditors.CheckEdit
    Friend WithEvents ADVANCED_LOOKUPCheckbox As DevExpress.XtraEditors.CheckEdit
    Friend WithEvents DEFAULTVALUETextBox As DevExpress.XtraEditors.TextEdit
@@ -795,4 +904,15 @@ End Sub
    Friend WithEvents LayoutControlItem23 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem21 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents TYPE_COLUMNComboBox2 As DevExpress.XtraEditors.LookUpEdit
+    Friend WithEvents CheckEditInheritValue As DevExpress.XtraEditors.CheckEdit
+    Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents FORMULA_EXPRESSIONTextBox As TextBox
+    Friend WithEvents LayoutControlItem24 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem25 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents SimpleButton3 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents LayoutControlItem26 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents SimpleButton4 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents FORMULA_SQLTextBox As TextBox
+    Friend WithEvents LayoutControlItem27 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem
 End Class
--- a/app/TaskFlow/frmColumn_Detail.resx
+++ b/app/TaskFlow/frmColumn_Detail.resx
@@ -123,6 +123,9 @@
  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <metadata name="TBPM_CONTROL_TABLETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>440, 17</value>
  </metadata>
@@ -142,20 +145,17 @@
  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>RibbonPageGroup1</value>
-  </data>
  <data name="RibbonPage1.Text" xml:space="preserve">
    <value>RibbonPage1</value>
  </data>
  <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 67</value>
+    <value>630, 67</value>
  </data>
  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 735</value>
+    <value>0, 920</value>
  </data>
  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 22</value>
+    <value>630, 22</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
    <value>RibbonStatusBar1</value>
@@ -181,16 +181,116 @@
  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>RibbonPageGroup1</value>
+  </data>
  <data name="RibbonPage2.Text" xml:space="preserve">
    <value>RibbonPage2</value>
  </data>
-  <data name="LU_CAPTIONTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 306</value>
+  <data name="SimpleButton4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>532, 470</value>
  </data>
-  <data name="LU_CAPTIONTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="SimpleButton4.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>10, 10, 10, 10</value>
+  </data>
+  <data name="SimpleButton4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 42</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="SimpleButton4.TabIndex" type="System.Int32, mscorlib">
+    <value>33</value>
+  </data>
+  <data name="SimpleButton4.Text" xml:space="preserve">
+    <value>...</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton4.Name" xml:space="preserve">
+    <value>SimpleButton4</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton4.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton4.Parent" xml:space="preserve">
+    <value>LayoutControl1</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton4.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="FORMULA_SQLTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>142, 478</value>
+  </data>
+  <data name="FORMULA_SQLTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>378, 20</value>
+  </data>
+  <data name="FORMULA_SQLTextBox.TabIndex" type="System.Int32, mscorlib">
+    <value>32</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_SQLTextBox.Name" xml:space="preserve">
+    <value>FORMULA_SQLTextBox</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_SQLTextBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_SQLTextBox.Parent" xml:space="preserve">
+    <value>LayoutControl1</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_SQLTextBox.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="SimpleButton3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>532, 424</value>
+  </data>
+  <data name="SimpleButton3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>10, 10, 10, 10</value>
+  </data>
+  <data name="SimpleButton3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 42</value>
+  </data>
+  <data name="SimpleButton3.TabIndex" type="System.Int32, mscorlib">
+    <value>31</value>
+  </data>
+  <data name="SimpleButton3.Text" xml:space="preserve">
+    <value>...</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton3.Name" xml:space="preserve">
+    <value>SimpleButton3</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton3.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton3.Parent" xml:space="preserve">
+    <value>LayoutControl1</value>
+  </data>
+  <data name="&gt;&gt;SimpleButton3.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="FORMULA_EXPRESSIONTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>142, 432</value>
+  </data>
+  <data name="FORMULA_EXPRESSIONTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>378, 20</value>
+  </data>
+  <data name="FORMULA_EXPRESSIONTextBox.TabIndex" type="System.Int32, mscorlib">
+    <value>29</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_EXPRESSIONTextBox.Name" xml:space="preserve">
+    <value>FORMULA_EXPRESSIONTextBox</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_EXPRESSIONTextBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_EXPRESSIONTextBox.Parent" xml:space="preserve">
+    <value>LayoutControl1</value>
+  </data>
+  <data name="&gt;&gt;FORMULA_EXPRESSIONTextBox.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="LU_CAPTIONTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>142, 306</value>
+  </data>
+  <data name="LU_CAPTIONTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>468, 20</value>
+  </data>
  <data name="LU_CAPTIONTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>26</value>
  </data>
@@ -204,13 +304,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;LU_CAPTIONTextBox.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>8</value>
  </data>
  <data name="GUIDTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 20</value>
+    <value>142, 20</value>
  </data>
  <data name="GUIDTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="GUIDTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -225,13 +325,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;GUIDTextBox.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>9</value>
  </data>
  <data name="SPALTENNAMETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 60</value>
+    <value>142, 60</value>
  </data>
  <data name="SPALTENNAMETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="SPALTENNAMETextBox.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
@@ -246,13 +346,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SPALTENNAMETextBox.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>10</value>
  </data>
  <data name="SPALTEN_HEADERTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 100</value>
+    <value>142, 100</value>
  </data>
  <data name="SPALTEN_HEADERTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="SPALTEN_HEADERTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
@@ -267,20 +367,20 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SPALTEN_HEADERTextBox.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>11</value>
  </data>
  <data name="SPALTENBREITETextBox.EditValue" type="System.Decimal, mscorlib">
    <value>0</value>
  </data>
  <data name="SPALTENBREITETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 140</value>
+    <value>142, 140</value>
  </data>
  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="SPALTENBREITETextBox.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
    <value>Combo</value>
  </data>
  <data name="SPALTENBREITETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 20</value>
+    <value>162, 20</value>
  </data>
  <data name="SPALTENBREITETextBox.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@@ -295,13 +395,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SPALTENBREITETextBox.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>12</value>
  </data>
  <data name="REGEX_MATCHTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 220</value>
+    <value>142, 220</value>
  </data>
  <data name="REGEX_MATCHTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>378, 20</value>
  </data>
  <data name="REGEX_MATCHTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
@@ -316,12 +416,11 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;REGEX_MATCHTextBox.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>13</value>
  </data>
  <data name="SimpleButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>483, 212</value>
+    <value>532, 212</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="SimpleButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>10, 10, 10, 10</value>
  </data>
@@ -329,7 +428,7 @@
    <value>10, 10, 10, 10</value>
  </data>
  <data name="SimpleButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 42</value>
+    <value>86, 42</value>
  </data>
  <data name="SimpleButton1.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
@@ -347,13 +446,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SimpleButton1.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>14</value>
  </data>
  <data name="REGEX_MESSAGE_DETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 266</value>
+    <value>142, 266</value>
  </data>
  <data name="REGEX_MESSAGE_DETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="REGEX_MESSAGE_DETextBox.TabIndex" type="System.Int32, mscorlib">
    <value>10</value>
@@ -368,13 +467,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;REGEX_MESSAGE_DETextBox.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>15</value>
  </data>
  <data name="SQL_COMMANDTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 346</value>
+    <value>142, 346</value>
  </data>
  <data name="SQL_COMMANDTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>378, 20</value>
  </data>
  <data name="SQL_COMMANDTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>11</value>
@@ -389,16 +488,16 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SQL_COMMANDTextBox.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>16</value>
  </data>
  <data name="SimpleButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>483, 338</value>
+    <value>532, 338</value>
  </data>
  <data name="SimpleButton2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>10, 10, 10, 10</value>
  </data>
  <data name="SimpleButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 42</value>
+    <value>86, 42</value>
  </data>
  <data name="SimpleButton2.TabIndex" type="System.Int32, mscorlib">
    <value>12</value>
@@ -416,13 +515,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SimpleButton2.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>17</value>
  </data>
  <data name="TextEdit7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 432</value>
+    <value>142, 524</value>
  </data>
  <data name="TextEdit7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 20</value>
+    <value>162, 20</value>
  </data>
  <data name="TextEdit7.TabIndex" type="System.Int32, mscorlib">
    <value>13</value>
@@ -437,13 +536,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;TextEdit7.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>18</value>
  </data>
  <data name="TextEdit8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>420, 432</value>
+    <value>446, 524</value>
  </data>
  <data name="TextEdit8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 20</value>
+    <value>164, 20</value>
  </data>
  <data name="TextEdit8.TabIndex" type="System.Int32, mscorlib">
    <value>14</value>
@@ -458,13 +557,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;TextEdit8.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>19</value>
  </data>
  <data name="CHANGED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 472</value>
+    <value>142, 564</value>
  </data>
  <data name="CHANGED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 20</value>
+    <value>162, 20</value>
  </data>
  <data name="CHANGED_WHOTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>15</value>
@@ -479,13 +578,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;CHANGED_WHOTextBox.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>20</value>
  </data>
  <data name="TextEdit10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>420, 472</value>
+    <value>446, 564</value>
  </data>
  <data name="TextEdit10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 20</value>
+    <value>164, 20</value>
  </data>
  <data name="TextEdit10.TabIndex" type="System.Int32, mscorlib">
    <value>16</value>
@@ -500,16 +599,16 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;TextEdit10.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>21</value>
  </data>
  <data name="READ_ONLYCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 561</value>
+    <value>24, 653</value>
  </data>
  <data name="READ_ONLYCheckBox.Properties.Caption" xml:space="preserve">
    <value>Read Only</value>
  </data>
  <data name="READ_ONLYCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>525, 18</value>
+    <value>582, 18</value>
  </data>
  <data name="READ_ONLYCheckBox.TabIndex" type="System.Int32, mscorlib">
    <value>17</value>
@@ -524,16 +623,16 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;READ_ONLYCheckBox.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>22</value>
  </data>
  <data name="LOAD_IDX_VALUECheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 583</value>
+    <value>24, 697</value>
  </data>
  <data name="LOAD_IDX_VALUECheckBox.Properties.Caption" xml:space="preserve">
    <value>Lade Indexdaten</value>
  </data>
  <data name="LOAD_IDX_VALUECheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>525, 18</value>
+    <value>582, 18</value>
  </data>
  <data name="LOAD_IDX_VALUECheckBox.TabIndex" type="System.Int32, mscorlib">
    <value>18</value>
@@ -548,16 +647,16 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;LOAD_IDX_VALUECheckBox.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>23</value>
  </data>
  <data name="VALIDATIONCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 537</value>
+    <value>24, 629</value>
  </data>
  <data name="VALIDATIONCheckbox.Properties.Caption" xml:space="preserve">
    <value>Muss ausgefüllt werden</value>
  </data>
  <data name="VALIDATIONCheckbox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>260, 18</value>
+    <value>288, 18</value>
  </data>
  <data name="VALIDATIONCheckbox.TabIndex" type="System.Int32, mscorlib">
    <value>19</value>
@@ -572,16 +671,16 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;VALIDATIONCheckbox.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>24</value>
  </data>
  <data name="ADVANCED_LOOKUPCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 605</value>
+    <value>24, 675</value>
  </data>
  <data name="ADVANCED_LOOKUPCheckbox.Properties.Caption" xml:space="preserve">
    <value>Erweitertes Auswahl Control (für lange Listen)</value>
  </data>
  <data name="ADVANCED_LOOKUPCheckbox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>525, 18</value>
+    <value>582, 18</value>
  </data>
  <data name="ADVANCED_LOOKUPCheckbox.TabIndex" type="System.Int32, mscorlib">
    <value>20</value>
@@ -596,13 +695,13 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;ADVANCED_LOOKUPCheckbox.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>25</value>
  </data>
  <data name="DEFAULTVALUETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 392</value>
+    <value>142, 392</value>
  </data>
  <data name="DEFAULTVALUETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="DEFAULTVALUETextBox.TabIndex" type="System.Int32, mscorlib">
    <value>21</value>
@@ -617,19 +716,19 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;DEFAULTVALUETextBox.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>26</value>
  </data>
  <data name="SEQUENCETextBox.EditValue" type="System.Decimal, mscorlib">
    <value>0</value>
  </data>
  <data name="SEQUENCETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>420, 140</value>
+    <value>446, 140</value>
  </data>
  <data name="SEQUENCETextBox.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
    <value>Combo</value>
  </data>
  <data name="SEQUENCETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 20</value>
+    <value>164, 20</value>
  </data>
  <data name="SEQUENCETextBox.TabIndex" type="System.Int32, mscorlib">
    <value>22</value>
@@ -644,10 +743,10 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SEQUENCETextBox.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>27</value>
  </data>
  <data name="SUMMARY_FUNCTIONCombobox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 537</value>
+    <value>438, 629</value>
  </data>
  <data name="SUMMARY_FUNCTIONCombobox.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
    <value>Combo</value>
@@ -656,7 +755,7 @@
    <value />
  </data>
  <data name="SUMMARY_FUNCTIONCombobox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>137, 20</value>
+    <value>168, 20</value>
  </data>
  <data name="SUMMARY_FUNCTIONCombobox.TabIndex" type="System.Int32, mscorlib">
    <value>23</value>
@@ -671,10 +770,10 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;SUMMARY_FUNCTIONCombobox.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>28</value>
  </data>
  <data name="TYPE_COLUMNComboBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 180</value>
+    <value>142, 180</value>
  </data>
  <data name="TYPE_COLUMNComboBox2.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
    <value>Combo</value>
@@ -683,7 +782,7 @@
    <value />
  </data>
  <data name="TYPE_COLUMNComboBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 20</value>
+    <value>468, 20</value>
  </data>
  <data name="TYPE_COLUMNComboBox2.TabIndex" type="System.Int32, mscorlib">
    <value>27</value>
@@ -698,7 +797,31 @@
    <value>LayoutControl1</value>
  </data>
  <data name="&gt;&gt;TYPE_COLUMNComboBox2.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>29</value>
+  </data>
+  <data name="CheckEditInheritValue.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 719</value>
+  </data>
+  <data name="CheckEditInheritValue.Properties.Caption" xml:space="preserve">
+    <value>Inherit Value (Vererbt den Wert der aktuellen Zelle auf alle nachfolgenden)</value>
+  </data>
+  <data name="CheckEditInheritValue.Size" type="System.Drawing.Size, System.Drawing">
+    <value>582, 18</value>
+  </data>
+  <data name="CheckEditInheritValue.TabIndex" type="System.Int32, mscorlib">
+    <value>28</value>
+  </data>
+  <data name="&gt;&gt;CheckEditInheritValue.Name" xml:space="preserve">
+    <value>CheckEditInheritValue</value>
+  </data>
+  <data name="&gt;&gt;CheckEditInheritValue.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;CheckEditInheritValue.Parent" xml:space="preserve">
+    <value>LayoutControl1</value>
+  </data>
+  <data name="&gt;&gt;CheckEditInheritValue.ZOrder" xml:space="preserve">
+    <value>30</value>
  </data>
  <data name="LayoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -760,8 +883,14 @@
  <data name="LayoutControlItem21.Text" xml:space="preserve">
    <value>Formatierung:</value>
  </data>
+  <data name="LayoutControlItem24.Text" xml:space="preserve">
+    <value>Formel:</value>
+  </data>
+  <data name="LayoutControlItem27.Text" xml:space="preserve">
+    <value>Formel SQL:</value>
+  </data>
  <data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 668</value>
+    <value>630, 853</value>
  </data>
  <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
    <value>33</value>
@@ -788,7 +917,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>573, 757</value>
+    <value>630, 942</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@@ -958,24 +1087,30 @@
  <data name="&gt;&gt;LayoutControlItem14.Type" xml:space="preserve">
    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;LayoutControlItem15.Name" xml:space="preserve">
-    <value>LayoutControlItem15</value>
-  </data>
-  <data name="&gt;&gt;LayoutControlItem15.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;LayoutControlItem17.Name" xml:space="preserve">
    <value>LayoutControlItem17</value>
  </data>
  <data name="&gt;&gt;LayoutControlItem17.Type" xml:space="preserve">
    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;LayoutControlItem25.Name" xml:space="preserve">
+    <value>LayoutControlItem25</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem25.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;LayoutControlItem20.Name" xml:space="preserve">
    <value>LayoutControlItem20</value>
  </data>
  <data name="&gt;&gt;LayoutControlItem20.Type" xml:space="preserve">
    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;LayoutControlItem22.Name" xml:space="preserve">
+    <value>LayoutControlItem22</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem22.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;LayoutControlItem18.Name" xml:space="preserve">
    <value>LayoutControlItem18</value>
  </data>
@@ -1000,6 +1135,30 @@
  <data name="&gt;&gt;LayoutControlItem21.Type" xml:space="preserve">
    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;LayoutControlItem24.Name" xml:space="preserve">
+    <value>LayoutControlItem24</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem24.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem26.Name" xml:space="preserve">
+    <value>LayoutControlItem26</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem26.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem27.Name" xml:space="preserve">
+    <value>LayoutControlItem27</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem27.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem15.Name" xml:space="preserve">
+    <value>LayoutControlItem15</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem15.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmColumn_Detail</value>
  </data>
--- a/app/TaskFlow/frmColumn_Detail.vb
+++ b/app/TaskFlow/frmColumn_Detail.vb
@@ -64,6 +64,17 @@ Public Class frmColumn_Detail
        End Try

    End Function
+    Private Sub READ_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles READ_ONLYCheckBox.CheckedChanged
+        Console.WriteLine($"READ_ONLY changed to: {READ_ONLYCheckBox.Checked}")
+        Console.WriteLine($"CheckEditInheritValue is now: {CheckEditInheritValue.Checked}")
+    End Sub
+
+    Private Sub CheckEditInheritValue_CheckedChanged(sender As Object, e As EventArgs) Handles CheckEditInheritValue.CheckedChanged
+        Console.WriteLine($"CheckEditInheritValue changed to: {CheckEditInheritValue.Checked}")
+        Dim stackTrace As New StackTrace()
+        Console.WriteLine($"Called from: {stackTrace}")
+    End Sub
+
    Sub Save_Data()
        Try
            TBPM_CONTROL_TABLEBindingSource.EndEdit()
@@ -87,11 +98,14 @@ Public Class frmColumn_Detail
                    SUMMARY_FUNCTIONCombobox.EditValue,
                    TYPE_COLUMNComboBox2.EditValue,
                    LU_CAPTIONTextBox.Text,
+                    CheckEditInheritValue.Checked,
+                    FORMULA_EXPRESSIONTextBox.Text,
+                    FORMULA_SQLTextBox.Text,
                    GUIDTextBox.Text
                )
                tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
-                FillData(GUIDTextBox.Text)
+                '  FillData(GUIDTextBox.Text)
            Else
                tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
            End If
@@ -193,4 +207,70 @@ Public Class frmColumn_Detail
    Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click

    End Sub
+
+    Private Sub SimpleButton3_Click(sender As Object, e As EventArgs) Handles SimpleButton3.Click
+        ' Alle verfügbaren Spalten für dieses Control laden
+        Dim availableColumns As DataTable = GetAvailableColumnsForControl()
+
+        ' Expression Designer öffnen
+        Using designer As New frmExpression_Designer(availableColumns, FORMULA_EXPRESSIONTextBox.Text)
+            If designer.ShowDialog() = DialogResult.OK Then
+                FORMULA_EXPRESSIONTextBox.Text = designer.Expression
+            End If
+        End Using
+    End Sub
+    Private Function GetAvailableColumnsForControl() As DataTable
+        ' Spalten aus der aktuellen Control-Definition laden
+        Dim oSQL = "SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID  = " & CURRENT_CONTROL_ID & " ORDER BY SEQUENCE"
+        Dim dt As DataTable = DatabaseFallback.GetDatatableECM(oSQL)
+        Return dt
+    End Function
+
+    Private Sub SimpleButton4_Click(sender As Object, e As EventArgs) Handles SimpleButton4.Click
+        Dim oldSQL = FORMULA_SQLTextBox.Text
+        CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN"
+        CURRENT_INDEX_ID = GUIDTextBox.Text
+        Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
+            .SQLCommand = FORMULA_SQLTextBox.Text,
+            .SQLConnection = 0
+         }
+        oForm2.ShowDialog()
+
+        If oForm2.DialogResult = DialogResult.OK Then
+            If oldSQL <> oForm2.SQLCommand Then
+                Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', FORMULA_SQL = '{oForm2.SQLCommand.Replace("'", "''")}' 
+                , CONNECTION_ID = {oForm2.SQLConnection} WHERE GUID = {GUIDTextBox.Text}"
+                If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then
+                    tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                    tslblAenderungen.Caption = "Changes saved - " & Now
+                    FORMULA_SQLTextBox.Text = oForm2.SQLCommand
+                Else
+                    MsgBox("Fehler beim Speichern des SQL Befehls. Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut.", MsgBoxStyle.Critical, "Fehler")
+                End If
+
+            End If
+        End If
+    End Sub
+
+    Private Sub FORMULA_EXPRESSIONTextBox_TextChanged(sender As Object, e As EventArgs) Handles FORMULA_EXPRESSIONTextBox.TextChanged, FORMULA_SQLTextBox.TextChanged
+        Dim oHasFormulaExpression As Boolean = FORMULA_EXPRESSIONTextBox.Text.Trim() <> String.Empty
+        Dim oHasFormulaSql As Boolean = FORMULA_SQLTextBox.Text.Trim() <> String.Empty
+
+        ' Entweder/Oder-Validierung: Beide gleichzeitig ist nicht erlaubt
+        If oHasFormulaExpression AndAlso oHasFormulaSql Then
+            MsgBox("Es darf nur FORMULA_EXPRESSION oder FORMULA_SQL gesetzt sein, nicht beides." & vbCrLf &
+                   "Bitte leeren Sie eines der beiden Felder.",
+                   MsgBoxStyle.Exclamation, "Ungültige Konfiguration")
+        End If
+
+        ' Wenn eine Formel gesetzt ist → ReadOnly aktivieren und sperren
+        If oHasFormulaExpression OrElse oHasFormulaSql Then
+            READ_ONLYCheckBox.Checked = True
+            'READ_ONLYCheckBox.Enabled = False
+        Else
+            READ_ONLYCheckBox.Checked = False
+        'READ_ONLYCheckBox.Enabled = True
+        End If
+
+    End Sub
 End Class
--- a/app/TaskFlow/frmConnection.vb
+++ b/app/TaskFlow/frmConnection.vb
@@ -330,7 +330,6 @@ Public Class frmConnection
        Catch ex As Exception
            LOGGER.Error(ex)
            MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical)
-            DD_LIB_Standards.clsLogger.Add("Error while loading Databases:" & ex.Message)
        Finally
            Me.Cursor = Cursors.Default
        End Try
--- a/app/TaskFlow/frmDashboard1.Designer.vb
+++ b/app/TaskFlow/frmDashboard1.Designer.vb
@@ -1,231 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmDashboard1
-    Inherits DevExpress.XtraEditors.XtraForm
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing AndAlso components IsNot Nothing Then
-            components.Dispose()
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Me.TileBar1 = New DevExpress.XtraBars.Navigation.TileBar()
-        Me.TileBarGroup2 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem1 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarItem2 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarGroup3 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem3 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.NavigationPane1 = New DevExpress.XtraBars.Navigation.NavigationPane()
-        Me.NavigationPage1 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.NavigationPage2 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.RadialMenu1 = New DevExpress.XtraBars.Ribbon.RadialMenu(Me.components)
-        Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
-        Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.NavigationPane1.SuspendLayout()
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TileBar1
-        '
-        Me.TileBar1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.TileBar1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        Me.TileBar1.Groups.Add(Me.TileBarGroup2)
-        Me.TileBar1.Groups.Add(Me.TileBarGroup3)
-        Me.TileBar1.Location = New System.Drawing.Point(0, 0)
-        Me.TileBar1.MaxId = 3
-        Me.TileBar1.Name = "TileBar1"
-        Me.TileBar1.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons
-        Me.TileBar1.Size = New System.Drawing.Size(796, 133)
-        Me.TileBar1.TabIndex = 0
-        Me.TileBar1.Text = "TileBar1"
-        '
-        'TileBarGroup2
-        '
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem1)
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem2)
-        Me.TileBarGroup2.Name = "TileBarGroup2"
-        Me.TileBarGroup2.Text = "Gruppe 1"
-        '
-        'TileBarItem1
-        '
-        Me.TileBarItem1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement1.Text = "TileBarItem1"
-        Me.TileBarItem1.Elements.Add(TileItemElement1)
-        Me.TileBarItem1.Id = 0
-        Me.TileBarItem1.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem1.Name = "TileBarItem1"
-        '
-        'TileBarItem2
-        '
-        Me.TileBarItem2.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement2.Text = "TileBarItem2"
-        Me.TileBarItem2.Elements.Add(TileItemElement2)
-        Me.TileBarItem2.Id = 1
-        Me.TileBarItem2.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Wide
-        Me.TileBarItem2.Name = "TileBarItem2"
-        '
-        'TileBarGroup3
-        '
-        Me.TileBarGroup3.Items.Add(Me.TileBarItem3)
-        Me.TileBarGroup3.Name = "TileBarGroup3"
-        Me.TileBarGroup3.Text = "Gruppe 2"
-        '
-        'TileBarItem3
-        '
-        Me.TileBarItem3.AppearanceItem.Normal.BackColor = System.Drawing.Color.DarkTurquoise
-        Me.TileBarItem3.AppearanceItem.Normal.Options.UseBackColor = True
-        Me.TileBarItem3.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement3.Text = "TileBarItem3"
-        Me.TileBarItem3.Elements.Add(TileItemElement3)
-        Me.TileBarItem3.Id = 2
-        Me.TileBarItem3.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem3.Name = "TileBarItem3"
-        '
-        'NavigationPane1
-        '
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage1)
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage2)
-        Me.NavigationPane1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.NavigationPane1.Location = New System.Drawing.Point(0, 343)
-        Me.NavigationPane1.Name = "NavigationPane1"
-        Me.NavigationPane1.Pages.AddRange(New DevExpress.XtraBars.Navigation.NavigationPageBase() {Me.NavigationPage1, Me.NavigationPage2})
-        Me.NavigationPane1.RegularSize = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.SelectedPage = Me.NavigationPage1
-        Me.NavigationPane1.Size = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.TabIndex = 1
-        Me.NavigationPane1.Text = "NavigationPane1"
-        '
-        'NavigationPage1
-        '
-        Me.NavigationPage1.Caption = "NavigationPage1"
-        Me.NavigationPage1.Name = "NavigationPage1"
-        Me.NavigationPage1.Size = New System.Drawing.Size(660, 77)
-        '
-        'NavigationPage2
-        '
-        Me.NavigationPage2.Caption = "NavigationPage2"
-        Me.NavigationPage2.Name = "NavigationPage2"
-        Me.NavigationPage2.PageText = "sdsdsd"
-        Me.NavigationPage2.Size = New System.Drawing.Size(660, 77)
-        '
-        'RadialMenu1
-        '
-        Me.RadialMenu1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2)})
-        Me.RadialMenu1.Manager = Me.BarManager1
-        Me.RadialMenu1.Name = "RadialMenu1"
-        '
-        'BarManager1
-        '
-        Me.BarManager1.DockControls.Add(Me.barDockControlTop)
-        Me.BarManager1.DockControls.Add(Me.barDockControlBottom)
-        Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
-        Me.BarManager1.DockControls.Add(Me.barDockControlRight)
-        Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem1, Me.BarButtonItem2})
-        Me.BarManager1.MaxItemId = 2
-        '
-        'barDockControlTop
-        '
-        Me.barDockControlTop.CausesValidation = False
-        Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
-        Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlBottom
-        '
-        Me.barDockControlBottom.CausesValidation = False
-        Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 493)
-        Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlLeft
-        '
-        Me.barDockControlLeft.CausesValidation = False
-        Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
-        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 493)
-        '
-        'barDockControlRight
-        '
-        Me.barDockControlRight.CausesValidation = False
-        Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(796, 0)
-        Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 493)
-        '
-        'BarButtonItem1
-        '
-        Me.BarButtonItem1.Caption = "BarButtonItem1"
-        Me.BarButtonItem1.Id = 0
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
-        'BarButtonItem2
-        '
-        Me.BarButtonItem2.Caption = "BarButtonItem2"
-        Me.BarButtonItem2.Id = 1
-        Me.BarButtonItem2.Name = "BarButtonItem2"
-        '
-        'frmDashboard1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(796, 493)
-        Me.Controls.Add(Me.NavigationPane1)
-        Me.Controls.Add(Me.TileBar1)
-        Me.Controls.Add(Me.barDockControlLeft)
-        Me.Controls.Add(Me.barDockControlRight)
-        Me.Controls.Add(Me.barDockControlBottom)
-        Me.Controls.Add(Me.barDockControlTop)
-        Me.Name = "frmDashboard1"
-        Me.Text = "frmDashboard1"
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.NavigationPane1.ResumeLayout(False)
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-
-    Friend WithEvents TileBar1 As DevExpress.XtraBars.Navigation.TileBar
-    Friend WithEvents TileBarGroup2 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem1 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarItem2 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarGroup3 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem3 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents NavigationPane1 As DevExpress.XtraBars.Navigation.NavigationPane
-    Friend WithEvents NavigationPage1 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents NavigationPage2 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents RadialMenu1 As DevExpress.XtraBars.Ribbon.RadialMenu
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
-    Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl
-End Class
--- a/app/TaskFlow/frmDashboard1.vb
+++ b/app/TaskFlow/frmDashboard1.vb
@@ -1,3 +0,0 @@
-Public Class frmDashboard1
-
-End Class
--- a/app/TaskFlow/frmError.vb
+++ b/app/TaskFlow/frmError.vb
@@ -2,8 +2,21 @@

 Public Class frmError
    Public ValidatorError As String = ""
+    Private _isClosing As Boolean = False
+
    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-        Me.Close()
+        ' ========== FIX 1: Event-Handler SOFORT deregistrieren ==========
+        RemoveHandler OK_Button.Click, AddressOf OK_Button_Click
+
+        ' ========== DIAGNOSE: StackTrace ausgeben ==========
+        Dim st As New StackTrace(True)
+        LOGGER.Debug($"[frmError] OK_Button_Click aufgerufen von:")
+        For Each frame As StackFrame In st.GetFrames()
+            LOGGER.Debug($"  {frame.GetMethod()?.DeclaringType?.Name}.{frame.GetMethod()?.Name} (Zeile {frame.GetFileLineNumber()})")
+        Next
+        ' ========== ENDE DIAGNOSE ==========
+
+        CloseDialog()
    End Sub

    Private Sub frmError_Load(sender As Object, e As System.EventArgs) Handles Me.Load
@@ -27,7 +40,45 @@ Public Class frmError
        End If
    End Sub

-    Private Sub frmError_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
-        Me.Label1.Focus()
+    Private Sub CloseDialog()
+        ' ========== FIX 2: Guard mit Dispose-Check ==========
+        If _isClosing OrElse Me.IsDisposed Then
+            LOGGER.Debug($"[frmError] CloseDialog blockiert (isClosing={_isClosing}, IsDisposed={Me.IsDisposed})")
+            Exit Sub
+        End If
+
+        _isClosing = True
+        LOGGER.Debug($"[frmError] CloseDialog: Flag gesetzt, starte verzögerten Close")
+
+        ' ========== FIX 3: VERZÖGERTER Close via BeginInvoke ==========
+        ' KRITISCH: Close wird NACH Abschluss des aktuellen Event-Handlers ausgeführt
+        Me.BeginInvoke(New Action(Sub()
+                                      If Not Me.IsDisposed Then
+                                          Me.DialogResult = DialogResult.OK
+                                          Me.Close()
+                                          LOGGER.Debug($"[frmError] Dialog geschlossen via BeginInvoke")
+                                      End If
+                                  End Sub))
+        ' ========== ENDE FIX 3 ==========
    End Sub
+    Private Sub frmError_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        Me.Label1.Focus()
+        LOGGER.Debug($"[frmError] Dialog angezeigt - Enabled: {Me.Enabled}")
+    End Sub
+
+    Private Sub frmError_Activated(sender As Object, e As EventArgs) Handles Me.Activated
+        LOGGER.Debug($"[frmError] Dialog aktiviert")
+    End Sub
+    ' ========== FIX 4: FormClosing-Handler hinzufügen ==========
+    Private Sub frmError_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        If _isClosing Then
+            LOGGER.Debug($"[frmError] FormClosing: Close bereits aktiv, erlauben")
+            Return
+        End If
+
+        ' Falls Close von außen (z.B. [X]-Button) ausgelöst wurde
+        _isClosing = True
+        LOGGER.Debug($"[frmError] FormClosing: Flag gesetzt via FormClosing")
+    End Sub
+    ' ========== ENDE FIX 4 ==========
 End Class
--- a/app/TaskFlow/frmExpression_Designer.Designer.vb
+++ b/app/TaskFlow/frmExpression_Designer.Designer.vb
@@ -0,0 +1,465 @@
+Imports DevExpress.XtraEditors
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmExpression_Designer
+    Inherits DevExpress.XtraEditors.XtraForm
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.layoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.btnClear = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnCancel = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnOK = New DevExpress.XtraEditors.SimpleButton()
+        Me.lblColumnCount = New System.Windows.Forms.Label()
+        Me.lblValidation = New System.Windows.Forms.Label()
+        Me.btnValidate = New DevExpress.XtraEditors.SimpleButton()
+        Me.panelOperators = New System.Windows.Forms.Panel()
+        Me.lstFunctions = New System.Windows.Forms.ListBox()
+        Me.lstColumns = New System.Windows.Forms.ListBox()
+        Me.txtExpression = New DevExpress.XtraEditors.MemoEdit()
+        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.layoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.emptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
+        Me.layoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.layoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.btnAdd = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnSubtract = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnMultiply = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnDivide = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnEquals = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnNotEquals = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnGreater = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnLess = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnAnd = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnOr = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnNot = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnOpenBracket = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnCloseBracket = New DevExpress.XtraEditors.SimpleButton()
+        CType(Me.layoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.layoutControl1.SuspendLayout()
+        CType(Me.txtExpression.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.emptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.layoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'layoutControl1
+        '
+        Me.layoutControl1.Controls.Add(Me.btnClear)
+        Me.layoutControl1.Controls.Add(Me.btnCancel)
+        Me.layoutControl1.Controls.Add(Me.btnOK)
+        Me.layoutControl1.Controls.Add(Me.lblColumnCount)
+        Me.layoutControl1.Controls.Add(Me.lblValidation)
+        Me.layoutControl1.Controls.Add(Me.btnValidate)
+        Me.layoutControl1.Controls.Add(Me.panelOperators)
+        Me.layoutControl1.Controls.Add(Me.lstFunctions)
+        Me.layoutControl1.Controls.Add(Me.lstColumns)
+        Me.layoutControl1.Controls.Add(Me.txtExpression)
+        Me.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.layoutControl1.Location = New System.Drawing.Point(0, 0)
+        Me.layoutControl1.Name = "layoutControl1"
+        Me.layoutControl1.Root = Me.Root
+        Me.layoutControl1.Size = New System.Drawing.Size(900, 600)
+        Me.layoutControl1.TabIndex = 0
+        Me.layoutControl1.Text = "LayoutControl1"
+        '
+        'btnClear
+        '
+        Me.btnClear.Location = New System.Drawing.Point(809, 558)
+        Me.btnClear.Name = "btnClear"
+        Me.btnClear.Size = New System.Drawing.Size(79, 30)
+        Me.btnClear.StyleController = Me.layoutControl1
+        Me.btnClear.TabIndex = 13
+        Me.btnClear.Text = "Löschen"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(724, 558)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(81, 30)
+        Me.btnCancel.StyleController = Me.layoutControl1
+        Me.btnCancel.TabIndex = 12
+        Me.btnCancel.Text = "Abbrechen"
+        '
+        'btnOK
+        '
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(644, 558)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(76, 30)
+        Me.btnOK.StyleController = Me.layoutControl1
+        Me.btnOK.TabIndex = 11
+        Me.btnOK.Text = "OK"
+        '
+        'lblColumnCount
+        '
+        Me.lblColumnCount.Location = New System.Drawing.Point(12, 472)
+        Me.lblColumnCount.Name = "lblColumnCount"
+        Me.lblColumnCount.Size = New System.Drawing.Size(876, 20)
+        Me.lblColumnCount.TabIndex = 10
+        Me.lblColumnCount.Text = "Referenzierte Spalten: 0"
+        '
+        'lblValidation
+        '
+        Me.lblValidation.Location = New System.Drawing.Point(116, 438)
+        Me.lblValidation.Name = "lblValidation"
+        Me.lblValidation.Size = New System.Drawing.Size(772, 30)
+        Me.lblValidation.TabIndex = 9
+        '
+        'btnValidate
+        '
+        Me.btnValidate.Location = New System.Drawing.Point(12, 438)
+        Me.btnValidate.Name = "btnValidate"
+        Me.btnValidate.Size = New System.Drawing.Size(100, 30)
+        Me.btnValidate.StyleController = Me.layoutControl1
+        Me.btnValidate.TabIndex = 8
+        Me.btnValidate.Text = "Validieren"
+        '
+        'panelOperators
+        '
+        Me.panelOperators.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.panelOperators.Location = New System.Drawing.Point(602, 161)
+        Me.panelOperators.Name = "panelOperators"
+        Me.panelOperators.Size = New System.Drawing.Size(286, 273)
+        Me.panelOperators.TabIndex = 7
+        '
+        'lstFunctions
+        '
+        Me.lstFunctions.FormattingEnabled = True
+        Me.lstFunctions.Location = New System.Drawing.Point(307, 161)
+        Me.lstFunctions.Name = "lstFunctions"
+        Me.lstFunctions.Size = New System.Drawing.Size(291, 273)
+        Me.lstFunctions.TabIndex = 6
+        '
+        'lstColumns
+        '
+        Me.lstColumns.FormattingEnabled = True
+        Me.lstColumns.Location = New System.Drawing.Point(12, 161)
+        Me.lstColumns.Name = "lstColumns"
+        Me.lstColumns.Size = New System.Drawing.Size(291, 273)
+        Me.lstColumns.TabIndex = 5
+        '
+        'txtExpression
+        '
+        Me.txtExpression.Location = New System.Drawing.Point(12, 28)
+        Me.txtExpression.Name = "txtExpression"
+        Me.txtExpression.Properties.ScrollBars = System.Windows.Forms.ScrollBars.Both
+        Me.txtExpression.Properties.WordWrap = False
+        Me.txtExpression.Size = New System.Drawing.Size(876, 113)
+        Me.txtExpression.StyleController = Me.layoutControl1
+        Me.txtExpression.TabIndex = 4
+        '
+        'Root
+        '
+        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Root.GroupBordersVisible = False
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.layoutControlItem1, Me.layoutControlItem2, Me.layoutControlItem3, Me.layoutControlItem4, Me.layoutControlItem5, Me.layoutControlItem6, Me.layoutControlItem7, Me.emptySpaceItem1, Me.layoutControlItem8, Me.layoutControlItem9, Me.layoutControlItem10})
+        Me.Root.Name = "Root"
+        Me.Root.Size = New System.Drawing.Size(900, 600)
+        Me.Root.TextVisible = False
+        '
+        'layoutControlItem1
+        '
+        Me.layoutControlItem1.Control = Me.txtExpression
+        Me.layoutControlItem1.Location = New System.Drawing.Point(0, 0)
+        Me.layoutControlItem1.Name = "layoutControlItem1"
+        Me.layoutControlItem1.Size = New System.Drawing.Size(880, 133)
+        Me.layoutControlItem1.Text = "Expression:"
+        Me.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top
+        Me.layoutControlItem1.TextSize = New System.Drawing.Size(61, 13)
+        '
+        'layoutControlItem2
+        '
+        Me.layoutControlItem2.Control = Me.lstColumns
+        Me.layoutControlItem2.Location = New System.Drawing.Point(0, 133)
+        Me.layoutControlItem2.Name = "layoutControlItem2"
+        Me.layoutControlItem2.Size = New System.Drawing.Size(295, 293)
+        Me.layoutControlItem2.Text = "Verfügbare Spalten:"
+        Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top
+        Me.layoutControlItem2.TextSize = New System.Drawing.Size(61, 13)
+        '
+        'layoutControlItem3
+        '
+        Me.layoutControlItem3.Control = Me.lstFunctions
+        Me.layoutControlItem3.Location = New System.Drawing.Point(295, 133)
+        Me.layoutControlItem3.Name = "layoutControlItem3"
+        Me.layoutControlItem3.Size = New System.Drawing.Size(295, 293)
+        Me.layoutControlItem3.Text = "Funktionen:"
+        Me.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
+        Me.layoutControlItem3.TextSize = New System.Drawing.Size(61, 13)
+        '
+        'layoutControlItem4
+        '
+        Me.layoutControlItem4.Control = Me.panelOperators
+        Me.layoutControlItem4.Location = New System.Drawing.Point(590, 133)
+        Me.layoutControlItem4.Name = "layoutControlItem4"
+        Me.layoutControlItem4.Size = New System.Drawing.Size(290, 293)
+        Me.layoutControlItem4.Text = "Operatoren:"
+        Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top
+        Me.layoutControlItem4.TextSize = New System.Drawing.Size(61, 13)
+        '
+        'layoutControlItem5
+        '
+        Me.layoutControlItem5.Control = Me.btnValidate
+        Me.layoutControlItem5.Location = New System.Drawing.Point(0, 426)
+        Me.layoutControlItem5.MaxSize = New System.Drawing.Size(104, 34)
+        Me.layoutControlItem5.MinSize = New System.Drawing.Size(104, 34)
+        Me.layoutControlItem5.Name = "layoutControlItem5"
+        Me.layoutControlItem5.Size = New System.Drawing.Size(104, 34)
+        Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+        Me.layoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem5.TextVisible = False
+        '
+        'layoutControlItem6
+        '
+        Me.layoutControlItem6.Control = Me.lblValidation
+        Me.layoutControlItem6.Location = New System.Drawing.Point(104, 426)
+        Me.layoutControlItem6.Name = "layoutControlItem6"
+        Me.layoutControlItem6.Size = New System.Drawing.Size(776, 34)
+        Me.layoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem6.TextVisible = False
+        '
+        'layoutControlItem7
+        '
+        Me.layoutControlItem7.Control = Me.lblColumnCount
+        Me.layoutControlItem7.Location = New System.Drawing.Point(0, 460)
+        Me.layoutControlItem7.Name = "layoutControlItem7"
+        Me.layoutControlItem7.Size = New System.Drawing.Size(880, 24)
+        Me.layoutControlItem7.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem7.TextVisible = False
+        '
+        'emptySpaceItem1
+        '
+        Me.emptySpaceItem1.AllowHotTrack = False
+        Me.emptySpaceItem1.Location = New System.Drawing.Point(0, 484)
+        Me.emptySpaceItem1.Name = "emptySpaceItem1"
+        Me.emptySpaceItem1.Size = New System.Drawing.Size(632, 62)
+        Me.emptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
+        '
+        'layoutControlItem8
+        '
+        Me.layoutControlItem8.Control = Me.btnOK
+        Me.layoutControlItem8.Location = New System.Drawing.Point(632, 546)
+        Me.layoutControlItem8.MaxSize = New System.Drawing.Size(80, 34)
+        Me.layoutControlItem8.MinSize = New System.Drawing.Size(80, 34)
+        Me.layoutControlItem8.Name = "layoutControlItem8"
+        Me.layoutControlItem8.Size = New System.Drawing.Size(80, 34)
+        Me.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+        Me.layoutControlItem8.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem8.TextVisible = False
+        '
+        'layoutControlItem9
+        '
+        Me.layoutControlItem9.Control = Me.btnCancel
+        Me.layoutControlItem9.Location = New System.Drawing.Point(712, 546)
+        Me.layoutControlItem9.MaxSize = New System.Drawing.Size(85, 34)
+        Me.layoutControlItem9.MinSize = New System.Drawing.Size(85, 34)
+        Me.layoutControlItem9.Name = "layoutControlItem9"
+        Me.layoutControlItem9.Size = New System.Drawing.Size(85, 34)
+        Me.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+        Me.layoutControlItem9.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem9.TextVisible = False
+        '
+        'layoutControlItem10
+        '
+        Me.layoutControlItem10.Control = Me.btnClear
+        Me.layoutControlItem10.Location = New System.Drawing.Point(797, 546)
+        Me.layoutControlItem10.MaxSize = New System.Drawing.Size(83, 34)
+        Me.layoutControlItem10.MinSize = New System.Drawing.Size(83, 34)
+        Me.layoutControlItem10.Name = "layoutControlItem10"
+        Me.layoutControlItem10.Size = New System.Drawing.Size(83, 34)
+        Me.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+        Me.layoutControlItem10.TextSize = New System.Drawing.Size(0, 0)
+        Me.layoutControlItem10.TextVisible = False
+        '
+        'btnAdd
+        '
+        Me.btnAdd.Name = "btnAdd"
+        Me.btnAdd.Size = New System.Drawing.Size(50, 30)
+        Me.btnAdd.TabIndex = 0
+        Me.btnAdd.Text = "+"
+        '
+        'btnSubtract
+        '
+        Me.btnSubtract.Name = "btnSubtract"
+        Me.btnSubtract.Size = New System.Drawing.Size(50, 30)
+        Me.btnSubtract.TabIndex = 1
+        Me.btnSubtract.Text = "-"
+        '
+        'btnMultiply
+        '
+        Me.btnMultiply.Name = "btnMultiply"
+        Me.btnMultiply.Size = New System.Drawing.Size(50, 30)
+        Me.btnMultiply.TabIndex = 2
+        Me.btnMultiply.Text = "*"
+        '
+        'btnDivide
+        '
+        Me.btnDivide.Name = "btnDivide"
+        Me.btnDivide.Size = New System.Drawing.Size(50, 30)
+        Me.btnDivide.TabIndex = 3
+        Me.btnDivide.Text = "/"
+        '
+        'btnEquals
+        '
+        Me.btnEquals.Name = "btnEquals"
+        Me.btnEquals.Size = New System.Drawing.Size(50, 30)
+        Me.btnEquals.TabIndex = 4
+        Me.btnEquals.Text = "="
+        '
+        'btnNotEquals
+        '
+        Me.btnNotEquals.Name = "btnNotEquals"
+        Me.btnNotEquals.Size = New System.Drawing.Size(50, 30)
+        Me.btnNotEquals.TabIndex = 5
+        Me.btnNotEquals.Text = "<>"
+        '
+        'btnGreater
+        '
+        Me.btnGreater.Name = "btnGreater"
+        Me.btnGreater.Size = New System.Drawing.Size(50, 30)
+        Me.btnGreater.TabIndex = 6
+        Me.btnGreater.Text = ">"
+        '
+        'btnLess
+        '
+        Me.btnLess.Name = "btnLess"
+        Me.btnLess.Size = New System.Drawing.Size(50, 30)
+        Me.btnLess.TabIndex = 7
+        Me.btnLess.Text = "<"
+        '
+        'btnAnd
+        '
+        Me.btnAnd.Name = "btnAnd"
+        Me.btnAnd.Size = New System.Drawing.Size(50, 30)
+        Me.btnAnd.TabIndex = 8
+        Me.btnAnd.Text = "AND"
+        '
+        'btnOr
+        '
+        Me.btnOr.Name = "btnOr"
+        Me.btnOr.Size = New System.Drawing.Size(50, 30)
+        Me.btnOr.TabIndex = 9
+        Me.btnOr.Text = "OR"
+        '
+        'btnNot
+        '
+        Me.btnNot.Name = "btnNot"
+        Me.btnNot.Size = New System.Drawing.Size(50, 30)
+        Me.btnNot.TabIndex = 10
+        Me.btnNot.Text = "NOT"
+        '
+        'btnOpenBracket
+        '
+        Me.btnOpenBracket.Name = "btnOpenBracket"
+        Me.btnOpenBracket.Size = New System.Drawing.Size(50, 30)
+        Me.btnOpenBracket.TabIndex = 11
+        Me.btnOpenBracket.Text = "("
+        '
+        'btnCloseBracket
+        '
+        Me.btnCloseBracket.Name = "btnCloseBracket"
+        Me.btnCloseBracket.Size = New System.Drawing.Size(50, 30)
+        Me.btnCloseBracket.TabIndex = 12
+        Me.btnCloseBracket.Text = ")"
+        '
+        'frmExpression_Designer
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(900, 600)
+        Me.Controls.Add(Me.layoutControl1)
+        Me.Name = "frmExpression_Designer"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Expression Designer"
+        CType(Me.layoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.layoutControl1.ResumeLayout(False)
+        CType(Me.txtExpression.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.emptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.layoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents layoutControl1 As DevExpress.XtraLayout.LayoutControl
+    Friend WithEvents btnClear As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnCancel As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnOK As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents lblColumnCount As Label
+    Friend WithEvents lblValidation As Label
+    Friend WithEvents btnValidate As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents panelOperators As Panel
+    Friend WithEvents lstFunctions As ListBox
+    Friend WithEvents lstColumns As ListBox
+    Friend WithEvents txtExpression As DevExpress.XtraEditors.MemoEdit
+    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents layoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents emptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
+    Friend WithEvents layoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents layoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents btnAdd As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnSubtract As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnMultiply As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnDivide As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnEquals As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnNotEquals As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnGreater As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnLess As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnAnd As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnOr As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnNot As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnOpenBracket As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnCloseBracket As DevExpress.XtraEditors.SimpleButton
+End Class
--- a/app/TaskFlow/frmExpression_Designer.resx
+++ b/app/TaskFlow/frmExpression_Designer.resx
@@ -117,10 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="RadialMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>140, 17</value>
-  </metadata>
 </root>
--- a/app/TaskFlow/frmExpression_Designer.vb
+++ b/app/TaskFlow/frmExpression_Designer.vb
@@ -0,0 +1,284 @@
+Imports System.Text.RegularExpressions
+Imports DevExpress.XtraEditors
+
+Public Class frmExpression_Designer
+    Private _availableColumns As DataTable
+    Private _currentExpression As String = ""
+
+    Public Property Expression As String
+        Get
+            Return _currentExpression
+        End Get
+        Set(value As String)
+            _currentExpression = value
+            txtExpression.Text = value
+        End Set
+    End Property
+
+    Public Sub New(pAvailableColumns As DataTable, pCurrentExpression As String)
+        InitializeComponent()
+
+        _availableColumns = pAvailableColumns
+        _currentExpression = pCurrentExpression
+    End Sub
+    Private Sub ConfigureOperatorButtons()
+        Dim yPos As Integer = 10
+
+        ' Arithmetische Operatoren
+        AddOperatorButton(btnAdd, "+", 10, yPos, "Addition")
+        AddOperatorButton(btnSubtract, "-", 70, yPos, "Subtraktion")
+        AddOperatorButton(btnMultiply, "*", 130, yPos, "Multiplikation")
+        AddOperatorButton(btnDivide, "/", 190, yPos, "Division")
+
+        yPos += 40
+
+        ' Vergleichsoperatoren
+        AddOperatorButton(btnEquals, "=", 10, yPos, "Gleich")
+        AddOperatorButton(btnNotEquals, "<>", 70, yPos, "Ungleich")
+        AddOperatorButton(btnGreater, ">", 130, yPos, "Größer")
+        AddOperatorButton(btnLess, "<", 190, yPos, "Kleiner")
+
+        yPos += 40
+
+        ' Logische Operatoren
+        AddOperatorButton(btnAnd, "AND", 10, yPos, "Und")
+        AddOperatorButton(btnOr, "OR", 70, yPos, "Oder")
+        AddOperatorButton(btnNot, "NOT", 130, yPos, "Nicht")
+
+        yPos += 40
+
+        ' Klammern
+        AddOperatorButton(btnOpenBracket, "(", 10, yPos, "Öffnende Klammer")
+        AddOperatorButton(btnCloseBracket, ")", 70, yPos, "Schließende Klammer")
+    End Sub
+
+    Private Sub AddOperatorButton(btn As SimpleButton, text As String, x As Integer, y As Integer, tooltip As String)
+        btn.Text = text
+        btn.Location = New Point(x, y)
+        btn.Size = New Size(50, 30)
+        btn.ToolTip = tooltip
+        Me.panelOperators.Controls.Add(btn)
+    End Sub
+    Private Sub frmExpressionDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        ' ZUERST Operatoren-Buttons erstellen
+        ConfigureOperatorButtons()
+
+        ' Spalten laden
+        LoadAvailableColumns()
+
+        ' Funktionen laden
+        LoadFunctions()
+
+        ' Operatoren laden
+        LoadOperators()
+
+        ' Aktuelle Expression anzeigen
+        txtExpression.Text = _currentExpression
+
+        ' Syntax-Highlighting aktivieren (optional)
+        UpdateSyntaxHighlighting()
+        ' Event-Handler für Text-Änderungen hinzufügen
+        AddHandler txtExpression.EditValueChanged, AddressOf txtExpression_EditValueChanged
+    End Sub
+
+    Private Sub txtExpression_EditValueChanged(sender As Object, e As EventArgs)
+        ' Validierungsmeldung zurücksetzen
+        lblValidation.Text = String.Empty
+        lblValidation.ForeColor = Color.Black
+
+        ' Syntax-Highlighting aktualisieren
+        UpdateSyntaxHighlighting()
+
+        ' Aktuellen Wert speichern
+        _currentExpression = txtExpression.Text
+    End Sub
+    Private Sub LoadAvailableColumns()
+        lstColumns.Items.Clear()
+
+        For Each row As DataRow In _availableColumns.Rows
+            Dim columnName As String = row.Item("SPALTENNAME").ToString()
+            Dim columnType As String = row.Item("TYPE_COLUMN").ToString()
+            Dim displayText As String = $"{columnName} ({columnType})"
+
+            lstColumns.Items.Add(New ListBoxItem With {
+                .DisplayText = displayText,
+                .ColumnName = columnName,
+                .DataType = columnType
+            })
+        Next
+    End Sub
+
+    Private Sub LoadFunctions()
+        lstFunctions.Items.Clear()
+
+        ' Mathematische Funktionen
+        lstFunctions.Items.Add(New FunctionItem("IIF", "IIF([Bedingung], Wahr, Falsch)", "Bedingte Verzweigung"))
+        lstFunctions.Items.Add(New FunctionItem("IsNull", "IsNull([Spalte], Ersatzwert)", "Null-Behandlung"))
+        lstFunctions.Items.Add(New FunctionItem("Convert", "Convert([Spalte], 'System.Double')", "Typkonvertierung"))
+
+        ' String-Funktionen
+        lstFunctions.Items.Add(New FunctionItem("Len", "Len([Text])", "Länge eines Textes"))
+        lstFunctions.Items.Add(New FunctionItem("Trim", "Trim([Text])", "Leerzeichen entfernen"))
+        lstFunctions.Items.Add(New FunctionItem("Substring", "Substring([Text], Start, Länge)", "Teilstring extrahieren"))
+    End Sub
+
+    Private Sub LoadOperators()
+        ' Arithmetische Operatoren
+        btnAdd.Tag = " + "
+        btnSubtract.Tag = " - "
+        btnMultiply.Tag = " * "
+        btnDivide.Tag = " / "
+
+        ' Vergleichsoperatoren
+        btnEquals.Tag = " = "
+        btnNotEquals.Tag = " <> "
+        btnGreater.Tag = " > "
+        btnLess.Tag = " < "
+
+        ' Logische Operatoren
+        btnAnd.Tag = " AND "
+        btnOr.Tag = " OR "
+        btnNot.Tag = " NOT "
+
+        ' Klammern
+        btnOpenBracket.Tag = "("
+        btnCloseBracket.Tag = ")"
+    End Sub
+
+    Private Sub lstColumns_DoubleClick(sender As Object, e As EventArgs) Handles lstColumns.DoubleClick
+        If lstColumns.SelectedItem IsNot Nothing Then
+            Dim item As ListBoxItem = CType(lstColumns.SelectedItem, ListBoxItem)
+            InsertText($"[{item.ColumnName}]")
+        End If
+    End Sub
+
+    Private Sub lstFunctions_DoubleClick(sender As Object, e As EventArgs) Handles lstFunctions.DoubleClick
+        If lstFunctions.SelectedItem IsNot Nothing Then
+            Dim item As FunctionItem = CType(lstFunctions.SelectedItem, FunctionItem)
+            InsertText(item.Template)
+        End If
+    End Sub
+
+    Private Sub Operator_Click(sender As Object, e As EventArgs) Handles btnAdd.Click, btnSubtract.Click, btnMultiply.Click, btnDivide.Click,
+                                                                         btnEquals.Click, btnNotEquals.Click, btnGreater.Click, btnLess.Click,
+                                                                         btnAnd.Click, btnOr.Click, btnNot.Click,
+                                                                         btnOpenBracket.Click, btnCloseBracket.Click
+        Dim btn As SimpleButton = CType(sender, SimpleButton)
+        InsertText(btn.Tag.ToString())
+    End Sub
+
+
+    Private Sub InsertText(text As String)
+        Dim selectionStart As Integer = txtExpression.SelectionStart
+
+        txtExpression.Text = txtExpression.Text.Insert(selectionStart, text)
+        txtExpression.SelectionStart = selectionStart + text.Length
+        txtExpression.Focus()
+
+        _currentExpression = txtExpression.Text
+        ' UpdateSyntaxHighlighting() wird jetzt im Event-Handler aufgerufen
+    End Sub
+
+    Private Sub btnValidate_Click(sender As Object, e As EventArgs) Handles btnValidate.Click
+        ValidateExpression()
+    End Sub
+
+    Private Sub ValidateExpression()
+        Try
+            ' Testdatatable erstellen
+            Dim testTable As New DataTable()
+
+            ' Spalten hinzufügen
+            For Each row As DataRow In _availableColumns.Rows
+                Dim colName As String = row.Item("SPALTENNAME").ToString()
+                Dim colType As String = row.Item("TYPE_COLUMN").ToString()
+
+                Dim dataType As Type = GetType(String)
+                Select Case colType
+                    Case "INTEGER"
+                        dataType = GetType(Integer)
+                    Case "DOUBLE", "CURRENCY"
+                        dataType = GetType(Double)
+                    Case "BOOLEAN"
+                        dataType = GetType(Boolean)
+                End Select
+
+                testTable.Columns.Add(colName, dataType)
+            Next
+
+            ' Test-Spalte mit Expression erstellen
+            Dim testColumn As New DataColumn("TEST_EXPRESSION") With {
+                .Expression = txtExpression.Text
+            }
+            testTable.Columns.Add(testColumn)
+
+            ' Erfolg!
+            lblValidation.Text = "✓ Expression ist gültig!"
+            lblValidation.ForeColor = Color.Green
+
+        Catch ex As Exception
+            lblValidation.Text = $"⚠️ Fehler: {ex.Message}"
+            lblValidation.ForeColor = Color.Red
+        End Try
+    End Sub
+
+    Private Sub UpdateSyntaxHighlighting()
+        ' Optional: Einfaches Syntax-Highlighting
+        ' Spalten-Referenzen markieren
+        Dim pattern As String = "\[([^\]]+)\]"
+        Dim matches = Regex.Matches(txtExpression.Text, pattern)
+
+        ' Anzahl der referenzierten Spalten anzeigen
+        lblColumnCount.Text = $"Referenzierte Spalten: {matches.Count}"
+    End Sub
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+        ' Finale Validierung
+        ValidateExpression()
+
+        If lblValidation.ForeColor = Color.Green Then
+            _currentExpression = txtExpression.Text
+            Me.DialogResult = DialogResult.OK
+            Me.Close()
+        Else
+            MessageBox.Show("Bitte korrigieren Sie die Expression zuerst!", "Validierung fehlgeschlagen", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+        End If
+    End Sub
+
+    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+        Me.DialogResult = DialogResult.Cancel
+        Me.Close()
+    End Sub
+
+    Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click
+        txtExpression.EditValue = String.Empty
+        _currentExpression = ""
+    End Sub
+
+    ' Hilfeklassen
+    Private Class ListBoxItem
+        Public Property DisplayText As String
+        Public Property ColumnName As String
+        Public Property DataType As String
+
+        Public Overrides Function ToString() As String
+            Return DisplayText
+        End Function
+    End Class
+
+    Private Class FunctionItem
+        Public Property Name As String
+        Public Property Template As String
+        Public Property Description As String
+
+        Public Sub New(name As String, template As String, description As String)
+            Me.Name = name
+            Me.Template = template
+            Me.Description = description
+        End Sub
+
+        Public Overrides Function ToString() As String
+            Return $"{Name} - {Description}"
+        End Function
+    End Class
+End Class
--- a/app/TaskFlow/frmFormDesigner.Designer.vb
+++ b/app/TaskFlow/frmFormDesigner.Designer.vb
@@ -25,6 +25,8 @@ Partial Class frmFormDesigner
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormDesigner))
        Me.SplitContainerDesigner = New System.Windows.Forms.SplitContainer()
+        Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet()
        Me.pnldesigner = New DigitalData.Controls.SnapPanel.ClassSnapPanel()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.pgControlsNew = New DevExpress.XtraVerticalGrid.PropertyGridControl()
@@ -59,7 +61,6 @@ Partial Class frmFormDesigner
        Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet()
        Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
        Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -69,7 +70,6 @@ Partial Class frmFormDesigner
        Me.TBDD_CONNECTIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter()
        Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter()
-        Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBPM_CONTROL_TABLETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -79,15 +79,15 @@ Partial Class frmFormDesigner
        Me.SplitContainerDesigner.Panel1.SuspendLayout()
        Me.SplitContainerDesigner.Panel2.SuspendLayout()
        Me.SplitContainerDesigner.SuspendLayout()
+        CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GridControlContextMenu.SuspendLayout()
        CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'SplitContainerDesigner
@@ -97,12 +97,23 @@ Partial Class frmFormDesigner
        '
        'SplitContainerDesigner.Panel1
        '
+        resources.ApplyResources(Me.SplitContainerDesigner.Panel1, "SplitContainerDesigner.Panel1")
        Me.SplitContainerDesigner.Panel1.Controls.Add(Me.pnldesigner)
        '
        'SplitContainerDesigner.Panel2
        '
        Me.SplitContainerDesigner.Panel2.Controls.Add(Me.Panel1)
        '
+        'TBPM_CONTROL_TABLEBindingSource
+        '
+        Me.TBPM_CONTROL_TABLEBindingSource.DataMember = "TBPM_CONTROL_TABLE"
+        Me.TBPM_CONTROL_TABLEBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        '
+        'DD_DMSLiteDataSet
+        '
+        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
+        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
        'pnldesigner
        '
        resources.ApplyResources(Me.pnldesigner, "pnldesigner")
@@ -359,11 +370,6 @@ Partial Class frmFormDesigner
        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
        '
-        'DD_DMSLiteDataSet
-        '
-        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
-        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
        'TBDD_CONNECTIONBindingSource
        '
        Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION"
@@ -414,11 +420,6 @@ Partial Class frmFormDesigner
        '
        Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True
        '
-        'TBPM_CONTROL_TABLEBindingSource
-        '
-        Me.TBPM_CONTROL_TABLEBindingSource.DataMember = "TBPM_CONTROL_TABLE"
-        Me.TBPM_CONTROL_TABLEBindingSource.DataSource = Me.DD_DMSLiteDataSet
-        '
        'TBPM_CONTROL_TABLETableAdapter
        '
        Me.TBPM_CONTROL_TABLETableAdapter.ClearBeforeFill = True
@@ -463,15 +464,15 @@ Partial Class frmFormDesigner
        Me.SplitContainerDesigner.Panel2.ResumeLayout(False)
        CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerDesigner.ResumeLayout(False)
+        CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
        CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GridControlContextMenu.ResumeLayout(False)
        CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

--- a/app/TaskFlow/frmFormDesigner.resx
+++ b/app/TaskFlow/frmFormDesigner.resx
@@ -126,6 +126,9 @@
    <value>0, 132</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="SplitContainerDesigner.Panel1.AutoScroll" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
  <data name="pnldesigner.AutoScroll" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -562,12 +565,15 @@
  <data name="&gt;&gt;SplitContainerDesigner.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
-  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>368, 17</value>
+  <metadata name="TBPM_CONTROL_TABLEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
  </metadata>
  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>206, 17</value>
  </metadata>
+  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>368, 17</value>
+  </metadata>
  <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 56</value>
  </metadata>
@@ -607,9 +613,6 @@
  <metadata name="TBWH_CHECK_PROFILE_CONTROLSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>823, 56</value>
  </metadata>
-  <metadata name="TBPM_CONTROL_TABLEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
-  </metadata>
  <metadata name="TBPM_CONTROL_TABLETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>278, 95</value>
  </metadata>
@@ -1068,6 +1071,18 @@
  <data name="$this.Text" xml:space="preserve">
    <value>Formular Designer</value>
  </data>
+  <data name="&gt;&gt;TBPM_CONTROL_TABLEBindingSource.Name" xml:space="preserve">
+    <value>TBPM_CONTROL_TABLEBindingSource</value>
+  </data>
+  <data name="&gt;&gt;TBPM_CONTROL_TABLEBindingSource.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DD_DMSLiteDataSet.Name" xml:space="preserve">
+    <value>DD_DMSLiteDataSet</value>
+  </data>
+  <data name="&gt;&gt;DD_DMSLiteDataSet.Type" xml:space="preserve">
+    <value>taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
  <data name="&gt;&gt;bbtnItemFinishSQL.Name" xml:space="preserve">
    <value>bbtnItemFinishSQL</value>
  </data>
@@ -1242,12 +1257,6 @@
  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Type" xml:space="preserve">
    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;DD_DMSLiteDataSet.Name" xml:space="preserve">
-    <value>DD_DMSLiteDataSet</value>
-  </data>
-  <data name="&gt;&gt;DD_DMSLiteDataSet.Type" xml:space="preserve">
-    <value>taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
  <data name="&gt;&gt;TBDD_CONNECTIONBindingSource.Name" xml:space="preserve">
    <value>TBDD_CONNECTIONBindingSource</value>
  </data>
@@ -1296,12 +1305,6 @@
  <data name="&gt;&gt;TBWH_CHECK_PROFILE_CONTROLSTableAdapter.Type" xml:space="preserve">
    <value>taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
-  <data name="&gt;&gt;TBPM_CONTROL_TABLEBindingSource.Name" xml:space="preserve">
-    <value>TBPM_CONTROL_TABLEBindingSource</value>
-  </data>
-  <data name="&gt;&gt;TBPM_CONTROL_TABLEBindingSource.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;TBPM_CONTROL_TABLETableAdapter.Name" xml:space="preserve">
    <value>TBPM_CONTROL_TABLETableAdapter</value>
  </data>
--- a/app/TaskFlow/frmFormDesigner.vb
+++ b/app/TaskFlow/frmFormDesigner.vb
@@ -1,12 +1,10 @@
 Imports System.ComponentModel
-Imports DD_LIB_Standards
+
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
-Imports DigitalData.Modules.Language
 Imports System.Drawing
 Imports DigitalData.GUIs.Common
 Imports DevExpress.Utils.Filtering.Internal
@@ -52,7 +50,7 @@ Public Class frmFormDesigner
            ORDER BY NAME"
        )
        CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable().
-            Select(Function(row) row.ItemEx("NAME", String.Empty)).
+            Select(Function(row) ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), String.Empty)).
            ToList()
        _Logger.debug("Reloading control name list done!")
    End Sub
@@ -79,7 +77,7 @@ Public Class frmFormDesigner
            '  Try
            ' Windream initialisieren
            If IDB_ACTIVE = False Then
-                clsWindream.Create_Session()
+                'clsWindream.Create_Session()
                bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
            Else
                bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@@ -90,7 +88,7 @@ Public Class frmFormDesigner
            Dim unsortedIndicies
            Dim sortedIndicies As List(Of String)
            If IDB_ACTIVE = False Then
-                unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+                unsortedIndicies = WINDREAM_MOD.GetIndiciesByObjecttype(CURRENT_OBJECTTYPE).ToList()
                sortedIndicies = unsortedIndicies '.OrderBy(Function(index As String) index).ToList()
                sortedIndicies = sortedIndicies.OrderBy(Function(index As String) index).ToList
            Else
@@ -112,7 +110,7 @@ Public Class frmFormDesigner
            If IDB_ACTIVE = False Then
                Windream_ChoiceLists = New List(Of String)
                Windream_ChoiceLists.Add(String.Empty)
-                Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists())
+                Windream_ChoiceLists.AddRange(WINDREAM_MOD.GetChoiceLists())
            End If

            'Catch ex As Exception
@@ -146,7 +144,7 @@ Public Class frmFormDesigner
            Dim missingIndexControls As New List(Of String)

            For Each row As DataRow In dt.Rows
-                If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
+                If ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
                    missingIndexControls.Add(row.Item("NAME"))
                End If
            Next
@@ -175,8 +173,11 @@ Public Class frmFormDesigner
    ''' </summary>
    Private Function IsVectorIndex(IndexName As String) As Boolean
        Dim oType As Integer
+        If IndexName = "@@DISPLAY_ONLY" Then
+            Return 0
+        End If
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -185,9 +186,9 @@ Public Class frmFormDesigner
    End Function

    Private Function IsNotBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -195,9 +196,9 @@ Public Class frmFormDesigner
    End Function

    Private Function IsNotDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -205,9 +206,9 @@ Public Class frmFormDesigner
    End Function

    Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -215,9 +216,9 @@ Public Class frmFormDesigner
    End Function

    Private Function IsNotVectorDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -225,9 +226,9 @@ Public Class frmFormDesigner
    End Function

    Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
        If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
        Else
            oType = IDBData.GetTypeOfIndex(IndexName)
        End If
@@ -248,12 +249,12 @@ Public Class frmFormDesigner
                Dim name As String = row.Item("NAME")
                Dim x As Integer = row.Item("X_LOC")
                Dim y As Integer = row.Item("Y_LOC")
-                Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
-                Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
-                Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
+                Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
+                Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
+                Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
                Dim family As FontFamily = New FontFamily(familyString)
                Dim font As New Font(family, size, style, GraphicsUnit.Point)
-                Dim color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), 0))
+                Dim color As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0))


                ' Jetzt die Control spezifischen Eigenschaften zuweisen
@@ -290,20 +291,25 @@ Public Class frmFormDesigner
                        SetMovementHandlers(dgv)

                    Case "TABLE"
-
-                        Dim oSQL = $"SELECT IIF(LANG.CAPTION IS NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* FROM TBPM_CONTROL_TABLE T
+                        Try
+                            Dim oSQL = $"Select IIF(LANG.CAPTION Is NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* FROM TBPM_CONTROL_TABLE T
                            INNER JOIN TBPM_PROFILE_CONTROLS T1 ON T.CONTROL_ID = T1.GUID LEFT JOIN (SELECT * FROM TBPM_CONTOL_TABLE_LANG WHERE LANG_CODE = '{USER_LANGUAGE}') LANG ON T.GUID = LANG.COL_ID  
                            WHERE T1.CONTROL_ACTIVE = 1  AND  T.CONTROL_ID = T1.GUID AND T.CONTROL_ID = {guid} ORDER BY T.SEQUENCE"
-                        Dim oDTColumnsPerDevExGrid As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "FDesignLaodControls")
+                            Dim oDTColumnsPerDevExGrid As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "FDesignLaodControls")


-                        Dim table = ControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True)
+                            Dim table = ControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True, "EUR")

-                        AddHandler table.MouseClick, AddressOf gridControl_MouseClick
-                        ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
+                            AddHandler table.MouseClick, AddressOf gridControl_MouseClick
+                            ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
+
+                            pnldesigner.Controls.Add(table)
+                            SetMovementHandlers(table)
+                        Catch ex As Exception
+                            _Logger.Error(ex)
+                            MsgBox("Error while loading Table Control with Id " & guid & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
+                        End Try

-                        pnldesigner.Controls.Add(table)
-                        SetMovementHandlers(table)

                    Case "LOOKUP"
                        Dim lookup = ControlCreator.CreateExistingLookupControl(row, True)
@@ -581,19 +587,20 @@ Public Class frmFormDesigner
        obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
        obj.Name = row.Item("NAME")
        obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-        obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing)
-        obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "")
+        obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
+        obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")

-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
-        Dim family As FontFamily = New FontFamily(familyString)
+        Dim oStyle As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
+        Dim oSize As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
+        Dim oFamilyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
+        Dim oFamily As FontFamily = New FontFamily(oFamilyString)

-        obj.Font = New Font(family, size, style)
+        obj.Font = New Font(oFamily, oSize, oStyle)

-        Dim color As Integer = NotNull(row.Item("FONT_COLOR"), 0)
+        Dim oColor As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)

-        obj.TextColor = IntToColor(color)
+        obj.TextColor = IntToColor(oColor)
+        obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near")

        Return obj
    End Function
@@ -614,11 +621,11 @@ Public Class frmFormDesigner
        obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED"))
        obj.Required = StrToBool(row.Item("VALIDATION"))
        obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
-        obj.Index = NotNull(row.Item("INDEX_NAME"), "")
-        obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing)
-
+        obj.Index = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
+        obj.DefaultValue = ClassAllgemeineFunktionen.NotNullString(row.Item("DEFAULT_VALUE"), Nothing)
+        obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near")
        ' Default value for ConnectionID
-        Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
+        Dim oConnectionId = ClassAllgemeineFunktionen.NotNullString(row.Item("CONNECTION_ID"), 0)
        obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
        Return obj
    End Function
@@ -679,9 +686,9 @@ Public Class frmFormDesigner
                Dim check As CheckBox = sender
                Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies)
                checkProps.Text = check.Text
-                checkProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                checkProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                checkProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                checkProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                checkProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                props = checkProps
            ElseIf TypeOf sender Is LookupControl3 Then
                Dim oLookup As LookupControl3 = sender
@@ -690,20 +697,20 @@ Public Class frmFormDesigner
                lookupProps.PreventDuplicates = StrToBool(oRow.Item("VKT_PREVENT_MULTIPLE_VALUES"))
                lookupProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
                lookupProps.DisplayAsComboBox = False
-                lookupProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                lookupProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                lookupProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                lookupProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                lookupProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                lookupProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))

                props = lookupProps
            ElseIf TypeOf sender Is TextEdit Then
                'Dim txt As TextEdit = sender
                Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies)
-                txtProps.Regex = NotNull(oRow.Item("REGEX_MATCH"), String.Empty)
-                txtProps.RegexMessage = NotNull(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
-                txtProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                txtProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                txtProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
-                txtProps.DisplayFormat = oRow.ItemEx("FORMAT_STRING", ClassControlCreator.CONTROL_TYPE_TEXT)
+                txtProps.Regex = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MATCH"), String.Empty)
+                txtProps.RegexMessage = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
+                txtProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                txtProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                txtProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
+                txtProps.DisplayFormat = ClassAllgemeineFunktionen.NotNullString(oRow.Item("FORMAT_STRING"), ClassControlCreator.CONTROL_TYPE_TEXT)

                props = txtProps

@@ -711,18 +718,18 @@ Public Class frmFormDesigner
                Dim cmb As Windows.Forms.ComboBox = sender
                Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, oRow, Source_AllIndicies)
                cmbProps.ChoiceLists = Windream_ChoiceLists
-                cmbProps.ChoiceList = NotNull(oRow.Item("CHOICE_LIST"), String.Empty)
-                cmbProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                cmbProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                cmbProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                cmbProps.ChoiceList = ClassAllgemeineFunktionen.NotNullString(oRow.Item("CHOICE_LIST"), String.Empty)
+                cmbProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                cmbProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                cmbProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                props = cmbProps
                cmbProps.DisplayAsLookUpControl = False

            ElseIf TypeOf sender Is DateTimePicker Then
                Dim dtp As DateTimePicker = sender
                Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, oRow, Source_AllIndicies)
-                dtpProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                dtpProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                dtpProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                dtpProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                props = dtpProps

            ElseIf TypeOf sender Is DataGridView Then
@@ -737,17 +744,17 @@ Public Class frmFormDesigner
                Dim oGridControl As GridControl = sender
                Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, oRow, Source_VectorIndicies)
                oGridProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
-                oGridProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                oGridProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oGridProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                oGridProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                props = oGridProps
            ElseIf TypeOf sender Is Button Then
                Dim oButton As Button = sender
                Dim oButtonProps As ButtonProperties = CreatePropsObject(New ButtonProperties, oRow, Source_VectorIndicies)
                oButtonProps.Text = oButton.Text
                oButtonProps.SQLCommand = New SQLValue(oRow.Item("SQL_UEBERPRUEFUNG"))
-                oButtonProps.Override_SQL = New SQLValue(NotNull(oRow.Item("SQL2"), ""))
-                oButtonProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                oButtonProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oButtonProps.Override_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL2"), ""))
+                oButtonProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                oButtonProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                If Not IsDBNull(oRow.Item("IMAGE_CONTROL")) Then
                    Dim obimg() As Byte = oRow.Item("IMAGE_CONTROL")
                    Dim oBitmap As Bitmap = ByteArrayToBitmap(obimg)
@@ -907,7 +914,19 @@ Public Class frmFormDesigner

            Case "DisplayFormat"
                UpdateSingleValue("FORMAT_STRING", newValue)
-
+            Case "TextAlignment"
+                UpdateSingleValue("TEXT_ALIGNMENT", newValue)
+                Select Case CurrentControl.GetType()
+                    Case GetType(TextEdit)
+                        If TypeOf CurrentControl Is DevExpress.XtraEditors.TextEdit Then
+                            Dim txt = DirectCast(CurrentControl, DevExpress.XtraEditors.TextEdit)
+                            Select Case newValue
+                                Case "Near" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+                                Case "Center" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+                                Case "Far" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
+                            End Select
+                        End If
+                End Select
        End Select
    End Sub

@@ -980,7 +999,7 @@ Public Class frmFormDesigner

    Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click
        Try
-            Dim oGuid = clsTools.ShortGuid()
+            Dim oGuid = ClassAllgemeineFunktionen.NewShortGuid()
            Dim oColumnName As String = "colNew" & oGuid
            Dim oColumnCaption As String = "New Column " & oGuid
            If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then
@@ -1121,14 +1140,13 @@ Public Class frmFormDesigner
        If Cursor = Cursors.Cross And Mouse_IsPressed = True Then
            Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position)
            Mouse_IsPressed = False
-
            Try
                Select Case NewControlSelected
                    Case ClassControlCreator.PREFIX_LABEL
                        Dim label = ControlCreator.CreateNewLabel(cursorPosition)
                        SetMovementHandlers(label)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width, label.TextAlign)
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = label
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1136,14 +1154,13 @@ Public Class frmFormDesigner
                            .ReadOnly = False
                        }

-
                        pnldesigner.Controls.Add(label)

                    Case ClassControlCreator.PREFIX_TEXTBOX
                        Dim txt = ControlCreator.CreateNewTextBox(cursorPosition)
                        SetMovementHandlers(txt)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width, txt.Properties.Appearance.TextOptions.HAlignment)
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = txt
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1157,7 +1174,7 @@ Public Class frmFormDesigner
                        Dim cmb = ControlCreator.CreateNewCombobox(cursorPosition)
                        SetMovementHandlers(cmb)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = cmb
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1171,7 +1188,7 @@ Public Class frmFormDesigner
                        Dim dtp = ControlCreator.CreateNewDatetimepicker(cursorPosition)
                        SetMovementHandlers(dtp)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = dtp
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1185,7 +1202,7 @@ Public Class frmFormDesigner
                        Dim chk = ControlCreator.CreateNewCheckbox(cursorPosition)
                        SetMovementHandlers(chk)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = chk
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1200,7 +1217,7 @@ Public Class frmFormDesigner

                        SetMovementHandlers(lc)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width, lc.Properties.Appearance.TextOptions.HAlignment)
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = lc
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1216,7 +1233,7 @@ Public Class frmFormDesigner
                        SetMovementHandlers(tb)
                        AddHandler tb.MouseClick, AddressOf gridControl_MouseClick

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        Dim oControlId = GetLastID()

@@ -1226,8 +1243,8 @@ Public Class frmFormDesigner
                            .ReadOnly = False
                        }

-                        TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME, "TEXT")
-                        TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME, "TEXT")
+                        TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME, "TEXT", 0)
+                        TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME, "TEXT", 0)

                        pnldesigner.Controls.Add(tb)
                    Case ClassControlCreator.PREFIX_LINE
@@ -1235,7 +1252,7 @@ Public Class frmFormDesigner

                        SetMovementHandlers(line)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = line
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1250,7 +1267,7 @@ Public Class frmFormDesigner

                        SetMovementHandlers(oButton)

-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width, "NONE")
                        CHANGES_FORM_DESIGN = True
                        CurrentControl = oButton
                        CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
--- a/app/TaskFlow/frmGhostMode.vb
+++ b/app/TaskFlow/frmGhostMode.vb
@@ -1,11 +1,11 @@
 Public Class frmGhostMode
    Private Sub frmGhostMode_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Dim oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS where TITLE = 'GHOST_SELECT'"
+        Dim oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS WITH (NOLOCK) where TITLE = 'GHOST_SELECT'"
        Dim DT_USER = DatabaseFallback.GetDatatableECM(oSQL)
        ' 
        If IsNothing(DT_USER) Then
            LOGGER.Info("GHOST Select 1 was nothing, now trying 2nd..")
-            oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WHERE CONFIG_NAME = 'GHOST_SELECT'"
+            oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WITH (NOLOCK) WHERE CONFIG_NAME = 'GHOST_SELECT'"
            If Not IsNothing(oSQL) Then
                oSQL = DatabaseFallback.GetScalarValueIDB(oSQL)
                DT_USER = DatabaseFallback.GetDatatableIDB(oSQL)
--- a/app/TaskFlow/frmMain.Designer.vb
+++ b/app/TaskFlow/frmMain.Designer.vb
@@ -83,6 +83,7 @@ Partial Class frmMain
        Me.BBtnItmNotfications = New DevExpress.XtraBars.BarButtonItem()
        Me.BSIVERSION1 = New DevExpress.XtraBars.BarStaticItem()
        Me.barbtnitmsaveLogfiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsitmCount = New DevExpress.XtraBars.BarStaticItem()
        Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -245,6 +246,7 @@ Partial Class frmMain
        '
        'Panel1
        '
+        Me.Panel1.BackColor = System.Drawing.Color.Transparent
        Me.Panel1.Controls.Add(Me.GridControlWorkflows)
        Me.Panel1.Controls.Add(Me.Panel2)
        Me.Panel1.Controls.Add(Me.NavBarControl1)
@@ -263,6 +265,8 @@ Partial Class frmMain
        '
        Me.GridViewWorkflows.Appearance.EvenRow.BackColor = System.Drawing.Color.Azure
        Me.GridViewWorkflows.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewWorkflows.Appearance.FooterPanel.Font = CType(resources.GetObject("GridViewWorkflows.Appearance.FooterPanel.Font"), System.Drawing.Font)
+        Me.GridViewWorkflows.Appearance.FooterPanel.Options.UseFont = True
        Me.GridViewWorkflows.Appearance.ViewCaption.Font = CType(resources.GetObject("GridViewWorkflows.Appearance.ViewCaption.Font"), System.Drawing.Font)
        Me.GridViewWorkflows.Appearance.ViewCaption.ForeColor = System.Drawing.Color.Black
        Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseFont = True
@@ -289,9 +293,9 @@ Partial Class frmMain
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles, Me.bsitmCount})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 56
+        Me.RibbonControl1.MaxItemId = 57
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen})
        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize})
@@ -721,6 +725,13 @@ Partial Class frmMain
        Me.barbtnitmsaveLogfiles.Name = "barbtnitmsaveLogfiles"
        Me.barbtnitmsaveLogfiles.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
        '
+        'bsitmCount
+        '
+        resources.ApplyResources(Me.bsitmCount, "bsitmCount")
+        Me.bsitmCount.Id = 56
+        Me.bsitmCount.Name = "bsitmCount"
+        Me.bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+        '
        'RibbonPageStart
        '
        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW})
@@ -847,6 +858,7 @@ Partial Class frmMain
        Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmCount)
        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -1799,4 +1811,5 @@ Partial Class frmMain
    Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView
    Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bsitmCount As DevExpress.XtraBars.BarStaticItem
 End Class
--- a/app/TaskFlow/frmMain.resx
+++ b/app/TaskFlow/frmMain.resx
--- a/app/TaskFlow/frmMain.vb
+++ b/app/TaskFlow/frmMain.vb
--- a/app/TaskFlow/frmMassValidator.vb
+++ b/app/TaskFlow/frmMassValidator.vb
@@ -323,7 +323,7 @@ Public Class frmMassValidator
                            lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
                            lookup.Properties.MultiSelect = oMultiselect

-                            If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
+                            If ClassAllgemeineFunktionen.NotNullString(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
                                lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
                            End If

@@ -355,7 +355,7 @@ Public Class frmMassValidator
                        LOGGER.Debug("Versuch Tabelle zu laden")
                        Dim oDTMyColumns As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")

-                        oControl = ControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False)
+                        oControl = ControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False, CURRENT_DOC_CURRENCY)
                End Select

                If oControl IsNot Nothing AndAlso TypeOf oControl IsNot Label Then
@@ -449,7 +449,7 @@ Public Class frmMassValidator
                End If
                Dim idxname As String = controlRow.Item("INDEX_NAME")
                ' Wenn kein defaultValue existiert, leeren String setzen
-                Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty)
+                Dim defaultValue As String = ClassAllgemeineFunktionen.NotNullString(controlRow.Item("DEFAULT_VALUE"), String.Empty)
                indexname = idxname
                Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE")
                LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString)
@@ -474,7 +474,7 @@ Public Class frmMassValidator
                                If wertWD = "" And defaultValue <> "" Then
                                    oControl.Text = defaultValue
                                Else
-                                    oControl.Text = NotNull(wertWD, defaultValue)
+                                    oControl.Text = ClassAllgemeineFunktionen.NotNullString(wertWD, defaultValue)
                                End If

                            End If
@@ -539,12 +539,15 @@ Public Class frmMassValidator
                                    Select Case Typ
                                            'Tabellendarstellung
                                        Case "TABLE"
-                                            Dim dt As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues")
+                                            Dim osqlControlTable = String.Format("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {0} ORDER BY SEQUENCE", CONTROL_ID)
+                                            Dim oDTCONTROL_TABLE As DataTable = DatabaseFallback.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(osqlControlTable, DatabaseType.ECM) With {
+                                                                                                .FilterExpression = $"CONTROL_ID = {CONTROL_ID}' ",
+                                                                                                .SortByColumn = "SEQUENCE"}) ', "MV_FillIndexValues")
                                            Dim SpaltenWerte As String()
-                                            If dt.Rows.Count > 1 Then
+                                            If oDTCONTROL_TABLE.Rows.Count > 1 Then
                                                For Each Zeile As Object In wertWD
                                                    SpaltenWerte = Split(Zeile, Delimiter)
-                                                    Select Case dt.Rows.Count
+                                                    Select Case oDTCONTROL_TABLE.Rows.Count
                                                        Case 2
                                                            If SpaltenWerte.Length = 2 Then
                                                                dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)})
@@ -915,7 +918,7 @@ Public Class frmMassValidator

                    Else
                        'not implemented     
-                        LOGGER.Warn("Depending_Control_Set_Result for [{0}] NOT IMPLEMENTED", displayboxname)
+                        LOGGER.Warn("⚠️ Depending_Control_Set_Result for [{0}] NOT IMPLEMENTED", displayboxname)
                    End If
                Else
                    If oResultTable.Rows.Count = 1 Then
@@ -926,7 +929,7 @@ Public Class frmMassValidator
                    End If
                End If
            Else
-                LOGGER.Warn("Result Table is nothing!")
+                LOGGER.Warn("⚠️ Result Table is nothing!")
            End If
        Catch ex As Exception
            LOGGER.Info("Unexpected Ersror in Depending_Control_Set_Result - ERROR: " & ex.Message)
@@ -1339,15 +1342,14 @@ Public Class frmMassValidator
        Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
        oResult = DatabaseFallback.GetScalarValueECM(oSQL)
        LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...")
+        LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+        oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
+        oResult = DatabaseFallback.GetScalarValueECM(oSQL)
+        LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
        If File.Exists(oResult) = False Then
-            LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
-            oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
-            oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-            LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
-            If File.Exists(oResult) = False Then
-                Return False
-            End If
+            Return False
        End If
+
        WMDocPathWindows = oResult

        CURRENT_DOC_PATH = WMDocPathWindows
--- a/app/TaskFlow/frmMonitor.vb
+++ b/app/TaskFlow/frmMonitor.vb
@@ -36,7 +36,7 @@ Public Class frmMonitor
                Try
                    oDocID = GridView1.GetFocusedRowCellValue(GridView1.Columns("ObjectID"))
                Catch ex1 As Exception
-                    LOGGER.Warn("Could not get Doc/ObjectReference: " & ex.Message)
+                    LOGGER.Warn("⚠️ Could not get Doc/ObjectReference: " & ex.Message)
                    MsgBox("Could not get Doc/ObjectReference: " & ex.Message, MsgBoxStyle.Critical, "Load_Detail")
                    Exit Sub
                End Try
@@ -174,7 +174,7 @@ Public Class frmMonitor
                '_frmDocView.LoadFile(oDocPath)

                If File.Exists(oDocPath) Then
-                    DocumentViewerMonitor.LoadFile(oDocPath)
+                    DocumentViewerMonitor.LoadFile_FromPath(oDocPath)
                    BarStaticItemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                    DocumentViewerMonitor.Visible = True
                    ' DocumentViewerMonitor.RightOnlyView(USER_RIGHT_VIEW_ONLY)
@@ -523,7 +523,7 @@ Public Class frmMonitor
                LOGGER.Warn($"Error getting DocPath in Monitor: {ex.Message}")
                Exit Sub
            End Try
-            DocumentViewerMonitor?.LoadFile(oDocPath)
+            DocumentViewerMonitor?.LoadFile_FromPath(oDocPath)

            'If oDocPath <> "" Then
            '    If Not Application.OpenForms().OfType(Of frmValidator).Any Then
--- a/app/TaskFlow/frmValidator.Designer.vb
+++ b/app/TaskFlow/frmValidator.Designer.vb
@@ -90,7 +90,6 @@ Partial Class frmValidator
        Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem()
        Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem()
        Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem()
-        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
        Me.bbtnitmInfoWorkflow = New DevExpress.XtraBars.BarButtonItem()
        Me.bchkitmNotes = New DevExpress.XtraBars.BarCheckItem()
        Me.BarButtonGroup1 = New DevExpress.XtraBars.BarButtonGroup()
@@ -153,7 +152,7 @@ Partial Class frmValidator
        '
        Me.SplitContainerButtons.Panel2.Controls.Add(Me.btnSave)
        resources.ApplyResources(Me.SplitContainerButtons.Panel2, "SplitContainerButtons.Panel2")
-        Me.SplitContainerButtons.SplitterPosition = 389
+        Me.SplitContainerButtons.SplitterPosition = 303
        '
        'SplitContainerReject_NotResp
        '
@@ -168,7 +167,7 @@ Partial Class frmValidator
        'SplitContainerReject_NotResp.Panel2
        '
        Me.SplitContainerReject_NotResp.Panel2.Controls.Add(Me.btnNotResponsible)
-        Me.SplitContainerReject_NotResp.SplitterPosition = 197
+        Me.SplitContainerReject_NotResp.SplitterPosition = 153
        '
        'btnReject
        '
@@ -259,9 +258,11 @@ Partial Class frmValidator
        '
        'DocumentViewer1
        '
+        Me.DocumentViewer1.BackColor = System.Drawing.SystemColors.ControlLightLight
        resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
        Me.DocumentViewer1.FileLoaded = False
        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
        '
        'BarManager1
        '
@@ -514,11 +515,13 @@ Partial Class frmValidator
        '
        'RibbonControl1
        '
+        Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(23, 24, 23, 24)
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 38
+        Me.RibbonControl1.MaxItemId = 39
        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.OptionsMenuMinWidth = 257
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -692,16 +695,6 @@ Partial Class frmValidator
        Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True
        Me.Attmnt_bbtnitm_LoadonClick.Name = "Attmnt_bbtnitm_LoadonClick"
        '
-        'BarButtonItem6
-        '
-        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
-        Me.BarButtonItem6.Id = 32
-        Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem6.Name = "BarButtonItem6"
-        Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
-        Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-        '
        'bbtnitmInfoWorkflow
        '
        resources.ApplyResources(Me.bbtnitmInfoWorkflow, "bbtnitmInfoWorkflow")
@@ -746,10 +739,10 @@ Partial Class frmValidator
        '
        'RbnPgGrpActions
        '
+        Me.RbnPgGrpActions.AllowTextClipping = False
        Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniNext)
        Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniDelete)
        Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniAnnotation)
-        Me.RbnPgGrpActions.ItemLinks.Add(Me.BarButtonItem6)
        Me.RbnPgGrpActions.Name = "RbnPgGrpActions"
        resources.ApplyResources(Me.RbnPgGrpActions, "RbnPgGrpActions")
        Me.RbnPgGrpActions.Visible = False
@@ -939,7 +932,6 @@ Partial Class frmValidator
    Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
    Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem
    Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem
-    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents pnlMain As DevExpress.XtraEditors.PanelControl
    Friend WithEvents btnSave As DevExpress.XtraEditors.SimpleButton
    Friend WithEvents DESCRIPTIONLabel As DevExpress.XtraEditors.LabelControl
--- a/app/TaskFlow/frmValidator.resx
+++ b/app/TaskFlow/frmValidator.resx
@@ -189,7 +189,7 @@
    <value>0, 0</value>
  </data>
  <data name="btnReject.Size" type="System.Drawing.Size, System.Drawing">
-    <value>197, 50</value>
+    <value>153, 50</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="btnReject.TabIndex" type="System.Int32, mscorlib">
@@ -284,7 +284,7 @@
    <value>0, 0</value>
  </data>
  <data name="btnNotResponsible.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 50</value>
+    <value>140, 50</value>
  </data>
  <data name="btnNotResponsible.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -317,7 +317,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerReject_NotResp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>389, 50</value>
+    <value>303, 50</value>
  </data>
  <data name="SplitContainerReject_NotResp.TabIndex" type="System.Int32, mscorlib">
    <value>46</value>
@@ -411,7 +411,7 @@
    <value>0, 0</value>
  </data>
  <data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
-    <value>250, 50</value>
+    <value>334, 50</value>
  </data>
  <data name="btnSave.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -447,7 +447,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing">
-    <value>649, 50</value>
+    <value>647, 50</value>
  </data>
  <data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib">
    <value>45</value>
@@ -480,7 +480,7 @@
    <value>6, 58</value>
  </data>
  <data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>642, 225</value>
+    <value>639, 225</value>
  </data>
  <data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -511,7 +511,7 @@
    <value>6, 33</value>
  </data>
  <data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>643, 26</value>
+    <value>640, 26</value>
  </data>
  <data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -544,7 +544,7 @@
    <value>5, 5</value>
  </data>
  <data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>643, 28</value>
+    <value>640, 28</value>
  </data>
  <data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -571,7 +571,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 341</value>
+    <value>651, 341</value>
  </data>
  <data name="pnlMain.TabIndex" type="System.Int32, mscorlib">
    <value>25</value>
@@ -606,11 +606,8 @@
  <data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
-  <data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 5, 4, 5</value>
-  </data>
  <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>519, 341</value>
+    <value>521, 341</value>
  </data>
  <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -619,7 +616,7 @@
    <value>DocumentViewer1</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
@@ -643,7 +640,7 @@
    <value>1176, 341</value>
  </data>
  <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>653</value>
+    <value>651</value>
  </data>
  <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
    <value>37</value>
@@ -1179,38 +1176,6 @@
  <data name="Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 8.25pt, style=Bold</value>
  </data>
-  <data name="BarButtonItem6.Caption" xml:space="preserve">
-    <value>Beleg anzeigen</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAExSURB
-        VDhPpZKxSsRQFET3Nyy18wOExcYv8G/0B+TAgkXKgAhmyzQWgsViY7FFZItsFFJobyMuWggLJuHKPHzh
-        mSgavDBwM3dmktz3RmY2+g96xFD0CGAXOI3j2CaTiQPwIE6zrj40bgJX0+nUlsulrVYrq+vaQb04zaSR
-        9ksAsAe8ZFlmqrd1Zdd3j3Z4duOew5JGWnlcALANvJZl2ZqPz29t/2jm8F1JK4+8CpgtFot2qDd7808B
-        KnnkVcC6qqp2oM/+S4A88v4aECLcSRhw4Zen6v5CCM18AQfyKmALeC6Kwg26S/QQp5lKWnnk9ce4E0WR
-        zefzNsQfo6Dem6UBnuTpXqSNNE0tSRLL89xdnqZpHNSLAzLgUtreTQyCxsAJcA+8f0K9uHFX3wsYih4x
-        FB8q0AjdQAvTBwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJSSURB
-        VFhHxZY9i1NBFIZ3/RNbbG1nJf4Nuy232dY/IcpavRYLW22ZEAvLEEIkkJRiYZYQi7QmYiCYRTTICgmO
-        PNe5YXJmbj4WvR544XLmnPc8k/sxOXDOHfxPRYmyFSXKVpQoW1GibEWJshUlNknSI0kvJHUkfZb004tr
-        cqxRQ20k67cTgKR7kk4lfZDkdhS19NB7dwBJDyT1cuNqteq63a4bjUZuPp+7xWKRiWtyrFETgNCLx/4A
-        kp5IusWoVqu5fr/vdg1q6fEQeOAVzUgCSDrUn8gMWq3WmvmXb7eu/u6je/rqvTt92V1bs0Fv8GsQh3Ze
-        CuAibxoOh2uGw09f3fnra/f4+ZuVtgUeAcSFnWeHn+XFk8lkzYid2+G7ABB4BRBnSQBJx5J+UDQYDKxH
-        9rPb4bsCEHh6AGYcpwCuKGg0GrY3C+65Hb4PAIG3h7hKAdywOJvNbF8WPHB2+L4AeHuAmxTAjMXpdGr7
-        sigCSKno7cDbA7DLCOCSxXq9bvuyKLoFKVGbCrw9wGUK4EjSdwra7bbtLXwIU6LWBp5+ODOOIgAPcSLp
-        F4Xj8XjNoOg1tKKG2jDw8sPxPglnrgF4iPP8nbWf39SHyA6nJgw8cj+87bwIwEI0m023XC5XhvZTjLgm
-        F+6cHno3DS8E8BAcp9kzUalUXK/XW5lvC2rpCe45XtGMjQAe4r6kt/kuMO10OoXHMWvBYEQvHvsfxwEE
-        pyMP53VgvE3U0kNvNvzOAAbmoaRnG/6SsUbNauhfBfgXihJlK0qUrShRtqJE2YoSZes3UL0KST/PhM0A
-        AAAASUVORK5CYII=
-</value>
-  </data>
  <data name="bbtnitmInfoWorkflow.Caption" xml:space="preserve">
    <value>Anzeigen</value>
  </data>
@@ -1861,12 +1826,6 @@
  <data name="&gt;&gt;Attmnt_bbtnitm_LoadonClick.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
-    <value>BarButtonItem6</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;bbtnitmInfoWorkflow.Name" xml:space="preserve">
    <value>bbtnitmInfoWorkflow</value>
  </data>
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
--- a/app/TaskFlow/frmValidatorSearch.Designer.vb
+++ b/app/TaskFlow/frmValidatorSearch.Designer.vb
@@ -313,9 +313,11 @@ Partial Class frmValidatorSearch
        '
        'DocumentViewer1
        '
+        Me.DocumentViewer1.BackColor = System.Drawing.SystemColors.ControlLightLight
        resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
        Me.DocumentViewer1.FileLoaded = False
        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
        '
        'SplitContainerSearches
        '
@@ -539,6 +541,7 @@ Partial Class frmValidatorSearch
        '
        'ToolStrip1
        '
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButtonFile, Me.ToolStripButtonRefreshSearches})
        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
        Me.ToolStrip1.Name = "ToolStrip1"
--- a/app/TaskFlow/frmValidatorSearch.resx
+++ b/app/TaskFlow/frmValidatorSearch.resx
@@ -138,7 +138,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 557</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -157,7 +157,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageDoc1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>349, 557</value>
  </data>
  <data name="XtraTabPageDoc1.Text" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -175,7 +175,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabControlDocs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>351, 582</value>
+    <value>351, 580</value>
  </data>
  <data name="XtraTabControlDocs.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -187,7 +187,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 557</value>
  </data>
  <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -205,7 +205,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageDoc2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>349, 557</value>
  </data>
  <data name="XtraTabPageDoc2.Text" xml:space="preserve">
    <value>XtraTabPage2</value>
@@ -229,7 +229,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 557</value>
  </data>
  <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -247,7 +247,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageDoc3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>349, 557</value>
  </data>
  <data name="XtraTabPageDoc3.Text" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -271,7 +271,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 557</value>
  </data>
  <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -289,7 +289,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageDoc4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>349, 557</value>
  </data>
  <data name="XtraTabPageDoc4.Text" xml:space="preserve">
    <value>XtraTabPage2</value>
@@ -313,7 +313,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 557</value>
  </data>
  <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -331,7 +331,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageDoc5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>349, 557</value>
  </data>
  <data name="XtraTabPageDoc5.Text" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -381,8 +381,11 @@
  <data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
+  <data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
  <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 582</value>
+    <value>503, 580</value>
  </data>
  <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -391,7 +394,7 @@
    <value>DocumentViewer1</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
    <value>SplitContainerControlDoc.Panel2</value>
@@ -415,7 +418,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 582</value>
+    <value>864, 580</value>
  </data>
  <data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
@@ -436,7 +439,7 @@
    <value>Fill</value>
  </data>
  <data name="SplitContainerSearches.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+    <value>0, 27</value>
  </data>
  <data name="XtraTabControlSQL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -451,7 +454,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>344, 560</value>
  </data>
  <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -469,7 +472,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>344, 560</value>
  </data>
  <data name="XtraTabPageSearch1.Text" xml:space="preserve">
    <value>Search1</value>
@@ -487,7 +490,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 585</value>
+    <value>346, 583</value>
  </data>
  <data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -499,7 +502,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>511, 560</value>
  </data>
  <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -517,7 +520,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 560</value>
  </data>
  <data name="XtraTabPageSearch2.Text" xml:space="preserve">
    <value>Search2</value>
@@ -541,7 +544,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>511, 560</value>
  </data>
  <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -559,7 +562,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 560</value>
  </data>
  <data name="XtraTabPageSearch3.Text" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -583,7 +586,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>511, 560</value>
  </data>
  <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -601,7 +604,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 560</value>
  </data>
  <data name="XtraTabPageSearch4.Text" xml:space="preserve">
    <value>XtraTabPage2</value>
@@ -625,7 +628,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>511, 560</value>
  </data>
  <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -643,7 +646,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 560</value>
  </data>
  <data name="XtraTabPageSearch5.Text" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -685,10 +688,10 @@
    <value>0, 17</value>
  </data>
  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 585</value>
+    <value>0, 583</value>
  </data>
  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 22</value>
+    <value>346, 22</value>
  </data>
  <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
@@ -739,10 +742,10 @@
    <value>No action so far</value>
  </data>
  <data name="ToolStrip2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 582</value>
+    <value>0, 580</value>
  </data>
  <data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 25</value>
+    <value>864, 25</value>
  </data>
  <data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -775,7 +778,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerSearches.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1214, 607</value>
+    <value>1214, 605</value>
  </data>
  <data name="SplitContainerSearches.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -811,7 +814,7 @@
    <value>Magenta</value>
  </data>
  <data name="ToolStripDropDownButtonFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 22</value>
+    <value>67, 24</value>
  </data>
  <data name="ToolStripDropDownButtonFile.Text" xml:space="preserve">
    <value>Datei</value>
@@ -820,7 +823,7 @@
    <value>Magenta</value>
  </data>
  <data name="ToolStripButtonRefreshSearches.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 22</value>
+    <value>135, 24</value>
  </data>
  <data name="ToolStripButtonRefreshSearches.Text" xml:space="preserve">
    <value>Aktualisiere Ansicht</value>
@@ -829,7 +832,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1214, 25</value>
+    <value>1214, 27</value>
  </data>
  <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -855,7 +858,7 @@
  <data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACbElE
        QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
        EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
        R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@@ -922,7 +925,7 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYdJREFUOE+NkG0rQ2Ec
        h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
        XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
        drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
--- a/app/TaskFlow/frmValidatorSearch.vb
+++ b/app/TaskFlow/frmValidatorSearch.vb
@@ -87,6 +87,7 @@ Public Class frmValidatorSearch
                '#### SQL Tabs Design Laden

                If DTSQL.Rows.Count > 0 Then
+                    LOGGER.Debug(String.Format("[{0} SQL-Definitions]", DTSQL.Rows.Count))
                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
                        If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
                            XtraTabControlSQL.TabPages(p).PageVisible = False
@@ -102,6 +103,7 @@ Public Class frmValidatorSearch
                End If

                If DTDOC.Rows.Count > 0 Then
+                    LOGGER.Debug(String.Format("[{0} Doc-Definitions]", DTDOC.Rows.Count))
                    '#### Doc Tabs Design Laden
                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
                        If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
@@ -440,7 +442,7 @@ Public Class frmValidatorSearch
            .ShowSettingButton = True
        })
        Catch ex As Exception
-            LOGGER.Warn("Error initializing DocViewDocsValdiatorSearch: " & ex.Message)
+            LOGGER.Warn("⚠️ Error initializing DocViewDocsValdiatorSearch: " & ex.Message)
        End Try

        OperationMode = GetOperationMode()
@@ -454,14 +456,67 @@ Public Class frmValidatorSearch
            End If
        End If
        If My.Settings.frmValidatorSearchSize.IsEmpty = False Then
-            Size = My.Settings.frmValidatorSearchSize
+            If My.Settings.frmValidatorSearchSize.Height > 120 And My.Settings.frmValidatorSearchSize.Width > 120 Then
+                Me.Size = My.Settings.frmValidatorSearchSize
+            End If
        End If
-        SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
+        If My.Settings.frmValSearchSplitterDistance > 20 Then
+            SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
+        End If
+

        ToolStripDropDownButtonFile.Visible = False
    End Sub

+    Private Sub EnsureFormIsVisible()
+        Try
+            ' Aktuellen Bildschirm basierend auf der Formularposition ermitteln
+            Dim currentScreen As Screen = Screen.FromPoint(Me.Location)
+            Dim workingArea As Rectangle = currentScreen.WorkingArea
+
+            ' Prüfen ob das Formular vollständig außerhalb des sichtbaren Bereichs liegt
+            Dim formBounds As New Rectangle(Me.Location, Me.Size)
+
+            ' Wenn das Formular nicht mit dem Arbeitsbereich überschneidet
+            If Not workingArea.IntersectsWith(formBounds) Then
+                CenterFormOnScreen()
+                Exit Sub
+            End If
+
+            ' Optional: Prüfen ob das Formular zu weit außerhalb liegt (z.B. nur 20% sichtbar)
+            Dim visibleArea As Rectangle = Rectangle.Intersect(workingArea, formBounds)
+            Dim visiblePercentage As Double = (visibleArea.Width * visibleArea.Height) / (formBounds.Width * formBounds.Height)
+
+            If visiblePercentage < 0.2 Then ' Weniger als 20% sichtbar
+                CenterFormOnScreen()
+            End If
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            ' Bei Fehler sicherheitshalber zentrieren
+            CenterFormOnScreen()
+        End Try
+    End Sub
+
+    Private Sub CenterFormOnScreen()
+        Try
+            ' Formular auf dem primären Bildschirm zentrieren
+            Me.StartPosition = FormStartPosition.CenterScreen
+
+            ' Alternative: Auf aktuellem Bildschirm zentrieren
+            Dim currentScreen As Screen = Screen.PrimaryScreen
+            Dim x As Integer = currentScreen.WorkingArea.Left + (currentScreen.WorkingArea.Width - Me.Width) \ 2
+            Dim y As Integer = currentScreen.WorkingArea.Top + (currentScreen.WorkingArea.Height - Me.Height) \ 2
+            Me.Location = New Point(x, y)
+
+            LOGGER.Info("Formular wurde zentriert, da es außerhalb des sichtbaren Bereichs lag")
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+    End Sub
    Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        ' Prüfen ob das Formular im sichtbaren Bereich liegt
+        EnsureFormIsVisible()
        formLoaded = True
    End Sub

@@ -535,7 +590,7 @@ Public Class frmValidatorSearch
                If Not IsNothing(DocumentViewer1) Then
                    Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}"
                    If Not IsNothing(oDocument.Contents) Then
-                        DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
+                        DocumentViewer1.LoadFile_FromPath(clsWMDocGrid.SELECTED_DOC_PATH) ',oFileName, New MemoryStream(oDocument.Contents))
                        LastDocID = clsWMDocGrid.SELECTED_DOC_ID
                        DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY)
                        If USER_RIGHT_VIEW_ONLY = True Then
@@ -624,7 +679,7 @@ Public Class frmValidatorSearch
                End If

            Else
-                LOGGER.Warn("Attention: RESULT_DOC_PATH is nothing")
+                LOGGER.Warn("⚠️ Attention: RESULT_DOC_PATH is nothing")
            End If
        Catch ex As Exception
            MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
--- a/app/TaskFlow/frmYesNo.Designer.vb
+++ b/app/TaskFlow/frmYesNo.Designer.vb
@@ -56,7 +56,7 @@ Partial Class frmYesNo
        '
        resources.ApplyResources(Me.PictureEdit1, "PictureEdit1")
        Me.PictureEdit1.Name = "PictureEdit1"
-        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control
+        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.White
        Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True
        Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
        Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
@@ -64,7 +64,7 @@ Partial Class frmYesNo
        '
        'txtQuestion
        '
-        Me.txtQuestion.BackColor = System.Drawing.SystemColors.Control
+        Me.txtQuestion.BackColor = System.Drawing.Color.White
        Me.txtQuestion.BorderStyle = System.Windows.Forms.BorderStyle.None
        resources.ApplyResources(Me.txtQuestion, "txtQuestion")
        Me.txtQuestion.Name = "txtQuestion"
--- a/app/TaskFlow/frmYesNo.resx
+++ b/app/TaskFlow/frmYesNo.resx
@@ -187,7 +187,7 @@
    <value>1</value>
  </data>
  <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>242, 277</value>
+    <value>243, 265</value>
  </data>
  <data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>4, 4, 4, 4</value>
@@ -273,7 +273,7 @@
    <value>True</value>
  </data>
  <data name="txtQuestion.Size" type="System.Drawing.Size, System.Drawing">
-    <value>378, 68</value>
+    <value>378, 54</value>
  </data>
  <data name="txtQuestion.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -330,7 +330,7 @@
    <value>True</value>
  </data>
  <data name="txtReason.Size" type="System.Drawing.Size, System.Drawing">
-    <value>428, 139</value>
+    <value>429, 135</value>
  </data>
  <data name="txtReason.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -354,7 +354,7 @@
    <value>7, 16</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>452, 326</value>
+    <value>453, 316</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 9.75pt</value>
--- a/app/TaskFlow/frmYesNo.vb
+++ b/app/TaskFlow/frmYesNo.vb
@@ -3,18 +3,20 @@
 Public Class frmYesNo
    Dim oQuestion As String
    Dim oCaption As String
+    Dim CommentInput As Boolean
    Public oComment As String
-    Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String)
+    Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String, pCommentInput As Boolean)
        MyBase.New()
        oQuestion = pQuestion
        oCaption = pCaption
        oComment = pCommentSoFar
+        CommentInput = pCommentInput
        InitializeComponent()
        ' Add any initialization after the InitializeComponent() call.

    End Sub
    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-        If txtReason.Text = String.Empty Then
+        If txtReason.Text = String.Empty And CommentInput = True Then
            Dim oStop As String
            If USER_LANGUAGE = "de-DE" Then
                oStop = "Bitte eine Begründung eingeben!"
@@ -42,6 +44,15 @@ Public Class frmYesNo
    Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load
        txtQuestion.Text = oQuestion
        txtReason.Text = oComment
+        If CommentInput = False Then
+            LabelControl1.Visible = False
+            txtReason.Visible = False
+            Me.Size = New Drawing.Size(455, 170)
+        Else
+            LabelControl1.Visible = True
+            txtReason.Visible = True
+            Me.Size = New Drawing.Size(455, 330)
+        End If
        Me.Text = oCaption
    End Sub
 End Class
--- a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll
+++ b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll
--- a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.filters.64.dll
+++ b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.filters.64.dll
--- a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.image.gdimgplug.64.dll
+++ b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.image.gdimgplug.64.dll
--- a/app/TaskFlow/packages.config
+++ b/app/TaskFlow/packages.config
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.GUIs.Common" version="2.6.2" targetFramework="net462" />
-  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
-  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Filesystem" version="1.3.3" targetFramework="net462" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
-  <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Patterns" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Windows" version="1.5.1" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.23" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.23" targetFramework="net462" />
+  <package id="Google.Protobuf" version="3.33.2" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
@@ -35,7 +28,7 @@
  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
-  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
  <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
  <package id="System.Management" version="9.0.0" targetFramework="net462" />
  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
@@ -44,6 +37,7 @@
  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
  <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
+  <package id="System.Threading.Channels" version="8.0.0" targetFramework="net462" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>
--- a/app/TaskFlow/taskFLOW-TEST-Debug.txt
+++ b/app/TaskFlow/taskFLOW-TEST-Debug.txt
--- a/app/TaskFlow/taskFLOW.vbproj
+++ b/app/TaskFlow/taskFLOW.vbproj
--- a/app/TaskFlow/taskFLOW.vbproj.backup
+++ b/app/TaskFlow/taskFLOW.vbproj.backup
--- a/app/update_devexpress.ps1
+++ b/app/update_devexpress.ps1
@@ -0,0 +1,35 @@
+$vbprojPath = "TaskFlow\taskFLOW.vbproj"
+$devExpressBasePath = "D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework"
+$content = Get-Content $vbprojPath -Raw
+
+# Liste aller DevExpress-Referenzen, die aktualisiert werden müssen
+$replacements = @(
+    @{
+        Old = '    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>'
+        New = '    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll</HintPath>
+    </Reference>'
+    },
+    @{
+        Old = '    <Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />'
+        New = '    <Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.CodeParser.v21.2.dll</HintPath>
+    </Reference>'
+    },
+    @{
+        Old = '    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />'
+        New = '    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
+    </Reference>'
+    }
+)
+
+foreach ($replacement in $replacements) {
+    $content = $content.Replace($replacement.Old, $replacement.New)
+}
+
+Set-Content $vbprojPath $content -NoNewline
+Write-Host "Updated DevExpress references"
--- a/app/update_devexpress_refs.py
+++ b/app/update_devexpress_refs.py
@@ -0,0 +1,28 @@
+import re
+
+vbproj_path = r"TaskFlow\taskFLOW.vbproj"
+devexpress_base_path = r"D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework"
+
+with open(vbproj_path, 'r', encoding='utf-8') as f:
+    content = f.read()
+
+# Pattern for DevExpress references without HintPath
+pattern = r'(<Reference Include="(DevExpress\.[^"]+\.v21\.2[^"]*)"[^>]*>)\s*(<SpecificVersion>False</SpecificVersion>)?\s*(</Reference>)'
+
+def replace_func(match):
+    full_ref = match.group(1)
+    dll_name = re.sub(r',.*$', '', match.group(2))
+    specific_version = match.group(3)
+    dll_filename = f"{dll_name}.dll"
+    
+    if specific_version:
+        return f"{full_ref}\r\n      {specific_version}\r\n      <HintPath>{devexpress_base_path}\\{dll_filename}</HintPath>\r\n    </Reference>"
+    else:
+        return f"{full_ref}\r\n      <HintPath>{devexpress_base_path}\\{dll_filename}</HintPath>\r\n    </Reference>"
+
+new_content = re.sub(pattern, replace_func, content)
+
+with open(vbproj_path, 'w', encoding='utf-8') as f:
+    f.write(new_content)
+
+print("DevExpress references updated successfully")
Author	SHA1	Message	Date
Developer01	f5ca487158	Session.Logout	2026-03-27 13:50:30 +01:00
Developer01	73e69b3eef	2.8.7.1	2026-03-27 12:48:25 +01:00
Developer01	cb51396952	FORMEL_SQL release Candidate	2026-03-25 15:20:39 +01:00
Developer01	c464f24681	Vor SetControlValuesChange	2026-03-20 13:43:09 +01:00
Developer01	969e07eb17	Vor Controls2B_EnDisabled Change	2026-03-11 16:43:34 +01:00
Developer01	7629d54fe1	2.8.4 Beta IDB replace Hochkomma bei Delete, Währungskonvertierung	2026-03-11 12:08:46 +01:00
Developer01	41e46f9dbb	Version 2.8.3 zu Test an MK und HE	2026-03-03 12:55:01 +01:00
Developer01	a192267d96	MS Anpassung Speicherung IDBData	2026-03-02 16:29:14 +01:00
Developer01	a0d3a487d8	Vor Ändeurng LoogUpControl	2026-02-27 11:46:09 +01:00
Developer01	54744a0531	Vor GridControl Length	2026-02-26 10:37:05 +01:00
Developer01	743ef3fe22	MS 2.8.2 Fehlerhandling und Column-Formel Test bei Henning	2026-02-25 13:16:12 +01:00
Developer01	25dcfb2061	VorKOG_Hotspots in LOD	2026-02-13 07:56:02 +01:00
Developer01	3e34b52c6f	2.8.1	2026-02-12 17:25:46 +01:00
Developer01	950aeba89e	2.8.1	2026-02-12 17:25:40 +01:00
Developer01	e086c5db14	Finalisierung Columnberechnungen - ab in den TEST	2026-02-12 10:19:28 +01:00
Developer01	4898d25388	Berechnung Spalten start	2026-02-10 17:40:15 +01:00
Developer01	c2b3c023b9	Merge in MAster	2026-02-10 13:05:24 +01:00
Developer01	034ca839ba	2.7.9 an WISAG ausgegeben	2026-02-05 16:58:19 +01:00
Developer01	05c4ee9f41	Bug Speichern Inherit Value und ReadOnly Columns	2026-02-02 16:58:04 +01:00
Developer01	83e31a2e00	Geschwindigkeitsoptimierungen Main	2026-02-02 11:44:17 +01:00
Developer01	bca424f50f	Optimierungen	2026-01-30 14:40:02 +01:00
Developer01	11d27cd860	Create_Basic_View	2026-01-30 13:02:55 +01:00
Developer01	969f27a91f	frm main Load Grid Optimierung	2026-01-30 13:00:16 +01:00
Developer01	b7d427b5eb	Decide_Load_Speed	2026-01-30 12:56:36 +01:00
Developer01	0f936c71e6	Speed Otimizing Lookp etc	2026-01-30 12:53:01 +01:00
Developer01	a53bfee8d5	ComboBOx Optimierung	2026-01-30 12:13:08 +01:00
Developer01	df4a8df25a	Optimierung Speed Load_Next Document	2026-01-30 12:09:21 +01:00
Developer01	0e6848aa69	Hotspots	2026-01-30 11:23:35 +01:00
Developer01	72b1e4acba	Vererbung Tabelle Finalisierung	2026-01-30 09:01:47 +01:00
Developer01	c249aa890d	Messpunkte integriert	2026-01-29 10:46:09 +01:00
Developer01	f1984572b7	2.7.7	2026-01-28 21:48:44 +01:00
Developer01	ce50bc2964	Vererbung Werte 1	2026-01-28 21:47:49 +01:00
Developer01	2a8beead00	Logging bzgl AdditionalTitle	2026-01-12 13:16:08 +01:00
Developer01	9b85d1552e	Laufzeitvererbung für Spaltenwerte implementiert. Eingeführter CellValueChanged-Handler plus HandleInheritedColumnValue prüfen das INHERIT_VALUE-Flag der Spaltendefinition. Werte werden ab dem bearbeiteten Eintrag auf alle folgenden Zeilen der aktiven Spalte übertragen, inklusive Schutz gegen rekursive Auslösung.	2026-01-12 11:36:03 +01:00
Developer01	9312c1244b	2.7.6.0 Indexierung Vektorfelder bei finalen INDexen	2025-12-22 14:13:50 +01:00
Developer01	55d7e025c9	Normalizing currency for windream	2025-12-16 17:21:18 +01:00
Developer01	2f64dc4b70	Vor Logging erweiterung in Tabelle Row Add	2025-12-12 10:04:53 +01:00
Developer01	17ec4953e5	WIX Aufruf über Link	2025-12-09 10:45:06 +01:00
Developer01	c29c508224	2.7.4	2025-12-05 14:03:07 +01:00
Developer01	443242415a	Alignmenttext und Currency	2025-12-05 09:22:01 +01:00
Developer01	4db9b71a29	Merge and Commit Master	2025-12-03 14:41:02 +01:00
Developer01	65b73b45bf	Currency Summary EUR	2025-12-03 14:29:18 +01:00
Developer01	4554c5841d	Validator NotResponible mit oder ohne override/inlcude FI	2025-12-03 14:11:30 +01:00
Developer01	eef779ab09	• Stabilisiert Ladevorgang und Positions-/Größen-Wiederherstellung des Formulars • Robustere Behandlung von Datenquellen, SQL-Placeholders und Verbindungs-IDs • Verbesserte Steuerlogik für abhängige Controls, Enable/Disable und SetControlData • Konsistente Verarbeitung von Vektorfeldern, Lookup, ComboBox, DateEdit und GridControl • Validierung: Pflichtfelder, Regex-Checks, Grid-Zellenvalidierung, Fehlerdialoge • Performance- und Logging-Verbesserungen, reduzierte Nebenwirkungen (Flags, Flow) • Zusätzliche Suchen: Preload, OnClick, UI-Anbindung, Refresh • Dokument-Viewer: Laden, Sichtbarkeit, PDF-Annotationen und Export-Workflow • Finale Indexierung inkl. SQL-basierten Werten, Work-History-Logging, Move2Folder • Fehlerbehandlung bei Überspringen/Löschen, Freigabe und Workflow-Abschluss • UI-Feedback: Statuslabel, Ribbon-Buttons, Tooltips, Ghost-Mode Unterstützung • Codehygiene: Null-/DBNull-Checks, Culture-Handling, farbliche Formatierung (Currency)	2025-11-26 14:05:37 +01:00
Developer01	040c7aeac0	2.7.3 WISAG • Erweiterung von SetControlValues_FromControl um Handling für DevExpress DateEdit (Parsing verschiedener Datumsformate, Farbanpassung). • Ergänzung einer analogen Fall-Branch für System.Windows.Forms.DateTimePicker (Fallback auf MinimumDateTime bei ungültigem oder leerem Caption). • Keine bestehenden Funktionen außerhalb der neuen Select-Case-Zweige angepasst. Nutzen: Ermöglicht dynamisches Setzen von Datumswerten aus SQL-Steuerdaten (Caption-Feld) für beide Datumstypen und konsistente Farbgestaltung wie bei anderen Steuerelementen. Hinweis: Validierungs- und Logging-Struktur wiederverwendet; keine Seiteneffekte auf andere Control-Typen.	2025-11-19 13:02:27 +01:00
Developer01	6eafe9d53a	Ms merge	2025-11-13 10:27:02 +01:00
Developer01	5b001aee03	Merge branch '2.6.1-Bugfix-Massenbearbeitung' into 2.7.0-Release	2025-10-22 08:37:12 +02:00
Developer01	5d69edab9f	Merge branch '2.6.0-Release' into 2.7.0-Release	2025-10-22 08:36:34 +02:00
Developer01	c3f1687648	Referenzen upgedated	2025-10-22 08:30:21 +02:00
Developer01	b526108d5d	Master empty row für GIT	2025-09-11 14:30:31 +02:00
Developer01	c9badc29bd	GIT_TEST	2025-09-11 14:28:44 +02:00
Developer01	fc271e0a82	Änderungen aus 2.61 Bugfix	2025-09-09 17:33:56 +02:00
Developer01	7da4c89777	Finales Bugfix	2025-09-09 17:30:01 +02:00
Developer01	fd2f59af04	Übernahme frmValidator-Logik aus Bugfix 2.6.1	2025-09-09 11:26:49 +02:00
Developer01	d7520ac86a	V1 - Anpassung frmValidator Logik Massenbarbeitung	2025-09-09 11:25:37 +02:00
Developer01	0eb480b427	frmValidator - SQLEnable funktionierte nicht bei Massenbearbeitung	2025-09-09 10:44:42 +02:00
Developer01	46d6cb0069	Dashboard gelöscht	2025-09-04 14:36:56 +02:00
Developer01	daf1c16b30	DocumentViewer Aufruf über Pfad (txtDateien)	2025-08-22 08:46:26 +02:00