2.7.4

• Robustere Behandlung von Datenquellen, SQL-Placeholders und Verbindungs-IDs
• Verbesserte Steuerlogik für abhängige Controls, Enable/Disable und SetControlData
• Konsistente Verarbeitung von Vektorfeldern, Lookup, ComboBox, DateEdit und GridControl
• Validierung: Pflichtfelder, Regex-Checks, Grid-Zellenvalidierung, Fehlerdialoge
• Performance- und Logging-Verbesserungen, reduzierte Nebenwirkungen (Flags, Flow)
• Zusätzliche Suchen: Preload, OnClick, UI-Anbindung, Refresh
• Dokument-Viewer: Laden, Sichtbarkeit, PDF-Annotationen und Export-Workflow
• Finale Indexierung inkl. SQL-basierten Werten, Work-History-Logging, Move2Folder
• Fehlerbehandlung bei Überspringen/Löschen, Freigabe und Workflow-Abschluss
• UI-Feedback: Statuslabel, Ribbon-Buttons, Tooltips, Ghost-Mode Unterstützung
• Codehygiene: Null-/DBNull-Checks, Culture-Handling, farbliche Formatierung (Currency)

app/TaskFlow/App.config

@@ -102,7 +102,8 @@
     </DevExpress.LookAndFeel.Design.AppSettings>
   </applicationSettings>
   <connectionStrings>
-    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" />
+    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@@ -143,7 +144,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
@@ -151,15 +152,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
@@ -229,7 +230,7 @@
         <value>0, 0</value>
       </setting>
       <setting name="frmValSearchSplitterDistance" serializeAs="String">
-        <value>563</value>
+        <value>513</value>
       </setting>
       <setting name="frmMainWindowState" serializeAs="String">
         <value>Normal</value>

app/TaskFlow/ClassAllgemeineFunktionen.vb

@@ -366,4 +366,55 @@ Public Class ClassAllgemeineFunktionen
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file")
         End Try
     End Sub
+    Public Shared Function NotNull(Of T)(value As Object, defaultValue As T) As T
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+
+        ' Versuche den Wert in den gewünschten Typ zu konvertieren
+        Try
+            Return CType(value, T)
+        Catch ex As InvalidCastException
+            ' Falls die Konvertierung fehlschlägt, gib den Default zurück
+            Return defaultValue
+        End Try
+    End Function
+    Public Shared Function NotNullNullable(Of T As Structure)(value As Object, defaultValue As Nullable(Of T)) As Nullable(Of T)
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+        Try
+            ' Direkte Casts sind robust, wandeln aber DBNull nicht – das ist bereits oben abgefangen.
+            Return DirectCast(value, Nullable(Of T))
+        Catch
+            Try
+                ' Fallback: in T casten und zu Nullable machen
+                Return New Nullable(Of T)(DirectCast(value, T))
+            Catch
+                Return defaultValue
+            End Try
+        End Try
+    End Function
+    Public Shared Function NotNullString(value As Object, defaultValue As Object) As String
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return CStr(value)
+    End Function
+
+    Public Shared Function NotNullDate(value As Object, defaultValue As DateTime) As DateTime?
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return DirectCast(value, DateTime)
+    End Function
+    Public Shared Function NewShortGuid() As String
+        ' Neue GUID erzeugen
+        Dim g As Guid = Guid.NewGuid()
+
+        ' In Base64 umwandeln
+        Dim b64 As String = Convert.ToBase64String(g.ToByteArray())
+
+        ' Unerwünschte Zeichen ersetzen/entfernen
+        b64 = b64.Replace("=", "").Replace("+", "-").Replace("/", "_")
+
+        ' Ergebnis zurückgeben
+        Return b64
+    End Function
 End Class

app/TaskFlow/ClassControlCreator.vb

@@ -104,17 +104,17 @@ Public Class ClassControlCreator
     Private Function TransformDataRow(row As DataRow) As ControlDBProps
         Dim x As Integer = row.Item("X_LOC")
         Dim y As Integer = row.Item("Y_LOC")
-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
+        Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
+        Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
+        Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
         Dim family As FontFamily = New FontFamily(familyString)
 
         Dim oGuid As Integer = row.Item("GUID")
-        Dim oControlName As String = NotNull(row.Item("NAME"), "")
+        Dim oControlName As String = ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), "")
-        Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "")
+        Dim oAttribute As String = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
         Dim oLocation As New Point(x, y)
         Dim oFont As New Font(family, size, style, GraphicsUnit.Point)
-        Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        Dim oColor As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
         Dim oReadOnly As Boolean = row.Item("READ_ONLY")
         Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM")
         If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then
@@ -122,7 +122,6 @@ Public Class ClassControlCreator
             oReadOnly = True
         End If
 
-
         Return New ControlDBProps() With {
             .Guid = oGuid,
             .Name = oControlName,
@@ -149,8 +148,6 @@ Public Class ClassControlCreator
             ctrl.Location = props.Location
             ctrl.Font = props.Font
             ctrl.ForeColor = props.Color
-
-
             If designMode Then
                 ctrl.Cursor = Cursors.Hand
             End If
@@ -171,7 +168,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewTextBox(location As Point) As TextEdit
         Dim control As New TextEdit With {
-            .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}",
+            .Name = $"{PREFIX_TEXTBOX}_{ClassAllgemeineFunktionen.NewShortGuid()}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Location = location,
             .ReadOnly = True,
@@ -184,7 +181,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewLabel(location As Point) As Label
         Dim control As New Label With {
-            .Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LABEL}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Text = DEFAULT_TEXT,
             .AutoSize = True,
             .Location = location,
@@ -196,7 +193,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewCheckbox(location As Point) As CheckBox
         Dim control As New CheckBox With {
-            .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_CHECKBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .AutoSize = True,
             .Text = DEFAULT_TEXT,
             .Cursor = Cursors.Hand,
@@ -209,7 +206,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewCombobox(location As Point) As Windows.Forms.ComboBox
         Dim control As New Windows.Forms.ComboBox With {
-            .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_COMBOBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -220,7 +217,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewDatetimepicker(location As Point) As DateTimePicker
         Dim control As New DateTimePicker With {
-            .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATETIMEPICKER}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -232,7 +229,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewDatagridview(location As Point) As DataGridView
         Dim control As New DataGridView With {
-            .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATAGRIDVIEW}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -252,7 +249,7 @@ Public Class ClassControlCreator
 
     Friend Function CreateNewLookupControl(location As Point) As LookupControl3
         Dim control As New LookupControl3 With {
-            .Name = $"{PREFIX_LOOKUP}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LOOKUP}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -262,7 +259,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewTable(location As Point) As GridControl
         Dim oControl As New GridControl With {
-            .Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_TABLE}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -282,7 +279,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewLine(location As Point) As LineLabel
         Dim control As New LineLabel With {
-            .Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LINE}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Text = "---------------------------------",
             .Size = New Size(100, 5),
             .Location = location
@@ -292,7 +289,7 @@ Public Class ClassControlCreator
     End Function
     Public Function CreateNewButton(location As Point) As Button
         Dim control As New Button With {
-            .Name = $"{PREFIX_BUTTON}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_BUTTON}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(108, 28),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -311,6 +308,7 @@ Public Class ClassControlCreator
             Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty)
             Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty)
             Dim oIndexname = oControlRow.ItemEx("INDEX_NAME", String.Empty)
+            Dim oAlignment = oControlRow.ItemEx("TEXT_ALIGNMENT", "Near")
             Dim oControl As BaseEdit = Nothing
             If oHeight >= 27 Then
                 oControl = CreateBaseControl(New MemoEdit(), oControlRow, designMode)
@@ -325,6 +323,13 @@ Public Class ClassControlCreator
 
             oControl.Height = oHeight
             oControl.Width = oWidth
+            If oAlignment = "Near" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+            ElseIf oAlignment = "Center" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+            ElseIf oAlignment = "Far" Then
+                oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
+            End If
 
             If Not designMode Then
                 'oControl.ReadOnly = oReadOnly
@@ -353,17 +358,24 @@ Public Class ClassControlCreator
     End Function
 
     Public Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
-        Dim control As Label = CreateBaseControl(New Label(), row, designMode)
+        Dim oControl As Label = CreateBaseControl(New Label(), row, designMode)
         Try
-            control.Text = row.Item("CTRL_CAPTION_LANG")
+            oControl.Text = row.Item("CTRL_CAPTION_LANG")
         Catch ex As Exception
-            Logger.Warn("Label [{0}] does not have a translation!", control.Name)
+            Logger.Warn("Label [{0}] does not have a translation!", oControl.Name)
-            control.Text = row.Item("CTRL_TEXT")
+            oControl.Text = row.Item("CTRL_TEXT")
         End Try
+        Dim oAlignment = row.ItemEx("TEXT_ALIGNMENT", "Near")
+        If oAlignment = "Near" Then
+            oControl.TextAlign = ContentAlignment.MiddleLeft
+        ElseIf oAlignment = "Center" Then
+            oControl.TextAlign = ContentAlignment.MiddleCenter
+        ElseIf oAlignment = "Far" Then
+            oControl.TextAlign = ContentAlignment.MiddleRight
+        End If
+        oControl.AutoSize = True
 
-        control.AutoSize = True
+        Return oControl
-
-        Return control
     End Function
 
     Public Function CreateExistingButton(row As DataRow, designMode As Boolean) As Button
@@ -395,21 +407,53 @@ Public Class ClassControlCreator
 
         Return oControl
     End Function
-    Public Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
+    Public Function CreateExistingCombobox(pRow As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
-        Dim control As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), row, designMode)
+        Dim oControl As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), pRow, designMode)
-
+        oControl.Size = New Size(pRow.Item("WIDTH"), pRow.Item("HEIGHT"))
-        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
         If Not designMode Then
-            control.Enabled = Not row.Item("READ_ONLY")
+            oControl.Enabled = Not pRow.Item("READ_ONLY")
-            control.TabStop = Not row.Item("READ_ONLY")
+            oControl.TabStop = Not pRow.Item("READ_ONLY")
-            control.BackColor = IIf(row.Item("READ_ONLY"), Color.LightGray, Color.White)
+            oControl.BackColor = IIf(pRow.Item("READ_ONLY"), Color.LightGray, Color.White)
 
-            control.AutoCompleteMode = AutoCompleteMode.SuggestAppend
+            oControl.AutoCompleteMode = AutoCompleteMode.SuggestAppend
-            control.AutoCompleteSource = AutoCompleteSource.ListItems
+            oControl.AutoCompleteSource = AutoCompleteSource.ListItems
         End If
 
-        Return control
+        '' Apply text alignment by owner-drawing based on oAlignment
+        'Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near")
+
+        '' Ensure owner-draw so we can control text alignment
+        'oControl.DrawMode = Global.System.Windows.Forms.DrawMode.OwnerDrawFixed
+
+        '' Attach handler with inline drawing logic respecting alignment
+        'AddHandler oControl.DrawItem,
+        'Sub(sender As Object, e As DrawItemEventArgs)
+        '    Dim cmb = TryCast(sender, Windows.Forms.ComboBox)
+        '    If cmb Is Nothing Then Return
+        '    e.DrawBackground()
+        '    If e.Index >= 0 AndAlso e.Index < cmb.Items.Count Then
+        '        Dim text As String = cmb.GetItemText(cmb.Items(e.Index))
+        '        Dim sf As New StringFormat(StringFormatFlags.NoWrap)
+        '        Select Case oAlignment
+        '            Case "Near"
+        '                sf.Alignment = StringAlignment.Near
+        '            Case "Center"
+        '                sf.Alignment = StringAlignment.Center
+        '            Case "Far"
+        '                sf.Alignment = StringAlignment.Far
+        '            Case Else
+        '                sf.Alignment = StringAlignment.Near
+        '        End Select
+        '        sf.LineAlignment = StringAlignment.Center
+        '        Using foreBrush As New SolidBrush(If((e.State And DrawItemState.Selected) = DrawItemState.Selected, SystemColors.HighlightText, cmb.ForeColor))
+        '            e.Graphics.DrawString(text, e.Font, foreBrush, e.Bounds, sf)
+        '        End Using
+        '    End If
+        '    e.DrawFocusRectangle()
+        'End Sub
+
+        Return oControl
     End Function
 
     Public Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
@@ -469,21 +513,30 @@ Public Class ClassControlCreator
         Return control
     End Function
 
-    Public Function CreateExistingLookupControl(row As DataRow, designMode As Boolean) As LookupControl3
+    Public Function CreateExistingLookupControl(pRow As DataRow, pDesignMode As Boolean) As LookupControl3
-        Dim control As LookupControl3 = CreateBaseControl(New LookupControl3(), row, designMode)
+        Dim oControl As LookupControl3 = CreateBaseControl(New LookupControl3(), pRow, pDesignMode)
-        control.Properties.Name = control.Name
+        oControl.Properties.Name = oControl.Name
-        control.Width = row.Item("WIDTH")
+        oControl.Width = pRow.Item("WIDTH")
-        control.ReadOnly = row.Item("READ_ONLY")
+        oControl.ReadOnly = pRow.Item("READ_ONLY")
-        control.Properties.AllowAddNewValues = row.Item("VKT_ADD_ITEM")
+        oControl.Properties.AllowAddNewValues = pRow.Item("VKT_ADD_ITEM")
+        Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near")
 
-        If designMode Then
+        If oAlignment = "Near" Then
-            control.Cursor = Cursors.Hand
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+        ElseIf oAlignment = "Center" Then
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+        ElseIf oAlignment = "Far" Then
+            oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
         End If
 
-        Return control
+        If pDesignMode Then
+            oControl.Cursor = Cursors.Hand
+        End If
+
+        Return oControl
     End Function
 
-    Public Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean) As GridControl
+    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 oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode)
         Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid
@@ -559,8 +612,8 @@ Public Class ClassControlCreator
 
         Dim oDataTable = oGridControlCreator.CreateGridColumns(DT_MY_COLUMNS)
         GridTables = oGridControlCreator.FillGridTables(DT_MY_COLUMNS, oControlId, oControl.Name)
-        oView.PopulateColumns(oDatatable)
+        oView.PopulateColumns(oDataTable)
-        oControl.DataSource = oDatatable
+        oControl.DataSource = oDataTable
         oControl.RefreshDataSource()
         oControl.ForceInitialize()
 
@@ -587,7 +640,7 @@ Public Class ClassControlCreator
             End Try
         End If
 
-        oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl)
+        oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl, pcurrencySymbol)
         oGridControlCreator.ConfigureViewEvents(DT_MY_COLUMNS, oView, oControl, oControlId)
 
         ' 08.11.2021: Fix editor being empty on first open
@@ -605,7 +658,7 @@ Public Class ClassControlCreator
         control.Text = "------------------------------"
         control.BorderStyle = BorderStyle.None
         control.AutoSize = False
-        control.BackColor = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        control.BackColor = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
         Return control
@@ -824,7 +877,7 @@ Public Class ClassControlCreator
                                 If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then
                                     Dim oGrid As GridControl = DirectCast(oControl, GridControl)
                                     DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow()
-                                    Logger.Info("Force-setting Editor for Grid [{0}]", oGrid.Name)
+                                    Logger.Debug("Force-setting Editor for Grid [{0}]", oGrid.Name)
                                     Exit For
                                 End If
                             Catch ex As Exception
@@ -841,9 +894,4 @@ Public Class ClassControlCreator
             Next
         End If
     End Sub
-
-
-
-
-
 End Class

app/TaskFlow/ClassFinalIndex.vb

@@ -114,12 +114,12 @@ Public Class ClassFinalIndex
             props.VectorIndex = isVector
 
             If type = INDEX_TYPE_STRING Or type = INDEX_TYPE_VECTOR_STRING Then
-                value = NotNull(value, "")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "")
 
                 props.StringValue = value
             ElseIf type = INDEX_TYPE_INTEGER Or type = INDEX_TYPE_INTEGER64 Or type = INDEX_TYPE_VECTOR_INTEGER_64 Then
                 Try
-                    value = NotNull(Of Integer)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)
                     If value = String.Empty Then
                         props.IntegerValue = 0
                     Else
@@ -138,7 +138,7 @@ Public Class ClassFinalIndex
                 If value = "SQL-Command" Then
                     props.FloatValue = 0
                 Else
-                    value = NotNull(Of Double)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)
 
                     If value = String.Empty Then
                         props.FloatValue = 0
@@ -148,7 +148,7 @@ Public Class ClassFinalIndex
                 End If
 
             ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then
-                value = NotNull(value, "False")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "False")
 
                 If value = "1" Or value.ToLower = "true" Then
                     props.BoolValue = True

app/TaskFlow/ClassInit.vb

@@ -521,6 +521,10 @@ Public Class ClassInit
             oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
 
             BASEDATA_DT_LANGUAGE = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+            oSql = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
+            BASEDATA_TBDD_COLUMNS_FORMAT = DatabaseFallback.GetDatatable("TBDD_COLUMNS_FORMAT", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
             oStopWatch.Done()
         Catch ex As Exception
             LOGGER.Error(ex)

app/TaskFlow/ClassRegexEditor.vb

@@ -12,7 +12,7 @@ Public Class ClassRegexEditor
 
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
         Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim oRegexString As String = NotNull(value, String.Empty)
+        Dim oRegexString As String = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
 
         If oService IsNot Nothing Then
             Using oform As New frmRegexEditor()

app/TaskFlow/ControlCreator/GridControl.vb

@@ -144,8 +144,16 @@ Namespace ControlCreator
                 Return oEditor
             End If
         End Function
+        ' Hilfsroutine: passt NUR das Summary-Item an (ohne FormatInfo)
+        Private Sub ApplyCurrencySummaryFormat(oCol As GridColumn, currencySymbol As String)
+            oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
+            ' Variante A: Standard-Währungsformat aus aktueller Kultur
+            ' oCol.SummaryItem.DisplayFormat = "SUM: {0:C2}"
 
-        Public Sub ConfigureViewColumns(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl)
+            ' Variante B: Kulturunabhängig, Symbol explizit anhängen
+            oCol.SummaryItem.DisplayFormat = $"SUM: {{0:N2}} {currencySymbol}"
+        End Sub
+        Public Sub ConfigureViewColumns(pColumnTable As DataTable, pGridView As GridView, pGrid As DevExpress.XtraGrid.GridControl, pcurrencySymbol As String)
             Dim oShouldDisplayFooter As Boolean = False
 
 
@@ -192,8 +200,7 @@ Namespace ControlCreator
                         oShouldDisplayFooter = True
 
                     Case Constants.AGGREGATE_TOTAL_CURRENCY
-                        oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum
+                        ApplyCurrencySummaryFormat(oCol, pcurrencySymbol)
-                        oCol.SummaryItem.DisplayFormat = "SUM: {0:C2}"
                         oShouldDisplayFooter = True
 
                     Case Constants.AGGREGATE_TOTAL_AVG

app/TaskFlow/DD_DMSLiteDataSet.Designer.vb

@@ -4587,6 +4587,8 @@ Partial Public Class DD_DMSLiteDataSet
         
         Private columnBACKCOLOR_IF As Global.System.Data.DataColumn
         
+        Private columnTEXT_ALIGNMENT As Global.System.Data.DataColumn
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub New()
@@ -4966,6 +4968,14 @@ Partial Public Class DD_DMSLiteDataSet
             End Get
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public ReadOnly Property TEXT_ALIGNMENTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnTEXT_ALIGNMENT
+            End Get
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
          Global.System.ComponentModel.Browsable(false)>  _
@@ -5045,9 +5055,10 @@ Partial Public Class DD_DMSLiteDataSet
                     ByVal TABLE_ORDER_COLUMN As String,  _
                     ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
                     ByVal FORMAT_STRING As String,  _
-                    ByVal BACKCOLOR_IF As String) As TBPM_PROFILE_CONTROLSRow
+                    ByVal BACKCOLOR_IF As String,  _
+                    ByVal TEXT_ALIGNMENT As String) As TBPM_PROFILE_CONTROLSRow
             Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, BACKCOLOR_IF}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, BACKCOLOR_IF, TEXT_ALIGNMENT}
             If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then
                 columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0)
             End If
