Sichtbarkeit & Logging für rbnPgGroupAttmt verbessert

- AssemblyVersion auf 2.9.1.0 erhöht
- Sichtbarkeit von rbnPgGroupAttmt wird nun explizit vor Rückgabe gesetzt, abhängig von den Suchergebnissen
- In FillIndexValues wird jetzt korrekt auf "CONNECTION_ID" geprüft und geloggt (statt "CONN_ID")
- Gleiches gilt für das finale Indexing bei dynamischen SQL-Befehlen
- Logmeldungen und Tab-Preloading-Verhalten wurden entsprechend angepasst und überprüft

app/SetupVS19/Product.wxs

@@ -99,23 +99,17 @@
 			</Component>-->
 
 			<Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-				<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
+				<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
-				<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll"/>
+				<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll"/>
-				<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll"/>
+				<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll"/>
-				<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll"/>
+				<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll"/>
 			</Component>
 
 			<Component Id="FormsUtilsLibs" Guid="51c183a7-af21-481a-bd34-0e547e6f6e1c">
-				<File Id="FormsUtilsLib" Name="FormsUtils.dll" Source="P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll" KeyPath="yes" />
+				<File Id="FormsUtilsLib" Name="FormsUtils.dll" Source="M:\Bibliotheken\3rdParty\FormsUtils.dll" KeyPath="yes" />
-			</Component>
-
-			<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-				<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll" KeyPath="yes"/>
 			</Component>
 
 			<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-				<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
-				<File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll"/>
 				<File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll"/>
 				<File Id="DDSnapPanel" Name="DigitalData.Controls.SnapPanel.dll" Source="DigitalData.Controls.SnapPanel.dll"/>
 				<File Id="DDCommonGUIs" Name="DigitalData.GUIs.Common.dll" Source="DigitalData.GUIs.Common.dll"/>
@@ -137,40 +131,60 @@
 				<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">
-			<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+        <File Id="Newtonsoft.Json" Name="Newtonsoft.Json.dll" Source="Newtonsoft.Json.dll" KeyPath="yes" />
-				<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
+        <File Id="System.Text.Json" Name="System.Text.Json.dll" Source="System.Text.Json.dll" />
-			</Component>
+        <File Id="FirebirdSql.Data.FirebirdClient" Name="FirebirdSql.Data.FirebirdClient.dll" Source="FirebirdSql.Data.FirebirdClient.dll" />
-
+        <File Id="EntityFramework" Name="EntityFramework.dll" Source="EntityFramework.dll" />
-			<Component Id="PDFsharp" Guid="9cd1cfb7-3f84-4a8b-aa51-642b723fcd70">
+        <File Id="EntityFramework.SqlServer" Name="EntityFramework.SqlServer.dll" Source="EntityFramework.SqlServer.dll" />
-				<File Id="PdfSharpgdi" Name="PdfSharp-gdi.dll" Source="P:\Visual Studio Projekte\Bibliotheken\PdfSharp-gdi.dll" KeyPath="yes"/>
+        <File Id="EntityFramework.Firebird" Name="EntityFramework.Firebird.dll" Source="EntityFramework.Firebird.dll" />
-			</Component>
+      </Component>
-
+      
 			<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" Name="GdPicture.NET.14.dll" KeyPath="yes" />
-				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
+        <File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll" />
-				<File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
+        <File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll" />
-				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
+        <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
-				<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
+        <File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
-				<File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+        <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
-				<File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+        <File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
-        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
-        <File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
         <File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+        <File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML.64" Name="GdPicture.NET.14.Imaging.ML.64.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
+        <File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
         <File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
         <File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
-        <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
         <File Id="GdPicture.NET.14.RTF" Name="GdPicture.NET.14.RTF.dll" />
+        <File Id="GdPicture.NET.14.SVG" Name="GdPicture.NET.14.SVG.dll" />
         <File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" />
         <File Id="GdPicture.NET.14.OpenXML" Name="GdPicture.NET.14.OpenXML.dll" />
         <File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
         <File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" />
         <File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll"/>
-        <File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll"/>
-        <File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll"/>
         <File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/>
-        <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
+        <File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" />
+        <File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" />
+        <File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" />
+        <File Id="OpenMcdf" Name="OpenMcdf.dll" />
+        <File Id="protobufnet.Core" Name="protobuf-net.Core.dll" />
+        <File Id="protobufnet" Name="protobuf-net.dll" />
+        <File Id="RtfPipe" Name="RtfPipe.dll" />
+        <File Id="System.Buffers" Name="System.Buffers.dll" />
+        <File Id="System.CodeDom" Name="System.CodeDom.dll" />
+        <File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" />
         <File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />
+        <File Id="System.Memory" Name="System.Memory.dll" />
+        <File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" />
+        <File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" />
+        <File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" />
+        <File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" />
+        <File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" />
+        <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
       </Component>
 
 			<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
@@ -286,9 +300,7 @@
 			<ComponentRef Id="WindreamLibs" />
 			<ComponentRef Id="FormsUtilsLibs"/>
 			<ComponentRef Id="DDLibs" />
-			<ComponentRef Id="Oracle" />
+			<ComponentRef Id="RuntimeLibs" />
-			<ComponentRef Id="PDFsharp" />
-			<ComponentRef Id="IndependentsoftLibs" />
 			<ComponentRef Id="DevExpressLibs" />
 			<ComponentRef Id="GDPictureLibs" />
 			<ComponentRef Id="Devexpress.Locales.de" />

app/TaskFlow.sln

@@ -7,8 +7,6 @@ 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
@@ -63,26 +61,6 @@ 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

app/TaskFlow/App.config

@@ -11,6 +11,7 @@
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="taskFLOW.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
+    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.21.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
   </configSections>
   <applicationSettings>
     <taskFLOW.My.MySettings>
@@ -102,8 +103,7 @@
     </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"
+    <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" />
-      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@@ -194,6 +194,10 @@
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>
@@ -246,4 +250,10 @@
       </setting>
     </taskFLOW.My.MySettings>
   </userSettings>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" />
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.21.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
+    </DbProviderFactories>
+  </system.data>
 </configuration>

app/TaskFlow/ClassAllgemeineFunktionen.vb

@@ -3,6 +3,7 @@ Imports System.Data.OracleClient
 Imports System.IO
 Imports WINDREAMLib
 Imports DevExpress.Utils.CommonDialogs
+Imports System.Runtime.InteropServices
 
 Public Class ClassAllgemeineFunktionen
     Public Shared Function GUI_LANGUAGE_INFO(pTITLE As String)

app/TaskFlow/ClassAnnotation.vb

@@ -1,38 +0,0 @@
-Imports PdfSharp.Pdf
-Imports PdfSharp.Pdf.Annotations
-Imports PdfSharp.Pdf.IO
-Imports PdfSharp.Drawing
-Public Class ClassAnnotation
-    Public Shared Function Annotate_PDF(title As String, content As String, page As Integer, fromGui As Boolean, Optional ycorrect As Integer = 0, Optional sizecorrect As Integer = 0)
-        If CURRENT_DOC_PATH.Length > 0 Then
-            Try
-                Dim doc As PdfDocument = PdfReader.Open(CURRENT_DOC_PATH, PdfDocumentOpenMode.Modify)
-                Dim firstPage As PdfPage = doc.Pages(page)
-
-                Dim gfx As XGraphics = XGraphics.FromPdfPage(firstPage)
-                Dim rect As XRect = gfx.Transformer.WorldToDefaultPage(New XRect(New XPoint(30, 60 + ycorrect), New XSize(60 + sizecorrect, 40 + sizecorrect)))
-
-                Dim annot As PdfTextAnnotation = New PdfTextAnnotation
-
-                annot.Title = title
-                'annot.Subject = txtsubject.Text
-                annot.Contents = content
-                annot.Rectangle = New PdfRectangle(rect)
-
-
-                firstPage.Annotations.Add(annot)
-                doc.Save(CURRENT_DOC_PATH)
-                Return True
-            Catch ex As Exception
-                If fromGui = True Then
-                    MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Annotate pdf:")
-                End If
-                LOGGER.Error(ex)
-                LOGGER.Info("Unexpected error in Annotate pdf: " & ex.Message, False)
-                Return False
-            End Try
-        End If
-
-
-    End Function
-End Class

app/TaskFlow/ClassControlCreator.vb

@@ -68,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
@@ -533,12 +545,11 @@ Public Class ClassControlCreator
     End Function
 
     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)
+        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
@@ -635,9 +646,13 @@ Public Class ClassControlCreator
             End Try
         End If
 
-        oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl, pcurrencySymbol)
+        ' *** KORRIGIERT: ConfigureViewColumns OHNE currencySymbol-Parameter ***
+        oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl)
+
+        ' *** NEU: ConfigureViewColumnsCurrency() für editierbare Währungsspalten ***
+        oGridControlCreator.ConfigureViewColumnsCurrency(DT_MY_COLUMNS, oView, oControl)
+
         oGridControlCreator.ConfigureViewEvents(DT_MY_COLUMNS, oView, oControl, oControlId)
-        ' 08.11.2021: Fix editor being empty on first open
         oView.FocusInvalidRow()
 
         Return oControl
@@ -848,44 +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
+        If pColumnsWithSqlAndControlPlaceholders Is Nothing OrElse pColumnsWithSqlAndControlPlaceholders.Rows.Count = 0 Then
-            For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows
+            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 lookup = DirectCast(oControl, LookupControl3)
-                    Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", -1)
+                    ' Speichere den aktuellen EditValue (kann einzelner Wert oder Liste sein)
-                    Dim oControlId = oRow.Item("CONTROL_ID")
+                    If lookup.EditValue IsNot Nothing Then
-                    Dim oColumnName = oRow.Item("SPALTENNAME")
+                        Dim controlName As String = lookup.Name
-                    Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP")
+                        lookupBackups(controlName) = lookup.EditValue
-
+                        Logger.Debug($"GridTables_HandleControlValueChange -> Backup für Lookup [{controlName}]: [{lookup.EditValue}]")
-                    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.Debug("Force-setting Editor for Grid [{0}]", oGrid.Name)
-                                    Exit For
-                                End If
-                            Catch ex As Exception
-                                Logger.Error(ex)
-                            End Try
-                        Next
-                        ' === End
-
                     End If
                 Catch ex As Exception
-                    Logger.Error(ex)
+                    Logger.Error($"GridTables_HandleControlValueChange -> Fehler beim Backup von Lookup: {ex.Message}")
-                    Logger.Info("Unexpected Error in Display SQL result for grid column: " & oRow.Item("CONTROL_ID") & " - ERROR: " & 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

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 ")
+                    ' ✅ IMMER normalisieren – auch für DB-Werte!
-                    If Double.TryParse(pValue, NumberStyles.Currency, CultureInfo.InvariantCulture, oConvertedValue) Then
+                    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
+                Try
-                    Return oConvertedValue
+                    Dim normalizedValue As String = NormalizeNumericString(pValue?.ToString())
-                End If
+                    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

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
@@ -84,52 +155,64 @@
     End Function
     Public Function GetVariableValue(oAttributeName As String, Optional oIDBTyp As Integer = 0, Optional FromIDB As Boolean = False) As Object
         Try
-            Dim oSingleAttribute As Boolean = True
+            ' Bestimme, ob es sich um ein Single-Value-Attribut handelt (nicht Typ 8 oder 9)
-            Select Case oIDBTyp
+            Dim oIsSingleAttribute As Boolean = (oIDBTyp <> 8 AndAlso oIDBTyp <> 9)
-                Case 8
+
-                    oSingleAttribute = False
+            LOGGER.Debug($"IDBData - GetVariableValue - Attribute: [{oAttributeName}] - IsSingleAttribute: [{oIsSingleAttribute}] - FromIDB: [{FromIDB}]")
-                Case 9
+
-                    oSingleAttribute = False
+            ' Schnellpfad: Direkt aus gecachter DataTable holen
-            End Select
+            If oIsSingleAttribute AndAlso IDB_DT_DOC_DATA.Rows.Count = 1 AndAlso Not FromIDB Then
-            Dim oAttributeValue
-            LOGGER.Debug($"IDBData - GetVariableValue - oSingleAttribute [{oSingleAttribute.ToString}] - FromIDB [{FromIDB.ToString}]")
-            If oSingleAttribute = True And IDB_DT_DOC_DATA.Rows.Count = 1 And FromIDB = False Then
                 Try
-                    If oAttributeName = "IDBCreatedWhen" Then
+                    Dim oMappedName As String = MapSystemAttributeName(oAttributeName)
-                        oAttributeName = "ADDED_WHEN"
+                    Dim oValue As Object = IDB_DT_DOC_DATA.Rows(0).Item(oMappedName)
-                    ElseIf oAttributeName = "IDBCreatedWho" Then
+                    LOGGER.Debug($"IDBData - GetVariableValue - Retrieved from cache: Attribute=[{oAttributeName}] MappedName=[{oMappedName}] Value=[{oValue}]")
-                        oAttributeName = "ADDED_WHO"
+                    Return oValue
-                    ElseIf oAttributeName = "IDBChangedWhen" Then
-                        oAttributeName = "CHANGED_WHEN"
-                    ElseIf oAttributeName = "IDBChangedWho" Then
-                        oAttributeName = "CHANGED_WHO"
-                    End If
-                    LOGGER.Debug($"IDBData - GetVariableValue - IDB_DT_DOC_DATA.Rows.Count = 1")
-                    oAttributeValue = IDB_DT_DOC_DATA.Rows(0).Item(oAttributeName)
                 Catch ex As Exception
                     LOGGER.Debug($"Error getting Attribute from IDB_DT_DOC_DATA: {ex.Message}")
+                    ' Fallthrough zum Datenbank-Fallback
                 End Try
+            End If
 
-            End If
+            ' Fallback: Wert aus Datenbank über Funktion holen
-            If Not IsNothing(oAttributeValue) Then
+            LOGGER.Debug($"Retrieving value for attribute [{oAttributeName}] via FNIDB_PM_GET_VARIABLE_VALUE")
-                LOGGER.Debug($"IDBData - GetVariableValue - Returning value: [{oAttributeValue}]")
+
-                Return oAttributeValue
+            Dim oSQL As String = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
+            LOGGER.Debug($"SQL: {oSQL}")
+
+            Dim oResultTable As DataTable = DatabaseFallback.GetDatatableIDB(oSQL)
+
+            If oResultTable IsNot Nothing AndAlso oResultTable.Rows.Count = 1 Then
+                Dim oValue As Object = oResultTable.Rows(0).Item(0)
+                LOGGER.Debug($"IDBData - GetVariableValue - Retrieved from DB: [{oValue}]")
+                Return oValue
             Else
-                LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ")
+                LOGGER.Info($"IDBData - GetVariableValue - No value found in DB for attribute [{oAttributeName}] - SQL [{oSQL}]")
             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}")
+            Return oResultTable
-            oAttributeValue = DatabaseFallback.GetDatatableIDB(oFNSQL)
+
-            Dim odt As DataTable = oAttributeValue
-            If odt.Rows.Count = 1 Then
-                oAttributeValue = odt.Rows(0).Item(0)
-            End If
-            Return oAttributeValue
         Catch ex As Exception
             LOGGER.Error(ex)
             Return Nothing
         End Try
+    End Function
 
