MS UserItemsReplace

2019-12-04 13:40:05 +01:00 · 2019-12-04 13:40:05 +01:00 · 9ad1fe7709
commit 9ad1fe7709
parent 5daf8617ed
46 changed files with 3229 additions and 1819 deletions
--- a/app/.vs/DD-Record-Organizer/DesignTimeBuild/.dtbcache
+++ b/app/.vs/DD-Record-Organizer/DesignTimeBuild/.dtbcache
--- a/app/DD-Record-Organizer/ClassControlLoader.vb
+++ b/app/DD-Record-Organizer/ClassControlLoader.vb
@ -326,7 +326,7 @@
                            control.Text = value
                        End If
                    Else
-                        Dim drarray() As DataRow = CURRENT_SQL_AUTO_VALUES_DT.Select("CONTROL_ID = " & ControlId)
+                        Dim drarray() As DataRow = CURRENT_SQL_AUTO_VALUES_DT.Select("GUID = " & ControlId)
                        If drarray.Length > 0 Then
                            Dim autoValue
                            Dim ID
--- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb
@ -110,12 +110,12 @@ Public Class ClassDOC_SEARCH
               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
-                "(SELECT DISTINCT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine &
-                "(SELECT DISTINCT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine &
-                "(SELECT DISTINCT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine &
-                "(SELECT DISTINCT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC3.GUID) AS VALUE4," & vbNewLine &
-                "dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
-                "FROM " & vbNewLine &
+               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID) AS VALUE1," & vbNewLine &
+               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID) AS VALUE2," & vbNewLine &
+               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID) AS VALUE3," & vbNewLine &
+               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID) AS VALUE4," & vbNewLine &
+               "dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
+               "FROM " & vbNewLine &
               "VWPMO_DOC_SEARCH T " & vbNewLine &
               "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
               "INNER JOIN TBPMO_RECORD TR	ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
@ -167,10 +167,10 @@ Public Class ClassDOC_SEARCH
             "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
             "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
             "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
-              "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine &
-              "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine &
-              "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine &
-              "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine &
+             "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID) AS VALUE1," & vbNewLine &
+             "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID) AS VALUE2," & vbNewLine &
+             "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID) AS VALUE3," & vbNewLine &
+             "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID) AS VALUE4" & vbNewLine &
             "FROM " & vbNewLine &
             "VWPMO_DOC_SEARCH T " & vbNewLine &
             "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
--- a/app/DD-Record-Organizer/ClassDatabase.vb
+++ b/app/DD-Record-Organizer/ClassDatabase.vb
@ -271,7 +271,34 @@ Public Class ClassDatabase
            Return False
        End Try
    End Function
+    Public Shared Function Execute_non_Query_withConnString(ExecuteCMD As String, theconnstring As String)
+        Try
+            Dim sw As New SW("Execute_non_Query_withConnString: " & ExecuteCMD)

+
+            Dim SQLconnect As New SqlClient.SqlConnection
+            Dim SQLcommand As SqlClient.SqlCommand
+            SQLconnect.ConnectionString = theconnstring
+            SQLconnect.Open()
+            SQLcommand = SQLconnect.CreateCommand
+            'Update Last Created Record in Foo
+            SQLcommand.CommandText = ExecuteCMD
+            SQLcommand.CommandTimeout = 120
+            SQLcommand.ExecuteNonQuery()
+            SQLcommand.Dispose()
+            SQLconnect.Close()
+
+            sw.Done()
+
+            Return True
+
+
+        Catch ex As Exception
+            ClassLogger.Add("Error in Execute_non_Query_withConnString: " & ex.Message, True)
+            ClassLogger.Add("SQL: " & ExecuteCMD, False)
+            Return False
+        End Try
+    End Function
    'TODO: Asynchrone Abfrage möglich machen
    Public Shared Sub Execute_non_Query_Async(ExecuteCMD As String, Optional Userinput As Boolean = False)
        Dim SQLconnect As New SqlClient.SqlConnection
@ -373,6 +400,28 @@ Public Class ClassDatabase
            Return Nothing
        End Try
    End Function
+    Public Shared Function Execute_ScalarWithConnectionString(connectionString As String, cmdscalar As String)
+        Dim result
+        Try
+
+            Dim SQLconnect As New SqlClient.SqlConnection
+            Dim SQLcommand As SqlClient.SqlCommand
+            SQLconnect.ConnectionString = connectionString
+            SQLconnect.Open()
+            SQLcommand = SQLconnect.CreateCommand
+            'Update Last Created Record in Foo
+            SQLcommand.CommandText = cmdscalar
+            SQLcommand.CommandTimeout = 120
+            result = SQLcommand.ExecuteScalar()
+            SQLcommand.Dispose()
+            SQLconnect.Close()
+            Return result
+        Catch ex As Exception
+            ClassLogger.Add("Error in Execute_ScalarWithConnectionString: " & ex.Message, True)
+            ClassLogger.Add("SQL: " & cmdscalar, False)
+            Return Nothing
+        End Try
+    End Function

    Public Shared Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
        Dim result
--- a/app/DD-Record-Organizer/ClassHelper.vb
+++ b/app/DD-Record-Organizer/ClassHelper.vb
@ -422,6 +422,5 @@ Public Class ClassHelper
            Return Nothing
        End Try

-
    End Function
 End Class
--- a/app/DD-Record-Organizer/ClassInit.vb
+++ b/app/DD-Record-Organizer/ClassInit.vb
@ -304,7 +304,7 @@ Public Class ClassInit

                    End If
                    If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
-                        SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""')"
+                        SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') "
                    End If
                    Return True
                    'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
--- a/app/DD-Record-Organizer/ClassNodeNavigation.vb
+++ b/app/DD-Record-Organizer/ClassNodeNavigation.vb
@ -103,9 +103,9 @@ Public Class ClassNodeNavigation
            End If
            If NODE_CONFIGURABLE_NODES_DT.Rows.Count > 0 And IsNumeric(NODE_ID) Then
                'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt
-                Dim table As DataTable = NODE_CONFIGURABLE_NODES_DT
+                Dim oTable As DataTable = NODE_CONFIGURABLE_NODES_DT
                ' Get rows with PARENT_ID = NODE_ID
-                Dim result() As DataRow = table.Select("PARENT_NODE = " & NODE_CONFIG_ID)
+                Dim result() As DataRow = oTable.Select("PARENT_NODE = " & NODE_CONFIG_ID)
                Dim count As Integer
                Dim ID
                ' Loop.
@ -126,12 +126,15 @@ Public Class ClassNodeNavigation
                    ClassNodeNavigation.NODE_CONFIGURABLE_ID = ID
                    CURRENT_NODE_CONFIGURABLE_ID = ID
                Else
+                    ' If LogErrorsOnly = False Then ClassLogger.Add("CURRENT_NODE_CONFIGURABLE_ID would be nothing...", False)
                    CURRENT_NODE_CONFIGURABLE_ID = 0
                End If
            Else
                If LogErrorsOnly = False Then ClassLogger.Add("NO NODE_CONFIGURABLE_NODES_DT", False)
+                CURRENT_NODE_CONFIGURABLE_ID = 0
            End If
        Catch ex As Exception
+            If LogErrorsOnly = False Then ClassLogger.Add("CURRENT_NODE_CONFIGURABLE_ID would be nothing(1)...", False)
            ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0
            CURRENT_NODE_CONFIGURABLE_ID = 0
        End Try
--- a/app/DD-Record-Organizer/ClassRecordState.vb
+++ b/app/DD-Record-Organizer/ClassRecordState.vb
@ -5,8 +5,7 @@
            If RecordId = 0 Then
                Exit Sub
            End If
-            Dim Username As String = USER_USERNAME
-            Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", Username, RecordId)
+            Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", USER_USERNAME, RecordId)
            If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
                ClassDatabase.Execute_non_Query(SQL, True)
            End If
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@ -51,14 +51,14 @@ Public Class ClassWindreamDocGrid
        _Helper = New ClassHelper
        SELECTED_DOC_ID = 0
        If Init_Table() = True Then
-            SELECTED_DOC_ID = 0
            Console.WriteLine("gridView.SelectedRowsCount: " & gridView.SelectedRowsCount.ToString)
+            gridView.EndSelection()
+
            If gridView.SelectedRowsCount >= 1 Then
                DT_RESULTFILES.Clear()
                For Each row In gridView.GetSelectedRows
                    Dim newRow As DataRow = DT_RESULTFILES.NewRow()
                    Try
-
                        Dim DOC_ID = gridView.GetRowCellValue(row, "DocID")
                        SELECTED_DOC_ID = DOC_ID
                        newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
@ -114,9 +114,20 @@ Public Class ClassWindreamDocGrid
                End Try
                Try
                    SELECTED_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
-                    newRow("DOC_PATH") = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+                    If IsNothing(SELECTED_DOC_PATH) Then
+                        SELECTED_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULL_FILENAME"))
+                        newRow("DOC_PATH") = gridView.GetFocusedRowCellValue(gridView.Columns("FULL_FILENAME"))
+                    Else
+                        newRow("DOC_PATH") = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+                    End If
+
                Catch ex As Exception