@@ -5122,6 +5133,7 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnSAVE_CHANGE_ON_ENABLED = MyBase.Columns("SAVE_CHANGE_ON_ENABLED")
             Me.columnFORMAT_STRING = MyBase.Columns("FORMAT_STRING")
             Me.columnBACKCOLOR_IF = MyBase.Columns("BACKCOLOR_IF")
+            Me.columnTEXT_ALIGNMENT = MyBase.Columns("TEXT_ALIGNMENT")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5213,6 +5225,8 @@ Partial Public Class DD_DMSLiteDataSet
             MyBase.Columns.Add(Me.columnFORMAT_STRING)
             Me.columnBACKCOLOR_IF = New Global.System.Data.DataColumn("BACKCOLOR_IF", GetType(String), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.columnBACKCOLOR_IF)
+            Me.columnTEXT_ALIGNMENT = New Global.System.Data.DataColumn("TEXT_ALIGNMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnTEXT_ALIGNMENT)
             Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
             Me.columnGUID.AutoIncrement = true
             Me.columnGUID.AllowDBNull = false
@@ -5260,6 +5274,9 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnTABLE_ORDER_COLUMN.MaxLength = 250
             Me.columnSAVE_CHANGE_ON_ENABLED.AllowDBNull = false
             Me.columnFORMAT_STRING.AllowDBNull = false
+            Me.columnTEXT_ALIGNMENT.AllowDBNull = false
+            Me.columnTEXT_ALIGNMENT.DefaultValue = CType("Near",String)
+            Me.columnTEXT_ALIGNMENT.MaxLength = 20
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -12568,6 +12585,17 @@ Partial Public Class DD_DMSLiteDataSet
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
+        Public Property TEXT_ALIGNMENT() As String
+            Get
+                Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Property TBPM_PROFILERow() As TBPM_PROFILERow
@@ -20284,6 +20312,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             tableMapping.ColumnMappings.Add("TABLE_ORDER_COLUMN", "TABLE_ORDER_COLUMN")
             tableMapping.ColumnMappings.Add("SAVE_CHANGE_ON_ENABLED", "SAVE_CHANGE_ON_ENABLED")
             tableMapping.ColumnMappings.Add("FORMAT_STRING", "FORMAT_STRING")
+            tableMapping.ColumnMappings.Add("TEXT_ALIGNMENT", "TEXT_ALIGNMENT")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -20298,19 +20327,19 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "T_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VK"& _ 
                 "T_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE"& _ 
                 "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, "& _ 
-                "FORMAT_STRING)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_"& _ 
+                "FORMAT_STRING, TEXT_ALIGNMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL"& _ 
-                "LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATI"& _ 
+                "_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAM"& _ 
-                "ON,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FO"& _ 
+                "E,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH"& _ 
-                "NT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULT"& _ 
+                ",@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEF"& _ 
-                "ISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_D"& _ 
+                "AULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,"& _ 
-                "E,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FO"& _ 
+                "@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANG"& _ 
-                "RMAT_STRING);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y"& _ 
+                "E_ON_ENABLED,@FORMAT_STRING,@TEXT_ALIGNMENT);      "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAM"& _ 
-                "_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDAT"& _ 
+                "E, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ 
-                "ION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, F"& _ 
+                "ED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEF"& _ 
-                "ONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MUL"& _ 
+                "UNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, L"& _ 
-                "TISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_"& _ 
+                "OAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VA"& _ 
-                "DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) "& _ 
+                "LUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS"& _ 
-                "ORDER BY Y_LOC, X_LOC"
+                " WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20348,6 +20377,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
             Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                PROFIL_ID = @PROFIL_ID, NA"& _ 
@@ -20363,14 +20393,14 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "CH = @REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_"& _ 
                 "DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 ="& _ 
                 " @SQL2, SQL_ENABLE = @SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SAVE_CHANGE_ON_ENAB"& _ 
-                "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUI"& _ 
+                "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = "& _ 
-                "D = @Original_GUID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_"& _ 
+                "@TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL"& _ 
-                "LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, V"& _ 
+                "_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WH"& _ 
-                "ALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_ST"& _ 
+                "O, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UE"& _ 
-                "YLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALU"& _ 
+                "BERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ"& _ 
-                "E, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_ME"& _ 
+                "_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MUL"& _ 
-                "SSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER"& _ 
+                "TIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_"& _ 
-                " BY Y_LOC, X_LOC"
+                "CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20405,6 +20435,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
@@ -20430,8 +20461,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "             REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL"& _ 
                 "2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, C"& _ 
                 "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENA"& _ 
-                "BLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID ="& _ 
+                "BLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHER"& _ 
-                " @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "E        (GUID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
@@ -20480,18 +20511,20 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._commandCollection(8) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(8).Connection = Me.Connection
             Me._commandCollection(8).CommandText = "INSERT INTO TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (PROFIL_ID, NAME, CTR"& _ 
-                "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROF"& _ 
+                "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALU"& _ 
-                "IL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width)"
+                "ES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIG"& _ 
+                "HT,@Width,@TEXT_ALIGNMENT)"
             Me._commandCollection(8).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Width", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(9) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(9).Connection = Me.Connection
             Me._commandCollection(9).CommandText = "UPDATE       TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET               INDEX_NAME = @INDEX_NAME,CH"& _ 
@@ -20511,8 +20544,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "P, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, I"& _ 
                 "MAGE_CONTROL, SQL2, SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SET_CONTROL_DATA, SQL"& _ 
                 "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, S"& _ 
-                "AVE_CHANGE_ON_ENABLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS AS T"& _ 
+                "AVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFI"& _ 
-                ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "LE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
             Me._commandCollection(10).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@profil_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20669,7 +20702,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     ByVal SQL2 As String,  _
                     ByVal SQL_ENABLE As String,  _
                     ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
-                    ByVal FORMAT_STRING As String) As Integer
+                    ByVal FORMAT_STRING As String,  _
+                    ByVal TEXT_ALIGNMENT As String) As Integer
             Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
             If (NAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("NAME")
@@ -20798,6 +20832,11 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.InsertCommand.Parameters(35).Value = CType(FORMAT_STRING,String)
             End If
+            If (TEXT_ALIGNMENT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                Me.Adapter.InsertCommand.Parameters(36).Value = CType(TEXT_ALIGNMENT,String)
+            End If
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -20851,6 +20890,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     ByVal SQL_ENABLE As String,  _
                     ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
                     ByVal FORMAT_STRING As String,  _
+                    ByVal TEXT_ALIGNMENT As String,  _
                     ByVal Original_GUID As Integer,  _
                     ByVal GUID As Integer) As Integer
             Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
@@ -20970,8 +21010,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(32).Value = CType(FORMAT_STRING,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_GUID,Integer)
+            If (TEXT_ALIGNMENT Is Nothing) Then
-            Me.Adapter.UpdateCommand.Parameters(34).Value = CType(GUID,Integer)
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(33).Value = CType(TEXT_ALIGNMENT,String)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(35).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -21184,9 +21229,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, false)>  _
+        Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short, ByVal TEXT_ALIGNMENT As String) As Integer
-        Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short) As Integer
             Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8)
             command.Parameters(0).Value = CType(PROFIL_ID,Integer)
             If (NAME Is Nothing) Then
@@ -21213,6 +21257,11 @@ Namespace DD_DMSLiteDataSetTableAdapters
             End If
             command.Parameters(7).Value = CType(HEIGHT,Short)
             command.Parameters(8).Value = CType(Width,Short)
+            If (TEXT_ALIGNMENT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT")
+            Else
+                command.Parameters(9).Value = CType(TEXT_ALIGNMENT,String)
+            End If
             Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
             If ((command.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then

app/TaskFlow/DD_DMSLiteDataSet.xsd

@@ -972,8 +972,8 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                     <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
                          (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, 
                          HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, 
-                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING)
+                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT)
-VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FORMAT_STRING);     
+VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FORMAT_STRING,@TEXT_ALIGNMENT);      
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1012,6 +1012,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                       <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -1020,7 +1021,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                     <CommandText>SELECT        GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, 
                          SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, 
                          REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, 
-                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING
+                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT
 FROM            TBPM_PROFILE_CONTROLS
 WHERE        (GUID = @guid)
 ORDER BY Y_LOC, X_LOC</CommandText>
@@ -1037,8 +1038,8 @@ SET                PROFIL_ID = @PROFIL_ID, NAME = @NAME, CTRL_TYPE = @CTRL_TYPE,
                          FONT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_SIZE, FONT_FAMILY = @FONT_FAMILY, FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, 
                          DEFAULT_VALUE = @DEFAULT_VALUE, MULTISELECT = @MULTISELECT, VKT_ADD_ITEM = @VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES = @VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH = @REGEX_MATCH, 
                          REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 = @SQL2, SQL_ENABLE = @SQL_ENABLE, 
-                         SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING
+                         SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = @TEXT_ALIGNMENT
-WHERE        (GUID = @Original_GUID);    
+WHERE        (GUID = @Original_GUID);     
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1074,6 +1075,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                       <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -1124,6 +1126,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
               <Mapping SourceColumn="TABLE_ORDER_COLUMN" DataSetColumn="TABLE_ORDER_COLUMN" />
               <Mapping SourceColumn="SAVE_CHANGE_ON_ENABLED" DataSetColumn="SAVE_CHANGE_ON_ENABLED" />
               <Mapping SourceColumn="FORMAT_STRING" DataSetColumn="FORMAT_STRING" />
+              <Mapping SourceColumn="TEXT_ALIGNMENT" DataSetColumn="TEXT_ALIGNMENT" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdControlExists" Modifier="Public" Name="cmdControlExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cmdControlExists">
@@ -1211,7 +1214,7 @@ WHERE        (GUID = @Guid)</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
@@ -1230,6 +1233,25 @@ VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
+                         (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT)
+VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width,@TEXT_ALIGNMENT)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Width" ColumnName="WIDTH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@Width" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
               </DbSource>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdUpdateIndexname" Modifier="Public" Name="cmdUpdateIndexname" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="cmdUpdateIndexname">
                 <UpdateCommand>
@@ -1251,7 +1273,7 @@ WHERE        (GUID = @Original_GUID);</CommandText>
                     <CommandText>SELECT        dbo.FNPM_LANGUAGE_CONTROL_TEXT(NAME, @USER_LANGUAGE, CTRL_TYPE, CTRL_TEXT) AS CTRL_CAPTION_LANG, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, 
                          CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, 
                          REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, IMAGE_CONTROL, SQL2, SQL_ENABLE, 
-                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING
+                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT
 FROM            TBPM_PROFILE_CONTROLS AS T
 WHERE        (PROFIL_ID = @profil_id)
 ORDER BY Y_LOC, X_LOC</CommandText>
@@ -2667,6 +2689,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
               <xs:element name="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnPropNameInTable="SAVE_CHANGE_ON_ENABLEDColumn" msprop:Generator_ColumnPropNameInRow="SAVE_CHANGE_ON_ENABLED" msprop:Generator_UserColumnName="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnVarNameInTable="columnSAVE_CHANGE_ON_ENABLED" type="xs:boolean" />
               <xs:element name="FORMAT_STRING" msprop:Generator_ColumnPropNameInTable="FORMAT_STRINGColumn" msprop:Generator_ColumnPropNameInRow="FORMAT_STRING" msprop:Generator_UserColumnName="FORMAT_STRING" msprop:Generator_ColumnVarNameInTable="columnFORMAT_STRING" type="xs:string" />
               <xs:element name="BACKCOLOR_IF" msprop:Generator_ColumnPropNameInTable="BACKCOLOR_IFColumn" msprop:Generator_ColumnPropNameInRow="BACKCOLOR_IF" msprop:Generator_UserColumnName="BACKCOLOR_IF" msprop:Generator_ColumnVarNameInTable="columnBACKCOLOR_IF" type="xs:string" minOccurs="0" />
+              <xs:element name="TEXT_ALIGNMENT" msprop:Generator_UserColumnName="TEXT_ALIGNMENT" msprop:Generator_ColumnPropNameInTable="TEXT_ALIGNMENTColumn" msprop:Generator_ColumnPropNameInRow="TEXT_ALIGNMENT" msprop:Generator_ColumnVarNameInTable="columnTEXT_ALIGNMENT" default="Near">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

app/TaskFlow/DD_DMSLiteDataSet.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-27" ViewPortY="-97" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-27" ViewPortY="91" 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/ModuleControlProperties.vb

@@ -2,6 +2,7 @@
 Imports System.ComponentModel.Design
 Imports System.Drawing.Design
 Imports System.Globalization
+Imports DevExpress.XtraPrinting.Native
 Imports DigitalData.Modules.Language.Utils
 
 Public Module ModuleControlProperties
@@ -69,6 +70,35 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_DISPLAY)>
         Public Property TextColor As Color
 
+        <DisplayName("Text Alignement")>
+        <Category(ClassConstants.CAT_DISPLAY)>
+        <TypeConverter(GetType(TextAlignmentConverter))>
+        Public Property TextAlignment As String
+        ' Converter für Dropdown-Werte Near/Center/Far
+        Public Class TextAlignmentConverter
+            Inherits TypeConverter
+
+            Public Overrides Function GetStandardValuesSupported(context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            ' Optional: True, damit nur die vorgegebenen Werte erlaubt sind
+            Public Overrides Function GetStandardValuesExclusive(context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection
+                Dim values = New List(Of String) From {"Near", "Center", "Far"}
+                Return New StandardValuesCollection(values)
+            End Function
+
+            Public Overrides Function ConvertTo(context As ITypeDescriptorContext, culture As CultureInfo, value As Object, destinationType As Type) As Object
+                If destinationType Is GetType(String) Then
+                    Return If(value Is Nothing, "", value.ToString())
+                End If
+                Return MyBase.ConvertTo(context, culture, value, destinationType)
+            End Function
+        End Class
         Class FontConverter
             Inherits TypeConverter
 
@@ -124,7 +154,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_DATA)>
         Public Property SQLCommand() As SQLValue
             Get
-                Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_sql_command, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _sql_command = value.Value
@@ -150,7 +180,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Enable_SQL = value.Value
@@ -163,7 +193,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL_OnLoad() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL_ONLOAD, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Enable_SQL_ONLOAD = value.Value
@@ -335,7 +365,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_DISPLAY)>
         Public Property CtrlImage() As ImageValue
             Get
-                Return New ImageValue(NotNull(_image_Value, ""))
+                Return New ImageValue(ClassAllgemeineFunktionen.NotNullString(_image_Value, ""))
             End Get
             Set(ByVal value As ImageValue)
                 _image_Value = value.Value
@@ -346,7 +376,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_VALIDATION)>
         Public Property Override_SQL() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Override_SQL, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Override_SQL = value.Value

app/TaskFlow/ModuleRuntimeVariables.vb

@@ -32,10 +32,15 @@ Module ModuleRuntimeVariables
     Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
     Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable
 
+    Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
+
+
+
     Public Property CURRENT_ProfilGUID As Integer
     Public Property CURRENT_ProfilName As String
     Public Property CURRENT_PROFILE_LOG_INDEX As String
     Public Property PROFILE_SHOW_DOCUMENT As Boolean = True
+    Public Property PROFILE_NOT_RESP_COMMENT As Boolean = True
 
     Public Property CURRENT_DOC_GUID As Int64
     Public Property CURRENT_DOC_ID As Int64

app/TaskFlow/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("2.7.4.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>

app/TaskFlow/My Project/Settings.Designer.vb

@@ -156,7 +156,7 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("563")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("513")>  _
         Public Property frmValSearchSplitterDistance() As Integer
             Get
                 Return CType(Me("frmValSearchSplitterDistance"),Integer)

app/TaskFlow/My Project/Settings.settings

@@ -27,7 +27,7 @@
       <Value Profile="(Default)">0, 0</Value>
     </Setting>
     <Setting Name="frmValSearchSplitterDistance" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">563</Value>
+      <Value Profile="(Default)">513</Value>
     </Setting>
     <Setting Name="frmMainWindowState" Type="System.String" Scope="User">
       <Value Profile="(Default)">Normal</Value>

app/TaskFlow/README.txt

@@ -1,5 +0,0 @@
-BASE MODULE
-===========
-
-This module is intended for often used constants and datastructures.
-Therefor it is important that this module does not have any dependencies on other modules!!

app/TaskFlow/TaskFlow.vbproj

@@ -77,14 +77,16 @@
   <PropertyGroup>
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <ItemGroup> 
+      <GdPictureAssemblies Include="$(SolutionDir)lib\GdPicture14*.dll" /> 
+  </ItemGroup> 
+    <Target Name="CopyGdPictureDlls" AfterTargets="Build"> 
+      <Copy SourceFiles="@(GdPictureAssemblies)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" /> 
+    </Target>
   <ItemGroup>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
-    </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -149,7 +151,8 @@
       <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">
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Controls.LookupGrid">
@@ -158,48 +161,43 @@
     <Reference Include="DigitalData.Controls.SnapPanel">
       <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.GUIs.Common, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Interfaces, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll</HintPath>
-    <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.License">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
-    <Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -386,8 +384,8 @@
     </Reference>
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
@@ -547,12 +545,6 @@
     <Compile Include="frmColumn_Detail.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmDashboard1.Designer.vb">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmDashboard1.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmDesignerLayout.Designer.vb">
       <DependentUpon>frmDesignerLayout.vb</DependentUpon>
     </Compile>
@@ -810,10 +802,6 @@
       <DependentUpon>frmColumn_Detail.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmDashboard1.resx">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmDesignerLayout.resx">
       <DependentUpon>frmDesignerLayout.vb</DependentUpon>
       <SubType>Designer</SubType>
@@ -1244,22 +1232,6 @@
     <None Include="Changelog.md" />
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
     <Content Include="DD_taskFLOW_ICON.ico" />
-    <Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
-    <Content Include="GdPicture.NET.14.barcode.1d.reader.dll" />
-    <Content Include="GdPicture.NET.14.barcode.2d.reader.64.dll" />
-    <Content Include="GdPicture.NET.14.barcode.2d.reader.dll" />
-    <Content Include="GdPicture.NET.14.filters.64.dll" />
-    <Content Include="GdPicture.NET.14.filters.dll" />
-    <Content Include="GdPicture.NET.14.image.gdimgplug.64.dll" />
-    <Content Include="GdPicture.NET.14.image.gdimgplug.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.ML.64.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.ML.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
-    <Content Include="GdPicture.NET.14.machine.vision.64.dll" />
-    <Content Include="GdPicture.NET.14.machine.vision.dll" />
-    <Content Include="GdPicture.NET.14.twain.client.64.dll" />
-    <Content Include="GdPicture.NET.14.twain.client.dll" />
     <Content Include="MailLicense.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1287,7 +1259,6 @@
     <None Include="Resources\DD_taskFLOW_BOOT.png" />
     <None Include="Resources\DD_taskFLOW_ICON.png" />
     <None Include="Resources\AttachFileHS.png" />
-    <Content Include="README.txt" />
     <Content Include="task.ico" />
     <None Include="Resources\searchFlow_icon.png" />
     <None Include="Resources\taskFlow_icon.png" />
@@ -1360,16 +1331,16 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.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.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

@@ -198,9 +198,10 @@ Public Class clsPatterns
 
             While ContainsPattern(oResult, PATTERN_CTRL)
                 If oTryCounter > MAX_TRY_COUNT Then
-                    LOGGER.Warn($"Max tries in ReplaceControlValues exceeded - Replacing with [0]")
+                    LOGGER.Info($"Max tries in ReplaceControlValues exceeded - Replacing PATTERN_CTRL [{PATTERN_CTRL}] with [0]")
+                    LOGGER.Info($"oResult so far is:{oResult}")
                     oResult = ReplacePattern(oResult, PATTERN_CTRL, 0)
-                    Throw New Exception($"Max tries in ReplaceControlValues exceeded - Result so far [{oResult}].")
+                    Exit While
                 End If
 
                 Dim oControlName As String = GetNextPattern(oResult, PATTERN_CTRL).Value
@@ -224,14 +225,14 @@ Public Class clsPatterns
 
                         Case GetType(TextEdit)
                             Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, TextEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty)
                             Catch ex As Exception
                                 LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                 oReplaceValue = ""
                             End Try
                         Case GetType(MemoEdit)
                             Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
                             Catch ex As Exception
                                 LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                 oReplaceValue = ""