+    ''' <summary>
+    ''' Mappt System-Attributnamen auf interne Spaltennamen.
+    ''' </summary>
+    Private Function MapSystemAttributeName(attributeName As String) As String
+        Select Case attributeName
+            Case "IDBCreatedWhen"
+                Return "ADDED_WHEN"
+            Case "IDBCreatedWho"
+                Return "ADDED_WHO"
+            Case "IDBChangedWhen"
+                Return "CHANGED_WHEN"
+            Case "IDBChangedWho"
+                Return "CHANGED_WHO"
+            Case Else
+                Return attributeName
+        End Select
     End Function
     Public Function Delete_Term_Object_From_Metadata(oAttributeName As String, oTerm2Delete As String) As Object
         Try
@@ -138,10 +221,11 @@
             If IDB_USES_WMFILESTORE Then
                 oID_IS_FOREIGN = 1
             End If
-
+            oTerm2Delete = oTerm2Delete.Replace("'", "''")
-            Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}"
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN};"
-            DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
+            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 +234,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}'"
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}';"
-            DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
+            LOGGER.Debug($"Delete_Attribute_Data: {oDELSQL}")
-
+            ' DatabaseFallback.ExecuteNonQueryIDB(oDELSQL)
+            Return ExecuteOrQueue(oDELSQL)
         Catch ex As Exception
             LOGGER.Error(ex)
             Return Nothing
@@ -162,18 +247,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
+                If oEffectiveCheckDeleted = True Then
-                    oOldAttributeResult = GetVariableValue(oAttributeName, oIDBTyp)
+                    oAttributeResultFromDB = GetVariableValue(oAttributeName, oIDBTyp)
-                    oTypeOldResult = oOldAttributeResult.GetType.ToString
+                    oTypeOldResult = oAttributeResultFromDB.GetType.ToString
-                    If oTypeOldResult = "System.Data.DataTable" Then
+                    If TypeOf oAttributeResultFromDB Is DataTable Then
-                        Dim myOldValues As DataTable = oOldAttributeResult
+                        Dim myOldValues As DataTable = oAttributeResultFromDB
-                        If myOldValues.Rows.Count > 1 Then
+                        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 +289,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
+                                LOGGER.Debug($"Checking oldValue[{oAttributeResultFromDB}] vs NewValue [{oNewValueRow.Item(1)}]")
-                                Dim oInfo1 = $"Checking oldValue[{oOldAttributeResult}] vs NewValue [{oNewValueRow.Item(1)}]"
+                                If oNewValueRow.Item(1).ToString.ToUpper = oAttributeResultFromDB.ToString.ToUpper Then
-                                If oNewValueRow.Item(1).ToString.ToUpper = oOldAttributeResult.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($"Value [{oAttributeResultFromDB}] no longer existing in Attribute [{oAttributeName}] - will be deleted!")
-                                LOGGER.Debug(oInfo2)
                                 '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
+                            If oDTMyNewValues.Rows(0).Item(1) <> oAttributeResultFromDB Then
-                                Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!"
+                                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 +320,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)
+                    'oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL)
-                    If oSuccess = False Then
+                    If Not ExecuteOrQueue(oPRSQL) Then Return False
-                        Return False
+                    'If oSuccess = False Then
-                    End If
+                    '    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"
+                oNewValue = oNewValue.Replace("'", "''")
-                LOGGER.Debug(oFNSQL)
+                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;"
-                Return DatabaseFallback.ExecuteNonQueryIDB(oFNSQL)
+                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

app/TaskFlow/ClassInit.vb

@@ -483,6 +483,14 @@ Public Class ClassInit
             'BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "")
             BASEDATA_DT_TBDD_CONNECTION = DatabaseFallback.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM))
 
+            oStep = "TBDD_CATALOG"
+            oSql = "select CAT_TITLE,CAT_STRING from TBDD_CATALOG"
+            BASEDATA_DT_TBDD_CATALOG = DatabaseFallback.GetDatatable("TBDD_CATALOG", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+            For Each oROW As DataRow In BASEDATA_DT_TBDD_CATALOG.Rows
+
+            Next
+
             oStep = "TBDD_3RD_PARTY_MODULES"
             oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1"
             Dim oTBDD_3RD_PARTY_MODULES As DataTable

app/TaskFlow/ClassPMWindream.vb

@@ -35,7 +35,7 @@ Public Class ClassPMWindream
 #End Region
 
 #Region "+++++ Variablen +++++"
-    Private oController As New WMOSearchController
+    'Private oController As New WMOSearchController
 #End Region
 
 #Region "+++++ Allgemeine Methoden und Funktionen +++++"

app/TaskFlow/ClassParamRefresh.vb

@@ -60,227 +60,242 @@ Public Class ClassParamRefresh
             ' Use For Each loop over words and display them.
             Dim oMode As String
             For Each oMode In oSplitWorkMode
-                LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
+                ProcessWorkingModeParameter(oMode, pMode)
-                If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then
+                'LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
-                    FORCE_LAYOUT_OVERVIEW = True
+                'If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then
-                    LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]")
+                '    FORCE_LAYOUT_OVERVIEW = True
-                ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then
+                '    LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]")
-                    SHOW_MASS_VALIDATOR = False
+                'ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then
-                    LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
+                '    SHOW_MASS_VALIDATOR = False
-                ElseIf oMode = "PM.NO_CHARTS" Then
+                '    LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
-                    SHOW_CHARTS = False
+                'ElseIf oMode = "PM.NO_CHARTS" Then
-                    LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]")
+                '    SHOW_CHARTS = False
-                ElseIf oMode = "PM.DEBUG_LOG" Then
+                '    LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]")
-                    DEBUG = True
+                'ElseIf oMode = "PM.DEBUG_LOG" Then
-                    LOGCONFIG.Debug = True
+                '    DEBUG = True
-                ElseIf oMode = "PM.LOG_HOTSPOTS" Then
+                '    LOGCONFIG.Debug = True
-                    LOG_HOTSPOTS = True
+                'ElseIf oMode = "PM.LOG_HOTSPOTS" Then
-                ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
+                '    LOG_HOTSPOTS = True
-                    OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
+                'ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
-                    If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
+                '    OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
-                        IDB_USES_WMFILESTORE = True
+                '    If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
-                    End If
+                '        IDB_USES_WMFILESTORE = True
-                    LOGGER.Info("OPERATION_MODE_FS: " + OPERATION_MODE_FS)
+                '    End If
-                ElseIf oMode = "PM.IDBWITHWMFS" Then
+                '    LOGGER.Info("OPERATION_MODE_FS: " + OPERATION_MODE_FS)
-                    IDB_USES_WMFILESTORE = True
+                'ElseIf oMode = "PM.IDBWITHWMFS" Then
-                ElseIf oMode = "PM.NO_BASICCONF" Then
+                '    IDB_USES_WMFILESTORE = True
-                    BASIC_CONF_VISIBLE = False
+                'ElseIf oMode = "PM.NO_BASICCONF" Then
-                    LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
+                '    BASIC_CONF_VISIBLE = False
-                ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then
+                '    LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
-                    SYS_LOCKED_MAINTENANCE = True
+                'ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then
-                ElseIf oMode.StartsWith("PM.IDB_CONID!") Then
+                '    SYS_LOCKED_MAINTENANCE = True
-                    If CONNECTION_STRING_IDB <> "" And dbIDBInitialized = True Then
+                'ElseIf oMode.StartsWith("PM.IDB_CONID!") Then
-                        IDB_ACTIVE = True
+                '    If CONNECTION_STRING_IDB <> "" And dbIDBInitialized = True Then
-                        Continue For
+                '        IDB_ACTIVE = True
-                    Else
+                '        Continue For
-                        Dim Database_IDB As MSSQLServer = Nothing
+                '    Else
-                        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+                '        Dim Database_IDB As MSSQLServer = Nothing
+                '        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+                '        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+                '        CONNECTION_STRING_IDB = oConString
+                '        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+                '        If Database_IDB.DBInitialized = True Then
+                '            IDB_ACTIVE = True
+                '            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!")
+                '            DatabaseFallback.InitializeIDB(Database_IDB)
+                '        Else
+                '            IDB_ACTIVE = False
+                '        End If
+                '    End If
+                'ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
+                '    EXCEL_OVERVIEW = True
+                '    LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
+                'ElseIf oMode = "PM.MONITORING" Then
+                '    MONITORING_ACTIVE = True
+                '    LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
+                'ElseIf oMode = "PM.GHOSTMODE" Then
+                '    GHOSTMODE_ACTIVE = True
+                '    LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
+                'ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
+                '    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
+                '    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
+                '    LOGGER.Debug($"RIBBON_COLOR_SCHEME [{RIBBON_COLOR_SCHEME}]")
+                'ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then
+                '    NO_DETAIL_PROFILES = True
+                '    LOGGER.Debug($"NO_DETAIL_PROFILES [{NO_DETAIL_PROFILES}]")
+                'ElseIf oMode = "PM.NO_POPUP" Then
+                '    POPUP_REMINDER_ACTIVE = False
+                '    LOGGER.Debug($"POPUP_REMINDER_ACTIVE [{POPUP_REMINDER_ACTIVE}]")
+                'ElseIf oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE") Then
+                '    Dim oTimeLapse = oMode.Replace("PM.POPUP_TIMELAPS_OVERRIDE=", "")
+                '    LOGGER.Info($"CENTRAL POPUP_TIMELAPS_OVERRIDE [{oTimeLapse}]")
+                '    Try
+                '        CONFIG.Config.ReminderTimer = oTimeLapse
+                '    Catch ex As Exception
+                '    End Try
 
-                        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+                'ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then
+                '    Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "")
+                '    CONV_IDENTIFICATION = oIdent
+                'ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
+                '    Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
+                '    Try
+                '        INACTIVITY_DURATION = CInt(oInactivityDuration)
+                '        LOGGER.Debug($"InactivityDuration [{INACTIVITY_DURATION}]")
+                '    Catch ex As Exception
+                '        LOGGER.Warn($"INACTIVITY_DURATION = 0 - {ex.Message}")
+                '        INACTIVITY_DURATION = 0
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.COL_LAST_EDITED") Then
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
+                '    Try
+                '        LAST_EDITED_COLUMN = oLEDITEDCOL
+                '        LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
+                '    Catch ex As Exception
+                '        LAST_EDITED_COLUMN = ""
 
-                        CONNECTION_STRING_IDB = oConString
+                '    End Try
-                        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+                'ElseIf oMode.StartsWith("PM.COL_LAST_ADDED") Then
-                        If Database_IDB.DBInitialized = True Then
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
-                            IDB_ACTIVE = True
+                '    Try
-                            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!")
+                '        LAST_ADDED_COLUMN = oLEDITEDCOL
-                            DatabaseFallback.InitializeIDB(Database_IDB)
+                '        LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
-                        Else
+                '    Catch ex As Exception
-                            IDB_ACTIVE = False
+                '        LAST_ADDED_COLUMN = ""
-                        End If
-                    End If
-                ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
-                    EXCEL_OVERVIEW = True
-                    LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
-                ElseIf oMode = "PM.MONITORING" Then
-                    MONITORING_ACTIVE = True
-                    LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
-                ElseIf oMode = "PM.GHOSTMODE" Then
-                    GHOSTMODE_ACTIVE = True
-                    LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
-                ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
-                    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
-                    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
-                    LOGGER.Debug($"RIBBON_COLOR_SCHEME [{RIBBON_COLOR_SCHEME}]")
-                ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then
-                    NO_DETAIL_PROFILES = True
-                    LOGGER.Debug($"NO_DETAIL_PROFILES [{NO_DETAIL_PROFILES}]")
-                ElseIf oMode = "PM.NO_POPUP" Then
-                    POPUP_REMINDER_ACTIVE = False
-                    LOGGER.Debug($"POPUP_REMINDER_ACTIVE [{POPUP_REMINDER_ACTIVE}]")
-                ElseIf oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE") Then
-                    Dim oTimeLapse = oMode.Replace("PM.POPUP_TIMELAPS_OVERRIDE=", "")
-                    LOGGER.Info($"CENTRAL POPUP_TIMELAPS_OVERRIDE [{oTimeLapse}]")
-                    Try
-                        CONFIG.Config.ReminderTimer = oTimeLapse
-                    Catch ex As Exception
-                    End Try
 
-                ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then
+                '    End Try
-                    Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "")
+                'ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
-                    CONV_IDENTIFICATION = oIdent
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
-                ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
+                '    Try
-                    Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
+                '        MON_EDITED_COLUMN = oLEDITEDCOL
-                    Try
+                '        LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
-                        INACTIVITY_DURATION = CInt(oInactivityDuration)
+                '    Catch ex As Exception
-                        LOGGER.Debug($"InactivityDuration [{INACTIVITY_DURATION}]")
-                    Catch ex As Exception
-                        LOGGER.Warn($"INACTIVITY_DURATION = 0 - {ex.Message}")
-                        INACTIVITY_DURATION = 0
-                    End Try
-                ElseIf oMode.StartsWith("PM.COL_LAST_EDITED") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
-                    Try
-                        LAST_EDITED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
-                    Catch ex As Exception
-                        LAST_EDITED_COLUMN = ""
 
-                    End Try
+                '    End Try
-                ElseIf oMode.StartsWith("PM.COL_LAST_ADDED") Then
+                'ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
-                    Try
+                '    Try
-                        LAST_ADDED_COLUMN = oLEDITEDCOL
+                '        MON_ADDED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
+                '        LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
-                    Catch ex As Exception
+                '    Catch ex As Exception
-                        LAST_ADDED_COLUMN = ""
 
-                    End Try
+                '    End Try
-                ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
+                'ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
+                '    Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")
-                    Try
+                '    Try
-                        MON_EDITED_COLUMN = oLEDITEDCOL
+                '        USE_APPSERVER = CBool(oUSE_APPSERVER)
-                        LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
+                '    Catch ex As Exception
-                    Catch ex As Exception
+                '        USE_APPSERVER = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.COPYWM2TEMP") Then
+                '    Dim oCOPYWM2TEMP = oMode.Replace("PM.COPYWM2TEMP=", "")
+                '    Try
+                '        COPY_WMFILE_2TEMP = CBool(oCOPYWM2TEMP)
+                '    Catch ex As Exception
+                '        COPY_WMFILE_2TEMP = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.MAP_SHARE_DRIVE") Then
+                '    Dim oMAP_SHARE_DRIVE = oMode.Replace("PM.MAP_SHARE_DRIVE=", "")
+                '    Try
+                '        MAP_SHARE_DRIVE = oMAP_SHARE_DRIVE
+                '    Catch ex As Exception
+                '        oMAP_SHARE_DRIVE = String.Empty
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.MAP_BLACKLIST") Then
+                '    Dim oMAP_BLACKLIST = oMode.Replace("PM.MAP_BLACKLIST=", "")
+                '    Try
+                '        MAP_BLACKLIST = oMAP_BLACKLIST
+                '    Catch ex As Exception
+                '        MAP_BLACKLIST = String.Empty
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.SEARCH1") Then
+                '    Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
+                '    Try
+                '        SEARCH1 = oSearch1
+                '    Catch ex As Exception
+                '        SEARCH1 = ""
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.SEARCH2") Then
+                '    Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
+                '    Try
+                '        SEARCH2 = oSearch2
+                '    Catch ex As Exception
+                '        SEARCH2 = ""
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.TRAFFICLIGHT_ICON") Then
+                '    Dim oParam = oMode.Replace("PM.TRAFFICLIGHT_ICON=", "")
+                '    Try
+                '        TL_ICON = CBool(oParam)
+                '    Catch ex As Exception
+                '        TL_ICON = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then
+                '    Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "")
+                '    Try
+                '        TITLE_NOTIFICATIONS = oParam
+                '    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)
 
-                    End Try
+                '            UserInheritance_ConfirmationByColumn = Nothing
-                ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
+                '            CONFIG.Save()
-                    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
+                '        End If
-                    Try
+                '    Catch ex As Exception
-                        MON_ADDED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
-                    Catch ex As Exception
 
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.START_CW") Then
+                '    Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
+                '    Try
+                '        START_CW = True
+                '        LOGGER.Debug("PM.START_CW = True")
+                '        Dim oSplit As String() = oAfterReplace.Split("~")
+                '        START_CW_CAPTION = oSplit(0)
+                '        Try
+                '            START_CW_LOC_VARIANT = oSplit(1)
+                '        Catch ex As Exception
+                '            START_CW_LOC_VARIANT = "-1"
+                '            LOGGER.Warn($"Could not read START_CW_LOCVARIANT : {ex.Message}")
+                '        End Try
 
-                    End Try
+                '    Catch ex As Exception
-                ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
+                '        LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
-                    Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")
+                '        START_CW = False
-                    Try
+                '    End Try
-                        USE_APPSERVER = CBool(oUSE_APPSERVER)
+                'ElseIf oMode.StartsWith("PM.RibbonPageCustTitle") Then
-                    Catch ex As Exception
+                '    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustTitle=", "")
-                        USE_APPSERVER = False
+                '    RibbonPageCustTitle = oAfterReplace
-
+                'ElseIf oMode.StartsWith("PM.RibbonPageCustItm1") Then
-                    End Try
+                '    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustItm1=", "")
-                ElseIf oMode.StartsWith("PM.SEARCH1") Then
+                '    RibbonPageCustItm1 = oAfterReplace
-                    Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
+                'ElseIf oMode.StartsWith("PM.ButtonExport2FolderCaption") Then
-                    Try
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2FolderCaption=", "")
-                        SEARCH1 = oSearch1
+                '    ButtonExport2Folder_Caption = oAfterReplace
-                    Catch ex As Exception
+                'ElseIf oMode.StartsWith("PM.ButtonExport2Folder_Mode") Then
-                        SEARCH1 = ""
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_Mode=", "")
-
+                '    ButtonExport2Folder_Mode = oAfterReplace
-                    End Try
+                'ElseIf oMode.StartsWith("PM.ButtonExport2Folder_RootFolder") Then
-                ElseIf oMode.StartsWith("PM.SEARCH2") Then
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_RootFolder=", "")
-                    Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
+                '    ButtonExport2Folder_RootFolder = oAfterReplace
-                    Try
+                'ElseIf oMode = "MAINFORM_ALLOW_LOGFILES" Then
-                        SEARCH2 = oSearch2
+                '    MAINFORM_CREATE_LOG_FILES = True
-                    Catch ex As Exception
+                'Else
-                        SEARCH2 = ""
+                '    LOGGER.Info($"Wrong oMode: {oMode}")
-
+                'End If
-                    End Try
-                ElseIf oMode.StartsWith("PM.TRAFFICLIGHT_ICON") Then
-                    Dim oParam = oMode.Replace("PM.TRAFFICLIGHT_ICON=", "")
-                    Try
-                        TL_ICON = CBool(oParam)
-                    Catch ex As Exception
-                        TL_ICON = False
-                    End Try
-                ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then
-                    Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "")
-                    Try
-                        TITLE_NOTIFICATIONS = oParam
-                    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
-                        START_CW = True
-                        LOGGER.Debug("PM.START_CW = True")
-                        Dim oSplit As String() = oAfterReplace.Split("~")
-                        START_CW_CAPTION = oSplit(0)
-                        Try
-                            START_CW_LOC_VARIANT = oSplit(1)
-                        Catch ex As Exception
-                            START_CW_LOC_VARIANT = "-1"
-                            LOGGER.Warn($"Could not read START_CW_LOCVARIANT : {ex.Message}")
-                        End Try
-
-                    Catch ex As Exception
-                        LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
-                        START_CW = False
-                    End Try
-                ElseIf oMode.StartsWith("PM.RibbonPageCustTitle") Then
-                    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustTitle=", "")
-                    RibbonPageCustTitle = oAfterReplace
-                ElseIf oMode.StartsWith("PM.RibbonPageCustItm1") Then
-                    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustItm1=", "")
-                    RibbonPageCustItm1 = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2FolderCaption") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2FolderCaption=", "")
-                    ButtonExport2Folder_Caption = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2Folder_Mode") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_Mode=", "")
-                    ButtonExport2Folder_Mode = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2Folder_RootFolder") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_RootFolder=", "")
-                    ButtonExport2Folder_RootFolder = oAfterReplace
-                ElseIf oMode = "MAINFORM_ALLOW_LOGFILES" Then
-                    MAINFORM_CREATE_LOG_FILES = True
-                Else
-                    LOGGER.Info($"Wrong oMode: {oMode}")
-                End If
             Next
             'If IDB_ACTIVE Then
             '    If CONNECTION_STRING_APP_SERVER <> String.Empty Then
@@ -298,4 +313,267 @@ Public Class ClassParamRefresh
         End If
         oStopwatch.Done()
     End Sub
+    Private Shared Sub ProcessWorkingModeParameter(oMode As String, pMode As String)
+        LOGGER.Debug($"Processing Working Mode Parameter: {oMode}")
+
+        Select Case True
+            Case oMode = "PM.FORCE_LAYOUT_OVERVIEW"
+                SetBooleanParameter(FORCE_LAYOUT_OVERVIEW, True, "FORCE_LAYOUT_OVERVIEW")
+
+            Case oMode = "PM.NO_MASS_VALIDATOR"
+                SetBooleanParameter(SHOW_MASS_VALIDATOR, False, "SHOW_MASS_VALIDATOR", LogLevel.Info)
+
+            Case oMode = "PM.NO_CHARTS"
+                SetBooleanParameter(SHOW_CHARTS, False, "SHOW_CHARTS")
+
+            Case oMode = "PM.DEBUG_LOG"
+                DEBUG = True
+                LOGCONFIG.Debug = True
+                LOGGER.Debug($"DEBUG_LOG = True")
+
+            Case oMode = "PM.LOG_HOTSPOTS"
+                SetBooleanParameter(LOG_HOTSPOTS, True, "LOG_HOTSPOTS")
+
+            Case oMode.StartsWith("OPERATION_MODE_FS")
+                OPERATION_MODE_FS = ExtractParameterValue(oMode, "OPERATION_MODE_FS")
+                If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
+                    IDB_USES_WMFILESTORE = True
+                End If
+                LOGGER.Info($"OPERATION_MODE_FS = {OPERATION_MODE_FS}")
+
+            Case oMode = "PM.IDBWITHWMFS"
+                SetBooleanParameter(IDB_USES_WMFILESTORE, True, "IDB_USES_WMFILESTORE", LogLevel.Info)
+
+            Case oMode = "PM.NO_BASICCONF"
+                SetBooleanParameter(BASIC_CONF_VISIBLE, False, "BASIC_CONF_VISIBLE", LogLevel.Info)
+
+            Case oMode = "PM.SYS_LOCKED_MAINTENANCE"
+                SetBooleanParameter(SYS_LOCKED_MAINTENANCE, True, "SYS_LOCKED_MAINTENANCE")
+
+            Case oMode.StartsWith("PM.IDB_CONID!")
+                ProcessIDBConnection(oMode)
+
+            Case oMode = "PM.EXCEL_OVERVIEW"
+                SetBooleanParameter(EXCEL_OVERVIEW, True, "EXCEL_OVERVIEW", LogLevel.Info)
+
+            Case oMode = "PM.MONITORING"
+                SetBooleanParameter(MONITORING_ACTIVE, True, "MONITORING_ACTIVE")
+
+            Case oMode = "PM.GHOSTMODE"
+                SetBooleanParameter(GHOSTMODE_ACTIVE, True, "GHOSTMODE_ACTIVE", LogLevel.Info)
+
+            Case oMode.StartsWith("PM.COLORSCHEME")
+                RIBBON_COLOR_SCHEME = ExtractParameterValue(oMode, "PM.COLORSCHEME").ToUpper
+                LOGGER.Debug($"RIBBON_COLOR_SCHEME = {RIBBON_COLOR_SCHEME}")
+
+            Case oMode.StartsWith("PM.NO_DETAIL_PROFILES")
+                SetBooleanParameter(NO_DETAIL_PROFILES, True, "NO_DETAIL_PROFILES")
+
+            Case oMode = "PM.NO_POPUP"
+                SetBooleanParameter(POPUP_REMINDER_ACTIVE, False, "POPUP_REMINDER_ACTIVE")
+
+            Case oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE")
+                ProcessPopupTimeLapse(oMode)
+
+            Case oMode.StartsWith("PM.CONV_IDENTIFICATION")
+                CONV_IDENTIFICATION = ExtractParameterValue(oMode, "PM.CONV_IDENTIFICATION")
+                LOGGER.Debug($"CONV_IDENTIFICATION = {CONV_IDENTIFICATION}")
+
+            Case oMode.StartsWith("PM.INACTIVITY_DURATION")
+                ProcessIntegerParameter(oMode, "PM.INACTIVITY_DURATION", INACTIVITY_DURATION, "InactivityDuration")
+
+            Case oMode.StartsWith("PM.COL_LAST_EDITED")
+                LAST_EDITED_COLUMN = ExtractParameterValue(oMode, "PM.COL_LAST_EDITED")
+                LOGGER.Debug($"LAST_EDITED_COLUMN = {LAST_EDITED_COLUMN}")
+
+            Case oMode.StartsWith("PM.COL_LAST_ADDED")
+                LAST_ADDED_COLUMN = ExtractParameterValue(oMode, "PM.COL_LAST_ADDED")
+                LOGGER.Debug($"LAST_ADDED_COLUMN = {LAST_ADDED_COLUMN}")
+
+            Case oMode.StartsWith("PM.MON_COL_CHANGED_WHEN")
+                MON_EDITED_COLUMN = ExtractParameterValue(oMode, "PM.MON_COL_CHANGED_WHEN")
+                LOGGER.Debug($"MON_EDITED_COLUMN = {MON_EDITED_COLUMN}")
+
+            Case oMode.StartsWith("PM.MON_COL_ADDED_WHEN")
+                MON_ADDED_COLUMN = ExtractParameterValue(oMode, "PM.MON_COL_ADDED_WHEN")
+                LOGGER.Debug($"MON_ADDED_COLUMN = {MON_ADDED_COLUMN}")
+
+            Case oMode.StartsWith("PM.USE_APPSERVER")
+                ProcessBooleanParameter(oMode, "PM.USE_APPSERVER", USE_APPSERVER, "USE_APPSERVER")
+
+            Case oMode.StartsWith("PM.COPYWM2TEMP")
+                ProcessBooleanParameter(oMode, "PM.COPYWM2TEMP", COPY_WMFILE_2TEMP, "COPY_WMFILE_2TEMP")
+
+            Case oMode.StartsWith("PM.MAP_SHARE_DRIVE")
+                MAP_SHARE_DRIVE = ExtractParameterValue(oMode, "PM.MAP_SHARE_DRIVE")
+                LOGGER.Debug($"MAP_SHARE_DRIVE = {MAP_SHARE_DRIVE}")
+
+            Case oMode.StartsWith("PM.MAP_BLACKLIST")
+                MAP_BLACKLIST = ExtractParameterValue(oMode, "PM.MAP_BLACKLIST")
+                LOGGER.Debug($"MAP_BLACKLIST = {MAP_BLACKLIST}")
+
+            Case oMode.StartsWith("PM.SEARCH1")
+                SEARCH1 = ExtractParameterValue(oMode, "PM.SEARCH1")
+                LOGGER.Debug($"SEARCH1 = {SEARCH1}")
+
+            Case oMode.StartsWith("PM.SEARCH2")
+                SEARCH2 = ExtractParameterValue(oMode, "PM.SEARCH2")
+                LOGGER.Debug($"SEARCH2 = {SEARCH2}")
+
+            Case oMode.StartsWith("PM.TRAFFICLIGHT_ICON")
+                ProcessBooleanParameter(oMode, "PM.TRAFFICLIGHT_ICON", TL_ICON, "TL_ICON")
+
+            Case oMode.StartsWith("PM.TITLE_NOTIFICATIONS")
+                TITLE_NOTIFICATIONS = ExtractParameterValue(oMode, "PM.TITLE_NOTIFICATIONS")
+                LOGGER.Debug($"TITLE_NOTIFICATIONS = {TITLE_NOTIFICATIONS}")
+
+            Case oMode.StartsWith("TF.InheritanceMsgAmount") AndAlso pMode = "Load"
+                InheritanceMsgAmount = ExtractParameterValue(oMode, "TF.InheritanceMsgAmount")
+                LOGGER.Debug($"InheritanceMsgAmount = {InheritanceMsgAmount}")
+
+            Case oMode.StartsWith("TF.InheritanceCalcReset") AndAlso pMode = "Load"
+                ProcessInheritanceReset(oMode)
+
+            Case oMode.StartsWith("PM.START_CW")
+                ProcessStartCW(oMode)
+
+            Case oMode.StartsWith("PM.RibbonPageCustTitle")
+                RibbonPageCustTitle = ExtractParameterValue(oMode, "PM.RibbonPageCustTitle")
+                LOGGER.Debug($"RibbonPageCustTitle = {RibbonPageCustTitle}")
+
+            Case oMode.StartsWith("PM.RibbonPageCustItm1")
+                RibbonPageCustItm1 = ExtractParameterValue(oMode, "PM.RibbonPageCustItm1")
+                LOGGER.Debug($"RibbonPageCustItm1 = {RibbonPageCustItm1}")
+
+            Case oMode.StartsWith("PM.ButtonExport2FolderCaption")
+                ButtonExport2Folder_Caption = ExtractParameterValue(oMode, "PM.ButtonExport2FolderCaption")
+                LOGGER.Debug($"ButtonExport2FolderCaption = {ButtonExport2Folder_Caption}")
+
+            Case oMode.StartsWith("PM.ButtonExport2Folder_Mode")
+                ButtonExport2Folder_Mode = ExtractParameterValue(oMode, "PM.ButtonExport2Folder_Mode")
+                LOGGER.Debug($"ButtonExport2Folder_Mode = {ButtonExport2Folder_Mode}")
+
+            Case oMode.StartsWith("PM.ButtonExport2Folder_RootFolder")
+                ButtonExport2Folder_RootFolder = ExtractParameterValue(oMode, "PM.ButtonExport2Folder_RootFolder")
+                LOGGER.Debug($"ButtonExport2Folder_RootFolder = {ButtonExport2Folder_RootFolder}")
+
+            Case oMode = "MAINFORM_ALLOW_LOGFILES"
+                SetBooleanParameter(MAINFORM_CREATE_LOG_FILES, True, "MAINFORM_CREATE_LOG_FILES")
+
+            Case Else
+                LOGGER.Info($"Unknown Working Mode Parameter: {oMode}")
+        End Select
+    End Sub
+    Private Shared Function ExtractParameterValue(parameterString As String, prefix As String) As String
+        Return parameterString.Replace($"{prefix}=", "")
+    End Function
+
+    Private Shared Sub SetBooleanParameter(ByRef target As Boolean, value As Boolean, paramName As String, Optional logLevel As LogLevel = LogLevel.Debug)
+        target = value
+        LogParameterValue(paramName, value.ToString(), logLevel)
+    End Sub
+
+    Private Shared Sub ProcessBooleanParameter(oMode As String, prefix As String, ByRef target As Boolean, paramName As String)
+        Dim value = ExtractParameterValue(oMode, prefix)
+        Try
+            target = CBool(value)
+            LOGGER.Debug($"{paramName} = {target}")
+        Catch ex As Exception
+            target = False
+            LOGGER.Warn($"Failed to parse {paramName}: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessIntegerParameter(oMode As String, prefix As String, ByRef target As Integer, paramName As String)
+        Dim value = ExtractParameterValue(oMode, prefix)
+        Try
+            target = CInt(value)
+            LOGGER.Debug($"{paramName} = {target}")
+        Catch ex As Exception
+            LOGGER.Warn($"Failed to parse {paramName}: {ex.Message}. Setting to 0")
+            target = 0
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessIDBConnection(oMode As String)
+        Dim Database_IDB As MSSQLServer = Nothing
+        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+        CONNECTION_STRING_IDB = oConString
+        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+
+        If Database_IDB.DBInitialized = True Then
+            IDB_ACTIVE = True
+            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]")
+            DatabaseFallback.InitializeIDB(Database_IDB)
+        Else
+            IDB_ACTIVE = False
+            LOGGER.Warn($"Failed to initialize IDB with Connection [{CON_ID}]")
+        End If
+        If CONNECTION_STRING_IDB <> "" AndAlso Database_IDB.DBInitialized = True Then
+            IDB_ACTIVE = True
+            LOGGER.Debug("IDB already initialized and active")
+            Return
+        End If
+    End Sub
+
+    Private Shared Sub ProcessPopupTimeLapse(oMode As String)
+        Dim oTimeLapse = ExtractParameterValue(oMode, "PM.POPUP_TIMELAPS_OVERRIDE")
+        LOGGER.Info($"POPUP_TIMELAPS_OVERRIDE = {oTimeLapse}")
+        Try
+            CONFIG.Config.ReminderTimer = oTimeLapse
+        Catch ex As Exception
+            LOGGER.Warn($"Failed to set ReminderTimer: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessInheritanceReset(oMode As String)
+        Dim oParam = ExtractParameterValue(oMode, "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
+            LOGGER.Warn($"Failed to process InheritanceCalcReset: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessStartCW(oMode As String)
+        Dim oAfterReplace = ExtractParameterValue(oMode, "PM.START_CW")
+        Try
+            START_CW = True
+            LOGGER.Debug("PM.START_CW = True")
+            Dim oSplit As String() = oAfterReplace.Split("~")
+            START_CW_CAPTION = oSplit(0)
+            Try
+                START_CW_LOC_VARIANT = oSplit(1)
+                LOGGER.Debug($"START_CW_LOC_VARIANT = {START_CW_LOC_VARIANT}")
+            Catch ex As Exception
+                START_CW_LOC_VARIANT = "-1"
+                LOGGER.Warn($"Could not read START_CW_LOC_VARIANT: {ex.Message}")
+            End Try
+        Catch ex As Exception
+            LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
+            START_CW = False
+        End Try
+    End Sub
+
+    Private Shared Sub LogParameterValue(paramName As String, value As String, logLevel As LogLevel)
+        Select Case logLevel
+            Case LogLevel.Info
+                LOGGER.Info($"{paramName} = {value}")
+            Case Else
+                LOGGER.Debug($"{paramName} = {value}")
+        End Select
+    End Sub
+
+    Private Enum LogLevel
+        Debug
+        Info
+    End Enum
 End Class

app/TaskFlow/ClassWindream_allgemein.vb

@@ -124,7 +124,7 @@ Public Class ClassWindream_allgemein
     Public Function Start_WMCC_andCo()
         Try
             ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist
-            Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
+            Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T WITH (NOLOCK) INNER JOIN TBDD_GROUPS T1 WITH (NOLOCK) on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
             Dim userExistsInServerUserGroup = DatabaseFallback.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup")
 
             If WMSESSION_STARTSTOP_STARTUP = True Then
@@ -322,30 +322,30 @@ LOGGER.Error(ex)
     ''' <param name="objekttypName">Name des Objekttyps</param>
     ''' <returns>Objekttyp als WMObject</returns>
     ''' <remarks></remarks>
-    Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
+    'Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
-        Try
+    '    Try
-            If IsNothing(Me.oSession) Then
+    '        If IsNothing(Me.oSession) Then
-                LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing")
+    '            LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing")
-                Return Nothing
+    '            Return Nothing
-            End If
+    '        End If
-            ' alle Objekttypen auslesen
+    '        ' alle Objekttypen auslesen
-            Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+    '        Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
 
-            ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen
+    '        ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen
-            For Each oObjectType As WMObject In oObjectTypes
+    '        For Each oObjectType As WMObject In oObjectTypes
-                If oObjectType.aName = objekttypName Then
+    '            If oObjectType.aName = objekttypName Then
-                    Return oObjectType
+    '                Return oObjectType
-                End If
+    '            End If
-            Next
+    '        Next
 
-            Return Nothing
+    '        Return Nothing
 
-        Catch ex As Exception
+    '    Catch ex As Exception
-            LOGGER.Error(ex)
+    '        LOGGER.Error(ex)
-            MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden")
+    '        MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden")
-            Return Nothing
+    '        Return Nothing
-        End Try
+    '    End Try
-    End Function
+    'End Function
 
     ''' <summary>
     ''' Überprüft ob der angegebene Index im Objekttyp existiert

app/TaskFlow/ControlCreator/GridControl.vb

@@ -25,13 +25,93 @@ Namespace ControlCreator
 
         Private newRowModified As Boolean
         Private isApplyingInheritedValue As Boolean
+        Private _FormulaColumnNames As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase)
+        Private _FormulaSqlColumns As New Dictionary(Of String, FormulaSqlDefinition)(StringComparer.OrdinalIgnoreCase)
 