-                    newRow("DOC_PATH") = ""
+                    Try
+
+                    Catch ex1 As Exception
+                        newRow("DOC_PATH") = ""
+                    End Try
+
                End Try
                Try
                    newRow("OBJECTTYPE") = gridView.GetFocusedRowCellValue(gridView.Columns("OBJECTTYPE"))
@ -216,7 +227,7 @@ Public Class ClassWindreamDocGrid
                            Dim value As String = ""

                            Try
-                                value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1}", configId, docId))
+                                value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", configId, docId, RECORD_ID))
                            Catch ex As Exception
                                ClassLogger.Add(String.Format(">> Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message, False)
                            End Try
--- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
+++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
@ -312,6 +312,12 @@
    <Compile Include="frmDocRecordLink.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmDocSearchResult.Designer.vb">
+      <DependentUpon>frmDocSearchResult.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDocSearchResult.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmDoc_Links.Designer.vb">
      <DependentUpon>frmDoc_Links.vb</DependentUpon>
    </Compile>
@ -795,6 +801,9 @@
    <EmbeddedResource Include="frmDocRecordLink.resx">
      <DependentUpon>frmDocRecordLink.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmDocSearchResult.resx">
+      <DependentUpon>frmDocSearchResult.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmDoc_Links.resx">
      <DependentUpon>frmDoc_Links.vb</DependentUpon>
    </EmbeddedResource>
@ -806,6 +815,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmGeodataNavigation.resx">
      <DependentUpon>frmGeodataNavigation.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmGeodataSelect.resx">
      <DependentUpon>frmGeodataSelect.vb</DependentUpon>
@ -848,6 +858,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmRight_Management.resx">
      <DependentUpon>frmRight_Management.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmSAP_FuBa.resx">
      <DependentUpon>frmSAP_FuBa.vb</DependentUpon>
@ -902,6 +913,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmRecordView.resx">
      <DependentUpon>frmRecordView.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmDocLink_Record_Entities.en-US.resx">
      <DependentUpon>frmDocLink_Record_Entities.vb</DependentUpon>
@ -1088,6 +1100,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmUserKonfig_AddUsers.resx">
      <DependentUpon>frmUserKonfig_AddUsers.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmCalendar.resx">
      <DependentUpon>frmCalendar.vb</DependentUpon>
@ -1114,6 +1127,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmDoctype_NameConvention.resx">
      <DependentUpon>frmDoctype_NameConvention.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmMenuDesigner.resx">
      <DependentUpon>frmMenuDesigner.vb</DependentUpon>
@ -1126,6 +1140,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmUserKonfig.resx">
      <DependentUpon>frmUserKonfig.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmWM_EntityImport.en-US.resx">
      <DependentUpon>frmWM_EntityImport.vb</DependentUpon>
@ -1148,6 +1163,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmFollowUp.resx">
      <DependentUpon>frmFollowUp.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmWMView_Config.en-US.resx">
      <DependentUpon>frmWMView_Config.vb</DependentUpon>
--- a/app/DD-Record-Organizer/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organizer/ModuleHelperMethods.vb
@ -267,12 +267,26 @@ Module ModuleHelperMethods
    Public Sub OpenFormConstructor(id As Integer, Optional recordId As Integer = -1)
        Try
            If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then
+                Dim frm1 As New frmConstructor_Main
+                frm1.Tag = id
+                Dim frmCollection = System.Windows.Forms.Application.OpenForms
+                For i As Int16 = 0I To frmCollection.Count - 1I
+                    If frmCollection.Item(i).Tag = id Then
+                        frmCollection.Item(i).Activate()
+                        frmCollection.Item(i).BringToFront()
+                        If frmCollection.Item(i).WindowState = FormWindowState.Minimized Then
+                            frmCollection.Item(i).WindowState = FormWindowState.Normal
+                        End If
+                        Exit Sub
+                    End If
+                Next i
                Exit Sub
            End If

            CURRENT_CONSTRUCTOR_ID = id
            CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
            Dim frm As New frmConstructor_Main()
+            frm.Tag = id
            ' frm = frmForm_Constructor.Instance()

            Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
--- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
@ -182,4 +182,7 @@
    Public INSERT_IN_ACTION As Boolean = False
    Public CURRENT_CONTROL_VALUE_COUNT As Integer = 1
    Public LAYOUT_DOC_GRIDVIEW As String
+
+    Public CURRENT_DOCSEARCH_SQL As String
+    Public CURRENT_DOCSEARCH_CAPTION As String
 End Module
--- a/app/DD-Record-Organizer/My
+++ b/app/DD-Record-Organizer/My
@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("ADDI - Akte der Dinge")>
-<Assembly: AssemblyCopyright("Copyright © 2018")>
+<Assembly: AssemblyCopyright("Copyright @")>
 <Assembly: AssemblyTrademark("")> 

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

-<Assembly: AssemblyVersion("2.5.0.1")>
+<Assembly: AssemblyVersion("2.5.0.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

 <Assembly: NeutralResourcesLanguageAttribute("")> 
--- a/app/DD-Record-Organizer/frmCockpit.Designer.vb
+++ b/app/DD-Record-Organizer/frmCockpit.Designer.vb
@ -122,7 +122,7 @@ Partial Class frmCockpit
        '
        'GridView1
        '
-        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
--- a/app/DD-Record-Organizer/frmConfig_Basic.vb
+++ b/app/DD-Record-Organizer/frmConfig_Basic.vb
@ -566,7 +566,5 @@ Public Class frmConfig_Basic
        If formloaded = False Then Exit Sub
        GridDocResult_BestFitColumns = chkLogErrorsOnly.Checked
        SaveMySettingsValue("GridDocResult_BestFitColumns", GridDocResult_BestFitColumns, "ConfigMain")
-
-
    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb
@ -1251,7 +1251,7 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvResult.AllowUserToAddRows = False
        Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.LightBlue
        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        resources.ApplyResources(Me.dgvResult, "dgvResult")
        Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@ -1262,7 +1262,7 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvPlaceholders.AllowUserToAddRows = False
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
--- a/app/DD-Record-Organizer/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organizer/frmConstructorDesigner.resx
@ -2310,7 +2310,7 @@
    <value>537, 22</value>
  </data>
  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView2.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -2508,7 +2508,7 @@
    <value>6, 22</value>
  </data>
  <data name="GridViewSupervisorsAdd.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -3044,7 +3044,7 @@
    <value>9, 21</value>
  </data>
  <data name="GridViewUserSQL.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewUserSQL.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -9354,7 +9354,7 @@ Home Tab</value>
    <value>579, 70</value>
  </data>
  <data name="GridViewlUsers2Menue.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -9423,7 +9423,7 @@ Home Tab</value>
    <value>941, 69</value>
  </data>
  <data name="GridView1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView1.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@ -24,9 +24,10 @@ Partial Class frmConstructor_Main
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
@ -444,12 +445,12 @@ Partial Class frmConstructor_Main
        Me.GridControlMain.AllowDrop = True
        Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
        resources.ApplyResources(Me.GridControlMain, "GridControlMain")
-        GridLevelNode4.LevelTemplate = Me.grvwGrid
-        GridLevelNode4.RelationName = "Level1"
-        GridLevelNode5.LevelTemplate = Me.grvwCarousel
-        GridLevelNode5.RelationName = "Level2"
-        GridLevelNode6.RelationName = "Level3"
-        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4, GridLevelNode5, GridLevelNode6})
+        GridLevelNode1.LevelTemplate = Me.grvwGrid
+        GridLevelNode1.RelationName = "Level1"
+        GridLevelNode2.LevelTemplate = Me.grvwCarousel
+        GridLevelNode2.RelationName = "Level2"
+        GridLevelNode3.RelationName = "Level3"
+        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
        Me.GridControlMain.MainView = Me.grvwTiles
        Me.GridControlMain.Name = "GridControlMain"
        Me.GridControlMain.TabStop = False
@ -970,6 +971,8 @@ Partial Class frmConstructor_Main
        Me.GridControlDocSearch.AllowDrop = True
        Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFilesBasic
        resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch")
+        GridLevelNode4.RelationName = "Level1"
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
        Me.GridControlDocSearch.TabStop = False
@ -994,9 +997,8 @@ Partial Class frmConstructor_Main
        '
        'GridViewDoc_Search
        '
-        Me.GridViewDoc_Search.Appearance.OddRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"), System.Drawing.Color)
-        Me.GridViewDoc_Search.Appearance.OddRow.BackColor2 = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor2"), System.Drawing.Color)
-        Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True
+        Me.GridViewDoc_Search.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewDoc_Search.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewDoc_Search.DetailVerticalIndent = 10
        Me.GridViewDoc_Search.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus
        Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch
@ -1010,7 +1012,7 @@ Partial Class frmConstructor_Main
        Me.GridViewDoc_Search.OptionsSelection.MultiSelect = True
        Me.GridViewDoc_Search.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
        Me.GridViewDoc_Search.OptionsView.ColumnAutoWidth = False
-        Me.GridViewDoc_Search.OptionsView.EnableAppearanceOddRow = True
+        Me.GridViewDoc_Search.OptionsView.EnableAppearanceEvenRow = True
        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
        '
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@ -260,7 +260,22 @@ Public Class frmConstructor_Main
            End If
        Next
    End Sub
-
+    Private Sub Load_Configurable_Nodes()
+        Try
+            Dim oSql = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
+            NODE_CONFIGURABLE_NODES_DT = ClassDatabase.Return_Datatable(oSql, False)
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Configurable_Nodes")
+        End Try
+    End Sub
+    Sub Load_Adding_users()
+        Try
+            Dim oSql = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
+            DT_ADDING_USERS = ClassDatabase.Return_Datatable(oSql, False)
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Adding_users")
+        End Try
+    End Sub
    Private Sub frmForm_Constructor_Main_Load(sender As Object, e As EventArgs) Handles Me.Load
        Dim sw As New SW("Form Load")
        Dim DT_PROXY_ENTITY As DataTable
@ -341,10 +356,9 @@ Public Class frmConstructor_Main

            CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPMO_ENTITY_RIGHT_CONTROLS where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID), False)