@@ -255,9 +256,8 @@ Public Class clsPatterns
                             ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then
                                 LOGGER.Debug($"LookupControl3 mit genau einem Value")
                                 oReplaceValue = oLookupControl3.Properties.SelectedValues(0)
-
                             Else
-                                LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
+                                '    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}")

app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb

@@ -40,6 +40,7 @@ Partial Class frmAdmin_notResponsibleConfig
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.cmbAttrComment = New System.Windows.Forms.ComboBox()
+        Me.checkCommentMuss = New System.Windows.Forms.CheckBox()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -193,11 +194,22 @@ Partial Class frmAdmin_notResponsibleConfig
         Me.cmbAttrComment.Size = New System.Drawing.Size(295, 24)
         Me.cmbAttrComment.TabIndex = 106
         '
+        'checkCommentMuss
+        '
+        Me.checkCommentMuss.AutoSize = True
+        Me.checkCommentMuss.Location = New System.Drawing.Point(548, 259)
+        Me.checkCommentMuss.Name = "checkCommentMuss"
+        Me.checkCommentMuss.Size = New System.Drawing.Size(208, 17)
+        Me.checkCommentMuss.TabIndex = 110
+        Me.checkCommentMuss.Text = "Begründung muss eingetragen werden"
+        Me.checkCommentMuss.UseVisualStyleBackColor = True
+        '
         'frmAdmin_notResponsibleConfig
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(778, 340)
+        Me.Controls.Add(Me.checkCommentMuss)
         Me.Controls.Add(Me.Label9)
         Me.Controls.Add(Me.cmbAttrComment)
         Me.Controls.Add(Me.txtPROFILE_NOT_RESPONSIBLE_QUEST)
@@ -236,4 +248,5 @@ Partial Class frmAdmin_notResponsibleConfig
     Friend WithEvents Label2 As Label
     Friend WithEvents Label9 As Label
     Friend WithEvents cmbAttrComment As ComboBox
+    Friend WithEvents checkCommentMuss As CheckBox
 End Class

app/TaskFlow/frmAdmin_notResponsibleConfig.resx

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

app/TaskFlow/frmAdmin_notResponsibleConfig.vb

@@ -21,12 +21,18 @@ Public Class frmAdmin_notResponsibleConfig
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}"
+        Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_COMMENT = '{checkCommentMuss.Checked}', NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}"
         If DatabaseECM.ExecuteNonQuery(oUpd) = True Then
             oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_QUEST','{txtPROFILE_NOT_RESPONSIBLE_QUEST.Text}','','{USER_USERNAME}','{oProfilID}',0"
+            LOGGER.Debug($"oUpd: {oUpd}")
             If DatabaseECM.ExecuteNonQuery(oUpd) Then
-                oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_REJECTION_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_REJECTION_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
+
-                bstitmInfo.Caption = "Data saved successfully - " + Now.ToString
+                oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
+                If DatabaseECM.ExecuteNonQuery(oUpd) Then
+                    bstitmInfo.Caption = "Data saved successfully - " + Now.ToString
+                    LOGGER.Debug($"oUpd: {oUpd}")
+                End If
+
 
 
             End If
@@ -38,10 +44,11 @@ Public Class frmAdmin_notResponsibleConfig
     Private Sub frmAdmin_notResponsibleConfig_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             Dim oNR_Act_Attr As String
-            Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE FROM TBPM_PROFILE WHERE GUID = {oProfilID}"
+            Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE,NOT_RESP_COMMENT FROM TBPM_PROFILE WHERE GUID = {oProfilID}"
             Dim oDT = DatabaseECM.GetDatatable(oSQL)
             oNotResponsible_SQL = oDT.Rows(0).Item("NOT_RESP_SQL")
             oNR_Act_Attr = oDT.Rows(0).Item("NOT_RESP_COMMENT_ATTRIBUTE")
+            checkCommentMuss.Checked = oDT.Rows(0).Item("NOT_RESP_COMMENT")
             LOGGER.Debug($"oNR_Act_Attr: {oNR_Act_Attr}")
 
 

app/TaskFlow/frmAdministration.vb

@@ -674,17 +674,17 @@ Public Class frmAdministration
             pgFinalIndexes.SelectedObject = Nothing
 
             Dim guid As Integer = focusedRow.Item("GUID")
-            Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
+            Dim index As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("INDEXNAME"), Nothing)
-            Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "")
+            Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SQL_COMMAND"), "")
-            ' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
+            ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONNECTION_ID"), 0)
-            Dim value As String = NotNull(focusedRow.Item("VALUE"), "")
+            Dim value As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("VALUE"), "")
-            Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True)
+            Dim active As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ACTIVE"), True)
-            Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "")
+            Dim description As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("DESCRIPTION"), "")
-            Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False)
+            Dim preventDuplicates As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("PREVENT_DUPLICATES"), False)
-            Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False)
+            Dim allowNewValues As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ALLOW_NEW_VALUES"), False)
-            Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
+            Dim VectorBehaviour As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
-            Dim oSequence As Int16 = NotNull(focusedRow.Item("SEQUENCE"), 0)
+            Dim oSequence As Int16 = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SEQUENCE"), 0)
-            Dim oIndetermined As Boolean = NotNull(focusedRow.Item("CONTINUE_INDETERMINED"), False)
+            Dim oIndetermined As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONTINUE_INDETERMINED"), False)
             CURRENT_INDEX_ID = guid
 
             Dim obj As New FinalIndexProperties With {
@@ -1074,25 +1074,25 @@ Public Class frmAdministration
                 Else
                     value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex)
                 End If
-                value = NotNull(value, String.Empty)
+                value = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
 
                 Dim guid = obj.GUID
                 Dim oProfileId As Integer = PROFILGUIDTextBox.Text
                 focusedRowHandle = 199
                 focusedRowHandle = viewFinalIndex.FocusedRowHandle
                 'Dim connectionId As Integer = obj.ConnectionId
-                ' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
+                ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.ConnectionId, 1)
-                Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
+                Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
 
-                Dim indexName As String = NotNull(obj.IndexName, String.Empty)
+                Dim indexName As String = ClassAllgemeineFunktionen.NotNullString(obj.IndexName, String.Empty)
                 Dim isVectorIndex As Boolean = obj.VectorIndex
                 Dim addedWho As String = USER_USERNAME
                 Dim description As String = obj.Description
                 Dim active As Integer = IIf(obj.Active, 1, 0)
                 Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0)
                 Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0)
-                Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty)
+                Dim IF_VEKTOR_BEHAVIOUR As String = ClassAllgemeineFunktionen.NotNullString(obj.VectorBehaviour, String.Empty)
-                Dim oDescription As String = NotNull(obj.Description, String.Empty)
+                Dim oDescription As String = ClassAllgemeineFunktionen.NotNullString(obj.Description, String.Empty)
                 Dim oSequence As Integer = obj.Sequence
                 Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState
                 If indexName = String.Empty Then

app/TaskFlow/frmConnection.vb

@@ -330,7 +330,6 @@ Public Class frmConnection
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical)
-            DD_LIB_Standards.clsLogger.Add("Error while loading Databases:" & ex.Message)
         Finally
             Me.Cursor = Cursors.Default
         End Try

app/TaskFlow/frmDashboard1.Designer.vb

@@ -1,231 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmDashboard1
-    Inherits DevExpress.XtraEditors.XtraForm
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing AndAlso components IsNot Nothing Then
-            components.Dispose()
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Me.TileBar1 = New DevExpress.XtraBars.Navigation.TileBar()
-        Me.TileBarGroup2 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem1 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarItem2 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarGroup3 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem3 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.NavigationPane1 = New DevExpress.XtraBars.Navigation.NavigationPane()
-        Me.NavigationPage1 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.NavigationPage2 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.RadialMenu1 = New DevExpress.XtraBars.Ribbon.RadialMenu(Me.components)
-        Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
-        Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.NavigationPane1.SuspendLayout()
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TileBar1
-        '
-        Me.TileBar1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.TileBar1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        Me.TileBar1.Groups.Add(Me.TileBarGroup2)
-        Me.TileBar1.Groups.Add(Me.TileBarGroup3)
-        Me.TileBar1.Location = New System.Drawing.Point(0, 0)
-        Me.TileBar1.MaxId = 3
-        Me.TileBar1.Name = "TileBar1"
-        Me.TileBar1.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons
-        Me.TileBar1.Size = New System.Drawing.Size(796, 133)
-        Me.TileBar1.TabIndex = 0
-        Me.TileBar1.Text = "TileBar1"
-        '
-        'TileBarGroup2
-        '
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem1)
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem2)
-        Me.TileBarGroup2.Name = "TileBarGroup2"
-        Me.TileBarGroup2.Text = "Gruppe 1"
-        '
-        'TileBarItem1
-        '
-        Me.TileBarItem1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement1.Text = "TileBarItem1"
-        Me.TileBarItem1.Elements.Add(TileItemElement1)
-        Me.TileBarItem1.Id = 0
-        Me.TileBarItem1.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem1.Name = "TileBarItem1"
-        '
-        'TileBarItem2
-        '
-        Me.TileBarItem2.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement2.Text = "TileBarItem2"
-        Me.TileBarItem2.Elements.Add(TileItemElement2)
-        Me.TileBarItem2.Id = 1
-        Me.TileBarItem2.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Wide
-        Me.TileBarItem2.Name = "TileBarItem2"
-        '
-        'TileBarGroup3
-        '
-        Me.TileBarGroup3.Items.Add(Me.TileBarItem3)
-        Me.TileBarGroup3.Name = "TileBarGroup3"
-        Me.TileBarGroup3.Text = "Gruppe 2"
-        '
-        'TileBarItem3
-        '
-        Me.TileBarItem3.AppearanceItem.Normal.BackColor = System.Drawing.Color.DarkTurquoise
-        Me.TileBarItem3.AppearanceItem.Normal.Options.UseBackColor = True
-        Me.TileBarItem3.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement3.Text = "TileBarItem3"
-        Me.TileBarItem3.Elements.Add(TileItemElement3)
-        Me.TileBarItem3.Id = 2
-        Me.TileBarItem3.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem3.Name = "TileBarItem3"
-        '
-        'NavigationPane1
-        '
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage1)
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage2)
-        Me.NavigationPane1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.NavigationPane1.Location = New System.Drawing.Point(0, 343)
-        Me.NavigationPane1.Name = "NavigationPane1"
-        Me.NavigationPane1.Pages.AddRange(New DevExpress.XtraBars.Navigation.NavigationPageBase() {Me.NavigationPage1, Me.NavigationPage2})
-        Me.NavigationPane1.RegularSize = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.SelectedPage = Me.NavigationPage1
-        Me.NavigationPane1.Size = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.TabIndex = 1
-        Me.NavigationPane1.Text = "NavigationPane1"
-        '
-        'NavigationPage1
-        '
-        Me.NavigationPage1.Caption = "NavigationPage1"
-        Me.NavigationPage1.Name = "NavigationPage1"
-        Me.NavigationPage1.Size = New System.Drawing.Size(660, 77)
-        '
-        'NavigationPage2
-        '
-        Me.NavigationPage2.Caption = "NavigationPage2"
-        Me.NavigationPage2.Name = "NavigationPage2"
-        Me.NavigationPage2.PageText = "sdsdsd"
-        Me.NavigationPage2.Size = New System.Drawing.Size(660, 77)
-        '
-        'RadialMenu1
-        '
-        Me.RadialMenu1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2)})
-        Me.RadialMenu1.Manager = Me.BarManager1
-        Me.RadialMenu1.Name = "RadialMenu1"
-        '
-        'BarManager1
-        '
-        Me.BarManager1.DockControls.Add(Me.barDockControlTop)
-        Me.BarManager1.DockControls.Add(Me.barDockControlBottom)
-        Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
-        Me.BarManager1.DockControls.Add(Me.barDockControlRight)
-        Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem1, Me.BarButtonItem2})
-        Me.BarManager1.MaxItemId = 2
-        '
-        'barDockControlTop
-        '
-        Me.barDockControlTop.CausesValidation = False
-        Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
-        Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlBottom
-        '
-        Me.barDockControlBottom.CausesValidation = False
-        Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 493)
-        Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlLeft
-        '
-        Me.barDockControlLeft.CausesValidation = False
-        Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
-        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 493)
-        '
-        'barDockControlRight
-        '
-        Me.barDockControlRight.CausesValidation = False
-        Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(796, 0)
-        Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 493)
-        '
-        'BarButtonItem1
-        '
-        Me.BarButtonItem1.Caption = "BarButtonItem1"
-        Me.BarButtonItem1.Id = 0
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
-        'BarButtonItem2
-        '
-        Me.BarButtonItem2.Caption = "BarButtonItem2"
-        Me.BarButtonItem2.Id = 1
-        Me.BarButtonItem2.Name = "BarButtonItem2"
-        '
-        'frmDashboard1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(796, 493)
-        Me.Controls.Add(Me.NavigationPane1)
-        Me.Controls.Add(Me.TileBar1)
-        Me.Controls.Add(Me.barDockControlLeft)
-        Me.Controls.Add(Me.barDockControlRight)
-        Me.Controls.Add(Me.barDockControlBottom)
-        Me.Controls.Add(Me.barDockControlTop)
-        Me.Name = "frmDashboard1"
-        Me.Text = "frmDashboard1"
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.NavigationPane1.ResumeLayout(False)
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-
-    Friend WithEvents TileBar1 As DevExpress.XtraBars.Navigation.TileBar
-    Friend WithEvents TileBarGroup2 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem1 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarItem2 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarGroup3 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem3 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents NavigationPane1 As DevExpress.XtraBars.Navigation.NavigationPane
-    Friend WithEvents NavigationPage1 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents NavigationPage2 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents RadialMenu1 As DevExpress.XtraBars.Ribbon.RadialMenu
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
-    Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl
-End Class

app/TaskFlow/frmDashboard1.resx

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="RadialMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>140, 17</value>
-  </metadata>
-</root>

app/TaskFlow/frmDashboard1.vb

@@ -1,3 +0,0 @@
-Public Class frmDashboard1
-
-End Class

app/TaskFlow/frmFormDesigner.vb

@@ -1,12 +1,10 @@
 Imports System.ComponentModel
-Imports DD_LIB_Standards
+
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
-Imports DigitalData.Modules.Language
 Imports System.Drawing
 Imports DigitalData.GUIs.Common
 Imports DevExpress.Utils.Filtering.Internal
@@ -52,7 +50,7 @@ Public Class frmFormDesigner
             ORDER BY NAME"
         )
         CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable().
-            Select(Function(row) row.ItemEx("NAME", String.Empty)).
+            Select(Function(row) ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), String.Empty)).
             ToList()
         _Logger.debug("Reloading control name list done!")
     End Sub
@@ -79,7 +77,7 @@ Public Class frmFormDesigner
             '  Try
             ' Windream initialisieren
             If IDB_ACTIVE = False Then
-                clsWindream.Create_Session()
+                'clsWindream.Create_Session()
                 bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             Else
                 bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@@ -90,7 +88,7 @@ Public Class frmFormDesigner
             Dim unsortedIndicies
             Dim sortedIndicies As List(Of String)
             If IDB_ACTIVE = False Then
-                unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+                unsortedIndicies = WINDREAM_MOD.GetIndiciesByObjecttype(CURRENT_OBJECTTYPE).ToList()
                 sortedIndicies = unsortedIndicies '.OrderBy(Function(index As String) index).ToList()
                 sortedIndicies = sortedIndicies.OrderBy(Function(index As String) index).ToList
             Else
@@ -112,7 +110,7 @@ Public Class frmFormDesigner
             If IDB_ACTIVE = False Then
                 Windream_ChoiceLists = New List(Of String)
                 Windream_ChoiceLists.Add(String.Empty)
-                Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists())
+                Windream_ChoiceLists.AddRange(WINDREAM_MOD.GetChoiceLists())
             End If
 
             'Catch ex As Exception
@@ -146,7 +144,7 @@ Public Class frmFormDesigner
             Dim missingIndexControls As New List(Of String)
 
             For Each row As DataRow In dt.Rows
-                If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
+                If ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
                     missingIndexControls.Add(row.Item("NAME"))
                 End If
             Next
@@ -176,7 +174,7 @@ Public Class frmFormDesigner
     Private Function IsVectorIndex(IndexName As String) As Boolean
         Dim oType As Integer
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -185,9 +183,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -195,9 +193,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -205,9 +203,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -215,9 +213,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -225,9 +223,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -248,12 +246,12 @@ Public Class frmFormDesigner
                 Dim name As String = row.Item("NAME")
                 Dim x As Integer = row.Item("X_LOC")
                 Dim y As Integer = row.Item("Y_LOC")
-                Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
+                Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
-                Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
+                Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
-                Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
+                Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
                 Dim family As FontFamily = New FontFamily(familyString)
                 Dim font As New Font(family, size, style, GraphicsUnit.Point)
-                Dim color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), 0))
+                Dim color As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0))
 
 
                 ' Jetzt die Control spezifischen Eigenschaften zuweisen
@@ -297,7 +295,7 @@ Public Class frmFormDesigner
                         Dim oDTColumnsPerDevExGrid As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "FDesignLaodControls")
 
 
-                        Dim table = ControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True)
+                        Dim table = ControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True, "EUR")
 
                         AddHandler table.MouseClick, AddressOf gridControl_MouseClick
                         ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
@@ -581,19 +579,20 @@ Public Class frmFormDesigner
         obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
         obj.Name = row.Item("NAME")
         obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-        obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing)
+        obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
-        obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "")
+        obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")
 
-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
+        Dim oStyle As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
+        Dim oSize As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
+        Dim oFamilyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
-        Dim family As FontFamily = New FontFamily(familyString)
+        Dim oFamily As FontFamily = New FontFamily(oFamilyString)
 
-        obj.Font = New Font(family, size, style)
+        obj.Font = New Font(oFamily, oSize, oStyle)
 
-        Dim color As Integer = NotNull(row.Item("FONT_COLOR"), 0)
+        Dim oColor As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)
 
-        obj.TextColor = IntToColor(color)
+        obj.TextColor = IntToColor(oColor)
+        obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near")
 
         Return obj
     End Function
@@ -614,11 +613,11 @@ Public Class frmFormDesigner
         obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED"))
         obj.Required = StrToBool(row.Item("VALIDATION"))
         obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
-        obj.Index = NotNull(row.Item("INDEX_NAME"), "")
+        obj.Index = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
-        obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing)
+        obj.DefaultValue = ClassAllgemeineFunktionen.NotNullString(row.Item("DEFAULT_VALUE"), Nothing)
-
+        obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near")
         ' Default value for ConnectionID
-        Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
+        Dim oConnectionId = ClassAllgemeineFunktionen.NotNullString(row.Item("CONNECTION_ID"), 0)
         obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
         Return obj
     End Function
@@ -679,9 +678,9 @@ Public Class frmFormDesigner
                 Dim check As CheckBox = sender
                 Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies)
                 checkProps.Text = check.Text