-        Public Sub New(pLogConfig As LogConfig, pGridTables As Dictionary(Of Integer, Dictionary(Of String, RepositoryItem)))
+        Private _isRefreshingFormula As Boolean = False  ' *** NEU: Flag für Formel-Refresh ***
+        Private _currencySymbol As String = "€"
+        ''' <summary>
+        ''' SHARED Dictionary: Speichert das aktuelle Währungssymbol PRO GridView (via Name).
+        ''' Dies ist notwendig, weil UpdateCurrencyFormat auf einer NEUEN GridControl-Instanz
+        ''' aufgerufen wird, der CustomColumnDisplayText-Handler aber auf der URSPRÜNGLICHEN
+        ''' Instanz registriert wurde. Durch das Shared Dictionary können alle Instanzen
+        ''' auf das aktuelle Symbol zugreifen.
+        ''' </summary>
+        Private Shared _CurrencySymbolByGridName As New Dictionary(Of String, String)(StringComparer.OrdinalIgnoreCase)
+
+        ''' <summary>
+        ''' Definiert eine SQL-basierte Formelspalte mit allen nötigen Metadaten.
+        ''' </summary>
+        Private Class FormulaSqlDefinition
+            Public Property SqlTemplate As String
+            Public Property ReferencedColumns As List(Of String)
+        End Class
+        ''' <summary>
+        ''' Extrahiert alle {#TBCOL#ColumnName}-Platzhalter aus einem SQL-Template.
+        ''' </summary>
+        Private Function GetReferencedSqlColumnNames(sqlTemplate As String) As List(Of String)
+            Dim columnNames As New List(Of String)
+            Dim pattern As String = "\{#TBCOL#([^}]+)\}"
+            Dim matches = Regex.Matches(sqlTemplate, pattern)
+
+            For Each match As Match In matches
+                Dim colName = match.Groups(1).Value
+                If Not columnNames.Contains(colName, StringComparer.OrdinalIgnoreCase) Then
+                    columnNames.Add(colName)
+                End If
+            Next
+
+            Return columnNames
+        End Function
+        ''' <summary>
+        ''' Ersetzt alle {#TBCOL#ColumnName}-Platzhalter durch die aktuellen Zeilenwerte.
+        ''' Gibt den ausführbaren SQL-String zurück.
+        ''' </summary>
+        Private Function ResolveSqlTemplate(sqlTemplate As String, pView As GridView, rowHandle As Integer) As String
+            Dim resolvedSql As String = sqlTemplate
+            Dim pattern As String = "\{#TBCOL#([^}]+)\}"
+            Dim matches = Regex.Matches(sqlTemplate, pattern)
+
+            For Each match As Match In matches
+                Dim colName = match.Groups(1).Value
+                Dim cellValue = pView.GetRowCellValue(rowHandle, colName)
+                Dim safeValue As String
+
+                If cellValue Is Nothing OrElse IsDBNull(cellValue) Then
+                    safeValue = "NULL"
+                ElseIf TypeOf cellValue Is String Then
+                    ' SQL-Injection-Schutz: Einfache Anführungszeichen escapen
+                    safeValue = "'" & cellValue.ToString().Replace("'", "''") & "'"
+                ElseIf TypeOf cellValue Is Boolean Then
+                    safeValue = If(CBool(cellValue), "1", "0")
+                Else
+                    ' Numerische Werte: Invariant-Format (Punkt als Dezimaltrenner)
+                    safeValue = Convert.ToString(cellValue, CultureInfo.InvariantCulture)
+                End If
+
+                resolvedSql = resolvedSql.Replace(match.Value, safeValue)
+                _Logger.Debug("Resolved SQL placeholder [{0}] with value [{1}] → {2}", match.Value, cellValue, safeValue)
+            Next
+            _Logger.Debug("Final resolved SQL: {0}", resolvedSql)
+            Return resolvedSql
+        End Function
+        Public Sub New(pLogConfig As LogConfig, pGridTables As Dictionary(Of Integer, Dictionary(Of String, RepositoryItem)), pCurrencySymbol As String)
             _LogConfig = pLogConfig
             _Logger = pLogConfig.GetLogger()
             _GridTables = pGridTables
+            _currencySymbol = pCurrencySymbol
+        End Sub
+        ''' <summary>
+        ''' Setzt den Shared Currency-Cache zurück. Muss beim Laden eines neuen Dokuments
+        ''' aufgerufen werden, bevor UpdateCurrencyFormat die neuen Werte schreibt.
+        ''' Verhindert, dass ein veraltetes Währungssymbol aus einem vorherigen Dokument
+        ''' durch den CustomColumnDisplayText-Handler verwendet wird.
+        ''' </summary>
+        Public Shared Sub ResetCurrencySymbolCache()
+            SyncLock _CurrencySymbolByGridName
+                _CurrencySymbolByGridName.Clear()
+            End SyncLock
         End Sub
-
         Public Function CreateGridColumns(pColumnTable As DataTable) As DataTable
             Dim oDataTable As New DataTable
             Dim columnsWithExpressions As New List(Of Tuple(Of DataColumn, String))
@@ -60,9 +140,19 @@ Namespace ControlCreator
                 End Select
 
                 Dim oFormulaExpression = ObjectEx.NotNull(oRow.Item("FORMULA_EXPRESSION"), String.Empty)
+                Dim oFormulaSql = ObjectEx.NotNull(oRow.Item("FORMULA_SQL"), String.Empty)
+
+                ' *** VALIDIERUNG: Beides gleichzeitig ist nicht erlaubt ***
+                If oFormulaExpression <> String.Empty AndAlso oFormulaSql <> String.Empty Then
+                    _Logger.Warn("⚠️ [CreateGridColumns] Column [{0}] has BOTH FORMULA_EXPRESSION and FORMULA_SQL – FORMULA_SQL will be ignored.", oColumn.ColumnName)
+                    ' FORMULA_EXPRESSION hat Vorrang → nur Expression wird als DataTable.Expression gesetzt
+                End If
+
                 If oFormulaExpression <> String.Empty Then
-                    ' Expression merken, aber erst später setzen
+                    ' FORMULA_EXPRESSION: Expression merken, aber erst später setzen (DataTable.Expression)
                     columnsWithExpressions.Add(New Tuple(Of DataColumn, String)(oColumn, oFormulaExpression))
+                    ' HINWEIS: FORMULA_SQL-Spalten bekommen KEINE DataTable.Expression,
+                    ' da deren Werte programmatisch via SetRowCellValue gesetzt werden.
                 End If
 
                 Try
@@ -199,16 +289,136 @@ Namespace ControlCreator
                 Return oEditor
             End If
         End Function
+        ''' <summary>
+        ''' Setzt das Währungssymbol für ein bestimmtes Grid im Shared Cache.
+        ''' Muss bei JEDEM Dokumentwechsel aufgerufen werden (auch bei EUR),
+        ''' damit der CustomColumnDisplayText-Handler sofort den korrekten Wert hat.
+        ''' </summary>
+        Public Shared Sub SetCurrencySymbolForGrid(gridName As String, currencySymbol As String)
+            SyncLock _CurrencySymbolByGridName
+                _CurrencySymbolByGridName(gridName) = currencySymbol
+            End SyncLock
+        End Sub
         ' Hilfsroutine: passt NUR das Summary-Item an (ohne FormatInfo)
-        Private Sub ApplyCurrencySummaryFormat(oCol As GridColumn, currencySymbol As String)
+        Private Sub ApplyCurrencySummaryFormat(oCol As GridColumn)
             oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
-            ' Variante A: Standard-Währungsformat aus aktueller Kultur
+            _Logger.Debug("Applying currency summary format for column [{0}] with symbol [{1}]", oCol.FieldName, _currencySymbol)
-            ' oCol.SummaryItem.DisplayFormat = "SUM: {0:C2}"
 
             ' Variante B: Kulturunabhängig, Symbol explizit anhängen
-            oCol.SummaryItem.DisplayFormat = $"SUM: {{0:N2}} {currencySymbol}"
+            oCol.SummaryItem.DisplayFormat = $"{{0:N2}} {_currencySymbol}"
         End Sub
-        Public Sub ConfigureViewColumns(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl, pcurrencySymbol As String)
+        ''' <summary>
+        ''' Aktualisiert die Währungsformatierung für alle CURRENCY-Spalten mit neuem Währungssymbol.
+        ''' Betrifft DisplayFormat, ColumnEdit (für editierbare Spalten) und Summary-Footer.
+        ''' </summary>
+        ''' <summary>
+        ''' 
+        Public Sub UpdateCurrencyFormat(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl, pNewCurrencySymbol As String)
+            Try
+                _Logger.Info("[UpdateCurrencyFormat] *** START *** [{0}] → [{1}] für [{2}]", _currencySymbol, pNewCurrencySymbol, pGrid.Name)
+
+                ' *** KERN-FIX: Speichere Symbol im SHARED Dictionary ***
+                Dim gridName As String = pGrid.Name
+                SyncLock _CurrencySymbolByGridName
+                    If _CurrencySymbolByGridName.ContainsKey(gridName) Then
+                        _CurrencySymbolByGridName(gridName) = pNewCurrencySymbol
+                    Else
+                        _CurrencySymbolByGridName.Add(gridName, pNewCurrencySymbol)
+                    End If
+                End SyncLock
+                _Logger.Debug("[UpdateCurrencyFormat] Shared Dictionary updated: [{0}] = [{1}]", gridName, pNewCurrencySymbol)
+
+                _currencySymbol = pNewCurrencySymbol
+
+                Dim oCultureInfo As CultureInfo = New CultureInfo("de-DE")
+                oCultureInfo.NumberFormat.CurrencySymbol = _currencySymbol
+
+                Dim riTextEdit As New RepositoryItemTextEdit()
+                riTextEdit.MaskSettings.Configure(Of MaskSettings.Numeric)(
+                    Sub(settings)
+                        settings.MaskExpression = "c"
+                        settings.Culture = oCultureInfo
+                    End Sub)
+                riTextEdit.UseMaskAsDisplayFormat = False
+                riTextEdit.DisplayFormat.FormatType = FormatType.Custom
+                riTextEdit.DisplayFormat.FormatString = $"#,##0.00 {_currencySymbol}"
+                _Logger.Debug("[UpdateCurrencyFormat] riTextEdit: DisplayFormat=[{0}]",
+                    riTextEdit.DisplayFormat.FormatString)
+
+                pGridView.BeginUpdate()
+                Try
+                    ' Schritt 1: Altes RepositoryItem entfernen (ohne vorher ColumnEdit=Nothing)
+                    Dim oldItems = pGrid.RepositoryItems.OfType(Of RepositoryItemTextEdit)().
+                        Where(Function(item) item.MaskSettings.MaskExpression = "c").ToList()
+                    For Each oldItem In oldItems
+                        _Logger.Debug("[UpdateCurrencyFormat] Removing old riTextEdit: DisplayFormat=[{0}]",
+                            oldItem.DisplayFormat.FormatString)
+                        pGrid.RepositoryItems.Remove(oldItem)
+                    Next
+
+                    ' Schritt 2: CURRENCY-Spalten konfigurieren
+                    For Each oCol As GridColumn In pGridView.Columns
+                        Dim oColumnData As DataRow = pColumnTable.
+                            Select($"SPALTENNAME = '{oCol.FieldName}'").
+                            FirstOrDefault()
+                        If oColumnData Is Nothing Then Continue For
+
+                        If ObjectEx.NotNull(oColumnData.Item("TYPE_COLUMN"), String.Empty).ToString() <> "CURRENCY" Then Continue For
+
+                        Dim oIsFormulaExpression As Boolean =
+                            ObjectEx.NotNull(oColumnData.Item("FORMULA_EXPRESSION"), String.Empty) <> String.Empty
+                        Dim oIsFormulaSql As Boolean =
+                            ObjectEx.NotNull(oColumnData.Item("FORMULA_SQL"), String.Empty) <> String.Empty
+
+                        ' Entweder/Oder: Beide gleichzeitig → Expression gewinnt, SQL ignoriert
+                        If oIsFormulaExpression AndAlso oIsFormulaSql Then
+                            _Logger.Warn("[UpdateCurrencyFormat] Column [{0}] has BOTH FORMULA_EXPRESSION and FORMULA_SQL – treating as EXPRESSION only.", oCol.FieldName)
+                            oIsFormulaSql = False
+                        End If
+
+                        ' Spalte ist eine Formel-Spalte (Expression ODER SQL) → ReadOnly, kein ColumnEdit
+                        Dim oIsAnyFormula As Boolean = oIsFormulaExpression OrElse oIsFormulaSql
+
+                        ' DisplayFormat immer aktualisieren
+                        oCol.DisplayFormat.FormatType = FormatType.Custom
+                        oCol.DisplayFormat.FormatString = $"#,##0.00 {_currencySymbol}"
+
+                        If Not oIsAnyFormula AndAlso oCol.OptionsColumn.AllowEdit Then
+                            ' Nur editierbare Nicht-Formel-Spalten bekommen ein ColumnEdit
+                            oCol.ColumnEdit = riTextEdit
+                            _Logger.Debug("[UpdateCurrencyFormat] ColumnEdit=[{0}] für [{1}]",
+                                DirectCast(oCol.ColumnEdit, RepositoryItemTextEdit).DisplayFormat.FormatString,
+                                oCol.FieldName)
+                        Else
+                            _Logger.Debug("[UpdateCurrencyFormat] [{0}]: ReadOnly/Formula – nur DisplayFormat aktualisiert (IsExpression=[{1}], IsSql=[{2}])",
+                                oCol.FieldName, oIsFormulaExpression, oIsFormulaSql)
+                        End If
+
+                        If ObjectEx.NotNull(oColumnData.Item("SUMMARY_FUNCTION"), String.Empty) =
+                           Constants.AGGREGATE_TOTAL_CURRENCY Then
+                            oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
+                            oCol.SummaryItem.DisplayFormat = $"{{0:N2}} {_currencySymbol}"
+                        End If
+                    Next
+                Finally
+                    pGridView.EndUpdate()
+                End Try
+
+                pGridView.LayoutChanged()
+                For i As Integer = 0 To pGridView.DataRowCount - 1
+                    pGridView.InvalidateRow(i)
+                Next
+                pGridView.UpdateTotalSummary()
+
+                _Logger.Info("[UpdateCurrencyFormat] *** END *** _currencySymbol=[{0}]", _currencySymbol)
+
+            Catch ex As Exception
+                _Logger.Error("[UpdateCurrencyFormat] Fehler: {0}", ex.Message)
+                _Logger.Error(ex)
+            End Try
+        End Sub
+
+        Public Sub ConfigureViewColumns(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl)
             Dim oShouldDisplayFooter As Boolean = False
             For Each oCol As GridColumn In pGridView.Columns
                 Dim oColumnData As DataRow = pColumnTable.
@@ -237,7 +447,10 @@ Namespace ControlCreator
                 If oFormulaExpression <> String.Empty Then
                     oIsReadOnly = True
                 End If
-
+                Dim oSQLExpression = ObjectEx.NotNull(oColumnData.Item("FORMULA_SQL"), String.Empty)
+                If oSQLExpression <> String.Empty Then
+                    oIsReadOnly = True
+                End If
 
                 oCol.OptionsColumn.AllowEdit = Not oIsReadOnly
 
@@ -253,8 +466,14 @@ Namespace ControlCreator
                         oCol.DisplayFormat.FormatString = "N2"
 
                     Case "CURRENCY"
-                        oCol.DisplayFormat.FormatType = FormatType.Custom
+                        ' *** DisplayFormat wird NICHT hier gesetzt ***
-                        oCol.DisplayFormat.FormatString = "C2"
+                        ' ConfigureViewColumnsCurrency übernimmt die CURRENCY-Formatierung
+                        ' mit dem korrekten _currencySymbol. Dieses Standardformat würde
+                        ' später von UpdateCurrencyFormat überschrieben werden müssen –
+                        ' für Formel-Spalten (kein ColumnEdit) greift aber nur DisplayFormat,
+                        ' weshalb ein falscher Initialwert hier persistent bleibt.
+                        _Logger.Debug("CURRENCY column [{0}]: DisplayFormat wird von ConfigureViewColumnsCurrency gesetzt", oCol.FieldName)
+
                 End Select
 
                 Dim oSummaryFunction As String = oColumnData.Item("SUMMARY_FUNCTION")
@@ -262,16 +481,17 @@ Namespace ControlCreator
                 Select Case oSummaryFunction
                     Case Constants.AGGREGATE_TOTAL_INTEGER
                         oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
-                        oCol.SummaryItem.DisplayFormat = "SUM: {0:N0}"
+                        oCol.SummaryItem.DisplayFormat = "{0:N0}"
                         oShouldDisplayFooter = True
 
                     Case Constants.AGGREGATE_TOTAL_FLOAT
                         oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
-                        oCol.SummaryItem.DisplayFormat = "SUM: {0:N2}"
+                        oCol.SummaryItem.DisplayFormat = "{0:N2}"
                         oShouldDisplayFooter = True
 
                     Case Constants.AGGREGATE_TOTAL_CURRENCY
-                        ApplyCurrencySummaryFormat(oCol, pcurrencySymbol)
+                        _Logger.Debug(Of String)("Applying currency summary format for column [{0}]", oCol.FieldName)
+                        ApplyCurrencySummaryFormat(oCol)
                         oShouldDisplayFooter = True
 
                     Case Constants.AGGREGATE_TOTAL_AVG
@@ -306,37 +526,179 @@ Namespace ControlCreator
                 End With
             End If
         End Sub
-        Public Sub ConfigureViewColumnsCurrency(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl, pCurrency As String)
 
+        Public Sub ConfigureViewColumnsCurrency(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl)
             Dim oCultureInfo As CultureInfo = New CultureInfo("de-DE")
-            oCultureInfo.NumberFormat.CurrencySymbol = pCurrency
+            oCultureInfo.NumberFormat.CurrencySymbol = _currencySymbol
+
             Dim riTextEdit As RepositoryItemTextEdit = New RepositoryItemTextEdit()
-            riTextEdit.MaskSettings.Configure(Of MaskSettings.Numeric)(Sub(settings)
+            riTextEdit.MaskSettings.Configure(Of MaskSettings.Numeric)(
-                                                                           settings.MaskExpression = "c"
+                Sub(settings)
-                                                                           settings.Culture = oCultureInfo
+                    settings.MaskExpression = "c"
-                                                                       End Sub)
+                    settings.Culture = oCultureInfo
-            riTextEdit.UseMaskAsDisplayFormat = True 'Optional
+                End Sub)
-            pGrid.RepositoryItems.Add(riTextEdit)
+            riTextEdit.UseMaskAsDisplayFormat = False
+            riTextEdit.DisplayFormat.FormatType = FormatType.Custom
+            riTextEdit.DisplayFormat.FormatString = $"#,##0.00 {_currencySymbol}"
+
+            _Logger.Debug("[ConfigureViewColumnsCurrency] riTextEdit erstellt: DisplayFormat=[{0}], HashCode=[{1}]",
+                riTextEdit.DisplayFormat.FormatString, riTextEdit.GetHashCode())
+            _Logger.Debug("[ConfigureViewColumnsCurrency] pGrid.RepositoryItems.Count VOR Schleife=[{0}]",
+                pGrid.RepositoryItems.Count)
 
             For Each oCol As GridColumn In pGridView.Columns
                 Dim oColumnData As DataRow = pColumnTable.
                     Select($"SPALTENNAME = '{oCol.FieldName}'").
                     FirstOrDefault()
+                If oColumnData Is Nothing Then Continue For
 
-                If oColumnData Is Nothing Then
+                Dim oColumnType As String = ObjectEx.NotNull(oColumnData.Item("TYPE_COLUMN"), String.Empty).ToString()
-                    Continue For
+                If oColumnType <> "CURRENCY" Then Continue For
+
+                Dim oFormulaExpression = ObjectEx.NotNull(oColumnData.Item("FORMULA_EXPRESSION"), String.Empty)
+                Dim oFormulaSql = ObjectEx.NotNull(oColumnData.Item("FORMULA_SQL"), String.Empty)
+
+                ' Entweder/Oder: Beide gleichzeitig → Expression gewinnt, SQL ignoriert
+                If oFormulaExpression <> String.Empty AndAlso oFormulaSql <> String.Empty Then
+                    _Logger.Warn("[ConfigureViewColumnsCurrency] Column [{0}] has BOTH FORMULA_EXPRESSION and FORMULA_SQL – treating as EXPRESSION only.", oCol.FieldName)
+                    oFormulaSql = String.Empty
                 End If
 
-                Dim oColumnType As String = oColumnData.Item("TYPE_COLUMN")
+                ' Spalte ist eine Formel-Spalte (Expression ODER SQL) → nur DisplayFormat, kein ColumnEdit
+                Dim oIsAnyFormula As Boolean = oFormulaExpression <> String.Empty OrElse oFormulaSql <> String.Empty
 
-                Select Case oColumnType
+                If oIsAnyFormula Then
-                    Case "CURRENCY"
+                    ' Formel-Spalten (Expression oder SQL): nur DisplayFormat setzen
-                        oCol.DisplayFormat.FormatType = FormatType.Custom
+                    oCol.DisplayFormat.FormatType = FormatType.Custom
-                        oCol.ColumnEdit = riTextEdit
+                    oCol.DisplayFormat.FormatString = $"#,##0.00 {_currencySymbol}"
-                End Select
+                    _Logger.Debug("[ConfigureViewColumnsCurrency] Formel-Spalte [{0}] (IsExpression=[{1}], IsSql=[{2}]): DisplayFormat=[{3}], RepositoryItems.Count=[{4}]",
+                        oCol.FieldName,
+                        oFormulaExpression <> String.Empty,
+                        oFormulaSql <> String.Empty,
+                        oCol.DisplayFormat.FormatString,
+                        pGrid.RepositoryItems.Count)
+
+                ElseIf oCol.OptionsColumn.AllowEdit Then
+                    _Logger.Debug("[ConfigureViewColumnsCurrency] [{0}] VOR ColumnEdit: RepositoryItems.Count=[{1}]",
+                        oCol.FieldName, pGrid.RepositoryItems.Count)
+
+                    oCol.ColumnEdit = riTextEdit
+
+                    _Logger.Debug("[ConfigureViewColumnsCurrency] [{0}] NACH ColumnEdit: RepositoryItems.Count=[{1}]",
+                        oCol.FieldName, pGrid.RepositoryItems.Count)
+
+                    Dim assignedEdit = TryCast(oCol.ColumnEdit, RepositoryItemTextEdit)
+                    _Logger.Debug("[ConfigureViewColumnsCurrency] [{0}]: IsSameObject=[{1}], ColumnEdit.DisplayFormat=[{2}], ColumnEdit.HashCode=[{3}]",
+                        oCol.FieldName,
+                        Object.ReferenceEquals(assignedEdit, riTextEdit),
+                        If(assignedEdit IsNot Nothing, assignedEdit.DisplayFormat.FormatString, "N/A"),
+                        If(assignedEdit IsNot Nothing, assignedEdit.GetHashCode(), -1))
+
+                    For i As Integer = 0 To pGrid.RepositoryItems.Count - 1
+                        _Logger.Debug("[ConfigureViewColumnsCurrency] RepositoryItems[{0}]: Type=[{1}], HashCode=[{2}]",
+                            i, pGrid.RepositoryItems(i).GetType().Name, pGrid.RepositoryItems(i).GetHashCode())
+                    Next
+                End If
             Next
+
+            Dim oTestFired As Boolean = False
+            AddHandler pGridView.CustomColumnDisplayText,
+            Sub(sender As Object, e As CustomColumnDisplayTextEventArgs)
+                If e.Column Is Nothing OrElse e.Value Is Nothing OrElse IsDBNull(e.Value) Then
+                    Return
+                End If
+
+                Dim oColumnData As DataRow = pColumnTable.
+                    Select($"SPALTENNAME = '{e.Column.FieldName}'").
+                    FirstOrDefault()
+
+                If oColumnData IsNot Nothing AndAlso
+                   oColumnData.Item("TYPE_COLUMN").ToString() = "CURRENCY" Then
+
+                    Try
+                        Dim currentSymbol As String = _currencySymbol
+                        Dim gridName As String = pGrid.Name
+                        SyncLock _CurrencySymbolByGridName
+                            If _CurrencySymbolByGridName.ContainsKey(gridName) Then
+                                currentSymbol = _CurrencySymbolByGridName(gridName)
+                            End If
+                        End SyncLock
+
+                        Dim oValue As Double
+                        If TypeOf e.Value Is Double OrElse TypeOf e.Value Is Decimal Then
+                            oValue = Convert.ToDouble(e.Value)
+                        ElseIf TypeOf e.Value Is String Then
+                            Dim oStringValue As String = e.Value.ToString().Trim()
+
+                            Dim oDeCulture As CultureInfo = New CultureInfo("de-DE")
+                            If Double.TryParse(oStringValue, NumberStyles.Currency Or NumberStyles.Number, oDeCulture, oValue) Then
+                            ElseIf Double.TryParse(oStringValue, NumberStyles.Currency Or NumberStyles.Number, CultureInfo.InvariantCulture, oValue) Then
+                            Else
+                                oValue = Convert.ToDouble(oStringValue, CultureInfo.CurrentCulture)
+                            End If
+                        Else
+                            oValue = Convert.ToDouble(e.Value)
+                        End If
+
+                        Dim oDeCultureInfo As CultureInfo = New CultureInfo("de-DE")
+                        e.DisplayText = oValue.ToString("N2", oDeCultureInfo) & " " & currentSymbol
+
+                        _Logger.Debug("[CustomColumnDisplayText] CURRENCY [{0}]: DisplayText=[{1}], Symbol=[{2}] (from Shared Dict in ConfigureViewColumnsCurrency)",
+                            e.Column.FieldName, e.DisplayText, currentSymbol)
+
+                    Catch ex As Exception
+                        _Logger.Warn("⚠️ Could not format currency value [{0}] for column [{1}]: {2}",
+                                     e.Value, e.Column.FieldName, ex.Message)
+                        Dim fallbackSymbol As String = _currencySymbol
+                        SyncLock _CurrencySymbolByGridName
+                            If _CurrencySymbolByGridName.ContainsKey(pGrid.Name) Then
+                                fallbackSymbol = _CurrencySymbolByGridName(pGrid.Name)
+                            End If
+                        End SyncLock
+                        e.DisplayText = e.Value.ToString() & " " & fallbackSymbol
+                    End Try
+                End If
+            End Sub
         End Sub
+
         Public Sub ConfigureViewEvents(pColumnTable As DataTable, pGridView As GridView, pControl As Windows.Forms.Control, pControlId As Integer)
+            ' *** Formel-Spalten einmalig cachen + Validierung: Entweder EXPRESSION oder SQL, nie beides ***
+            _FormulaColumnNames.Clear()
+            _FormulaSqlColumns.Clear()
+
+            For Each r As DataRow In pColumnTable.Rows
+                Dim oColName = r.Item("SPALTENNAME").ToString()
+                Dim oExpr = ObjectEx.NotNull(r.Item("FORMULA_EXPRESSION"), String.Empty).ToString()
+                Dim oSql = ObjectEx.NotNull(r.Item("FORMULA_SQL"), String.Empty).ToString()
+
+                ' *** VALIDIERUNG: Beides gleichzeitig ist nicht erlaubt ***
+                If oExpr <> String.Empty AndAlso oSql <> String.Empty Then
+                    _Logger.Warn("⚠️ Column [{0}] has BOTH FORMULA_EXPRESSION and FORMULA_SQL – this is not allowed! FORMULA_SQL will be ignored.", oColName)
+                    MsgBox(String.Format(
+                        "Die Spalte '{0}' enthält sowohl eine FORMULA_EXPRESSION als auch eine FORMULA_SQL." & vbCrLf &
+                        "Es darf nur eine der beiden Formeln gesetzt sein." & vbCrLf &
+                        "FORMULA_SQL wird ignoriert. Bitte korrigieren Sie die Konfiguration im Tabellen-Designer.",
+                        oColName), MsgBoxStyle.Exclamation, "Ungültige Spalten-Konfiguration")
+                    ' FORMULA_EXPRESSION hat Vorrang → SQL ignorieren
+                    oSql = String.Empty
+                End If
+
+                If oExpr <> String.Empty Then
+                    _FormulaColumnNames.Add(oColName)
+                    _Logger.Debug("[ConfigureViewEvents] Column [{0}] registered as FORMULA_EXPRESSION column.", oColName)
+                ElseIf oSql <> String.Empty Then
+                    Dim oConnectionId As Integer = r.ItemEx("CONNECTION_ID", 0)
+                    _FormulaSqlColumns(oColName) = New FormulaSqlDefinition() With {
+                        .SqlTemplate = oSql,
+                        .ReferencedColumns = GetReferencedSqlColumnNames(oSql)
+                    }
+                    ' SQL-Spalten auch in _FormulaColumnNames aufnehmen → Editor-Blockade + ReadOnly
+                    _FormulaColumnNames.Add(oColName)
+                    _Logger.Debug("[ConfigureViewEvents] Column [{0}] registered as FORMULA_SQL column. ReferencedColumns=[{1}]",
+                        oColName, String.Join(", ", GetReferencedSqlColumnNames(oSql)))
+                End If
+            Next
+
             AddHandler pGridView.InitNewRow, Sub(sender As Object, e As InitNewRowEventArgs)
                                                  Try
                                                      _Logger.Debug("Initialzing new row")
@@ -362,23 +724,100 @@ Namespace ControlCreator
                                                      newRowModified = False
                                                  End Try
                                              End Sub
+            ' *** NEU: CustomColumnDisplayText für robuste CURRENCY-Formatierung ***
+            AddHandler pGridView.CustomColumnDisplayText,
+                Sub(sender As Object, e As CustomColumnDisplayTextEventArgs)
+                    If e.Column Is Nothing OrElse e.Value Is Nothing OrElse IsDBNull(e.Value) Then
+                        Return
+                    End If
+
+                    ' Prüfe ob Spalte vom Typ CURRENCY ist
+                    Dim oColumnData As DataRow = pColumnTable.
+                        Select($"SPALTENNAME = '{e.Column.FieldName}'").
+                        FirstOrDefault()
+
+                    If oColumnData IsNot Nothing AndAlso
+                       oColumnData.Item("TYPE_COLUMN").ToString() = "CURRENCY" Then
+
+                        Try
+                            ' *** KERN-FIX: Hole Symbol aus SHARED Dictionary statt Instanz-Feld ***
+                            Dim currentSymbol As String = _currencySymbol  ' Fallback
+                            Dim gridName As String = pControl.Name
+                            SyncLock _CurrencySymbolByGridName
+                                If _CurrencySymbolByGridName.ContainsKey(gridName) Then
+                                    currentSymbol = _CurrencySymbolByGridName(gridName)
+                                End If
+                            End SyncLock
+
+                            Dim oValue As Double
+                            ' *** KRITISCH: Robustes Parsing unabhängig vom Dezimaltrenner ***
+                            If TypeOf e.Value Is Double OrElse TypeOf e.Value Is Decimal Then
+                                oValue = Convert.ToDouble(e.Value)
+                            ElseIf TypeOf e.Value Is String Then
+                                Dim oStringValue As String = e.Value.ToString().Trim()
+
+                                ' Versuche zuerst deutsches Format (1.234,56)
+                                Dim oDeCulture As CultureInfo = New CultureInfo("de-DE")
+                                If Double.TryParse(oStringValue, NumberStyles.Currency Or NumberStyles.Number, oDeCulture, oValue) Then
+                                    ' Erfolgreich mit deutschem Format geparst
+                                ElseIf Double.TryParse(oStringValue, NumberStyles.Currency Or NumberStyles.Number, CultureInfo.InvariantCulture, oValue) Then
+                                    ' Erfolgreich mit invariantem Format (Punkt als Dezimaltrenner)
+                                Else
+                                    ' Fallback: Systemkultur
+                                    oValue = Convert.ToDouble(oStringValue, CultureInfo.CurrentCulture)
+                                End If
+                            Else
+                                oValue = Convert.ToDouble(e.Value)
+                            End If
+
+                            ' Formatierung IMMER mit deutscher Kultur (Komma als Dezimaltrenner)
+                            Dim oDeCultureInfo As CultureInfo = New CultureInfo("de-DE")
+                            e.DisplayText = oValue.ToString("N2", oDeCultureInfo) & " " & currentSymbol
+
+                            _Logger.Debug("[CustomColumnDisplayText] CURRENCY [{0}]: DisplayText=[{1}], Symbol=[{2}] (from Shared Dict in ConfigureViewEvents)",
+                                e.Column.FieldName, e.DisplayText, currentSymbol)
+
+                        Catch ex As Exception
+                            _Logger.Warn("⚠️ Could not format currency value [{0}] for column [{1}]: {2}",
+                                         e.Value, e.Column.FieldName, ex.Message)
+                            ' Fallback: Original-Wert + Symbol
+                            Dim fallbackSymbol As String = _currencySymbol
+                            SyncLock _CurrencySymbolByGridName
+                                If _CurrencySymbolByGridName.ContainsKey(pControl.Name) Then
+                                    fallbackSymbol = _CurrencySymbolByGridName(pControl.Name)
+                                End If
+                            End SyncLock
+                            e.DisplayText = e.Value.ToString() & " " & fallbackSymbol
+                        End Try
+                    End If
+                End Sub
 
             AddHandler pGridView.CustomRowCellEdit, Sub(sender As Object, e As CustomRowCellEditEventArgs)
                                                         Try
                                                             For Each oRow As DataRow In pColumnTable.Rows
-                                                                Dim oColumnName = oRow.Item("SPALTENNAME")
+                                                                Dim oColumnName As String = oRow.Item("SPALTENNAME").ToString()
+                                                                If oColumnName <> e.Column.FieldName Then Continue For
+
                                                                 Dim oEditorExists = GridTables_TestEditorExistsByControlAndColumn(pControlId, oColumnName)
-                                                                If oColumnName <> e.Column.FieldName Then
-                                                                    Continue For
-                                                                End If
 
                                                                 If oEditorExists Then
+                                                                    ' Combobox/Lookup-Editor aus GridTables: immer zuweisen
                                                                     Dim oEditor = _GridTables.Item(pControlId).Item(oColumnName)
                                                                     _Logger.Debug("Assigning Editor to Column [{0}]", oColumnName)
                                                                     e.RepositoryItem = oEditor
                                                                 Else
-                                                                    _Logger.Debug("Editor for Column [{0}] does not exist", oColumnName)
+                                                                    Dim oColumnType As String = ObjectEx.NotNull(oRow.Item("TYPE_COLUMN"), String.Empty).ToString()
+                                                                    If oColumnType = "CURRENCY" Then
+                                                                        If _FormulaColumnNames.Contains(oColumnName) Then
+                                                                            _Logger.Debug("CURRENCY column [{0}] is formula/readonly – CustomColumnDisplayText handles display", oColumnName)
+                                                                        Else
+                                                                            _Logger.Debug("CURRENCY column [{0}] – NO e.RepositoryItem set. Display via CustomColumnDisplayText, Edit via GridColumn.ColumnEdit", oColumnName)
+                                                                        End If
+                                                                    Else
+                                                                        _Logger.Debug("Editor for Column [{0}] does not exist", oColumnName)
+                                                                    End If
                                                                 End If
+                                                                Exit For
                                                             Next
                                                         Catch ex As Exception
                                                             _Logger.Warn("⚠️ Error in CustomRowCellEdit for [{0}]", e.CellValue)
@@ -394,30 +833,328 @@ Namespace ControlCreator
                                                    End Sub
 
             AddHandler pGridView.PopupMenuShowing, AddressOf View_PopupMenuShowing
-
             AddHandler pGridView.InvalidRowException, AddressOf View_InvalidRowException
             AddHandler pGridView.ValidatingEditor, AddressOf View_ValidatingEditor
-            '  AddHandler pGridView.CustomColumnDisplayText, AddressOf View_CustomColumnDisplayText
+            AddHandler pGridView.ShownEditor,
+                Sub(sender As Object, e As EventArgs)
+                    Dim view As GridView = TryCast(sender, GridView)
+                    If view.IsNewItemRow(view.FocusedRowHandle) Then
+                        _Logger.Debug("Attaching Modified Handler.")
+                        AddHandler view.ActiveEditor.Modified, Sub()
+                                                                   _Logger.Debug("Row was modified.")
+                                                                   newRowModified = True
+                                                               End Sub
+                    End If
+
+                    ' *** LIVE-REFRESH bei JEDER Eingabe (nur für FORMULA_EXPRESSION!) ***
+                    ' FORMULA_SQL wird NICHT hier behandelt – SQL-Refresh erfolgt nur über CellValueChanged
+                    If view.FocusedColumn IsNot Nothing AndAlso view.ActiveEditor IsNot Nothing Then
+                        Dim oFocusedColumnName As String = view.FocusedColumn.FieldName
+
+                        ' Prüfen ob diese Spalte von FORMULA_EXPRESSION-Spalten referenziert wird
+                        Dim oFormulaColumnsToRefresh As New List(Of String)
+                        For Each oColumnData As DataRow In pColumnTable.Rows
+                            Dim oColName = oColumnData.Item("SPALTENNAME").ToString()
+                            Dim oExpr = ObjectEx.NotNull(oColumnData.Item("FORMULA_EXPRESSION"), String.Empty).ToString()
+
+                            ' Nur FORMULA_EXPRESSION – FORMULA_SQL wird über CellValueChanged behandelt
+                            If oExpr = String.Empty Then
+                                Continue For
+                            End If
+
+                            ' Spalte darf keine FORMULA_SQL haben (wurde oben validiert, Sicherheitsprüfung)
+                            Dim oSqlExpr = ObjectEx.NotNull(oColumnData.Item("FORMULA_SQL"), String.Empty).ToString()
+                            If oSqlExpr <> String.Empty Then
+                                _Logger.Debug("[FormulaRefresh] Column [{0}] has both FORMULA_EXPRESSION and FORMULA_SQL – skipping live refresh.", oColName)
+                                Continue For
+                            End If
+
+                            Dim referencedColumns = GetReferencedColumnNames(oExpr)
+                            If referencedColumns.Any(Function(col) String.Equals(col, oFocusedColumnName, StringComparison.OrdinalIgnoreCase)) Then
+                                oFormulaColumnsToRefresh.Add(oColName)
+                            End If
+                        Next
+
+                        If oFormulaColumnsToRefresh.Count > 0 Then
+                            _Logger.Debug("[FormulaRefresh] Attaching EditValueChanged handler for LIVE formula updates on column [{0}].", oFocusedColumnName)
+
+                            ' Handler für LIVE Aktualisierung während JEDER Eingabe
+                            AddHandler view.ActiveEditor.EditValueChanged,
+                                Sub(editorSender As Object, editorArgs As EventArgs)
+                                    Try
+                                        Dim oRowHandle As Integer = view.FocusedRowHandle
+                                        If Not view.IsValidRowHandle(oRowHandle) Then Return
+
+                                        Dim oEditor As DevExpress.XtraEditors.BaseEdit = TryCast(editorSender, DevExpress.XtraEditors.BaseEdit)
+                                        If oEditor Is Nothing Then Return
+
+                                        Dim isNewItemRow As Boolean = view.IsNewItemRow(oRowHandle)
+
+                                        Try
+                                            Dim oValue As Object = oEditor.EditValue
+
+                                            If TypeOf oEditor Is DevExpress.XtraEditors.TextEdit Then
+                                                Dim oTextEdit As DevExpress.XtraEditors.TextEdit = DirectCast(oEditor, DevExpress.XtraEditors.TextEdit)
+                                                If oTextEdit.Properties.MaskSettings IsNot Nothing Then
+                                                    oValue = oEditor.EditValue
+                                                End If
+                                            End If
+
+                                            If isNewItemRow Then
+                                                _Logger.Debug("[FormulaRefresh] EditValueChanged (NewItemRow) – setting value for [{0}] = [{1}].", oFocusedColumnName, oValue)
+
+                                                _isRefreshingFormula = True
+                                                Try
+                                                    ' Wert setzen
+                                                    view.SetRowCellValue(oRowHandle, oFocusedColumnName, If(oValue Is Nothing, DBNull.Value, oValue))
+
+                                                    ' *** KRITISCH: DoEvents() damit SetRowCellValue processed wird ***
+                                                    view.UpdateCurrentRow()
+
+                                                    ' Formel-Spalten SOFORT refreshen
+                                                    For Each oFormulaColumnName As String In oFormulaColumnsToRefresh
+                                                        Dim oGridColumn As GridColumn = view.Columns.ColumnByFieldName(oFormulaColumnName)
+                                                        If oGridColumn IsNot Nothing Then
+                                                            view.RefreshRowCell(oRowHandle, oGridColumn)
+                                                            _Logger.Debug("[FormulaRefresh] (NewItemRow) Refreshed [{0}], current value: [{1}]",
+                                                                oFormulaColumnName, view.GetRowCellValue(oRowHandle, oGridColumn))
+                                                        End If
+                                                    Next
+                                                Finally
+                                                    _isRefreshingFormula = False
+                                                End Try
+
+                                            Else
+                                                ' Bestehende Row
+                                                Dim oDataRow As DataRow = view.GetDataRow(oRowHandle)
+                                                If oDataRow IsNot Nothing Then
+                                                    _Logger.Debug("[FormulaRefresh] EditValueChanged – setting value for [{0}] in DataTable.", oFocusedColumnName)
+                                                    oDataRow.Item(oFocusedColumnName) = If(oValue Is Nothing, DBNull.Value, oValue)
+
+                                                    For Each oFormulaColumnName As String In oFormulaColumnsToRefresh
+                                                        Dim oGridColumn As GridColumn = view.Columns.ColumnByFieldName(oFormulaColumnName)
+                                                        If oGridColumn IsNot Nothing Then
+                                                            view.RefreshRowCell(oRowHandle, oGridColumn)
+                                                            Dim currentValue = view.GetRowCellValue(oRowHandle, oGridColumn)
+                                                            _Logger.Debug("[FormulaRefresh] Current value for [{0}]: [{1}]", oFormulaColumnName, currentValue)
+                                                        End If
+                                                    Next
+                                                End If
+                                            End If
+
+                                        Catch parseEx As Exception
+                                            _Logger.Debug("[FormulaRefresh] Parse error during EditValueChanged: {0}", parseEx.Message)
+                                        End Try
+
+                                    Catch ex As Exception
+                                        _Logger.Error(ex)
+                                    End Try
+                                End Sub
+                        End If
+                    End If
+                End Sub
 
-            ' These handlers are all used for the custom DefaultValue functionality, additionally some code in the 'InitNewRow' event.
-            ' https://supportcenter.devexpress.com/ticket/details/t1035580/how-to-default-a-value-in-a-column-when-add-new-row-in-data-grid
-            AddHandler pGridView.ShowingEditor, AddressOf View_ShowingEditor
-            AddHandler pGridView.ShownEditor, AddressOf View_ShownEditor
             AddHandler pGridView.ValidateRow, AddressOf View_ValidateRow
             AddHandler pControl.LostFocus, AddressOf Control_LostFocus
+
+            AddHandler pGridView.ShowingEditor,
+                Sub(sender As Object, e As CancelEventArgs)
+                    Try
+                        Dim oView As GridView = TryCast(sender, GridView)
+                        If oView Is Nothing Then Return
+
+                        _Logger.Debug("Showing editor.")
+
+                        ' Formel-Spalten dürfen keinen Editor öffnen (gilt für EXPRESSION UND SQL)
+                        If oView.FocusedColumn IsNot Nothing Then
+                            Dim oFieldName As String = oView.FocusedColumn.FieldName
+                            If _FormulaColumnNames.Contains(oFieldName) Then
+                                _Logger.Debug("Cancelling editor – column [{0}] is a formula column (Expression or SQL).", oFieldName)
+                                e.Cancel = True
+                                Return
+                            End If
+                        End If
+
+                        If oView.IsNewItemRow(oView.FocusedRowHandle) AndAlso Not newRowModified Then
+                            _Logger.Debug("Adding new row.")
+                            oView.AddNewRow()
+                        End If
+                    Catch ex As Exception
+                        _Logger.Error(ex)
+                    End Try
+                End Sub
+
+            AddHandler pGridView.FocusedColumnChanged,
+                Sub(sender As Object, e As FocusedColumnChangedEventArgs)
+                    Try
+                        Dim oView As GridView = TryCast(sender, GridView)
+                        If oView Is Nothing Then Return
+
+                        Dim oRowHandle As Integer = oView.FocusedRowHandle
+                        If oView.IsNewItemRow(oRowHandle) Then Return
+                        If Not oView.IsValidRowHandle(oRowHandle) Then Return
+
+                        If oView.FocusedColumn IsNot Nothing AndAlso
+                           _FormulaColumnNames.Contains(oView.FocusedColumn.FieldName) Then
+                            _Logger.Debug("[FormulaRefresh] FocusedColumnChanged – closing editor on formula column [{0}].", oView.FocusedColumn.FieldName)
+                            oView.CloseEditor()
+                        End If
+                    Catch ex As Exception
+                        _Logger.Error(ex)
+                    End Try
+                End Sub
+
             AddHandler pGridView.CellValueChanged,
                 Sub(sender As Object, e As CellValueChangedEventArgs)
+                    ' *** HandleInheritedColumnValue MUSS zuerst aufgerufen werden ***
                     Try
                         HandleInheritedColumnValue(TryCast(sender, GridView), pColumnTable, e)
                     Catch ex As Exception
                         _Logger.Error(ex)
                     End Try
+
+                    ' *** FORMULA_EXPRESSION-Refresh via CellValueChanged (FALLBACK) ***
+                    ' (EditValueChanged macht das normalerweise schon LIVE)
+                    Try
+                        Dim oView As GridView = TryCast(sender, GridView)
+                        If oView Is Nothing OrElse e.Column Is Nothing Then Return
+
+                        Dim oFormulaColumnsToRefresh As New List(Of String)
+
+                        For Each oColumnData As DataRow In pColumnTable.Rows
+                            Dim oExpr = ObjectEx.NotNull(oColumnData.Item("FORMULA_EXPRESSION"), String.Empty).ToString()
+                            If oExpr = String.Empty Then Continue For
+
+                            ' Nur FORMULA_EXPRESSION – kein SQL
+                            Dim oSqlExpr = ObjectEx.NotNull(oColumnData.Item("FORMULA_SQL"), String.Empty).ToString()
+                            If oSqlExpr <> String.Empty Then Continue For
+
+                            Dim referencedColumns = GetReferencedColumnNames(oExpr)
+                            If referencedColumns.Any(Function(col) String.Equals(col, e.Column.FieldName, StringComparison.OrdinalIgnoreCase)) Then
+                                oFormulaColumnsToRefresh.Add(oColumnData.Item("SPALTENNAME").ToString())
+                            End If
+                        Next
+
+                        If oFormulaColumnsToRefresh.Count = 0 Then
+                            ' Kein FORMULA_EXPRESSION-Refresh nötig – weiter zu FORMULA_SQL
+                        Else
+                            Dim oRowHandle As Integer = e.RowHandle
+                            _Logger.Debug("[FormulaRefresh] CellValueChanged FALLBACK – refreshing EXPRESSION columns for row [{0}] after column [{1}] changed.", oRowHandle, e.Column.FieldName)
+
+                            oView.GridControl.BeginInvoke(New Action(
+                                Sub()
+                                    Try
+                                        If Not oView.IsValidRowHandle(oRowHandle) Then Return
+
+                                        For Each oFormulaColumnName As String In oFormulaColumnsToRefresh
+                                            Dim oGridColumn As GridColumn = oView.Columns.ColumnByFieldName(oFormulaColumnName)
+                                            If oGridColumn Is Nothing Then Continue For
+
+                                            oView.RefreshRowCell(oRowHandle, oGridColumn)
+                                            _Logger.Debug("[FormulaRefresh] FALLBACK DisplayText for [{0}]: [{1}]",
+                                                oFormulaColumnName, oView.GetRowCellDisplayText(oRowHandle, oGridColumn))
+                                        Next
+                                    Catch ex As Exception
+                                        _Logger.Error(ex)
+                                    End Try
+                                End Sub))
+                        End If
+
+                    Catch ex As Exception
+                        _Logger.Error(ex)
+                    End Try
+
+                    ' *** FORMULA_SQL-Refresh via CellValueChanged ***
+                    ' SQL wird NUR hier ausgeführt (nicht in EditValueChanged) um DB-Roundtrips zu minimieren
+                    Try
+                        Dim oView As GridView = TryCast(sender, GridView)
+                        If oView Is Nothing OrElse e.Column Is Nothing Then Return
+
+                        ' Finde alle SQL-Formelspalten, die die geänderte Spalte referenzieren
+                        Dim oSqlColumnsToRefresh As New List(Of String)
+                        For Each kvp In _FormulaSqlColumns
+                            If kvp.Value.ReferencedColumns.Any(
+                                Function(col) String.Equals(col, e.Column.FieldName, StringComparison.OrdinalIgnoreCase)) Then
+                                oSqlColumnsToRefresh.Add(kvp.Key)
+                            End If
+                        Next
+
+                        If oSqlColumnsToRefresh.Count = 0 Then Return
+
+                        Dim oRowHandle As Integer = e.RowHandle
+                        _Logger.Debug("[FormulaSql] CellValueChanged – column [{0}] triggers SQL refresh for: [{1}]",
+                            e.Column.FieldName, String.Join(", ", oSqlColumnsToRefresh))
+
+                        ' BeginInvoke: UI nicht blockieren, GridView in stabilem Zustand
+                        oView.GridControl.BeginInvoke(New Action(
+                            Sub()
+                                Try
+                                    If Not oView.IsValidRowHandle(oRowHandle) Then Return
+
+                                    For Each oSqlColumnName As String In oSqlColumnsToRefresh
+                                        Dim oDefinition = _FormulaSqlColumns(oSqlColumnName)
+
+                                        ' Prüfen ob ALLE referenzierten Spalten einen Wert haben
+                                        Dim allValuesPresent As Boolean = True
+                                        For Each refCol In oDefinition.ReferencedColumns
+                                            Dim cellVal = oView.GetRowCellValue(oRowHandle, refCol)
+                                            If cellVal Is Nothing OrElse IsDBNull(cellVal) Then
+                                                _Logger.Debug("[FormulaSql] Column [{0}] has NULL value – skipping SQL for [{1}]", refCol, oSqlColumnName)
+                                                allValuesPresent = False
+                                                Exit For
+                                            End If
+                                        Next
+
+                                        If Not allValuesPresent Then Continue For
+
+                                        ' Pattern ersetzen und SQL ausführen
+                                        Dim resolvedSql = ResolveSqlTemplate(oDefinition.SqlTemplate, oView, oRowHandle)
+                                        _Logger.Debug("[FormulaSql] Executing SQL for [{0}]: [{1}]", oSqlColumnName, resolvedSql)
+
+                                        Try
+                                            Dim oResultTable As DataTable = DatabaseFallback.GetDatatable(
+                                                New GetDatatableOptions(resolvedSql, DatabaseType.ECM))
+
+                                            If oResultTable IsNot Nothing AndAlso oResultTable.Rows.Count > 0 Then
+                                                Dim oResult = oResultTable.Rows(0).Item(0)
+                                                _Logger.Debug("[FormulaSql] Result for [{0}]: [{1}]", oSqlColumnName, oResult)
+
+                                                _isRefreshingFormula = True
+                                                Try
+                                                    oView.SetRowCellValue(oRowHandle, oSqlColumnName,
+                                                        If(oResult Is Nothing OrElse IsDBNull(oResult), DBNull.Value, oResult))
+                                                    oView.RefreshRowCell(oRowHandle, oView.Columns.ColumnByFieldName(oSqlColumnName))
+                                                Finally
+                                                    _isRefreshingFormula = False
+                                                End Try
+                                            Else
+                                                _Logger.Warn("[FormulaSql] No result returned for [{0}]", oSqlColumnName)
+                                            End If
+
+                                        Catch sqlEx As Exception
+                                            _Logger.Warn("⚠️ [FormulaSql] SQL execution failed for [{0}]: {1}", oSqlColumnName, sqlEx.Message)
+                                            _Logger.Error(sqlEx)
+                                        End Try
+                                    Next
+                                Catch ex As Exception
+                                    _Logger.Error(ex)
+                                End Try
+                            End Sub))
+
+                    Catch ex As Exception
+                        _Logger.Error(ex)
+                    End Try
                 End Sub
         End Sub
         Private Sub HandleInheritedColumnValue(pView As GridView, pColumnDefinition As DataTable, pArgs As CellValueChangedEventArgs)
             If pView Is Nothing OrElse pArgs Is Nothing OrElse pArgs.Column Is Nothing Then
                 Return
             End If
+            ' *** NEU: Bei Formel-Refresh überspringen ***
+            If _isRefreshingFormula Then
+                _Logger.Debug("Skipping HandleInheritedColumnValue during formula refresh.")
+                Return
+            End If
 
             If isApplyingInheritedValue OrElse pArgs.RowHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle Then
                 Return
@@ -579,16 +1316,7 @@ Namespace ControlCreator
 
             Return entry
         End Function
-        Private Sub View_CustomColumnDisplayText(ByVal eSender As Object, ByVal e As CustomColumnDisplayTextEventArgs)
+
-            If IsNothing(e.Value) Then
-                Exit Sub
-            End If
-            Dim view As GridView = eSender
-            'Dim view As GridView = TryCast(GridView1, GridView)
-            If e.Column.FieldName = "SpalteCurrency" Then
-                ' e.DisplayText = e.Value.ToString().Replace("€", "CHF")
-            End If
-        End Sub
         Private Sub View_PopupMenuShowing(sender As Object, e As PopupMenuShowingEventArgs)
             Dim view As GridView = TryCast(sender, GridView)
             Dim oFocusedColumn As GridColumn = view.FocusedColumn
@@ -642,28 +1370,12 @@ Namespace ControlCreator
             End If
         End Sub
 
-        Private Sub View_ShowingEditor(sender As Object, e As CancelEventArgs)
-            Dim view As GridView = TryCast(sender, GridView)
-            _Logger.Debug("Showing editor.")
-            If view.IsNewItemRow(view.FocusedRowHandle) AndAlso Not newRowModified Then
-                _Logger.Debug("Adding new row.")
-                view.AddNewRow()
-            End If
-        End Sub
 
-        Private Sub View_ShownEditor(sender As Object, e As EventArgs)
-            Dim view As GridView = TryCast(sender, GridView)
-            If view.IsNewItemRow(view.FocusedRowHandle) Then
-                _Logger.Debug("Attaching Modified Handler.")
-                AddHandler view.ActiveEditor.Modified, Sub()
-                                                           _Logger.Debug("Row was modified.")
-                                                           newRowModified = True
-                                                       End Sub
-            End If
-        End Sub
 
         Private Sub View_ValidateRow(sender As Object, e As ValidateRowEventArgs)
             Dim view As GridView = TryCast(sender, GridView)
+            ' RowHandle für RowUpdated merken, bevor er sich nach dem Commit ändert
+
             If view.IsNewItemRow(e.RowHandle) AndAlso Not newRowModified Then
                 _Logger.Debug("Deleting unused row")
                 view.DeleteRow(e.RowHandle)

app/TaskFlow/DD_DMSLiteDataSet.Designer.vb

@@ -5466,6 +5466,8 @@ Partial Public Class DD_DMSLiteDataSet
         
         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()
@@ -5709,6 +5711,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 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)>  _
@@ -5771,9 +5781,10 @@ Partial Public Class DD_DMSLiteDataSet
                     ByVal TYPE_COLUMN As String,  _
                     ByVal LU_CAPTION As String,  _
                     ByVal INHERIT_VALUE As Boolean,  _