-            SQL = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
-            DT_ADDING_USERS = ClassDatabase.Return_Datatable(SQL, False)
-            SQL = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
-            NODE_CONFIGURABLE_NODES_DT = ClassDatabase.Return_Datatable(SQL, False)
+            Load_Adding_users()
+            Load_Configurable_Nodes()
+
        Catch ex As System.Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2")
        End Try
@ -1551,17 +1565,20 @@ Public Class frmConstructor_Main
            Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
            If SelectedNode IsNot Nothing Then
                Dim _TagENT_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
-                If _TagENT_ID <> 0 And _TagENT_ID <> ENTITY_ID Then
+                If (_TagENT_ID <> 0 And _TagENT_ID <> ENTITY_ID) Or _TagENT_ID <> CURRENT_ENTITY_ID Then
+                    ClassLogger.Add("Entity-Data needs to be reloaded...", False)
+
                    ENTITY_ID = _TagENT_ID
                    CURRENT_ENTITY_ID = ENTITY_ID
+                    CURRENT_CONSTRUCTOR_ID = CONSTRUCTORID
+
+                    Load_Adding_users()
+                    Load_Configurable_Nodes()
                Else
                    If pManually = False Then
                        Exit Sub
                    End If
-
                End If
-
-
            End If

            'If NODE_NAVIGATION = True Then
@ -2255,15 +2272,31 @@ Public Class frmConstructor_Main
        Dim EditingUser = ClassRecordState.IsRecordLocked(SELECTED_RECORD_ID)
        ' Überprüfen, ob der Record gerade bearbeitet wird
        If Not IsNothing(EditingUser) And EditingUser <> USER_USERNAME Then
+            If USER_IS_ADMIN = True Then
+                Dim msg = "Record is in work: " & vbNewLine & $"Dieser Datensatz wird gerade vom Benutzer '{EditingUser}' bearbeitet. Wollen Sie diesen entsperren?"
+                Dim msg1 = "Achtung"
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "Record is in work: " & vbNewLine & $"This Record is currently being edited by User '{EditingUser}'. Do You want to unlock the record?"
+                    msg1 = "Attention"
+                End If
+                Dim result As DialogResult = MessageBox.Show(msg, msg1, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = System.Windows.Forms.DialogResult.Yes Then
+                    ClassRecordState.UnlockRecord(SELECTED_RECORD_ID)
+                    Exit Sub
+                End If
+

-            tslblLocked.Visible = True
-            If USER_LANGUAGE = "de-DE" Then
-                ClassHelper.MSGBOX_Handler("INFO", "Achtung", "Record is in work: " & vbNewLine & String.Format("Dieser Datensatz wird gerade vom Benutzer '{0}' bearbeitet und kann nur lesend abgerufen werden.", EditingUser))
            Else
-                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Record is in work: " & vbNewLine & String.Format("This Record is currently being edited by User '{0}' and only available in Read-Only mode.", EditingUser))
+                tslblLocked.Visible = True
+                If USER_LANGUAGE = "de-DE" Then
+                    ClassHelper.MSGBOX_Handler("INFO", "Achtung", "Record is in work: " & vbNewLine & String.Format("Dieser Datensatz wird gerade vom Benutzer '{0}' bearbeitet und kann nur lesend abgerufen werden.", EditingUser))
+                Else
+                    ClassHelper.MSGBOX_Handler("INFO", "Attention", "Record is in work: " & vbNewLine & String.Format("This Record is currently being edited by User '{0}' and only available in Read-Only mode.", EditingUser))
+                End If
+                ' Wenn Record bearbeitet wird, EnableEditMode abbrechen!
+                Exit Sub
            End If
-            ' Wenn Record bearbeitet wird, EnableEditMode abbrechen!
-            Exit Sub
+

        Else
            'Wenn Record bearbeitet werden kann, IN_WORK auf 1 setzen, um Bearbeitung durch andere zu verhindern!
@ -2480,17 +2513,12 @@ Public Class frmConstructor_Main
                ClassLogger.Add("ADDING RECORDS IS PROHIBITED FOR ENTITY: " & ENTITY_ID, False)
            End If

-            'sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
-
            expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
            DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")  'ClassDatabase.Return_Datatable(sql, True)
            expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
-            'sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}')  ORDER BY T.SEQUENCE ", ENTITY_ID, USER_LANGUAGE)
            DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True)

-            'sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 
            DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True)
-            ' sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE)
            expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE)
            DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")  'ClassDatabase.Return_Datatable(sql, True)
            Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
@ -3728,6 +3756,50 @@ Public Class frmConstructor_Main
        sw.Done()
        Cursor = Cursors.Default
    End Sub
+    Private Sub RUN_ENTITY_DOC_SEARCH()
+        Dim sw As New SW("RUN_ENTITY_DOC_SEARCH")
+        Try
+            Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {ENTITY_ID}"
+            CURRENT_DOCSEARCH_SQL = ClassDatabase.Execute_Scalar(oSQL, True)
+            Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
+            If USER_LANGUAGE <> "de-De" Then
+                oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
+            End If
+            MsgBox(oText, vbOKOnly, "Information")
+
+
+            If CURRENT_DOCSEARCH_SQL = "" Then
+                CURRENT_DOCSEARCH_SQL = String.Format("SELECT DISTINCT T.* " & vbNewLine &
+                   "FROM " & vbNewLine &
+                   "VWPMO_DOC_SEARCH T" & vbNewLine &
+                   "WHERE T.DocID IN (select DISTINCT T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine &
+                   "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID)", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM)
+            Else
+                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", ENTITY_ID)
+                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE)
+                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_ECM_ID", USERID_FK_INT_ECM)
+                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_ID", USER_GUID)
+            End If
+
+
+            If USER_LANGUAGE <> "de-DE" Then
+                CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
+            Else
+                CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
+            End If
+            Dim myformThread = New Thread(Sub()
+                                              Using frm As New frmDocSearchResult
+                                                  Application.Run(frm)
+
+                                              End Using
+                                          End Sub)
+            myformThread.Start()
+
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error RUN_ENTITY_DOC_SEARCH", ex.Message, ex.StackTrace)
+        End Try
+        sw.Done()
+    End Sub
    Private Sub RUN_WDSEARCH_GRID()
        Me.Cursor = Cursors.WaitCursor
        Dim sw As New SW("RUN_WDSEARCH_GRID")
@ -4250,16 +4322,30 @@ Public Class frmConstructor_Main
        End If
    End Sub
    Private Sub ButtonResetView_Click(sender As Object, e As EventArgs) Handles ButtonResetView.Click
-        'TODO: Ansicht zurücksetzen
+        Reset_View_layout
+    End Sub
+    Sub Reset_View_layout()
        Try
-            Dim XMLPath = Get_Grid_Layout_Filename()
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
            If File.Exists(XMLPath) Then
+                Me.Cursor = Cursors.WaitCursor
                File.Delete(XMLPath)
-                Load_Entity_Data_CONTROLS_RECORDS()
+                GridControlDocSearch.DataSource = Nothing
+                GridViewDoc_Search.Columns.Clear()
+
+                RUN_WDSEARCH_GRID()
+
+            Else
+                MsgBox("Set back of Layout not successfull - File not existing!", MsgBoxStyle.Information)
            End If
        Catch ex As Exception
-            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset Layout Grid: ", ex.Message)
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset Layout DocGrid: ", ex.Message)
        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+    Private Sub AnsichtZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_ResetView.Click
+        ' TODO: Ansicht zurücksetzen
+        Reset_View_layout()
    End Sub
 #End Region

@ -5319,13 +5405,13 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
-        GridViewDoc_Search.EndSelection()
+
        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
        Refresh_DocID()
    End Sub

    Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
-        GridViewDoc_Search.EndSelection()
+
        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
        Refresh_DocID()
    End Sub
@ -5767,11 +5853,14 @@ Public Class frmConstructor_Main
                            Dim rowcolorname As String = ""
                            'Die Color für den value auswählen
                            For Each matchingRow As DataRow In matchingRows