-                checkProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                checkProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                checkProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                checkProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                checkProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                 props = checkProps
             ElseIf TypeOf sender Is LookupControl3 Then
                 Dim oLookup As LookupControl3 = sender
@@ -690,20 +689,20 @@ Public Class frmFormDesigner
                 lookupProps.PreventDuplicates = StrToBool(oRow.Item("VKT_PREVENT_MULTIPLE_VALUES"))
                 lookupProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
                 lookupProps.DisplayAsComboBox = False
-                lookupProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                lookupProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                lookupProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                lookupProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                lookupProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                lookupProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
 
                 props = lookupProps
             ElseIf TypeOf sender Is TextEdit Then
                 'Dim txt As TextEdit = sender
                 Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies)
-                txtProps.Regex = NotNull(oRow.Item("REGEX_MATCH"), String.Empty)
+                txtProps.Regex = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MATCH"), String.Empty)
-                txtProps.RegexMessage = NotNull(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
+                txtProps.RegexMessage = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
-                txtProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                txtProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                txtProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                txtProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                txtProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                txtProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
-                txtProps.DisplayFormat = oRow.ItemEx("FORMAT_STRING", ClassControlCreator.CONTROL_TYPE_TEXT)
+                txtProps.DisplayFormat = ClassAllgemeineFunktionen.NotNullString(oRow.Item("FORMAT_STRING"), ClassControlCreator.CONTROL_TYPE_TEXT)
 
                 props = txtProps
 
@@ -711,18 +710,18 @@ Public Class frmFormDesigner
                 Dim cmb As Windows.Forms.ComboBox = sender
                 Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, oRow, Source_AllIndicies)
                 cmbProps.ChoiceLists = Windream_ChoiceLists
-                cmbProps.ChoiceList = NotNull(oRow.Item("CHOICE_LIST"), String.Empty)
+                cmbProps.ChoiceList = ClassAllgemeineFunktionen.NotNullString(oRow.Item("CHOICE_LIST"), String.Empty)
-                cmbProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                cmbProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                cmbProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                cmbProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                cmbProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                cmbProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                 props = cmbProps
                 cmbProps.DisplayAsLookUpControl = False
 
             ElseIf TypeOf sender Is DateTimePicker Then
                 Dim dtp As DateTimePicker = sender
                 Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, oRow, Source_AllIndicies)
-                dtpProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                dtpProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                dtpProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                dtpProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 props = dtpProps
 
             ElseIf TypeOf sender Is DataGridView Then
@@ -737,17 +736,17 @@ Public Class frmFormDesigner
                 Dim oGridControl As GridControl = sender
                 Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, oRow, Source_VectorIndicies)
                 oGridProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
-                oGridProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                oGridProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                oGridProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oGridProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 props = oGridProps
             ElseIf TypeOf sender Is Button Then
                 Dim oButton As Button = sender
                 Dim oButtonProps As ButtonProperties = CreatePropsObject(New ButtonProperties, oRow, Source_VectorIndicies)
                 oButtonProps.Text = oButton.Text
                 oButtonProps.SQLCommand = New SQLValue(oRow.Item("SQL_UEBERPRUEFUNG"))
-                oButtonProps.Override_SQL = New SQLValue(NotNull(oRow.Item("SQL2"), ""))
+                oButtonProps.Override_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL2"), ""))
-                oButtonProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
+                oButtonProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
-                oButtonProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oButtonProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 If Not IsDBNull(oRow.Item("IMAGE_CONTROL")) Then
                     Dim obimg() As Byte = oRow.Item("IMAGE_CONTROL")
                     Dim oBitmap As Bitmap = ByteArrayToBitmap(obimg)
@@ -907,7 +906,19 @@ Public Class frmFormDesigner
 
             Case "DisplayFormat"
                 UpdateSingleValue("FORMAT_STRING", newValue)
-
+            Case "TextAlignment"
+                UpdateSingleValue("TEXT_ALIGNMENT", newValue)
+                Select Case CurrentControl.GetType()
+                    Case GetType(TextEdit)
+                        If TypeOf CurrentControl Is DevExpress.XtraEditors.TextEdit Then
+                            Dim txt = DirectCast(CurrentControl, DevExpress.XtraEditors.TextEdit)
+                            Select Case newValue
+                                Case "Near" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+                                Case "Center" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+                                Case "Far" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
+                            End Select
+                        End If
+                End Select
         End Select
     End Sub
 
@@ -980,7 +991,7 @@ Public Class frmFormDesigner
 
     Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click
         Try
-            Dim oGuid = clsTools.ShortGuid()
+            Dim oGuid = ClassAllgemeineFunktionen.NewShortGuid()
             Dim oColumnName As String = "colNew" & oGuid
             Dim oColumnCaption As String = "New Column " & oGuid
             If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then
@@ -1121,14 +1132,13 @@ Public Class frmFormDesigner
         If Cursor = Cursors.Cross And Mouse_IsPressed = True Then
             Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             Mouse_IsPressed = False
-
             Try
                 Select Case NewControlSelected
                     Case ClassControlCreator.PREFIX_LABEL
                         Dim label = ControlCreator.CreateNewLabel(cursorPosition)
                         SetMovementHandlers(label)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width, label.TextAlign)
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = label
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1136,14 +1146,13 @@ Public Class frmFormDesigner
                             .ReadOnly = False
                         }
 
-
                         pnldesigner.Controls.Add(label)
 
                     Case ClassControlCreator.PREFIX_TEXTBOX
                         Dim txt = ControlCreator.CreateNewTextBox(cursorPosition)
                         SetMovementHandlers(txt)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width, txt.Properties.Appearance.TextOptions.HAlignment)
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = txt
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1157,7 +1166,7 @@ Public Class frmFormDesigner
                         Dim cmb = ControlCreator.CreateNewCombobox(cursorPosition)
                         SetMovementHandlers(cmb)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = cmb
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1171,7 +1180,7 @@ Public Class frmFormDesigner
                         Dim dtp = ControlCreator.CreateNewDatetimepicker(cursorPosition)
                         SetMovementHandlers(dtp)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = dtp
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1185,7 +1194,7 @@ Public Class frmFormDesigner
                         Dim chk = ControlCreator.CreateNewCheckbox(cursorPosition)
                         SetMovementHandlers(chk)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = chk
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1200,7 +1209,7 @@ Public Class frmFormDesigner
 
                         SetMovementHandlers(lc)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width, lc.Properties.Appearance.TextOptions.HAlignment)
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = lc
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1216,7 +1225,7 @@ Public Class frmFormDesigner
                         SetMovementHandlers(tb)
                         AddHandler tb.MouseClick, AddressOf gridControl_MouseClick
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         Dim oControlId = GetLastID()
 
@@ -1235,7 +1244,7 @@ Public Class frmFormDesigner
 
                         SetMovementHandlers(line)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = line
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
@@ -1250,7 +1259,7 @@ Public Class frmFormDesigner
 
                         SetMovementHandlers(oButton)
 
-                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width)
+                        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width, "NONE")
                         CHANGES_FORM_DESIGN = True
                         CurrentControl = oButton
                         CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {

app/TaskFlow/frmMain.Designer.vb

@@ -83,6 +83,7 @@ Partial Class frmMain
         Me.BBtnItmNotfications = New DevExpress.XtraBars.BarButtonItem()
         Me.BSIVERSION1 = New DevExpress.XtraBars.BarStaticItem()
         Me.barbtnitmsaveLogfiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsitmCount = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -289,9 +290,9 @@ Partial Class frmMain
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles, Me.bsitmCount})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 56
+        Me.RibbonControl1.MaxItemId = 57
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen})
         Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize})
@@ -721,6 +722,13 @@ Partial Class frmMain
         Me.barbtnitmsaveLogfiles.Name = "barbtnitmsaveLogfiles"
         Me.barbtnitmsaveLogfiles.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
+        'bsitmCount
+        '
+        resources.ApplyResources(Me.bsitmCount, "bsitmCount")
+        Me.bsitmCount.Id = 56
+        Me.bsitmCount.Name = "bsitmCount"
+        Me.bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+        '
         'RibbonPageStart
         '
         Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW})
@@ -847,6 +855,7 @@ Partial Class frmMain
         Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmCount)
         resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -974,6 +983,7 @@ Partial Class frmMain
         Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlBottom)
         Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlLeft)
         Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlRight)
+        Me.DocumentViewerBarManager1.DockWindowTabFont = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.DocumentViewerBarManager1.Form = Me
         Me.DocumentViewerBarManager1.ImageStream = CType(resources.GetObject("DocumentViewerBarManager1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer)
         Me.DocumentViewerBarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.PrintPreviewStaticItem1, Me.ProgressBarEditItem1, Me.PrintPreviewBarItem1, Me.PrintPreviewStaticItem2, Me.ZoomTrackBarEditItem1, Me.bbiDocumentMap, Me.bbiParameters, Me.bbiThumbnails, Me.bbiFind, Me.bbiHighlightEditingFields, Me.bbiCustomize, Me.bbiOpen, Me.bbiSave, Me.bbiPrint, Me.bbiPrintDirect, Me.bbiPageSetup, Me.bbiEditPageHF, Me.bbiScale, Me.bbiHandTool, Me.bbiMagnifier, Me.bbiZoomOut, Me.bbiZoom, Me.bbiZoomIn, Me.bbiShowFirstPage, Me.bbiShowPrevPage, Me.bbiShowNextPage, Me.bbiShowLastPage, Me.bbiMultiplePages, Me.bbiFillBackground, Me.bbiWatermark, Me.bbiExportFile, Me.bbiSendFile, Me.bbiClosePreview, Me.miFile, Me.miView, Me.miBackground, Me.miPageLayout, Me.miPageLayoutFacing, Me.miPageLayoutContinuous, Me.miToolbars, Me.PrintPreviewBarCheckItem1, Me.PrintPreviewBarCheckItem2, Me.PrintPreviewBarCheckItem3, Me.PrintPreviewBarCheckItem4, Me.PrintPreviewBarCheckItem5, Me.PrintPreviewBarCheckItem6, Me.PrintPreviewBarCheckItem7, Me.PrintPreviewBarCheckItem8, Me.PrintPreviewBarCheckItem9, Me.PrintPreviewBarCheckItem10, Me.PrintPreviewBarCheckItem11, Me.PrintPreviewBarCheckItem12, Me.PrintPreviewBarCheckItem13, Me.PrintPreviewBarCheckItem14, Me.PrintPreviewBarCheckItem15, Me.PrintPreviewBarCheckItem16, Me.PrintPreviewBarCheckItem17, Me.PrintPreviewBarCheckItem18, Me.PrintPreviewBarCheckItem19})
@@ -1799,4 +1809,5 @@ Partial Class frmMain
     Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bsitmCount As DevExpress.XtraBars.BarStaticItem
 End Class

app/TaskFlow/frmMain.vb

@@ -1,24 +1,25 @@
-Imports System.Globalization
+Imports System.ComponentModel
-Imports DevExpress.Utils
+Imports System.Globalization
-Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
-Imports DevExpress.XtraGrid.Views.Grid
-Imports DevExpress.XtraGrid
-Imports DevExpress.XtraNavBar
-Imports DevExpress.XtraGrid.Columns
-Imports System.Threading
-Imports System.ComponentModel
 Imports System.IO
-Imports DevExpress.XtraPrinting
+Imports System.Threading
-Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.EDMI.API.Constants
-Imports DigitalData.Modules.Windream
-Imports DigitalData.GUIs.Common
-Imports DevExpress.XtraGrid.Views.BandedGrid
-Imports DevExpress.XtraBars.Ribbon
-Imports DigitalData.Modules.ZooFlow
 Imports DevExpress.LookAndFeel
-Imports DigitalData.Modules.Base
+Imports DevExpress.Utils
+Imports DevExpress.XtraBars.Ribbon
+Imports DevExpress.XtraExport.Helpers
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraGrid.Views.Base
+Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+Imports DevExpress.XtraNavBar
+Imports DevExpress.XtraPrinting
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.EDMI.API.Constants
+Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
+Imports DigitalData.Modules.Windream
+Imports DigitalData.Modules.ZooFlow
 
 Public Class frmMain
     Private Property FormHelper As FormHelper
@@ -1404,8 +1405,8 @@ Public Class frmMain
                 cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
                 Thread.CurrentThread.CurrentCulture = cultureInfo
                 Thread.CurrentThread.CurrentUICulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentCulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentCulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -2159,12 +2160,10 @@ Public Class frmMain
             RestoreLayout()
 
             Try
-                Dim oSQLFormat = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
-                Dim dtColFormat As DataTable = Await DatabaseFallback.GetDatatableECMAsync(oSQLFormat)
 
                 For Each oColumn As DevExpress.XtraGrid.Columns.GridColumn In GridViewWorkflows.Columns
 
-                    For Each oRow As DataRow In dtColFormat.Rows
+                    For Each oRow As DataRow In BASEDATA_TBDD_COLUMNS_FORMAT.Rows
                         Dim colName = oRow("COLUMN_TITLE").ToString()
 
                         If oColumn.FieldName = colName Then
@@ -2179,7 +2178,10 @@ Public Class frmMain
                                 If oColumn.ColumnType = GetType(DateTime) And oColumn.DisplayFormat.FormatString <> "dd.MM.yyyy HH:mm:ss" Then
                                     oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss"
                                 End If
-
+                            ElseIf oSollFormatType = "Numeric" Then
+                                If oColumn.ColumnType <> GetType(Int32) Then
+                                    oColumn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric
+                                End If
                             End If
                         End If
                     Next
@@ -2242,50 +2244,84 @@ Public Class frmMain
         Item_Scope("DOUBLECLICK")
     End Sub
 
+    'Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
+    '    Try
+    '        ' Added
+    '        If FormOpenClose = True And GridIsLoaded = False Then
+    '            Exit Sub
+    '        End If
+
+    '        Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
+    '        Dim view As GridView = sender
+
+    '        If info.Column.FieldName = "GROUP_TEXT" Then
+    '            info.GroupText = info.GroupValueText
+
+    '            Dim oColorString As String = "LightGray"
+    '            Dim oFontColorString As String = "Black"
+    '            Dim oFoundConfig As Boolean = False
+    '            Dim oGROUP_TEXT_COL As String
+    '            If USER_LANGUAGE = "de-DE" Then
+    '                oGROUP_TEXT_COL = "GROUP_TEXT"
+    '            Else
+    '                oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
+    '            End If
+
+
+    '            For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
+    '                If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
+    '                    oFoundConfig = True
+    '                    oColorString = oProfileRow.Item("GROUP_COLOR")
+    '                    oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
+    '                    ' Added
+    '                    Exit For
+    '                End If
+    '            Next
+    '            If oFoundConfig = False Then
+    '                LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
+    '                ' Added
+    '                Exit Sub
+    '            End If
+
+    '            Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
+    '            Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
+
+    '            info.Appearance.BackColor = oColor
+    '            info.Appearance.ForeColor = oFontColor
+    '        End If
+    '    Catch ex As Exception
+    '        LOGGER.Error(ex)
+    '    End Try
+    'End Sub
+
     Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
         Try
-            ' Added
+
             If FormOpenClose = True And GridIsLoaded = False Then
                 Exit Sub
             End If
 
-            Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
+            Dim oInfo As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
-            Dim view As GridView = sender
+            If oInfo Is Nothing OrElse oInfo.Column Is Nothing Then
+                Exit Sub
+            End If
 
-            If info.Column.FieldName = "GROUP_TEXT" Then
+            Dim oView As GridView = sender
-                info.GroupText = info.GroupValueText
+
+            If oInfo.Column.FieldName = "GROUP_TEXT" Then
+                oInfo.GroupText = oInfo.GroupValueText
 
                 Dim oColorString As String = "LightGray"
                 Dim oFontColorString As String = "Black"
-                Dim oFoundConfig As Boolean = False
+                Dim oChildRowHandle As Integer = oView.GetChildRowHandle(oInfo.RowHandle, 0)
-                Dim oGROUP_TEXT_COL As String
-                If USER_LANGUAGE = "de-DE" Then
-                    oGROUP_TEXT_COL = "GROUP_TEXT"
-                Else
-                    oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
-                End If
 
-
+                oColorString = oView.GetRowCellValue(oChildRowHandle, "GROUP_COLOR")
-                For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
-                    If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
-                        oFoundConfig = True
-                        oColorString = oProfileRow.Item("GROUP_COLOR")
-                        oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
-                        ' Added
-                        Exit For
-                    End If
-                Next
-                If oFoundConfig = False Then
-                    LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
-                    ' Added
-                    Exit Sub
-                End If
 
                 Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
                 Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
 
-                info.Appearance.BackColor = oColor
+                oInfo.Appearance.BackColor = oColor
-                info.Appearance.ForeColor = oFontColor
+                oInfo.Appearance.ForeColor = oFontColor
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -2478,10 +2514,6 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
         oStopWatch.Done()
     End Sub
     Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        If USER_USERNAME = "SchreiberM" Then
-            frmDashboard1.Show()
-        End If ' 
-
         If RIBBON_COLOR_SCHEME <> "" Then
             Me.LookAndFeel.UseDefaultLookAndFeel = False
             If RIBBON_COLOR_SCHEME = "Blue".ToUpper Then
@@ -2858,13 +2890,16 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
             End If
             If Ev_Filter_Panel_Closed = False Then
-                Dim oTermFilterActive As String = S.Filter_aktiv
+                Dim oTermFilterActive As String = String.Format("{0} ({1})", S.Filter_aktiv, GridViewWorkflows.RowCount)
                 If GridViewWorkflows.ActiveFilterString <> String.Empty Then
-                    If Not lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
+                    If lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
-                        lblCaptionMainGrid.Text += $"|{oTermFilterActive}"
-                    Else
                         Ev_Filter_Panel_Closed = False
                     End If
+                    lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                    bsitmCount.Caption = oTermFilterActive
+                Else
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                 End If
 
             End If
@@ -2941,7 +2976,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
             Timer5Mins.Stop()
             TimerRefresh.Stop()
             TimerReminder.Stop()
-            LOGGER.Info("Inactivity recognized. Automatic Logout in process!")
+            LOGGER.Info("Inactivity recognized. Automatic Logout In process!")
             Hide()
             ClassAllgemeineFunktionen.LoginOut("LOGOUT")
             TimerInactivity.Stop()
@@ -2976,8 +3011,8 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
                 MyProcess.StartInfo.FileName = bbtniCW.Tag
                 MyProcess.Start()
             Else
-                LOGGER.Warn($"easyFLOW-Exe not found [{bbtniCW.Tag}]")
+                LOGGER.Warn($"easyFLOW-Exe Not found [{bbtniCW.Tag}]")
-                FormHelper.ShowInfoMessage("Clipboard Watcher could not be started!", omsgTitleWarning)
+                FormHelper.ShowInfoMessage("Clipboard Watcher could Not be started!", omsgTitleWarning)
             End If
 
         Catch ex As Exception
@@ -3062,7 +3097,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
     Private Sub BarButtonItemFileLink_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemFileLink.ItemClick
         Dim oReceipiant = ""
         Dim oFocusedDocGUID = GridViewWorkflows.GetFocusedRowCellValue(GridViewWorkflows.Columns("GUID"))
-        Dim oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID},1)"
+        Dim oSQL = $"Select [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID}, 1)"
         Dim oFilePath = DatabaseFallback.GetScalarValueECM(oSQL)
         If File.Exists(oFilePath) Then
             Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
@@ -3116,6 +3151,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
                 If CURRENT_DT_PROFILE.Rows.Count = 1 Then
                     CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME")
                     PROFILE_SHOW_DOCUMENT = CURRENT_DT_PROFILE.Rows(0).Item("SHOW_DOCUMENT")