-                    ByVal FORMULA_EXPRESSION As String) As TBPM_CONTROL_TABLERow
+                    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, INHERIT_VALUE, FORMULA_EXPRESSION}
+            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
@@ -5831,6 +5842,7 @@ Partial Public Class DD_DMSLiteDataSet
             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(),  _
@@ -5888,6 +5900,8 @@ Partial Public Class DD_DMSLiteDataSet
             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
@@ -5931,7 +5945,11 @@ Partial Public Class DD_DMSLiteDataSet
             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(),  _
@@ -13227,6 +13245,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 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
@@ -21535,6 +21564,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             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
@@ -21572,12 +21602,12 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ 
                 "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"&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, "& _ 
+                "= @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Origina"& _ 
-                "CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST,"& _ 
+                "l_GUID);      "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBRE"& _ 
-                " CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, C"& _ 
+                "ITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VA"& _ 
-                "HANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUE"& _ 
+                "LUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAG"& _ 
-                "NCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)"& _ 
+                "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, "", "", ""))
@@ -21603,6 +21633,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             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
@@ -21625,8 +21656,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "_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, 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"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (CO"& _ 
+                "        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"& _ 
-                "NTROL_ID = @CONTROL_ID)"
+                "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()
@@ -21639,8 +21670,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "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)&"                         INHERIT_VALUE = "& _ 
-                "@INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @"& _ 
+                "@INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA"& _ 
-                "Original_GUID)"
+                "_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, "", "", ""))
@@ -21660,6 +21691,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             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
@@ -21682,8 +21714,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "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, 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"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GU"& _ 
+                "        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"& _ 
-                "ID = @GUID)"
+                "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()
@@ -21892,6 +21924,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     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)
@@ -21978,8 +22011,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(23).Value = CType(FORMULA_EXPRESSION,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_GUID,Integer)
+            If (FORMULA_SQL Is Nothing) Then
-            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(GUID,Integer)
+                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
@@ -22017,6 +22055,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     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
@@ -22081,7 +22120,12 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 command.Parameters(17).Value = CType(FORMULA_EXPRESSION,String)
             End If