-
-                                rowcolorname = matchingRow.Item("COLOR")
-                                If rowcolorname <> "" Then
-                                    Exit For
+                                rowcolorname = ""
+                                If Not IsDBNull(matchingRow.Item("COLOR")) Then
+                                    rowcolorname = matchingRow.Item("COLOR")
                                End If
+
+                                If rowcolorname <> "" Then
+                                        Exit For
+                                    End If
                            Next
                            If rowcolorname <> "" Then
                                ColorRow = Color.FromName(rowcolorname)
@ -5824,7 +5913,7 @@ Public Class frmConstructor_Main
                e.Cancel = True
            End If
            Me.Cursor = Cursors.WaitCursor
-            GridViewDoc_Search.EndSelection()
+
            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
                e.Cancel = True
@ -5947,26 +6036,7 @@ Public Class frmConstructor_Main
            RUN_WDSEARCH_GRID()
        End If
    End Sub
-    Private Sub AnsichtZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_ResetView.Click
-        ' TODO: Ansicht zurücksetzen
-        Try
-            Dim XMLPath = Get_DocGrid_Layout_Filename()
-            If File.Exists(XMLPath) Then
-                Me.Cursor = Cursors.WaitCursor
-                File.Delete(XMLPath)
-                GridControlDocSearch.DataSource = Nothing
-                GridViewDoc_Search.Columns.Clear()

-                RUN_WDSEARCH_GRID()
-
-            Else
-                MsgBox("Set back of Layout not successfull - File not existing!", MsgBoxStyle.Information)
-            End If
-        Catch ex As Exception
-            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset Layout DocGrid: ", ex.Message)
-        End Try
-        Me.Cursor = Cursors.Default
-    End Sub
    Sub Set_Displayname()
        Try
            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
@ -6423,7 +6493,7 @@ Public Class frmConstructor_Main
    End Sub
    Private Sub docCMEntityWideSearch_Click(sender As Object, e As EventArgs) Handles docCMEntityWideSearch.Click
        CURRENT_SEARCH_TYPE = "ENTITY"
-        RUN_WDSEARCH_GRID()
+        RUN_ENTITY_DOC_SEARCH()
    End Sub

    Private Sub tsbtnDoc_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnDoc_Refresh.Click
@ -6668,7 +6738,7 @@ Public Class frmConstructor_Main

    Private Sub EnitätssucheToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmientitySearch.Click
        CURRENT_SEARCH_TYPE = "ENTITY"
-        RUN_WDSEARCH_GRID()
+        RUN_ENTITY_DOC_SEARCH()
    End Sub

    Private Sub OberhalbToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OberhalbToolStripMenuItem.Click
@ -7243,4 +7313,8 @@ Public Class frmConstructor_Main
            MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
+
+    Private Sub tsmiNodeNew_Click(sender As Object, e As EventArgs) Handles tsmiNodeNew.Click
+
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmDocRecordLink.vb
+++ b/app/DD-Record-Organizer/frmDocRecordLink.vb
@ -230,7 +230,7 @@ Public Class frmDocRecordLink
            ResultViewName = $"VWPMO_ENTITY_TABLE{entity.id}"
            ResultSQL = $"SELECT T.* FROM {ResultViewName} T"
            txtEntity.Text = cmbConstructorForms.Text
-
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> ResultSQL: " & ResultSQL, False)
            Me.Cursor = Cursors.WaitCursor
            Dim DT_RESULT = clsDatabase.Return_Datatable(ResultSQL, True)
            If Not IsNothing(DT_RESULT) Then
--- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
+++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
@ -0,0 +1,220 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDocSearchResult
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult))
+        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripLabelCaption = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
+        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
+        Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.docCM_Copy = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator()
+        Me.docCM_Showlinks = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator()
+        Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator()
+        Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.StatusStrip1.SuspendLayout()
+        Me.ToolStrip1.SuspendLayout()
+        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContextMenuStripResultFiles.SuspendLayout()
+        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'StatusStrip1
+        '
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocID})
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 623)
+        Me.StatusStrip1.Name = "StatusStrip1"
+        Me.StatusStrip1.Size = New System.Drawing.Size(1083, 22)
+        Me.StatusStrip1.TabIndex = 0
+        Me.StatusStrip1.Text = "StatusStrip1"
+        '
+        'tslblDocID
+        '
+        Me.tslblDocID.Name = "tslblDocID"
+        Me.tslblDocID.Size = New System.Drawing.Size(92, 17)
+        Me.tslblDocID.Text = "No row selected"
+        '
+        'ToolStrip1
+        '
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1})
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25)
+        Me.ToolStrip1.TabIndex = 1
+        Me.ToolStrip1.Text = "ToolStrip1"
+        '
+        'ToolStripLabelCaption
+        '
+        Me.ToolStripLabelCaption.Name = "ToolStripLabelCaption"
+        Me.ToolStripLabelCaption.Size = New System.Drawing.Size(88, 22)
+        Me.ToolStripLabelCaption.Text = "ToolStripLabel1"
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(95, 22)
+        Me.ToolStripButton1.Text = "Aktualisieren"
+        '
+        'GridControlDocSearch
+        '
+        Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles
+        Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
+        GridLevelNode1.RelationName = "Level1"
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
+        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25)
+        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
+        Me.GridControlDocSearch.Name = "GridControlDocSearch"
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 598)
+        Me.GridControlDocSearch.TabIndex = 8
+        Me.GridControlDocSearch.TabStop = False
+        Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
+        '
+        'ContextMenuStripResultFiles
+        '
+        Me.ContextMenuStripResultFiles.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator20, Me.docCM_Showlinks, Me.ToolStripSeparator22, Me.docCM_PropertiesFile, Me.ToolStripSeparator25})
+        Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
+        Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(256, 152)
+        '
+        'docCM_Open
+        '
+        Me.docCM_Open.Name = "docCM_Open"
+        Me.docCM_Open.Size = New System.Drawing.Size(255, 26)
+        Me.docCM_Open.Text = "Datei Öffnen"
+        '
+        'OrdnerÖffnenToolStripMenuItem
+        '
+        Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem"
+        Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 26)
+        Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen"
+        '
+        'docCM_Copy
+        '
+        Me.docCM_Copy.Image = Global.DD_Record_Organizer.My.Resources.Resources.Copy_6524
+        Me.docCM_Copy.Name = "docCM_Copy"
+        Me.docCM_Copy.Size = New System.Drawing.Size(255, 26)
+        Me.docCM_Copy.Text = "Datei in Zwischenablage kopieren"
+        '
+        'ToolStripSeparator20
+        '
+        Me.ToolStripSeparator20.Name = "ToolStripSeparator20"
+        Me.ToolStripSeparator20.Size = New System.Drawing.Size(252, 6)
+        '
+        'docCM_Showlinks
+        '
+        Me.docCM_Showlinks.Image = CType(resources.GetObject("docCM_Showlinks.Image"), System.Drawing.Image)
+        Me.docCM_Showlinks.Name = "docCM_Showlinks"
+        Me.docCM_Showlinks.Size = New System.Drawing.Size(255, 26)
+        Me.docCM_Showlinks.Text = "Verknüpfungen anzeigen"
+        '
+        'ToolStripSeparator22
+        '
+        Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
+        Me.ToolStripSeparator22.Size = New System.Drawing.Size(252, 6)
+        '
+        'docCM_PropertiesFile
+        '
+        Me.docCM_PropertiesFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.PropertyGridEditorPart_6041
+        Me.docCM_PropertiesFile.Name = "docCM_PropertiesFile"
+        Me.docCM_PropertiesFile.Size = New System.Drawing.Size(255, 26)
+        Me.docCM_PropertiesFile.Text = "Eigenschaften Datei"
+        '
+        'ToolStripSeparator25
+        '
+        Me.ToolStripSeparator25.Name = "ToolStripSeparator25"
+        Me.ToolStripSeparator25.Size = New System.Drawing.Size(252, 6)
+        '
+        'GridViewDoc_Search
+        '
+        Me.GridViewDoc_Search.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
+        Me.GridViewDoc_Search.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewDoc_Search.DetailVerticalIndent = 10
+        Me.GridViewDoc_Search.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus
+        Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch
+        Me.GridViewDoc_Search.LevelIndent = 10
+        Me.GridViewDoc_Search.Name = "GridViewDoc_Search"
+        Me.GridViewDoc_Search.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewDoc_Search.OptionsDetail.ShowDetailTabs = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedRow = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceHideSelection = False
+        Me.GridViewDoc_Search.OptionsSelection.MultiSelect = True
+        Me.GridViewDoc_Search.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
+        Me.GridViewDoc_Search.OptionsView.ColumnAutoWidth = False
+        Me.GridViewDoc_Search.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
+        '
+        'frmDocSearchResult
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1083, 645)
+        Me.Controls.Add(Me.GridControlDocSearch)
+        Me.Controls.Add(Me.ToolStrip1)
+        Me.Controls.Add(Me.StatusStrip1)
+        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmDocSearchResult"
+        Me.Text = "frmDocSearchResult"
+        Me.StatusStrip1.ResumeLayout(False)
+        Me.StatusStrip1.PerformLayout()
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
+        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ContextMenuStripResultFiles.ResumeLayout(False)
+        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents StatusStrip1 As StatusStrip
+    Friend WithEvents ToolStrip1 As ToolStrip
+    Friend WithEvents GridControlDocSearch As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewDoc_Search As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents tslblDocID As ToolStripStatusLabel
+    Friend WithEvents ToolStripLabelCaption As ToolStripLabel
+    Friend WithEvents ContextMenuStripResultFiles As ContextMenuStrip
+    Friend WithEvents docCM_Open As ToolStripMenuItem
+    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents docCM_Copy As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator20 As ToolStripSeparator
+    Friend WithEvents docCM_Showlinks As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator22 As ToolStripSeparator
+    Friend WithEvents docCM_PropertiesFile As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator25 As ToolStripSeparator
+    Friend WithEvents ToolStripButton1 As ToolStripButton
+End Class
--- a/app/DD-Record-Organizer/frmDocSearchResult.resx
+++ b/app/DD-Record-Organizer/frmDocSearchResult.resx
--- a/app/DD-Record-Organizer/frmDocSearchResult.vb
+++ b/app/DD-Record-Organizer/frmDocSearchResult.vb
@ -0,0 +1,224 @@
+Imports System.IO
+Imports System.Runtime.InteropServices
+Imports System.Text
+Imports DevExpress.XtraGrid.Views.Base
+
+Public Class frmDocSearchResult
+    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
+    End Function
+    Public Structure SHELLEXECUTEINFO
+        Public cbSize As Integer
+        Public fMask As Integer
+        Public hwnd As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpVerb As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpFile As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpParameters As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpDirectory As String
+        Dim nShow As Integer
+        Dim hInstApp As IntPtr
+        Dim lpIDList As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpClass As String
+        Public hkeyClass As IntPtr
+        Public dwHotKey As Integer
+        Public hIcon As IntPtr
+        Public hProcess As IntPtr
+    End Structure
+    Private Const SEE_MASK_INVOKEIDLIST = &HC
+    Private Const SEE_MASK_NOCLOSEPROCESS = &H40
+    Private Const SEE_MASK_FLAG_NO_UI = &H400
+    Public Const SW_SHOW As Short = 5
+    Public Sub LoadDocSearch()
+        Try
+            Cursor = Cursors.WaitCursor
+
+            Dim DTRESULT As DataTable = ClassDatabase.Return_Datatable(CURRENT_DOCSEARCH_SQL, True)
+            GridControlDocSearch.DataSource = Nothing
+            GridViewDoc_Search.Columns.Clear()
+            GridControlDocSearch.DataSource = DTRESULT
+            GridViewDoc_Search.BestFitColumns(True)
+            ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DTRESULT.Rows.Count} rows)"
+            Load_DocGrid_Layout()
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in LoadDocSearch: " & ex.Message)
+        End Try
+        Cursor = Cursors.Default
+
+    End Sub
+    Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
+        If GridViewDoc_Search.RowCount > 0 Then
+            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            Refresh_DocID()
+        End If
+
+    End Sub
+
+    Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
+        If GridViewDoc_Search.RowCount > 0 Then
+            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            Refresh_DocID()
+        End If
+    End Sub
+    Sub Refresh_DocID()
+        If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
+            Dim msg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
+            tslblDocID.Text = msg
+
+        Else
+            tslblDocID.Text = "DocRow not selected"
+
+        End If
+    End Sub
+    Sub Open_File()
+        Me.Cursor = Cursors.WaitCursor
+        Dim allow_Open As Boolean = False
+        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+        Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+        If Not IsNothing(Result) Then
+            Select Case Result.ToString
+                Case "R"
+
+                    allow_Open = True
+                Case "RW"
+                    allow_Open = True
+                Case "RWA"
+                    allow_Open = True
+            End Select
+        End If
+        If allow_Open = True Then
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+            For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+                ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
+                If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch()
+            Next
+        Else
+            ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!")
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub docCM_Open_Click(sender As Object, e As EventArgs) Handles docCM_Open.Click
+        Open_File()
+    End Sub
+
+    Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            ClassHelper.Open_Folder(row.Item("DOC_PATH"), row.Item("DOC_ID"))
+        Next
+    End Sub
+
+    Private Sub docCM_Copy_Click(sender As Object, e As EventArgs) Handles docCM_Copy.Click
+        If ClassWindreamDocGrid.SELECTED_DOC_PATH <> "" Then
+            Try
+                Dim selectedfile(0) As String
+                selectedfile(0) = ClassWindreamDocGrid.SELECTED_DOC_PATH
+                Dim dataobj As New DataObject
+                dataobj.SetData(DataFormats.FileDrop, True, selectedfile)
+
+                Clipboard.Clear()
+                Clipboard.SetDataObject(dataobj, True)
+            Catch ex As Exception
+                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Copy file:", ex.Message)
+            End Try
+            Cursor = Cursors.Default
+        End If
+    End Sub
+
+    Private Sub docCM_Showlinks_Click(sender As Object, e As EventArgs) Handles docCM_Showlinks.Click
+        Try
+            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+
+            Dim frm As New frmDoc_Links
+            frm.Show()
+            frm.BringToFront()
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub docCM_PropertiesFile_Click(sender As Object, e As EventArgs) Handles docCM_PropertiesFile.Click
+
+    End Sub
+    Sub Show_File_Properties()
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If row.Item("DOC_PATH") <> "" Then
+                Cursor = Cursors.WaitCursor
+                Dim sei As New SHELLEXECUTEINFO
+                sei.cbSize = Marshal.SizeOf(sei)
+                sei.lpVerb = "properties"
+                sei.lpFile = row.Item("DOC_PATH")
+                sei.nShow = SW_SHOW
+                sei.fMask = SEE_MASK_INVOKEIDLIST
+                If Not ShellExecuteEx(sei) Then
+                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message)
+                End If
+            End If
+            Cursor = Cursors.Default
+        Next
+    End Sub
+
+    Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load
+        LoadDocSearch()
+        Me.Text = CURRENT_DOCSEARCH_CAPTION
+    End Sub
+    Sub Save_DocGrid_Layout()
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            GridViewDoc_Search.SaveLayoutToXml(XMLPath)
+            ' Update_Status_Label(True, "Grid Layout Loaded")
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
+        End Try
+    End Sub
+    Sub Load_DocGrid_Layout()
+        Try
+
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+                GridViewDoc_Search.RestoreLayoutFromXml(XMLPath)
+                GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter()
+            End If
+
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
+        End Try
+    End Sub
+    Private Function Get_DocGrid_Layout_Filename()
+        Dim Filename As String = String.Format("GridViewDocSearchSW-{0}-UserLayout.xml", CURRENT_ENTITY_ID)
+        LAYOUT_DOC_GRIDVIEW = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+        Return LAYOUT_DOC_GRIDVIEW
+    End Function
+
+    Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
+        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+        Refresh_DocID()
+    End Sub
+
+    Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged
+        ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])"
+    End Sub
+
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        LoadDocSearch()
+    End Sub
+End Class
--- a/app/DD-Record-Organizer/frmDoctype_NameConvention.resx
+++ b/app/DD-Record-Organizer/frmDoctype_NameConvention.resx
@ -765,7 +765,7 @@
    <value>Löschen</value>
  </data>
  <data name="GridView1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="colPATTERN.VisibleIndex" type="System.Int32, mscorlib">
    <value>1</value>
--- a/app/DD-Record-Organizer/frmFileInWork.vb
+++ b/app/DD-Record-Organizer/frmFileInWork.vb
@ -22,4 +22,8 @@
            MsgBox("Unexpected Error 2 in Setting to work - Check logfile", MsgBoxStyle.Exclamation)
        End Try
    End Sub
+
+    Private Sub frmFileInWork_Load(sender As Object, e As EventArgs) Handles Me.Load
+        txtComment.Text = String.Empty
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmFollowUp.resx
+++ b/app/DD-Record-Organizer/frmFollowUp.resx
@ -1006,7 +1006,7 @@
    <value>534, 39</value>
  </data>
  <data name="GridView1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView1.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -1069,7 +1069,7 @@
    <value>10, 18</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -2478,7 +2478,7 @@
    <value>0, 0</value>
  </data>
  <data name="grvwResult.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridResult.Size" type="System.Drawing.Size, System.Drawing">
    <value>1109, 739</value>
--- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
+++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
@ -67,64 +67,47 @@ Partial Class frmGlobalSearch
        '
        'SplitContainerMain
        '
-        resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain")
        Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain")
        Me.SplitContainerMain.Name = "SplitContainerMain"
-        resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1")
        Me.SplitContainerMain.Panel1.Controls.Add(Me.GridControlRecords)
        Me.SplitContainerMain.Panel1.Controls.Add(Me.ToolStripRecords)
-        resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
+        resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1")
        Me.SplitContainerMain.Panel2.Controls.Add(Me.GridControlFiles)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStripDokumente)
+        resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
        Me.SplitContainerMain.SplitterPosition = 751
        '
        'GridControlRecords
        '
-        resources.ApplyResources(Me.GridControlRecords, "GridControlRecords")
        Me.GridControlRecords.ContextMenuStrip = Me.cmsRecords