+                    PROFILE_NOT_RESP_COMMENT = CURRENT_DT_PROFILE.Rows(0).Item("NOT_RESP_COMMENT")
                     ActiveWorkflowType = 1
                 Else
                     Exit Sub
@@ -3230,6 +3266,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
     Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
         GridLayout_Changed("GridViewWFItems_SubstituteFilter")
+
     End Sub
 
     Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
@@ -3262,7 +3299,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
                     LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
 
-                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
+                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
                     If oResult = True Then
                         WM_AHWF_docPath = oTargetPath
                         Dim oDocID = WINDREAM_MOD.NewDocumentID

app/TaskFlow/frmMassValidator.vb

@@ -323,7 +323,7 @@ Public Class frmMassValidator
                             lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
                             lookup.Properties.MultiSelect = oMultiselect
 
-                            If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
+                            If ClassAllgemeineFunktionen.NotNullString(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
                                 lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
                             End If
 
@@ -355,7 +355,7 @@ Public Class frmMassValidator
                         LOGGER.Debug("Versuch Tabelle zu laden")
                         Dim oDTMyColumns As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")
 
-                        oControl = ControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False)
+                        oControl = ControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False, CURRENT_DOC_CURRENCY)
                 End Select
 
                 If oControl IsNot Nothing AndAlso TypeOf oControl IsNot Label Then
@@ -449,7 +449,7 @@ Public Class frmMassValidator
                 End If
                 Dim idxname As String = controlRow.Item("INDEX_NAME")
                 ' Wenn kein defaultValue existiert, leeren String setzen
-                Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty)
+                Dim defaultValue As String = ClassAllgemeineFunktionen.NotNullString(controlRow.Item("DEFAULT_VALUE"), String.Empty)
                 indexname = idxname
                 Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE")
                 LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString)
@@ -474,7 +474,7 @@ Public Class frmMassValidator
                                 If wertWD = "" And defaultValue <> "" Then
                                     oControl.Text = defaultValue
                                 Else
-                                    oControl.Text = NotNull(wertWD, defaultValue)
+                                    oControl.Text = ClassAllgemeineFunktionen.NotNullString(wertWD, defaultValue)
                                 End If
 
                             End If
@@ -1339,15 +1339,14 @@ Public Class frmMassValidator
         Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
         oResult = DatabaseFallback.GetScalarValueECM(oSQL)
         LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...")
+        LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+        oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
+        oResult = DatabaseFallback.GetScalarValueECM(oSQL)
+        LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
         If File.Exists(oResult) = False Then
-            LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+            Return False
-            oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
-            oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-            LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
-            If File.Exists(oResult) = False Then
-                Return False
-            End If
         End If
+
         WMDocPathWindows = oResult
 
         CURRENT_DOC_PATH = WMDocPathWindows

app/TaskFlow/frmValidator.Designer.vb

@@ -90,7 +90,6 @@ Partial Class frmValidator
         Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem()
         Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem()
         Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem()
-        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         Me.bbtnitmInfoWorkflow = New DevExpress.XtraBars.BarButtonItem()
         Me.bchkitmNotes = New DevExpress.XtraBars.BarCheckItem()
         Me.BarButtonGroup1 = New DevExpress.XtraBars.BarButtonGroup()
@@ -515,7 +514,7 @@ Partial Class frmValidator
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
         Me.RibbonControl1.MaxItemId = 38
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -692,16 +691,6 @@ Partial Class frmValidator
         Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True
         Me.Attmnt_bbtnitm_LoadonClick.Name = "Attmnt_bbtnitm_LoadonClick"
         '
-        'BarButtonItem6
-        '
-        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
-        Me.BarButtonItem6.Id = 32
-        Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem6.Name = "BarButtonItem6"
-        Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
-        Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-        '
         'bbtnitmInfoWorkflow
         '
         resources.ApplyResources(Me.bbtnitmInfoWorkflow, "bbtnitmInfoWorkflow")
@@ -746,10 +735,10 @@ Partial Class frmValidator
         '
         'RbnPgGrpActions
         '
+        Me.RbnPgGrpActions.AllowTextClipping = False
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniNext)
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniDelete)
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniAnnotation)
-        Me.RbnPgGrpActions.ItemLinks.Add(Me.BarButtonItem6)
         Me.RbnPgGrpActions.Name = "RbnPgGrpActions"
         resources.ApplyResources(Me.RbnPgGrpActions, "RbnPgGrpActions")
         Me.RbnPgGrpActions.Visible = False
@@ -939,7 +928,6 @@ Partial Class frmValidator
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
     Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem
     Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem
-    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents pnlMain As DevExpress.XtraEditors.PanelControl
     Friend WithEvents btnSave As DevExpress.XtraEditors.SimpleButton
     Friend WithEvents DESCRIPTIONLabel As DevExpress.XtraEditors.LabelControl

app/TaskFlow/frmValidator.resx

@@ -126,7 +126,10 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainerButtons.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 289</value>
+    <value>2, 358</value>
+  </data>
+  <data name="SplitContainerButtons.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="SplitContainerReject_NotResp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -134,6 +137,9 @@
   <data name="SplitContainerReject_NotResp.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="SplitContainerReject_NotResp.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="btnReject.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
@@ -188,8 +194,11 @@
   <data name="btnReject.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="btnReject.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="btnReject.Size" type="System.Drawing.Size, System.Drawing">
-    <value>197, 50</value>
+    <value>253, 62</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnReject.TabIndex" type="System.Int32, mscorlib">
@@ -283,8 +292,11 @@
   <data name="btnNotResponsible.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="btnNotResponsible.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="btnNotResponsible.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 50</value>
+    <value>235, 62</value>
   </data>
   <data name="btnNotResponsible.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -317,7 +329,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerReject_NotResp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>389, 50</value>
+    <value>500, 62</value>
   </data>
   <data name="SplitContainerReject_NotResp.TabIndex" type="System.Int32, mscorlib">
     <value>46</value>
@@ -410,8 +422,11 @@
   <data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="btnSave.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
-    <value>250, 50</value>
+    <value>323, 62</value>
   </data>
   <data name="btnSave.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -447,7 +462,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing">
-    <value>649, 50</value>
+    <value>835, 62</value>
   </data>
   <data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib">
     <value>45</value>
@@ -468,7 +483,10 @@
     <value>Fill</value>
   </data>
   <data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 158</value>
+    <value>0, 194</value>
+  </data>
+  <data name="SplitContainer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="PanelValidatorControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
@@ -477,10 +495,13 @@
     <value>Segoe UI, 8.25pt</value>
   </data>
   <data name="PanelValidatorControl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 58</value>
+    <value>8, 72</value>
+  </data>
+  <data name="PanelValidatorControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>642, 225</value>
+    <value>824, 279</value>
   </data>
   <data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -508,10 +529,13 @@
     <value>None</value>
   </data>
   <data name="DESCRIPTIONLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 33</value>
+    <value>8, 41</value>
+  </data>
+  <data name="DESCRIPTIONLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>643, 26</value>
+    <value>826, 32</value>
   </data>
   <data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -541,10 +565,13 @@
     <value>None</value>
   </data>
   <data name="TITLELabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 5</value>
+    <value>6, 6</value>
+  </data>
+  <data name="TITLELabel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>643, 28</value>
+    <value>826, 35</value>
   </data>
   <data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -570,8 +597,11 @@
   <data name="pnlMain.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="pnlMain.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 341</value>
+    <value>839, 422</value>
   </data>
   <data name="pnlMain.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
@@ -607,10 +637,10 @@
     <value>0, 0</value>
   </data>
   <data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 5, 4, 5</value>
+    <value>5, 6, 5, 6</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>519, 341</value>
+    <value>668, 422</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -619,7 +649,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>
@@ -640,10 +670,13 @@
     <value>1</value>
   </data>
   <data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 341</value>
+    <value>1512, 422</value>
   </data>
   <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>653</value>
+    <value>839</value>
+  </data>
+  <data name="SplitContainer1.SplitterWidth" type="System.Int32, mscorlib">
+    <value>5</value>
   </data>
   <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
     <value>37</value>
@@ -672,8 +705,11 @@
   <data name="barDockControlTop.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="barDockControlTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 0</value>
+    <value>1512, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve">
     <value>barDockControlTop</value>
@@ -691,10 +727,13 @@
     <value>Bottom</value>
   </data>
   <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 521</value>
+    <value>0, 644</value>
+  </data>
+  <data name="barDockControlBottom.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 0</value>
+    <value>1512, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
     <value>barDockControlBottom</value>
@@ -714,8 +753,11 @@
   <data name="barDockControlLeft.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="barDockControlLeft.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 521</value>
+    <value>0, 644</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
     <value>barDockControlLeft</value>
@@ -733,10 +775,13 @@
     <value>Right</value>
   </data>
   <data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1176, 0</value>
+    <value>1512, 0</value>
+  </data>
+  <data name="barDockControlRight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 521</value>
+    <value>0, 644</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
     <value>barDockControlRight</value>
@@ -757,10 +802,10 @@
     <value>82</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>7, 17</value>
+    <value>9, 21</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 521</value>
+    <value>1512, 644</value>
   </data>
   <data name="bsiError.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold</value>
@@ -1179,38 +1224,6 @@
   <data name="Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold</value>
   </data>
-  <data name="BarButtonItem6.Caption" xml:space="preserve">
-    <value>Beleg anzeigen</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAExSURB
-        VDhPpZKxSsRQFET3Nyy18wOExcYv8G/0B+TAgkXKgAhmyzQWgsViY7FFZItsFFJobyMuWggLJuHKPHzh
-        mSgavDBwM3dmktz3RmY2+g96xFD0CGAXOI3j2CaTiQPwIE6zrj40bgJX0+nUlsulrVYrq+vaQb04zaSR
-        9ksAsAe8ZFlmqrd1Zdd3j3Z4duOew5JGWnlcALANvJZl2ZqPz29t/2jm8F1JK4+8CpgtFot2qDd7808B
-        KnnkVcC6qqp2oM/+S4A88v4aECLcSRhw4Zen6v5CCM18AQfyKmALeC6Kwg26S/QQp5lKWnnk9ce4E0WR
-        zefzNsQfo6Dem6UBnuTpXqSNNE0tSRLL89xdnqZpHNSLAzLgUtreTQyCxsAJcA+8f0K9uHFX3wsYih4x
-        FB8q0AjdQAvTBwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJSSURB
-        VFhHxZY9i1NBFIZ3/RNbbG1nJf4Nuy232dY/IcpavRYLW22ZEAvLEEIkkJRiYZYQi7QmYiCYRTTICgmO
-        PNe5YXJmbj4WvR544XLmnPc8k/sxOXDOHfxPRYmyFSXKVpQoW1GibEWJshUlNknSI0kvJHUkfZb004tr
-        cqxRQ20k67cTgKR7kk4lfZDkdhS19NB7dwBJDyT1cuNqteq63a4bjUZuPp+7xWKRiWtyrFETgNCLx/4A
-        kp5IusWoVqu5fr/vdg1q6fEQeOAVzUgCSDrUn8gMWq3WmvmXb7eu/u6je/rqvTt92V1bs0Fv8GsQh3Ze
-        CuAibxoOh2uGw09f3fnra/f4+ZuVtgUeAcSFnWeHn+XFk8lkzYid2+G7ABB4BRBnSQBJx5J+UDQYDKxH
-        9rPb4bsCEHh6AGYcpwCuKGg0GrY3C+65Hb4PAIG3h7hKAdywOJvNbF8WPHB2+L4AeHuAmxTAjMXpdGr7
-        sigCSKno7cDbA7DLCOCSxXq9bvuyKLoFKVGbCrw9wGUK4EjSdwra7bbtLXwIU6LWBp5+ODOOIgAPcSLp
-        F4Xj8XjNoOg1tKKG2jDw8sPxPglnrgF4iPP8nbWf39SHyA6nJgw8cj+87bwIwEI0m023XC5XhvZTjLgm
-        F+6cHno3DS8E8BAcp9kzUalUXK/XW5lvC2rpCe45XtGMjQAe4r6kt/kuMO10OoXHMWvBYEQvHvsfxwEE
-        pyMP53VgvE3U0kNvNvzOAAbmoaRnG/6SsUbNauhfBfgXihJlK0qUrShRtqJE2YoSZes3UL0KST/PhM0A
-        AAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtnitmInfoWorkflow.Caption" xml:space="preserve">
     <value>Anzeigen</value>
   </data>
@@ -1266,6 +1279,9 @@
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="RibbonControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="RibbonPageFile.Text" xml:space="preserve">
     <value>Datei</value>
   </data>
@@ -1322,13 +1338,16 @@
     <value>Combo</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 158</value>
+    <value>1512, 194</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 499</value>
+    <value>0, 616</value>
+  </data>
+  <data name="RibbonStatusBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1176, 22</value>
+    <value>1512, 28</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -1556,7 +1575,7 @@
 </value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 4, 3, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>frmValidator</value>
@@ -1861,12 +1880,6 @@
   <data name="&gt;&gt;Attmnt_bbtnitm_LoadonClick.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
-    <value>BarButtonItem6</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;bbtnitmInfoWorkflow.Name" xml:space="preserve">
     <value>bbtnitmInfoWorkflow</value>
   </data>
@@ -1991,11 +2004,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
+        AAAAAAAAiwEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
         VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp
         ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC
         b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
-        dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAb
+        dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAb
         w5ZmZm5lbiBTaWUgZWluZSBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRl
         bUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4
         E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNz
@@ -2027,11 +2040,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls
+        AAAAAAAAiwEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls
         cy5Ub29sVGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50
         CE1heFdpZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRl
         ZmF1bHRCb29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRv
-        b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAA
+        b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAA
         Bg8AAAAYU3BlaWNoZXJuIGRlciBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw
         SXRlbUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUlu
         ZGV4E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHBy
@@ -2063,11 +2076,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
+        AAAAAAAAiwEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
         VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp
         ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC
         b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
-        dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAN
+        dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAN
         RGF0ZWkgZHJ1Y2tlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMF
         AAAACEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERp
         c3RhbmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw
@@ -2099,11 +2112,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt
+        AAAAAAAAiwEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt
         BwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lkdGgST3du
         ZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4D
         AAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFn
-        ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAABlWb3JoZXJp
+        ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAABlWb3JoZXJp
         Z2UgU2VpdGUgYW56ZWlnZW4uBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0
         aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9U
         ZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRv
@@ -2135,11 +2148,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H
+        AAAAAAAAiwEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H
         AAAADUFsbG93SHRtbFRleHQESWNvbgxJbWFnZU9wdGlvbnMKTGVmdEluZGVudAhNYXhXaWR0aBJPd25l
         ckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMA
         AAATU3lzdGVtLkRyYXdpbmcuSWNvbgkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdl
-        T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAAA8AQAAAAYPAAAAF07DpGNoc3Rl
+        T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAACLAQAAAAYPAAAAF07DpGNoc3Rl
         IFNlaXRlIGFuemVpZ2VuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9u
         cwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9UZXh0
         RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRvb2xU
@@ -2171,11 +2184,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU
+        AAAAAAAAiwEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU
         aXBJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lk
         dGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJv
         b2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0
-        ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAAAtU
+        ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAAAtU
         ZXh0IHN1Y2hlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMFAAAA
         CEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERpc3Rh
         bmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSW1h
@@ -2255,11 +2268,11 @@
         CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
         c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
         c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
-        AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN
+        AAAAAAAAiwEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN
         QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs
         b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT
         eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp
-        b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg
+        b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAApw4RuZGVybiBkZXIg
         Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
         dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k
         ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl

app/TaskFlow/frmValidator.vb

@@ -1,5 +1,14 @@
-Imports DevExpress.DataAccess.Native.Sql
+Imports System.ComponentModel
+'Imports System.Data.SqlClient
+Imports System.Globalization
+Imports System.IO
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+Imports System.Text.RegularExpressions
+Imports System.Threading
+Imports DevExpress.DataAccess.Native.Sql
 Imports DevExpress.Utils
+Imports DevExpress.Utils.Automation
 Imports DevExpress.XtraBars
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Mask
@@ -19,14 +28,6 @@ Imports DigitalData.Modules.Interfaces
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.ZooFlow.Constants
-Imports System.ComponentModel
-'Imports System.Data.SqlClient
-Imports System.Globalization
-Imports System.IO
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-Imports System.Text.RegularExpressions
-Imports System.Threading
 'Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 'Imports System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox
 Imports WINDREAMLib
@@ -43,8 +44,7 @@ Public Class frmValidator
     ''' Contains all grid columns for the current profile
     ''' </summary>
     Private Property DT_COLUMNS_GRID As DataTable