-            command.Parameters(18).Value = CType(Original_GUID,Integer)
+            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

app/TaskFlow/DD_DMSLiteDataSet.xsc

@@ -56,32 +56,24 @@
     <TableUISetting Name="TBPM_CONTROL_TABLE">
       <ColumnUISettings>
         <ColumnUISetting Name="ADDED_WHO">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
         <ColumnUISetting Name="ADDED_WHEN">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
         <ColumnUISetting Name="CHANGED_WHEN">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
         <ColumnUISetting Name="TYPE_COLUMN">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>

app/TaskFlow/DD_DMSLiteDataSet.xsd

@@ -1319,7 +1319,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                   <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, INHERIT_VALUE, 
-                         FORMULA_EXPRESSION
+                         FORMULA_EXPRESSION, FORMULA_SQL
 FROM            TBPM_CONTROL_TABLE
 WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
                     <Parameters>
@@ -1334,8 +1334,8 @@ SET                CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN
                          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, INHERIT_VALUE = @INHERIT_VALUE, 
-                         LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION = @FORMULA_EXPRESSION
+                         LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION = @FORMULA_EXPRESSION, FORMULA_SQL = @FORMULA_SQL
-WHERE        (GUID = @Original_GUID);     
+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="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" />
@@ -1362,6 +1362,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                       <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>
@@ -1396,6 +1397,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
               <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">
@@ -1405,7 +1407,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
 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, 
-                         INHERIT_VALUE = @INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION
+                         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.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" />
@@ -1426,6 +1428,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                       <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>
@@ -1458,7 +1461,7 @@ FROM            TBPM_CONTROL_TABLE</CommandText>
                   <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, INHERIT_VALUE, 
-                         FORMULA_EXPRESSION
+                         FORMULA_EXPRESSION, FORMULA_SQL
 FROM            TBPM_CONTROL_TABLE
 WHERE        (GUID = @GUID)</CommandText>
                     <Parameters>
@@ -2812,13 +2815,20 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                 </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">
+              <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>
@@ -3405,9 +3415,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

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="472" ViewPortY="129" 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" />

app/TaskFlow/ModuleFinalIndexProperties.vb

@@ -1,7 +1,7 @@
 Imports System.ComponentModel
 Imports System.Drawing.Design
 Imports System.Globalization
-Imports FormsUtils
+Imports FormsUtils 'FormsUtils.dll als Fremdbibliothek für die Properties
 
 Module ModuleFinalIndexProperties
     <TypeConverter(GetType(PropertiesDeluxeTypeConverter))>

app/TaskFlow/ModuleMySettings.vb

@@ -4,6 +4,9 @@
     Public Property CONNECTION_STRING_ECM As String = ""
     Public Property CONNECTION_STRING_IDB As String = ""
     Public Property IDB_ACTIVE As Boolean = False
+    Public Property COPY_WMFILE_2TEMP As Boolean = False
+    Public Property MAP_SHARE_DRIVE As String = String.Empty
+    Public Property MAP_BLACKLIST As String = String.Empty
     Public Property EDMIAppServerActive As Boolean = False
 
     Public Property OPERATION_MODE_FS As String = "PURE_WM"

app/TaskFlow/ModuleRuntimeVariables.vb

@@ -19,6 +19,7 @@ Module ModuleRuntimeVariables
     ' Diese Werte müssen später zur Laufzeit geladen werden
     Public Property ActiveWorkflowType As Integer
     Public Property BASEDATA_DT_TBDD_CONNECTION As DataTable
+    Public Property BASEDATA_DT_TBDD_CATALOG As DataTable
     Public Property BASEDATA_DT_TBDD_SQL_COMMANDS As DataTable
     Public Property BASEDATA_DT_CONFIG As DataTable
     Public Property BASEDATA_DTGRID_GROUPS As DataTable
@@ -29,8 +30,8 @@ Module ModuleRuntimeVariables
     Public Property BASEDATA_DT_PROFILES_SEARCHES_DOC As DataTable
     Public Property DT_FILTERED_PROFILE_SEARCHES_DOC As DataTable
 
-    Public Property BASEDATA_DT_PROFILES_SEARCHES_SQL As DataTable
+    Public Property BASEDATA_DT_PROFILES_SEARCHES_DATA As DataTable
-    Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
+    Public Property DT_FILTERED_PROFILE_SEARCHES_DATA As DataTable
     Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable
 
     Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
@@ -82,6 +83,10 @@ 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 = ""
+    ''' <summary>
+    ''' Temporärer Ordner für Dokumentkopien (wenn COPY_WMFILE_2TEMP = True)
+    ''' </summary>
+    Public TEMP_DOCUMENT_FOLDER As String = String.Empty
     Public Class UserInheritanceConfirmation
         Public Property ColumnName As String = ""
         Public Property Count As Integer
@@ -159,9 +164,7 @@ Module ModuleRuntimeVariables
     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
-
     Public Property WINDREAM As ClassPMWindream
     Public Property WINDREAM_MOD As Windream
     Public Property WINDREAM_ALLG As ClassWindream_allgemein

app/TaskFlow/My 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.8.2.0")>
+<Assembly: AssemblyVersion("2.9.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>

app/TaskFlow/Oracle.DataAccess.Common.Configuration.Section.xsd

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:simpleType name="parameterDirection">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Output"/>
+      <xs:enumeration value="InputOutput"/>
+      <xs:enumeration value="ReturnValue"/>
+      <xs:enumeration value="Implicit"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="customBoolean">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="true"/>
+      <xs:enumeration value="false"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ONSParameters">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="nodeList"/>
+      <!--<xs:enumeration value="walletFile"/>
+      <xs:enumeration value="walletPassword"/>-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ONSModeValues">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="local"/>
+      <xs:enumeration value="remote"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="datatype">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="System.Binary"/>
+      <xs:enumeration value="System.Boolean"/>
+      <xs:enumeration value="System.Byte"/>
+      <xs:enumeration value="System.Byte[]"/>
+      <xs:enumeration value="System.Char"/>
+      <xs:enumeration value="System.DateTime"/>
+      <xs:enumeration value="System.DateTimeOffset"/>
+      <xs:enumeration value="System.Decimal"/>
+      <xs:enumeration value="System.Double"/>
+      <xs:enumeration value="System.Guid"/>
+      <xs:enumeration value="System.Int16"/>
+      <xs:enumeration value="System.Int32"/>
+      <xs:enumeration value="System.Int64"/>
+      <xs:enumeration value="System.SByte"/>
+      <xs:enumeration value="System.Single"/>
+      <xs:enumeration value="System.String"/>
+      <xs:enumeration value="System.TimeSpan"/>
+      <xs:enumeration value="System.UInt16"/>
+      <xs:enumeration value="System.UInt32"/>
+      <xs:enumeration value="System.UInt64"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="providerType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="BFile"/>
+      <xs:enumeration value="BinaryFloat"/>
+      <xs:enumeration value="BinaryDouble"/>
+      <xs:enumeration value="Blob"/>
+      <xs:enumeration value="Byte"/>
+      <xs:enumeration value="Char"/>
+      <xs:enumeration value="Clob"/>
+      <xs:enumeration value="Date"/>
+      <xs:enumeration value="Decimal"/>
+      <xs:enumeration value="Double"/>
+      <xs:enumeration value="Int16"/>
+      <xs:enumeration value="Int32"/>
+      <xs:enumeration value="Int64"/>
+      <xs:enumeration value="IntervalDS"/>
+      <xs:enumeration value="IntervalYM"/>
+      <xs:enumeration value="Long"/>
+      <xs:enumeration value="LongRaw"/>
+      <xs:enumeration value="NChar"/>
+      <xs:enumeration value="NClob"/>
+      <xs:enumeration value="NVarchar2"/>
+      <xs:enumeration value="Object"/>
+      <xs:enumeration value="Raw"/>
+      <xs:enumeration value="Single"/>
+      <xs:enumeration value="TimeStamp"/>
+      <xs:enumeration value="TimeStampLTZ"/>
+      <xs:enumeration value="TimeStampTZ"/>
+      <xs:enumeration value="Varchar2"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="nativeDataType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="BFile"/>
+      <xs:enumeration value="Binary_Float"/>
+      <xs:enumeration value="Binary_Double"/>
+      <xs:enumeration value="Blob"/>
+      <xs:enumeration value="Char"/>
+      <xs:enumeration value="Clob"/>
+      <xs:enumeration value="Date"/>
+      <xs:enumeration value="Number"/>
+      <xs:enumeration value="Interval Day To Second"/>
+      <xs:enumeration value="Interval Year To Month"/>
+      <xs:enumeration value="Long"/>
+      <xs:enumeration value="Long Raw"/>
+      <xs:enumeration value="NChar"/>
+      <xs:enumeration value="NClob"/>
+      <xs:enumeration value="NVarchar2"/>
+      <xs:enumeration value="Raw"/>
+      <xs:enumeration value="Rowid"/>
+      <xs:enumeration value="Timestamp"/>
+      <xs:enumeration value="Timestamp With Local Time Zone"/>
+      <xs:enumeration value="Timestamp With Time Zone"/>
+      <xs:enumeration value="URowid"/>
+      <xs:enumeration value="UserDefinedType"/>
+      <xs:enumeration value="Varchar2"/>
+      <xs:enumeration value="XmlType"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="providerDBType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AnsiString"/>
+      <xs:enumeration value="AnsiStringFixedLength"/>
+      <xs:enumeration value="Binary"/>
+      <xs:enumeration value="Byte"/>
+      <xs:enumeration value="Date"/>
+      <xs:enumeration value="DateTime"/>
+      <xs:enumeration value="DateTimeOffset"/>
+      <xs:enumeration value="Decimal"/>
+      <xs:enumeration value="Double"/>
+      <xs:enumeration value="Int16"/>
+      <xs:enumeration value="Int32"/>
+      <xs:enumeration value="Int64"/>
+      <xs:enumeration value="Object"/>
+      <xs:enumeration value="Single"/>
+      <xs:enumeration value="String"/>
+      <xs:enumeration value="StringFixedLength"/>
+      <xs:enumeration value="Time"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>

app/TaskFlow/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:include schemaLocation="Oracle.DataAccess.Common.Configuration.Section.xsd"/>
+  <xs:element name="oracle.manageddataaccess.client" >
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="version" type="odpmversiontype" minOccurs="0" />
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="odpmversiontype">
+    <xs:complexContent>
+      <xs:extension base="odpmparameters">
+        <xs:attribute name="number" type="xs:string" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="odpmparameters">
+    <xs:all>
+      <xs:element minOccurs="0" name="settings">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="setting">
+              <xs:complexType>
+                <xs:attribute name="name" type="xs:string" use="required" />
+                <xs:attribute name="value" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="udtMappings">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="udtMapping">
+              <xs:complexType>
+                <xs:attribute name="typeName" type="xs:string" use="required" />
+                <xs:attribute name="factoryName" type="xs:string" use="required" />
+                <xs:attribute name="dataSource" type="xs:string" use="required" />
+                <xs:attribute name="schemaName" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="LDAPsettings">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="LDAPsetting">
+              <xs:complexType>
+                <xs:attribute name="name" type="xs:string" use="required" />
+                <xs:attribute name="value" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="distributedTransaction">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="setting">
+              <xs:complexType>
+                <xs:attribute name="name" type="xs:string" use="required" />
+                <xs:attribute name="value" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="dataSources">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="dataSource">
+              <xs:complexType>
+                <xs:attribute name="alias" type="xs:string" use="required" />
+                <xs:attribute name="descriptor" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+      <xs:element minOccurs="0" name="connectionPools">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="connectionPool">
+              <xs:complexType>
+                <xs:attribute name="connectionString" type="xs:string" use="required" />
+                <xs:attribute name="poolName" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" name="edmMappings">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="edmMapping">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" name="add">
+                    <xs:complexType>
+                      <xs:attribute name="name" type="xs:string" use="required" />
+                      <xs:attribute name="precision" type="xs:int" use="required" />
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+                <xs:attribute name="dataType" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="edmNumberMapping">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" name="add">
+                    <xs:complexType>
+                      <xs:attribute name="NETType" type="xs:string" use="required" />
+                      <xs:attribute name="MinPrecision" type="xs:int" use="required" />
+                      <xs:attribute name="MaxPrecision" type="xs:int" use="required" />
+                      <xs:attribute name="DBType" type="xs:string" use="required" />
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="implicitRefCursor">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="storedProcedure">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" minOccurs="1" name="refCursor">
+                    <xs:complexType>
+                      <xs:sequence>
+                        <xs:element maxOccurs="1" minOccurs="1" name="bindInfo">
+                          <xs:complexType>
+                            <xs:attribute name="mode" type="parameterDirection" use="required" />
+                          </xs:complexType>
+                        </xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="metadata">
+                          <xs:complexType>
+                            <xs:attribute name="columnOrdinal" type="xs:int" use="required" />
+                            <xs:attribute name="columnName" type="xs:string" use="required" />
+                            <xs:attribute name="baseColumnName" type="xs:string" use="optional" />
+                            <xs:attribute name="baseSchemaName" type="xs:string" use="optional" />
+                            <xs:attribute name="baseTableName" type="xs:string" use="optional" />
+                            <xs:attribute name="providerType" type="providerType" use="optional" />
+                            <xs:attribute name="columnSize" type="xs:int" use="optional" />
+                            <xs:attribute name="numericPrecision" type="xs:int" use="optional" />
+                            <xs:attribute name="numericScale" type="xs:int" use="optional" />
+                            <xs:attribute name="isUnique" type="customBoolean" use="optional" />
+                            <xs:attribute name="isKey" type="customBoolean" use="optional" />
+                            <xs:attribute name="isRowID" type="customBoolean" use="optional" />
+                            <xs:attribute name="dataType" type="datatype" use="optional" />
+                            <xs:attribute name="allowDBNull" type="customBoolean" use="optional" />
+                            <xs:attribute name="isAliased" type="customBoolean" use="optional" />
+                            <xs:attribute name="isByteSemantic" type="customBoolean" use="optional" />
+                            <xs:attribute name="isExpression" type="customBoolean" use="optional" />
+                            <xs:attribute name="isHidden" type="customBoolean" use="optional" />
+                            <xs:attribute name="isReadOnly" type="customBoolean" use="optional" />
+                            <xs:attribute name="isLong" type="customBoolean" use="optional" />
+                            <xs:attribute name="udtTypeName" type="xs:string" use="optional" />
+                            <xs:attribute name="nativeDataType" type="nativeDataType" use="optional" />
+                            <xs:attribute name="providerDBType" type="providerDBType" use="optional" />
+                            <xs:attribute name="objectName" type="xs:string" use="optional" />
+                          </xs:complexType>
+                        </xs:element>
+                      </xs:sequence>
+                      <xs:attribute name="name" type="xs:string" use="optional" />
+                      <xs:attribute name="position" type="xs:int" use="optional" />
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+                <xs:attribute name="schema" type="xs:string" use="optional" />
+                <xs:attribute name="name" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="onsConfig">
+        <xs:complexType>
+          <xs:sequence>
+ 		    <xs:element minOccurs="0" name="settings">
+				<xs:complexType>
+				  <xs:sequence>
+					<xs:element maxOccurs="2" minOccurs="0" name="setting">
+					  <xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="value" type="xs:string" use="required" />
+					  </xs:complexType>
+					</xs:element>
+				  </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="ons">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element maxOccurs="3" minOccurs="1" name="add">
+                    <xs:complexType>
+                      <xs:attribute name="name" type="ONSParameters" use="required" />
+                      <xs:attribute name="value" type="xs:string" use="required" />
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+                <xs:attribute name="database" type="xs:string" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+          <xs:attribute name="configFile" type="xs:string" use="optional" />
+          <xs:attribute name="mode" type="ONSModeValues" use="required" />
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+</xs:schema>

app/TaskFlow/TaskFlow.vbproj

@@ -151,9 +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, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\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>
@@ -173,23 +173,18 @@
       <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.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Interfaces">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
-      <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>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">
       <SpecificVersion>False</SpecificVersion>
@@ -202,15 +197,14 @@
       <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">
+    <Reference Include="DigitalData.Modules.Windream">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.ZooFlow">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
+      <HintPath>M:\Bibliotheken\Digital Data\DD_Modules\DLLLicenseManager.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@@ -231,117 +225,109 @@
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="FormsUtils">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\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.23\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOBRWSLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOSRCHLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOTOOLLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Mail">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\Limilabs\Mail.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -356,15 +342,6 @@
     <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>
@@ -377,11 +354,8 @@
     <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
       <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.21.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
+      <HintPath>..\packages\Oracle.ManagedDataAccess.21.15.0\lib\net462\Oracle.ManagedDataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp-gdi">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
@@ -392,9 +366,6 @@
     <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
       <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
-    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
@@ -488,7 +459,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationEvents.vb" />
-    <Compile Include="ClassAnnotation.vb" />
     <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
     <Compile Include="ClassControlCreator.vb" />
@@ -1099,6 +1069,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Oracle.DataAccess.Common.Configuration.Section.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Oracle.ManagedDataAccess.Client.Configuration.Section.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Resources\syncreon.png" />
   </ItemGroup>
@@ -1280,6 +1256,7 @@
     <None Include="Resources\PM_mit_slogan.JPG" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="logtaskflow.txt" />
     <None Include="Changelog.md" />
     <Content Include="DataColumnExpression.txt" />
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
@@ -1389,10 +1366,10 @@
     </PropertyGroup>
     <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'))" />
+    <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'))" />
   </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')" />
+  <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')" />
   <!-- 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">

app/TaskFlow/clsPatterns.vb

@@ -1,10 +1,11 @@
 Imports System.Text.RegularExpressions
-Imports WINDREAMLib
+Imports DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper
-Imports DigitalData.Controls.LookupGrid
-Imports DevExpress.XtraGrid
-Imports DevExpress.XtraGrid.Views.Grid
-Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraEditors
+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.
@@ -75,7 +76,8 @@ Public Class clsPatterns
     ''' Aktualisiert den Wert eines Controls im Cache
     ''' </summary>
     Public Shared Sub UpdateControlInCache(controlName As String, newValue As Object)
-        SyncLock _ControlLookupCache ' Thread-Safety
+        ' 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
@@ -98,8 +100,13 @@ Public Class clsPatterns
                             lookup.Properties.SelectedValues = New List(Of String) From {newValue.ToString()}
                         End If
 
-                    Case GetType(Windows.Forms.ComboBox)
+                   ' ========== FIX START: Beide ComboBox-Typen unterstützen ==========
-                        DirectCast(ctrl, ComboBox).Text = newValue?.ToString()
+                    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
@@ -130,12 +137,14 @@ Public Class clsPatterns
     Public Shared Sub UpdateMultipleControlsInCache(updates As Dictionary(Of String, Object))
         If updates Is Nothing OrElse updates.Count = 0 Then Return
 
-        SyncLock _ControlLookupCache
+        ' FIX: Gleicher Lock-Anker wie UpdateControlInCache → kein Deadlock
-            For Each kvp In updates
+        ' Die eigentliche Aktualisierung läuft sequenziell über UpdateControlInCache,
-                UpdateControlInCache(kvp.Key, kvp.Value)
+        ' da SyncLock in VB.NET re-entrant auf demselben Thread ist.
-            Next
+        For Each kvp In updates
-            LOGGER.Debug($"Batch cache update completed for {updates.Count} controls")
+            UpdateControlInCache(kvp.Key, kvp.Value)
-        End SyncLock
+        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}
@@ -145,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
+            If Not HasAnyPatterns(oResult) Then
-                Return result
+                Return oResult
             End If
 
-            LOGGER.Debug($"input BEFORE replacing: [{result}]")
+            LOGGER.Debug($"input BEFORE replacing: [{oResult}]")
-            result = ReplaceInternalValues(result)
+            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
+            If Not IsNothing(oResult) Then
-                result = ReplaceUserValues(result)
+                oResult = ReplaceUserValues(oResult)
-                LOGGER.Debug($"input AFTER replacing: [{result}]")
+                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
@@ -259,14 +273,23 @@ 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(ctrl As Control, cache As Dictionary(Of String, Control))
+    Private Shared Sub RecursiveAddToCache(rootCtrl As Control, cache As Dictionary(Of String, Control))
-        cache(ctrl.Name) = ctrl
+        Dim stack As New Stack(Of Control)()
-        For Each child As Control In ctrl.Controls
+        stack.Push(rootCtrl)
-            RecursiveAddToCache(child, cache)
+
-        Next
+        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
@@ -280,8 +303,9 @@ Public Class clsPatterns
                 LOGGER.Debug($"Control cache initialized with {_ControlLookupCache.Count} controls")
             End If
         End SyncLock
-        Try
 
+        Try
+            LOGGER.Debug($"Starting ReplaceControlValues with input: [{oResult}] for document ID: {CURRENT_DOC_ID}")
             Dim oTryCounter = 0
 
             While ContainsPattern(oResult, PATTERN_CTRL)
@@ -349,12 +373,28 @@ Public Class clsPatterns
                         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
@@ -362,13 +402,12 @@ Public Class clsPatterns
                                     oIndex += 1
                                 Next
                                 oIsSQL = False
-                            ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then
+                            Else ' Count = 1
-                                LOGGER.Debug($"LookupControl3 mit genau einem Value")
+                                LOGGER.Debug($"LookupControl3 [{oControlName}] mit genau einem Value")
-                                oReplaceValue = oLookupControl3.Properties.SelectedValues(0)
+                                oReplaceValue = selectedValues(0)
-                            Else
-                                '    LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
-                                oReplaceValue = ERROR_REPLACE_VALUE
                             End If
+
+                            LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")
                             LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")
 
                         Case GetType(Windows.Forms.ComboBox)
@@ -376,7 +415,7 @@ 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
@@ -401,10 +440,18 @@ 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}")
+                        oReplaceValue = SafeSqlEscape(oReplaceValue)
-                        'LOGGER.Debug($"oReplaceValue = {oReplaceValue}")
-                        oReplaceValue = oReplaceValue.Replace("'", "''")
                     End If
                     oResult = ReplacePattern(oResult, PATTERN_CTRL, oReplaceValue)
                 Else
@@ -420,19 +467,52 @@ Public Class clsPatterns
             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
+                If oIndexName = "@@DISPLAY_ONLY" Then
-                    Throw New Exception("Max tries in ReplaceWindreamIndicies exceeded.")
+                    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
@@ -442,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
@@ -458,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
@@ -509,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
 

app/TaskFlow/frmAdministration.vb

@@ -845,11 +845,9 @@ Public Class frmAdministration
     Private Sub PM_VEKTOR_INDEXComboBox_MouseHover(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.MouseHover
         ToolTip1.Show("Bitte wählen Sie hier den Vektor-Index den Sie für die Kennzeichnung der PM-Indizes verwenden wollen:", PM_VEKTOR_INDEXComboBox)
     End Sub
-
     Private Sub cmbLOGIndex_MouseHover(sender As Object, e As EventArgs) Handles cmbLOGIndex.MouseHover
         ToolTip1.Show("Bitte wählen Sie hier den Vektor-Index den Sie für das Loggen der Wertänderungen nutzen wollen:", cmbLOGIndex)
     End Sub
-
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         If CInt(PROFILGUIDTextBox.Text) > 0 Then
             profile_guid = PROFILGUIDTextBox.Text
@@ -867,7 +865,6 @@ Public Class frmAdministration
             MsgBox("No profile could be passed to designer:", MsgBoxStyle.Exclamation)
         End If
     End Sub
-
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemRefreshProfileData.ItemClick
         If BarButtonItem26.Tag = "Lock" Then
             EditMode_Profile("")

app/TaskFlow/frmAnnotations.vb

@@ -7,7 +7,7 @@ Public Class frmAnnotations
 
         Try
             Me.Cursor = Cursors.WaitCursor
-            ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text, True)
+            ' ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text, True)
             Me.Cursor = Cursors.Default
             Me.Close()
         Catch ex As Exception

app/TaskFlow/frmColumn_Detail.Designer.vb

@@ -37,6 +37,8 @@ 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()
@@ -89,6 +91,8 @@ Partial Class frmColumn_Detail
         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()
@@ -141,6 +145,8 @@ Partial Class frmColumn_Detail
         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
@@ -237,6 +243,8 @@ 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)
@@ -266,6 +274,19 @@ Partial Class frmColumn_Detail
         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")
@@ -277,6 +298,7 @@ Partial Class frmColumn_Detail
         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
         '
@@ -478,9 +500,9 @@ Partial Class frmColumn_Detail
         '
         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.LayoutControlItem24, Me.LayoutControlItem26})
+        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(593, 816)
+        Me.Root.Size = New System.Drawing.Size(630, 853)
         Me.Root.TextVisible = False
         '
         'LayoutControlItem1
@@ -489,7 +511,7 @@ 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(573, 40)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
         Me.LayoutControlItem1.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -499,7 +521,7 @@ 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(573, 40)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
         Me.LayoutControlItem2.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -509,7 +531,7 @@ 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(573, 40)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -519,7 +541,7 @@ 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(286, 40)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(304, 40)
         resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4")
         Me.LayoutControlItem4.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -529,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(488, 46)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(520, 46)
         resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5")
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.SimpleButton1
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(488, 200)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(520, 200)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(85, 46)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(90, 46)
         Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem6.TextVisible = False
         '
@@ -548,7 +570,7 @@ 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(488, 46)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(520, 46)
         resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8")
         Me.LayoutControlItem8.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -558,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(573, 40)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7")
         Me.LayoutControlItem7.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem9
         '
         Me.LayoutControlItem9.Control = Me.SimpleButton2
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(488, 326)
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(520, 326)
         Me.LayoutControlItem9.Name = "LayoutControlItem9"
-        Me.LayoutControlItem9.Size = New System.Drawing.Size(85, 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, 458)
+        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(286, 40)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(304, 40)
         resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10")
         Me.LayoutControlItem10.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem12
         '
         Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox
-        Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 498)
+        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(286, 40)
+        Me.LayoutControlItem12.Size = New System.Drawing.Size(304, 40)
         resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12")
         Me.LayoutControlItem12.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem11
         '
         Me.LayoutControlItem11.Control = Me.TextEdit8
-        Me.LayoutControlItem11.Location = New System.Drawing.Point(286, 458)
+        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(287, 40)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(306, 40)
         resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11")
         Me.LayoutControlItem11.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem13
         '
         Me.LayoutControlItem13.Control = Me.TextEdit10
-        Me.LayoutControlItem13.Location = New System.Drawing.Point(286, 498)
+        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(287, 40)
+        Me.LayoutControlItem13.Size = New System.Drawing.Size(306, 40)
         resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13")
         Me.LayoutControlItem13.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlGroup1
         '
         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, 538)
+        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 584)
         Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(573, 258)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(610, 249)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
         'LayoutControlItem16
@@ -624,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(274, 24)
+        Me.LayoutControlItem16.Size = New System.Drawing.Size(292, 24)
         Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem16.TextVisible = False
         '
@@ -633,7 +655,7 @@ 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(549, 22)
+        Me.LayoutControlItem14.Size = New System.Drawing.Size(586, 22)
         Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem14.TextVisible = False
         '
@@ -642,7 +664,7 @@ Partial Class frmColumn_Detail
         Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox
         Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 46)
         Me.LayoutControlItem17.Name = "LayoutControlItem17"
-        Me.LayoutControlItem17.Size = New System.Drawing.Size(549, 22)
+        Me.LayoutControlItem17.Size = New System.Drawing.Size(586, 22)
         Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem17.TextVisible = False
         '
@@ -651,16 +673,16 @@ Partial Class frmColumn_Detail
         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(549, 22)
+        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(274, 0)
+        Me.LayoutControlItem20.Location = New System.Drawing.Point(292, 0)
         Me.LayoutControlItem20.Name = "LayoutControlItem20"
-        Me.LayoutControlItem20.Size = New System.Drawing.Size(275, 24)
+        Me.LayoutControlItem20.Size = New System.Drawing.Size(294, 24)
         resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20")
         Me.LayoutControlItem20.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -670,7 +692,7 @@ Partial Class frmColumn_Detail
         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(549, 123)
+        Me.LayoutControlItem22.Size = New System.Drawing.Size(586, 114)
         Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem22.TextVisible = False
         '
@@ -680,17 +702,17 @@ 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(573, 40)
+        Me.LayoutControlItem18.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18")
         Me.LayoutControlItem18.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem19
         '
         Me.LayoutControlItem19.Control = Me.SEQUENCETextBox
-        Me.LayoutControlItem19.Location = New System.Drawing.Point(286, 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(287, 40)
+        Me.LayoutControlItem19.Size = New System.Drawing.Size(306, 40)
         resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19")
         Me.LayoutControlItem19.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -701,7 +723,7 @@ 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(573, 40)
+        Me.LayoutControlItem23.Size = New System.Drawing.Size(610, 40)
         Me.LayoutControlItem23.TextSize = New System.Drawing.Size(110, 13)
         '
         'LayoutControlItem21
@@ -710,7 +732,7 @@ 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(573, 40)
+        Me.LayoutControlItem21.Size = New System.Drawing.Size(610, 40)
         resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21")
         Me.LayoutControlItem21.TextSize = New System.Drawing.Size(110, 13)
         '
@@ -720,19 +742,38 @@ Partial Class frmColumn_Detail
         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(488, 46)
+        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(488, 412)
+        Me.LayoutControlItem26.Location = New System.Drawing.Point(520, 412)
         Me.LayoutControlItem26.Name = "LayoutControlItem26"
-        Me.LayoutControlItem26.Size = New System.Drawing.Size(85, 46)
+        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
         '
         Me.Appearance.Options.UseFont = True
@@ -799,6 +840,8 @@ Partial Class frmColumn_Detail
         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
 
@@ -868,4 +911,8 @@ End Sub
     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

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>593, 67</value>
+    <value>630, 67</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 883</value>
+    <value>0, 920</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>593, 22</value>
+    <value>630, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -181,20 +181,71 @@
   <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="SimpleButton3.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="SimpleButton4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>500, 424</value>
+    <value>532, 470</value>
   </data>
   <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>81, 42</value>
+    <value>86, 42</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="SimpleButton3.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
   </data>
@@ -211,13 +262,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SimpleButton3.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <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>346, 20</value>
+    <value>378, 20</value>
   </data>
   <data name="FORMULA_EXPRESSIONTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>29</value>
@@ -232,13 +283,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;FORMULA_EXPRESSIONTextBox.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <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>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="LU_CAPTIONTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
@@ -253,13 +304,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;LU_CAPTIONTextBox.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="GUIDTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 20</value>
   </data>
   <data name="GUIDTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="GUIDTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -274,13 +325,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;GUIDTextBox.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="SPALTENNAMETextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 60</value>
   </data>
   <data name="SPALTENNAMETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="SPALTENNAMETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -295,13 +346,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SPALTENNAMETextBox.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="SPALTEN_HEADERTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 100</value>
   </data>
   <data name="SPALTEN_HEADERTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="SPALTEN_HEADERTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -316,7 +367,7 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SPALTEN_HEADERTextBox.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="SPALTENBREITETextBox.EditValue" type="System.Decimal, mscorlib">
     <value>0</value>
@@ -329,7 +380,7 @@
     <value>Combo</value>
   </data>
   <data name="SPALTENBREITETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 20</value>
+    <value>162, 20</value>
   </data>
   <data name="SPALTENBREITETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -344,13 +395,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SPALTENBREITETextBox.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="REGEX_MATCHTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 220</value>
   </data>
   <data name="REGEX_MATCHTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 20</value>
+    <value>378, 20</value>
   </data>
   <data name="REGEX_MATCHTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -365,10 +416,10 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;REGEX_MATCHTextBox.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="SimpleButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>500, 212</value>
+    <value>532, 212</value>
   </data>
   <data name="SimpleButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>10, 10, 10, 10</value>
@@ -377,7 +428,7 @@
     <value>10, 10, 10, 10</value>
   </data>
   <data name="SimpleButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>81, 42</value>
+    <value>86, 42</value>
   </data>
   <data name="SimpleButton1.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -395,13 +446,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SimpleButton1.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="REGEX_MESSAGE_DETextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 266</value>
   </data>
   <data name="REGEX_MESSAGE_DETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="REGEX_MESSAGE_DETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -416,13 +467,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;REGEX_MESSAGE_DETextBox.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="SQL_COMMANDTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 346</value>
   </data>
   <data name="SQL_COMMANDTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 20</value>
+    <value>378, 20</value>
   </data>
   <data name="SQL_COMMANDTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -437,16 +488,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SQL_COMMANDTextBox.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="SimpleButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>500, 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>81, 42</value>
+    <value>86, 42</value>
   </data>
   <data name="SimpleButton2.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -464,13 +515,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SimpleButton2.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="TextEdit7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>142, 478</value>
+    <value>142, 524</value>
   </data>
   <data name="TextEdit7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 20</value>
+    <value>162, 20</value>
   </data>
   <data name="TextEdit7.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -485,13 +536,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;TextEdit7.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="TextEdit8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>428, 478</value>
+    <value>446, 524</value>
   </data>
   <data name="TextEdit8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 20</value>
+    <value>164, 20</value>
   </data>
   <data name="TextEdit8.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -506,13 +557,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;TextEdit8.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="CHANGED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>142, 518</value>
+    <value>142, 564</value>
   </data>
   <data name="CHANGED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 20</value>
+    <value>162, 20</value>
   </data>
   <data name="CHANGED_WHOTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -527,13 +578,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;CHANGED_WHOTextBox.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="TextEdit10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>428, 518</value>
+    <value>446, 564</value>
   </data>
   <data name="TextEdit10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 20</value>
+    <value>164, 20</value>
   </data>
   <data name="TextEdit10.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
@@ -548,16 +599,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;TextEdit10.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="READ_ONLYCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 607</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>545, 18</value>
+    <value>582, 18</value>
   </data>
   <data name="READ_ONLYCheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -572,16 +623,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;READ_ONLYCheckBox.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="LOAD_IDX_VALUECheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 651</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>545, 18</value>
+    <value>582, 18</value>
   </data>
   <data name="LOAD_IDX_VALUECheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -596,16 +647,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;LOAD_IDX_VALUECheckBox.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="VALIDATIONCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 583</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>270, 18</value>
+    <value>288, 18</value>
   </data>
   <data name="VALIDATIONCheckbox.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -620,16 +671,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;VALIDATIONCheckbox.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="ADVANCED_LOOKUPCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 629</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>545, 18</value>
+    <value>582, 18</value>
   </data>
   <data name="ADVANCED_LOOKUPCheckbox.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
@@ -644,13 +695,13 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;ADVANCED_LOOKUPCheckbox.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="DEFAULTVALUETextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 392</value>
   </data>
   <data name="DEFAULTVALUETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="DEFAULTVALUETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -665,19 +716,19 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;DEFAULTVALUETextBox.ZOrder" xml:space="preserve">
-    <value>24</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>428, 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>145, 20</value>
+    <value>164, 20</value>
   </data>
   <data name="SEQUENCETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -692,10 +743,10 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SEQUENCETextBox.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="SUMMARY_FUNCTIONCombobox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>420, 583</value>
+    <value>438, 629</value>
   </data>
   <data name="SUMMARY_FUNCTIONCombobox.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
     <value>Combo</value>
@@ -704,7 +755,7 @@
     <value />
   </data>
   <data name="SUMMARY_FUNCTIONCombobox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 20</value>
+    <value>168, 20</value>
   </data>
   <data name="SUMMARY_FUNCTIONCombobox.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -719,7 +770,7 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;SUMMARY_FUNCTIONCombobox.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="TYPE_COLUMNComboBox2.Location" type="System.Drawing.Point, System.Drawing">
     <value>142, 180</value>
@@ -731,7 +782,7 @@
     <value />
   </data>
   <data name="TYPE_COLUMNComboBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>431, 20</value>
+    <value>468, 20</value>
   </data>
   <data name="TYPE_COLUMNComboBox2.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
@@ -746,16 +797,16 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;TYPE_COLUMNComboBox2.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="CheckEditInheritValue.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 673</value>
+    <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>545, 18</value>
+    <value>582, 18</value>
   </data>
   <data name="CheckEditInheritValue.TabIndex" type="System.Int32, mscorlib">
     <value>28</value>
@@ -770,7 +821,7 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;CheckEditInheritValue.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="LayoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -835,8 +886,11 @@
   <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>593, 816</value>
+    <value>630, 853</value>
   </data>
   <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
     <value>33</value>
@@ -863,7 +917,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>593, 905</value>
+    <value>630, 942</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>
@@ -1093,6 +1147,18 @@
   <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>

app/TaskFlow/frmColumn_Detail.vb

@@ -100,6 +100,7 @@ Public Class frmColumn_Detail
                     LU_CAPTIONTextBox.Text,
                     CheckEditInheritValue.Checked,
                     FORMULA_EXPRESSIONTextBox.Text,
+                    FORMULA_SQLTextBox.Text,
                     GUIDTextBox.Text
                 )
                 tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@@ -224,4 +225,52 @@ Public Class frmColumn_Detail
         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

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
+    Private Sub CloseDialog()
-        Me.Label1.Focus()
+        ' ========== 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

app/TaskFlow/frmMain.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAcABCwHAAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAQgBDAEIAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1506,13 +1506,13 @@
     <value>Aktionen</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 158</value>
+    <value>1473, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 666</value>
+    <value>0, 838</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 22</value>
+    <value>1473, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -1539,7 +1539,7 @@
     <value>4</value>
   </data>
   <data name="GridControlWorkflows.Size" type="System.Drawing.Size, System.Drawing">
-    <value>945, 484</value>
+    <value>1240, 656</value>
   </data>
   <data name="GridControlWorkflows.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -1575,7 +1575,7 @@
     <value>233, 0</value>
   </data>
   <data name="Panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>945, 24</value>
+    <value>1240, 24</value>
   </data>
   <data name="Panel2.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -1782,7 +1782,7 @@
     <value>233</value>
   </data>
   <data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 508</value>
+    <value>233, 680</value>
   </data>
   <data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1812,7 +1812,7 @@
     <value>0, 158</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 508</value>
+    <value>1473, 680</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -2042,10 +2042,10 @@
     <value>Bottom</value>
   </data>
   <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 688</value>
+    <value>0, 860</value>
   </data>
   <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 0</value>
+    <value>1473, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
     <value>barDockControlBottom</value>
@@ -2066,7 +2066,7 @@
     <value>0, 0</value>
   </data>
   <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 688</value>
+    <value>0, 860</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
     <value>barDockControlLeft</value>
@@ -2084,10 +2084,10 @@
     <value>Right</value>
   </data>
   <data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1178, 0</value>
+    <value>1473, 0</value>
   </data>
   <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 688</value>
+    <value>0, 860</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
     <value>barDockControlRight</value>
@@ -2105,13 +2105,13 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>147</value>
+    <value>123</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>9, 19</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 688</value>
+    <value>1473, 860</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 12pt</value>
@@ -3574,7 +3574,7 @@
     <value>Graphisches Dokument</value>
   </data>
   <data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1178, 0</value>
+    <value>1473, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve">
     <value>barDockControlTop</value>

app/TaskFlow/frmMain.vb

@@ -15,6 +15,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 Imports DevExpress.XtraNavBar
 Imports DevExpress.XtraPrinting
+Imports DevExpress.XtraSplashScreen
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
@@ -61,6 +62,7 @@ Public Class frmMain
     Private DetailLinkActive As Boolean = False
     Private FRONTEND_ACTION As String = "NONE"
     Private Ev_Filter_Panel_Closed As Boolean = False
+    Private _overlayActive As Boolean = False
 
     Dim omsgOpenWorkflow As String
     Dim omsgTitleWarning As String
@@ -950,6 +952,7 @@ Public Class frmMain
                     _tag = _tag.ToString.Replace("itmProfile#", "")
                     If IsNumeric(_tag) Then
                         If CURRENT_CLICKED_PROFILE_ID <> _tag Then
+                            LOGGER.Debug($"Profile with ID {_tag} clicked in NavBarControl...loading Profile...")
                             OverviewOrDEtail = "DETAIL"
                             If Not Application.OpenForms().OfType(Of frmValidator).Any Then
                                 CURRENT_CLICKED_PROFILE_ID = _tag
@@ -966,14 +969,14 @@ Public Class frmMain
 
                             Me.Cursor = Cursors.WaitCursor
                             Try
+                                LOGGER.Debug($"Loading profile with ID {_tag}...")
                                 ' Zentral über Decide_Load laden
                                 Await Decide_Load(False, True)
                             Finally
                                 Me.Cursor = Cursors.Default
                             End Try
                         Else
-                            CURRENT_CLICKED_PROFILE_TITLE = Nothing
+                            LOGGER.Debug($"Profile with ID {_tag} clicked in NavBarControl is already active...ignoring click.")
-                            CURRENT_CLICKED_PROFILE_ID = Nothing
                         End If
                     End If
 
@@ -1398,6 +1401,13 @@ Public Class frmMain
     ' HAUPTLADEMETHODE - Koordiniert den gesamten Ladevorgang
     ' ========================================
     Private Async Function Decide_Load(pIsFormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task
+        Dim oHandle As Object = Nothing
+        Dim overlayStartedHere As Boolean = False
+        If Not _overlayActive Then
+            oHandle = SplashScreenManager.ShowOverlayForm(Me)
+            _overlayActive = True
+            overlayStartedHere = True
+        End If
         Dim perfStart As DateTime = DateTime.MinValue
         Dim refreshWasEnabled As Boolean = False
 
@@ -1436,11 +1446,6 @@ Public Class frmMain
                     LOGGER.Info("[PERF Decide_Load] ruft LoadOverviewData auf...")
                 End If
 
-                ' UI vorbereiten
-                If Not PrepareGridForLoading() Then
-                    Exit Function
-                End If
-
                 Await Task.Yield()
 
                 ' Daten laden
@@ -1451,11 +1456,6 @@ Public Class frmMain
                     LOGGER.Info("[PERF Decide_Load] ruft LoadProfileData auf...")
                 End If
 
-                ' UI vorbereiten
-                If Not PrepareGridForLoading() Then
-                    Exit Function
-                End If
-
                 Await Task.Yield()
 
                 ' Daten laden
@@ -1470,6 +1470,10 @@ Public Class frmMain
             ' ========== NACHBEARBEITUNG ==========
             ApplyPostLoadSettings()
             GridIsLoaded = True
+            ' ========== CAPTION FINAL SICHERSTELLEN ==========
+            ' ApplyPostLoadSettings kann durch Spalten-Events den Caption überschreiben,
+            ' daher hier nochmals den korrekten Caption setzen
+            UpdateGridCaption()
 
         Catch ex As Exception
             GridIsLoaded = True
@@ -1477,7 +1481,10 @@ Public Class frmMain
             LOGGER.Info("Unexpected error in Decide_load: " & ex.Message)
         Finally
             FRONTEND_ACTION = FA_NONE
-
+            If overlayStartedHere Then
+                _overlayActive = False
+                SplashScreenManager.CloseOverlayForm(oHandle)
+            End If
             If refreshWasEnabled Then
                 TimerRefresh.Start()
             End If
@@ -1491,33 +1498,6 @@ Public Class frmMain
             End If
         End Try
     End Function
-
-    ' ========================================
-    ' UI-VORBEREITUNG - Macht Grid sichtbar und zeigt LoadingPanel
-    ' ========================================
-    Private Function PrepareGridForLoading() As Boolean
-        Try
-            ' Grid sichtbar machen
-            If GridControlWorkflows.Visible = False Then
-                GridControlWorkflows.Visible = True
-            End If
-
-            ' UI-Thread Zeit geben
-            Application.DoEvents()
-
-            ' LoadingPanel anzeigen
-            GridViewWorkflows.ShowLoadingPanel()
-
-            ' Nochmal Zeit zum Rendern
-            Application.DoEvents()
-
-            Return True
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            Return False
-        End Try
-    End Function
-
     ' ========================================
     ' OVERVIEW DATEN LADEN - Spezialisiert auf Overview
     ' ========================================
@@ -1686,9 +1666,6 @@ Public Class frmMain
                 GridControlWorkflows.EndUpdate()
             End If
 
-            ' LoadingPanel verstecken (NUR HIER!)
-            GridViewWorkflows.HideLoadingPanel()
-
             If LOG_HOTSPOTS Then
                 Dim totalElapsed = (DateTime.Now - perfStart).TotalMilliseconds
                 If totalElapsed > 4000 Then
@@ -1715,6 +1692,9 @@ Public Class frmMain
                 Return False
             End If
 
+            ' === FIX: Grid sichtbar machen bevor BeginUpdate ===
+            GridControlWorkflows_Visible()
+
             If GridControlWorkflows.Visible Then
                 GridControlWorkflows.BeginUpdate()
                 gridUpdateStarted = True
@@ -1729,6 +1709,7 @@ Public Class frmMain
             DT_CURR_WF_ITEMS = Await DatabaseFallback.GetDatatableECMAsync(oSQL)
 
             If IsNothing(DT_CURR_WF_ITEMS) Then
+                LOGGER.Warn("Daten konnten nicht geladen werden für Profil: " & CURRENT_CLICKED_PROFILE_TITLE)
                 Return False
             End If
 
@@ -1740,12 +1721,13 @@ Public Class frmMain
                 GridControlWorkflows.Visible = False
                 bindsourcegrid.DataSource = Nothing
                 GridControlWorkflows.DataSource = Nothing
+                LOGGER.Info("Keine Workflow-Items für Profil: " & CURRENT_CLICKED_PROFILE_TITLE)
                 Return False
             End If
 
             ' ========== BASIC VIEW ERSTELLEN ==========
             Await CreateBasicViewForProfile()
-
+            LOGGER.Debug("Basic View für Profil erstellt: " & CURRENT_CLICKED_PROFILE_TITLE)
             Return True
 
         Catch ex As Exception
@@ -1759,9 +1741,6 @@ Public Class frmMain
             If gridUpdateStarted Then
                 GridControlWorkflows.EndUpdate()
             End If
-
-            ' LoadingPanel verstecken (NUR HIER!)
-            GridViewWorkflows.HideLoadingPanel()
         End Try
     End Function
 
@@ -1998,6 +1977,8 @@ Public Class frmMain
         Dim useWaitCursorApplied As Boolean = False
         Dim previousMessage As String = bsiMessage.Caption
         Dim messageApplied As Boolean = False
+        Dim oHandle As Object = Nothing
+        Dim overlayStartedHere As Boolean = False
 
         If LOG_HOTSPOTS Then
             perfStart = DateTime.Now
@@ -2008,6 +1989,14 @@ Public Class frmMain
             CURRENT_ProfilGUID = pProfilID
             WM_AHWF_docPath = String.Empty
 
+            ' ========== OVERLAY ANZEIGEN ==========
+            If Not _overlayActive Then
+                oHandle = SplashScreenManager.ShowOverlayForm(Me)
+                _overlayActive = True
+                overlayStartedHere = True
+            End If
+
+
             ' ========== UI-VORBEREITUNG ==========
             Me.UseWaitCursor = True
             useWaitCursorApplied = True
@@ -2055,12 +2044,12 @@ Public Class frmMain
                 End If
 
                 ' ========== SEARCH SQL PREPARATION ==========
-                BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing
+                DT_FILTERED_PROFILE_SEARCHES_DATA = Nothing
-                rows = BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX")
+                rows = BASEDATA_DT_PROFILES_SEARCHES_DATA.Select(oExpression, "TAB_INDEX")
                 If rows.Length > 0 Then
-                    BASEDATA_DT_PROFILE_SEARCHES_SQL = rows.CopyToDataTable()
+                    DT_FILTERED_PROFILE_SEARCHES_DATA = rows.CopyToDataTable()
                 Else
-                    BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
+                    DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Clone()
                 End If
 
                 ' ========== VALIDATOR-FORM ÖFFNEN ==========
@@ -2112,6 +2101,13 @@ Public Class frmMain
             MsgBox("Unexpected error in Load_Profil_from_Grid: " & ex.Message & vbNewLine & ADDITIONAL_TITLE & " will try to reload the overview - Please try again!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
             Dim task = Decide_Load(False, True)
         Finally
+            ' ========== OVERLAY SCHLIESSEN (FALLBACK) ==========
+            If overlayStartedHere AndAlso _overlayActive Then
+                SplashScreenManager.CloseOverlayForm(oHandle)
+                LOGGER.Debug("Overlay closed in Load_Profil_from_Grid")
+                _overlayActive = False
+            End If
+
             ' ========== UI AUFRÄUMEN ==========
             If useWaitCursorApplied Then
                 Me.UseWaitCursor = False
@@ -2287,6 +2283,13 @@ Public Class frmMain
                     Exit Function
                 End If
 
+
+                If oIds.Count > 1000 Then
+                    Dim omsg = String.Format("You chose more than 1000 Workflows. Please select fewer items.", vbNewLine)
+                    FormHelper.ShowInfoMessage(omsg, omsgTitleAttention)
+                    Exit Function
+                End If
+
                 ' ========== DB-OPERATIONEN ==========
                 LOGGER.Debug("Cleaning up queued DocIds..")
                 Dim oDelete = $"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID}"
@@ -2548,11 +2551,9 @@ Public Class frmMain
         Dim viewUpdateStarted As Boolean = False
         Dim layoutRestored As Boolean = False
         Dim resetLayoutTriggered As Boolean = False
-        Dim showLoadingPanel As Boolean = False
         Dim useWaitCursorApplied As Boolean = False
         Dim previousMessage As String = bsiMessage.Caption
         Dim loadingMessageApplied As Boolean = False
-        Dim gridWasMadeVisible As Boolean = False
 
         If LOG_HOTSPOTS Then
             perfStart = DateTime.Now
@@ -2564,24 +2565,11 @@ Public Class frmMain
         ' SCHRITT 1: Grid sichtbar machen
         If GridControlWorkflows.Visible = False Then
             GridControlWorkflows.Visible = True
-            gridWasMadeVisible = True
         End If
 
         GRID_LOAD_TYPE = "OVERVIEW"
         CURRENT_CLICKED_PROFILE_ID = 0
 
-        ' SCHRITT 2: UI-Thread Zeit geben, das Grid zu rendern
-        Application.DoEvents()
-        Await Task.Delay(100)
-
-        ' SCHRITT 3: LoadingPanel anzeigen (jetzt ist das Grid definitiv sichtbar!)
-        GridViewWorkflows.ShowLoadingPanel()
-        showLoadingPanel = True
-
-        ' SCHRITT 4: UI-Thread Zeit zum Rendern des LoadingPanels geben
-        Application.DoEvents()
-        Await Task.Delay(150)
-
         If LOG_HOTSPOTS Then
             Dim elapsed = (DateTime.Now - perfStep).TotalMilliseconds
             If elapsed > 4000 Then
@@ -2876,7 +2864,6 @@ Public Class frmMain
 
         Finally
             ' ========== AUFRÄUMEN ==========
-            ' EndUpdate IMMER aufrufen (vor dem Verstecken des LoadingPanel)
             If viewUpdateStarted Then
                 GridViewWorkflows.EndUpdate()
             End If
@@ -2884,11 +2871,6 @@ Public Class frmMain
                 GridControlWorkflows.EndUpdate()
             End If
 
-            ' LoadingPanel SOFORT nach EndUpdate verstecken
-            If showLoadingPanel Then
-                GridViewWorkflows.HideLoadingPanel()
-            End If
-
             ' WaitCursor entfernen
             If useWaitCursorApplied Then
                 Me.UseWaitCursor = False
@@ -3196,6 +3178,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
             End If
 
             BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseECM.GetDatatable(oSQL)
+            EnsureProfileSearchType(BASEDATA_DT_PROFILES_SEARCHES_DOC, "DOC", NameOf(BASEDATA_DT_PROFILES_SEARCHES_DOC))
 
             If pMode = "Load" Then
                 DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
@@ -3203,16 +3186,18 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
             oSQL = "select * from TBPM_PROFILE_SEARCH WITH (NOLOCK) where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
 
-            BASEDATA_DT_PROFILES_SEARCHES_SQL = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
+            BASEDATA_DT_PROFILES_SEARCHES_DATA = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
-                .FilterExpression = "TYPE = 'SQL'",
+            .FilterExpression = "TYPE = 'SQL'",
-                .SortByColumn = "PROFILE_ID,TAB_INDEX"
+            .SortByColumn = "PROFILE_ID,TAB_INDEX"
             })
+            EnsureProfileSearchType(BASEDATA_DT_PROFILES_SEARCHES_DATA, "SQL", NameOf(BASEDATA_DT_PROFILES_SEARCHES_DATA))
+
             oSQL = String.Format("SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{0}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, '{0}' as LANGUAGE, * FROM TBPM_PROFILE_CONTROLS WITH (NOLOCK)", {USER_LANGUAGE})
             BASEDATA_TBPM_PROFILE_CONTROLS = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                 .FilterExpression = String.Format("LANGUAGE = '{0}'", {USER_LANGUAGE})
             })
             If pMode = "Load" Then
-                BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
+                DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Clone()
             End If
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(60)
             LoadVWPM_CONTROL_INDEX()
@@ -3233,6 +3218,53 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
         End Try
         oStopWatch.Done()
     End Sub
+    Private Sub EnsureProfileSearchType(ByRef pTable As DataTable, expectedType As String, tableName As String)
+        Try
+            If pTable Is Nothing Then
+                LOGGER.Warn($"{tableName} is Nothing - type guard skipped")
+                Exit Sub
+            End If
+
+            If pTable.Columns.Contains("TYPE") = False Then
+                LOGGER.Warn($"{tableName} has no TYPE column - type guard skipped")
+                Exit Sub
+            End If
+
+            Dim cleanedTable As DataTable = pTable.Clone()
+            Dim removedCount As Integer = 0
+            Dim sampleInvalidSql As String = String.Empty
+
+            For Each row As DataRow In pTable.Rows
+                Dim rowType As String = String.Empty
+                If row("TYPE") IsNot DBNull.Value Then
+                    rowType = row("TYPE").ToString().Trim().ToUpperInvariant()
+                End If
+
+                If rowType = expectedType.ToUpperInvariant() Then
+                    cleanedTable.ImportRow(row)
+                Else
+                    removedCount += 1
+                    If sampleInvalidSql = String.Empty AndAlso pTable.Columns.Contains("SQL_COMMAND") Then
+                        If row("SQL_COMMAND") IsNot DBNull.Value Then
+                            sampleInvalidSql = row("SQL_COMMAND").ToString()
+                        End If
+                    End If
+                End If
+            Next
+
+            If removedCount > 0 Then
+                LOGGER.Warn($"{tableName}: removed {removedCount} row(s) with unexpected TYPE. Expected TYPE='{expectedType}'.")
+                If sampleInvalidSql <> String.Empty Then
+                    LOGGER.Warn($"{tableName}: sample unexpected SQL_COMMAND => {sampleInvalidSql}")
+                End If
+            End If
+            LOGGER.Debug($"{tableName}: {cleanedTable.Rows.Count} rows with TYPE='{expectedType}' after type guard.")
+            pTable = cleanedTable
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            LOGGER.Warn($"EnsureProfileSearchType failed for {tableName}")
+        End Try
+    End Sub
     Private Sub ConfigureGlobalLookAndFeel()
         If RIBBON_COLOR_SCHEME <> "" Then
             UserLookAndFeel.Default.UseDefaultLookAndFeel = False
@@ -3317,13 +3349,24 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
     End Sub
     Private Sub tsslblDEBUG_LOG_MouseHover(sender As Object, e As EventArgs)
         MsgBox("UserDebugMode is activated remotely. Debugdata will be transferred to database and will be deleted after 10 days!!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
-
     End Sub
 
     Private Sub frmMain_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
         If Application.OpenForms().OfType(Of frmValidator).Any Then
             _FormValidator.Close()
         End If
+        If Not IsNothing(WINDREAM_MOD) And IDB_ACTIVE = False Then
+            LOGGER.Debug("Closing frmMain - Now logging out...")
+            Try
+                WINDREAM_MOD.Session.Logout()
+                LOGGER.Debug("WINDREAM_MOD Session logged out successfully.")
+
+            Catch ex As Exception
+                LOGGER.Warn("Error while logging out WINDREAM_MOD Session: {0}", ex.Message)
+                LOGGER.Error(ex)
+            End Try
+        End If
+
     End Sub
 
 
@@ -3474,11 +3517,26 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
     End Sub
 
     Private Sub bwBasicData_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles bwBasicData.RunWorkerCompleted
-        If USER_IS_ADMIN Then
+        Try
-            'bsiDebug.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("LicenseCountCaption")}: {USERCOUNT_LOGGED_IN}"
+            If e.Error IsNot Nothing Then
-            bsiDebug.Caption = String.Format(S.Anzahl_Lizenzen___0_, USERCOUNT_LOGGED_IN)
+                LOGGER.Error(e.Error)
-        End If
+                LOGGER.Warn($"bwBasicData completed with error: {e.Error.Message}")
-        BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+            End If
+
+            If USER_IS_ADMIN Then
+                bsiDebug.Caption = String.Format(S.Anzahl_Lizenzen___0_, USERCOUNT_LOGGED_IN)
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        Finally
+            BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+            ' Caption zurücksetzen, falls sie noch auf "busy" steht
+            If bsiMessage.Caption = "bwBasicData is busy - no Refreshing" Then
+                bsiMessage.Caption = ""
+                bsiMessage.ItemAppearance.Normal.BackColor = Color.Transparent
+                bsiMessage.ItemAppearance.Normal.ForeColor = Color.Empty
+            End If
+        End Try
     End Sub
 
     Private Sub bwBasicData_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles bwBasicData.ProgressChanged
@@ -3597,7 +3655,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
     Private Sub GridViewWorkflows_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWorkflows.ColumnFilterChanged
         Try
-            If FormShown = False Or FRONTEND_ACTION = NAVBAR_CLICKED Then
+            If FormShown = False Or FRONTEND_ACTION <> FA_NONE Then
                 Exit Sub
             End If
 
@@ -3615,11 +3673,21 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
                     If lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
                         Ev_Filter_Panel_Closed = False
                     End If
-                    lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
+
+                    ' Caption korrekt setzen: Profil-Titel oder Gesamtübersicht
+                    If GRID_LOAD_TYPE.StartsWith("PROFILE#") AndAlso Not String.IsNullOrEmpty(CURRENT_CLICKED_PROFILE_TITLE) Then
+                        LOGGER.Debug($"Setting Grid Caption with Profile Title [{CURRENT_CLICKED_PROFILE_TITLE}] and Filter Active Term [{oTermFilterActive}]")
+                        lblCaptionMainGrid.Text = String.Format("{0} - {1}", CURRENT_CLICKED_PROFILE_TITLE, oTermFilterActive)
+                    Else
+                        LOGGER.Debug($"Setting Grid Caption with Gesamtübersicht and Filter Active Term [{oTermFilterActive}]")
+                        lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
+                    End If
+
                     bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                     bsitmCount.Caption = oTermFilterActive
                 Else
                     bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                    LOGGER.Debug("No active filter - resetting caption to default")
                 End If
 
             End If
@@ -4064,10 +4132,10 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
                         oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID}"
                         BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges)
 
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing
+                        DT_FILTERED_PROFILE_SEARCHES_DATA = Nothing
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Copy
+                        DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Copy
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL.Clear()
+                        DT_FILTERED_PROFILE_SEARCHES_DATA.Clear()
-                        BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges)
+                        BASEDATA_DT_PROFILES_SEARCHES_DATA.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DATA, LoadOption.PreserveChanges)
 
                         Try
                             Dim oEnvironment = GetEnvironment()

app/TaskFlow/frmMassValidator.vb

@@ -2,7 +2,7 @@
 Imports Oracle.ManagedDataAccess.Client
 Imports System.ComponentModel
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
+'Imports DigitalData.Modules.Language.Utils
 Imports System.IO
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
 Imports DigitalData.Modules.EDMI.API.Constants
@@ -33,7 +33,6 @@ Public Class frmMassValidator
     Dim viewer_string As String
     Dim pdfxchange As Boolean = False
     Dim sumatra As Boolean = False
-    Dim WMObject As WMObject
     Private Sub frmMassValidator_Load(sender As Object, e As EventArgs) Handles Me.Load
         FORM_Shown = False
         Try
@@ -1261,35 +1260,35 @@ Public Class frmMassValidator
                         Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY)
                         DatabaseFallback.ExecuteNonQueryECM(ins)
 
-                        '####### ANNOTIEREN WENN KONFIGURIERT #######
+                        ''####### ANNOTIEREN WENN KONFIGURIERT #######
-                        If docrow.Item("FULL_PATH").ToString.ToLower.EndsWith(".pdf") Then
+                        'If docrow.Item("FULL_PATH").ToString.ToLower.EndsWith(".pdf") Then
-                            If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                        '    If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                                If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
+                        '        If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
-                                    Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
+                        '            Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
-                                    Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish1")
+                        '            Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish1")
-                                    If Not IsNothing(DT_ENTRY) Then
+                        '            If Not IsNothing(DT_ENTRY) Then
-                                        If DT_ENTRY.Rows.Count = 1 Then
+                        '                If DT_ENTRY.Rows.Count = 1 Then
-                                            Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
+                        '                    Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
-                                            ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
+                        '                    ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
-                                        End If
+                        '                End If
-                                    End If
+                        '            End If
-                                End If
+                        '        End If
-                                Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
+                        '        Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
-                                If CBool(value) = True Then
+                        '        If CBool(value) = True Then
-                                    Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
+                        '            Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
-                                    Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish2")
+                        '            Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish2")
-                                    If Not IsNothing(DT_ENTRIES) Then
+                        '            If Not IsNothing(DT_ENTRIES) Then
-                                        If DT_ENTRIES.Rows.Count > 0 Then
+                        '                If DT_ENTRIES.Rows.Count > 0 Then
-                                            Dim AnnotationString As String = ""
+                        '                    Dim AnnotationString As String = ""
-                                            For Each rw As DataRow In DT_ENTRIES.Rows
+                        '                    For Each rw As DataRow In DT_ENTRIES.Rows
-                                                AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
+                        '                        AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
-                                            Next
+                        '                    Next
-                                            ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, 10, 40)
+                        '                    ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, 10, 40)
-                                        End If
+                        '                End If
-                                    End If
+                        '            End If
-                                End If
+                        '        End If
-                            End If
+                        '    End If
-                        End If
+                        'End If
 
                         '####### WENN MOVE2FOLDER KONFIGURIERT IST#######
                         If MOVE2Folder <> "" Then

app/TaskFlow/frmValidator.Designer.vb

@@ -762,7 +762,6 @@ Partial Class frmValidator
         Me.rbnPgGroupAttmt.ItemLinks.Add(Me.Attmnt_bbtnitm_LoadonClick)
         Me.rbnPgGroupAttmt.Name = "rbnPgGroupAttmt"
         resources.ApplyResources(Me.rbnPgGroupAttmt, "rbnPgGroupAttmt")
-        Me.rbnPgGroupAttmt.Visible = False
         '
         'RibbonPageGroupCustom
         '

app/TaskFlow/frmValidator.resx

@@ -616,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.6.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>

app/TaskFlow/frmValidatorSearch.resx

@@ -138,7 +138,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -187,7 +187,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -229,7 +229,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -271,7 +271,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -313,7 +313,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -454,7 +454,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -502,7 +502,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -520,7 +520,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch2.Text" xml:space="preserve">
     <value>Search2</value>
@@ -544,7 +544,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -562,7 +562,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch3.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -586,7 +586,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -604,7 +604,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch4.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -628,7 +628,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -646,7 +646,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch5.Text" xml:space="preserve">
     <value>XtraTabPage3</value>

app/TaskFlow/frmValidatorSearch.vb

@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Runtime.InteropServices
 Imports DevExpress.Utils
@@ -7,12 +8,13 @@ Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraTab
+Imports DigitalData.GUIs.Common
 Imports DigitalData.GUIs.Common.DocumentResultList
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.ZooFlow.Constants
 Imports DigitalData.Modules.ZooFlow
-Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.ZooFlow.Constants
 
 Public Class frmValidatorSearch
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
@@ -43,7 +45,7 @@ Public Class frmValidatorSearch
 #End Region
     Public formLoaded As Boolean = False
     Public _DTDocSearches As DataTable
-    Public _DTSQLSearches As DataTable
+    Public _DTDATASearches As DataTable
     Private _frmValidator As frmValidator 'You need a reference to Form1
     Private Shared BW_DocPath As String
     Private Shared BW_DocID As Integer
@@ -51,6 +53,8 @@ Public Class frmValidatorSearch
     Private Documentloader As Loader
     Private Property OperationMode As OperationMode
     Private ReadOnly Environment As Environment
+    Private _documentPathHandler As DocumentPathHandler
+    Private _suppressTabEvents As Boolean = False
 
     Public Sub New(pfrmValidator As frmValidator, pEnvironment As Environment)
 
@@ -79,52 +83,354 @@ Public Class frmValidatorSearch
     End Function
     Public Sub TabPreload(TabCountSQL As Integer, TabCountDoc As Integer, DTSQL As DataTable, DTDOC As DataTable)
         Try
-            SplitContainerSearches.Panel1Collapsed = IIf(DTSQL.Rows.Count > 0, False, True)
+            LOGGER.Debug("=== TabPreload START ===")
-            SplitContainerSearches.Panel2Collapsed = IIf(DTDOC.Rows.Count > 0, False, True)
+            LOGGER.Debug($"Parameters: TabCountSQL={TabCountSQL}, TabCountDoc={TabCountDoc}, DTSQL.Rows={If(DTSQL?.Rows.Count, 0)}, DTDOC.Rows={If(DTDOC?.Rows.Count, 0)}")
-            If Me.InvokeRequired() Then
-                Me.Invoke(Sub() TabPreload(TabCountSQL, TabCountDoc, DTSQL, DTDOC))
-            Else
-                '#### 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
-                        End If
-                    Next
-                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
-                        If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
-                            Exit For
-                        End If
-                        XtraTabControlSQL.TabPages(p).Text = DTSQL.Rows(p).Item("TAB_TITLE")
-
-                    Next
-                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
-                            XtraTabControlDocs.TabPages(p).PageVisible = False
-                        End If
-                    Next
-                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
-                        If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
-                            Exit For
-                        End If
-                        XtraTabControlDocs.TabPages(p).Text = DTDOC.Rows(p).Item("TAB_TITLE")
-                    Next
-
-                End If
-
 
+            ' Validierung der Parameter
+            If DTSQL Is Nothing Then
+                LOGGER.Warn("⚠️ DTSQL ist Nothing")
+                DTSQL = New DataTable()
+            End If
+            If DTDOC Is Nothing Then
+                LOGGER.Warn("⚠️ DTDOC ist Nothing")
+                DTDOC = New DataTable()
             End If
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
 
+            ' Thread-Synchronisation
+            If Me.InvokeRequired() Then
+                LOGGER.Debug("InvokeRequired=True, rufe auf UI-Thread auf")
+                Me.Invoke(Sub() TabPreload(TabCountSQL, TabCountDoc, DTSQL, DTDOC))
+                Return
+            End If
+
+            LOGGER.Debug("Ausführung auf UI-Thread")
+
+            ' ============================================================
+            ' WICHTIG: Variablen VOR Try-Block deklarieren
+            ' ============================================================
+            Dim hasSQLData As Boolean = False
+            Dim hasDocData As Boolean = False
+            Dim actualSQLTabCount As Integer = 0
+            Dim actualDocTabCount As Integer = 0
+
+            ' ============================================================
+            ' KRITISCH: Events DEAKTIVIEREN während der Rekonfiguration
+            ' ============================================================
+            _suppressTabEvents = True
+            LOGGER.Debug("🚫 Tab-Events deaktiviert")
+
+            Try
+                ' KRITISCH: DataTables SOFORT zuweisen
+                _DTDATASearches = DTSQL
+                _DTDocSearches = DTDOC
+                LOGGER.Debug($"✓ _DTDATASearches und _DTDocSearches zugewiesen: SQL={_DTDATASearches.Rows.Count}, Doc={_DTDocSearches.Rows.Count}")
+
+                ' TabCount-Validierung
+                actualSQLTabCount = Math.Min(TabCountSQL, DTSQL.Rows.Count)
+                actualDocTabCount = Math.Min(TabCountDoc, DTDOC.Rows.Count)
+
+                If actualSQLTabCount <> TabCountSQL Then
+                    LOGGER.Warn($"⚠️ TabCountSQL korrigiert: {TabCountSQL} → {actualSQLTabCount}")
+                End If
+                If actualDocTabCount <> TabCountDoc Then
+                    LOGGER.Warn($"⚠️ TabCountDoc korrigiert: {TabCountDoc} → {actualDocTabCount}")
+                End If
+
+                ' Panel-Sichtbarkeit
+                hasSQLData = DTSQL.Rows.Count > 0 AndAlso actualSQLTabCount > 0
+                hasDocData = DTDOC.Rows.Count > 0 AndAlso actualDocTabCount > 0
+
+                SplitContainerSearches.Panel1Collapsed = Not hasSQLData
+                SplitContainerSearches.Panel2Collapsed = Not hasDocData
+
+                LOGGER.Debug($"Panel1Collapsed (SQL)={SplitContainerSearches.Panel1Collapsed}, Panel2Collapsed (Doc)={SplitContainerSearches.Panel2Collapsed}")
+
+                ' ============================================================
+                ' KRITISCH: DocumentViewer nur bei Doc-Searches sichtbar
+                ' ============================================================
+                If hasDocData Then
+                    If Not DocumentViewer1.Visible Then
+                        DocumentViewer1.Visible = True
+                        LOGGER.Debug("✓ DocumentViewer1 sichtbar gemacht (Doc-Searches vorhanden)")
+                    End If
+                Else
+                    If DocumentViewer1.Visible Then
+                        DocumentViewer1.Visible = False
+                        LOGGER.Debug("✓ DocumentViewer1 ausgeblendet (keine Doc-Searches)")
+                    End If
+                End If
+
+                ' #### SQL Tabs konfigurieren
+                If hasSQLData Then
+                    LOGGER.Debug($"Konfiguriere SQL-Tabs: {DTSQL.Rows.Count} Definitionen")
+
+                    ' ALLE Tabs unsichtbar machen
+                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                        XtraTabControlSQL.TabPages(p).PageVisible = False
+                    Next
+                    LOGGER.Debug($"Alle {XtraTabControlSQL.TabPages.Count} SQL-Tabs auf PageVisible=False gesetzt")
+
+                    ' Nur benötigte Tabs sichtbar machen
+                    Dim processedTabs As Integer = 0
+                    For p As Integer = 0 To Math.Min(actualSQLTabCount - 1, XtraTabControlSQL.TabPages.Count - 1)
+                        If p < DTSQL.Rows.Count Then
+                            Try
+                                Dim tabTitle As String = If(DTSQL.Rows(p).Item("TAB_TITLE")?.ToString(), $"Tab {p + 1}")
+                                XtraTabControlSQL.TabPages(p).Text = tabTitle
+                                XtraTabControlSQL.TabPages(p).PageVisible = True
+                                processedTabs += 1
+                                LOGGER.Debug($"SQL-Tab {p}: Text='{tabTitle}', PageVisible=True")
+                            Catch ex As Exception
+                                LOGGER.Error($"❌ Fehler beim Konfigurieren von SQL-Tab {p}", ex)
+                            End Try
+                        End If
+                    Next
+
+                    LOGGER.Info($"✓ {processedTabs} SQL-Tabs konfiguriert")
+                Else
+                    LOGGER.Debug("Keine SQL-Daten, alle Tabs ausblenden")
+                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                        XtraTabControlSQL.TabPages(p).PageVisible = False
+                    Next
+                End If
+
+                ' #### Doc Tabs konfigurieren
+                If hasDocData Then
+                    LOGGER.Debug($"Konfiguriere Doc-Tabs: {DTDOC.Rows.Count} Definitionen")
+
+                    ' ALLE Tabs unsichtbar machen
+                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                        XtraTabControlDocs.TabPages(p).PageVisible = False
+                    Next
+                    LOGGER.Debug($"Alle {XtraTabControlDocs.TabPages.Count} Doc-Tabs auf PageVisible=False gesetzt")
+
+                    ' Nur benötigte Tabs sichtbar machen
+                    Dim processedTabs As Integer = 0
+                    For p As Integer = 0 To Math.Min(actualDocTabCount - 1, XtraTabControlDocs.TabPages.Count - 1)
+                        If p < DTDOC.Rows.Count Then
+                            Try
+                                Dim tabTitle As String = If(DTDOC.Rows(p).Item("TAB_TITLE")?.ToString(), $"Tab {p + 1}")
+                                XtraTabControlDocs.TabPages(p).Text = tabTitle
+                                XtraTabControlDocs.TabPages(p).PageVisible = True
+                                processedTabs += 1
+                                LOGGER.Debug($"Doc-Tab {p}: Text='{tabTitle}', PageVisible=True")
+                            Catch ex As Exception
+                                LOGGER.Error($"❌ Fehler beim Konfigurieren von Doc-Tab {p}", ex)
+                            End Try
+                        End If
+                    Next
+
+                    LOGGER.Info($"✓ {processedTabs} Doc-Tabs konfiguriert")
+                Else
+                    LOGGER.Debug("Keine Doc-Daten, alle Tabs ausblenden")
+                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                        XtraTabControlDocs.TabPages(p).PageVisible = False
+                    Next
+                End If
+
+            Finally
+                ' ============================================================
+                ' KRITISCH: Events REAKTIVIEREN nach Rekonfiguration
+                ' ============================================================
+                _suppressTabEvents = False
+                LOGGER.Debug("✓ Tab-Events reaktiviert")
+            End Try
+
+            ' JETZT manuell den ersten sichtbaren Tab aktivieren
+            ' ERSETZE im unteren Teil von TabPreload den SQL-Block:
+            If hasSQLData AndAlso XtraTabControlSQL.TabPages.Count > 0 Then
+                Dim firstVisibleSqlIndex As Integer = -1
+                For i As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                    If XtraTabControlSQL.TabPages(i).PageVisible Then
+                        firstVisibleSqlIndex = i
+                        Exit For
+                    End If
+                Next
+
+                If firstVisibleSqlIndex >= 0 AndAlso _DTDATASearches IsNot Nothing AndAlso firstVisibleSqlIndex < _DTDATASearches.Rows.Count Then
+                    LOGGER.Debug($"Setze SQL SelectedTabPageIndex manuell auf {firstVisibleSqlIndex}")
+
+                    Dim prevSuppress As Boolean = _suppressTabEvents
+                    _suppressTabEvents = True
+                    XtraTabControlSQL.SelectedTabPageIndex = firstVisibleSqlIndex
+                    _suppressTabEvents = prevSuppress
+
+                    Try
+                        Dim selectedRow As DataRow = _DTDATASearches.Rows(firstVisibleSqlIndex)
+                        Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+                        Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+                        Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {firstVisibleSqlIndex}")
+
+                        If Not String.IsNullOrEmpty(oCommand) Then
+                            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+                            LOGGER.Debug($"SQL-Tab {firstVisibleSqlIndex}: erzwungener Initial-Refresh")
+                            RefreshTabSQL(oConID, oCommand, firstVisibleSqlIndex, oTabCaption)
+                        End If
+                    Catch ex As Exception
+                        LOGGER.Error("❌ Fehler beim SQL-Initial-Refresh in TabPreload", ex)
+                    End Try
+                End If
+            End If
+
+            ' ERSETZE im unteren Teil von TabPreload den Doc-Block:
+            If hasDocData AndAlso XtraTabControlDocs.TabPages.Count > 0 Then
+                Dim firstVisibleDocIndex As Integer = -1
+                For i As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                    If XtraTabControlDocs.TabPages(i).PageVisible Then
+                        firstVisibleDocIndex = i
+                        Exit For
+                    End If
+                Next
+
+                If firstVisibleDocIndex >= 0 AndAlso _DTDocSearches IsNot Nothing AndAlso firstVisibleDocIndex < _DTDocSearches.Rows.Count Then
+                    LOGGER.Debug($"Setze Doc SelectedTabPageIndex manuell auf {firstVisibleDocIndex}")
+
+                    Dim prevSuppress As Boolean = _suppressTabEvents
+                    _suppressTabEvents = True
+                    XtraTabControlDocs.SelectedTabPageIndex = firstVisibleDocIndex
+                    _suppressTabEvents = prevSuppress
+
+                    Try
+                        Dim selectedRow As DataRow = _DTDocSearches.Rows(firstVisibleDocIndex)
+                        Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+                        Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+                        Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {firstVisibleDocIndex}")
+
+                        If Not String.IsNullOrEmpty(oCommand) Then
+                            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+                            LOGGER.Debug($"Doc-Tab {firstVisibleDocIndex}: erzwungener Initial-Refresh")
+                            RefreshTabDoc(oConID, oCommand, firstVisibleDocIndex, oTabCaption)
+                        End If
+                    Catch ex As Exception
+                        LOGGER.Error("❌ Fehler beim Doc-Initial-Refresh in TabPreload", ex)
+                    End Try
+                End If
+            End If
+
+            LOGGER.Debug("=== TabPreload END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in TabPreload", ex)
+            LOGGER.Error($"Stack Trace: {ex.StackTrace}")
+            _suppressTabEvents = False ' Sicherstellung
+
+            Try
+                SplitContainerSearches.Panel1Collapsed = True
+                SplitContainerSearches.Panel2Collapsed = True
+                DocumentViewer1.Visible = False
+            Catch collapseEx As Exception
+                LOGGER.Error("❌ Fehler beim Kollabieren der Panels", collapseEx)
+            End Try
+        End Try
+    End Sub
+    Private Sub XtraTabControlSQL_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlSQL.SelectedPageChanged
+        Try
+            ' KRITISCH: Event unterdrücken während TabPreload läuft
+            If _suppressTabEvents Then
+                LOGGER.Debug($"🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex})")
+                Exit Sub
+            End If
+
+            LOGGER.Debug($"=== XtraTabControlSQL_SelectedPageChanged START - SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex} ===")
+
+            If _DTDATASearches Is Nothing Then
+                LOGGER.Warn("⚠️ _DTDATASearches ist Nothing - Exit Sub")
+                Exit Sub
+            End If
+            If XtraTabControlSQL.SelectedTabPageIndex >= 0 AndAlso
+                Not XtraTabControlSQL.TabPages(XtraTabControlSQL.SelectedTabPageIndex).PageVisible Then
+                LOGGER.Debug("SQL-Tab ist nicht sichtbar - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlSQL.SelectedTabPageIndex >= _DTDATASearches.Rows.Count Then
+                LOGGER.Error($"❌ SelectedTabPageIndex ({XtraTabControlSQL.SelectedTabPageIndex}) >= _DTDATASearches.Rows.Count ({_DTDATASearches.Rows.Count}) - Exit Sub")
+                Exit Sub
+            End If
+
+            Dim selectedRow As DataRow = _DTDATASearches.Rows(XtraTabControlSQL.SelectedTabPageIndex)
+            Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+            Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+            Dim oTabIndex As Integer = XtraTabControlSQL.SelectedTabPageIndex
+            Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {oTabIndex}")
+
+            LOGGER.Debug($"Tab-Info: '{oTabCaption}', ConID={oConID}, TabIndex={oTabIndex}")
+
+            If String.IsNullOrEmpty(oCommand) Then
+                LOGGER.Warn($"⚠️ SQL_COMMAND ist leer für Tab '{oTabCaption}' - Exit Sub")
+                Exit Sub
+            End If
+
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+            LOGGER.Debug($"SQL ersetzt, Länge={oCommand.Length} Zeichen")
+
+            ' ============================================================
+            ' KRITISCH: RefreshTabSQL aufrufen!
+            ' ============================================================
+            LOGGER.Debug($"Rufe RefreshTabSQL auf für Tab '{oTabCaption}'")
+            RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption)
+
+            LOGGER.Debug("=== XtraTabControlSQL_SelectedPageChanged END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in XtraTabControlSQL_SelectedPageChanged", ex)
+            LOGGER.Error($"Details: SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex}, _DTDATASearches.Rows.Count={If(_DTDATASearches?.Rows.Count, 0)}")
+        End Try
+    End Sub
+
+    Private Sub XtraTabControlDocs_SelectedPageChanged_1(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlDocs.SelectedPageChanged
+        Try
+            ' KRITISCH: Event unterdrücken während TabPreload läuft
+            If _suppressTabEvents Then
+                LOGGER.Debug($"🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex})")
+                Exit Sub
+            End If
+
+            LOGGER.Debug($"=== XtraTabControlDocs_SelectedPageChanged START - SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex} ===")
+
+            If _DTDocSearches Is Nothing Then
+                LOGGER.Warn("⚠️ _DTDocSearches ist Nothing - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlDocs.SelectedTabPageIndex < 0 Then
+                LOGGER.Debug("SelectedTabPageIndex < 0 - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlDocs.SelectedTabPageIndex >= _DTDocSearches.Rows.Count Then
+                LOGGER.Error($"❌ SelectedTabPageIndex ({XtraTabControlDocs.SelectedTabPageIndex}) >= _DTDocSearches.Rows.Count ({_DTDocSearches.Rows.Count}) - Exit Sub")
+                Exit Sub
+            End If
+
+            Dim selectedRow As DataRow = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex)
+            Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+            Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+            Dim oTabIndex As Integer = XtraTabControlDocs.SelectedTabPageIndex
+            Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {oTabIndex}")
+
+            LOGGER.Debug($"Tab-Info: '{oTabCaption}', ConID={oConID}, TabIndex={oTabIndex}")
+
+            If String.IsNullOrEmpty(oCommand) Then
+                LOGGER.Warn($"⚠️ SQL_COMMAND ist leer für Tab '{oTabCaption}' - Exit Sub")
+                Exit Sub
+            End If
+
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+            LOGGER.Debug($"SQL ersetzt, Länge={oCommand.Length} Zeichen")
+
+            ' ============================================================
+            ' KRITISCH: RefreshTabDoc aufrufen!
+            ' ============================================================
+            LOGGER.Debug($"Rufe RefreshTabDoc auf für Tab '{oTabCaption}'")
+            RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption)
+
+            LOGGER.Debug("=== XtraTabControlDocs_SelectedPageChanged END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in XtraTabControlDocs_SelectedPageChanged", ex)
+            LOGGER.Error($"Details: SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex}, _DTDocSearches.Rows.Count={If(_DTDocSearches?.Rows.Count, 0)}")
+        End Try
     End Sub
     Public Sub RefreshTabSQL(ConID As Integer, SQLCommand As String, TabIndex As Integer, TabCaption As String)
         If Me.InvokeRequired() Then
@@ -237,28 +543,31 @@ Public Class frmValidatorSearch
                     myGridview = GridViewDocSearch5
             End Select
             myGridControl.ContextMenuStrip = ContextMenuStripWMFile
-            'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID)
+
             Dim oDatatable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With {
-                .ConnectionId = ConID
+            .ConnectionId = ConID
-            })
+        })
 
             If Not IsNothing(oDatatable) Then
                 XtraTabControlDocs.TabPages(TabIndex).Text = $"{TabCaption} ({oDatatable.Rows.Count})"
-                clsWMDocGrid.DTDocuments = oDatatable
-                'Select Case TabIndex
-                '    Case 0
-                '        GridControlDocSearch1.DataSource = oDatatable
-                '    Case 1
-                '        GridControlDocSearch2.DataSource = oDatatable
-                '    Case 2
-                '        GridControlDocSearch3.DataSource = oDatatable
-                '    Case 3
-                '        GridControlDocSearch4.DataSource = oDatatable
-                '    Case 4
-                '        GridControlDocSearch5.DataSource = oDatatable
 
-                'End Select
+                ' FIX: Nicht jedes Doc-Tab liefert echte Dokumentspalten
+                Dim hasDocId As Boolean = oDatatable.Columns.Contains("DocID")
+                Dim hasFullFilename As Boolean = oDatatable.Columns.Contains("FULL_FILENAME")
+
+                If Not hasDocId OrElse Not hasFullFilename Then
+                    LOGGER.Warn($"⚠️ Refresh_Load_GridDoc: Tab [{TabCaption}] liefert kein Dokument-Schema (DocID/FULL_FILENAME fehlt). Fallback auf Standard-Grid.")
+                    myGridControl.DataSource = oDatatable
+                    myGridview.BestFitColumns(True)
+                    clsWMDocGrid.DTDocuments = Nothing
+                    ToolStripDropDownButtonFile.Visible = False
+                    tslblState.Text = $"Tab [{TabCaption}] refreshed (fallback grid) - {Now}"
+                    Exit Sub
+                End If
+
+                clsWMDocGrid.DTDocuments = oDatatable
                 Create_GridControl(myGridview, oDatatable)
+
                 Dim oxmlPath As String = ""
                 oxmlPath = Get_DocGrid_Layout_Filename(XtraTabControlDocs.SelectedTabPageIndex)
 
@@ -463,33 +772,65 @@ Public Class frmValidatorSearch
         If My.Settings.frmValSearchSplitterDistance > 20 Then
             SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
         End If
-
+        ' DocumentPathHandler initialisieren
+        _documentPathHandler = New DocumentPathHandler(LOGCONFIG)
 
         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
 
-    Private Sub XtraTabControlSQL_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlSQL.SelectedPageChanged
+
-        If IsNothing(_DTSQLSearches) Then Exit Sub
-        Dim oConID = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("CONN_ID")
-        Dim oCommand = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        Dim oTabIndex = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_INDEX")
-        Dim oTabCaption = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_TITLE")
-        RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption)
-    End Sub
-    Private Sub XtraTabControlDocs_SelectedPageChanged_1(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlDocs.SelectedPageChanged
-        If IsNothing(_DTDocSearches) Then Exit Sub
-        Dim oConID = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("CONN_ID")
-        Dim oCommand = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        Dim oTabIndex = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_INDEX")
-        Dim oTabCaption = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_TITLE")
-        RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption)
-    End Sub
 
     Private Sub EigenschaftenDateiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenDateiToolStripMenuItem.Click
         Show_File_Properties()
@@ -518,86 +859,126 @@ Public Class frmValidatorSearch
         Next
     End Sub
     Sub Refresh_DocID(myGrid As GridView)
-        Try
+        If myGrid Is Nothing Then
+            LOGGER.Warn("⚠️ Refresh_DocID: myGrid is Nothing - Exit Sub")
+            Return
+        End If
 
+        Try
             myGrid.ShowLoadingPanel()
             clsWMDocGrid.ActiveDocGrid = myGrid
             clsWMDocGrid.ActiveDocGrid.EndSelection()
             clsWMDocGrid.GetDocItems()
+
             If ToolStripDropDownButtonFile.Visible = False Then
                 ToolStripDropDownButtonFile.Visible = True
             End If
-            If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then
-                If LastDocID = clsWMDocGrid.SELECTED_DOC_ID Then
-                    myGrid.HideLoadingPanel()
-                    Exit Sub
-                End If
-                Dim msg = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString
-                tslblDocID.Text = msg
-                ToolStripDropDownButtonFile.Enabled = True
-                Dim oDocument As DocumentResultList.Document = Nothing
-                ' Load DocumentInfo 
-                oDocument = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH)
 
-                If Not IsNothing(DocumentViewer1) Then
+            If clsWMDocGrid.SELECTED_DOC_ID = 0 Then
-                    Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}"
-                    If Not IsNothing(oDocument.Contents) Then
-                        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
-                            ToolStripDropDownButtonFile.Visible = False
-                        Else
-                            ToolStripDropDownButtonFile.Visible = True
-                        End If
-                    Else
-                        statlbl.Text = "odocument.content is nothing, Check Your log"
-                    End If
-
-
-                End If
-
-            Else
                 tslblDocID.Text = "DocRow not selected"
                 ToolStripDropDownButtonFile.Enabled = False
+                Return
             End If
+
+            If LastDocID = clsWMDocGrid.SELECTED_DOC_ID Then
+                Return
+            End If
+
+            tslblDocID.Text = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString
+            ToolStripDropDownButtonFile.Enabled = True
+            LOGGER.Debug($"✓ DocID aktualisiert: {clsWMDocGrid.SELECTED_DOC_ID}")
+            If IsNothing(Documentloader) Then
+                If OperationMode = Nothing Then
+                    OperationMode = GetOperationMode()
+                End If
+                Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User)
+            End If
+
+            If _documentPathHandler Is Nothing Then
+                _documentPathHandler = New DocumentPathHandler(LOGCONFIG)
+            End If
+
+            Dim oDocument As DocumentResultList.Document = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH)
+
+            If IsNothing(oDocument) Then
+                LOGGER.Warn($"⚠️ Refresh_DocID: Documentloader.Load lieferte Nothing (DocID={clsWMDocGrid.SELECTED_DOC_ID})")
+                statlbl.Text = "Dokument konnte nicht geladen werden."
+                Return
+            Else
+                LOGGER.Debug($"✓ Documentloader.Load erfolgreich für DocID={clsWMDocGrid.SELECTED_DOC_ID}, Pfad: {clsWMDocGrid.SELECTED_DOC_PATH}")
+            End If
+
+            If Not IsNothing(DocumentViewer1) AndAlso Not IsNothing(oDocument.Contents) Then
+                Dim options As New DocumentPathHandler.DocumentPathOptions With {
+                    .EnableMapping = COPY_WMFILE_2TEMP AndAlso Not String.IsNullOrWhiteSpace(WMSUFFIX),
+                    .WMSuffix = WMSUFFIX,
+                    .SpecificDrive = If(Len(MAP_SHARE_DRIVE) = 1, MAP_SHARE_DRIVE, ""),
+                    .DriveBlacklist = MAP_BLACKLIST,
+                    .CopyToTemp = COPY_WMFILE_2TEMP,
+                    .TempFolder = TEMP_DOCUMENT_FOLDER,
+                    .UnmapAfterCopy = True
+                }
+
+                Dim result = _documentPathHandler.ProcessDocumentPath(clsWMDocGrid.SELECTED_DOC_PATH, options)
+
+                If result.Success Then
+                    DocumentViewer1.LoadFile_FromPath(result.FinalPath)
+                    LastDocID = clsWMDocGrid.SELECTED_DOC_ID
+                    DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY)
+                    LOGGER.Debug($"✓ [ValidatorSearch] Dokument geladen: [{Path.GetFileName(result.FinalPath)}]")
+                Else
+                    LOGGER.Error($"❌ [ValidatorSearch] {result.ErrorMessage}")
+                    statlbl.Text = $"Fehler: {result.ErrorMessage}"
+                End If
+            Else
+                statlbl.Text = "Dokumentinhalt ist leer."
+            End If
+
         Catch ex As Exception
             LOGGER.Error(ex)
+        Finally
+            Try
+                myGrid.HideLoadingPanel()
+            Catch
+            End Try
         End Try
-        myGrid.HideLoadingPanel()
     End Sub
-    Private Sub GridViewDocSearch1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged
+    Private Sub GridViewDocSearch_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged,
-        Refresh_DocID(GridViewDocSearch1)
+    GridViewDocSearch2.FocusedRowChanged,
+    GridViewDocSearch3.FocusedRowChanged,
+    GridViewDocSearch4.FocusedRowChanged,
+    GridViewDocSearch5.FocusedRowChanged
+
+        If Not Me.Visible Then
+            Return
+        End If
+
+        Dim activeGrid As GridView = TryCast(sender, GridView)
+        If activeGrid Is Nothing Then
+            Return
+        End If
+
+        LOGGER.Debug($"FocusedRowChanged ausgelöst: [{activeGrid.Name}]")
+        Refresh_DocID(activeGrid)
     End Sub
 
-    Private Sub GridViewDocSearch2_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch2.FocusedRowChanged
+    Private Sub GridViewDocSearch_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch1.FocusedColumnChanged,
-        Refresh_DocID(GridViewDocSearch2)
+    GridViewDocSearch2.FocusedColumnChanged,
-    End Sub
+    GridViewDocSearch3.FocusedColumnChanged,
-    Private Sub GridViewDocSearch3_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch3.FocusedRowChanged
+    GridViewDocSearch4.FocusedColumnChanged,
-        Refresh_DocID(GridViewDocSearch3)
+    GridViewDocSearch5.FocusedColumnChanged
-    End Sub
-    Private Sub GridViewDocSearch4_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch4.FocusedRowChanged
-        Refresh_DocID(GridViewDocSearch4)
-    End Sub
-    Private Sub GridViewDocSearch5_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch5.FocusedRowChanged
-        Refresh_DocID(GridViewDocSearch5)
-    End Sub
 
-    Private Sub GridViewDocSearch1_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch1.FocusedColumnChanged
+        If Not Me.Visible Then
-        Refresh_DocID(GridViewDocSearch1)
+            Return
-    End Sub
+        End If
 
-    Private Sub GridViewDocSearch2_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch2.FocusedColumnChanged
+        Dim activeGrid As GridView = TryCast(sender, GridView)
-        Refresh_DocID(GridViewDocSearch2)
+        If activeGrid Is Nothing Then
-    End Sub
+            Return
-    Private Sub GridViewDocSearch3_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch3.FocusedColumnChanged
+        End If
-        Refresh_DocID(GridViewDocSearch3)
+
-    End Sub
+        LOGGER.Debug($"FocusedColumnChanged ausgelöst: [{activeGrid.Name}]")
-    Private Sub GridViewDocSearch4_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch4.FocusedColumnChanged
+        Refresh_DocID(activeGrid)
-        Refresh_DocID(GridViewDocSearch4)
-    End Sub
-    Private Sub GridViewDocSearch5_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch5.FocusedColumnChanged
-        Refresh_DocID(GridViewDocSearch5)
     End Sub
 
     Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
@@ -693,14 +1074,16 @@ Public Class frmValidatorSearch
 
     End Sub
     Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click
-        If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+        If DT_FILTERED_PROFILE_SEARCHES_DATA.Rows.Count > 0 Then
-            LOGGER.Debug($"There are [{BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count}] SQLSearches configured!")
+            LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DATA.Rows.Count}] DATASearches configured!")
-            _DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
+            _DTDATASearches = DT_FILTERED_PROFILE_SEARCHES_DATA
-            Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
+            Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("CONN_ID")
-            Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
+            Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("SQL_COMMAND")
             oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlSQL.SelectedTabPageIndex = 0
-            Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
+            Refresh_Load_GridSQL(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("TAB_TITLE"))
+        Else
+            LOGGER.Debug("No DATASearches configured for this profile!")
         End If
         If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
             LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count}] DocSearches configured!")
@@ -710,6 +1093,8 @@ Public Class frmValidatorSearch
             oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlDocs.SelectedTabPageIndex = 0
             RefreshTabDoc(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
+        Else
+            LOGGER.Debug("No DocSearches configured for this profile!")
         End If
     End Sub
 
@@ -754,48 +1139,57 @@ Public Class frmValidatorSearch
     End Sub
     Sub ReLoad_Active_SQLTab()
         Dim oTabIndex = XtraTabControlSQL.SelectedTabPageIndex
-        Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("CONN_ID")
+        Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("CONN_ID")
-        Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("SQL_COMMAND")
+        Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("SQL_COMMAND")
         oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        RefreshTabSQL(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("TAB_TITLE"))
+        RefreshTabSQL(oConID, oCommand, oTabIndex, DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("TAB_TITLE"))
     End Sub
 
     Private Sub GridControlDocSearch1_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch1.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch1)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch2_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch2.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch2)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch3_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch3.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch3)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch4_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch4.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch4)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch5_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch5.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch5)
         FileShow()
     End Sub
 
     Private Sub GridControlDocSearch1_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch1.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch1)
 
     End Sub
     Private Sub GridControlDocSearch2_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch2.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch2)
     End Sub
     Private Sub GridControlDocSearch3_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch3.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch3)
     End Sub
     Private Sub GridControlDocSearch4_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch4.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch4)
     End Sub
     Private Sub GridControlDocSearch5_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch5.Click
-
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch5)
     End Sub
 

app/TaskFlow/logtaskflow.txt

@@ -0,0 +1,150 @@
+13:45:45.0872|frmValidator|INFO >> Load_Additional_Searches -> ✓ SQL-Search 'Inhalte ZUGFeRD-XML': 67 Ergebnisse gefunden
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceAllValues -> input BEFORE replacing: [Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = {#IDBA#ObjectID}]
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceIDBAttributes -> Starting ReplaceIDBAttributes with input: [Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = {#IDBA#ObjectID}] for document ID: 4511694
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceIDBAttributes -> IS_SQL = True - oReplaceValue = [{#IDBA#ObjectID}]
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceIDBAttributes -> oIDBValue = 4511694
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceIDBAttributes -> sql after ReplaceIDBAttributes: Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = {#IDBA#ObjectID}
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceControlValues -> Starting ReplaceControlValues with input: [Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = 4511694] for document ID: 4511694
+13:45:45.0872|taskFLOW|DEBUG >> ReplaceAllValues -> input AFTER replacing: [Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = 4511694]
+13:45:45.0872|DatabaseWithFallback|DEBUG >> GetDatatable -> ForceFallback is True, falling back to direct database access.
+13:45:45.0872|DatabaseWithFallback|DEBUG >> GetDatatableFromDatabase -> Fetching data from database [ECM] with Connection Id [ECM]
+13:45:45.0872|DatabaseWithFallback|DEBUG >> GetDatatableFromDatabase -> Retrieving Connection String from Connection Id [1]
+13:45:45.0872|MSSQLServer|DEBUG >> Get_ConnectionStringforID -> Getting ConnectionString for ConnectionId [1]
+13:45:45.0872|MSSQLServer|DEBUG >> GetConnection -> The Following Connection is open: Server=W2K19SRV398;Database=DD_ECM;User Id=EDMAdmin;Password=XXXXX;Application Name=DD_EDMIAppService;Workstation ID=W2K19SRV391;
+13:45:45.0872|MSSQLServer|DEBUG >> MaybeGetTransaction -> Transaction Mode: [WithTransaction]
+13:45:45.0872|MSSQLServer|DEBUG >> GetDatatableWithConnectionObject -> GetDatatableWithConnectionObject: Running Query [SELECT * FROM TBDD_CONNECTION WHERE GUID = 1] and Parameters []
+13:45:45.0872|MSSQLServer|DEBUG >> GetConnection -> The Following Connection is open: Data Source=w2k19srv398;Initial Catalog=DD_ECM;User ID=EDMAdmin;Password=XXXXX
+13:45:45.0872|MSSQLServer|DEBUG >> MaybeGetTransaction -> Transaction Mode: [WithTransaction]
+13:45:45.0872|MSSQLServer|DEBUG >> GetDatatableWithConnectionObject -> GetDatatableWithConnectionObject: Running Query [Select T.DocID,T.FULL_FILENAME,T.Doctype from TBPM_CUST_ATTACHMENTS  T WITH (NOLOCK) INNER JOIN idb.dbo.VWIDB_DOC_DATA T1 ON T.EmailMessageID = T1.EmailMessageID WHERE T1.IDB_OBJ_ID = 4511694] and Parameters []
+13:45:45.5262|frmValidator|DEBUG >> Load_Additional_Searches -> ℹ️ Doc-Search 'Attachments': Keine Ergebnisse gefunden
+13:45:45.5262|frmValidator|DEBUG >> Load_Additional_Searches -> Ergebnisprüfung abgeschlossen: AdditionalDataResultsExist=True, AdditionalDocResultsExist=False
+13:45:45.5262|frmValidator|DEBUG >> Load_Additional_Searches -> rbnPgGroupAttmt.Visible gesetzt auf: True | Stack: 
+   at taskFLOW.frmValidator.FillIndexValues(Boolean first, String SingleAttribute)
+13:45:45.5262|frmValidator|DEBUG >> Load_Additional_Searches -> --- NORMAL-MODUS aktiviert (nur vorbereiten, NICHT Show) ---
+13:45:45.5262|taskFLOW|DEBUG >> TabPreload -> === TabPreload START ===
+13:45:45.5262|taskFLOW|DEBUG >> TabPreload -> Parameters: TabCountSQL=1, TabCountDoc=0, DTSQL.Rows=1, DTDOC.Rows=0
+13:45:45.5262|taskFLOW|DEBUG >> TabPreload -> Ausführung auf UI-Thread
+13:45:45.5262|taskFLOW|DEBUG >> TabPreload -> 🚫 Tab-Events deaktiviert
+13:45:45.5262|taskFLOW|DEBUG >> TabPreload -> ✓ _DTDATASearches und _DTDocSearches zugewiesen: SQL=1, Doc=0
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> Panel1Collapsed (SQL)=False, Panel2Collapsed (Doc)=True
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> Konfiguriere SQL-Tabs: 1 Definitionen
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=1)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=2)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=3)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=4)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=-1)
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> Alle 5 SQL-Tabs auf PageVisible=False gesetzt
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlSQL_SelectedPageChanged -> 🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex=0)
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> SQL-Tab 0: Text='Inhalte ZUGFeRD-XML', PageVisible=True
+13:45:45.5322|taskFLOW|INFO >> TabPreload -> ✓ 1 SQL-Tabs konfiguriert
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> Keine Doc-Daten, alle Tabs ausblenden
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlDocs_SelectedPageChanged_1 -> 🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex=1)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlDocs_SelectedPageChanged_1 -> 🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex=2)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlDocs_SelectedPageChanged_1 -> 🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex=3)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlDocs_SelectedPageChanged_1 -> 🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex=4)
+13:45:45.5322|taskFLOW|DEBUG >> XtraTabControlDocs_SelectedPageChanged_1 -> 🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex=-1)
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> ✓ Tab-Events reaktiviert
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> Setze SQL SelectedTabPageIndex manuell auf 0
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceAllValues -> input BEFORE replacing: [SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = {#IDBA#ObjectID})
+ORDER BY GROUP_COUNTER, SPEC_NAME]
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceIDBAttributes -> Starting ReplaceIDBAttributes with input: [SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = {#IDBA#ObjectID})
+ORDER BY GROUP_COUNTER, SPEC_NAME] for document ID: 4511694
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceIDBAttributes -> IS_SQL = True - oReplaceValue = [{#IDBA#ObjectID}]
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceIDBAttributes -> oIDBValue = 4511694
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceIDBAttributes -> sql after ReplaceIDBAttributes: SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = {#IDBA#ObjectID})
+ORDER BY GROUP_COUNTER, SPEC_NAME
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceControlValues -> Starting ReplaceControlValues with input: [SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = 4511694)
+ORDER BY GROUP_COUNTER, SPEC_NAME] for document ID: 4511694
+13:45:45.5322|taskFLOW|DEBUG >> ReplaceAllValues -> input AFTER replacing: [SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = 4511694)
+ORDER BY GROUP_COUNTER, SPEC_NAME]
+13:45:45.5322|taskFLOW|DEBUG >> TabPreload -> SQL-Tab 0: erzwungener Initial-Refresh
+13:45:45.5322|DatabaseWithFallback|DEBUG >> GetDatatable -> ForceFallback is True, falling back to direct database access.
+13:45:45.5322|DatabaseWithFallback|DEBUG >> GetDatatableFromDatabase -> Fetching data from database [ECM] with Connection Id [ECM]
+13:45:45.5322|DatabaseWithFallback|DEBUG >> GetDatatableFromDatabase -> Retrieving Connection String from Connection Id [1]
+13:45:45.5322|MSSQLServer|DEBUG >> Get_ConnectionStringforID -> Getting ConnectionString for ConnectionId [1]
+13:45:45.5322|MSSQLServer|DEBUG >> GetConnection -> The Following Connection is open: Server=W2K19SRV398;Database=DD_ECM;User Id=EDMAdmin;Password=XXXXX;Application Name=DD_EDMIAppService;Workstation ID=W2K19SRV391;
+13:45:45.5322|MSSQLServer|DEBUG >> MaybeGetTransaction -> Transaction Mode: [WithTransaction]
+13:45:45.5322|MSSQLServer|DEBUG >> GetDatatableWithConnectionObject -> GetDatatableWithConnectionObject: Running Query [SELECT * FROM TBDD_CONNECTION WHERE GUID = 1] and Parameters []
+13:45:45.5322|MSSQLServer|DEBUG >> GetConnection -> The Following Connection is open: Data Source=w2k19srv398;Initial Catalog=DD_ECM;User ID=EDMAdmin;Password=XXXXX
+13:45:45.5322|MSSQLServer|DEBUG >> MaybeGetTransaction -> Transaction Mode: [WithTransaction]
+13:45:45.5322|MSSQLServer|DEBUG >> GetDatatableWithConnectionObject -> GetDatatableWithConnectionObject: Running Query [SELECT 
+	SPEC_NAME [Definitions-Name],
+	ITEM_DESCRIPTION [Beschreibung],
+	CASE 
+		WHEN SPEC_NAME = 'INVOICE_POSITION_NOTE' THEN
+			REPLACE(REPLACE(ITEM_VALUE, CHAR(13),' '),CHAR(10),' ')
+		ELSE 
+			ITEM_VALUE 
+		END		[Inhalt xml],
+	GROUP_COUNTER [Gruppenzähler],
+	IS_REQUIRED [Pflichtangabe], 
+	CREATEDWHEN [Erstellt] 
+FROM dbo.TBEDMI_ITEM_VALUE WITH (NOLOCK) 
+WHERE REFERENCE_GUID = (SELECT EmailMessageID FROM IDB.dbo.VWIDB_DOC_DATA WHERE IDB_OBJ_ID = 4511694)
+ORDER BY GROUP_COUNTER, SPEC_NAME] and Parameters []
+13:45:45.5832|taskFLOW|DEBUG >> TabPreload -> === TabPreload END ===

app/TaskFlow/packages.config

@@ -5,8 +5,8 @@
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" 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" version="14.3.3" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.23" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" 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" />
@@ -19,6 +19,7 @@
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="Oracle.ManagedDataAccess" version="21.15.0" targetFramework="net462" />
   <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />

app/TaskFlow/taskFLOW.vbproj

@@ -151,9 +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, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\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>
@@ -173,23 +173,18 @@
       <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.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Interfaces">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
-      <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>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">
       <SpecificVersion>False</SpecificVersion>
@@ -202,15 +197,14 @@
       <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">
+    <Reference Include="DigitalData.Modules.Windream">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.ZooFlow">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
+      <HintPath>M:\Bibliotheken\Digital Data\DD_Modules\DLLLicenseManager.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@@ -231,117 +225,109 @@
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="FormsUtils">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\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.23\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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.23\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.3\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>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOBRWSLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOSRCHLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOTOOLLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Mail">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\Limilabs\Mail.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -356,15 +342,6 @@
     <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>
@@ -377,11 +354,8 @@
     <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
       <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.21.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
+      <HintPath>..\packages\Oracle.ManagedDataAccess.21.15.0\lib\net462\Oracle.ManagedDataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp-gdi">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
@@ -392,9 +366,6 @@
     <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
       <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
-    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
@@ -488,7 +459,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationEvents.vb" />
-    <Compile Include="ClassAnnotation.vb" />
     <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
     <Compile Include="ClassControlCreator.vb" />
@@ -624,6 +594,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>
@@ -868,6 +844,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>
@@ -1090,6 +1069,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Oracle.DataAccess.Common.Configuration.Section.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Oracle.ManagedDataAccess.Client.Configuration.Section.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Resources\syncreon.png" />
   </ItemGroup>
@@ -1271,6 +1256,7 @@
     <None Include="Resources\PM_mit_slogan.JPG" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="logtaskflow.txt" />
     <None Include="Changelog.md" />
     <Content Include="DataColumnExpression.txt" />
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
@@ -1380,10 +1366,10 @@
     </PropertyGroup>
     <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'))" />
+    <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'))" />
   </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')" />
+  <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')" />
   <!-- 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">