-        Me.GridControlRecords.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlRecords.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlRecords.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlRecords.EmbeddedNavigator.AccessibleName")
-        Me.GridControlRecords.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlRecords.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlRecords.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlRecords.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlRecords.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlRecords.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlRecords.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlRecords.EmbeddedNavigator.ToolTip = resources.GetString("GridControlRecords.EmbeddedNavigator.ToolTip")
-        Me.GridControlRecords.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlRecords.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlRecords.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlRecords.EmbeddedNavigator.ToolTipTitle")
+        resources.ApplyResources(Me.GridControlRecords, "GridControlRecords")
        Me.GridControlRecords.MainView = Me.GridViewRecords
        Me.GridControlRecords.Name = "GridControlRecords"
        Me.GridControlRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewRecords})
        '
        'cmsRecords
        '
-        resources.ApplyResources(Me.cmsRecords, "cmsRecords")
        Me.cmsRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportExcelToolStripMenuItem, Me.ShowRecordToolStripMenuItem})
        Me.cmsRecords.Name = "cmsRecords"
+        resources.ApplyResources(Me.cmsRecords, "cmsRecords")
        '
        'ExportExcelToolStripMenuItem
        '
-        resources.ApplyResources(Me.ExportExcelToolStripMenuItem, "ExportExcelToolStripMenuItem")
        Me.ExportExcelToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
        Me.ExportExcelToolStripMenuItem.Name = "ExportExcelToolStripMenuItem"
+        resources.ApplyResources(Me.ExportExcelToolStripMenuItem, "ExportExcelToolStripMenuItem")
        '
        'ShowRecordToolStripMenuItem
        '
-        resources.ApplyResources(Me.ShowRecordToolStripMenuItem, "ShowRecordToolStripMenuItem")
        Me.ShowRecordToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_view_detail
        Me.ShowRecordToolStripMenuItem.Name = "ShowRecordToolStripMenuItem"
+        resources.ApplyResources(Me.ShowRecordToolStripMenuItem, "ShowRecordToolStripMenuItem")
        '
        'GridViewRecords
        '
        Me.GridViewRecords.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewRecords.Appearance.EvenRow.FontSizeDelta = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.FontSizeDelta"), Integer)
-        Me.GridViewRecords.Appearance.EvenRow.FontStyleDelta = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewRecords.Appearance.EvenRow.GradientMode = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewRecords.Appearance.EvenRow.Image = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.Image"), System.Drawing.Image)
        Me.GridViewRecords.Appearance.EvenRow.Options.UseBackColor = True
-        resources.ApplyResources(Me.GridViewRecords, "GridViewRecords")
        Me.GridViewRecords.GridControl = Me.GridControlRecords
        Me.GridViewRecords.Name = "GridViewRecords"
        Me.GridViewRecords.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@ -141,47 +124,35 @@ Partial Class frmGlobalSearch
        '
        'ToolStripRecords
        '
-        resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords")
        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.tsbtnviewDetail})
+        resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords")
        Me.ToolStripRecords.Name = "ToolStripRecords"
        '
        'tslblRecordsResult
        '
-        resources.ApplyResources(Me.tslblRecordsResult, "tslblRecordsResult")
        Me.tslblRecordsResult.Name = "tslblRecordsResult"
+        resources.ApplyResources(Me.tslblRecordsResult, "tslblRecordsResult")
        '
        'ToolStripSeparator1
        '
-        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
        '
        'ToolStripButton1
        '
-        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
        Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
+        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
        Me.ToolStripButton1.Name = "ToolStripButton1"
        '
        'tsbtnviewDetail
        '
-        resources.ApplyResources(Me.tsbtnviewDetail, "tsbtnviewDetail")
        Me.tsbtnviewDetail.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_view_detail
+        resources.ApplyResources(Me.tsbtnviewDetail, "tsbtnviewDetail")
        Me.tsbtnviewDetail.Name = "tsbtnviewDetail"
        '
        'GridControlFiles
        '
        resources.ApplyResources(Me.GridControlFiles, "GridControlFiles")
-        Me.GridControlFiles.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlFiles.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleName")
-        Me.GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlFiles.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlFiles.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlFiles.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlFiles.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlFiles.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlFiles.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlFiles.EmbeddedNavigator.ToolTip = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTip")
-        Me.GridControlFiles.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlFiles.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTipTitle")
        Me.GridControlFiles.MainView = Me.GridViewFiles
        Me.GridControlFiles.Name = "GridControlFiles"
        Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
@ -189,12 +160,7 @@ Partial Class frmGlobalSearch
        'GridViewFiles
        '
        Me.GridViewFiles.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewFiles.Appearance.EvenRow.FontSizeDelta = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.FontSizeDelta"), Integer)
-        Me.GridViewFiles.Appearance.EvenRow.FontStyleDelta = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewFiles.Appearance.EvenRow.GradientMode = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewFiles.Appearance.EvenRow.Image = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.Image"), System.Drawing.Image)
        Me.GridViewFiles.Appearance.EvenRow.Options.UseBackColor = True
-        resources.ApplyResources(Me.GridViewFiles, "GridViewFiles")
        Me.GridViewFiles.GridControl = Me.GridControlFiles
        Me.GridViewFiles.Name = "GridViewFiles"
        Me.GridViewFiles.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@ -211,8 +177,8 @@ Partial Class frmGlobalSearch
        '
        'ToolStripDokumente
        '
-        resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente")
        Me.ToolStripDokumente.AllowDrop = True
+        resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente")
        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView, Me.ToolStripButton2})
        Me.ToolStripDokumente.Name = "ToolStripDokumente"
        '
@ -223,9 +189,9 @@ Partial Class frmGlobalSearch
        '
        'ToolStripButton2
        '
-        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
        Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
        Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
+        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
        Me.ToolStripButton2.Name = "ToolStripButton2"
        '
        'ToolStripMain
@ -236,8 +202,8 @@ Partial Class frmGlobalSearch
        '
        'tsbtnRefresh
        '
-        resources.ApplyResources(Me.tsbtnRefresh, "tsbtnRefresh")
        Me.tsbtnRefresh.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
+        resources.ApplyResources(Me.tsbtnRefresh, "tsbtnRefresh")
        Me.tsbtnRefresh.Name = "tsbtnRefresh"
        '
        'Label1
@ -272,13 +238,13 @@ Partial Class frmGlobalSearch
        '
        'Panel1
        '
-        resources.ApplyResources(Me.Panel1, "Panel1")
        Me.Panel1.Controls.Add(Me.txtSearch)
        Me.Panel1.Controls.Add(Me.Label2)
        Me.Panel1.Controls.Add(Me.GroupBox1)
        Me.Panel1.Controls.Add(Me.Label1)
        Me.Panel1.Controls.Add(Me.ToolStripMain)
        Me.Panel1.Controls.Add(Me.Label3)
+        resources.ApplyResources(Me.Panel1, "Panel1")
        Me.Panel1.Name = "Panel1"
        '
        'txtSearch
@ -293,10 +259,10 @@ Partial Class frmGlobalSearch
        '
        'GroupBox1
        '
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
        Me.GroupBox1.Controls.Add(Me.rbSearchRecord)
        Me.GroupBox1.Controls.Add(Me.rbSearchFulltext)
        Me.GroupBox1.Controls.Add(Me.rbSearchCombined)
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.TabStop = False
        '
--- a/app/DD-Record-Organizer/frmGlobalSearch.resx
+++ b/app/DD-Record-Organizer/frmGlobalSearch.resx
--- a/app/DD-Record-Organizer/frmLanguage_Translator.resx
+++ b/app/DD-Record-Organizer/frmLanguage_Translator.resx
@ -470,7 +470,7 @@
    <value>0, 0</value>
  </data>
  <data name="grvwGridObjects.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="grvwGridObjects.Appearance.FilterPanel.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>255, 128, 0</value>
--- a/app/DD-Record-Organizer/frmLoginUserSelect.Designer.vb
+++ b/app/DD-Record-Organizer/frmLoginUserSelect.Designer.vb
@ -67,7 +67,7 @@ Partial Class frmLoginUserSelect
        '
        Me.GridViewlUsers2Menue.Appearance.ColumnFilterButton.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GridViewlUsers2Menue.Appearance.ColumnFilterButton.Options.UseFont = True
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewlUsers2Menue.Appearance.FilterPanel.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GridViewlUsers2Menue.Appearance.FilterPanel.Options.UseFont = True
--- a/app/DD-Record-Organizer/frmMain.Designer.vb
+++ b/app/DD-Record-Organizer/frmMain.Designer.vb
@ -100,6 +100,7 @@ Partial Class frmMain
        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
        Me.TimerInformation = New System.Windows.Forms.Timer(Me.components)
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.Timer5mins = New System.Windows.Forms.Timer(Me.components)
        Me.cmsSystray.SuspendLayout()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -723,6 +724,11 @@ Partial Class frmMain
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
        '
+        'Timer5mins
+        '
+        Me.Timer5mins.Enabled = True
+        Me.Timer5mins.Interval = 300000
+        '
        'frmMain
        '
        Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color)
@ -823,5 +829,6 @@ Partial Class frmMain
    Friend WithEvents BarButtonItemSwitchCon As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents LabelConString As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents StatusVersionDB As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents Timer5mins As Timer
 End Class

--- a/app/DD-Record-Organizer/frmMain.resx
+++ b/app/DD-Record-Organizer/frmMain.resx
@ -2728,13 +2728,13 @@
    <value>Administration</value>
  </data>
  <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1011, 150</value>
+    <value>1019, 150</value>
  </data>
  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 516</value>
+    <value>0, 520</value>
  </data>
  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1011, 23</value>
+    <value>1019, 23</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
    <value>RibbonStatusBar1</value>
@ -2790,6 +2790,9 @@
  <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <metadata name="Timer5mins.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>432, 56</value>
+  </metadata>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@ -2803,7 +2806,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1011, 539</value>
+    <value>1019, 543</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@ -4135,6 +4138,12 @@
  <data name="&gt;&gt;TimerInformation.Type" xml:space="preserve">
    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;Timer5mins.Name" xml:space="preserve">
+    <value>Timer5mins</value>
+  </data>
+  <data name="&gt;&gt;Timer5mins.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@ -200,11 +200,7 @@ Public Class frmMain
            Else
                'itemRefreshProxy.Visibility = BarItemVisibility.Never
            End If
-            Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
-            If USER_LANGUAGE <> "de-DE" Then
-                msg = "#User logged in: " & USERS_LOGGED_IN.ToString()
-            End If
-            LabelLoggedIn.Caption = msg
+            LoggedIn()

            'LoadMenuItems()
            LoadMenuItems2()
@ -216,6 +212,20 @@ Public Class frmMain
        End If
        Load_TasksforUser()
    End Sub
+    Sub LoggedIn()
+        Try
+            Dim oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
+            Dim anzahl = ClassDatabase.Execute_Scalar(oSQL, False)
+            USERS_LOGGED_IN = CInt(anzahl)
+        Catch ex As Exception
+
+        End Try
+        Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
+        If USER_LANGUAGE <> "de-DE" Then
+            msg = "#User logged in: " & USERS_LOGGED_IN.ToString()
+        End If
+        LabelLoggedIn.Caption = msg
+    End Sub
    Sub Display_ConString()
        Try
            Dim connection As New SqlClient.SqlConnection(MyConnectionString) 'csb.ConnectionString)
@ -530,6 +540,7 @@ Public Class frmMain

    Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles TimerTasks.Tick
        Refresh_TaskReminder()
+
    End Sub

    Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles Me.Resize
@ -550,6 +561,7 @@ Public Class frmMain
                End If

                RUN_TIMER()
+                Timer5mins.Start()

                If Sett_ConstructorStart <> 0 Then
                    Cursor = Cursors.WaitCursor
@ -1029,7 +1041,7 @@ Public Class frmMain
            Dim dt2 As DataTable = CURRENT_TBPMO_CONN_SWITCH
            Dim drActive As DataRow() = dt2.Select("ACTIVE = 1")
            Dim drInActive As DataRow() = dt2.Select("ACTIVE = 0")
-            Dim name = ""
+            Dim oSQLDescription = ""
            Dim oSqlcon = ""
            Dim oSqlcon_Proxy = ""
            Dim oWM_ALIAS = ""
@ -1037,7 +1049,7 @@ Public Class frmMain
            Dim oACTIVE_GUID
            For Each row As DataRow In drInActive
                oINACTIVE_GUID = row.Item("GUID")
-                name = row.Item("DESCRIPTION")
+                oSQLDescription = row.Item("DESCRIPTION")
                oSqlcon = row.Item("SQL_CONNECTION")
                oSqlcon_Proxy = row.Item("SQL_CONNECTION_PROXY")
                oWM_ALIAS = row.Item("WM_ALIAS")
@ -1047,20 +1059,21 @@ Public Class frmMain
            Next


-            If name <> "" Then
+            If oSQLDescription <> "" Then
                Dim oresult As MsgBoxResult
-                Dim msg = "Wollen Sie die Verbindungs-Konfiguration nun auf '" & name & "' ändern?"
+                Dim msg = "Wollen Sie die Verbindungs-Konfiguration nun auf '" & oSQLDescription & "' ändern?"
                If USER_LANGUAGE <> "de-DE" Then
-                    msg = "Would You like to change the Connection-configuration to '" & name & "'?"
+                    msg = "Would You like to change the Connection-configuration to '" & oSQLDescription & "'?"
                End If
                oresult = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                If oresult = MsgBoxResult.Yes Then
-                    BarButtonItemSwitchCon.Caption = "Switch Connection to: " & name
+                    BarButtonItemSwitchCon.Caption = "Switch Connection to: " & oSQLDescription
                    Try
                        My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "CurrentAlias", oWM_ALIAS)
                        My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "VFSAlias", oWM_ALIAS)
                    Catch ex As Exception
                        ClassLogger.Add("Unexpected error in Changing WMAlias: " & ex.Message, True)
+                        MsgBox("Unexpected error in Changing WMAlias: " & ex.Message, MsgBoxStyle.Critical)
                        Exit Sub
                    End Try
                    Try
@ -1069,6 +1082,7 @@ Public Class frmMain
                        IndexService.Start
                    Catch ex As Exception
                        ClassLogger.Add("Unexpected error in Restarting IndexService: " & ex.Message, True)
+                        MsgBox("Unexpected error in Restarting IndexService: " & ex.Message, MsgBoxStyle.Critical)
                        Exit Sub
                    End Try
                    Try
@ -1077,6 +1091,7 @@ Public Class frmMain
                        ControlCenter.StartVFSService(1)
                    Catch ex As Exception
                        ClassLogger.Add("Unexpected error in Restarting ControlCenter: " & ex.Message, True)
+                        MsgBox("Unexpected error in Restarting ControlCenter: " & ex.Message, MsgBoxStyle.Critical)
                        Exit Sub
                    End Try

@ -1093,13 +1108,28 @@ Public Class frmMain
                    If ClassInit.InitDatabase = True Then
                        ClassInit.InitUserLogin()
                        Load_Connection_Dep_Data()
-                        msg = "Die Client-Verbindung wurde erfolgreich gewechselt!"
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "The Client-Connection was changed successfully!"
+
+                        sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE UPPER(CONN_NAME) = UPPER('{0}') AND USER_ID = {1}", oSQLDescription, USER_GUID)
+                        Dim oSuccess As Boolean = False
+                        If ClassDatabase.Execute_non_Query(sql) = True Then
+                            oSuccess = True
                        End If
-                        MsgBox(msg, MsgBoxStyle.Information)
-                        sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE DESCRIPTION = {0} AND USER_ID = {1}", name, USER_GUID)
-                        ClassDatabase.Execute_Scalar(sql)
+                        If oSuccess = True Then
+                            msg = "Die Client-Verbindung wurde erfolgreich gewechselt!"
+                            If USER_LANGUAGE <> "de-DE" Then
+                                msg = "The Client-Connection was changed successfully!"
+                            End If
+                            MsgBox(msg, MsgBoxStyle.Information)
+                        Else
+                            msg = "Die Client-Verbindung konnte nicht erfolgreich gewechselt werden!"
+                            If USER_LANGUAGE <> "de-DE" Then
+                                msg = "The Client-Connection could not be changed!"
+                            End If
+                            MsgBox(msg, MsgBoxStyle.Critical)
+                        End If
+
+
+
                        ClassInit.Init_CONN_SWITCH()
                        CONN_Manager()
                    End If
@ -1110,4 +1140,8 @@ Public Class frmMain
            MsgBox("Unexpected error in BarButtonItemSwitchCon.ItemClick: " & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
+
+    Private Sub Timer5mins_Tick(sender As Object, e As EventArgs) Handles Timer5mins.Tick
+        LoggedIn()
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmRecordView.resx
+++ b/app/DD-Record-Organizer/frmRecordView.resx
@ -996,7 +996,7 @@
    <value>0, 0</value>
  </data>
  <data name="grvwGridPos.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
    <value>1332, 276</value>
@ -1440,7 +1440,7 @@
    <value>314, 24</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -1699,7 +1699,7 @@ zuordnen</value>
    <value>3, 6</value>
  </data>
  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView2.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmRecord_Changes.resx
+++ b/app/DD-Record-Organizer/frmRecord_Changes.resx
@ -345,7 +345,7 @@
    <value />
  </data>
  <data name="grvwSelection.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="&gt;&gt;BindingNavigator1.ZOrder" xml:space="preserve">
    <value>1</value>
--- a/app/DD-Record-Organizer/frmRight_Management.resx
+++ b/app/DD-Record-Organizer/frmRight_Management.resx
@ -675,7 +675,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>11, 120</value>
  </data>
  <data name="GridViewlUsers2Menue.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb
+++ b/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb
@ -823,7 +823,7 @@ Partial Class frmSAP_FuBa
        '
        'GridView2
        '
-        Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridView2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Magenta
        Me.GridView2.Appearance.SelectedRow.Options.UseBackColor = True
--- a/app/DD-Record-Organizer/frmUserKonfig.resx
+++ b/app/DD-Record-Organizer/frmUserKonfig.resx
@ -1836,7 +1836,7 @@
    <value>667, 19</value>
  </data>
  <data name="GridViewWH_Users1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewWH_Users1.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -1899,7 +1899,7 @@
    <value>229, 19</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewlUsers2Group.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -2137,7 +2137,7 @@ matchen</value>
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1128, 296</value>
+    <value>1124, 293</value>
  </data>
  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -2212,7 +2212,7 @@ matchen</value>
    <value>4, 41</value>
  </data>
  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView2.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -2628,7 +2628,7 @@ matchen</value>
    <value>631, 17</value>
  </data>
  <data name="GridViewUsersinClient.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewUsersinClient.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -2691,7 +2691,7 @@ matchen</value>
    <value>187, 19</value>
  </data>
  <data name="GridViewUser2Mandanten.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewUser2Mandanten.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -3639,7 +3639,7 @@ Mandant hinzufügen</value>
    <value>11, 29</value>
  </data>
  <data name="GridView3.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView3.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
@ -3855,7 +3855,7 @@ Mandant hinzufügen</value>
    <value>765, 39</value>
  </data>
  <data name="GridViewUser.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewUser.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmUserKonfig_AddUsers.resx
+++ b/app/DD-Record-Organizer/frmUserKonfig_AddUsers.resx
@ -247,7 +247,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridViewUsers.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridViewUsers.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmViewsUser.Designer.vb
+++ b/app/DD-Record-Organizer/frmViewsUser.Designer.vb
@ -85,7 +85,7 @@ Partial Class frmViewsUser
        '
        'GridView1
        '
-        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
@ -161,7 +161,7 @@ Partial Class frmViewsUser
        '
        'GridViewlUsers2Menue
        '
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True
--- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx
+++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx
@ -908,7 +908,7 @@
    <value>3, 59</value>
  </data>
  <data name="GridView1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Cyan</value>
+    <value>LightBlue</value>
  </data>
  <data name="GridView1.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Fuchsia</value>
--- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb
+++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb
@ -66,7 +66,7 @@ Public Class frmWM_DoctypeConfig
                If IsInsert = True Then
                    Dim DOCID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART WHERE BEZEICHNUNG = '" & BEZEICHNUNGTextBox.Text & "'", True)
                    If DOCID > 0 Then
-                        Dim insert = "INSERT INTO TBDD_DOKUMENTART_MODULE (DOKART_ID, MODULE_ID) VALUES (" & DOCID & ", 0)"
+                        Dim insert = "INSERT INTO TBDD_DOKUMENTART_MODULE (DOKART_ID, MODULE_ID) VALUES (" & DOCID & ",(SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'ADDI'))"
                        If ClassDatabase.Execute_non_Query(insert, True) = True Then
                            Refresh_DokartModule(DOCID)
                            IsInsert = False
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
@ -30,6 +30,8 @@ Partial Class frmCheckRightsEntity
        Me.btncancel = New System.Windows.Forms.Button()
        Me.chklogging = New System.Windows.Forms.CheckBox()
        Me.lblstate = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtOverride = New System.Windows.Forms.TextBox()
        Me.SuspendLayout()
        '
        'Label1
@ -52,7 +54,7 @@ Partial Class frmCheckRightsEntity
        '
        'btnCheckRights
        '
-        Me.btnCheckRights.Location = New System.Drawing.Point(28, 60)
+        Me.btnCheckRights.Location = New System.Drawing.Point(28, 94)
        Me.btnCheckRights.Name = "btnCheckRights"
        Me.btnCheckRights.Size = New System.Drawing.Size(335, 39)
        Me.btnCheckRights.TabIndex = 2
@ -64,7 +66,7 @@ Partial Class frmCheckRightsEntity
        '
        'ProgressBar1
        '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 130)
+        Me.ProgressBar1.Location = New System.Drawing.Point(28, 164)
        Me.ProgressBar1.Name = "ProgressBar1"
        Me.ProgressBar1.Size = New System.Drawing.Size(335, 31)
        Me.ProgressBar1.TabIndex = 3
@ -74,7 +76,7 @@ Partial Class frmCheckRightsEntity
        '
        Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1
        Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btncancel.Location = New System.Drawing.Point(369, 130)
+        Me.btncancel.Location = New System.Drawing.Point(369, 164)
        Me.btncancel.Name = "btncancel"
        Me.btncancel.Size = New System.Drawing.Size(75, 31)
        Me.btncancel.TabIndex = 4
@ -99,17 +101,37 @@ Partial Class frmCheckRightsEntity
        '
        Me.lblstate.AutoSize = True
        Me.lblstate.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblstate.Location = New System.Drawing.Point(28, 111)
+        Me.lblstate.Location = New System.Drawing.Point(28, 145)
        Me.lblstate.Name = "lblstate"
        Me.lblstate.Size = New System.Drawing.Size(38, 13)
        Me.lblstate.TabIndex = 6
        Me.lblstate.Text = "Label2"
        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(28, 60)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(153, 13)
+        Me.Label2.TabIndex = 7
+        Me.Label2.Text = "Optional from Count Override:"
+        '
+        'txtOverride
+        '
+        Me.txtOverride.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtOverride.Location = New System.Drawing.Point(263, 57)
+        Me.txtOverride.Name = "txtOverride"
+        Me.txtOverride.Size = New System.Drawing.Size(100, 21)
+        Me.txtOverride.TabIndex = 8
+        '
        'frmCheckRightsEntity
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(493, 172)
+        Me.ClientSize = New System.Drawing.Size(493, 219)
+        Me.Controls.Add(Me.txtOverride)
+        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.lblstate)
        Me.Controls.Add(Me.chklogging)
        Me.Controls.Add(Me.btncancel)
@ -138,4 +160,6 @@ End Sub
    Friend WithEvents btncancel As System.Windows.Forms.Button
    Friend WithEvents chklogging As System.Windows.Forms.CheckBox
    Friend WithEvents lblstate As System.Windows.Forms.Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtOverride As TextBox
 End Class
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
@ -9,6 +9,7 @@ Public Class frmCheckRightsEntity
    Private CURR_DOCID As Integer
    Private CURR_DOCPATH As String
    Private ENTITY_ID As Integer
+    Private OverrideCount As Integer
    Dim righterrors As Boolean = False
    Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
@ -26,6 +27,11 @@ Public Class frmCheckRightsEntity
    Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click
        If cmbentity.SelectedIndex <> -1 Then
            Try
+                If txtOverride.Text <> "" Then
+                    OverrideCount = CInt(txtOverride.Text)
+                Else
+                    OverrideCount = 0
+                End If
                righterrors = False
                CURR_DOCID = 0
                ENTITY_ID = cmbentity.SelectedValue
@ -34,8 +40,12 @@ Public Class frmCheckRightsEntity
                BW_RightsEntity = New BackgroundWorker
                BW_RightsEntity.WorkerReportsProgress = True
                BW_RightsEntity.WorkerSupportsCancellation = True
-                Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {0} ORDER BY DocID", ENTITY_ID)
-                DT_FILES = clsDatabase.Return_Datatable(sqlfiles)
+                Dim oSQL = $"SELECT TRL.DOC_ID AS DocID
+,'' as FULL_FILENAME --, [dbo].[FNPMO_GET_WINDREAM_FILE_PATH] (TRL.DOC_ID) as FULL_FILENAME,
+,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] 
+FROM TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {ENTITY_ID} ORDER BY DocID"
+                ' Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {0} ORDER BY DocID", ENTITY_ID)
+                DT_FILES = clsDatabase.Return_Datatable(oSQL)
                If DD_Rights.ClassWDRights.Init(chklogging.Checked, ClassDatabase.ConnectionStringRM) = False Then
                    MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                    Exit Sub
@ -73,6 +83,13 @@ Public Class frmCheckRightsEntity
        Dim i As Integer = 1
        'Jede Datei einzeln verarbeiten
        For Each row As DataRow In DT_FILES.Rows
+            If OverrideCount <> 0 Then
+                If WorkingFiles < OverrideCount Then
+                    WorkingFiles += 1
+                    i += 1
+                    Continue For
+                End If
+            End If
            If BW_RightsEntity.CancellationPending = True Then
                MsgBox("Backgroundworker aborting - check log!", MsgBoxStyle.Critical)
                e.Cancel = True
@ -82,6 +99,10 @@ Public Class frmCheckRightsEntity
                WorkingFiles += 1
                CURR_DOCID = row.Item("DocID")
                CURR_DOCPATH = row.Item("FULL_FILENAME")
+                If CURR_DOCPATH = String.Empty Then
+                    Dim oSQL = $"SELECT [dbo].[FNPMO_GET_WINDREAM_FILE_PATH] ({CURR_DOCID})"
+                    CURR_DOCPATH = clsDatabase.Execute_Scalar(oSQL)
+                End If
                If DD_Rights.ClassWDRights.Doc_Renew_Rights(CURR_DOCID, CURR_DOCPATH, True) Then
                    If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
                        righterrors = True
--- a/app/RecordOrganizer_RightManager/frmUsersReworkRights.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmUsersReworkRights.Designer.vb
@ -102,7 +102,7 @@ Partial Class frmUsersReworkRights
        '
        'GridViewlUsers2Menue
        '
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True