-
+    Private Property GIT_TEST As Boolean = False
-
     ''' <summary>
     ''' Contains all grid columns for the current profile which have an sql but don't have a reference to a control
     ''' </summary>
@@ -76,6 +76,7 @@ Public Class frmValidator
     Private CountAction As Int16 = 0
     Public Shared Property WMDocPathWindows As String
     Private Property DocPathWindows As String
+    Private Property DocCurrency As String = "EUR"
     'Anzahl der Validierungsdokumente
     Private Property Amount_Docs2Validate As Integer
     Private Property first_control As Control
@@ -94,9 +95,6 @@ Public Class frmValidator
     Public Property _FormLoaded As Boolean = False
     Private Property _FormClosing As Boolean = False
     Private Property _ControlHandleStarted As Boolean = False
-    Private Property _ItemWorked As Boolean = False
-
-
     Private Property Override As Boolean = False
     Private Property OverrideAll As Boolean = False
     Private Property Override_SQLCommand As String = ""
@@ -106,7 +104,7 @@ Public Class frmValidator
     Private ControlCreator As ClassControlCreator
     Private PerformanceLogger As Logger
     Private Validator As Validator
-    Private Const LOG_PERF = True
+    Private Const LOG_PERF = False
     Private ReadOnly MyValidationLogger As Logger
 
     Private Property OperationMode As OperationMode
@@ -194,7 +192,6 @@ Public Class frmValidator
             Validator = New Validator(LOGCONFIG)
 
             Override = False
-            _ItemWorked = False
             SplitContainer1.Panel2Collapsed = True
             first_control = Nothing
             _FormClosing = False
@@ -297,7 +294,7 @@ Public Class frmValidator
                         PROFIL_FINISH_SQL = oProfileRow.Item("SQL_BTN_FINISH")
                         PROFIL_VEKTORINDEX = oProfileRow.Item("PM_VEKTOR_INDEX")
                         PROFIL_CURRENCY_ATTRIBUTE = oProfileRow.Item("CURRENCY_ATTRIBUTE")
-
+                        PROFILE_NOT_RESP_COMMENT = oProfileRow.Item("NOT_RESP_COMMENT")
                         PROFIL_REJECT_ACTIONS_ATTRIBUTE = oProfileRow.Item("REJECT_ACTIONS_ATTRIBUTE")
                         PROFIL_REJECT_COMMENT_ATTRIBUTE = oProfileRow.Item("REJECT_COMMENT_ATTRIBUTE")
                         PROFIL_NOT_RESP_COMMENT_ATTR = oProfileRow.Item("NOT_RESP_COMMENT_ATTRIBUTE")
@@ -399,7 +396,7 @@ Public Class frmValidator
                         If oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS <> String.Empty Then
                             functBtnReject = True
                         End If
-                        If oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL <> String.Empty Then
+                        If (oProfileNotResponsibleQuestion <> String.Empty Or oProfileNotResponsibleText <> String.Empty) And oProfile_NOT_RESP_SQL <> String.Empty Then
                             If IDB_ACTIVE = True Then
                                 functBtnNR = True
                             End If
@@ -453,11 +450,9 @@ Public Class frmValidator
                             End If
                         End If
 
-                        bbtniNext.Visibility = BarItemVisibility.Always
 
+                        bbtniNext.Visibility = BarItemVisibility.Never
                         If CURRENT_JUMP_DOC_GUID <> 0 Then
-                            bbtniNext.Visibility = BarItemVisibility.Never
-
                             Amount_Docs2Validate = 1
                         Else
 
@@ -544,12 +539,9 @@ Public Class frmValidator
 
         If CURRENT_DOC_GUID <> 0 Then
             Try
-                If _ItemWorked = False Then
+                Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
-                    Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
+                DatabaseFallback.ExecuteNonQueryECM(sql)
-                    DatabaseFallback.ExecuteNonQueryECM(sql)
+                'PRTF_PROFILE_FILES_WORK("FreeFile")
-                    'PRTF_PROFILE_FILES_WORK("FreeFile")
-                End If
-
 
             Catch ex As Exception
                 MyValidationLogger.Error(ex)
@@ -1147,7 +1139,7 @@ Public Class frmValidator
                                 Continue For
                             End If
 
-                            Dim oGrid = ControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False)
+                            Dim oGrid = ControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False, DocCurrency)
                             oMyControl = oGrid
                             'AddHandler oGrid.Views(0).c AddressOf GridView_CustomColumnDisplayText
 
@@ -1253,7 +1245,7 @@ Public Class frmValidator
         End If
 
         SetControlValues_FromControl(oTextbox)
-
+        Controls2beEnabled(oTextbox.Name)
         ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
 
     End Sub
@@ -1355,6 +1347,7 @@ Public Class frmValidator
             Dim oTitle
             Dim oCaption
             Dim oColor
+            Dim oIncludeFI As Boolean = False
             Try
                 oAction = oDT_ACTIONS?.Rows(0).Item("ActionType")
             Catch ex As Exception
@@ -1385,12 +1378,17 @@ Public Class frmValidator
             Catch ex As Exception
                 oColor = ""
             End Try
+            Try
+                oIncludeFI = oDT_ACTIONS?.Rows(0).Item("IncludeFI")
+            Catch ex As Exception
+            End Try
             Try
                 OverrideAll = oDT_ACTIONS?.Rows(0).Item("OverrideAll")
             Catch ex As Exception
                 MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}")
                 OverrideAll = False
             End Try
+
             If OverrideAll = True Then
                 MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!")
             End If
@@ -1405,7 +1403,7 @@ Public Class frmValidator
                         result = MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
                         If result = MsgBoxResult.Yes Then
                             Override = True
-                            Finish_WFStep()
+                            Finish_WFStep(oIncludeFI)
                         End If
                     End If
                 Case "Update_Single_Control".ToUpper
@@ -1451,7 +1449,7 @@ Public Class frmValidator
                 Case "Override_Direct".ToUpper
                     Override = True
                     If Check_UpdateIndexe() = True Then
-                        Finish_WFStep(False)
+                        Finish_WFStep(oIncludeFI)
                     End If
 
                 Case "Override incFinal".ToUpper
@@ -1490,7 +1488,7 @@ Public Class frmValidator
                             Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG")
                             Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString()
                             sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue)
-                            'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1), $"oControlID[{CONTROL_ID}]")
+                            'Dim resultDT: DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1), $"oControlID[{CONTROL_ID}")
                             Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With {
                                 .ConnectionId = ROW.Item("CONNECTION_ID")
                             })
@@ -1643,7 +1641,7 @@ Public Class frmValidator
         Dim oControlname2Set = oRow.Item("NAME")
         MyValidationLogger.Debug($"Workin on SetControLValue for {oControlname2Set} ...")
 
-        Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", -1)
+        Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", 0)
         Dim oControlDataSql = oRow.ItemEx("SET_CONTROL_DATA", String.Empty)
 
         If oConnectionId = -1 Or oControlDataSql = String.Empty Then
@@ -1700,7 +1698,7 @@ Public Class frmValidator
                     Dim oControl As Control = oControlObject2Set
                     Dim oMeta As ClassControlCreator.ControlMetadata = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata)
 
-                    MyValidationLogger.Debug($"Got the Control2Set: {oControlId2Set}..Setting the values..")
+                    MyValidationLogger.Debug(String.Format("Got the Control2Set: {0}..Setting the values..", {oControl.Name}))
 
 
                     Select Case True
@@ -1762,8 +1760,42 @@ Public Class frmValidator
                             Catch ex As Exception
                                 MyValidationLogger.Warn($"Error while Control2Set (Combobox): {ex.Message}")
                             End Try
+                        Case oControl.GetType() = GetType(DevExpress.XtraEditors.DateEdit)
+                            Try
+                                Dim oDateEdit As DevExpress.XtraEditors.DateEdit = DirectCast(oControl, DevExpress.XtraEditors.DateEdit)
+                                Dim parsed As DateTime
+                                If String.IsNullOrWhiteSpace(oControlCaption) Then
+                                    oDateEdit.EditValue = Nothing
+                                ElseIf DateTime.TryParse(oControlCaption, parsed) Then
+                                    oDateEdit.EditValue = parsed
+                                ElseIf DateTime.TryParse(oControlCaption, CultureInfo.CurrentCulture, DateTimeStyles.None, parsed) Then
+                                    oDateEdit.EditValue = parsed
+                                ElseIf DateTime.TryParse(oControlCaption, CultureInfo.InvariantCulture, DateTimeStyles.None, parsed) Then
+                                    oDateEdit.EditValue = parsed
+                                Else
+                                    oDateEdit.EditValue = Nothing
+                                End If
 
+                            Catch ex As Exception
+                                MyValidationLogger.Warn($"Error While Control2Set (DateEdit): {ex.Message}")
+                            End Try
+                        Case oControl.GetType() = GetType(System.Windows.Forms.DateTimePicker)
+                            Try
+                                Dim dtp As System.Windows.Forms.DateTimePicker = DirectCast(oControl, System.Windows.Forms.DateTimePicker)
+                                Dim parsed As DateTime
+                                If String.IsNullOrWhiteSpace(oControlCaption) Then
+                                    dtp.Value = DateTimePicker.MinimumDateTime
+                                ElseIf DateTime.TryParse(oControlCaption, parsed) _
+                                    OrElse DateTime.TryParse(oControlCaption, CultureInfo.CurrentCulture, DateTimeStyles.None, parsed) _
+                                    OrElse DateTime.TryParse(oControlCaption, CultureInfo.InvariantCulture, DateTimeStyles.None, parsed) Then
+                                    dtp.Value = parsed
+                                Else
+                                    dtp.Value = DateTimePicker.MinimumDateTime
+                                End If
 
+                            Catch ex As Exception
+                                MyValidationLogger.Warn($"Error While Control2Set (DateTimePicker): {ex.Message}")
+                            End Try
 
                         Case oControl.GetType() = GetType(Windows.Forms.CheckBox)
                             Dim oBitValue As Boolean
@@ -1782,7 +1814,7 @@ Public Class frmValidator
 
                                 End Try
                             Catch ex As Exception
-                                MyValidationLogger.Warn($"Error while Control2Set (Checkbox): {ex.Message}")
+                                MyValidationLogger.Warn($"Error while Control2Set (Checkbox) {ex.Message}")
                             End Try
 
 
@@ -1796,7 +1828,7 @@ Public Class frmValidator
                 End If
 
                 If oFound = False Then
-                    MyValidationLogger.Debug($"Could not find the Control2Set with ID {oControlGUID2Set} on panel!!!")
+                    MyValidationLogger.Debug($"Could Not find the Control2Set with ID {oControlGUID2Set} on panel!!!")
                 End If
             Catch ex As Exception
                 MyValidationLogger.Error(ex)
@@ -1810,10 +1842,10 @@ Public Class frmValidator
         Dim oLOOKUPValue = SelectedValues.Item(0
                                                )
         Dim oLOOKUPName = LookupControl.Name
-        MyValidationLogger.Debug($"oLOOKUPValue is  [{oLOOKUPValue}]!")
+        MyValidationLogger.Debug($"oLOOKUPValue Is  [{oLOOKUPValue}]!")
         Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid
         Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
-        Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{oLOOKUPName}%'"
+        Dim oExpression = $"SQL_UEBERPRUEFUNG Like '%#CTRL#{oLOOKUPName}%'"
         DT_CONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
         If oFilteredDatatable.Rows.Count > 0 Then
             MyValidationLogger.Debug($"We got {oFilteredDatatable.Rows.Count} depending controls!!")
@@ -1825,7 +1857,7 @@ Public Class frmValidator
             Dim oDEPENDING_CtrlName = oRowDependingControl.Item("NAME")
             MyValidationLogger.Debug($"Control {oDEPENDING_CtrlName} is depending on lookUp {oLOOKUPName}..")
             If _DependingControl_In_Action = True Then
-                MyValidationLogger.Debug($"..but _dependingControl_in_action = True ==> Exit Sub!")
+                MyValidationLogger.Info($"..but _dependingControl_in_action = True ==> Exit Sub!")
                 Exit Sub
             End If
             If Not IsDBNull(oRowDependingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) Then
@@ -1848,6 +1880,7 @@ Public Class frmValidator
                                     Case oControl.GetType() = GetType(DevExpress.XtraEditors.TextEdit) Or oControl.GetType() = GetType(MemoEdit)
                                         Try
                                             Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
+                                            MyValidationLogger.Debug(String.Format("Setting EditValue with value [{0}]", oValue))
                                             oValue = ObjectEx.NotNull(Of Object)(oValue, Nothing)
                                             Try
                                                 'oControl.Text = oValue
@@ -1959,6 +1992,7 @@ Public Class frmValidator
                 Dim oSqlCommand = IIf(IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")), "", oRowDependingControl.Item("SQL_UEBERPRUEFUNG"))
                 oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
                 _DependingControl_In_Action = True
+                MyValidationLogger.Debug($"_DependingControl_In_Action: Control {oDEPENDING_CtrlName} ...")
                 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"CheckBox_DependingControls - oControlID: {oControlID}")
                 Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With {
                     .ConnectionId = oRowDependingControl.Item("CONNECTION_ID")
@@ -2231,6 +2265,7 @@ Public Class frmValidator
                 If Not IsDBNull(oRowEnablingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")) Then
                     Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE"))
                     oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
+                    MyValidationLogger.Debug($"_DependingControl_In_Action: oENABLE_CtrlName {oENABLE_CtrlName} ...")
                     _DependingControl_In_Action = True
 
                     Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID")
@@ -2252,7 +2287,7 @@ Public Class frmValidator
                             End If
 
                         Next
-
+                        _DependingControl_In_Action = False
                         If oFound = False Then
                             MyValidationLogger.Debug($"Could not find the enabling Control with ID {oENABLE_GUID} on panel!!!")
                         End If
@@ -2291,8 +2326,8 @@ Public Class frmValidator
     '        Logger.Error(ex)
     '    End Try
     'End Sub
-    Private Sub Controls2B_EnDisabled_on_Load()
+    Private Sub Controls2B_EnDisabled()
-        If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load")
+        If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled")
 
         Try
             Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
@@ -2319,8 +2354,10 @@ Public Class frmValidator
 
                         Try
                             MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...")
-                            oControl.Enabled = oResult
+
+                            oControl.Enabled = CBool(oResult)
                         Catch ex As Exception
+                            MyValidationLogger.Warn($"Could not convert value [oResult] to Boolean!")
                             MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
                         End Try
 
@@ -2419,7 +2456,7 @@ Public Class frmValidator
                         MyValidationLogger.Debug("SQL Check is not configured!")
                         Return True
                     End If
-                    If check.ToString.Length > 0 And dr.Item("INDEX_NAME") <> "DD PM-ONLY FOR DISPLAY" Then
+                    If check.ToString.Length > 0 And Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(dr.Item("INDEX_NAME")) Then
                         Dim cs As String = DatabaseFallback.GetConnectionString(dr.Item("CONNECTION_ID"))
 
                         If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then
@@ -2483,7 +2520,7 @@ Public Class frmValidator
                 End Try
 
                 Try
-                    Amount_Docs2Validate = oDT.Rows(0).Item(2)
+                    Amount_Docs2Validate = CInt(oDT.Rows(0).Item(2))
                     MyValidationLogger.Debug($"Get_Next_GUID: Amount_Docs2Validate [{Amount_Docs2Validate}]...")
                 Catch ex As Exception
                     Amount_Docs2Validate = 0
@@ -2561,25 +2598,23 @@ Public Class frmValidator
 
             WMDocPathWindows = String.Empty
             If OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then
+                Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
+                oResult = DatabaseFallback.GetScalarValueECM(oSQL)
+                MyValidationLogger.Debug($"First Checking file [{oResult}] exists?...")
                 If File.Exists(oResult) = False Then
-                    Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
+                    MyValidationLogger.Info($"Getting filepath with standard 1 ...")
-                    oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-                    MyValidationLogger.Debug($"Checking file 0 [{oResult}] exists?...")
-                    DocPathWindows = oResult
-                    MyValidationLogger.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
                     oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
-
                     oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-
+                    MyValidationLogger.Debug($"Second Checking file [{oResult}] exists?...")
-                    MyValidationLogger.Debug($"Checking file 1[{oResult}] exists?...")
                     If File.Exists(oResult) = False Then
-                        MyValidationLogger.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!")
+                        MyValidationLogger.Info($"Second FileExists also returned false [{oResult}]!")
                         DocPathWindows = oResult
                         MyValidationLogger.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
                         Return False
                     End If
-
                 End If
+                DocPathWindows = oResult
+
             Else
                 oResult = ClassConstants.OpModeFS_ZF
                 MyValidationLogger.Debug($"GetDocPathWindows: Filestore is {ClassConstants.OpModeFS_ZF}")
@@ -2678,14 +2713,22 @@ Public Class frmValidator
                 DatabaseFallback.ExecuteNonQueryECM(sql)
 
                 ' ############ Infos eintragen #################
-                ' txtDateipfad.Text = Document_Path
-                'Dim omsg = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("remainingOps")}: {Amount_Docs2Validate}"
-                Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
 
-                If Amount_Docs2Validate > 0 Then
+                If Amount_Docs2Validate > 1 Then
+                    Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
                     bsiInformation.Caption = omsg
+
+                    bsiInformation.Caption = omsg
+                    If RbnPgGrpActions.Visible = False Then
+                        RbnPgGrpActions.Visible = True
+                    End If
+                    bbtniNext.Visibility = BarItemVisibility.Always
                 Else
-                    bsiInformation.Caption = "Could not get the amount of remaining docs!"
+                    bbtniNext.Visibility = BarItemVisibility.Never
+                    If bbtniDelete.Visibility = BarItemVisibility.Never And bbtniAnnotation.Visibility = BarItemVisibility.Never Then
+                        RbnPgGrpActions.Visible = False
+                    End If
+                    bsiInformation.Caption = ""
                 End If
 
                 bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID
@@ -2697,6 +2740,33 @@ Public Class frmValidator
                     ' oErrorMessage = IDB_GetDocInfo()
                 End If
 
+                Dim oCurrency As String
+                If PROFIL_CURRENCY_ATTRIBUTE <> "" Then
+                    oCurrency = GetVariableValuefromSource(PROFIL_CURRENCY_ATTRIBUTE, 1, False)
+                    MyValidationLogger.Debug(String.Format("Read oCurrency from Attribute: {0} is {1}", PROFIL_CURRENCY_ATTRIBUTE, oCurrency))
+                Else
+                    oCurrency = "EUR"
+                    MyValidationLogger.Debug(String.Format("oCurrency by default is {0}", oCurrency))
+                End If
+                If Not IsNothing(oCurrency) Then
+                    DocCurrency = oCurrency
+                    Dim oValueType = DocCurrency.GetType.ToString
+                    If IsDBNull(DocCurrency) Then
+                        DocCurrency = "EUR"
+                    Else
+                        Try
+                            DocCurrency = DocCurrency.ToString
+                        Catch ex As Exception
+                            MyValidationLogger.Warn($"Unexpected error in Converting oCurreny to string: " & ex.Message)
+                            DocCurrency = "EUR"
+                        End Try
+                    End If
+                Else
+                    MyValidationLogger.Warn($"oCurrency is Nothing - Check PROFIL_CURRENCY_ATTRIBUTE! ")
+
+                End If
+
+
 
 
                 If oErrMsgMissingInput = "" Then
@@ -2746,32 +2816,15 @@ Public Class frmValidator
                 End If
             End If
             Try
-                Dim oCurrency As String
-                If PROFIL_CURRENCY_ATTRIBUTE <> "" Then
-                    oCurrency = GetVariableValuefromSource(PROFIL_CURRENCY_ATTRIBUTE, 1, False)
-                Else
-                    oCurrency = "EUR"
-                End If
 
-                If Not IsNothing(oCurrency) Then
 
-                    Dim oValueType = oCurrency.GetType.ToString
+
-                    If IsDBNull(oCurrency) Then
+                If DocCurrency <> String.Empty Then
-                        oCurrency = "EUR"
+                        If DocCurrency.ToString.Length <> 3 Then
-                    Else
+                            MyValidationLogger.Info("DocCurrency-Length = 3 - Setting to EUR")
-                        Try
+                            DocCurrency = "EUR"
-                            oCurrency = oCurrency.ToString
-                        Catch ex As Exception
-                            MyValidationLogger.Warn($"Unexpected error in Converting oCurreny to string: " & ex.Message)
-                            oCurrency = "EUR"
-                        End Try
-                    End If
-                    If oCurrency <> String.Empty Then
-                        If oCurrency.ToString.Length <> 3 Then
-                            MyValidationLogger.Info("oCurrency-Length = 3 - Setting to EUR")
-                            oCurrency = "EUR"
                         End If
-                        MyValidationLogger.Debug($"oCurrency = {oCurrency}")
+                        MyValidationLogger.Debug($"DocCurrency = {DocCurrency}")
                         For Each oControl As Control In PanelValidatorControl.Controls
                             Try
                                 Dim oMeta = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata)
@@ -2783,7 +2836,7 @@ Public Class frmValidator
                                     DT_COLUMNS_GRID.Select(oExpression, "SEQUENCE").CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
 
                                     Dim oCultureInfo As CultureInfo = New CultureInfo("de-DE")
-                                    oCultureInfo.NumberFormat.CurrencySymbol = oCurrency
+                                    oCultureInfo.NumberFormat.CurrencySymbol = DocCurrency
                                     Dim riTextEdit As RepositoryItemTextEdit = New RepositoryItemTextEdit()
                                     riTextEdit.MaskSettings.Configure(Of MaskSettings.Numeric)(Sub(settings)
                                                                                                    settings.MaskExpression = "c"
@@ -2817,12 +2870,9 @@ Public Class frmValidator
                             End Try
                         Next
                     Else
-                        MyValidationLogger.Warn($"oCurrency is String.empty! ")
+                        MyValidationLogger.Warn($"DocCurrency is String.empty! ")
                     End If
-                Else
-                    MyValidationLogger.Warn($"oCurrency is Nothing - Check PROFIL_CURRENCY_ATTRIBUTE! ")
 
-                End If
             Catch ex As Exception
                 MyValidationLogger.Warn($"Unexpected error in display format Currency: " & ex.Message)
             End Try
@@ -2832,7 +2882,7 @@ Public Class frmValidator
             Catch ex As Exception
                 MyValidationLogger.Error(ex)
             End Try
-
+            Controls2B_EnDisabled()
 
             MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
         Catch ex As Exception
@@ -2899,13 +2949,13 @@ Public Class frmValidator
             End If
             SplitContainer1.Panel2Collapsed = True
             If Not IsNothing(DocumentViewer1) Then
-                    DocumentViewer1.Visible = False
+                DocumentViewer1.Visible = False
-                End If
+            End If
 
-                RibbonPageFile.Visible = False
+            RibbonPageFile.Visible = False
-                Exit Sub
+            Exit Sub
-            Else
+        Else
-                If Not IsNothing(DocumentViewer1) Then
+            If Not IsNothing(DocumentViewer1) Then
                 DocumentViewer1.Visible = True
             End If
 
@@ -3282,7 +3332,9 @@ Public Class frmValidator
                     oIndexName = oSourceIndexName
                     oControName = oControl.Name
                     Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
-
+                    If oIndexName = "@@DISPLAY_ONLY" Then
+                        oLoadIndex = False
+                    End If
                     MyValidationLogger.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString)
 
 
@@ -3300,10 +3352,13 @@ Public Class frmValidator
                                     Exit For
                                 End If
                                 If oSourceIndexName Is Nothing = False Then
-                                    If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then
+                                    If oLoadIndex = False Then
-                                        ' Wenn kein Index exisitiert, defaultValue laden
+                                        MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
-                                        oTextBox.EditValue = oDefaultValue
+                                        If Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
-                                        MyValidationLogger.Debug("Indexwert soll nicht geladen werden.")
+                                            ' Wenn kein Index exisitiert, defaultValue laden
+                                            oTextBox.EditValue = oDefaultValue
+                                        End If
+
                                         Exit Select
                                     End If
 
@@ -3339,7 +3394,7 @@ Public Class frmValidator
                                     MyValidationLogger.Debug("Value from Source: [{0}]", oValueFromSource)
 
                                     Try
-                                        'Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "")
+                                        Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "")
                                         'oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString)
 
                                         'If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then
@@ -3350,6 +3405,9 @@ Public Class frmValidator
 
                                         oTextBox.EditValue = ObjectEx.NotNull(oValueFromSource, oDefaultValue)
 
+                                        If oControl.GetType = GetType(DevExpress.XtraEditors.TextEdit) And oFormatString = "CURRENCY" Then
+                                            ApplyCurrencyMask(oTextBox)
+                                        End If
                                         Try
                                             Dim oBackColor As String = oControlRow.Item("CTRL_BACKCOLOR_IF")
                                             If oBackColor <> String.Empty Then
@@ -3376,7 +3434,6 @@ Public Class frmValidator
                                             MyValidationLogger.Warn($"Unexpected error in Set Backcolor [{oControl.Name}]: {ex.Message}")
                                             MyValidationLogger.Error(ex)
                                         End Try
-
                                         ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
 
                                     Catch ex As Exception
@@ -3408,13 +3465,16 @@ Public Class frmValidator
                                     Exit For
                                 End If
                                 If oSourceIndexName Is Nothing = False Then
-                                    If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then
+                                    If oLoadIndex = False Then
-                                        If oDefaultValue = String.Empty Then
-                                            oMyCombobox.SelectedIndex = -1
-                                        Else
-                                            oMyCombobox.Text = oDefaultValue
-                                        End If
                                         MyValidationLogger.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.")
+                                        If Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
+                                            If oDefaultValue = String.Empty Then
+                                                oMyCombobox.SelectedIndex = -1
+                                            Else
+                                                oMyCombobox.Text = oDefaultValue
+                                            End If
+                                        End If
+
                                         Exit Select
                                     End If
 
@@ -3494,6 +3554,7 @@ Public Class frmValidator
                                 End If
                                 If oSourceIndexName Is Nothing = False Then
                                     If oLoadIndex = False Then
+                                        MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
                                         MyValidationLogger.Debug("Indexwert soll nicht geladen werden.")
                                         Exit Select
                                     End If
@@ -3554,12 +3615,26 @@ Public Class frmValidator
                                                                 End If
 
                                                                 Dim oRowData As New List(Of Object)
+                                                                MyValidationLogger.Debug(String.Format("Now creating the rows for DevexpressGrid ..."))
+                                                                Dim oMSG = ""
+                                                                Try
+                                                                    For index = 1 To oColValuesfromSource.Length
+                                                                        oMSG = ""
+                                                                        Dim oValue = oColValuesfromSource(index - 1)
+                                                                        oMSG = String.Format("...Index [{0}] - Value [{1}]", index, oValue)
+                                                                        MyValidationLogger.Debug(oMSG)
+                                                                        Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
+                                                                        Dim oConvertedValue = ClassFormat.GetConvertedValue(oValue, oColumnType)
+                                                                        oRowData.Add(oConvertedValue)
+                                                                    Next
+                                                                Catch ex As Exception
+                                                                    MyValidationLogger.Warn(String.Format("Unexpected error while working on IDB Fill GridControl: {0}", oControl.Name))
+                                                                    If Not oMSG = String.Empty Then
+                                                                        MyValidationLogger.Warn(String.Format("oMSG: {0}", oMSG))
+                                                                    End If
+                                                                    MyValidationLogger.Error(ex)
+                                                                End Try
 
-                                                                For index = 1 To oColValuesfromSource.Length
-                                                                    Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
-                                                                    Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
-                                                                    oRowData.Add(oConvertedValue)
-                                                                Next
 
                                                                 oDataSource.Rows.Add(oRowData.ToArray())
 
@@ -3658,7 +3733,7 @@ Public Class frmValidator
                                 MyValidationLogger.Error(ex)
                                 MyValidationLogger.Info(">> Unexpected error in FillIndexValues(GridControl: " & oMyGridControl.Name & "): " & ex.Message, True)
                                 MyValidationLogger.Info(">> Controltype: " & oControlType)
-                                MyValidationLogger.Info(">> Indexname windream: " & oIndexName)
+                                MyValidationLogger.Info(">> Attributname: " & oIndexName)
                                 errormessage = "Unexpected error in FillIndexValues(Combobox: " & oMyGridControl.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
                                 My.Settings.Save()
                                 frmError.ShowDialog()
@@ -3676,8 +3751,9 @@ Public Class frmValidator
 
                                 Dim myCheckBox As CheckBox = oControl
 
-                                If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then
+                                If oLoadIndex = False Or {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
-                                    MyValidationLogger.Debug("Indexwert soll nicht geladen werden.")
+                                    MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
+                                    Exit Select
                                 End If
 
 
@@ -4009,11 +4085,37 @@ Public Class frmValidator
 
 
     End Sub
+
+    Private Sub ApplyCurrencyMask(pTextEdit As TextEdit)
+        If pTextEdit Is Nothing Then Return
+        Try
+            ' Kultur auf Basis der aktuellen UI, aber Währungssymbol aus DocCurrency setzen
+            Dim culture As New CultureInfo("de-DE")
+            ' Wenn DocCurrency leer/fehlerhaft ist, fallback auf EUR
+            Dim currencySymbol As String = If(String.IsNullOrWhiteSpace(DocCurrency) OrElse DocCurrency.Length <> 3, "EUR", DocCurrency)
+
+            ' DevExpress Numeric-Mask "c" mit angepasster Kultur
+            pTextEdit.Properties.MaskSettings.Configure(Of MaskSettings.Numeric)(
+            Sub(settings)
+                settings.MaskExpression = "c"
+                settings.Culture = DirectCast(culture.Clone(), CultureInfo)
+                settings.Culture.NumberFormat.CurrencySymbol = currencySymbol
+            End Sub)
+
+            pTextEdit.Properties.UseMaskAsDisplayFormat = True
+
+
+        Catch ex As Exception
+            MyValidationLogger.Warn(String.Format("Unexpected error while applying CurrencyMaskfor pTextEdit: [{0} - ERROR: {1}", pTextEdit.Name, ex.Message))
+
+        End Try
+
+    End Sub
+
     Private Sub frmValidation_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
         '  Refresh_FileList()
         Load_Next_Document(True)
 
-        Controls2B_EnDisabled_on_Load()
         _DependingControl_In_Action = False
         _DependingColumn_In_Action = False
 
@@ -4229,8 +4331,7 @@ Public Class frmValidator
     End Function
     Sub Finish_WFStep(Optional includeFI As Boolean = True)
         btnSave.Enabled = False
-        MyValidationLogger.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet")
+        MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...")
-        _ItemWorked = True
         Dim oErrorOcurred As Boolean = False
         If OverrideAll = False Then
             'Eingaben auf Form überprüfen
@@ -4273,7 +4374,6 @@ Public Class frmValidator
                                         My.Settings.Save()
                                         frmError.ShowDialog()
                                         oErrorOcurred = True
-                                        _ItemWorked = False
                                     End If
                                     If Not IsNothing(oSQLCommand) Then
                                         Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID)
@@ -4285,7 +4385,6 @@ Public Class frmValidator
                                                     My.Settings.Save()
                                                     frmError.ShowDialog()
                                                     oErrorOcurred = True
-                                                    _ItemWorked = False
                                                 Else
                                                     MyValidationLogger.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, Continuing with next Attribute and Replacing with empty String")
                                                     oResultfromSQL = ""
@@ -4299,7 +4398,6 @@ Public Class frmValidator
                                                     My.Settings.Save()
                                                     frmError.ShowDialog()
                                                     oErrorOcurred = True
-                                                    _ItemWorked = False
                                                 Else
                                                     MyValidationLogger.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute")
                                                     Continue For
@@ -4344,7 +4442,6 @@ Public Class frmValidator
                                         My.Settings.Save()
                                         frmError.ShowDialog()
                                         oErrorOcurred = True
-                                        _ItemWorked = False
                                     End If
                                 Else
                                     MyValidationLogger.Debug("Now the final indexing...")
@@ -4376,12 +4473,10 @@ Public Class frmValidator
                                         My.Settings.Save()
                                         frmError.ShowDialog()
                                         oErrorOcurred = True
-                                        _ItemWorked = False
                                     End If
 
                                 End If
                                 If oErrorOcurred = True Then
-                                    _ItemWorked = False
                                     Exit For
                                 End If
                             Next
@@ -4501,35 +4596,38 @@ Public Class frmValidator
                         DatabaseFallback.ExecuteNonQueryECM(ins)
                         Dim oFIsql As String
                         'Close_document_viewer()
-                        If Current_Document.Extension = "pdf" Then
+                        If Not IsNothing(Current_Document) Then
-                            If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                            If Current_Document.Extension = "pdf" Then
-                                If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
+                                If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                                    oFIsql = 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)
+                                    If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
-                                    Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
+                                        oFIsql = 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)
-                                    If Not IsNothing(DT_ENTRY) Then
+                                        Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
-                                        If DT_ENTRY.Rows.Count = 1 Then
+                                        If Not IsNothing(DT_ENTRY) Then
-                                            Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
+                                            If DT_ENTRY.Rows.Count = 1 Then
-                                            ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
+                                                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)
+                                            End If
                                         End If
                                     End If
-                                End If
+                                    Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
-                                Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
+                                    If CBool(oAnnotateAllWHEs) = True Then
-                                If CBool(oAnnotateAllWHEs) = True Then
+                                        oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
-                                    oFIsql = 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(oFIsql) ', "Finish_WFStep3")
-                                    Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
+                                        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, False, 10, 40)
-                                            ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
+                                            End If
                                         End If
                                     End If
                                 End If
                             End If
                         End If
 
+
                         'wenn Move2Folder aktiviert wurde
                         If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then
                             idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG)
@@ -4538,7 +4636,6 @@ Public Class frmValidator
                                 My.Settings.Save()
                                 frmError.ShowDialog()
                                 oErrorOcurred = True
-                                _ItemWorked = False
                             End If
                         End If
 
@@ -4552,7 +4649,6 @@ Public Class frmValidator
                     My.Settings.Save()
                     frmError.ShowDialog()
                     oErrorOcurred = True
-                    _ItemWorked = False
                     MyValidationLogger.Info("Unexpected error in Finish: " & ex.Message, True)
                     Exit Sub
                 End Try
@@ -4562,7 +4658,6 @@ Public Class frmValidator
                 errormessage = oErrMsgMissingInput
                 frmError.ShowDialog()
                 oErrorOcurred = True
-                _ItemWorked = False
                 Exit Sub
             End If
         Else
@@ -4577,7 +4672,6 @@ Public Class frmValidator
         End If
         If oErrorOcurred = True Then
             MsgBox("Unhandled error occured in Finish Workflow-Step...Please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
-            _ItemWorked = False
         Else
             'PRTF_PROFILE_FILES_WORK("Worked")
             MyValidationLogger.Debug("Validation of document ended successfully!")
@@ -4756,10 +4850,10 @@ Public Class frmValidator
                     Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA")
 
                     'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist
-                    If oDBControlName = oControl.Name And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then
+                    If oDBControlName = oControl.Name And Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oIndexName) Then
                         MyValidationLogger.Debug("Indexierung für Control (" & oControlId & ") '" & oControlName & "' gestartet. Indexname '" & oIndexName & "'")
                         If oIndexName = "" Then
-                            MyValidationLogger.Info(" >> Indexname is unexpected empty.")
+                            MyValidationLogger.Info(">> Indexname is unexpected empty.")
                             Continue For
                         End If
                         Select Case True
@@ -4965,7 +5059,6 @@ Public Class frmValidator
                                         oMissing = True
 
                                         oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
-
                                         MyValidationLogger.Warn(oErrMsgMissingInput)
                                         If oRegexMessage <> String.Empty Then
                                             oErrMsgMissingInput &= ":" & vbCrLf & oRegexMessage
@@ -5936,7 +6029,6 @@ Public Class frmValidator
         My.Settings.Save()
     End Sub
     Private Sub btnSave_MouseHover(sender As Object, e As EventArgs)
-        'Dim oMsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("F2forSave")
         ToolTip1.Show(S.F2_für_Speichern, btnSave)
     End Sub
 
@@ -5950,8 +6042,14 @@ Public Class frmValidator
     Sub SetStatusLabel(infotext As String, Optional pColor As String = "")
         bsiInformation.Caption = infotext & " " & Now.ToString
         If pColor <> String.Empty Then
-            bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor)
+            Try
-            bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor))
+                bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor)
+                bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor))
+            Catch ex As Exception
+                bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent
+                bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black
+            End Try
+
         Else
             bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent
             bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black
@@ -5999,7 +6097,6 @@ Public Class frmValidator
     Private Sub bbtniRefresh_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtniRefresh.ItemClick
         Reload_Controls("")
         Try
-            'btnSave.Text = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.ValidationButton")
             btnSave.Text = S.Speichern___Nächster_Vorgang__F2_
         Catch ex As Exception
 
@@ -6250,17 +6347,42 @@ Public Class frmValidator
                 End If
             End If
         Next
-
+        Dim oIncludeFI As Boolean = False
-
+        OverrideAll = True
-        oProfile_NOT_RESP_SQL = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True)
+        Override = True
+        Override_SQLCommand = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True)
         Dim oCaption As String = "Bestätigung - "
         If USER_LANGUAGE <> "de-DE" Then
             oCaption = "Confirmation - "
         End If
-        Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion, oCaption + oProfileNotResponsibleText, oCommentSoFar)
+        Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion, oCaption + oProfileNotResponsibleText, oCommentSoFar, PROFILE_NOT_RESP_COMMENT)
         frmDialog.ShowDialog()
         ' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
         If frmDialog.DialogResult = DialogResult.OK Then
+            Dim oOverrideDT As DataTable = DatabaseFallback.GetDatatableECM(Override_SQLCommand)
+            If Not IsNothing(oOverrideDT) Then
+                If oOverrideDT.Rows.Count = 1 Then
+                    Try
+                        OverrideAll = oOverrideDT?.Rows(0).Item("OverrideAll")
+                    Catch ex As Exception
+                        MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}")
+                    End Try
+                    Try
+                        oIncludeFI = oOverrideDT?.Rows(0).Item("IncludeFI")
+                    Catch ex As Exception
+                        MyValidationLogger.Warn($"Could not set oIncludeFI {ex.Message}")
+                    End Try
+                Else
+                    MyValidationLogger.Info(String.Format("Result of oProfile_NOT_RESP_SQL did not delivered a Datatable - OverrideAll = True"))
+                End If
+            Else
+                MyValidationLogger.Warn(String.Format("oProfile_NOT_RESP_SQL returned Nothing - OverrideAll = True"))
+            End If
+
+            If OverrideAll = True Then
+                MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!")
+            End If
+
 
             'For Each oControl As Control In PanelValidatorControl.Controls
             '    If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Attribute = PROFIL_NOT_RESP_COMMENT_ATTR Then
@@ -6282,13 +6404,8 @@ Public Class frmValidator
                 Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment)
             Else
                 Dim oREsult = IDBData.SetVariableValue(PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment)
-
             End If
-
+            Finish_WFStep(oIncludeFI)
-            OverrideAll = True
-            Override_SQLCommand = oProfile_NOT_RESP_SQL
-            Override = True
-            Finish_WFStep()
         End If
     End Sub
 

app/TaskFlow/frmValidatorSearch.Designer.vb

@@ -150,7 +150,7 @@ Partial Class frmValidatorSearch
         '
         Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1)
         resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2")
-        Me.SplitContainerControlDoc.SplitterPosition = 351
+        Me.SplitContainerControlDoc.SplitterPosition = 468
         '
         'XtraTabControlDocs
         '
@@ -162,12 +162,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageDoc1
         '
         Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1)
-        Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1"
         resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1")
+        Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1"
         '
         'GridControlDocSearch1
         '
         resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1")
+        Me.GridControlDocSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode1.RelationName = "Level1"
         Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
         Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1
@@ -180,6 +181,7 @@ Partial Class frmValidatorSearch
         Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewDocSearch1.DetailHeight = 458
         Me.GridViewDocSearch1.GridControl = Me.GridControlDocSearch1
         Me.GridViewDocSearch1.Name = "GridViewDocSearch1"
         Me.GridViewDocSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -194,12 +196,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageDoc2
         '
         Me.XtraTabPageDoc2.Controls.Add(Me.GridControlDocSearch2)
-        Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2"
         resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2")
+        Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2"
         '
         'GridControlDocSearch2
         '
         resources.ApplyResources(Me.GridControlDocSearch2, "GridControlDocSearch2")
+        Me.GridControlDocSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridControlDocSearch2.MainView = Me.GridViewDocSearch2
         Me.GridControlDocSearch2.Name = "GridControlDocSearch2"
         Me.GridControlDocSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch2})
@@ -210,6 +213,7 @@ Partial Class frmValidatorSearch
         Me.GridViewDocSearch2.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewDocSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewDocSearch2.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewDocSearch2.DetailHeight = 458
         Me.GridViewDocSearch2.GridControl = Me.GridControlDocSearch2
         Me.GridViewDocSearch2.Name = "GridViewDocSearch2"
         Me.GridViewDocSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -224,12 +228,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageDoc3
         '
         Me.XtraTabPageDoc3.Controls.Add(Me.GridControlDocSearch3)
-        Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3"
         resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3")
+        Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3"
         '
         'GridControlDocSearch3
         '
         resources.ApplyResources(Me.GridControlDocSearch3, "GridControlDocSearch3")
+        Me.GridControlDocSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridControlDocSearch3.MainView = Me.GridViewDocSearch3
         Me.GridControlDocSearch3.Name = "GridControlDocSearch3"
         Me.GridControlDocSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch3})
@@ -240,6 +245,7 @@ Partial Class frmValidatorSearch
         Me.GridViewDocSearch3.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewDocSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewDocSearch3.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewDocSearch3.DetailHeight = 458
         Me.GridViewDocSearch3.GridControl = Me.GridControlDocSearch3
         Me.GridViewDocSearch3.Name = "GridViewDocSearch3"
         Me.GridViewDocSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -254,12 +260,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageDoc4
         '
         Me.XtraTabPageDoc4.Controls.Add(Me.GridControlDocSearch4)
-        Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4"
         resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4")
+        Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4"
         '
         'GridControlDocSearch4
         '
         resources.ApplyResources(Me.GridControlDocSearch4, "GridControlDocSearch4")
+        Me.GridControlDocSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridControlDocSearch4.MainView = Me.GridViewDocSearch4
         Me.GridControlDocSearch4.Name = "GridControlDocSearch4"
         Me.GridControlDocSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch4})
@@ -270,6 +277,7 @@ Partial Class frmValidatorSearch
         Me.GridViewDocSearch4.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewDocSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewDocSearch4.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewDocSearch4.DetailHeight = 458
         Me.GridViewDocSearch4.GridControl = Me.GridControlDocSearch4
         Me.GridViewDocSearch4.Name = "GridViewDocSearch4"
         Me.GridViewDocSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -284,12 +292,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageDoc5
         '
         Me.XtraTabPageDoc5.Controls.Add(Me.GridControlDocSearch5)
-        Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5"
         resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5")
+        Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5"
         '
         'GridControlDocSearch5
         '
         resources.ApplyResources(Me.GridControlDocSearch5, "GridControlDocSearch5")
+        Me.GridControlDocSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridControlDocSearch5.MainView = Me.GridViewDocSearch5
         Me.GridControlDocSearch5.Name = "GridControlDocSearch5"
         Me.GridControlDocSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch5})
@@ -300,6 +309,7 @@ Partial Class frmValidatorSearch
         Me.GridViewDocSearch5.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewDocSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewDocSearch5.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewDocSearch5.DetailHeight = 458
         Me.GridViewDocSearch5.GridControl = Me.GridControlDocSearch5
         Me.GridViewDocSearch5.Name = "GridViewDocSearch5"
         Me.GridViewDocSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -313,9 +323,11 @@ Partial Class frmValidatorSearch
         '
         'DocumentViewer1
         '
+        Me.DocumentViewer1.BackColor = System.Drawing.SystemColors.ControlLightLight
         resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
         Me.DocumentViewer1.FileLoaded = False
         Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
         '
         'SplitContainerSearches
         '
@@ -344,12 +356,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageSearch1
         '
         Me.XtraTabPageSearch1.Controls.Add(Me.GridControlSearch1)
-        Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1"
         resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1")
+        Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1"
         '
         'GridControlSearch1
         '
         resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1")
+        Me.GridControlSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode2.RelationName = "Level1"
         Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
         Me.GridControlSearch1.MainView = Me.GridViewSearch1
@@ -362,6 +375,7 @@ Partial Class frmValidatorSearch
         Me.GridViewSearch1.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewSearch1.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewSearch1.DetailHeight = 458
         Me.GridViewSearch1.GridControl = Me.GridControlSearch1
         Me.GridViewSearch1.Name = "GridViewSearch1"
         Me.GridViewSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -376,12 +390,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageSearch2
         '
         Me.XtraTabPageSearch2.Controls.Add(Me.GridControlSearch2)
-        Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2"
         resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2")
+        Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2"
         '
         'GridControlSearch2
         '
         resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2")
+        Me.GridControlSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode3.RelationName = "Level1"
         Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3})
         Me.GridControlSearch2.MainView = Me.GridViewSearch2
@@ -394,6 +409,7 @@ Partial Class frmValidatorSearch
         Me.GridViewSearch2.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewSearch2.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewSearch2.DetailHeight = 458
         Me.GridViewSearch2.GridControl = Me.GridControlSearch2
         Me.GridViewSearch2.Name = "GridViewSearch2"
         Me.GridViewSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -408,12 +424,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageSearch3
         '
         Me.XtraTabPageSearch3.Controls.Add(Me.GridControlSearch3)
-        Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3"
         resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3")
+        Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3"
         '
         'GridControlSearch3
         '
         resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3")
+        Me.GridControlSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode4.RelationName = "Level1"
         Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
         Me.GridControlSearch3.MainView = Me.GridViewSearch3
@@ -426,6 +443,7 @@ Partial Class frmValidatorSearch
         Me.GridViewSearch3.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewSearch3.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewSearch3.DetailHeight = 458
         Me.GridViewSearch3.GridControl = Me.GridControlSearch3
         Me.GridViewSearch3.Name = "GridViewSearch3"
         Me.GridViewSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -440,12 +458,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageSearch4
         '
         Me.XtraTabPageSearch4.Controls.Add(Me.GridControlSearch4)
-        Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4"
         resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4")
+        Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4"
         '
         'GridControlSearch4
         '
         resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4")
+        Me.GridControlSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode5.RelationName = "Level1"
         Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5})
         Me.GridControlSearch4.MainView = Me.GridViewSearch4
@@ -458,6 +477,7 @@ Partial Class frmValidatorSearch
         Me.GridViewSearch4.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewSearch4.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewSearch4.DetailHeight = 458
         Me.GridViewSearch4.GridControl = Me.GridControlSearch4
         Me.GridViewSearch4.Name = "GridViewSearch4"
         Me.GridViewSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -472,12 +492,13 @@ Partial Class frmValidatorSearch
         'XtraTabPageSearch5
         '
         Me.XtraTabPageSearch5.Controls.Add(Me.GridControlSearch5)
-        Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5"
         resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5")
+        Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5"
         '
         'GridControlSearch5
         '
         resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5")
+        Me.GridControlSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         GridLevelNode6.RelationName = "Level1"
         Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6})
         Me.GridControlSearch5.MainView = Me.GridViewSearch5
@@ -490,6 +511,7 @@ Partial Class frmValidatorSearch
         Me.GridViewSearch5.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
         Me.GridViewSearch5.Appearance.SelectedRow.Options.UseBackColor = True
+        Me.GridViewSearch5.DetailHeight = 458
         Me.GridViewSearch5.GridControl = Me.GridControlSearch5
         Me.GridViewSearch5.Name = "GridViewSearch5"
         Me.GridViewSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -539,6 +561,7 @@ Partial Class frmValidatorSearch
         '
         'ToolStrip1
         '
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButtonFile, Me.ToolStripButtonRefreshSearches})
         resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
         Me.ToolStrip1.Name = "ToolStrip1"

app/TaskFlow/frmValidatorSearch.resx

@@ -125,20 +125,32 @@
   <data name="SplitContainerControlDoc.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="SplitContainerControlDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="XtraTabControlDocs.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="XtraTabControlDocs.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="XtraTabControlDocs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlDocSearch1.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlDocSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>583, 933</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -156,8 +168,11 @@
   <data name="&gt;&gt;GridControlDocSearch1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageDoc1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageDoc1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>466, 746</value>
   </data>
   <data name="XtraTabPageDoc1.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -175,7 +190,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabControlDocs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>351, 582</value>
+    <value>468, 764</value>
   </data>
   <data name="XtraTabControlDocs.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -183,11 +198,17 @@
   <data name="GridControlDocSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlDocSearch2.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlDocSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>583, 920</value>
   </data>
   <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -204,8 +225,11 @@
   <data name="&gt;&gt;GridControlDocSearch2.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageDoc2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageDoc2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>466, 736</value>
   </data>
   <data name="XtraTabPageDoc2.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -225,11 +249,17 @@
   <data name="GridControlDocSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlDocSearch3.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch3.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlDocSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>583, 916</value>
   </data>
   <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -246,8 +276,11 @@
   <data name="&gt;&gt;GridControlDocSearch3.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageDoc3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageDoc3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>466, 733</value>
   </data>
   <data name="XtraTabPageDoc3.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -267,11 +300,17 @@
   <data name="GridControlDocSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlDocSearch4.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch4.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlDocSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>583, 916</value>
   </data>
   <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -288,8 +327,11 @@
   <data name="&gt;&gt;GridControlDocSearch4.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageDoc4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageDoc4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>466, 733</value>
   </data>
   <data name="XtraTabPageDoc4.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -309,11 +351,17 @@
   <data name="GridControlDocSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlDocSearch5.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch5.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlDocSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>583, 916</value>
   </data>
   <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -330,8 +378,11 @@
   <data name="&gt;&gt;GridControlDocSearch5.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageDoc5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageDoc5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 559</value>
+    <value>466, 733</value>
   </data>
   <data name="XtraTabPageDoc5.Text" xml:space="preserve">
     <value>XtraTabPage3</value>
@@ -381,8 +432,11 @@
   <data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 582</value>
+    <value>621, 764</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -391,7 +445,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainerControlDoc.Panel2</value>
@@ -415,7 +469,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 582</value>
+    <value>1101, 764</value>
   </data>
   <data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -436,7 +490,10 @@
     <value>Fill</value>
   </data>
   <data name="SplitContainerSearches.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+    <value>0, 31</value>
+  </data>
+  <data name="SplitContainerSearches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="XtraTabControlSQL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -444,14 +501,23 @@
   <data name="XtraTabControlSQL.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="XtraTabControlSQL.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlSearch1.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>639, 926</value>
   </data>
   <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -468,8 +534,11 @@
   <data name="&gt;&gt;GridControlSearch1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
+  </data>
   <data name="XtraTabPageSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 741</value>
   </data>
   <data name="XtraTabPageSearch1.Text" xml:space="preserve">
     <value>Search1</value>
@@ -487,7 +556,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 585</value>
+    <value>513, 769</value>
   </data>
   <data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -495,11 +564,17 @@
   <data name="GridControlSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlSearch2.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>639, 915</value>
   </data>
   <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -516,8 +591,11 @@
   <data name="&gt;&gt;GridControlSearch2.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 732</value>
   </data>
   <data name="XtraTabPageSearch2.Text" xml:space="preserve">
     <value>Search2</value>
@@ -537,11 +615,17 @@
   <data name="GridControlSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlSearch3.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch3.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>639, 915</value>
   </data>
   <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -558,8 +642,11 @@
   <data name="&gt;&gt;GridControlSearch3.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 732</value>
   </data>
   <data name="XtraTabPageSearch3.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -579,11 +666,17 @@
   <data name="GridControlSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlSearch4.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch4.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>639, 915</value>
   </data>
   <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -600,8 +693,11 @@
   <data name="&gt;&gt;GridControlSearch4.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 732</value>
   </data>
   <data name="XtraTabPageSearch4.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -621,11 +717,17 @@
   <data name="GridControlSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="GridControlSearch5.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch5.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="GridControlSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>639, 915</value>
   </data>
   <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -642,8 +744,11 @@
   <data name="&gt;&gt;GridControlSearch5.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="XtraTabPageSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>511, 732</value>
   </data>
   <data name="XtraTabPageSearch5.Text" xml:space="preserve">
     <value>XtraTabPage3</value>
@@ -676,19 +781,22 @@
     <value>595, 17</value>
   </metadata>
   <data name="tsslblSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 17</value>
+    <value>115, 20</value>
   </data>
   <data name="tsslblSQL.Text" xml:space="preserve">
     <value>No action so far</value>
   </data>
   <data name="statlbl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 17</value>
+    <value>0, 20</value>
   </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 585</value>
+    <value>0, 769</value>
+  </data>
+  <data name="StatusStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 19, 0</value>
   </data>
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 22</value>
+    <value>513, 26</value>
   </data>
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -727,22 +835,22 @@
     <value>Bottom</value>
   </data>
   <data name="tslblDocID.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 22</value>
+    <value>79, 28</value>
   </data>
   <data name="tslblDocID.Text" xml:space="preserve">
     <value>tslblDocID</value>
   </data>
   <data name="tslblState.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 22</value>
+    <value>115, 28</value>
   </data>
   <data name="tslblState.Text" xml:space="preserve">
     <value>No action so far</value>
   </data>
   <data name="ToolStrip2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 582</value>
+    <value>0, 764</value>
   </data>
   <data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 25</value>
+    <value>1101, 31</value>
   </data>
   <data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -775,7 +883,10 @@
     <value>1</value>
   </data>
   <data name="SplitContainerSearches.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1214, 607</value>
+    <value>1619, 795</value>
+  </data>
+  <data name="SplitContainerSearches.SplitterWidth" type="System.Int32, mscorlib">
+    <value>5</value>
   </data>
   <data name="SplitContainerSearches.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -796,13 +907,13 @@
     <value>17, 17</value>
   </metadata>
   <data name="DateiÖffnenToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>148, 22</value>
+    <value>184, 26</value>
   </data>
   <data name="DateiÖffnenToolStripMenuItem1.Text" xml:space="preserve">
     <value>Öffnen</value>
   </data>
   <data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>148, 22</value>
+    <value>184, 26</value>
   </data>
   <data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
     <value>Eigenschaften</value>
@@ -811,7 +922,7 @@
     <value>Magenta</value>
   </data>
   <data name="ToolStripDropDownButtonFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 22</value>
+    <value>79, 28</value>
   </data>
   <data name="ToolStripDropDownButtonFile.Text" xml:space="preserve">
     <value>Datei</value>
@@ -820,7 +931,7 @@
     <value>Magenta</value>
   </data>
   <data name="ToolStripButtonRefreshSearches.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 22</value>
+    <value>162, 28</value>
   </data>
   <data name="ToolStripButtonRefreshSearches.Text" xml:space="preserve">
     <value>Aktualisiere Ansicht</value>
@@ -829,7 +940,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1214, 25</value>
+    <value>1619, 31</value>
   </data>
   <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -855,7 +966,7 @@
   <data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACbElE
         QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
         EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
         R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@@ -870,7 +981,7 @@
 </value>
   </data>
   <data name="EigenschaftenDateiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 30</value>
+    <value>218, 30</value>
   </data>
   <data name="EigenschaftenDateiToolStripMenuItem.Text" xml:space="preserve">
     <value>Eigenschaften Datei</value>
@@ -922,7 +1033,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYdJREFUOE+NkG0rQ2Ec
         h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
         XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
         drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
@@ -933,28 +1044,28 @@
 </value>
   </data>
   <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 30</value>
+    <value>218, 30</value>
   </data>
   <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
     <value>Datei öffnen</value>
   </data>
   <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>186, 6</value>
+    <value>215, 6</value>
   </data>
   <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 30</value>
+    <value>218, 30</value>
   </data>
   <data name="ToolStripMenuItem1.Text" xml:space="preserve">
     <value>Aktualisieren</value>
   </data>
   <data name="LayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 30</value>
+    <value>218, 30</value>
   </data>
   <data name="LayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve">
     <value>Layout zurücksetzen</value>
   </data>
   <data name="ContextMenuStripWMFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>190, 130</value>
+    <value>219, 130</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripWMFile.Name" xml:space="preserve">
     <value>ContextMenuStripWMFile</value>
@@ -966,16 +1077,16 @@
     <value>423, 17</value>
   </metadata>
   <data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 6</value>
+    <value>168, 6</value>
   </data>
   <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 30</value>
+    <value>171, 30</value>
   </data>
   <data name="ToolStripMenuItem4.Text" xml:space="preserve">
     <value>Aktualisieren</value>
   </data>
   <data name="ContextMenuStripSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>151, 40</value>
+    <value>172, 40</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripSQL.Name" xml:space="preserve">
     <value>ContextMenuStripSQL</value>
@@ -990,10 +1101,10 @@
     <value>81</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 17</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1214, 632</value>
+    <value>1619, 826</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt</value>
@@ -1031,6 +1142,9 @@
         AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAP//AAA=
 </value>
   </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Zusätzliche Suchen</value>
   </data>

app/TaskFlow/frmValidatorSearch.vb

@@ -87,6 +87,7 @@ Public Class frmValidatorSearch
                 '#### SQL Tabs Design Laden
 
                 If DTSQL.Rows.Count > 0 Then
+                    LOGGER.Debug(String.Format("[{0} SQL-Definitions]", DTSQL.Rows.Count))
                     For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
                         If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
                             XtraTabControlSQL.TabPages(p).PageVisible = False
@@ -102,6 +103,7 @@ Public Class frmValidatorSearch
                 End If
 
                 If DTDOC.Rows.Count > 0 Then
+                    LOGGER.Debug(String.Format("[{0} Doc-Definitions]", DTDOC.Rows.Count))
                     '#### Doc Tabs Design Laden
                     For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
                         If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
@@ -454,9 +456,14 @@ Public Class frmValidatorSearch
             End If
         End If
         If My.Settings.frmValidatorSearchSize.IsEmpty = False Then
-            Size = My.Settings.frmValidatorSearchSize
+            If My.Settings.frmValidatorSearchSize.Height > 120 And My.Settings.frmValidatorSearchSize.Width > 120 Then
+                Me.Size = My.Settings.frmValidatorSearchSize
+            End If
         End If
-        SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
+        If My.Settings.frmValSearchSplitterDistance > 20 Then
+            SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
+        End If
+
 
         ToolStripDropDownButtonFile.Visible = False
     End Sub

app/TaskFlow/frmYesNo.Designer.vb

@@ -56,7 +56,7 @@ Partial Class frmYesNo
         '
         resources.ApplyResources(Me.PictureEdit1, "PictureEdit1")
         Me.PictureEdit1.Name = "PictureEdit1"
-        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control
+        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.White
         Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True
         Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
         Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
@@ -64,7 +64,7 @@ Partial Class frmYesNo
         '
         'txtQuestion
         '
-        Me.txtQuestion.BackColor = System.Drawing.SystemColors.Control
+        Me.txtQuestion.BackColor = System.Drawing.Color.White
         Me.txtQuestion.BorderStyle = System.Windows.Forms.BorderStyle.None
         resources.ApplyResources(Me.txtQuestion, "txtQuestion")
         Me.txtQuestion.Name = "txtQuestion"

app/TaskFlow/frmYesNo.resx

@@ -187,7 +187,7 @@
     <value>1</value>
   </data>
   <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>242, 277</value>
+    <value>243, 265</value>
   </data>
   <data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
@@ -273,7 +273,7 @@
     <value>True</value>
   </data>
   <data name="txtQuestion.Size" type="System.Drawing.Size, System.Drawing">
-    <value>378, 68</value>
+    <value>378, 54</value>
   </data>
   <data name="txtQuestion.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -330,7 +330,7 @@
     <value>True</value>
   </data>
   <data name="txtReason.Size" type="System.Drawing.Size, System.Drawing">
-    <value>428, 139</value>
+    <value>429, 135</value>
   </data>
   <data name="txtReason.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -354,7 +354,7 @@
     <value>7, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>452, 326</value>
+    <value>453, 316</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 9.75pt</value>

app/TaskFlow/frmYesNo.vb

@@ -3,18 +3,20 @@
 Public Class frmYesNo
     Dim oQuestion As String
     Dim oCaption As String
+    Dim CommentInput As Boolean
     Public oComment As String
-    Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String)
+    Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String, pCommentInput As Boolean)
         MyBase.New()
         oQuestion = pQuestion
         oCaption = pCaption
         oComment = pCommentSoFar
+        CommentInput = pCommentInput
         InitializeComponent()
         ' Add any initialization after the InitializeComponent() call.
 
     End Sub
     Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-        If txtReason.Text = String.Empty Then
+        If txtReason.Text = String.Empty And CommentInput = True Then
             Dim oStop As String
             If USER_LANGUAGE = "de-DE" Then
                 oStop = "Bitte eine Begründung eingeben!"
@@ -42,6 +44,15 @@ Public Class frmYesNo
     Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load
         txtQuestion.Text = oQuestion
         txtReason.Text = oComment
+        If CommentInput = False Then
+            LabelControl1.Visible = False
+            txtReason.Visible = False
+            Me.Size = New Drawing.Size(455, 170)
+        Else
+            LabelControl1.Visible = True
+            txtReason.Visible = True
+            Me.Size = New Drawing.Size(455, 330)
+        End If
         Me.Text = oCaption
     End Sub
 End Class

app/TaskFlow/packages.config

@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.GUIs.Common" version="2.6.2" targetFramework="net462" />
-  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
-  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Filesystem" version="1.3.3" targetFramework="net462" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
-  <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Patterns" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Windows" version="1.5.1" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
   <package id="GdPicture.runtimes.windows" version="14.3.3" 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" />
@@ -35,7 +25,7 @@
   <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
   <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
-  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
   <package id="System.Management" version="9.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />