MS

app/DD-Record-Organiser/ClassControlBuilder.vb

@@ -352,13 +352,13 @@ Public Class ClassControlBuilder
                     If (Not value.Contains(";")) Then
                         If Not IsNothing(ctrlvalID) Then
                             Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGE_STEP = {1},CHANGED_WHO = '{2}' WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
-                                                     value.ToString, CURRENT_CHANGE_STEP, Environment.UserName, CONTROL_ID, CURRENT_RECORD_ID)
+                                                     value.ToString, CURRENT_CHANGE_STEP, USER_USERNAME, CONTROL_ID, CURRENT_RECORD_ID)
                             If ClassDatabase.Execute_non_Query(upd1, True) = False Then
 
                             End If
                         Else
                             If CURRENT_RECORD_ID <> 0 Then
-                                Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName)
+                                Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, USER_USERNAME)
                                 ClassDatabase.Execute_non_Query(ins)
                             End If
 
@@ -402,7 +402,7 @@ Public Class ClassControlBuilder
                                     Dim id = ClassDatabase.Execute_Scalar(sql1)
 
                                     If Not IsNothing(id) Then
-                                        Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, Environment.UserName, id)
+                                        Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
                                         If ClassDatabase.Execute_non_Query(upd, True) = True Then
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
                                         Else
@@ -410,7 +410,7 @@ Public Class ClassControlBuilder
                                         End If
 
                                     Else
-                                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, dateValue, Environment.UserName)
+                                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, dateValue, USER_USERNAME)
                                         If ClassDatabase.Execute_non_Query(ins) = True Then
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
                                         Else
@@ -457,7 +457,7 @@ Public Class ClassControlBuilder
                                     Dim id = ClassDatabase.Execute_Scalar(sqltextbox)
 
                                     If Not IsNothing(id) Then
-                                        Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, Environment.UserName, id)
+                                        Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, USER_USERNAME, id)
                                         If ClassDatabase.Execute_non_Query(upd, True) = True Then
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
                                         Else
@@ -465,7 +465,7 @@ Public Class ClassControlBuilder
                                         End If
 
                                     Else
-                                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, value1, Environment.UserName)
+                                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, value1, USER_USERNAME)
                                         If ClassDatabase.Execute_non_Query(ins) = True Then
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
                                         Else

app/DD-Record-Organiser/ClassControlCommands.vb

@@ -156,7 +156,7 @@
 
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & guid & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
                 Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL, True)
-                SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, Environment.UserName)
+                SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, USER_USERNAME)
                 ClassDatabase.Execute_non_Query(SQL, True)
                 Return True
             Else
@@ -181,7 +181,7 @@
             '    Console.WriteLine("After:" & x & ":" & y)
             'End If
 
-            Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE CONTROL_ID = " & CONTROL_ID
+            Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE CONTROL_ID = " & CONTROL_ID
 
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 Return True
@@ -204,7 +204,7 @@
             Dim NAME As String
             Dim REQUIRED As Integer
             Dim READ_ONLY As Integer
-            Dim CHANGED_WHO As String = Environment.UserName
+            Dim CHANGED_WHO As String = USER_USERNAME
             Dim COL_NAME As String
             Dim SQLCommand As String
             Dim EnabledWhen As String
@@ -361,7 +361,7 @@
             Dim CurrentType As String = control.GetType.ToString
             Dim X_LOC, Y_LOC As Integer
             Dim HEIGHT, WIDTH As Integer
-            Dim CHANGED_WHO As String = Environment.UserName
+            Dim CHANGED_WHO As String = USER_USERNAME
             Dim CONTROL_TEXT As String
             Dim TAB_INDEX As Integer
             Dim TAB_STOP As Integer

app/DD-Record-Organiser/ClassControlCommandsUI.vb

@@ -310,7 +310,7 @@ Public Class ClassControlCommandsUI
 
     Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
         Try
-            Dim ADDED_WHO As String = Environment.UserName
+            Dim ADDED_WHO As String = USER_USERNAME
             'Dim RECORD_ID As Integer
 
             'If IsInsert Then
@@ -413,7 +413,7 @@ Public Class ClassControlCommandsUI
             cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
             cmd.Parameters.Add("@RECORDID", SqlDbType.Int).Value = RecordID
             cmd.Parameters.Add("@IMG", SqlDbType.VarBinary).Value = bimage
-            cmd.Parameters.Add("@ADDED_WHO", SqlDbType.VarChar).Value = Environment.UserName
+            cmd.Parameters.Add("@ADDED_WHO", SqlDbType.VarChar).Value = USER_USERNAME
 
             conn.Open()
             cmd.ExecuteNonQuery()
@@ -436,9 +436,9 @@ Public Class ClassControlCommandsUI
             Dim VALUE = "%%" & ImageID.ToString & "%%"
 
             If valueExists Then
-                SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", VALUE, Environment.UserName, ControlID, RecordID)
+                SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", VALUE, USER_USERNAME, ControlID, RecordID)
             Else
-                SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (RECORD_ID, CONTROL_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", RecordID, ControlID, VALUE, Environment.UserName)
+                SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (RECORD_ID, CONTROL_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", RecordID, ControlID, VALUE, USER_USERNAME)
             End If
 
             ClassDatabase.Execute_non_Query(SQL, True)
@@ -465,7 +465,7 @@ Public Class ClassControlCommandsUI
             cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
             cmd.Parameters.Add("@RECORDID", SqlDbType.Int).Value = RecordID
             cmd.Parameters.Add("@IMG", SqlDbType.VarBinary).Value = bimage
-            cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = Environment.UserName
+            cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = USER_USERNAME
 
             conn.Open()
             cmd.ExecuteNonQuery()
@@ -495,7 +495,7 @@ Public Class ClassControlCommandsUI
     Private Sub UpdateAllControls(FormID As Integer, RecordID As Integer, controls As Control.ControlCollection)
         Try
             Dim sw As New SW("UpdateAllControls")
-            Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
+            Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
             ClassDatabase.Execute_non_Query(del)
             CURRENT_CHANGE_STEP += 1
             Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID))
@@ -600,7 +600,7 @@ Public Class ClassControlCommandsUI
                         Case "Decimal"
                             _addValue = Decimal.Parse(_addValue, Globalization.NumberStyles.Integer)
                     End Select
-                    Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE,ADDED_WHO) VALUES({0}, {1}, '{2}','{3}')", ControlId, RecordId, _addValue, Environment.UserName)
+                    Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE,ADDED_WHO) VALUES({0}, {1}, '{2}','{3}')", ControlId, RecordId, _addValue, USER_USERNAME)
                     ClassDatabase.Execute_non_Query(ins)
                 End If
             Next
@@ -919,7 +919,7 @@ Public Class ClassControlCommandsUI
 
     Public Shared Function InsertControlValue(ControlID As Integer, RecordID As Integer, Value As String)
         Try
-            Dim AddedWho = Environment.UserName
+            Dim AddedWho = USER_USERNAME
             Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
 
             Select Case FORMAT_TYPE
@@ -960,7 +960,7 @@ Public Class ClassControlCommandsUI
 
     Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String)
         Try
-            Dim CHANGED_WHO = Environment.UserName
+            Dim CHANGED_WHO = USER_USERNAME
             Dim DT_FORMAT_TYPE As DataTable = ClassDatabase.Return_Datatable("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
             Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
 
@@ -1000,19 +1000,19 @@ Public Class ClassControlCommandsUI
     End Function
 
     Public Shared Function CreateRecord(FormID)
-        Dim ADDED_WHO As String = Environment.UserName
+        Dim ADDED_WHO As String = USER_USERNAME
         Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & ADDED_WHO & "', " & FormID & ",4711)"
         Return ClassDatabase.Execute_non_Query(SQL, True)
     End Function
 
     Public Shared Function GetLastRecord()
-        Dim ADDED_WHO As String = Environment.UserName
+        Dim ADDED_WHO As String = USER_USERNAME
         Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND  ADDED_WHO = '" & ADDED_WHO & "'"
         Return ClassDatabase.Execute_Scalar(SQL, True)
     End Function
 
     Public Shared Function ConnectRecord(PARENT_RECORD As Integer, LINK_RECORD As Integer, Optional Comment As String = "")
-        Dim ADDED_WHO As String = Environment.UserName
+        Dim ADDED_WHO As String = USER_USERNAME
         Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & PARENT_RECORD & "," & LINK_RECORD & ",'" & Comment & "','" & ADDED_WHO & "')"
         If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL:  " & SQL, False)
         Return ClassDatabase.Execute_non_Query(SQL, True)

app/DD-Record-Organiser/ClassDOC_SEARCH.vb

@@ -72,11 +72,12 @@ Public Class ClassDOC_SEARCH
                     "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN4','{1}') AS DROPDOWN4" & vbNewLine & _
                     "FROM " & vbNewLine & _
                     "VWPMO_DOC_SEARCH T" & vbNewLine & _
-                    "WHERE T.DocID IN (select DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & 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, OPTION1, OPTION2)
-                If CURRENT_ENTITYSQL.ToUpper.Contains("WHERE") Then
+                If CURRENT_ENTITYSQL_WHERE <> "" Then
-                    Dim where = CURRENT_ENTITYSQL.ToUpper.Replace("SELECT T.*", "SELECT '#' + CONVERT(VARCHAR(10),T.[Record-ID]) + '#'")
+                    Dim where = CURRENT_ENTITYSQL_WHERE.Replace("WHERE [RECORD-ID] IN ", "")
-                    SQL_DOC_SEARCH = SQL_DOC_SEARCH & String.Format(" AND RECORD_ID IN ({0})", where)
+
+                    SQL_DOC_SEARCH = SQL_DOC_SEARCH & " " & vbNewLine & String.Format("AND T.DocID IN (SELECT DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK WHERE RECORD_ID IN ({0}))", where)
                 End If
                 If BG = True Then
                     If IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then
@@ -343,12 +344,12 @@ Public Class ClassDOC_SEARCH
             Return False
         End Try
     End Function
-    Public Shared Function SET_RECORD_DOCID_LINK(DOC_ID As Integer, RECORD_ID As Integer)
+    Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer)
         Try
-            Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (DOC_ID, RECORD_ID,ADDED_WHO) VALUES	({0},{1},'{2}')", DOC_ID, RECORD_ID, Environment.UserName)
+            Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
-            Return ClassDatabase.Execute_non_Query(ins)
+            Return ClassDatabase.Execute_non_Query_withConn(execute, 1)
         Catch ex As Exception
-            MsgBox("Unexpected Error in SET_RECORD_DOCID_LINK: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            MsgBox("Unexpected Error in CREATE_DOC_RELATED_LINKS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
     End Function
@@ -359,7 +360,7 @@ Public Class ClassDOC_SEARCH
                 Return False
             End If
             If LogErrorsOnly = False Then ClassLogger.Add("#### SETTING RIGHTS FPOR FILE ######", False)
-            DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName)
+            DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", USER_USERNAME)
             If DD_Rights.clsDatabase.Init(MyConnectionString) = True Then
                 If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then
                     If DD_Rights.ClassRights.Collect_Users(CURRENT_RECORD_ID, ENTITY_ID) = True Then

app/DD-Record-Organiser/ClassDragDrop.vb

@@ -8,7 +8,7 @@ Public Class ClassDragDrop
             If LogErrorsOnly = False Then ClassLogger.Add(" >> In Drop_File....", False)
             files_dropped = Nothing
 
-            Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')"
+            Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')"
             ClassDatabase.Execute_non_Query(sql)
 
 

app/DD-Record-Organiser/ClassFileResult.vb

@@ -8,7 +8,7 @@
             If comment = "" Then
                 upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0} WHERE DocID = {1}", state, DocID)
             Else
-                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, Environment.UserName, comment, DocID)
+                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID)
             End If
             If ClassDatabase.Execute_non_Query(upd) = True Then
                 InWork = True
@@ -48,7 +48,7 @@
             Dim DT As DataTable = CURRENT_TBPMO_INDEX_MAN
             If DT.Rows.Count > 0 Then
                 For Each row As DataRow In DT.Rows
-                    Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, row.Item("GUID"), row.Item("MAN_VALUE"), Environment.UserName)
+                    Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, row.Item("GUID"), row.Item("MAN_VALUE"), USER_USERNAME)
                     ClassDatabase.Execute_non_Query(insert)
                 Next
             End If

app/DD-Record-Organiser/ClassFolderWatcher.vb

@@ -110,7 +110,7 @@ Public Class ClassFolderWatcher
         Try
             Dim filename_only As String = Path.GetFileName(filename)
 
-            Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, Environment.UserName, handleType, filename_only)
+            Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, USER_USERNAME, handleType, filename_only)
             Return ClassDatabase.Execute_non_Query(ins, True)
         Catch ex As Exception
             MsgBox("Unexpected Error in Insert Scan-File: " & ex.Message, MsgBoxStyle.Critical)

app/DD-Record-Organiser/ClassFunctionCommands.vb

@@ -105,7 +105,7 @@
             If ValueExists = 0 Then
                 Return InsertValue(ControlID, RecordID, Value)
             Else
-                SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", Value, Environment.UserName, ControlID, RecordID)
+                SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", Value, USER_USERNAME, ControlID, RecordID)
                 If ClassDatabase.Execute_non_Query(SQL, True) = True Then
                     Return True
                 Else : Return False

app/DD-Record-Organiser/ClassHelper.vb

@@ -250,7 +250,7 @@ Public Class ClassHelper
     End Function
     Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String)
         Try
-            Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, Environment.UserName)
+            Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, USER_USERNAME)
             Return ClassDatabase.Execute_non_Query(insert)
         Catch ex As Exception
             ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True)
@@ -259,7 +259,7 @@ Public Class ClassHelper
     End Function
     Public Shared Function DeleteRecord(ByVal SELECTED_RECORD_ID)
         Try
-            Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, Environment.UserName)
+            Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, USER_USERNAME)
             Dim result As Boolean = ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
 
             If result = False Then

app/DD-Record-Organiser/ClassImport_Windream.vb

@@ -22,7 +22,7 @@ Public Class ClassImport_Windream
                 'Die Datei nach windream importieren
                 Dim streamresult = ClassWindream.Stream_File(QuellDatei_Path, Targetpath)
                 If streamresult = True Then
-                    Dim sql As String = String.Format("SELECT DocID FROM  VWPMO_WD_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
+                    Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
                     CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                     sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & DOCTYPE_ID
                     Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
@@ -407,7 +407,7 @@ Public Class ClassImport_Windream
                             Case "OFilename".ToUpper
                                 DATEINAME = DATEINAME.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_FILENAME))
                             Case "Username".ToUpper
-                                DATEINAME = DATEINAME.Replace(element.Value, Environment.UserName)
+                                DATEINAME = DATEINAME.Replace(element.Value, USER_USERNAME)
                         End Select
                         If datetemp <> "" Then
                             DATEINAME = DATEINAME.Replace(element.Value, datetemp)

app/DD-Record-Organiser/ClassInit.vb

@@ -6,7 +6,7 @@ Public Class ClassInit
     End Sub
 
     Public Sub InitLogger()
-        ClassLogger.Init("", Environment.UserName)
+        ClassLogger.Init("", USER_USERNAME)
     End Sub
 
     Public Function InitDatabase()
@@ -103,20 +103,26 @@ Public Class ClassInit
 
     End Sub
 
-    Public Shared Function InitUserLogin()
+    Public Shared Function InitUserLogin(Optional _User As String = "")
         Try
-            Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", Environment.UserName)
+            If _User = "" Then
+                USER_USERNAME = Environment.UserName
+            Else
+                USER_USERNAME = _User
+            End If
+            Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
             ClassLogger.Add(">> Login at: " & Now.ToString, False)
-            ClassLogger.Add(">> Username: " & Environment.UserName, False)
+            ClassLogger.Add(">> Username: " & USER_USERNAME, False)
             Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql)
             If USER_DT.Rows.Count = 0 Then
-                ClassLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradminsitration!", False)
+                ClassLogger.Add(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!", False)
                 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                 'Me.Close()
                 Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
                 MsgBox(msg, MsgBoxStyle.Exclamation)
                 Return False
             Else
+
                 USER_GUID = USER_DT.Rows(0).Item("GUID")
                 USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
                 USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'ClassDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
@@ -141,7 +147,7 @@ Public Class ClassInit
                 End If
                 Dim Right_RO As Boolean = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
                 If Right_RO = False Then
-                    ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False)
+                    ClassLogger.Add(" - User: " & USER_USERNAME & " nicht für Modul freigegben!", False)
                     'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                     Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
 
@@ -166,10 +172,18 @@ Public Class ClassInit
                     ClassDatabase.Execute_non_Query(sql)
 
                     USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN")
-                    'If USER_IS_ADMIN = True Then
+                    If USER_IS_ADMIN = True Then
-                    '    'Admin
+                        If ESC_Hidden = True Then
-                    '    pageAdmin.Visible = True
+                            frmLoginUserSelect.ShowDialog()
-                    'End If
+                            ESC_Hidden = False
+                            If USER_USERNAME <> "" Then
+                                InitUserLogin(USER_USERNAME)
+                            End If
+
+                        End If
+                        '    'Admin
+                        '    pageAdmin.Visible = True
+                    End If
 
                     sql = 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(sql)
@@ -213,7 +227,7 @@ Public Class ClassInit
                     End If
                     Return True
                     'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
-                End If
+                    End If
             End If
         Catch ex As Exception
             ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True)

app/DD-Record-Organiser/ClassRecordState.vb

@@ -2,7 +2,7 @@
 
     Public Shared Sub LockRecord(RecordId As Integer)
         Try
-            Dim Username As String = Environment.UserName
+            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)
 
             ClassDatabase.Execute_non_Query(SQL)

app/DD-Record-Organiser/ClassWindream.vb

@@ -2160,7 +2160,7 @@ Public Class ClassWindream
                     dwAccessRight = aRightRelation.GetVariableValue(COL_AccessRight_AccessRight) 'COL_AccessRight_AccessRight)
                     Dim UserGroupRelation = aRightRelation.GetWMObjectRelationByName(REL_AccessRight_UserOrGroup)
                     Dim UserOrGroup = UserGroupRelation.item(0).aName
-                    If UserOrGroup.ToString.ToLower.Contains(Environment.UserName.ToLower) Then
+                    If UserOrGroup.ToString.ToLower.Contains(USER_USERNAME.ToLower) Then
                         If dwAccessRight And WMAccessRightRead Then
                             _msg = "R"
                         End If

app/DD-Record-Organiser/DD-Record-Organiser.vbproj

@@ -316,6 +316,12 @@
     <Compile Include="frmLicense_User.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmLoginUserSelect.Designer.vb">
+      <DependentUpon>frmLoginUserSelect.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmLoginUserSelect.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmMass_Change.Designer.vb">
       <DependentUpon>frmMass_Change.vb</DependentUpon>
     </Compile>
@@ -741,6 +747,9 @@
     <EmbeddedResource Include="frmLicense_User.resx">
       <DependentUpon>frmLicense_User.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmLoginUserSelect.resx">
+      <DependentUpon>frmLoginUserSelect.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmMass_Change.en-US.resx">
       <DependentUpon>frmMass_Change.vb</DependentUpon>
     </EmbeddedResource>
@@ -759,6 +768,9 @@
     <EmbeddedResource Include="frmSAP_FuBa.resx">
       <DependentUpon>frmSAP_FuBa.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmSearchAllOver.en-US.resx">
+      <DependentUpon>frmSearchAllOver.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmSearchAllOVer.resx">
       <DependentUpon>frmSearchAllOver.vb</DependentUpon>
     </EmbeddedResource>

app/DD-Record-Organiser/DD_ECMAdmin.xsc

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

app/DD-Record-Organiser/DD_ECMAdmin.xsd

@@ -537,6 +537,42 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </Mappings>
             <Sources />
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="USER_RIGHTSTableAdapter" GeneratorDataComponentClassName="USER_RIGHTSTableAdapter" Name="USER_RIGHTS" UserDataComponentName="USER_RIGHTSTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T.GUID, dbo.FNPMO_GETOBJECTCAPTION(@LANGUAGE, 'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T3.GUID), 1) AS FORM_TITLE, T1.USERNAME, T1.NAME, T1.PRENAME, T.EDIT_REC, T.ADD_REC, 
+                         T.DELETE_REC, T.ADD_DOC, T.READ_ONLY_DOC, T.DELETE_DOC, T.FILES_VISIBLE, T.ADDED_WHEN, T.CHANGED_WHEN
+FROM            TBPMO_RIGHT_USER AS T INNER JOIN
+                         TBDD_USER AS T1 ON T.USER_ID = T1.GUID INNER JOIN
+                         TBPMO_FORM AS T2 ON T.ENTITY_ID = T2.GUID INNER JOIN
+                         TBPMO_FORM_VIEW AS T3 ON T2.GUID = T3.FORM_ID</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="LANGUAGE" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
+              <Mapping SourceColumn="FORM_TITLE" DataSetColumn="FORM_TITLE" />
+              <Mapping SourceColumn="USERNAME" DataSetColumn="USERNAME" />
+              <Mapping SourceColumn="NAME" DataSetColumn="NAME" />
+              <Mapping SourceColumn="PRENAME" DataSetColumn="PRENAME" />
+              <Mapping SourceColumn="EDIT_REC" DataSetColumn="EDIT_REC" />
+              <Mapping SourceColumn="ADD_REC" DataSetColumn="ADD_REC" />
+              <Mapping SourceColumn="DELETE_REC" DataSetColumn="DELETE_REC" />
+              <Mapping SourceColumn="ADD_DOC" DataSetColumn="ADD_DOC" />
+              <Mapping SourceColumn="READ_ONLY_DOC" DataSetColumn="READ_ONLY_DOC" />
+              <Mapping SourceColumn="DELETE_DOC" DataSetColumn="DELETE_DOC" />
+              <Mapping SourceColumn="FILES_VISIBLE" DataSetColumn="FILES_VISIBLE" />
+              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
+              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -545,7 +581,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
   <xs:element name="DD_ECMAdmin" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DD_ECMAdmin" msprop:Generator_UserDSName="DD_ECMAdmin">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_TableClassName="TBPMO_FORM_CONSTRUCTORDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_CONSTRUCTOR" msprop:Generator_TablePropName="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_RowDeletingName="TBPMO_FORM_CONSTRUCTORRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_CONSTRUCTORRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_CONSTRUCTORRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_CONSTRUCTORRowDeleted" msprop:Generator_UserTableName="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_RowChangedName="TBPMO_FORM_CONSTRUCTORRowChanged" msprop:Generator_RowEvArgName="TBPMO_FORM_CONSTRUCTORRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FORM_CONSTRUCTORRow">
+        <xs:element name="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_TableClassName="TBPMO_FORM_CONSTRUCTORDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_CONSTRUCTOR" msprop:Generator_RowChangedName="TBPMO_FORM_CONSTRUCTORRowChanged" msprop:Generator_TablePropName="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_RowDeletingName="TBPMO_FORM_CONSTRUCTORRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_CONSTRUCTORRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_CONSTRUCTORRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_CONSTRUCTORRowDeleted" msprop:Generator_RowClassName="TBPMO_FORM_CONSTRUCTORRow" msprop:Generator_UserTableName="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_RowEvArgName="TBPMO_FORM_CONSTRUCTORRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -591,7 +627,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_TableClassName="TBPMO_FORM_CONSTRUCTOR_DETAILDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_TablePropName="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_RowDeletingName="TBPMO_FORM_CONSTRUCTOR_DETAILRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_CONSTRUCTOR_DETAILRowDeleted" msprop:Generator_UserTableName="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_RowChangedName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChanged" msprop:Generator_RowEvArgName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FORM_CONSTRUCTOR_DETAILRow">
+        <xs:element name="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_TableClassName="TBPMO_FORM_CONSTRUCTOR_DETAILDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_RowChangedName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChanged" msprop:Generator_TablePropName="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_RowDeletingName="TBPMO_FORM_CONSTRUCTOR_DETAILRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_CONSTRUCTOR_DETAILRowDeleted" msprop:Generator_RowClassName="TBPMO_FORM_CONSTRUCTOR_DETAILRow" msprop:Generator_UserTableName="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_RowEvArgName="TBPMO_FORM_CONSTRUCTOR_DETAILRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -712,7 +748,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBDD_CONNECTIONRow" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent">
+        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBDD_CONNECTIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -785,14 +821,14 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="DT_VORSCHAU" msprop:Generator_TableClassName="DT_VORSCHAUDataTable" msprop:Generator_TableVarName="tableDT_VORSCHAU" msprop:Generator_TablePropName="DT_VORSCHAU" msprop:Generator_RowDeletingName="DT_VORSCHAURowDeleting" msprop:Generator_RowChangingName="DT_VORSCHAURowChanging" msprop:Generator_RowEvHandlerName="DT_VORSCHAURowChangeEventHandler" msprop:Generator_RowDeletedName="DT_VORSCHAURowDeleted" msprop:Generator_UserTableName="DT_VORSCHAU" msprop:Generator_RowChangedName="DT_VORSCHAURowChanged" msprop:Generator_RowEvArgName="DT_VORSCHAURowChangeEvent" msprop:Generator_RowClassName="DT_VORSCHAURow">
+        <xs:element name="DT_VORSCHAU" msprop:Generator_TableClassName="DT_VORSCHAUDataTable" msprop:Generator_TableVarName="tableDT_VORSCHAU" msprop:Generator_RowChangedName="DT_VORSCHAURowChanged" msprop:Generator_TablePropName="DT_VORSCHAU" msprop:Generator_RowDeletingName="DT_VORSCHAURowDeleting" msprop:Generator_RowChangingName="DT_VORSCHAURowChanging" msprop:Generator_RowEvHandlerName="DT_VORSCHAURowChangeEventHandler" msprop:Generator_RowDeletedName="DT_VORSCHAURowDeleted" msprop:Generator_RowClassName="DT_VORSCHAURow" msprop:Generator_UserTableName="DT_VORSCHAU" msprop:Generator_RowEvArgName="DT_VORSCHAURowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="VALUE" msprop:Generator_ColumnVarNameInTable="columnVALUE" msprop:Generator_ColumnPropNameInRow="VALUE" msprop:Generator_ColumnPropNameInTable="VALUEColumn" msprop:Generator_UserColumnName="VALUE" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWTEMPQUICKVIEW" msprop:Generator_TableClassName="VWTEMPQUICKVIEWDataTable" msprop:Generator_TableVarName="tableVWTEMPQUICKVIEW" msprop:Generator_RowChangedName="VWTEMPQUICKVIEWRowChanged" msprop:Generator_TablePropName="VWTEMPQUICKVIEW" msprop:Generator_RowDeletingName="VWTEMPQUICKVIEWRowDeleting" msprop:Generator_RowChangingName="VWTEMPQUICKVIEWRowChanging" msprop:Generator_RowEvHandlerName="VWTEMPQUICKVIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="VWTEMPQUICKVIEWRowDeleted" msprop:Generator_RowClassName="VWTEMPQUICKVIEWRow" msprop:Generator_UserTableName="VWTEMPQUICKVIEW" msprop:Generator_RowEvArgName="VWTEMPQUICKVIEWRowChangeEvent">
+        <xs:element name="VWTEMPQUICKVIEW" msprop:Generator_TableClassName="VWTEMPQUICKVIEWDataTable" msprop:Generator_TableVarName="tableVWTEMPQUICKVIEW" msprop:Generator_TablePropName="VWTEMPQUICKVIEW" msprop:Generator_RowDeletingName="VWTEMPQUICKVIEWRowDeleting" msprop:Generator_RowChangingName="VWTEMPQUICKVIEWRowChanging" msprop:Generator_RowEvHandlerName="VWTEMPQUICKVIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="VWTEMPQUICKVIEWRowDeleted" msprop:Generator_UserTableName="VWTEMPQUICKVIEW" msprop:Generator_RowChangedName="VWTEMPQUICKVIEWRowChanged" msprop:Generator_RowEvArgName="VWTEMPQUICKVIEWRowChangeEvent" msprop:Generator_RowClassName="VWTEMPQUICKVIEWRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Record-ID" msprop:Generator_ColumnVarNameInTable="_columnRecord_ID" msprop:Generator_ColumnPropNameInRow="_Record_ID" msprop:Generator_ColumnPropNameInTable="_Record_IDColumn" msprop:Generator_UserColumnName="Record-ID" type="xs:int" />
@@ -821,7 +857,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBAD_Users" msprop:Generator_TableClassName="TBAD_UsersDataTable" msprop:Generator_TableVarName="tableTBAD_Users" msprop:Generator_TablePropName="TBAD_Users" msprop:Generator_RowDeletingName="TBAD_UsersRowDeleting" msprop:Generator_RowChangingName="TBAD_UsersRowChanging" msprop:Generator_RowEvHandlerName="TBAD_UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="TBAD_UsersRowDeleted" msprop:Generator_UserTableName="TBAD_Users" msprop:Generator_RowChangedName="TBAD_UsersRowChanged" msprop:Generator_RowEvArgName="TBAD_UsersRowChangeEvent" msprop:Generator_RowClassName="TBAD_UsersRow">
+        <xs:element name="TBAD_Users" msprop:Generator_TableClassName="TBAD_UsersDataTable" msprop:Generator_TableVarName="tableTBAD_Users" msprop:Generator_RowChangedName="TBAD_UsersRowChanged" msprop:Generator_TablePropName="TBAD_Users" msprop:Generator_RowDeletingName="TBAD_UsersRowDeleting" msprop:Generator_RowChangingName="TBAD_UsersRowChanging" msprop:Generator_RowEvHandlerName="TBAD_UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="TBAD_UsersRowDeleted" msprop:Generator_RowClassName="TBAD_UsersRow" msprop:Generator_UserTableName="TBAD_Users" msprop:Generator_RowEvArgName="TBAD_UsersRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Select" msprop:Generator_ColumnVarNameInTable="columnSelect" msprop:Generator_ColumnPropNameInRow="_Select" msprop:Generator_ColumnPropNameInTable="SelectColumn" msprop:Generator_UserColumnName="Select" type="xs:boolean" default="false" minOccurs="0" />
@@ -833,7 +869,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_ENTITIES" msprop:Generator_TableClassName="TBWH_ENTITIESDataTable" msprop:Generator_TableVarName="tableTBWH_ENTITIES" msprop:Generator_RowChangedName="TBWH_ENTITIESRowChanged" msprop:Generator_TablePropName="TBWH_ENTITIES" msprop:Generator_RowDeletingName="TBWH_ENTITIESRowDeleting" msprop:Generator_RowChangingName="TBWH_ENTITIESRowChanging" msprop:Generator_RowEvHandlerName="TBWH_ENTITIESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ENTITIESRowDeleted" msprop:Generator_RowClassName="TBWH_ENTITIESRow" msprop:Generator_UserTableName="TBWH_ENTITIES" msprop:Generator_RowEvArgName="TBWH_ENTITIESRowChangeEvent">
+        <xs:element name="TBWH_ENTITIES" msprop:Generator_TableClassName="TBWH_ENTITIESDataTable" msprop:Generator_TableVarName="tableTBWH_ENTITIES" msprop:Generator_TablePropName="TBWH_ENTITIES" msprop:Generator_RowDeletingName="TBWH_ENTITIESRowDeleting" msprop:Generator_RowChangingName="TBWH_ENTITIESRowChanging" msprop:Generator_RowEvHandlerName="TBWH_ENTITIESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ENTITIESRowDeleted" msprop:Generator_UserTableName="TBWH_ENTITIES" msprop:Generator_RowChangedName="TBWH_ENTITIESRowChanged" msprop:Generator_RowEvArgName="TBWH_ENTITIESRowChangeEvent" msprop:Generator_RowClassName="TBWH_ENTITIESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -854,7 +890,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_USER_GROUPS" msprop:Generator_TableClassName="TBWH_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBWH_USER_GROUPS" msprop:Generator_RowChangedName="TBWH_USER_GROUPSRowChanged" msprop:Generator_TablePropName="TBWH_USER_GROUPS" msprop:Generator_RowDeletingName="TBWH_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBWH_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_USER_GROUPSRowDeleted" msprop:Generator_RowClassName="TBWH_USER_GROUPSRow" msprop:Generator_UserTableName="TBWH_USER_GROUPS" msprop:Generator_RowEvArgName="TBWH_USER_GROUPSRowChangeEvent">
+        <xs:element name="TBWH_USER_GROUPS" msprop:Generator_TableClassName="TBWH_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBWH_USER_GROUPS" msprop:Generator_TablePropName="TBWH_USER_GROUPS" msprop:Generator_RowDeletingName="TBWH_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBWH_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_USER_GROUPSRowDeleted" msprop:Generator_UserTableName="TBWH_USER_GROUPS" msprop:Generator_RowChangedName="TBWH_USER_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBWH_USER_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBWH_USER_GROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -868,7 +904,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_Users1" msprop:Generator_TableClassName="TBWH_Users1DataTable" msprop:Generator_TableVarName="tableTBWH_Users1" msprop:Generator_RowChangedName="TBWH_Users1RowChanged" msprop:Generator_TablePropName="TBWH_Users1" msprop:Generator_RowDeletingName="TBWH_Users1RowDeleting" msprop:Generator_RowChangingName="TBWH_Users1RowChanging" msprop:Generator_RowEvHandlerName="TBWH_Users1RowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_Users1RowDeleted" msprop:Generator_RowClassName="TBWH_Users1Row" msprop:Generator_UserTableName="TBWH_Users1" msprop:Generator_RowEvArgName="TBWH_Users1RowChangeEvent">
+        <xs:element name="TBWH_Users1" msprop:Generator_TableClassName="TBWH_Users1DataTable" msprop:Generator_TableVarName="tableTBWH_Users1" msprop:Generator_TablePropName="TBWH_Users1" msprop:Generator_RowDeletingName="TBWH_Users1RowDeleting" msprop:Generator_RowChangingName="TBWH_Users1RowChanging" msprop:Generator_RowEvHandlerName="TBWH_Users1RowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_Users1RowDeleted" msprop:Generator_UserTableName="TBWH_Users1" msprop:Generator_RowChangedName="TBWH_Users1RowChanged" msprop:Generator_RowEvArgName="TBWH_Users1RowChangeEvent" msprop:Generator_RowClassName="TBWH_Users1Row">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Select" msprop:Generator_ColumnVarNameInTable="columnSelect" msprop:Generator_ColumnPropNameInRow="_Select" msprop:Generator_ColumnPropNameInTable="SelectColumn" msprop:Generator_UserColumnName="Select" type="xs:boolean" default="false" minOccurs="0" />
@@ -880,7 +916,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_Users2" msprop:Generator_TableClassName="TBWH_Users2DataTable" msprop:Generator_TableVarName="tableTBWH_Users2" msprop:Generator_TablePropName="TBWH_Users2" msprop:Generator_RowDeletingName="TBWH_Users2RowDeleting" msprop:Generator_RowChangingName="TBWH_Users2RowChanging" msprop:Generator_RowEvHandlerName="TBWH_Users2RowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_Users2RowDeleted" msprop:Generator_UserTableName="TBWH_Users2" msprop:Generator_RowChangedName="TBWH_Users2RowChanged" msprop:Generator_RowEvArgName="TBWH_Users2RowChangeEvent" msprop:Generator_RowClassName="TBWH_Users2Row">
+        <xs:element name="TBWH_Users2" msprop:Generator_TableClassName="TBWH_Users2DataTable" msprop:Generator_TableVarName="tableTBWH_Users2" msprop:Generator_RowChangedName="TBWH_Users2RowChanged" msprop:Generator_TablePropName="TBWH_Users2" msprop:Generator_RowDeletingName="TBWH_Users2RowDeleting" msprop:Generator_RowChangingName="TBWH_Users2RowChanging" msprop:Generator_RowEvHandlerName="TBWH_Users2RowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_Users2RowDeleted" msprop:Generator_RowClassName="TBWH_Users2Row" msprop:Generator_UserTableName="TBWH_Users2" msprop:Generator_RowEvArgName="TBWH_Users2RowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Select" msprop:Generator_ColumnVarNameInTable="columnSelect" msprop:Generator_ColumnPropNameInRow="_Select" msprop:Generator_ColumnPropNameInTable="SelectColumn" msprop:Generator_UserColumnName="Select" type="xs:boolean" default="false" minOccurs="0" />
@@ -892,7 +928,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_SAP_FUBA" msprop:Generator_TableClassName="TBPMO_SAP_FUBADataTable" msprop:Generator_TableVarName="tableTBPMO_SAP_FUBA" msprop:Generator_TablePropName="TBPMO_SAP_FUBA" msprop:Generator_RowDeletingName="TBPMO_SAP_FUBARowDeleting" msprop:Generator_RowChangingName="TBPMO_SAP_FUBARowChanging" msprop:Generator_RowEvHandlerName="TBPMO_SAP_FUBARowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_SAP_FUBARowDeleted" msprop:Generator_UserTableName="TBPMO_SAP_FUBA" msprop:Generator_RowChangedName="TBPMO_SAP_FUBARowChanged" msprop:Generator_RowEvArgName="TBPMO_SAP_FUBARowChangeEvent" msprop:Generator_RowClassName="TBPMO_SAP_FUBARow">
+        <xs:element name="TBPMO_SAP_FUBA" msprop:Generator_TableClassName="TBPMO_SAP_FUBADataTable" msprop:Generator_TableVarName="tableTBPMO_SAP_FUBA" msprop:Generator_RowChangedName="TBPMO_SAP_FUBARowChanged" msprop:Generator_TablePropName="TBPMO_SAP_FUBA" msprop:Generator_RowDeletingName="TBPMO_SAP_FUBARowDeleting" msprop:Generator_RowChangingName="TBPMO_SAP_FUBARowChanging" msprop:Generator_RowEvHandlerName="TBPMO_SAP_FUBARowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_SAP_FUBARowDeleted" msprop:Generator_RowClassName="TBPMO_SAP_FUBARow" msprop:Generator_UserTableName="TBPMO_SAP_FUBA" msprop:Generator_RowEvArgName="TBPMO_SAP_FUBARowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1007,7 +1043,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_TableClassName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGDataTable" msprop:Generator_TableVarName="tableTBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_TablePropName="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_RowDeletingName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowDeleted" msprop:Generator_UserTableName="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_RowChangedName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow">
+        <xs:element name="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_TableClassName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGDataTable" msprop:Generator_TableVarName="tableTBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_RowChangedName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChanged" msprop:Generator_TablePropName="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_RowDeletingName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowDeleted" msprop:Generator_RowClassName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow" msprop:Generator_UserTableName="TBPMO_DOCSEARCH_RESULTLIST_CONFIG" msprop:Generator_RowEvArgName="TBPMO_DOCSEARCH_RESULTLIST_CONFIGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1056,6 +1092,50 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="USER_RIGHTS" msprop:Generator_TableClassName="USER_RIGHTSDataTable" msprop:Generator_TableVarName="tableUSER_RIGHTS" msprop:Generator_TablePropName="USER_RIGHTS" msprop:Generator_RowDeletingName="USER_RIGHTSRowDeleting" msprop:Generator_RowChangingName="USER_RIGHTSRowChanging" msprop:Generator_RowEvHandlerName="USER_RIGHTSRowChangeEventHandler" msprop:Generator_RowDeletedName="USER_RIGHTSRowDeleted" msprop:Generator_UserTableName="USER_RIGHTS" msprop:Generator_RowChangedName="USER_RIGHTSRowChanged" msprop:Generator_RowEvArgName="USER_RIGHTSRowChangeEvent" msprop:Generator_RowClassName="USER_RIGHTSRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="FORM_TITLE" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnFORM_TITLE" msprop:Generator_ColumnPropNameInRow="FORM_TITLE" msprop:Generator_ColumnPropNameInTable="FORM_TITLEColumn" msprop:Generator_UserColumnName="FORM_TITLE" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="USERNAME" msprop:Generator_ColumnVarNameInTable="columnUSERNAME" msprop:Generator_ColumnPropNameInRow="USERNAME" msprop:Generator_ColumnPropNameInTable="USERNAMEColumn" msprop:Generator_UserColumnName="USERNAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="PRENAME" msprop:Generator_ColumnVarNameInTable="columnPRENAME" msprop:Generator_ColumnPropNameInRow="PRENAME" msprop:Generator_ColumnPropNameInTable="PRENAMEColumn" msprop:Generator_UserColumnName="PRENAME" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="EDIT_REC" msprop:Generator_ColumnVarNameInTable="columnEDIT_REC" msprop:Generator_ColumnPropNameInRow="EDIT_REC" msprop:Generator_ColumnPropNameInTable="EDIT_RECColumn" msprop:Generator_UserColumnName="EDIT_REC" type="xs:boolean" />
+              <xs:element name="ADD_REC" msprop:Generator_ColumnVarNameInTable="columnADD_REC" msprop:Generator_ColumnPropNameInRow="ADD_REC" msprop:Generator_ColumnPropNameInTable="ADD_RECColumn" msprop:Generator_UserColumnName="ADD_REC" type="xs:boolean" />
+              <xs:element name="DELETE_REC" msprop:Generator_ColumnVarNameInTable="columnDELETE_REC" msprop:Generator_ColumnPropNameInRow="DELETE_REC" msprop:Generator_ColumnPropNameInTable="DELETE_RECColumn" msprop:Generator_UserColumnName="DELETE_REC" type="xs:boolean" />
+              <xs:element name="ADD_DOC" msprop:Generator_ColumnVarNameInTable="columnADD_DOC" msprop:Generator_ColumnPropNameInRow="ADD_DOC" msprop:Generator_ColumnPropNameInTable="ADD_DOCColumn" msprop:Generator_UserColumnName="ADD_DOC" type="xs:boolean" />
+              <xs:element name="READ_ONLY_DOC" msprop:Generator_ColumnVarNameInTable="columnREAD_ONLY_DOC" msprop:Generator_ColumnPropNameInRow="READ_ONLY_DOC" msprop:Generator_ColumnPropNameInTable="READ_ONLY_DOCColumn" msprop:Generator_UserColumnName="READ_ONLY_DOC" type="xs:boolean" />
+              <xs:element name="DELETE_DOC" msprop:Generator_ColumnVarNameInTable="columnDELETE_DOC" msprop:Generator_ColumnPropNameInRow="DELETE_DOC" msprop:Generator_ColumnPropNameInTable="DELETE_DOCColumn" msprop:Generator_UserColumnName="DELETE_DOC" type="xs:boolean" />
+              <xs:element name="FILES_VISIBLE" msprop:Generator_ColumnVarNameInTable="columnFILES_VISIBLE" msprop:Generator_ColumnPropNameInRow="FILES_VISIBLE" msprop:Generator_ColumnPropNameInTable="FILES_VISIBLEColumn" msprop:Generator_UserColumnName="FILES_VISIBLE" type="xs:boolean" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -1090,10 +1170,14 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A
       <xs:selector xpath=".//mstns:TBPMO_DOCSEARCH_RESULTLIST_CONFIG" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
+    <xs:unique name="USER_RIGHTS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:USER_RIGHTS" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msdata:parent="TBPMO_FORM_CONSTRUCTOR" msdata:child="TBPMO_FORM_CONSTRUCTOR_DETAIL" msdata:parentkey="GUID" msdata:childkey="CONSTRUCT_ID" msprop:Generator_UserChildTable="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_ChildPropName="GetTBPMO_FORM_CONSTRUCTOR_DETAILRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msprop:Generator_ParentPropName="TBPMO_FORM_CONSTRUCTORRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msprop:Generator_UserParentTable="TBPMO_FORM_CONSTRUCTOR" />
+      <msdata:Relationship name="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msdata:parent="TBPMO_FORM_CONSTRUCTOR" msdata:child="TBPMO_FORM_CONSTRUCTOR_DETAIL" msdata:parentkey="GUID" msdata:childkey="CONSTRUCT_ID" msprop:Generator_UserChildTable="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_ChildPropName="GetTBPMO_FORM_CONSTRUCTOR_DETAILRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msprop:Generator_UserParentTable="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_ParentPropName="TBPMO_FORM_CONSTRUCTORRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

app/DD-Record-Organiser/DD_ECMAdmin.xss

@@ -4,23 +4,24 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-14" ViewPortY="-14" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-14" ViewPortY="-3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="13" X="45" Y="38" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="14" X="45" Y="38" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="12" X="385" Y="38" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="13" X="385" Y="38" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="10" X="866" Y="324" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="11" X="866" Y="324" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWTEMPQUICKVIEW" ZOrder="8" X="1089" Y="129" Height="172" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:VWTEMPQUICKVIEW" ZOrder="9" X="1089" Y="129" Height="172" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:TBWH_ENTITIES" ZOrder="7" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_ENTITIES" ZOrder="8" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBWH_USER_GROUPS" ZOrder="6" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_USER_GROUPS" ZOrder="7" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_SAP_FUBA" ZOrder="4" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBPMO_SAP_FUBA" ZOrder="5" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG" ZOrder="1" X="34" Y="348" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG" ZOrder="2" X="34" Y="348" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="9" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
+    <Shape ID="DesignTable:USER_RIGHTS" ZOrder="1" X="566" Y="380" Height="305" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBAD_Users" ZOrder="5" X="365" Y="384" Height="144" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="10" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:TBWH_Users1" ZOrder="3" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBAD_Users" ZOrder="6" X="365" Y="384" Height="144" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBWH_Users2" ZOrder="2" X="794" Y="145" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:TBWH_Users1" ZOrder="4" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_Users2" ZOrder="3" X="794" Y="145" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="11" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="12" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>345</X>

app/DD-Record-Organiser/ModuleHelperMethods.vb

@@ -193,8 +193,8 @@
         frm.Show()
     End Sub
     Public Sub OpenSearchAllOVer()
-        Dim frm As New frmViewsUser
+        Dim frm As New frmSearchAllOVer
-        frm = frmViewsUser
+        frm = frmSearchAllOVer
         frm.MdiParent = MAIN_FORM
         frm.Show()
     End Sub

app/DD-Record-Organiser/ModuleMySettings.vb

@@ -32,6 +32,8 @@ Module ModuleMySettings
 
     Public USER_IS_ADMIN = False
     Public USERS_LOGGED_IN = 0
+
+    Public USER_USERNAME As String
     Public USER_GUID = 0
     Public USERID_FK_INT_ECM = 0
     Public USER_LANGUAGE As String = "de-DE"

app/DD-Record-Organiser/ModuleRuntimeVariables.vb

@@ -1,4 +1,6 @@
 Module ModuleRuntimeVariables
+    Public ESC_Hidden As Boolean = False
+
     Public MAIN_FORM As frmMain = Nothing
     Public ERROR_INIT = "NONE"
     Public CtrlBuilder As ClassControlBuilder
@@ -82,6 +84,7 @@
     Public CURRENT_ENTITY_VALUES_DT As DataTable
     Public CURRENT_CONTROL_VALUES As DataTable
     Public CURRENT_SQL_AUTO_VALUES_DT As DataTable
+    Public CURRENT_ENTITYSQL_WHERE As String
     Public CURRENT_TBPMO_INDEX_MAN As DataTable
     Public CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable
     Public CURRENT_DT_DOC_ENTITY_SEARCH As DataTable

app/DD-Record-Organiser/frmCockpit.vb

@@ -16,7 +16,7 @@
                         "'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), 1) AS 'Entity-Title', dbo.FNPMO_GETOBJECTCAPTION('{0}', 'WF_STATE_TITLE' + CONVERT(VARCHAR(5), STATE_ID), 1) AS 'State-Title', " & _
                         "COMMENT, DUE_DATE, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TASK_DATE, FINAL, COLOR FROM VWPMO_WF_ACTIVE AS T " & _
                         "WHERE (WF_TASK_ID NOT IN (SELECT WF_TASK_ID FROM VWPMO_WF_USER_EXCLUSIV " & _
-                        "WHERE (WF_TASK_ID NOT IN (SELECT WF_TASK_ID FROM VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1 WHERE (UPPER(USERNAME) = UPPER('{1}'))))))", USER_LANGUAGE, Environment.UserName)
+                        "WHERE (WF_TASK_ID NOT IN (SELECT WF_TASK_ID FROM VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1 WHERE (UPPER(USERNAME) = UPPER('{1}'))))))", USER_LANGUAGE, USER_USERNAME)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             If Not DT Is Nothing Then
                 GridControl1.DataSource = DT

app/DD-Record-Organiser/frmConfig_Basic.vb

@@ -288,9 +288,9 @@ Public Class frmConfig_Basic
             Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)
             Dim sql As String
             If folderwatch Is Nothing And mypath <> "" Then
-                sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE,SUBDIRECTORIES, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN', " & _SUBDIRECTORIES & ",'" & Environment.UserName & "')"
+                sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE,SUBDIRECTORIES, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN', " & _SUBDIRECTORIES & ",'" & USER_USERNAME & "')"
             Else
-                sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', SUBDIRECTORIES = " & _SUBDIRECTORIES & ", CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch
+                sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', SUBDIRECTORIES = " & _SUBDIRECTORIES & ", CHANGED_WHO = '" & USER_USERNAME & "' where GUID = " & folderwatch
             End If
             If ClassDatabase.Execute_non_Query(sql) Then
                 Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT FOLDER_PATH, SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)

app/DD-Record-Organiser/frmConnections.vb

@@ -9,7 +9,7 @@ Public Class frmConnections
             Me.Validate()
             Me.TBDD_CONNECTIONBindingSource.EndEdit()
             If DD_ECMAdmin.TBDD_CONNECTION.GetChanges Is Nothing = False Then
-                CHANGED_WHOTextBox.Text = Environment.UserName
+                CHANGED_WHOTextBox.Text = USER_USERNAME
                 TBDD_CONNECTIONBindingSource.EndEdit()
                 TBDD_CONNECTIONTableAdapter.Update(DD_ECMAdmin.TBDD_CONNECTION)
                 Me.lblSave.Visible = True
@@ -285,7 +285,7 @@ Public Class frmConnections
     End Sub
 
     Private Sub TBDD_CONNECTIONBindingSource_AddingNew1(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CONNECTIONBindingSource.AddingNew
-        Me.DD_ECMAdmin.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName
+        Me.DD_ECMAdmin.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = USER_USERNAME
         Me.DD_ECMAdmin.TBDD_CONNECTION.ERSTELLTWANNColumn.DefaultValue = Date.Now
     End Sub
 

app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb

@@ -113,6 +113,7 @@ Partial Class frmConstructorDesigner
         Me.listBoxControls = New System.Windows.Forms.ListBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
+        Me.chkActivateDSOnEdit = New System.Windows.Forms.CheckBox()
         Me.chkDOC_SEARCH_TAB1 = New System.Windows.Forms.CheckBox()
         Me.XtraTabControlSV = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage7 = New DevExpress.XtraTab.XtraTabPage()
@@ -851,12 +852,19 @@ Partial Class frmConstructorDesigner
         'XtraTabPage4
         '
         resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4")
+        Me.XtraTabPage4.Controls.Add(Me.chkActivateDSOnEdit)
         Me.XtraTabPage4.Controls.Add(Me.chkDOC_SEARCH_TAB1)
         Me.XtraTabPage4.Controls.Add(Me.XtraTabControlSV)
         Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
         Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch)
         Me.XtraTabPage4.Name = "XtraTabPage4"
         '
+        'chkActivateDSOnEdit
+        '
+        resources.ApplyResources(Me.chkActivateDSOnEdit, "chkActivateDSOnEdit")
+        Me.chkActivateDSOnEdit.Name = "chkActivateDSOnEdit"
+        Me.chkActivateDSOnEdit.UseVisualStyleBackColor = True
+        '
         'chkDOC_SEARCH_TAB1
         '
         resources.ApplyResources(Me.chkDOC_SEARCH_TAB1, "chkDOC_SEARCH_TAB1")
@@ -1960,4 +1968,5 @@ Partial Class frmConstructorDesigner
     Friend WithEvents colSurname1 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colSurname4 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents chkDOC_SEARCH_TAB1 As System.Windows.Forms.CheckBox
+    Friend WithEvents chkActivateDSOnEdit As System.Windows.Forms.CheckBox
 End Class

app/DD-Record-Organiser/frmConstructorDesigner.resx

@@ -1099,7 +1099,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAYwBDAGMAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAawBDAGsAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -2177,6 +2177,36 @@
   <data name="XtraTabPage4.AutoScroll" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="chkActivateDSOnEdit.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkActivateDSOnEdit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="chkActivateDSOnEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>335, 8</value>
+  </data>
+  <data name="chkActivateDSOnEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>279, 17</value>
+  </data>
+  <data name="chkActivateDSOnEdit.TabIndex" type="System.Int32, mscorlib">
+    <value>85</value>
+  </data>
+  <data name="chkActivateDSOnEdit.Text" xml:space="preserve">
+    <value>Dateimanagement bei Datensatzwechsel freischalten</value>
+  </data>
+  <data name="&gt;&gt;chkActivateDSOnEdit.Name" xml:space="preserve">
+    <value>chkActivateDSOnEdit</value>
+  </data>
+  <data name="&gt;&gt;chkActivateDSOnEdit.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkActivateDSOnEdit.Parent" xml:space="preserve">
+    <value>XtraTabPage4</value>
+  </data>
+  <data name="&gt;&gt;chkActivateDSOnEdit.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="chkDOC_SEARCH_TAB1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2202,7 +2232,7 @@
     <value>XtraTabPage4</value>
   </data>
   <data name="&gt;&gt;chkDOC_SEARCH_TAB1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="XtraTabControlSV.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
@@ -2813,7 +2843,7 @@
     <value>409, 47</value>
   </data>
   <data name="CheckedListBoxSupervisorControls.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 132</value>
+    <value>253, 116</value>
   </data>
   <data name="CheckedListBoxSupervisorControls.TabIndex" type="System.Int32, mscorlib">
     <value>95</value>
@@ -2891,7 +2921,7 @@
     <value>XtraTabPage4</value>
   </data>
   <data name="&gt;&gt;XtraTabControlSV.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="chkWDSearch_Active.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2918,7 +2948,7 @@
     <value>XtraTabPage4</value>
   </data>
   <data name="&gt;&gt;chkWDSearch_Active.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="lblSaveDocSearch.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2930,7 +2960,7 @@
     <value>NoControl</value>
   </data>
   <data name="lblSaveDocSearch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>828, 12</value>
+    <value>786, 15</value>
   </data>
   <data name="lblSaveDocSearch.Size" type="System.Drawing.Size, System.Drawing">
     <value>129, 13</value>
@@ -2954,7 +2984,7 @@
     <value>XtraTabPage4</value>
   </data>
   <data name="&gt;&gt;lblSaveDocSearch.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
     <value>1094, 280</value>

app/DD-Record-Organiser/frmConstructorDesigner.vb

@@ -12,7 +12,7 @@ Public Class frmConstructorDesigner
             Me.Validate()
             Me.TBPMO_FORM_CONSTRUCTORBindingSource.EndEdit()
             If DD_ECMAdmin.TBPMO_FORM_CONSTRUCTOR.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 TBPMO_FORM_CONSTRUCTORTableAdapter.Update(DD_ECMAdmin.TBPMO_FORM_CONSTRUCTOR)
                 lblSave.Visible = True
             Else
@@ -167,6 +167,7 @@ Public Class frmConstructorDesigner
         Try
             'Zurücksetzen
             lblSaveDocSearch.Visible = False
+
             Dim res = ClassDatabase.Execute_Scalar("SELECT DOCUMENT_VIEW FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
 
             If res = True Then
@@ -174,12 +175,20 @@ Public Class frmConstructorDesigner
             Else
                 chkWDSearch_Active.Checked = False
             End If
-            res = ClassDatabase.Execute_Scalar("SELECT DOC_SEARCH_TAB1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
+
+            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT DOC_SEARCH_TAB1,ACTIVATE_DOC_SEARCH_ON_EDIT FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
+            res = DT.Rows(0).Item(0) ' ClassDatabase.Execute_Scalar("SELECT DOC_SEARCH_TAB1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
             If CBool(res) = True Then
                 chkDOC_SEARCH_TAB1.Checked = True
             Else
                 chkDOC_SEARCH_TAB1.Checked = False
             End If
+            res = DT.Rows(0).Item(1) ' ClassDatabase.Execute_Scalar("SELECT ACTIVATE_DOC_SEARCH_ON_EDIT FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
+            If CBool(res) = True Then
+                chkActivateDSOnEdit.Checked = True
+            Else
+                chkActivateDSOnEdit.Checked = False
+            End If
         Catch ex As Exception
             MsgBox("Error in RecordSearch_Config:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -316,7 +325,7 @@ Public Class frmConstructorDesigner
             Try
                 Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource.EndEdit()
                 If DD_ECMAdmin.TBPMO_FORM_CONSTRUCTOR_DETAIL.GetChanges Is Nothing = False Then
-                    Me.CHANGED_WHOTextBox1.Text = Environment.UserName
+                    Me.CHANGED_WHOTextBox1.Text = USER_USERNAME
                     Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource.EndEdit()
                     Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter.Update(DD_ECMAdmin.TBPMO_FORM_CONSTRUCTOR_DETAIL)
                     tslblSaveDetail.Text = "Constructor-Details saved - " & Now
@@ -340,12 +349,8 @@ Public Class frmConstructorDesigner
                     Else
                         docsearch = 0
                     End If
-
+                    Dim upd = String.Format("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = {0},CHANGED_WHO = '{1}' WHERE FORM_ID = {2} AND SCREEN_ID = {3}", docsearch, USER_USERNAME, SELECTED_ENTITY_ID, CURRENT_SCREEN_ID)
-                    Dim sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = " & docsearch & " , CHANGED_WHO = '" & Environment.UserName & "' where FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+                    ClassDatabase.Execute_non_Query(upd)
-                    If ClassDatabase.Execute_non_Query(sql, True) = True Then
-                        lblSaveDocSearch.Visible = True
-                        lblSaveDocSearch.Text = "Data saved - " & Now
-                    End If
 
                     Dim DOC_SEARCH_TAB1 As Integer
                     If chkDOC_SEARCH_TAB1.Checked Then
@@ -353,7 +358,13 @@ Public Class frmConstructorDesigner
                     Else
                         DOC_SEARCH_TAB1 = 0
                     End If
-                    sql = "UPDATE TBPMO_FORM_CONSTRUCTOR_DETAIL SET DOC_SEARCH_TAB1 = " & DOC_SEARCH_TAB1 & " , CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID
+                    Dim ACTIVATE_DOC_SEARCH_ON_EDIT As Integer
+                    If chkActivateDSOnEdit.Checked Then
+                        ACTIVATE_DOC_SEARCH_ON_EDIT = 1
+                    Else
+                        ACTIVATE_DOC_SEARCH_ON_EDIT = 0
+                    End If
+                    Dim sql = String.Format("UPDATE TBPMO_FORM_CONSTRUCTOR_DETAIL SET DOC_SEARCH_TAB1 = {0},ACTIVATE_DOC_SEARCH_ON_EDIT = {1}, CHANGED_WHO = '{2}' where GUID = {3}", DOC_SEARCH_TAB1, ACTIVATE_DOC_SEARCH_ON_EDIT, USER_USERNAME, SELECTED_CONSTRUCTOR_DETAIL_ID)
                     If ClassDatabase.Execute_non_Query(sql, True) = True Then
                         lblSaveDocSearch.Visible = True
                         lblSaveDocSearch.Text = "Data saved - " & Now
@@ -373,7 +384,7 @@ Public Class frmConstructorDesigner
             Try
                 Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource.EndEdit()
                 If DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.GetChanges Is Nothing = False Then
-                    Me.CHANGED_WHOTextBox2.Text = Environment.UserName
+                    Me.CHANGED_WHOTextBox2.Text = USER_USERNAME
                     Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource.EndEdit()
                     Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL)
                     lblsaveSQLUser.Visible = True
@@ -586,7 +597,7 @@ Public Class frmConstructorDesigner
         Try
             Dim i = listBoxControls.SelectedValue
             If Not IsNothing(i) Then
-                Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",'" & Environment.UserName & "')"
+                Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",'" & USER_USERNAME & "')"
                 If ClassDatabase.Execute_non_Query(insert, True) Then
                     Load_QuickDisplay()
                 End If
@@ -625,7 +636,7 @@ Public Class frmConstructorDesigner
     End Sub
 
     Private Sub btnSetHeadline_Click(sender As Object, e As EventArgs) Handles btnSetHeadline.Click
-        Dim upd = "UPDATE TBPMO_FORM_CONSTR_QUICK_DISPLAY SET HEADLINE = 1, CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & ListBoxConfiguredDisplay.SelectedValue
+        Dim upd = "UPDATE TBPMO_FORM_CONSTR_QUICK_DISPLAY SET HEADLINE = 1, CHANGED_WHO = '" & USER_USERNAME & "' WHERE GUID = " & ListBoxConfiguredDisplay.SelectedValue
         If ClassDatabase.Execute_non_Query(upd, True) Then
             lblChangeHeadline.Visible = True
         End If
@@ -637,7 +648,7 @@ Public Class frmConstructorDesigner
             Try
                 Dim i = listBoxControls.SelectedValue
                 If Not IsNothing(i) Then
-                    Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,PICTURE,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",1,'" & Environment.UserName & "')"
+                    Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,PICTURE,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",1,'" & USER_USERNAME & "')"
                     If ClassDatabase.Execute_non_Query(insert, True) Then
                         Load_QuickDisplay()
                         lblQuickViewAdded.Visible = True
@@ -705,7 +716,7 @@ Public Class frmConstructorDesigner
                     Else
                         home = 0
                     End If
-                    Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO,HOME_MENUE) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & row.Item(5) & ",'" & Environment.UserName & "'," & home & ")"
+                    Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO,HOME_MENUE) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & row.Item(5) & ",'" & USER_USERNAME & "'," & home & ")"
                     If ClassDatabase.Execute_non_Query(insert, False) = False Then
                         MsgBox("Could not insert the User-Definition....Check the logfile!", MsgBoxStyle.Exclamation)
                     End If
@@ -789,7 +800,7 @@ Public Class frmConstructorDesigner
         Try
             Dim USERID = GridViewUserSQL.GetFocusedRowCellValue(GridViewUserSQL.Columns("ID"))
             If Not USERID Is Nothing Then
-                DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.ADDED_WHOColumn.DefaultValue = Environment.UserName
+                DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.ADDED_WHOColumn.DefaultValue = USER_USERNAME
                 DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.CONSTR_DET_IDColumn.DefaultValue = SELECTED_CONSTRUCTOR_DETAIL_ID
                 DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.USER_IDColumn.DefaultValue = USERID
             End If
@@ -865,7 +876,7 @@ Public Class frmConstructorDesigner
             Dim item As MyListBoxItem = CType(obj, MyListBoxItem)
             Dim sql = "select count(*) from TBPMO_CLIENT_ENTITY Where CLIENT_ID = " & item.ExtraData & " AND ENTITY_ID = " & SELECTED_ENTITY_ID
             If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, SELECTED_ENTITY_ID, Environment.UserName)
+                sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, SELECTED_ENTITY_ID, USER_USERNAME)
                 If ClassDatabase.Execute_non_Query(sql) = False Then
                     MsgBox("Error in Adding Entity to Client!", MsgBoxStyle.Critical)
                 End If
@@ -958,7 +969,7 @@ Public Class frmConstructorDesigner
 
                     Dim sel = String.Format("SELECT COUNT(GUID) FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0} AND USER_ID = {1}", SELECTED_ENTITY_ID, row.Item(5))
                     If ClassDatabase.Execute_Scalar(sel) = 0 Then
-                        Dim insert = String.Format("INSERT INTO TBPMO_ENTITY_SUPERVISOR ([ENTITY_ID], USER_ID,RIGHT1,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", SELECTED_ENTITY_ID, row.Item(5), right, Environment.UserName)
+                        Dim insert = String.Format("INSERT INTO TBPMO_ENTITY_SUPERVISOR ([ENTITY_ID], USER_ID,RIGHT1,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", SELECTED_ENTITY_ID, row.Item(5), right, USER_USERNAME)
                         If ClassDatabase.Execute_non_Query(insert, True) Then
                         End If
                     End If
@@ -994,7 +1005,7 @@ Public Class frmConstructorDesigner
         If cmbSupervisorControls.SelectedIndex <> -1 Then
             Dim sql = "select count(*) from TBPMO_SUPERVISOR_CONTROLS Where CONTROL_ID = " & cmbSupervisorControls.SelectedValue
             If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                sql = String.Format("INSERT INTO TBPMO_SUPERVISOR_CONTROLS (CONTROL_ID, ADDED_WHO) VALUES ({0},'{1}')", cmbSupervisorControls.SelectedValue, Environment.UserName)
+                sql = String.Format("INSERT INTO TBPMO_SUPERVISOR_CONTROLS (CONTROL_ID, ADDED_WHO) VALUES ({0},'{1}')", cmbSupervisorControls.SelectedValue, USER_USERNAME)
                 If ClassDatabase.Execute_non_Query(sql) = False Then
                     MsgBox("Error in Adding Supervisor-Control! Check log", MsgBoxStyle.Critical)
                 Else

app/DD-Record-Organiser/frmConstructor_Main.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmConstructor_Main
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     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()
@@ -29,7 +30,7 @@ Partial Class frmConstructor_Main
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
         Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
         Me.TreeViewMain = New System.Windows.Forms.TreeView()
-        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip()
+        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator14 = New System.Windows.Forms.ToolStripSeparator()
         Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -40,7 +41,7 @@ Partial Class frmConstructor_Main
         Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
         Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -62,11 +63,12 @@ Partial Class frmConstructor_Main
         Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.grvwCarousel = New DevExpress.XtraGrid.Views.Layout.LayoutView()
         Me.grvwTiles = New DevExpress.XtraGrid.Views.Tile.TileView()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripRecords = New System.Windows.Forms.ToolStrip()
         Me.tslbldisplayRecords = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripDropDownButton3 = New System.Windows.Forms.ToolStripDropDownButton()
         Me.CopyRecordtsmi = New System.Windows.Forms.ToolStripMenuItem()
         Me.NewVarianttsmi = New System.Windows.Forms.ToolStripMenuItem()
+        Me.RecordDeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.ChangeParentLinktsmi = New System.Windows.Forms.ToolStripMenuItem()
         Me.CreateWorkflowtaskstsmi = New System.Windows.Forms.ToolStripMenuItem()
@@ -76,11 +78,15 @@ Partial Class frmConstructor_Main
         Me.AnwendungscacheResettsmi = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator19 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsbtnRefresh_Entity = New System.Windows.Forms.ToolStripButton()
-        Me.tsbtnDeleteRecord = New System.Windows.Forms.ToolStripButton()
         Me.TCDetails = New DevExpress.XtraTab.XtraTabControl()
         Me.TabDetails = New DevExpress.XtraTab.XtraTabPage()
         Me.SplitContainerDetails = New DevExpress.XtraEditors.SplitContainerControl()
         Me.pnlDetails = New System.Windows.Forms.Panel()
+        Me.pnlDocFill = New System.Windows.Forms.Panel()
+        Me.statStripDoc = New System.Windows.Forms.StatusStrip()
+        Me.tslblDocIDTab1 = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.tslblDocViewLocked = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.pnlDocToolStrip = New System.Windows.Forms.Panel()
         Me.ToolStripEdit = New System.Windows.Forms.ToolStrip()
         Me.tsButtonAdd = New System.Windows.Forms.ToolStripButton()
         Me.tsButtonSave = New System.Windows.Forms.ToolStripButton()
@@ -93,10 +99,12 @@ Partial Class frmConstructor_Main
         Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel()
         Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
         Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
         Me.docCM_Copy = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
+        Me.docCMEntityWideSearch = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator()
         Me.docCM_Rename = New System.Windows.Forms.ToolStripMenuItem()
         Me.tsTextBoxRenameFile = New System.Windows.Forms.ToolStripTextBox()
         Me.docCM_RenameDisplay = New System.Windows.Forms.ToolStripMenuItem()
@@ -117,19 +125,18 @@ Partial Class frmConstructor_Main
         Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
         Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsdrdowbtnDocSearch = New System.Windows.Forms.ToolStripDropDownButton()
         Me.KonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsTextboxFulltext = New System.Windows.Forms.ToolStripTextBox()
         Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator()
-        Me.tsbtnEntitySearch = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.DocSearchRefresh = New System.Windows.Forms.ToolStripButton()
+        Me.tsbtnDoc_Refresh = New System.Windows.Forms.ToolStripButton()
         Me.TabFollowUp = New DevExpress.XtraTab.XtraTabPage()
         Me.ListViewFollowUps = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.grpbxFU_Profile = New System.Windows.Forms.GroupBox()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
         Me.btnRemoveUser_FollowUp = New System.Windows.Forms.Button()
@@ -147,7 +154,7 @@ Partial Class frmConstructor_Main
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
         Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator()
+        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
         Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@@ -160,84 +167,80 @@ Partial Class frmConstructor_Main
         Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.XtraTabPageVariant = New DevExpress.XtraTab.XtraTabPage()
-        Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl()
-        Me.ProgressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel()
         Me.SplitContainerFORM = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
         Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane()
         Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton()
         Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton()
         Me.StatusStrip_Main = New System.Windows.Forms.StatusStrip()
         Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel()
         Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.tsstlblDocID = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.tslblDocIDMain = New System.Windows.Forms.ToolStripStatusLabel()
         Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel()
         Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar()
         Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel()
         Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
-        Me.ttToolTip = New System.Windows.Forms.ToolTip()
+        Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
-        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
         Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
         Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter()
-        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
-        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.ToolTipController = New DevExpress.Utils.ToolTipController()
+        Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
         Me.RealTimeSource1 = New DevExpress.Data.RealTimeSource()
-        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SplitContainerMain.SuspendLayout()
+        Me.SplitContainerMain.SuspendLayout
-        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SplitContainerTop.SuspendLayout()
+        Me.SplitContainerTop.SuspendLayout
-        Me.CMSEntity.SuspendLayout()
+        Me.CMSEntity.SuspendLayout
-        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.ContextMenuGrid.SuspendLayout()
+        Me.ContextMenuGrid.SuspendLayout
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.ToolStrip1.SuspendLayout()
+        Me.ToolStripRecords.SuspendLayout
-        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.TCDetails.SuspendLayout()
+        Me.TCDetails.SuspendLayout
-        Me.TabDetails.SuspendLayout()
+        Me.TabDetails.SuspendLayout
-        CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerDetails,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SplitContainerDetails.SuspendLayout()
+        Me.SplitContainerDetails.SuspendLayout
-        Me.ToolStripEdit.SuspendLayout()
+        Me.pnlDocFill.SuspendLayout
-        Me.TabWindream.SuspendLayout()
+        Me.statStripDoc.SuspendLayout
-        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ToolStripEdit.SuspendLayout
-        Me.ContextMenuStripResultFiles.SuspendLayout()
+        Me.TabWindream.SuspendLayout
-        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.ToolStripDokumente.SuspendLayout()
+        Me.ContextMenuStripResultFiles.SuspendLayout
-        Me.TabFollowUp.SuspendLayout()
+        CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.grpbxFU_Profile.SuspendLayout()
+        Me.ToolStripDokumente.SuspendLayout
-        Me.GroupBox4.SuspendLayout()
+        Me.TabFollowUp.SuspendLayout
-        Me.TabPos.SuspendLayout()
+        Me.grpbxFU_Profile.SuspendLayout
-        Me.Panel1.SuspendLayout()
+        Me.GroupBox4.SuspendLayout
-        CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.TabPos.SuspendLayout
-        CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout
-        CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.BindingNavigatorPOS.SuspendLayout()
+        CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.XtraTabPageVariant.SuspendLayout()
+        CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.BindingNavigatorPOS.SuspendLayout
-        CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerFORM,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SplitContainerFORM.SuspendLayout()
+        Me.SplitContainerFORM.SuspendLayout
-        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.StatusStrip_Main.SuspendLayout
-        Me.StatusStrip_Main.SuspendLayout()
+        CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout
-        Me.SuspendLayout()
         '
         'SplitContainerMain
         '
         Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
         resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain")
-        Me.SplitContainerMain.Horizontal = False
+        Me.SplitContainerMain.Horizontal = false
         Me.SplitContainerMain.Name = "SplitContainerMain"
         Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerTop)
         resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1")
@@ -253,20 +256,20 @@ Partial Class frmConstructor_Main
         Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain)
         resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1")
         Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain)
-        Me.SplitContainerTop.Panel2.Controls.Add(Me.ToolStrip1)
+        Me.SplitContainerTop.Panel2.Controls.Add(Me.ToolStripRecords)
         resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2")
         Me.SplitContainerTop.SplitterPosition = 283
         '
         'TreeViewMain
         '
-        Me.TreeViewMain.AllowDrop = True
+        Me.TreeViewMain.AllowDrop = true
         Me.TreeViewMain.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
         Me.TreeViewMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TreeViewMain.ContextMenuStrip = Me.CMSEntity
         resources.ApplyResources(Me.TreeViewMain, "TreeViewMain")
-        Me.TreeViewMain.FullRowSelect = True
+        Me.TreeViewMain.FullRowSelect = true
         Me.TreeViewMain.Name = "TreeViewMain"
-        Me.TreeViewMain.ShowLines = False
+        Me.TreeViewMain.ShowLines = false
         '
         'CMSEntity
         '
@@ -324,7 +327,7 @@ Partial Class frmConstructor_Main
         '
         'GridControlMain
         '
-        Me.GridControlMain.AllowDrop = True
+        Me.GridControlMain.AllowDrop = true
         Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
         resources.ApplyResources(Me.GridControlMain, "GridControlMain")
         GridLevelNode1.LevelTemplate = Me.grvwGrid
@@ -446,25 +449,25 @@ Partial Class frmConstructor_Main
         '
         'grvwGrid
         '
-        Me.grvwGrid.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.grvwGrid.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.EvenRow.BackColor"),System.Drawing.Color)
-        Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = True
+        Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = true
         Me.grvwGrid.GridControl = Me.GridControlMain
         resources.ApplyResources(Me.grvwGrid, "grvwGrid")
         Me.grvwGrid.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always
         Me.grvwGrid.Name = "grvwGrid"
         Me.grvwGrid.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
         Me.grvwGrid.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.grvwGrid.OptionsBehavior.Editable = False
+        Me.grvwGrid.OptionsBehavior.Editable = false
-        Me.grvwGrid.OptionsBehavior.ReadOnly = True
+        Me.grvwGrid.OptionsBehavior.ReadOnly = true
         Me.grvwGrid.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
-        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = false
-        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False
+        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = false
-        Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False
+        Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = false
-        Me.grvwGrid.OptionsSelection.MultiSelect = True
+        Me.grvwGrid.OptionsSelection.MultiSelect = true
         Me.grvwGrid.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
-        Me.grvwGrid.OptionsView.ColumnAutoWidth = False
+        Me.grvwGrid.OptionsView.ColumnAutoWidth = false
-        Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True
+        Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = true
-        Me.grvwGrid.OptionsView.ShowAutoFilterRow = True
+        Me.grvwGrid.OptionsView.ShowAutoFilterRow = true
         Me.grvwGrid.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
         Me.grvwGrid.VertScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always
         '
@@ -477,22 +480,22 @@ Partial Class frmConstructor_Main
         'grvwTiles
         '
         Me.grvwTiles.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat
-        Me.grvwTiles.FocusBorderColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.grvwTiles.FocusBorderColor = System.Drawing.Color.FromArgb(CType(CType(255,Byte),Integer), CType(CType(128,Byte),Integer), CType(CType(255,Byte),Integer))
         Me.grvwTiles.GridControl = Me.GridControlMain
         Me.grvwTiles.Name = "grvwTiles"
-        Me.grvwTiles.OptionsBehavior.ReadOnly = True
+        Me.grvwTiles.OptionsBehavior.ReadOnly = true
-        Me.grvwTiles.OptionsFind.AlwaysVisible = True
+        Me.grvwTiles.OptionsFind.AlwaysVisible = true
         Me.grvwTiles.OptionsTiles.HorizontalContentAlignment = DevExpress.Utils.HorzAlignment.Near
         Me.grvwTiles.OptionsTiles.ItemSize = New System.Drawing.Size(240, 116)
         Me.grvwTiles.OptionsTiles.RowCount = 2
         Me.grvwTiles.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar
         Me.grvwTiles.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Top
         '
-        'ToolStrip1
+        'ToolStripRecords
         '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbldisplayRecords, Me.ToolStripDropDownButton3, Me.ToolStripSeparator19, Me.tsbtnRefresh_Entity, Me.tsbtnDeleteRecord})
+        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbldisplayRecords, Me.ToolStripDropDownButton3, Me.ToolStripSeparator19, Me.tsbtnRefresh_Entity})
-        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
+        resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords")
-        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStripRecords.Name = "ToolStripRecords"
         '
         'tslbldisplayRecords
         '
@@ -502,7 +505,7 @@ Partial Class frmConstructor_Main
         'ToolStripDropDownButton3
         '
         Me.ToolStripDropDownButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripDropDownButton3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CopyRecordtsmi, Me.NewVarianttsmi, Me.ToolStripSeparator5, Me.ChangeParentLinktsmi, Me.CreateWorkflowtaskstsmi, Me.showRecordLogtsmi, Me.OfficeVorlagentsmi, Me.ToolStripSeparator4, Me.AnwendungscacheResettsmi})
+        Me.ToolStripDropDownButton3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CopyRecordtsmi, Me.NewVarianttsmi, Me.RecordDeleteToolStripMenuItem, Me.ToolStripSeparator5, Me.ChangeParentLinktsmi, Me.CreateWorkflowtaskstsmi, Me.showRecordLogtsmi, Me.OfficeVorlagentsmi, Me.ToolStripSeparator4, Me.AnwendungscacheResettsmi})
         Me.ToolStripDropDownButton3.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041
         resources.ApplyResources(Me.ToolStripDropDownButton3, "ToolStripDropDownButton3")
         Me.ToolStripDropDownButton3.Name = "ToolStripDropDownButton3"
@@ -519,6 +522,12 @@ Partial Class frmConstructor_Main
         Me.NewVarianttsmi.Name = "NewVarianttsmi"
         resources.ApplyResources(Me.NewVarianttsmi, "NewVarianttsmi")
         '
+        'RecordDeleteToolStripMenuItem
+        '
+        Me.RecordDeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.RecordDeleteToolStripMenuItem.Name = "RecordDeleteToolStripMenuItem"
+        resources.ApplyResources(Me.RecordDeleteToolStripMenuItem, "RecordDeleteToolStripMenuItem")
+        '
         'ToolStripSeparator5
         '
         Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
@@ -568,21 +577,15 @@ Partial Class frmConstructor_Main
         resources.ApplyResources(Me.tsbtnRefresh_Entity, "tsbtnRefresh_Entity")
         Me.tsbtnRefresh_Entity.Name = "tsbtnRefresh_Entity"
         '
-        'tsbtnDeleteRecord
-        '
-        Me.tsbtnDeleteRecord.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
-        resources.ApplyResources(Me.tsbtnDeleteRecord, "tsbtnDeleteRecord")
-        Me.tsbtnDeleteRecord.Name = "tsbtnDeleteRecord"
-        '
         'TCDetails
         '
-        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color)
+        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"),System.Drawing.Color)
-        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color)
+        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor2"),System.Drawing.Color)
-        Me.TCDetails.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font)
+        Me.TCDetails.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.Font"),System.Drawing.Font)
-        Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseBackColor = True
+        Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseBackColor = true
-        Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseFont = True
+        Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseFont = true
         resources.ApplyResources(Me.TCDetails, "TCDetails")
-        Me.TCDetails.LookAndFeel.UseDefaultLookAndFeel = False
+        Me.TCDetails.LookAndFeel.UseDefaultLookAndFeel = false
         Me.TCDetails.Name = "TCDetails"
         Me.TCDetails.SelectedTabPage = Me.TabDetails
         Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos, Me.XtraTabPageVariant})
@@ -597,23 +600,56 @@ Partial Class frmConstructor_Main
         '
         'SplitContainerDetails
         '
-        Me.SplitContainerDetails.Appearance.BackColor = CType(resources.GetObject("SplitContainerDetails.Appearance.BackColor"), System.Drawing.Color)
+        Me.SplitContainerDetails.Appearance.BackColor = CType(resources.GetObject("SplitContainerDetails.Appearance.BackColor"),System.Drawing.Color)
-        Me.SplitContainerDetails.Appearance.Options.UseBackColor = True
+        Me.SplitContainerDetails.Appearance.Options.UseBackColor = true
         Me.SplitContainerDetails.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D
         Me.SplitContainerDetails.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
         resources.ApplyResources(Me.SplitContainerDetails, "SplitContainerDetails")
         Me.SplitContainerDetails.Name = "SplitContainerDetails"
         Me.SplitContainerDetails.Panel1.Controls.Add(Me.pnlDetails)
         resources.ApplyResources(Me.SplitContainerDetails.Panel1, "SplitContainerDetails.Panel1")
+        Me.SplitContainerDetails.Panel2.Controls.Add(Me.pnlDocFill)
+        Me.SplitContainerDetails.Panel2.Controls.Add(Me.pnlDocToolStrip)
         resources.ApplyResources(Me.SplitContainerDetails.Panel2, "SplitContainerDetails.Panel2")
         Me.SplitContainerDetails.SplitterPosition = 786
         '
         'pnlDetails
         '
-        Me.pnlDetails.AllowDrop = True
+        Me.pnlDetails.AllowDrop = true
         resources.ApplyResources(Me.pnlDetails, "pnlDetails")
         Me.pnlDetails.Name = "pnlDetails"
         '
+        'pnlDocFill
+        '
+        Me.pnlDocFill.Controls.Add(Me.statStripDoc)
+        resources.ApplyResources(Me.pnlDocFill, "pnlDocFill")
+        Me.pnlDocFill.Name = "pnlDocFill"
+        '
+        'statStripDoc
+        '
+        Me.statStripDoc.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocIDTab1, Me.tslblDocViewLocked})
+        resources.ApplyResources(Me.statStripDoc, "statStripDoc")
+        Me.statStripDoc.Name = "statStripDoc"
+        '
+        'tslblDocIDTab1
+        '
+        Me.tslblDocIDTab1.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)  _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)  _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides)
+        Me.tslblDocIDTab1.Name = "tslblDocIDTab1"
+        resources.ApplyResources(Me.tslblDocIDTab1, "tslblDocIDTab1")
+        '
+        'tslblDocViewLocked
+        '
+        Me.tslblDocViewLocked.Image = Global.DD_Record_Organiser.My.Resources.Resources.lock
+        Me.tslblDocViewLocked.Name = "tslblDocViewLocked"
+        resources.ApplyResources(Me.tslblDocViewLocked, "tslblDocViewLocked")
+        '
+        'pnlDocToolStrip
+        '
+        resources.ApplyResources(Me.pnlDocToolStrip, "pnlDocToolStrip")
+        Me.pnlDocToolStrip.Name = "pnlDocToolStrip"
+        '
         'ToolStripEdit
         '
         Me.ToolStripEdit.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
@@ -677,7 +713,7 @@ Partial Class frmConstructor_Main
         '
         'TabWindream
         '
-        Me.TabWindream.AllowDrop = True
+        Me.TabWindream.AllowDrop = true
         Me.TabWindream.Controls.Add(Me.GridControlDocSearch)
         Me.TabWindream.Controls.Add(Me.ToolStripDokumente)
         Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
@@ -686,7 +722,7 @@ Partial Class frmConstructor_Main
         '
         'GridControlDocSearch
         '
-        Me.GridControlDocSearch.AllowDrop = True
+        Me.GridControlDocSearch.AllowDrop = true
         Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles
         resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch")
         Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
@@ -695,7 +731,7 @@ Partial Class frmConstructor_Main
         '
         'ContextMenuStripResultFiles
         '
-        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCM_Rename, Me.docCM_RenameDisplay, Me.docCM_InWork, Me.docCM_linkRecord, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_DeleteFile, Me.docCM_RemoveLink, Me.ToolStripSeparator9, Me.docCM_ResetView, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile})
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_Rename, Me.docCM_RenameDisplay, Me.docCM_InWork, Me.docCM_linkRecord, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_DeleteFile, Me.docCM_RemoveLink, Me.ToolStripSeparator9, Me.docCM_ResetView, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile})
         Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
         resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles")
         '
@@ -715,6 +751,17 @@ Partial Class frmConstructor_Main
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
         resources.ApplyResources(Me.ToolStripSeparator10, "ToolStripSeparator10")
         '
+        'docCMEntityWideSearch
+        '
+        Me.docCMEntityWideSearch.Image = Global.DD_Record_Organiser.My.Resources.Resources.shield_go
+        Me.docCMEntityWideSearch.Name = "docCMEntityWideSearch"
+        resources.ApplyResources(Me.docCMEntityWideSearch, "docCMEntityWideSearch")
+        '
+        'ToolStripSeparator20
+        '
+        Me.ToolStripSeparator20.Name = "ToolStripSeparator20"
+        resources.ApplyResources(Me.ToolStripSeparator20, "ToolStripSeparator20")
+        '
         'docCM_Rename
         '
         Me.docCM_Rename.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsTextBoxRenameFile})
@@ -814,31 +861,31 @@ 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.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.BackColor2 = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor2"),System.Drawing.Color)
-        Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True
+        Me.GridViewDoc_Search.Appearance.OddRow.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.OptionsDetail.ShowDetailTabs = false
-        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = false
-        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedRow = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedRow = false
-        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceHideSelection = False
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceHideSelection = false
-        Me.GridViewDoc_Search.OptionsSelection.MultiSelect = True
+        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.ColumnAutoWidth = false
-        Me.GridViewDoc_Search.OptionsView.EnableAppearanceOddRow = True
+        Me.GridViewDoc_Search.OptionsView.EnableAppearanceOddRow = true
-        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = true
         Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
         '
         'ToolStripDokumente
         '
-        Me.ToolStripDokumente.AllowDrop = True
+        Me.ToolStripDokumente.AllowDrop = true
         resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente")
-        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.tsbtnEntitySearch, Me.ToolStripSeparator3, Me.DocSearchRefresh})
+        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.tsdrdowbtnDocSearch, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.ToolStripSeparator3, Me.tsbtnDoc_Refresh})
         Me.ToolStripDokumente.Name = "ToolStripDokumente"
         '
         'tslblWindreamView
@@ -846,12 +893,12 @@ Partial Class frmConstructor_Main
         resources.ApplyResources(Me.tslblWindreamView, "tslblWindreamView")
         Me.tslblWindreamView.Name = "tslblWindreamView"
         '
-        'ToolStripDropDownButton2
+        'tsdrdowbtnDocSearch
         '
-        Me.ToolStripDropDownButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.tsdrdowbtnDocSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripDropDownButton2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KonfigurationToolStripMenuItem})
+        Me.tsdrdowbtnDocSearch.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KonfigurationToolStripMenuItem})
-        resources.ApplyResources(Me.ToolStripDropDownButton2, "ToolStripDropDownButton2")
+        resources.ApplyResources(Me.tsdrdowbtnDocSearch, "tsdrdowbtnDocSearch")
-        Me.ToolStripDropDownButton2.Name = "ToolStripDropDownButton2"
+        Me.tsdrdowbtnDocSearch.Name = "tsdrdowbtnDocSearch"
         '
         'KonfigurationToolStripMenuItem
         '
@@ -883,23 +930,16 @@ Partial Class frmConstructor_Main
         Me.ToolStripSeparator18.Name = "ToolStripSeparator18"
         resources.ApplyResources(Me.ToolStripSeparator18, "ToolStripSeparator18")
         '
-        'tsbtnEntitySearch
-        '
-        Me.tsbtnEntitySearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.tsbtnEntitySearch.Image = Global.DD_Record_Organiser.My.Resources.Resources.f6
-        resources.ApplyResources(Me.tsbtnEntitySearch, "tsbtnEntitySearch")
-        Me.tsbtnEntitySearch.Name = "tsbtnEntitySearch"
-        '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
         resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3")
         '
-        'DocSearchRefresh
+        'tsbtnDoc_Refresh
         '
-        Me.DocSearchRefresh.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
+        Me.tsbtnDoc_Refresh.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
-        resources.ApplyResources(Me.DocSearchRefresh, "DocSearchRefresh")
+        resources.ApplyResources(Me.tsbtnDoc_Refresh, "tsbtnDoc_Refresh")
-        Me.DocSearchRefresh.Name = "DocSearchRefresh"
+        Me.tsbtnDoc_Refresh.Name = "tsbtnDoc_Refresh"
         '
         'TabFollowUp
         '
@@ -914,10 +954,10 @@ Partial Class frmConstructor_Main
         '
         resources.ApplyResources(Me.ListViewFollowUps, "ListViewFollowUps")
         Me.ListViewFollowUps.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
-        Me.ListViewFollowUps.FullRowSelect = True
+        Me.ListViewFollowUps.FullRowSelect = true
-        Me.ListViewFollowUps.HideSelection = False
+        Me.ListViewFollowUps.HideSelection = false
         Me.ListViewFollowUps.Name = "ListViewFollowUps"
-        Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False
+        Me.ListViewFollowUps.UseCompatibleStateImageBehavior = false
         Me.ListViewFollowUps.View = System.Windows.Forms.View.Details
         '
         'ColumnHeader1
@@ -937,7 +977,7 @@ Partial Class frmConstructor_Main
         Me.grpbxFU_Profile.Controls.Add(Me.dtpFollowUp)
         Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control)
         Me.grpbxFU_Profile.Name = "grpbxFU_Profile"
-        Me.grpbxFU_Profile.TabStop = False
+        Me.grpbxFU_Profile.TabStop = false
         '
         'GroupBox4
         '
@@ -949,25 +989,25 @@ Partial Class frmConstructor_Main
         Me.GroupBox4.Controls.Add(Me.ListBoxUser2Profile)
         Me.GroupBox4.Controls.Add(Me.Label7)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.TabStop = False
+        Me.GroupBox4.TabStop = false
         '
         'btnRemoveUser_FollowUp
         '
         resources.ApplyResources(Me.btnRemoveUser_FollowUp, "btnRemoveUser_FollowUp")
         Me.btnRemoveUser_FollowUp.Name = "btnRemoveUser_FollowUp"
-        Me.btnRemoveUser_FollowUp.UseVisualStyleBackColor = True
+        Me.btnRemoveUser_FollowUp.UseVisualStyleBackColor = true
         '
         'btnAddUser_FollowUp
         '
         resources.ApplyResources(Me.btnAddUser_FollowUp, "btnAddUser_FollowUp")
         Me.btnAddUser_FollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.AddMark_10580
         Me.btnAddUser_FollowUp.Name = "btnAddUser_FollowUp"
-        Me.btnAddUser_FollowUp.UseVisualStyleBackColor = True
+        Me.btnAddUser_FollowUp.UseVisualStyleBackColor = true
         '
         'cmbFollowUpUser
         '
         resources.ApplyResources(Me.cmbFollowUpUser, "cmbFollowUpUser")
-        Me.cmbFollowUpUser.FormattingEnabled = True
+        Me.cmbFollowUpUser.FormattingEnabled = true
         Me.cmbFollowUpUser.Name = "cmbFollowUpUser"
         '
         'Label6
@@ -978,7 +1018,7 @@ Partial Class frmConstructor_Main
         'ListBoxUser2Profile
         '
         resources.ApplyResources(Me.ListBoxUser2Profile, "ListBoxUser2Profile")
-        Me.ListBoxUser2Profile.FormattingEnabled = True
+        Me.ListBoxUser2Profile.FormattingEnabled = true
         Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile"
         '
         'Label7
@@ -996,7 +1036,7 @@ Partial Class frmConstructor_Main
         '
         resources.ApplyResources(Me.chkFollowUp, "chkFollowUp")
         Me.chkFollowUp.Name = "chkFollowUp"
-        Me.chkFollowUp.UseVisualStyleBackColor = True
+        Me.chkFollowUp.UseVisualStyleBackColor = true
         '
         'dtpFollowUp
         '
@@ -1018,9 +1058,9 @@ Partial Class frmConstructor_Main
         '
         Me.TabPos.Controls.Add(Me.Panel1)
         Me.TabPos.Controls.Add(Me.BindingNavigatorPOS)
-        Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image)
+        Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"),System.Drawing.Image)
         Me.TabPos.Name = "TabPos"
-        Me.TabPos.PageVisible = False
+        Me.TabPos.PageVisible = false
         resources.ApplyResources(Me.TabPos, "TabPos")
         '
         'Panel1
@@ -1038,12 +1078,12 @@ Partial Class frmConstructor_Main
         '
         'grvwGridPos
         '
-        Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"),System.Drawing.Color)
-        Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = True
+        Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = true
         Me.grvwGridPos.GridControl = Me.GridControlPos
         Me.grvwGridPos.Name = "grvwGridPos"
-        Me.grvwGridPos.OptionsView.EnableAppearanceEvenRow = True
+        Me.grvwGridPos.OptionsView.EnableAppearanceEvenRow = true
-        Me.grvwGridPos.OptionsView.ShowAutoFilterRow = True
+        Me.grvwGridPos.OptionsView.ShowAutoFilterRow = true
         '
         'BindingNavigatorPOS
         '
@@ -1123,34 +1163,19 @@ Partial Class frmConstructor_Main
         '
         'XtraTabPageVariant
         '
-        Me.XtraTabPageVariant.Appearance.Header.BackColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.BackColor"), System.Drawing.Color)
+        Me.XtraTabPageVariant.Appearance.Header.BackColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.BackColor"),System.Drawing.Color)
-        Me.XtraTabPageVariant.Appearance.Header.Font = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.Font"), System.Drawing.Font)
+        Me.XtraTabPageVariant.Appearance.Header.Font = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.Font"),System.Drawing.Font)
-        Me.XtraTabPageVariant.Appearance.Header.ForeColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.ForeColor"), System.Drawing.Color)
+        Me.XtraTabPageVariant.Appearance.Header.ForeColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.ForeColor"),System.Drawing.Color)
-        Me.XtraTabPageVariant.Appearance.Header.Options.UseBackColor = True
+        Me.XtraTabPageVariant.Appearance.Header.Options.UseBackColor = true
-        Me.XtraTabPageVariant.Appearance.Header.Options.UseFont = True
+        Me.XtraTabPageVariant.Appearance.Header.Options.UseFont = true
-        Me.XtraTabPageVariant.Appearance.Header.Options.UseForeColor = True
+        Me.XtraTabPageVariant.Appearance.Header.Options.UseForeColor = true
-        Me.XtraTabPageVariant.Controls.Add(Me.ProgressBarControl1)
-        Me.XtraTabPageVariant.Controls.Add(Me.ProgressPanel1)
         Me.XtraTabPageVariant.Name = "XtraTabPageVariant"
-        Me.XtraTabPageVariant.PageVisible = False
+        Me.XtraTabPageVariant.PageVisible = false
         resources.ApplyResources(Me.XtraTabPageVariant, "XtraTabPageVariant")
         '
-        'ProgressBarControl1
-        '
-        resources.ApplyResources(Me.ProgressBarControl1, "ProgressBarControl1")
-        Me.ProgressBarControl1.Name = "ProgressBarControl1"
-        Me.ProgressBarControl1.ShowProgressInTaskBar = True
-        '
-        'ProgressPanel1
-        '
-        Me.ProgressPanel1.Appearance.BackColor = CType(resources.GetObject("ProgressPanel1.Appearance.BackColor"), System.Drawing.Color)
-        Me.ProgressPanel1.Appearance.Options.UseBackColor = True
-        resources.ApplyResources(Me.ProgressPanel1, "ProgressPanel1")
-        Me.ProgressPanel1.Name = "ProgressPanel1"
-        '
         'SplitContainerFORM
         '
-        Me.SplitContainerFORM.Collapsed = True
+        Me.SplitContainerFORM.Collapsed = true
         Me.SplitContainerFORM.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
         resources.ApplyResources(Me.SplitContainerFORM, "SplitContainerFORM")
         Me.SplitContainerFORM.Name = "SplitContainerFORM"
@@ -1185,8 +1210,8 @@ Partial Class frmConstructor_Main
         '
         Me.NavButtonHome.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True]
         Me.NavButtonHome.Caption = ""
-        Me.NavButtonHome.Glyph = CType(resources.GetObject("NavButtonHome.Glyph"), System.Drawing.Image)
+        Me.NavButtonHome.Glyph = CType(resources.GetObject("NavButtonHome.Glyph"),System.Drawing.Image)
-        Me.NavButtonHome.IsMain = True
+        Me.NavButtonHome.IsMain = true
         Me.NavButtonHome.Name = "NavButtonHome"
         '
         'NavButtonRefresh
@@ -1194,20 +1219,20 @@ Partial Class frmConstructor_Main
         Me.NavButtonRefresh.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right
         Me.NavButtonRefresh.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True]
         Me.NavButtonRefresh.Caption = ""
-        Me.NavButtonRefresh.Glyph = CType(resources.GetObject("NavButtonRefresh.Glyph"), System.Drawing.Image)
+        Me.NavButtonRefresh.Glyph = CType(resources.GetObject("NavButtonRefresh.Glyph"),System.Drawing.Image)
         Me.NavButtonRefresh.Name = "NavButtonRefresh"
         '
         'StatusStrip_Main
         '
-        Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsstlblDocID, Me.tsslblWorkflowstate, Me.progressLoadEntity, Me.labelLoadEntity})
+        Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tslblDocIDMain, Me.tsslblWorkflowstate, Me.progressLoadEntity, Me.labelLoadEntity})
         resources.ApplyResources(Me.StatusStrip_Main, "StatusStrip_Main")
         Me.StatusStrip_Main.Name = "StatusStrip_Main"
         '
         'tsslblStatus
         '
-        Me.tsslblStatus.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+        Me.tsslblStatus.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)  _
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)  _
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides)
         Me.tsslblStatus.BorderStyle = System.Windows.Forms.Border3DStyle.Etched
         Me.tsslblStatus.Name = "tsslblStatus"
         resources.ApplyResources(Me.tsslblStatus, "tsslblStatus")
@@ -1215,20 +1240,19 @@ Partial Class frmConstructor_Main
         'tsslblRecord
         '
         Me.tsslblRecord.BackColor = System.Drawing.SystemColors.ControlLight
-        Me.tsslblRecord.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+        Me.tsslblRecord.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)  _
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)  _
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides)
         Me.tsslblRecord.Name = "tsslblRecord"
         resources.ApplyResources(Me.tsslblRecord, "tsslblRecord")
         '
-        'tsstlblDocID
+        'tslblDocIDMain
         '
-        Me.tsstlblDocID.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
+        Me.tslblDocIDMain.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)  _
-        Me.tsstlblDocID.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)  _
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides)
-            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+        Me.tslblDocIDMain.Name = "tslblDocIDMain"
-        Me.tsstlblDocID.Name = "tsstlblDocID"
+        resources.ApplyResources(Me.tslblDocIDMain, "tslblDocIDMain")
-        resources.ApplyResources(Me.tsstlblDocID, "tsstlblDocID")
         '
         'tsslblWorkflowstate
         '
@@ -1254,7 +1278,7 @@ Partial Class frmConstructor_Main
         '
         'ImageCollection1
         '
-        Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer)
+        Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"),DevExpress.Utils.ImageCollectionStreamer)
         '
         'ContextMenuDetails
         '
@@ -1268,11 +1292,11 @@ Partial Class frmConstructor_Main
         '
         'VWPMO_WF_USER_ACTIVETableAdapter
         '
-        Me.VWPMO_WF_USER_ACTIVETableAdapter.ClearBeforeFill = True
+        Me.VWPMO_WF_USER_ACTIVETableAdapter.ClearBeforeFill = true
         '
         'TableAdapterManager
         '
-        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.BackupDataSetBeforeUpdate = false
         Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
@@ -1313,7 +1337,7 @@ Partial Class frmConstructor_Main
         '
         'TBPMO_FILES_USERTableAdapter
         '
-        Me.TBPMO_FILES_USERTableAdapter.ClearBeforeFill = True
+        Me.TBPMO_FILES_USERTableAdapter.ClearBeforeFill = true
         '
         'VWPMO_WF_ACTIVEBindingSource
         '
@@ -1322,7 +1346,7 @@ Partial Class frmConstructor_Main
         '
         'VWPMO_WF_ACTIVETableAdapter
         '
-        Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = True
+        Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = true
         '
         'TBPMO_FILES_USERBindingSource
         '
@@ -1332,7 +1356,7 @@ Partial Class frmConstructor_Main
         'RealTimeSource1
         '
         Me.RealTimeSource1.DisplayableProperties = Nothing
-        Me.RealTimeSource1.UseWeakEventHandler = True
+        Me.RealTimeSource1.UseWeakEventHandler = true
         '
         'frmConstructor_Main
         '
@@ -1342,64 +1366,65 @@ Partial Class frmConstructor_Main
         Me.Controls.Add(Me.StatusStrip_Main)
         Me.Controls.Add(Me.NavPane)
         Me.Name = "frmConstructor_Main"
-        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerMain.ResumeLayout(False)
+        Me.SplitContainerMain.ResumeLayout(false)
-        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerTop.ResumeLayout(False)
+        Me.SplitContainerTop.ResumeLayout(false)
-        Me.CMSEntity.ResumeLayout(False)
+        Me.CMSEntity.ResumeLayout(false)
-        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ContextMenuGrid.ResumeLayout(False)
+        Me.ContextMenuGrid.ResumeLayout(false)
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStripRecords.ResumeLayout(false)
-        Me.ToolStrip1.PerformLayout()
+        Me.ToolStripRecords.PerformLayout
-        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).EndInit
-        Me.TCDetails.ResumeLayout(False)
+        Me.TCDetails.ResumeLayout(false)
-        Me.TabDetails.ResumeLayout(False)
+        Me.TabDetails.ResumeLayout(false)
-        Me.TabDetails.PerformLayout()
+        Me.TabDetails.PerformLayout
-        CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerDetails,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerDetails.ResumeLayout(False)
+        Me.SplitContainerDetails.ResumeLayout(false)
-        Me.ToolStripEdit.ResumeLayout(False)
+        Me.pnlDocFill.ResumeLayout(false)
-        Me.ToolStripEdit.PerformLayout()
+        Me.pnlDocFill.PerformLayout
-        Me.TabWindream.ResumeLayout(False)
+        Me.statStripDoc.ResumeLayout(false)
-        Me.TabWindream.PerformLayout()
+        Me.statStripDoc.PerformLayout
-        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ToolStripEdit.ResumeLayout(false)
-        Me.ContextMenuStripResultFiles.ResumeLayout(False)
+        Me.ToolStripEdit.PerformLayout
-        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabWindream.ResumeLayout(false)
-        Me.ToolStripDokumente.ResumeLayout(False)
+        Me.TabWindream.PerformLayout
-        Me.ToolStripDokumente.PerformLayout()
+        CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).EndInit
-        Me.TabFollowUp.ResumeLayout(False)
+        Me.ContextMenuStripResultFiles.ResumeLayout(false)
-        Me.TabFollowUp.PerformLayout()
+        CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).EndInit
-        Me.grpbxFU_Profile.ResumeLayout(False)
+        Me.ToolStripDokumente.ResumeLayout(false)
-        Me.grpbxFU_Profile.PerformLayout()
+        Me.ToolStripDokumente.PerformLayout
-        Me.GroupBox4.ResumeLayout(False)
+        Me.TabFollowUp.ResumeLayout(false)
-        Me.GroupBox4.PerformLayout()
+        Me.TabFollowUp.PerformLayout
-        Me.TabPos.ResumeLayout(False)
+        Me.grpbxFU_Profile.ResumeLayout(false)
-        Me.TabPos.PerformLayout()
+        Me.grpbxFU_Profile.PerformLayout
-        Me.Panel1.ResumeLayout(False)
+        Me.GroupBox4.ResumeLayout(false)
-        CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox4.PerformLayout
-        CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPos.ResumeLayout(false)
-        CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPos.PerformLayout
-        Me.BindingNavigatorPOS.ResumeLayout(False)
+        Me.Panel1.ResumeLayout(false)
-        Me.BindingNavigatorPOS.PerformLayout()
+        CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).EndInit
-        Me.XtraTabPageVariant.ResumeLayout(False)
+        CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.BindingNavigatorPOS.ResumeLayout(false)
-        Me.SplitContainerFORM.ResumeLayout(False)
+        Me.BindingNavigatorPOS.PerformLayout
-        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerFORM,System.ComponentModel.ISupportInitialize).EndInit
-        Me.StatusStrip_Main.ResumeLayout(False)
+        Me.SplitContainerFORM.ResumeLayout(false)
-        Me.StatusStrip_Main.PerformLayout()
+        Me.StatusStrip_Main.ResumeLayout(false)
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.StatusStrip_Main.PerformLayout
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ResumeLayout(False)
+        CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        Me.PerformLayout()
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents NavPane As DevExpress.XtraBars.Navigation.TileNavPane
     Friend WithEvents NavButtonHome As DevExpress.XtraBars.Navigation.NavButton
     Friend WithEvents StatusStrip_Main As System.Windows.Forms.StatusStrip
@@ -1410,7 +1435,6 @@ Partial Class frmConstructor_Main
     Friend WithEvents tsslblStatus As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents tsslblRecord As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents NavButtonRefresh As DevExpress.XtraBars.Navigation.NavButton
-    Friend WithEvents BindingSource_Entity As System.Windows.Forms.BindingSource
     Friend WithEvents DD_ECMAdmin As DD_Record_Organiser.DD_ECMAdmin
     Friend WithEvents ContextMenuGrid As System.Windows.Forms.ContextMenuStrip
     Friend WithEvents FunktionenDataGridToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
@@ -1453,7 +1477,7 @@ Partial Class frmConstructor_Main
     Friend WithEvents ContextMenuDetails As System.Windows.Forms.ContextMenuStrip
     Friend WithEvents ToolStripDokumente As System.Windows.Forms.ToolStrip
     Friend WithEvents tslblWindreamView As System.Windows.Forms.ToolStripLabel
-    Friend WithEvents ToolStripDropDownButton2 As System.Windows.Forms.ToolStripDropDownButton
+    Friend WithEvents tsdrdowbtnDocSearch As System.Windows.Forms.ToolStripDropDownButton
     Friend WithEvents KonfigurationToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents DD_DMSDataSet As DD_Record_Organiser.DD_DMSDataSet
     Friend WithEvents VWPMO_WF_USER_ACTIVEBindingSource As System.Windows.Forms.BindingSource
@@ -1526,7 +1550,6 @@ Partial Class frmConstructor_Main
     Friend WithEvents progressLoadEntity As System.Windows.Forms.ToolStripProgressBar
     Friend WithEvents labelLoadEntity As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents docCM_DeleteFile As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents tsstlblDocID As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents AuswertungAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripSeparator14 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents ToolStripSeparator15 As System.Windows.Forms.ToolStripSeparator
@@ -1537,10 +1560,9 @@ Partial Class frmConstructor_Main
     Friend WithEvents ToolStripSeparator17 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents ToolStripLabel1 As System.Windows.Forms.ToolStripLabel
     Friend WithEvents tsTextboxFulltext As System.Windows.Forms.ToolStripTextBox
-    Friend WithEvents tsbtnEntitySearch As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripSeparator18 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents docCM_GetRights As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+    Friend WithEvents ToolStripRecords As System.Windows.Forms.ToolStrip
     Friend WithEvents tslbldisplayRecords As System.Windows.Forms.ToolStripLabel
     Friend WithEvents ToolStripDropDownButton3 As System.Windows.Forms.ToolStripDropDownButton
     Friend WithEvents CopyRecordtsmi As System.Windows.Forms.ToolStripMenuItem
@@ -1548,7 +1570,6 @@ Partial Class frmConstructor_Main
     Friend WithEvents CreateWorkflowtaskstsmi As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents showRecordLogtsmi As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ChangeParentLinktsmi As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents DocSearchRefresh As System.Windows.Forms.ToolStripButton
     Friend WithEvents AnwendungscacheResettsmi As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents OfficeVorlagentsmi As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripSeparator5 As System.Windows.Forms.ToolStripSeparator
@@ -1556,10 +1577,17 @@ Partial Class frmConstructor_Main
     Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents XtraTabPageVariant As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents SplitContainerDetails As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents tsbtnDeleteRecord As System.Windows.Forms.ToolStripButton
     Friend WithEvents tsbtnRefresh_Entity As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripSeparator19 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl
-    Friend WithEvents ProgressPanel1 As DevExpress.XtraWaitForm.ProgressPanel
     Friend WithEvents RealTimeSource1 As DevExpress.Data.RealTimeSource
+    Friend WithEvents RecordDeleteToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents docCMEntityWideSearch As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator20 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents tsbtnDoc_Refresh As System.Windows.Forms.ToolStripButton
+    Friend WithEvents pnlDocToolStrip As System.Windows.Forms.Panel
+    Friend WithEvents pnlDocFill As System.Windows.Forms.Panel
+    Friend WithEvents statStripDoc As System.Windows.Forms.StatusStrip
+    Friend WithEvents tslblDocIDTab1 As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents tslblDocViewLocked As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents tslblDocIDMain As System.Windows.Forms.ToolStripStatusLabel
 End Class

app/DD-Record-Organiser/frmConstructor_Main.resx

@@ -132,7 +132,7 @@
     <value>0, 0</value>
   </data>
   <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 134</value>
+    <value>250, 95</value>
   </metadata>
   <data name="ResetEbenenAuswahlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>194, 22</value>
@@ -217,7 +217,7 @@
     <value>Panel1</value>
   </data>
   <metadata name="ContextMenuGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>461, 17</value>
+    <value>295, 17</value>
   </metadata>
   <data name="FunktionenDataGridToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt, style=Bold</value>
@@ -360,8 +360,8 @@
   <data name="&gt;&gt;GridControlMain.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ToolStripRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>502, 134</value>
+    <value>735, 95</value>
   </metadata>
   <data name="tslbldisplayRecords.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
@@ -387,6 +387,12 @@
   <data name="NewVarianttsmi.ToolTipText" xml:space="preserve">
     <value>Erzeugt eine neue Variante und speichert den bisherigen Record.</value>
   </data>
+  <data name="RecordDeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 22</value>
+  </data>
+  <data name="RecordDeleteToolStripMenuItem.Text" xml:space="preserve">
+    <value>Record löschen</value>
+  </data>
   <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
     <value>225, 6</value>
   </data>
@@ -447,37 +453,28 @@
   <data name="tsbtnRefresh_Entity.Text" xml:space="preserve">
     <value>Neu laden</value>
   </data>
-  <data name="tsbtnDeleteRecord.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="ToolStripRecords.Location" type="System.Drawing.Point, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbtnDeleteRecord.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 22</value>
-  </data>
-  <data name="tsbtnDeleteRecord.Text" xml:space="preserve">
-    <value>Record löschen</value>
-  </data>
-  <data name="ToolStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
     <value>1067, 25</value>
   </data>
-  <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
+  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="ToolStrip1.Text" xml:space="preserve">
+  <data name="ToolStripRecords.Text" xml:space="preserve">
     <value>ToolStrip1</value>
   </data>
-  <data name="&gt;&gt;ToolStrip1.Name" xml:space="preserve">
+  <data name="&gt;&gt;ToolStripRecords.Name" xml:space="preserve">
-    <value>ToolStrip1</value>
+    <value>ToolStripRecords</value>
   </data>
-  <data name="&gt;&gt;ToolStrip1.Type" xml:space="preserve">
+  <data name="&gt;&gt;ToolStripRecords.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ToolStrip1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;ToolStripRecords.Parent" xml:space="preserve">
     <value>SplitContainerTop.Panel2</value>
   </data>
-  <data name="&gt;&gt;ToolStrip1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;ToolStripRecords.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="SplitContainerTop.Panel2.Text" xml:space="preserve">
@@ -561,6 +558,93 @@
   <data name="SplitContainerDetails.Panel1.Text" xml:space="preserve">
     <value>Panel1</value>
   </data>
+  <metadata name="statStripDoc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>987, 95</value>
+  </metadata>
+  <data name="tslblDocIDTab1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 19</value>
+  </data>
+  <data name="tslblDocIDTab1.Text" xml:space="preserve">
+    <value>DocID:</value>
+  </data>
+  <data name="tslblDocViewLocked.Size" type="System.Drawing.Size, System.Drawing">
+    <value>109, 19</value>
+  </data>
+  <data name="tslblDocViewLocked.Text" xml:space="preserve">
+    <value>Ansicht gesperrt</value>
+  </data>
+  <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 286</value>
+  </data>
+  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>554, 24</value>
+  </data>
+  <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="statStripDoc.Text" xml:space="preserve">
+    <value>StatusStrip1</value>
+  </data>
+  <data name="&gt;&gt;statStripDoc.Name" xml:space="preserve">
+    <value>statStripDoc</value>
+  </data>
+  <data name="&gt;&gt;statStripDoc.Type" xml:space="preserve">
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;statStripDoc.Parent" xml:space="preserve">
+    <value>pnlDocFill</value>
+  </data>
+  <data name="&gt;&gt;statStripDoc.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="pnlDocFill.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="pnlDocFill.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 26</value>
+  </data>
+  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
+    <value>554, 310</value>
+  </data>
+  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;pnlDocFill.Name" xml:space="preserve">
+    <value>pnlDocFill</value>
+  </data>
+  <data name="&gt;&gt;pnlDocFill.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pnlDocFill.Parent" xml:space="preserve">
+    <value>SplitContainerDetails.Panel2</value>
+  </data>
+  <data name="&gt;&gt;pnlDocFill.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="pnlDocToolStrip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="pnlDocToolStrip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>554, 26</value>
+  </data>
+  <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;pnlDocToolStrip.Name" xml:space="preserve">
+    <value>pnlDocToolStrip</value>
+  </data>
+  <data name="&gt;&gt;pnlDocToolStrip.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pnlDocToolStrip.Parent" xml:space="preserve">
+    <value>SplitContainerDetails.Panel2</value>
+  </data>
+  <data name="&gt;&gt;pnlDocToolStrip.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="SplitContainerDetails.Panel2.Text" xml:space="preserve">
     <value>Panel2</value>
   </data>
@@ -586,7 +670,7 @@
     <value>0</value>
   </data>
   <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>757, 17</value>
+    <value>591, 17</value>
   </metadata>
   <data name="tsButtonAdd.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -750,7 +834,7 @@
     <value>1</value>
   </data>
   <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>124, 134</value>
+    <value>357, 95</value>
   </metadata>
   <data name="docCM_Open.Size" type="System.Drawing.Size, System.Drawing">
     <value>251, 22</value>
@@ -767,6 +851,15 @@
   <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
     <value>248, 6</value>
   </data>
+  <data name="docCMEntityWideSearch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>251, 22</value>
+  </data>
+  <data name="docCMEntityWideSearch.Text" xml:space="preserve">
+    <value>Entitätsweite Suche starten</value>
+  </data>
+  <data name="ToolStripSeparator20.Size" type="System.Drawing.Size, System.Drawing">
+    <value>248, 6</value>
+  </data>
   <data name="tsTextBoxRenameFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>350, 23</value>
   </data>
@@ -861,7 +954,7 @@
     <value>Eigenschaften</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 320</value>
+    <value>252, 348</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>
@@ -900,7 +993,7 @@
     <value>0</value>
   </data>
   <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>9, 57</value>
+    <value>975, 17</value>
   </metadata>
   <data name="ToolStripDokumente.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 9pt</value>
@@ -920,7 +1013,7 @@
   <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
     <value>Konfiguration User</value>
   </data>
-  <data name="ToolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tsdrdowbtnDocSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGcSURBVDhPrZI/SEJRFMZvFNTSIo2Bk0OtLdlYEeEgEQUR
@@ -933,13 +1026,13 @@
         DwcIdDRYJUwiAB0yTe/NNUuIXy/etxLLTTpKAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="ToolStripDropDownButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="tsdrdowbtnDocSearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
   </data>
-  <data name="ToolStripDropDownButton2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tsdrdowbtnDocSearch.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 22</value>
   </data>
-  <data name="ToolStripDropDownButton2.Text" xml:space="preserve">
+  <data name="tsdrdowbtnDocSearch.Text" xml:space="preserve">
     <value>Konfiguration windream-Ansicht</value>
   </data>
   <data name="ToolStripSeparator17.Size" type="System.Drawing.Size, System.Drawing">
@@ -963,26 +1056,17 @@
   <data name="ToolStripSeparator18.Size" type="System.Drawing.Size, System.Drawing">
     <value>6, 25</value>
   </data>
-  <data name="tsbtnEntitySearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbtnEntitySearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 22</value>
-  </data>
-  <data name="tsbtnEntitySearch.Text" xml:space="preserve">
-    <value>Entitätsweite Suche</value>
-  </data>
   <data name="ToolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
     <value>6, 25</value>
   </data>
-  <data name="DocSearchRefresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="tsbtnDoc_Refresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
   </data>
-  <data name="DocSearchRefresh.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tsbtnDoc_Refresh.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 22</value>
+    <value>119, 22</value>
   </data>
-  <data name="DocSearchRefresh.Text" xml:space="preserve">
+  <data name="tsbtnDoc_Refresh.Text" xml:space="preserve">
-    <value>Suche aktualisieren</value>
+    <value>Suche neu laden</value>
   </data>
   <data name="ToolStripDokumente.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
@@ -1509,7 +1593,7 @@
     <value>0</value>
   </data>
   <metadata name="BindingNavigatorPOS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>332, 134</value>
+    <value>565, 95</value>
   </metadata>
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1721,57 +1805,6 @@
   <data name="XtraTabPageVariant.Appearance.Header.ForeColor" type="System.Drawing.Color, System.Drawing">
     <value>Black</value>
   </data>
-  <data name="ProgressBarControl1.EditValue" type="System.Int32, mscorlib">
-    <value>51</value>
-  </data>
-  <data name="ProgressBarControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 40</value>
-  </data>
-  <data name="ProgressBarControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 24</value>
-  </data>
-  <data name="ProgressBarControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ProgressBarControl1.Name" xml:space="preserve">
-    <value>ProgressBarControl1</value>
-  </data>
-  <data name="&gt;&gt;ProgressBarControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;ProgressBarControl1.Parent" xml:space="preserve">
-    <value>XtraTabPageVariant</value>
-  </data>
-  <data name="&gt;&gt;ProgressBarControl1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="ProgressPanel1.Appearance.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Transparent</value>
-  </data>
-  <data name="ProgressPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>46, 14</value>
-  </data>
-  <data name="ProgressPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>246, 66</value>
-  </data>
-  <data name="ProgressPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="ProgressPanel1.Text" xml:space="preserve">
-    <value>ProgressPanel1</value>
-  </data>
-  <data name="&gt;&gt;ProgressPanel1.Name" xml:space="preserve">
-    <value>ProgressPanel1</value>
-  </data>
-  <data name="&gt;&gt;ProgressPanel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;ProgressPanel1.Parent" xml:space="preserve">
-    <value>XtraTabPageVariant</value>
-  </data>
-  <data name="&gt;&gt;ProgressPanel1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="XtraTabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
     <value>1356, 365</value>
   </data>
@@ -1859,9 +1892,6 @@
   <data name="&gt;&gt;SplitContainerFORM.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>160, 17</value>
-  </metadata>
   <data name="NavButtonHome.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -1931,8 +1961,11 @@
   <data name="tsslblRecord.Text" xml:space="preserve">
     <value>tssRecord</value>
   </data>
-  <data name="tsstlblDocID.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tslblDocIDMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>4, 19</value>
+    <value>46, 19</value>
+  </data>
+  <data name="tslblDocIDMain.Text" xml:space="preserve">
+    <value>DocID:</value>
   </data>
   <data name="tsslblWorkflowstate.Size" type="System.Drawing.Size, System.Drawing">
     <value>137, 19</value>
@@ -1977,10 +2010,10 @@
     <value>5</value>
   </data>
   <metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>326, 17</value>
+    <value>160, 17</value>
   </metadata>
   <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>610, 17</value>
+    <value>444, 17</value>
   </metadata>
   <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1991,10 +2024,10 @@
 </value>
   </data>
   <metadata name="ttToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>878, 17</value>
+    <value>712, 17</value>
   </metadata>
   <metadata name="ContextMenuDetails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>979, 17</value>
+    <value>813, 17</value>
   </metadata>
   <data name="ContextMenuDetails.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 4</value>
@@ -2006,40 +2039,40 @@
     <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>182, 56</value>
+    <value>1140, 17</value>
   </metadata>
   <metadata name="VWPMO_WF_USER_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>472, 56</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="VWPMO_WF_USER_ACTIVETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>750, 56</value>
+    <value>295, 56</value>
   </metadata>
   <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>567, 56</value>
   </metadata>
   <metadata name="TBPMO_FILES_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>910, 95</value>
+    <value>17, 95</value>
   </metadata>
   <metadata name="VWPMO_WF_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>190, 95</value>
+    <value>740, 56</value>
   </metadata>
   <metadata name="VWPMO_WF_ACTIVETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>434, 95</value>
+    <value>984, 56</value>
   </metadata>
   <metadata name="TBPMO_FILES_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>672, 95</value>
+    <value>1222, 56</value>
   </metadata>
   <metadata name="ToolTipController.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>325, 56</value>
+    <value>1283, 17</value>
   </metadata>
   <metadata name="RealTimeSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>609, 134</value>
+    <value>842, 95</value>
   </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>110</value>
+    <value>215</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
@@ -2706,6 +2739,12 @@
   <data name="&gt;&gt;NewVarianttsmi.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;RecordDeleteToolStripMenuItem.Name" xml:space="preserve">
+    <value>RecordDeleteToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;RecordDeleteToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ToolStripSeparator5.Name" xml:space="preserve">
     <value>ToolStripSeparator5</value>
   </data>
@@ -2760,11 +2799,17 @@
   <data name="&gt;&gt;tsbtnRefresh_Entity.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;tsbtnDeleteRecord.Name" xml:space="preserve">
+  <data name="&gt;&gt;tslblDocIDTab1.Name" xml:space="preserve">
-    <value>tsbtnDeleteRecord</value>
+    <value>tslblDocIDTab1</value>
   </data>
-  <data name="&gt;&gt;tsbtnDeleteRecord.Type" xml:space="preserve">
+  <data name="&gt;&gt;tslblDocIDTab1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tslblDocViewLocked.Name" xml:space="preserve">
+    <value>tslblDocViewLocked</value>
+  </data>
+  <data name="&gt;&gt;tslblDocViewLocked.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;tsButtonAdd.Name" xml:space="preserve">
     <value>tsButtonAdd</value>
@@ -2838,6 +2883,18 @@
   <data name="&gt;&gt;ToolStripSeparator10.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;docCMEntityWideSearch.Name" xml:space="preserve">
+    <value>docCMEntityWideSearch</value>
+  </data>
+  <data name="&gt;&gt;docCMEntityWideSearch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator20.Name" xml:space="preserve">
+    <value>ToolStripSeparator20</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator20.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;docCM_Rename.Name" xml:space="preserve">
     <value>docCM_Rename</value>
   </data>
@@ -2952,10 +3009,10 @@
   <data name="&gt;&gt;tslblWindreamView.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ToolStripDropDownButton2.Name" xml:space="preserve">
+  <data name="&gt;&gt;tsdrdowbtnDocSearch.Name" xml:space="preserve">
-    <value>ToolStripDropDownButton2</value>
+    <value>tsdrdowbtnDocSearch</value>
   </data>
-  <data name="&gt;&gt;ToolStripDropDownButton2.Type" xml:space="preserve">
+  <data name="&gt;&gt;tsdrdowbtnDocSearch.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;KonfigurationToolStripMenuItem.Name" xml:space="preserve">
@@ -2988,22 +3045,16 @@
   <data name="&gt;&gt;ToolStripSeparator18.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;tsbtnEntitySearch.Name" xml:space="preserve">
-    <value>tsbtnEntitySearch</value>
-  </data>
-  <data name="&gt;&gt;tsbtnEntitySearch.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;ToolStripSeparator3.Name" xml:space="preserve">
     <value>ToolStripSeparator3</value>
   </data>
   <data name="&gt;&gt;ToolStripSeparator3.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;DocSearchRefresh.Name" xml:space="preserve">
+  <data name="&gt;&gt;tsbtnDoc_Refresh.Name" xml:space="preserve">
-    <value>DocSearchRefresh</value>
+    <value>tsbtnDoc_Refresh</value>
   </data>
-  <data name="&gt;&gt;DocSearchRefresh.Type" xml:space="preserve">
+  <data name="&gt;&gt;tsbtnDoc_Refresh.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;ColumnHeader1.Name" xml:space="preserve">
@@ -3090,12 +3141,6 @@
   <data name="&gt;&gt;BindingNavigatorSeparator2.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;BindingSource_Entity.Name" xml:space="preserve">
-    <value>BindingSource_Entity</value>
-  </data>
-  <data name="&gt;&gt;BindingSource_Entity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;TileNavCategory1.Name" xml:space="preserve">
     <value>TileNavCategory1</value>
   </data>
@@ -3126,10 +3171,10 @@
   <data name="&gt;&gt;tsslblRecord.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;tsstlblDocID.Name" xml:space="preserve">
+  <data name="&gt;&gt;tslblDocIDMain.Name" xml:space="preserve">
-    <value>tsstlblDocID</value>
+    <value>tslblDocIDMain</value>
   </data>
-  <data name="&gt;&gt;tsstlblDocID.Type" xml:space="preserve">
+  <data name="&gt;&gt;tslblDocIDMain.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;tsslblWorkflowstate.Name" xml:space="preserve">

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -7,14 +7,16 @@ Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Tile
 Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+Imports DevExpress.XtraGrid
 Imports DevExpress.XtraScheduler
 Imports System.Text
 Imports System.IO
-Imports DevExpress.XtraGrid
+
 Imports WINDREAMLib
 Imports System.Runtime.InteropServices
 Imports DD_Rights
-Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+
 
 Public Class frmConstructor_Main
 
@@ -168,7 +170,7 @@ Public Class frmConstructor_Main
     Private SQL_RIGHT_READ_AND_VIEW_ONLY As String = ""
     Private SQL_RIGHT_WINDREAM_FORBIDDEN As String = ""
     Private DOC_SEARCH_TAB1 As Boolean = False
-
+    Private ACTIVATE_DOC_SEARCH_ON_EDIT As Boolean = False
     Private FORM_TYPE As Integer
     Private ENTITY_ID As Integer
     Private REDUNDANT_FORM As Integer
@@ -229,6 +231,9 @@ Public Class frmConstructor_Main
         ' Check_Record_Changed()
         CloseWDDocview()
         Save_Grid_Layout()
+        If DOC_SEARCH_TAB1 = True Then
+            Save_DocGrid_Layout()
+        End If
         Save_Splitter_Layout()
         ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
 
@@ -279,7 +284,7 @@ Public Class frmConstructor_Main
             VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
-            VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
+            VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
             Dim SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
                         "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND  CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
 
@@ -756,10 +761,15 @@ Public Class frmConstructor_Main
                     sql = String.Format("SELECT SQL_COMMAND FROM TBPMO_CONSTRUCTOR_USER_SQL WHERE USER_ID = {0} AND CONSTR_DET_ID = {1}", USER_GUID, ConstructorDetailID)
                     Dim result = ClassDatabase.Execute_Scalar(sql)
                     If Not IsNothing(result) Then
+                        result = result.ToUpper.Replace("@RECORDID", RECORD_ID)
+                        result = result.ToUpper.Replace("@USER_ID", USER_GUID)
                         _ENTITYSQL = _ENTITYSQL & " " & result.ToString
-                        _ENTITYSQL = _ENTITYSQL.ToUpper.Replace("@RECORDID", RECORD_ID)
+                        CURRENT_ENTITYSQL_WHERE = result
-                        _ENTITYSQL = _ENTITYSQL.ToUpper.Replace("@USER_ID", USER_GUID)
+                    Else
+                        CURRENT_ENTITYSQL_WHERE = ""
                     End If
+                Else
+                    CURRENT_ENTITYSQL_WHERE = ""
                 End If
             Catch ex As Exception
                 ClassLogger.Add("Error in Get Entity SQL for User: " & vbNewLine & ex.Message, True)
@@ -867,7 +877,7 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub grvwGrid_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles grvwGrid.FocusedColumnChanged
-        Me.Cursor = Cursors.WaitCursor
+        Cursor = Cursors.WaitCursor
         Column_Row_Handler()
         Me.Cursor = Cursors.Default
     End Sub
@@ -882,15 +892,6 @@ Public Class frmConstructor_Main
         sw.Stop()
         sw.Reset()
         If LogErrorsOnly = False Then ClassLogger.Add(" >>>> GridView_FocusedRowChanged took " & Format(elapsed, "0.000000000") & " seconds", False)
-        'If dataloaded = True Then
-        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> grvwSelection_FocusedRowChanged - EditState: " & EDIT_STATE, False)
-        '    Dim selRecID = GetSelected_RecordID()
-        '    If Not selRecID Is Nothing And selRecID <> SelectedRecordID Or EDIT_STATE = "insert" Then
-        '        Focused_Row_Column_Changed()
-        '    Else
-        '        'Console.WriteLine("SelRecordID identisch")
-        '    End If
-        'End If
     End Sub
     Private Sub gridView1_CustomDrawRowIndicator(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs)
         If IsTopFirstRow Then
@@ -1029,7 +1030,7 @@ Public Class frmConstructor_Main
             TabFollowUp.PageEnabled = True
             TabPos.PageEnabled = True
             TabWindream.PageEnabled = True
-            DocSearchRefresh.Enabled = True
+            tsbtnDoc_Refresh.Enabled = True
             EntitätssucheStartenToolStripMenuItem.Enabled = True
             docCM_Open.Enabled = True
             docCM_InWork.Enabled = True
@@ -1044,8 +1045,8 @@ Public Class frmConstructor_Main
                     tempsql = tempsql.Replace("@USER_ID", USER_GUID)
                     tempsql = tempsql.Replace("@USER_GUID", USER_GUID)
                     tempsql = tempsql.Replace("@ENTITY_ID", ENTITY_ID)
-                    tempsql = tempsql.Replace("@USERNAME", Environment.UserName)
+                    tempsql = tempsql.Replace("@USERNAME", USER_USERNAME)
-                    tempsql = tempsql.Replace("@USER_NAME", Environment.UserName)
+                    tempsql = tempsql.Replace("@USER_NAME", USER_USERNAME)
                     ''Regulären Ausdruck zum Auslesen der windream-Indexe definieren
                     'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
                     '' einen Regulären Ausdruck laden
@@ -1131,7 +1132,7 @@ Public Class frmConstructor_Main
                         ' Hinzufügen sollte auch bei RIGHT_ONLY_READ verfügbar sein
                         tslblFileslocked.Visible = True
                         'TabWindream.PageEnabled = False
-                        DocSearchRefresh.Enabled = False
+                        tsbtnDoc_Refresh.Enabled = False
                         EntitätssucheStartenToolStripMenuItem.Enabled = False
                         docCM_Open.Enabled = False
                         docCM_InWork.Enabled = False
@@ -1225,13 +1226,18 @@ Public Class frmConstructor_Main
                 If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then
                     Dim Record = Return_RECORD_forTag(SelectedNode.Tag)
                     If Record <> 0 Then
-                        pnlDetails.Enabled = True
+                        Doc_Controls_EditMode(True)
-                        ToolStripEdit.Enabled = True
                         Column_Row_Handler(Record, True)
                         LocateRecordById(RECORD_ID)
+                        If DOC_SEARCH_TAB1 = True Then
+                            Doc_Controls_EditMode(True)
+                        End If
                     End If
                 Else
                     pnlDetails.Enabled = False
+                    If DOC_SEARCH_TAB1 = True Then
+                        Doc_Controls_EditMode(False)
+                    End If
                     ToolStripEdit.Enabled = False
 
                 End If
@@ -1241,12 +1247,25 @@ Public Class frmConstructor_Main
         End If
 
     End Sub
-
+    Sub Doc_Controls_EditMode(state As Boolean)
+        If state = False Then
+            GridControlDocSearch.ContextMenuStrip = Nothing
+            tslblDocViewLocked.Visible = True
+        Else
+            GridControlDocSearch.ContextMenuStrip = ContextMenuStripResultFiles
+            tslblDocViewLocked.Visible = False
+        End If
+        tsTextboxFulltext.Enabled = state
+        tsdrdowbtnDocSearch.Enabled = state
+    End Sub
     Private Sub TreeViewMain_BeforeSelect(sender As Object, e As TreeViewCancelEventArgs) Handles TreeViewMain.BeforeSelect
         If NODE_NAVIGATION = False Then
             If grvwGrid.Columns.Count > 0 Then
                 Save_Grid_Layout()
             End If
+            If DOC_SEARCH_TAB1 = True Then
+                Save_DocGrid_Layout()
+            End If
         Else
             If Not IsNothing(TreeViewMain.SelectedNode) Then
                 TreeViewMain.SelectedNode.NodeFont = New Font(TreeViewMain.Font.FontFamily, TreeViewMain.Font.Size, FontStyle.Regular)
@@ -1972,7 +1991,7 @@ Public Class frmConstructor_Main
                 EDIT_STATE = EditState.None
                 CURRENT_RECORD_ENABLED = False
                 ' Update_Record_Label(SELECTED_RECORD_ID)
-                ClassHelper.InsertEssential_Log(SELECTED_RECORD_ID, "RECORD-ID", "RECORD WAS DELETED MANUALLY by USER: " & Environment.UserName)
+                ClassHelper.InsertEssential_Log(SELECTED_RECORD_ID, "RECORD-ID", "RECORD WAS DELETED MANUALLY by USER: " & USER_USERNAME)
                 msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' wurde erfolgreich gelöscht - " & Now
                 If USER_LANGUAGE <> "de-DE" Then
                     msg = "The record and all dependencies for '" & SELECTED_RECORD_ID & "' were deleted - " & Now
@@ -2022,14 +2041,11 @@ Public Class frmConstructor_Main
         End If
     End Sub
 
-
-
     Sub EnableEditMode()
-
         Dim EditingUser = ClassRecordState.IsRecordLocked(SELECTED_RECORD_ID)
 
         ' Überprüfen, ob der Record gerade bearbeitet wird
-        If Not IsNothing(EditingUser) And EditingUser <> Environment.UserName Then
+        If Not IsNothing(EditingUser) And EditingUser <> USER_USERNAME Then
 
             tslblLocked.Visible = True
             If USER_LANGUAGE = "de-DE" Then
@@ -2049,11 +2065,11 @@ Public Class frmConstructor_Main
         DeactivateTabs()
 
         CURRENT_CHANGE_STEP += 1
-        Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
+        Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
         ClassDatabase.Execute_non_Query(del)
         Lock_RecordControls(False)
         tsmi_RecordDelete.Enabled = True
-        tsbtnDeleteRecord.Enabled = True
+        RecordDeleteToolStripMenuItem.Enabled = True
         MassenänderungToolStripMenuItem.Enabled = True
         Me.tsButtonAdd.Enabled = False
         Me.tsButtonSave.Enabled = True
@@ -2079,6 +2095,9 @@ Public Class frmConstructor_Main
 
         RECORD_ENABLED = True
         CURRENT_RECORD_ENABLED = True
+        If DOC_SEARCH_TAB1 = True Then
+            Doc_Controls_EditMode(True)
+        End If
         pnlDetails.Focus()
         'If RECORD_ENABLED = False Then
         '    ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
@@ -2118,6 +2137,11 @@ Public Class frmConstructor_Main
                 CtrlCommandUI.IsEdit = False
             End If
         End If
+        If ACTIVATE_DOC_SEARCH_ON_EDIT = False Then
+            If DOC_SEARCH_TAB1 = True Then
+                Doc_Controls_EditMode(False)
+            End If
+        End If
         
     End Sub
 
@@ -2206,7 +2230,7 @@ Public Class frmConstructor_Main
             tsButtonEdit.Visible = True
             tsButtonDelete.Visible = True
             tsmi_RecordDelete.Enabled = True
-            tsbtnDeleteRecord.Enabled = True
+            RecordDeleteToolStripMenuItem.Enabled = True
             MassenänderungToolStripMenuItem.Enabled = True
 
             If RIGHT_ADD_R = False Then
@@ -2222,7 +2246,7 @@ Public Class frmConstructor_Main
             If RIGHT_DELETE_R = False Then
                 tsButtonDelete.Visible = False
                 tsmi_RecordDelete.Enabled = False
-                tsbtnDeleteRecord.Enabled = False
+                RecordDeleteToolStripMenuItem.Enabled = False
             End If
         Catch ex As Exception
             MsgBox("Error in GetSet_Rights:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -2250,7 +2274,14 @@ Public Class frmConstructor_Main
             SQL_RIGHT_READ_AND_VIEW_ONLY = result.Item("SQL_RIGHT_READ_AND_VIEW_ONLY")
             SQL_RIGHT_WINDREAM_FORBIDDEN = result.Item("SQL_RIGHT_WINDREAM_VIEW")
             DOC_SEARCH_TAB1 = result.Item("DOC_SEARCH_TAB1")
-
+            If DOC_SEARCH_TAB1 = True Then
+                tslblDocIDMain.Visible = False
+                tslblDocIDTab1.Visible = True
+            Else
+                tslblDocIDMain.Visible = True
+                tslblDocIDTab1.Visible = False
+            End If
+            ACTIVATE_DOC_SEARCH_ON_EDIT = result.Item("ACTIVATE_DOC_SEARCH_ON_EDIT")
             Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULTLIST KONFIG")
             sql_ResultList = 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 = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
@@ -2458,7 +2489,7 @@ Public Class frmConstructor_Main
                         Clear_Windream_ResultList()
                         GridControlDocSearch.Visible = True
                         'RUN_WD_SEARCH("", "ENTITY")
-                        RUN_WDSEARCH_GRID("ENTITY")
+                        ' RUN_WDSEARCH_GRID("ENTITY")
                     End If
                 End If
             End If
@@ -2614,15 +2645,31 @@ Public Class frmConstructor_Main
                 If DOC_SEARCH_TAB1 = True Then
                     SplitContainerDetails.Collapsed = False
                     SplitContainerDetails.PanelVisibility = SplitPanelVisibility.Both
-                    SplitContainerDetails.Panel2.Controls.Add(ToolStripDokumente)
+                    'ToolStripDokumente.Dock = DockStyle.None
-                    SplitContainerDetails.Panel2.Controls.Add(GridControlDocSearch)
+                    pnlDocToolStrip.Controls.Add(ToolStripDokumente)
+                    pnlDocFill.Controls.Add(GridControlDocSearch)
+                    'ToolStripDokumente.Dock = DockStyle.Top
+                    'GridControlDocSearch.Dock = DockStyle.None
+                    'GridControlDocSearch.Dock = DockStyle.Top
                     TabWindream.PageVisible = False
+                    If ACTIVATE_DOC_SEARCH_ON_EDIT = False Then
+                        Doc_Controls_EditMode(False)
+                    Else
+                        Doc_Controls_EditMode(True)
+                    End If
+
+                    Load_DocGrid_Layout()
                 Else
                     SplitContainerDetails.PanelVisibility = SplitPanelVisibility.Panel1
                     SplitContainerDetails.Collapsed = True
+                    'ToolStripDokumente.Dock = DockStyle.None
                     TabWindream.Controls.Add(ToolStripDokumente)
+                    'ToolStripDokumente.Dock = DockStyle.Top
+                    'GridControlDocSearch.Dock = DockStyle.None
                     TabWindream.Controls.Add(GridControlDocSearch)
+                    'GridControlDocSearch.Dock = DockStyle.Top
                     TabWindream.PageVisible = True
+                    Doc_Controls_EditMode(True)
                 End If
             End If
 
@@ -2701,8 +2748,6 @@ Public Class frmConstructor_Main
 
             ' Datatable laden
             GridControlMain.DataSource = DT
-            BindingSource_Entity.DataSource = DT
-
 
             grvwTiles.TileTemplate.Clear()
 
@@ -3007,33 +3052,29 @@ Public Class frmConstructor_Main
             Else
                 'Grid leeren
                 Clear_Grid_View()
-                'Databinding Neu
+
+                'Vorbereiten der Arrays
                 Dim listcheck As List(Of String) = ClassHelper.Return_listcheck(ENTITY_ID)
                 Dim listdate As List(Of String) = ClassHelper.Return_listdate(ENTITY_ID)
-
+                Dim DT_RESULT As DataTable = ClassHelper.Format_GridColumns(DT_SELECTION, _ENTITYSQL, listcheck, listdate)
-                BindingSource_Entity.DataSource = ClassHelper.Format_GridColumns(DT_SELECTION, _ENTITYSQL, listcheck, listdate)
+                GridControlMain.DataSource = DT_RESULT
-                GridControlMain.DataSource = BindingSource_Entity
 
                 ' Alle Date Spalten durchgehen 
                 For Each col As String In listdate
                     Dim date_edit As New DevExpress.XtraEditors.Repository.RepositoryItemTimeEdit
                     Dim date_column As GridColumn = grvwGrid.Columns(col)
-
                     date_column.DisplayFormat.FormatType = FormatType.DateTime
                     date_column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
-
+                    date_column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
-                    date_column.OptionsFilter.FilterPopupMode = FilterPopupMode.Default
+                    date_column.ColumnEdit = date_edit
-                    date_column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains
+                    date_column.FilterMode = ColumnFilterMode.Value ' was DisplayText
 
                     date_edit.DisplayFormat.FormatType = FormatType.DateTime
                     date_edit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
-
                     date_edit.Mask.MaskType = Mask.MaskType.DateTime
                     date_edit.Mask.EditMask = CURRENT_DATE_FORMAT
                     date_edit.Mask.UseMaskAsDisplayFormat = True
 
-                    date_column.ColumnEdit = date_edit
-                    date_column.FilterMode = ColumnFilterMode.DisplayText
                 Next
                 Try
                     grvwGrid.Columns("AddedWhen").DisplayFormat.FormatType = FormatType.DateTime
@@ -3555,7 +3596,7 @@ Public Class frmConstructor_Main
             If CBool(wdsearch) = False Then
                 windream_Docshow = False
                 TabWindream.PageVisible = False
-                DocSearchRefresh.Enabled = False
+                tsbtnDoc_Refresh.Enabled = False
                 EntitätssucheStartenToolStripMenuItem.Enabled = False
                 Exit Sub
             Else
@@ -3565,7 +3606,7 @@ Public Class frmConstructor_Main
                 '    DocSearchRefresh.Visible = False
                 '    Exit Function
                 'End If
-                DocSearchRefresh.Enabled = True
+                tsbtnDoc_Refresh.Enabled = True
                 EntitätssucheStartenToolStripMenuItem.Enabled = True
                 windream_Docshow = True
                 If windream_inited = False Then
@@ -3798,7 +3839,7 @@ Public Class frmConstructor_Main
             End If
             Dim configId As Integer = item.ConfigID
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
             ClassDatabase.Execute_non_Query(Sql)
@@ -3825,7 +3866,7 @@ Public Class frmConstructor_Main
             Dim configid = detailRow.Item("CONFIG_ID")
 
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
             Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
 
@@ -3853,7 +3894,7 @@ Public Class frmConstructor_Main
             Dim configid = detailRow.Item("CONFIG_ID")
 
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
             ClassDatabase.Execute_non_Query(Sql)
@@ -3875,7 +3916,7 @@ Public Class frmConstructor_Main
             Dim configid = detailRow.Item("CONFIG_ID")
 
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
             ClassDatabase.Execute_non_Query(Sql)
@@ -4259,9 +4300,7 @@ Public Class frmConstructor_Main
             'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren
             If NEW_FILES_ADDED = True Then
                 Me.Cursor = Cursors.WaitCursor
-                If ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS = True Then
+                RUN_WDSEARCH_GRID("RECORD")
-                    RUN_WDSEARCH_GRID("RECORD")
-                End If
             Else
                 If LogErrorsOnly = False Then ClassLogger.Add(" >> No new files were added or windream tab is not focused!", False)
             End If
@@ -4294,7 +4333,7 @@ Public Class frmConstructor_Main
                     If DropType.ToString.Contains("SCAN") = False Then
                         ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False)
                         Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1)
-                        TBPMO_FILES_USERTableAdapter.cmdInsert(CURRENT_WORKFILE, Environment.UserName, DropType)
+                        TBPMO_FILES_USERTableAdapter.cmdInsert(CURRENT_WORKFILE, USER_USERNAME, DropType)
                     End If
                 End If
 
@@ -4313,7 +4352,7 @@ Public Class frmConstructor_Main
                 End If
             End If
 
-            Dim sql1 = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", Environment.UserName)
+            Dim sql1 = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1)
             If Not IsNothing(DT) Then
                 If DT.Rows.Count > 0 Then
@@ -4892,30 +4931,31 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub grvwGrid_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGrid.RowStyle
+        If e.RowHandle = -1 Then
+            Exit Sub
+        End If
         If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
             e.Appearance.BackColor = Color.Orange
         Else
             If GRID_TYPE = GridType.Grid Then
-                If e.RowHandle = -1 Then
+
-                    Exit Sub
+                'Try
-                End If
+                '    Dim rowCellValue = grvwGrid.GetRowCellValue(e.RowHandle, "ROW_COLOR")
-                Try
+                '    If rowCellValue <> "" Then
-                    Dim rowCellValue = grvwGrid.GetRowCellValue(e.RowHandle, "ROW_COLOR")
+                '        Dim ColorRow As Color
-                    If rowCellValue <> "" Then
+                '        Try
-                        Dim ColorRow As Color
+                '            ColorRow = Color.FromName(rowCellValue)
-                        Try
+                '        Catch ex As Exception
-                            ColorRow = Color.FromName(rowCellValue)
+                '            ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False)
-                        Catch ex As Exception
+                '            Exit Sub
-                            ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False)
+                '        End Try
-                            Exit Sub
+                '        'Dim c As Color = DirectCast(rowCellValue, Color)
-                        End Try
+                '        e.Appearance.BackColor = ColorRow
-                        'Dim c As Color = DirectCast(rowCellValue, Color)
+                '        e.HighPriority = True
-                        e.Appearance.BackColor = ColorRow
+                '    End If
-                        e.HighPriority = True
+                'Catch ex As Exception
-                    End If
+                '    ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False)
-                Catch ex As Exception
+                'End Try
-                    ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False)
-                End Try
             End If
         End If
     End Sub
@@ -4970,7 +5010,7 @@ Public Class frmConstructor_Main
     Private Sub btnAddUser_FollowUp_Click(sender As Object, e As EventArgs) Handles btnAddUser_FollowUp.Click
         If cmbFollowUpUser.SelectedIndex <> -1 And FOLL_UP_ID > 0 Then
             Try
-                Dim ins = "INSERT INTO TBPMO_FOLLUPEMAIL_RECORD (FOLLOW_UP_ID,USER_ID,RECORD_ID,ADDED_WHO) VALUES (" & FOLL_UP_ID & ", " & cmbFollowUpUser.SelectedValue & ", " & RECORD_ID & ", '" & Environment.UserName & "')"
+                Dim ins = "INSERT INTO TBPMO_FOLLUPEMAIL_RECORD (FOLLOW_UP_ID,USER_ID,RECORD_ID,ADDED_WHO) VALUES (" & FOLL_UP_ID & ", " & cmbFollowUpUser.SelectedValue & ", " & RECORD_ID & ", '" & USER_USERNAME & "')"
                 If ClassDatabase.Execute_non_Query(ins, True) = True Then
                     Load_FUUser(FOLL_UP_ID)
                     Update_Status_Label(True, "User added to Follow Up", EditState.Insert)
@@ -5119,9 +5159,12 @@ Public Class frmConstructor_Main
     End Sub
     Sub Refresh_DocID()
         If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
-            tsstlblDocID.Text = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
+            Dim msg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
+            tslblDocIDMain.Text = msg
+            tslblDocIDTab1.Text = msg
         Else
-            tsstlblDocID.Text = ""
+            tslblDocIDMain.Text = ""
+            tslblDocIDTab1.Text = ""
         End If
     End Sub
 
@@ -5206,6 +5249,9 @@ Public Class frmConstructor_Main
 
     End Sub
     Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
+        If IsNothing(GridControlDocSearch.ContextMenuStrip) Then
+            Exit Sub
+        End If
         Me.Cursor = Cursors.WaitCursor
         Dim allow_Open As Boolean = False
         ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
@@ -5458,7 +5504,7 @@ Public Class frmConstructor_Main
         Try
             'If USER_RESULTLIST_CONFIG_GUID = 0 Then
             '    Dim insert = String.Format("INSERT INTO TBPMO_USER_WINDREAM_RESULTLIST_CONFIG (USER_ID,CONSTRUCTOR_DETAIL_ID,COLUMN1,COLUMN1_WIDTH,COLUMN2,COLUMN2_WIDTH,COLUMN3,COLUMN3_WIDTH,COLUMN4,COLUMN4_WIDTH,COLUMN5,COLUMN5_WIDTH,COLUMN6,COLUMN6_WIDTH,COLUMN7,COLUMN7_WIDTH,ADDED_WHO)" & _
-            '                               " SELECT {0},{1},COLUMN1,COLUMN1_WIDTH,COLUMN2,COLUMN2_WIDTH,COLUMN3,COLUMN3_WIDTH,COLUMN4,COLUMN4_WIDTH,COLUMN5,COLUMN5_WIDTH,COLUMN6,COLUMN6_WIDTH,COLUMN7,COLUMN7_WIDTH,'{2}' FROM TBPMO_WINDREAM_RESULTLIST_CONFIG WHERE GUID = {3}", USER_GUID, CONSTRUCTOR_DETAIL_ID, Environment.UserName, gridGUID)
+            '                               " SELECT {0},{1},COLUMN1,COLUMN1_WIDTH,COLUMN2,COLUMN2_WIDTH,COLUMN3,COLUMN3_WIDTH,COLUMN4,COLUMN4_WIDTH,COLUMN5,COLUMN5_WIDTH,COLUMN6,COLUMN6_WIDTH,COLUMN7,COLUMN7_WIDTH,'{2}' FROM TBPMO_WINDREAM_RESULTLIST_CONFIG WHERE GUID = {3}", USER_GUID, CONSTRUCTOR_DETAIL_ID, USER_USERNAME, gridGUID)
             '    If ClassDatabase.Execute_non_Query(insert) = True Then
             '        USER_RESULTLIST_CONFIG_GUID = ClassDatabase.Execute_Scalar("SELECT MAX GUID FROM TBPMO_USER_WINDREAM_RESULTLIST_CONFIG WHERE USER_ID = " & USER_GUID)
             '    Else
@@ -5678,18 +5724,23 @@ Public Class frmConstructor_Main
                     ContextMenu_Write()
             End Select
         End If
-        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
+        If Not IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
+            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                docCM_RenameDisplay.Visible = True
+                If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
-                Set_Displayname()
+                    docCM_RenameDisplay.Visible = True
+                    Set_Displayname()
+                Else
+                    docCM_RenameDisplay.Visible = False
+                End If
             Else
                 docCM_RenameDisplay.Visible = False
             End If
         Else
-            docCM_RenameDisplay.Visible = False
+            e.Cancel = True
         End If
         
 
+
     End Sub
     Sub File_in_Work()
         docCM_InWork.Enabled = True
@@ -5712,7 +5763,7 @@ Public Class frmConstructor_Main
             Dim displ As String
 
             If CBool(ClassWindreamDocGrid.SELECTED_INWORK) = True Then
-                If IW_USER.ToUpper = Environment.UserName.ToUpper Then
+                If IW_USER.ToUpper = USER_USERNAME.ToUpper Then
                     displ = "Datei wieder freigeben"
                     If USER_LANGUAGE <> "de-DE" Then
                         displ = "Set file free"
@@ -5743,7 +5794,7 @@ Public Class frmConstructor_Main
         ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
         If ClassWindreamDocGrid.SELECTED_INWORK = True Then ' Datei ist in Bearbeitung
             Dim displ As String
-            If IW_USER.ToUpper = Environment.UserName.ToUpper Then
+            If IW_USER.ToUpper = USER_USERNAME.ToUpper Then
                 If ClassFileResult.Set_InWork(0, "") = True Then
                     RUN_WDSEARCH_GRID("RECORD")
                 End If
@@ -5866,7 +5917,7 @@ Public Class frmConstructor_Main
         ' Alle Tab Pages außer Detailansicht deaktivieren
         ' Zur Detailansicht springen
         For Each tab As DevExpress.XtraTab.XtraTabPage In TCDetails.TabPages
-            If (tab.Name <> "TabDetails") Then
+            If (tab.Name <> "TabDetails") And tab.Name <> "TabWindream" Then
                 tab.PageEnabled = False
             Else
                 TCDetails.SelectedTabPage = tab
@@ -5994,7 +6045,7 @@ Public Class frmConstructor_Main
                         For Each _RECORD As String In e.Data.GetData(GetType(String()))
                             Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD)
                             If ClassDatabase.Execute_non_Query(upd) = True Then
-                                msg = String.Format("ENTITY WAS CHANGED TO {0}-{1} by User: {2}", ENTITY_STRING, node_tag, Environment.UserName)
+                                msg = String.Format("ENTITY WAS CHANGED TO {0}-{1} by User: {2}", ENTITY_STRING, node_tag, USER_USERNAME)
                                 ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg)
                                 sql = "SELECT T.* FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK T1  WHERE T.DocID = T1.DOC_ID AND T1.RECORD_ID = " & _RECORD
                                 Dim DT_DOCS As DataTable = ClassDatabase.Return_Datatable(sql)
@@ -6007,7 +6058,7 @@ Public Class frmConstructor_Main
                                     "AND LINKED_CTRL_ID IN (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {1})", ENTITY_ID, node_tag)
                                 Dim DT_CHANGE_CTR As DataTable = ClassDatabase.Return_Datatable(sql)
                                 For Each row As DataRow In DT_CHANGE_CTR.Rows
-                                    upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET CONTROL_ID = {0}, CHANGED_WHO = '{3}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", row.Item("LINKED_CTRL_ID"), row.Item("ORIGIN_CTRL_ID"), _RECORD, Environment.UserName)
+                                    upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET CONTROL_ID = {0}, CHANGED_WHO = '{3}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", row.Item("LINKED_CTRL_ID"), row.Item("ORIGIN_CTRL_ID"), _RECORD, USER_USERNAME)
                                     ClassDatabase.Execute_non_Query(upd)
                                 Next
                             End If
@@ -6063,11 +6114,6 @@ Public Class frmConstructor_Main
         End Try
 
     End Sub
-
-    Private Sub tsbtnEntitySearch_Click(sender As Object, e As EventArgs) Handles tsbtnEntitySearch.Click
-        RUN_WDSEARCH_GRID("ENTITY")
-    End Sub
-
     Private Sub DateirechteFürUserToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_GetRights.Click
         Dim result = ClassWindream.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH)
         If Not IsNothing(result) Then
@@ -6099,7 +6145,7 @@ Public Class frmConstructor_Main
                 CURRENT_FORM_ID = ENTITY_ID
                 Dim sql = "EXEC	PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & ", " & RECORD_ID
                 If ClassDatabase.Execute_non_Query(sql) = True Then
-                    VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
+                    VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
                     Show_act_WFTask()
                     If USER_LANGUAGE = "de-DE" Then
                         stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?"
@@ -6139,7 +6185,7 @@ Public Class frmConstructor_Main
         End If
         result = MessageBox.Show(msg, "Copy Record:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
-            Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName)
+            Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, USER_USERNAME)
             If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
                 Load_Entity_Data(ACT_EBENE)
             End If
@@ -6150,12 +6196,6 @@ Public Class frmConstructor_Main
         CURRENT_RECORD_ID = RECORD_ID
         frmRecord_Changes.ShowDialog()
     End Sub
-
-    Private Sub DocSearchRefresh_Click(sender As Object, e As EventArgs) Handles DocSearchRefresh.Click
-        ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
-        RUN_WDSEARCH_GRID("RECORD")
-    End Sub
-
     Private Sub AnwendungscacheResettsbtn_Click(sender As Object, e As EventArgs) Handles AnwendungscacheResettsmi.Click
         Dim result As MsgBoxResult
         Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Entität wird dann automatisch neugeladen!"
@@ -6194,11 +6234,18 @@ Public Class frmConstructor_Main
         End If
     End Sub
 
-    Private Sub tsbtnDeleteRecord_Click(sender As Object, e As EventArgs) Handles tsbtnDeleteRecord.Click
-        Delete_Record()
-    End Sub
-
     Private Sub tsbtnRefresh_Entity_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh_Entity.Click
         Refresh_Entity_Data()
     End Sub
+
+    Private Sub RecordDeleteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RecordDeleteToolStripMenuItem.Click
+        Delete_Record()
+    End Sub
+    Private Sub docCMEntityWideSearch_Click(sender As Object, e As EventArgs) Handles docCMEntityWideSearch.Click
+        RUN_WDSEARCH_GRID("ENTITY")
+    End Sub
+
+    Private Sub tsbtnDoc_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnDoc_Refresh.Click
+        RUN_WDSEARCH_GRID("RECORD")
+    End Sub
 End Class

app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.vb

@@ -7,7 +7,7 @@
         Try
             Me.TBDD_EMAIL_ACCOUNTBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_EMAIL_ACCOUNT.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBDD_EMAIL_ACCOUNTBindingSource.EndEdit()
                 TBDD_EMAIL_ACCOUNTTableAdapter.Update(Me.DD_DMSDataSet.TBDD_EMAIL_ACCOUNT)
                 lblSave.Visible = True
@@ -28,7 +28,7 @@
     End Sub
 
     Private Sub TBDD_EMAIL_ACCOUNTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_EMAIL_ACCOUNTBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_EMAIL_ACCOUNT.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_EMAIL_ACCOUNT.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub btnEmailTest_Click(sender As Object, e As EventArgs) Handles btnEmailTest.Click

app/DD-Record-Organiser/frmDocLink_to_Record.vb

@@ -428,7 +428,7 @@ Public Class frmDocLink_to_Record
                     CURRENT_DOC_ID = row.Item("DOC_ID")
                     Dim DOC_PATH = row.Item("DOC_PATH")
                     Dim _objecttype = row.Item("OBJECTTYPE")
-                    Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (RECORD_ID,DOC_ID,COMMENT,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", RecordId, CURRENT_DOC_ID, "MANUAL RECORD-LINK", Environment.UserName)
+                    Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (RECORD_ID,DOC_ID,COMMENT,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", RecordId, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(ins) = False Then
                         MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical)
                     End If

app/DD-Record-Organiser/frmDoctype_NameConvention.vb

@@ -87,7 +87,7 @@
         Else
             sf = 0
         End If
-        Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', MANUAL_SUBFOLDER = " & sf & ",  CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID
+        Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', MANUAL_SUBFOLDER = " & sf & ",  CHANGED_WHO = '" & USER_USERNAME & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID
         If ClassDatabase.Execute_non_Query(sql, True) = True Then
             lblSave.Visible = True
             lblSave.Text = "Data saved - " & Now.ToString
@@ -189,7 +189,7 @@
 
     Private Sub TBPMO_WD_NAMECONVENTION_FORMATBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WD_NAMECONVENTION_FORMATBindingSource.AddingNew
         Try
-            DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMAT.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMAT.ADDED_WHOColumn.DefaultValue = USER_USERNAME
             DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMAT.IDColumn.DefaultValue = TBPMO_WD_FORMVIEW_DOKTYPES_GUID
         Catch ex As Exception
             MsgBox("Error in Adding Format Rules: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)

app/DD-Record-Organiser/frmEntities.vb

@@ -185,8 +185,8 @@ Public Class frmEntities
     End Function
 
     Private Sub TBPMO_FORMBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_FORMBindingSource.AddingNew
-        DD_DMSDataSet.TBPMO_FORM.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_FORM.ADDED_WHOColumn.DefaultValue = USER_USERNAME
-        DD_DMSDataSet.TBPMO_FORM_VIEW.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_FORM_VIEW.ADDED_WHOColumn.DefaultValue = USER_USERNAME
         DD_DMSDataSet.TBPMO_FORM.SHOW_FORM_CONSTRUCTColumn.DefaultValue = True
         DD_DMSDataSet.TBPMO_FORM.SINGLE_RECORDColumn.DefaultValue = False
         'Me.GroupBox1.Visible = True
@@ -231,7 +231,7 @@ Public Class frmEntities
 
             ' Save FORM Properties
             If DD_DMSDataSet.TBPMO_FORM.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBoxPMOForm.Text = Environment.UserName
+                Me.CHANGED_WHOTextBoxPMOForm.Text = USER_USERNAME
                 Me.TBPMO_FORMBindingSource.EndEdit()
                 Try
                     TBPMO_FORMTableAdapter.Update(DD_DMSDataSet.TBPMO_FORM)
@@ -247,7 +247,7 @@ Public Class frmEntities
                 Dim sql = "SELECT (MAX(GUID)) FROM TBPMO_FORM"
                 Dim FORM_ID = ClassDatabase.Execute_Scalar(sql)
 
-                Dim ADDED_WHO As String = Environment.UserName
+                Dim ADDED_WHO As String = USER_USERNAME
 
 
                 'MsgBox(FORM_TITLETextBox.Text)
@@ -260,7 +260,7 @@ Public Class frmEntities
             Else
                 Me.TBPMO_FORM_VIEWBindingSource.EndEdit()
                 If DD_DMSDataSet.TBPMO_FORM_VIEW.GetChanges Is Nothing = False Then
-                    'Me.CHANGED_WHOTextBoxPMOFormView.Text = Environment.UserName
+                    'Me.CHANGED_WHOTextBoxPMOFormView.Text = USER_USERNAME
                     Me.TBPMO_FORM_VIEWBindingSource.EndEdit()
                     TBPMO_FORM_VIEWTableAdapter.Update(DD_DMSDataSet.TBPMO_FORM_VIEW)
                     changes = True
@@ -336,7 +336,7 @@ Public Class frmEntities
         If result = MsgBoxResult.Yes Then
             Try
                 Dim CurrentID = GetCurrentGUID()
-                Dim sql As String = "EXEC PRPMO_COPY_ENTITY " & CurrentID.ToString & ", '" & Environment.UserName & "'"
+                Dim sql As String = "EXEC PRPMO_COPY_ENTITY " & CurrentID.ToString & ", '" & USER_USERNAME & "'"
                 If ClassDatabase.Execute_non_Query(sql) = True Then
                     'MsgBox("Die Entität wurde erfolgreich kopiert!", MsgBoxStyle.Information)
                     Load_TreeView()

app/DD-Record-Organiser/frmFollowUp.vb

@@ -7,7 +7,7 @@
         Try
             Me.TBPMO_FOLLOW_UP_EMAILBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_FOLLOW_UP_EMAILBindingSource.EndEdit()
                 TBPMO_FOLLOW_UP_EMAILTableAdapter.Update(Me.DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL)
                 lblSaveWVEmail.Visible = True
@@ -175,7 +175,7 @@
     Private Sub TBPMO_FOLLOW_UP_EMAILBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_FOLLOW_UP_EMAILBindingSource.AddingNew
         Try
             Me.FOLLOW_UP_SEQUENCEComboBox.SelectedIndex = 0
-            DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.ADDED_WHOColumn.DefaultValue = USER_USERNAME
             DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.FOLLOW_UP_DAYSColumn.DefaultValue = "0000000"
         Catch ex As Exception
             MsgBox("Fehler bei Add Record FollowUp:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -217,7 +217,7 @@
             If row.Item(0) = CBool(True) Then
                 Dim sql = "select count(*) from TBPMO_FOLLUPEMAIL_USER Where user_id = " & row.Item(5) & " AND FOLLOW_UP_ID = " & Me.GUIDTextBox.Text
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                    Dim ins = "insert into TBPMO_FOLLUPEMAIL_USER (USER_ID,FOLLOW_UP_ID,ADDED_WHO) VALUES (" & row.Item(5) & ", " & Me.GUIDTextBox.Text & ", '" & Environment.UserName & "')"
+                    Dim ins = "insert into TBPMO_FOLLUPEMAIL_USER (USER_ID,FOLLOW_UP_ID,ADDED_WHO) VALUES (" & row.Item(5) & ", " & Me.GUIDTextBox.Text & ", '" & USER_USERNAME & "')"
                     If ClassDatabase.Execute_non_Query(ins) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to FollowUp!", row.Item(1)), MsgBoxStyle.Critical)
                     End If

app/DD-Record-Organiser/frmGoogle.vb

@@ -85,30 +85,29 @@ Public Class frmGoogle
         VectorLayer.Data = storage
 
     End Sub
-
     Private Sub MapControl1_MapItemClick(sender As Object, e As MapItemClickEventArgs) Handles MapControl1.MapItemClick
-        Dim item As MapPushpin = e.Item
+        Try
-        Dim row As DataRow = item.Information
+            Dim item As MapPushpin = e.Item
-        Dim attrs As MapItemAttributeCollection = item.Attributes
+            Dim row As DataRow = item.Information
-
+            Dim attrs As MapItemAttributeCollection = item.Attributes
-        ListBox1.Items.Clear()
+            ListBox1.Items.Clear()
-        ListBox1.Items.Add(row.Item("Supplier_number"))
+            ListBox1.Items.Add(row.Item("Supplier_number"))
-        ListBox1.Items.Add(row.Item("Supplier_name"))
+            ListBox1.Items.Add(row.Item("Supplier_name"))
-        ListBox1.Items.Add(row.Item("MP_Number"))
+            ListBox1.Items.Add(row.Item("MP_Number"))
+        Catch ex As Exception
 
+        End Try
     End Sub
 
     Private Sub MapControl1_DrawMapItem(sender As Object, e As DrawMapItemEventArgs) Handles MapControl1.DrawMapItem
         Dim colorOuter As Color = Color.Green
         Dim colorInner As Color = Color.Green
         Dim colorInnerHighlight As Color = Color.Red
-
         e.Fill = Color.Red
     End Sub
 
     Public Class MapItemFactory
         Inherits DefaultMapItemFactory
-
         Protected Overrides Sub InitializeItem(ByVal item As MapItem, ByVal obj As Object)
             MyBase.InitializeItem(item, obj)
             Dim rect As MapRectangle = TryCast(item, MapRectangle)

app/DD-Record-Organiser/frmLanguage_Translator.vb

@@ -130,7 +130,7 @@ Public Class frmLanguage_Translator
                     ts_statelbl.BackColor = Color.Red
                     Exit Sub
                 End If
-                Dim upd = String.Format("UPDATE TBPMO_LANGUAGE_OBJECT SET {3} = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", e.Value, Environment.UserName, Grid_RecordID, e.Column.FieldName)
+                Dim upd = String.Format("UPDATE TBPMO_LANGUAGE_OBJECT SET {3} = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", e.Value, USER_USERNAME, Grid_RecordID, e.Column.FieldName)
                 If ClassDatabase.Execute_non_Query(upd) = True Then
                     ts_statelbl.Text = "Row/ID (" & Grid_RecordID.ToString & ") Updated - " & Now
                     ts_statelbl.BackColor = Color.Yellow

app/DD-Record-Organiser/frmLogRecord.vb

@@ -32,7 +32,7 @@
         Try
             Me.TBPMO_RECORD_LOG_CONFIGBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_RECORD_LOG_CONFIG.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_RECORD_LOG_CONFIGBindingSource.EndEdit()
                 TBPMO_RECORD_LOG_CONFIGTableAdapter.Update(Me.DD_DMSDataSet.TBPMO_RECORD_LOG_CONFIG)
                 lblSaveWVEmail.Visible = True

app/DD-Record-Organiser/frmLogin.vb

@@ -17,6 +17,6 @@
     End Sub
 
     Private Sub frmLogin_Load(sender As Object, e As EventArgs) Handles Me.Load
-        UsernameTextBox.Text = Environment.UserName
+        UsernameTextBox.Text = USER_USERNAME
     End Sub
 End Class

app/DD-Record-Organiser/frmLoginUserSelect.Designer.vb

@@ -0,0 +1,190 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmLoginUserSelect
+    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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLoginUserSelect))
+        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl()
+        Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colID = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.btnLogin = New System.Windows.Forms.Button()
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'DD_ECMAdmin
+        '
+        Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin"
+        Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'TBAD_UsersBindingSource
+        '
+        Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users"
+        Me.TBAD_UsersBindingSource.DataSource = Me.DD_ECMAdmin
+        '
+        'GridControlUsers2Menue
+        '
+        Me.GridControlUsers2Menue.DataSource = Me.TBAD_UsersBindingSource
+        Me.GridControlUsers2Menue.Location = New System.Drawing.Point(15, 39)
+        Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue
+        Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue"
+        Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True
+        Me.GridControlUsers2Menue.Size = New System.Drawing.Size(484, 255)
+        Me.GridControlUsers2Menue.TabIndex = 89
+        Me.GridControlUsers2Menue.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewlUsers2Menue})
+        '
+        'GridViewlUsers2Menue
+        '
+        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.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
+        Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
+        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True
+        Me.GridViewlUsers2Menue.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GridViewlUsers2Menue.Appearance.Row.Options.UseFont = True
+        Me.GridViewlUsers2Menue.Appearance.ViewCaption.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GridViewlUsers2Menue.Appearance.ViewCaption.Options.UseFont = True
+        Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.colSurname, Me.GridColumn1, Me.GridColumn2, Me.colID})
+        Me.GridViewlUsers2Menue.GridControl = Me.GridControlUsers2Menue
+        Me.GridViewlUsers2Menue.Name = "GridViewlUsers2Menue"
+        Me.GridViewlUsers2Menue.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewlUsers2Menue.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewlUsers2Menue.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewlUsers2Menue.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewlUsers2Menue.OptionsView.ColumnAutoWidth = False
+        Me.GridViewlUsers2Menue.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewlUsers2Menue.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewlUsers2Menue.OptionsView.ShowGroupPanel = False
+        '
+        'colSelect
+        '
+        Me.colSelect.Caption = "Selection"
+        Me.colSelect.FieldName = "Select"
+        Me.colSelect.Name = "colSelect"
+        Me.colSelect.Visible = True
+        Me.colSelect.VisibleIndex = 0
+        Me.colSelect.Width = 54
+        '
+        'colSurname
+        '
+        Me.colSurname.Caption = "Name"
+        Me.colSurname.FieldName = "Surname"
+        Me.colSurname.Name = "colSurname"
+        Me.colSurname.Visible = True
+        Me.colSurname.VisibleIndex = 1
+        Me.colSurname.Width = 127
+        '
+        'GridColumn1
+        '
+        Me.GridColumn1.FieldName = "Username"
+        Me.GridColumn1.Name = "GridColumn1"
+        Me.GridColumn1.OptionsColumn.AllowEdit = False
+        Me.GridColumn1.Visible = True
+        Me.GridColumn1.VisibleIndex = 2
+        Me.GridColumn1.Width = 130
+        '
+        'GridColumn2
+        '
+        Me.GridColumn2.FieldName = "Email"
+        Me.GridColumn2.Name = "GridColumn2"
+        Me.GridColumn2.OptionsColumn.AllowEdit = False
+        Me.GridColumn2.Visible = True
+        Me.GridColumn2.VisibleIndex = 3
+        Me.GridColumn2.Width = 102
+        '
+        'colID
+        '
+        Me.colID.FieldName = "ID"
+        Me.colID.Name = "colID"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(250, 16)
+        Me.Label1.TabIndex = 90
+        Me.Label1.Text = "Choose an user you would like to login as:"
+        '
+        'btnLogin
+        '
+        Me.btnLogin.Image = Global.DD_Record_Organiser.My.Resources.Resources.user_16xLG
+        Me.btnLogin.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnLogin.Location = New System.Drawing.Point(15, 300)
+        Me.btnLogin.Name = "btnLogin"
+        Me.btnLogin.Size = New System.Drawing.Size(484, 35)
+        Me.btnLogin.TabIndex = 91
+        Me.btnLogin.Text = "Login as User"
+        Me.btnLogin.UseVisualStyleBackColor = True
+        '
+        'frmLoginUserSelect
+        '
+        Me.AcceptButton = Me.btnLogin
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(512, 345)
+        Me.ControlBox = False
+        Me.Controls.Add(Me.btnLogin)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.GridControlUsers2Menue)
+        Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.KeyPreview = True
+        Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmLoginUserSelect"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Login as special user"
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents DD_ECMAdmin As DD_Record_Organiser.DD_ECMAdmin
+    Friend WithEvents TBAD_UsersBindingSource As System.Windows.Forms.BindingSource
+    Friend WithEvents GridControlUsers2Menue As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewlUsers2Menue As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents colSelect As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colID As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents btnLogin As System.Windows.Forms.Button
+End Class

app/DD-Record-Organiser/frmLoginUserSelect.resx

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="TBAD_UsersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>152, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
+        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
+        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
+        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wD/////////AAAAAAAAAAAA/////////wAAAAAAAAAAAP93
+        d3d3d/8AAAAAAAAAAAD/d3d3d3f/AAAAAAAAAAAA/3d3/3d3/wAAAAAAAAAAAP93d/93d/8AAAAAAAAA
+        AAD/d3d3d3f//////////wAA/3d3d3d3//////////8AAP93d/93d/93d3d3d3f/AAD/////////d3d3
+        d3d3/wAA///3d3//////////d/8AAAD/d3d3/////////3f/AAAA/3d3d/93d3f///93/wAAAP93d3f/
+        d3d3////d/8AAAD/d3d3/////////3f/AAAA//d3f/////////93/wAAAA//////d3d3d///d/8AAAAA
+        //+H/3d3d3f//3f/AAAAAAD/d/////////93/wAAAAAA/3f/////////d/8AAAAAAP93/3d3d/93/3f/
+        AAAAAAD/d/93d3f/d/93/wAAAAAA/3f/////////d/8AAAAAAP93/////////3f/AAAAAAD/d/93d3d3
+        d/93/wAAAAAA/3f/d3d3d3f/d/8AAAAAAP93/////////3f/AAAAAAD/d/////////93/wAAAAAA/3d3
+        d3d3d3d3d/8AAAAAAP93d3d3d3d3d3f/AAAAAAD//////////////wAAAAAA//////////////8AAAAD
+        //8AA///AAP//wAD//8AA///AAP//wAAAA8AAAAPAAAADwAAAA8AAAAPwAAAD8AAAA/AAAAPwAAAD8AA
+        AA/gAAAP8AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wA
+        AA/8AAAPKAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wD////wAAAAAPd3
+        d/AAAAAA93d38AAAAAD3f3f/////AP////d3d38AD3d/////fwAPd393f/9/AA93f////38AAP+Pd3f/
+        fwAAD3////9/AAAPf3d/f38AAA9/////fwAAD393d39/AAAPf////38AAA93d3d3fwAAD///////AAH/
+        AAAB/wAAAf8AAAADAAAAAwAAgAMAAIADAACAAwAAwAMAAOADAADgAwAA4AMAAOADAADgAwAA4AMAAOAD
+        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgBZWVkAZGRkAG5u
+        bgCzs7MA4ODgAObk5QDr6+sA8e/wAPLx8QD08/MA9PP0APb19gD6+voAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AA0NDQ0NDQ0NDQ0NDQ0N
+        AAAAAAAAAAAAAAAAAAAAAAAADQ0NDQ0NDQ0NDQ0NDQ0AAAAAAAAAAAAAAAAAAAAAAAANDQEBAQEBAQEB
+        AQENDQAAAAAAAAAAAAAAAAAAAAAAAA0NAQEBAQEBAQEBAQ0NAAAAAAAAAAAAAAAAAAAAAAAADQ0BAQEB
+        BwcBAQEBDQ0AAAAAAAAAAAAAAAAAAAAAAAANDQEBAQEHBwEBAQENDQAAAAAAAAAAAAAAAAAAAAAAAA0N
+        AQEBAQEBAQEBAQ0NDQ0NDQ0NDQ0NDQ0NDQ0AAAAADQ0BAQEBAwMBAQEBDQ0NDQ0NDQ0NDQ0NDQ0NDQAA
+        AAANDQEBAQMICAMBAQENDQEBAQEBAQEBAQEBAQ0NAAAAAA0NDQ0NDQ0NDQ0NDQ0NAQEBAQEBAQEBAQEB
+        DQ0AAAAADQ0NDQgEAQEECA0NDQ0JCQkJCQkJCQkJAQENDQAAAAAAAA0NBAEBAQEEDQ0JCQkJCQkJCQkJ
+        CQkBAQ0NAAAAAAAADQ0BAQEBAQEHDQEBAQEBAQkJCQkJCQEBDQ0AAAAAAAANDQEBAQEBAQ0NAQEBAQEB
+        CQkJCQkJAQENDQAAAAAAAA0NBAEBAQEEDQ0JCQkJCQkJCQkJCQkBAQ0NAAAAAAAADg0IBAEBBAgNDQkJ
+        CQkJCQkJCQkJCQEBDQ0AAAAAAAAADQ0NCAcNCA0JBAQEBAQEBAQJCQkJAQENDQAAAAAAAAAADg0NDQUC
+        CQkBAQEBAQEBAQkJCQkBAQ0NAAAAAAAAAAAAAA0NAQEJCQkJCQkJCQkJCQkJCQEBDQ0AAAAAAAAAAAAA
+        DQ0BAQkJCQkJCQkJCQkJCQkJAQENDQAAAAAAAAAAAAANDQEBCQkBAQEBAQEJCQEBCQkBAQ0NAAAAAAAA
+        AAAAAA0NAQEJCQEBAQEBAQkJAQEJCQEBDQ0AAAAAAAAAAAAADQ0BAQkJCQkJCQkJCQkJCQkJAQENDQAA
+        AAAAAAAAAAANDQEBCQkJCQkJCQkJCQkJCQkBAQ0NAAAAAAAAAAAAAA0NAQEJCQEBAQEBAQEBAQEJCQEB
+        DQ0AAAAAAAAAAAAADQ0BAQkJAQEBAQEBAQEBAQkJAQENDQAAAAAAAAAAAAANDQEBCQkJCQkJCQkJCQkJ
+        CQkBAQ0NAAAAAAAAAAAAAA0NAQEJCQkJCQkJCQkJCQkJCQEBDQ0AAAAAAAAAAAAADQ0BAQEBAQEBAQEB
+        AQEBAQEBAQENDQAAAAAAAAAAAAANDQEBAQEBAQEBAQEBAQEBAQEBAQ0NAAAAAAAAAAAAAA0NDQ0NDQ0N
+        DQ0NDQ0NDQ0NDQ0NDQ0AAAAAAAAAAAAADQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQAAAAAAA///AAP//wAD
+        //8AA///AAP//wAD//8AAAAPAAAADwAAAA8AAAAPAAAAD8AAAA/AAAAPwAAAD8AAAA/AAAAP4AAAD/AA
+        AA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAADygA
+        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAE1NTQCGhoYAkZGRAKen
+        pwDx7/AA9PPzAPX19QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8ACAgICAgICAAAAAAAAAAAAAgB
+        AQEBAQgAAAAAAAAAAAAIAQEDAQEIAAAAAAAAAAAACAEECAQBCAgICAgICAgAAAgICAgICAgBAQEBAQEI
+        AAAACAIBAggGBgYGBgYBCAAAAAgBAQEIAQEBBgYGAQgAAAAIAgECCAYGBgYGBgEIAAAAAAgIBQYBAQEB
+        BgYBCAAAAAAACAEGBgYGBgYGAQgAAAAAAAgBBgEBAQYBBgEIAAAAAAAIAQYGBgYGBgYBCAAAAAAACAEG
+        AQEBAQEGAQgAAAAAAAgBBgYGBgYGBgEIAAAAAAAIAQEBAQEBAQEBCAAAAAAACAgICAgICAgICAgAAAH/
+        AAAB/wAAAf8AAAADAAAAAwAAgAMAAIADAACAAwAAwAMAAOADAADgAwAA4AMAAOADAADgAwAA4AMAAOAD
+        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv/m5OX/5uTl/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/+bk5f/m5OX/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9kZGT/ZGRk/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
+        Qv9CQkL/ZGRk/+vr6//r6+v/ZGRk/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA
+        AAD29vb/9vb2//b29v/29vb/6+vr/29vb/9CQkL/QkJC/29vb//r6+v/9vb2//b29v/29vb/9vb2//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA9vb23/b29v9vb2//QkJC/0JCQv9CQkL/QkJC/29vb//29vb/9PPz//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29hD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/+Dg
+        4P/19PX/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
+        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2EPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//X09f9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb27/b29v9vb2//QkJC/0JC
+        Qv9CQkL/QkJC/29vb//29vb/9PP0//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vaA9vb2/+vr
+        6/9vb2//QkJC/0JCQv9vb2//6+vr//b29v/y8PH/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD29vbP9vb2//b29v/r6+v/4ODg//b29v/r6+v/8/Ly//Hv8P9ubW7/bm1u/25tbv9ubW7/bm1u/25t
+        bv9ubW7/bm1u//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD29vaA9vb27/b29v/29vb/s7Oz/1lZWf/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b2
+        9v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
+        Qv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv/x7/D/8e/w/0JC
+        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2//b2
+        9v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//Hv
+        8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
+        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAD
+        //8AA///AAP//wAD//8AA///AAP//wAAAA8AAAAPAAAADwAAAA8AAAAPwAAAD4AAAA+AAAAPwAAAD8AA
+        AA/gAAAP8AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wAAA/8AAAP/AAAD/wA
+        AA/8AAAPKAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JC
+        Qv9CQkL/hoaG/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v9CQkL/kZGR//b29v+RkZH/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAA
+        AAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2/wAA
+        AAAAAAAAAAAAAPb29u9NTU3/QkJC/01NTf/08/P/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b2
+        9v8AAAAAAAAAAPb29iD29vb/QkJC/0JCQv9CQkL/9fT1/0JCQv9CQkL/QkJC//Hv8P/x7/D/8e/w/0JC
+        Qv/29vb/AAAAAAAAAAAAAAAA9vb2701NTf9CQkL/TU1N//Tz8//x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P9CQkL/9vb2/wAAAAAAAAAAAAAAAPb29kD29vbv9vb2/6enp//x7/D/QkJC/0JCQv9CQkL/QkJC//Hv
+        8P/x7/D/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/8e/w/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC//Hv8P9CQkL/QkJC/0JC
+        Qv/x7/D/QkJC//Hv8P9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv/x7/D/8e/w//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29v9CQkL/8e/w/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC//Hv
+        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAB/wAAAf8AAAH/
+        AAAAAwAAAAMAAIADAAAAAwAAgAMAAIADAADgAwAA4AMAAOADAADgAwAA4AMAAOADAADgAwAA
+</value>
+  </data>
+</root>

app/DD-Record-Organiser/frmLoginUserSelect.vb

@@ -0,0 +1,72 @@
+Public Class frmLoginUserSelect
+
+    Private Sub frmLoginUserSelect_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
+        If e.KeyCode = Keys.Return Then
+            Login()
+        End If
+    End Sub
+
+    Private Sub frmLoginUserSelect_Load(sender As Object, e As EventArgs) Handles Me.Load
+        Dim Sql = String.Format("SELECT * FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1")
+        Dim DT_USER = ClassDatabase.Return_Datatable(Sql)
+        Try
+            DD_ECMAdmin.TBAD_Users.Clear()
+
+            For Each row As DataRow In DT_USER.Rows
+                Dim newUserRow As DD_ECMAdmin.TBAD_UsersRow
+                newUserRow = DD_ECMAdmin.TBAD_Users.NewTBAD_UsersRow
+                newUserRow.Username = row.Item("USERNAME")
+                newUserRow.Surname = row.Item("NAME")
+                newUserRow.Prename = row.Item("PRENAME")
+                Try
+                    newUserRow.Email = row.Item("EMAIL")
+                Catch ex As Exception
+                    newUserRow.Email = ""
+                End Try
+
+                newUserRow.ID = row.Item("GUID")
+                DD_ECMAdmin.TBAD_Users.Rows.Add(newUserRow)
+                ' chklbxUserForGroup.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
+            Next
+        Catch ex As Exception
+            MsgBox("Error Load_Users:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+
+    Private Sub btnLogin_Click(sender As Object, e As EventArgs) Handles btnLogin.Click
+        Login()
+    End Sub
+    Sub Login()
+        Try
+            Dim COUNT As Integer
+            For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                If row.Item(0) = CBool(True) Then
+                    COUNT += 1
+                End If
+
+            Next
+            If COUNT = 1 Then
+                For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                    If row.Item(0) = CBool(True) Then
+                        Dim User = row.Item("USERNAME")
+                        USER_USERNAME = row.Item("USERNAME")
+                        Me.Close()
+                    End If
+                Next
+            Else
+                If COUNT > 0 Then
+                    MsgBox("Please choose one User!", MsgBoxStyle.Exclamation)
+                Else
+                    MsgBox("Please choose only one User!", MsgBoxStyle.Exclamation)
+                End If
+
+                Exit Sub
+            End If
+            For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                row.Item(0) = CBool(False)
+            Next
+        Catch ex As Exception
+            MsgBox("Error while Login in as special user: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+End Class

app/DD-Record-Organiser/frmMain.Designer.vb

@@ -68,6 +68,7 @@ Partial Class frmMain
         Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem23 = New DevExpress.XtraBars.BarButtonItem()
         Me.btnGlobalSearch = New DevExpress.XtraBars.BarButtonItem()
         Me.LabelUser = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem24 = New DevExpress.XtraBars.BarButtonItem()
@@ -187,9 +188,9 @@ Partial Class frmMain
         Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
         Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
         Me.ribbonMain.ExpandCollapseItem.Id = 0
-        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.BarButtonItem24, Me.bbtnItemViewsUser})
+        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.BarButtonItem24, Me.bbtnItemViewsUser, Me.BarButtonItem23})
         resources.ApplyResources(Me.ribbonMain, "ribbonMain")
-        Me.ribbonMain.MaxItemId = 8
+        Me.ribbonMain.MaxItemId = 10
         Me.ribbonMain.Name = "ribbonMain"
         Me.ribbonMain.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
         Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin})
@@ -420,7 +421,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.BarSubItem1, "BarSubItem1")
         Me.BarSubItem1.Id = 38
-        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9)})
+        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem23)})
         Me.BarSubItem1.Name = "BarSubItem1"
         Me.BarSubItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -458,6 +459,12 @@ Partial Class frmMain
         Me.BarButtonItem9.Id = 45
         Me.BarButtonItem9.Name = "BarButtonItem9"
         '
+        'BarButtonItem23
+        '
+        resources.ApplyResources(Me.BarButtonItem23, "BarButtonItem23")
+        Me.BarButtonItem23.Id = 9
+        Me.BarButtonItem23.Name = "BarButtonItem23"
+        '
         'btnGlobalSearch
         '
         resources.ApplyResources(Me.btnGlobalSearch, "btnGlobalSearch")
@@ -720,6 +727,7 @@ Partial Class frmMain
     Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents bbtnItemViewsUser As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem
 
 End Class
 

app/DD-Record-Organiser/frmMain.resx

@@ -124,6 +124,18 @@
     <value>442, 56</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ADDIBeendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
+  </data>
+  <data name="ADDIBeendenToolStripMenuItem.Text" xml:space="preserve">
+    <value>ADDI beenden</value>
+  </data>
+  <data name="CockpitAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
+  </data>
+  <data name="CockpitAnzeigenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Cockpit anzeigen</value>
+  </data>
   <data name="cmsSystray.Size" type="System.Drawing.Size, System.Drawing">
     <value>166, 48</value>
   </data>
@@ -1032,18 +1044,6 @@
   <data name="NotifyIcon.Visible" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="ADDIBeendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
-  <data name="ADDIBeendenToolStripMenuItem.Text" xml:space="preserve">
-    <value>ADDI beenden</value>
-  </data>
-  <data name="CockpitAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
-  <data name="CockpitAnzeigenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Cockpit anzeigen</value>
-  </data>
   <metadata name="TimerTasks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>190, 56</value>
   </metadata>
@@ -2123,6 +2123,9 @@ Konfiguration</value>
   <data name="BarButtonItem9.Caption" xml:space="preserve">
     <value>Resultlist Config</value>
   </data>
+  <data name="BarButtonItem23.Caption" xml:space="preserve">
+    <value>Sync Files</value>
+  </data>
   <data name="btnGlobalSearch.Caption" xml:space="preserve">
     <value>Globale Suche</value>
   </data>
@@ -2258,20 +2261,38 @@ Konfiguration</value>
   <data name="pageForms.Appearance.BackColor" type="System.Drawing.Color, System.Drawing">
     <value>Yellow</value>
   </data>
+  <data name="groupQuickAccessForm2.Text" xml:space="preserve">
+    <value>Views/Sichten</value>
+  </data>
+  <data name="RibbonPageGroup4.Text" xml:space="preserve">
+    <value>Test</value>
+  </data>
   <data name="pageForms.Text" xml:space="preserve">
     <value>Weitere Sichten</value>
   </data>
+  <data name="RibbonPageGroupProgram.Text" xml:space="preserve">
+    <value>Programm Konfiguration</value>
+  </data>
+  <data name="RibbonPageGroupTask.Text" xml:space="preserve">
+    <value>Tasks und windream-Konfigurationen</value>
+  </data>
+  <data name="RibbonPageGroupMenue.Text" xml:space="preserve">
+    <value>Menü Konfiguration</value>
+  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Connections</value>
+  </data>
   <data name="pageAdmin.Text" xml:space="preserve">
     <value>Administration</value>
   </data>
   <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1404, 150</value>
+    <value>1420, 150</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 747</value>
+    <value>0, 755</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1404, 23</value>
+    <value>1420, 23</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -2297,24 +2318,6 @@ Konfiguration</value>
   <data name="&gt;&gt;ribbonMain.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="groupQuickAccessForm2.Text" xml:space="preserve">
-    <value>Views/Sichten</value>
-  </data>
-  <data name="RibbonPageGroup4.Text" xml:space="preserve">
-    <value>Test</value>
-  </data>
-  <data name="RibbonPageGroupProgram.Text" xml:space="preserve">
-    <value>Programm Konfiguration</value>
-  </data>
-  <data name="RibbonPageGroupTask.Text" xml:space="preserve">
-    <value>Tasks und windream-Konfigurationen</value>
-  </data>
-  <data name="RibbonPageGroupMenue.Text" xml:space="preserve">
-    <value>Menü Konfiguration</value>
-  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Connections</value>
-  </data>
   <metadata name="DefaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>242, 17</value>
   </metadata>
@@ -2343,7 +2346,7 @@ Konfiguration</value>
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1404, 770</value>
+    <value>1420, 778</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>
@@ -3495,6 +3498,12 @@ Konfiguration</value>
   <data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem23.Name" xml:space="preserve">
+    <value>BarButtonItem23</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem23.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;btnGlobalSearch.Name" xml:space="preserve">
     <value>btnGlobalSearch</value>
   </data>

app/DD-Record-Organiser/frmMain.vb

@@ -39,7 +39,7 @@ Public Class frmMain
     End Sub
     Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs)
         Try
-            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName)
+            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", USER_USERNAME)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles")
             If Not IsNothing(DT) Then
                 CURRENT_SCAN_TABLE = DT
@@ -95,7 +95,7 @@ Public Class frmMain
 
                 Me.Text = Application.ProductName
                 LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString)
-                LabelUser.Caption = Environment.UserName
+                LabelUser.Caption = USER_USERNAME
 
                 'IP-Adresse-Auslesen
                 Dim Addresslist() As IPAddress = _
@@ -147,7 +147,7 @@ Public Class frmMain
     Sub Load_TasksforUser()
         Try
             VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
+            Me.VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
             CURRENT_TASKS_GENERAL = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE
         Catch ex As Exception
             MsgBox("Error in Load Tasks:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -161,7 +161,7 @@ Public Class frmMain
             Dim sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))"
             sql = sql.Replace("@LogInOut", 0)
             sql = sql.Replace("@ANGEMELDETWO", "''")
-            sql = sql.Replace("@user", Environment.UserName)
+            sql = sql.Replace("@user", USER_USERNAME)
             ClassDatabase.Execute_non_Query(sql)
             sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE = 'RECORD_ORGANIZER'"
             ClassDatabase.Execute_non_Query(sql)
@@ -355,12 +355,20 @@ Public Class frmMain
 
             End If
 
+
             Dim sql = "SELECT COUNT(GUID) FROM TBPMO_USER_GLOBAL_SEARCH WHERE USER_ID = " & USER_GUID
             Dim Count = ClassDatabase.Execute_Scalar(sql)
             If Count = 0 Then
                 btnGlobalSearch.Enabled = False
+                groupSearchAllOver.Visible = False
             Else
                 btnGlobalSearch.Enabled = True
+                groupSearchAllOver.Visible = True
+            End If
+            If USER_USERNAME.ToUpper = "SCHREIBERM" Or USER_USERNAME.ToUpper = "JENNEJ" Then
+                RibbonPageGroup4.Visible = True
+            Else
+                RibbonPageGroup4.Visible = False
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in Load QuickStart-Items:" & vbNewLine & ex.Message)
@@ -855,4 +863,13 @@ Public Class frmMain
     Private Sub BarButtonItem25_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtnItemViewsUser.ItemClick
         OpenViewsUser()
     End Sub
+    Private Sub BarButtonItem23_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem23.ItemClick
+        Cursor = Cursors.WaitCursor
+        If ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS() = True Then
+            MsgBox("All files were synced successfully!", MsgBoxStyle.Information)
+        Else
+            MsgBox("Error while synchronizing files! Check the log!", MsgBoxStyle.Critical)
+        End If
+        Cursor = Cursors.Default
+    End Sub
 End Class

app/DD-Record-Organiser/frmMass_Change.vb

@@ -78,12 +78,12 @@
 
 
                                     If Not IsNothing(ex_GUID) Then
-                                        SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, Environment.UserName, ex_GUID)
+                                        SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID)
                                         If ClassDatabase.Execute_non_Query(SQL) = False Then
                                             MsgBox("Error in updating the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation)
                                         End If
                                     Else
-                                        SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, Environment.UserName)
+                                        SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, USER_USERNAME)
                                         If ClassDatabase.Execute_non_Query(SQL) = False Then
                                             MsgBox("Error in inserting the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation)
                                         End If

app/DD-Record-Organiser/frmMenuDesigner.vb

@@ -50,7 +50,7 @@
             Dim Name = FormBindingSource.Item(FormBindingSource.Position).Item("NAME")
 
             If IsNothing(FormID) = False Then
-                TBPMO_MENU_FORM_ENTRIESTableAdapter.Insert(MenuID, FormID, "", Name, 1, Environment.UserName, Date.Now, Nothing, Nothing)
+                TBPMO_MENU_FORM_ENTRIESTableAdapter.Insert(MenuID, FormID, "", Name, 1, USER_USERNAME, Date.Now, Nothing, Nothing)
                 RefreshMenuEntries()
             End If
         Catch ex As Exception

app/DD-Record-Organiser/frmNewVariant.vb

@@ -12,15 +12,15 @@ Public Class frmNewVariant
             End If
             result = MessageBox.Show(msg, "Create variant:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
-                Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", CURRENT_RECORD_ID, Environment.UserName)
+                Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", CURRENT_RECORD_ID, USER_USERNAME)
                 If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
-                    Dim sel = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
+                    Dim sel = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
                     Dim REC_ID = ClassDatabase.Execute_Scalar(sel)
-                    Dim Upd = String.Format("UPDATE TBPMO_RECORD SET PARENT_RECORD = {0},CHANGED_WHO = '{1}' WHERE GUID = {2}", REC_ID, Environment.UserName, CURRENT_RECORD_ID)
+                    Dim Upd = String.Format("UPDATE TBPMO_RECORD SET PARENT_RECORD = {0},CHANGED_WHO = '{1}' WHERE GUID = {2}", REC_ID, USER_USERNAME, CURRENT_RECORD_ID)
                     If ClassDatabase.Execute_non_Query(Upd) = True Then
-                        Dim ins = String.Format("INSERT INTO TBPMO_RECORD_VARIANT (RECORD_ID,REASON_CODE,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", CURRENT_RECORD_ID, cmbReason.SelectedText, txtComment.Text, Environment.UserName)
+                        Dim ins = String.Format("INSERT INTO TBPMO_RECORD_VARIANT (RECORD_ID,REASON_CODE,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", CURRENT_RECORD_ID, cmbReason.SelectedText, txtComment.Text, USER_USERNAME)
                         If ClassDatabase.Execute_non_Query(ins) = True Then
-                            Upd = String.Format("UPDATE TBPMO_RECORD SET RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}),CHANGED_WHO = '{1}' WHERE GUID = {2}", CURRENT_RECORD_ID, Environment.UserName, REC_ID)
+                            Upd = String.Format("UPDATE TBPMO_RECORD SET RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}),CHANGED_WHO = '{1}' WHERE GUID = {2}", CURRENT_RECORD_ID, USER_USERNAME, REC_ID)
                             If ClassDatabase.Execute_non_Query(Upd) = True Then
                                 CURRENT_RECORD_ID = REC_ID
                                 Me.DialogResult = System.Windows.Forms.DialogResult.OK

app/DD-Record-Organiser/frmQuickStart_Images.vb

@@ -98,7 +98,7 @@
         Try
             Dim column = e.Column.FieldName
             Dim id = gvMainView.GetFocusedRowCellValue(gvMainView.Columns("GUID"))
-            Dim sql = String.Format("UPDATE TBPMO_FORM_CONSTRUCTOR SET {0} = '{1}',CHANGED_WHO = '{2}',LANGUAGE = '{3}' where GUID = {4}", column, e.Value, Environment.UserName, USER_LANGUAGE, id)
+            Dim sql = String.Format("UPDATE TBPMO_FORM_CONSTRUCTOR SET {0} = '{1}',CHANGED_WHO = '{2}',LANGUAGE = '{3}' where GUID = {4}", column, e.Value, USER_USERNAME, USER_LANGUAGE, id)
             If ClassDatabase.Execute_non_Query(sql) = False Then
                 MsgBox("Update Value not successfull. Check logfile", MsgBoxStyle.Critical)
             End If

app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb

@@ -92,7 +92,7 @@ Public Class frmRecOrgConfig_Basic
                 cmd.Parameters.Add("@VERSION_DELIMITER", SqlDbType.Text).Value = txtDelimiterVersion.Text
                 cmd.Parameters.Add("@FILE_DELIMITER", SqlDbType.Text).Value = txtDelimiterFile.Text
                 cmd.Parameters.Add("@STRING1", SqlDbType.Text).Value = txtwddriveletter.Text
-                cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.Text).Value = Environment.UserName
+                cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.Text).Value = USER_USERNAME
                 cmd.Parameters.Add("@PRODUCT_NAME1", SqlDbType.Text).Value = txtProductName.Text
 
                 conn.Open()
@@ -110,7 +110,7 @@ Public Class frmRecOrgConfig_Basic
                 'If chkUnicode.Checked Then
                 '    wduni = 1
                 'End If
-                Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET WIKI_STRING = '{0}', CHANGED_WHO = '{1}', WD_UNICODE = {2} WHERE GUID = 1", Me.txtWiki.Text, Environment.UserName, wduni)
+                Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET WIKI_STRING = '{0}', CHANGED_WHO = '{1}', WD_UNICODE = {2} WHERE GUID = 1", Me.txtWiki.Text, USER_USERNAME, wduni)
 
                 If ClassDatabase.Execute_non_Query(upd, True) = True Then
                     lblSaveresult.Visible = True
@@ -126,7 +126,7 @@ Public Class frmRecOrgConfig_Basic
             Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text)
             Dim pw As String = cipherText
 
-            Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName)
+            Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, USER_USERNAME)
             ClassDatabase.Execute_non_Query(upd)
             btnsave.Enabled = False
 
@@ -161,7 +161,7 @@ Public Class frmRecOrgConfig_Basic
 
     Private Sub btnTest_Anmeldung_Click(sender As Object, e As EventArgs) Handles btnTest_Anmeldung.Click
         Try
-            DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName)
+            DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", USER_USERNAME)
             Dim session = DD_Rights.ClassRights.GetWMSessionAsUser(Me.txtDomäne.Text, Me.txtServername.Text, Me.txtUser.Text, Me.txtPW.Text)
             If Not IsNothing(session) Then
                 MsgBox("The persionalized connection to windream was created successfully!", MsgBoxStyle.Information)
@@ -169,7 +169,7 @@ Public Class frmRecOrgConfig_Basic
                 Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text)
                 Dim pw As String = cipherText
 
-                Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName)
+                Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, USER_USERNAME)
                 ClassDatabase.Execute_non_Query(upd)
                 btnsave.Enabled = False
             Else

app/DD-Record-Organiser/frmRecordView.vb

@@ -83,9 +83,9 @@ Public Class frmRecordView
             Dim value As String = item.Value
             Dim configId As Integer = item.ConfigID
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
-            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, Environment.UserName)
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, USER_USERNAME)
             ClassDatabase.Execute_non_Query(Sql)
         Catch ex As Exception
             MsgBox("Error:" & vbNewLine & ex.Message)
@@ -100,7 +100,7 @@ Public Class frmRecordView
             Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
             Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
             Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user)
@@ -117,7 +117,7 @@ Public Class frmRecordView
             Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
             Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
             Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-            Dim user As String = Environment.UserName
+            Dim user As String = USER_USERNAME
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
             ClassDatabase.Execute_non_Query(Sql)
@@ -187,7 +187,7 @@ Public Class frmRecordView
         Try
             'Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.Connection.ConnectionString = MyConnectionString
             Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName, JUMP_RECORD_ID)
+            Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME, JUMP_RECORD_ID)
             If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then
                 TabControlBottom.TabPages(1).Appearance.Header.BackColor = Color.Red
             Else
@@ -333,11 +333,11 @@ Public Class frmRecordView
             Dim upd
             If STATE_IDComboBox.SelectedIndex <> -1 Then
                 upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}', STATE_ID = {2}, ACTIVE = {3}, CHANGED_WHO = '{4}', TASK_DATE = '{5}' " & _
-                                   "WHERE GUID = {6}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, Environment.UserName, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
+                                   "WHERE GUID = {6}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
                 STATE_IDComboBox.SelectedIndex = -1
             Else
                 upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}', ACTIVE = {2}, CHANGED_WHO = '{3}', TASK_DATE = '{4}' " & _
-                                   "WHERE GUID = {5}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, 1, Environment.UserName, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
+                                   "WHERE GUID = {5}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, 1, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
                 STATE_IDComboBox.SelectedIndex = -1
             End If
             If ClassDatabase.Execute_non_Query(upd, True) Then
@@ -351,7 +351,7 @@ Public Class frmRecordView
             Else
                 MsgBox("Update not successfull. Please check logfile.", MsgBoxStyle.Exclamation)
             End If
-            '  Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, Environment.UserName, DateTimePicker1.Value, Me.GUIDTextBox.Text)
+            '  Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text)
         Catch ex As Exception
             MsgBox("Error in save Workflow:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -562,7 +562,7 @@ Public Class frmRecordView
                     If DropType.ToString.Contains("SCAN") = False Then
                         ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False)
                         Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1)
-                        Dim insert = String.Format("INSERT INTO TBPMO_FILES_USER(FILENAME2WORK, USER_WORK, HANDLE_TYPE) VALUES('{0}','{1}','{2}')", CURRENT_WORKFILE, Environment.UserName, DropType)
+                        Dim insert = String.Format("INSERT INTO TBPMO_FILES_USER(FILENAME2WORK, USER_WORK, HANDLE_TYPE) VALUES('{0}','{1}','{2}')", CURRENT_WORKFILE, USER_USERNAME, DropType)
                         If ClassDatabase.Execute_non_Query(insert) = False Then
                             Exit Sub
                         End If
@@ -572,7 +572,7 @@ Public Class frmRecordView
             Next
             Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
             If ClassDatabase.Execute_Scalar(sql, True) >= 1 Then
-                Dim sql1 = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", Environment.UserName)
+                Dim sql1 = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
                 Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1)
                 If Not IsNothing(DT) Then
                     If DT.Rows.Count > 0 Then
@@ -608,7 +608,7 @@ Public Class frmRecordView
                 Dim sql = "select count(*) from TBPMO_WORKFLOW_TASK_USER Where USER_ID = " & row.Item(5) & " AND WF_TASK_ID = " & WF_TASK_ID
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
                     '##
-                    Dim Ins = "Insert INTO TBPMO_WORKFLOW_TASK_USER (WF_TASK_ID,[USER_ID],ADDED_WHO) VALUES (" & WF_TASK_ID & ", " & row.Item(5) & ",'" & Environment.UserName & "')"
+                    Dim Ins = "Insert INTO TBPMO_WORKFLOW_TASK_USER (WF_TASK_ID,[USER_ID],ADDED_WHO) VALUES (" & WF_TASK_ID & ", " & row.Item(5) & ",'" & USER_USERNAME & "')"
                     If ClassDatabase.Execute_non_Query(Ins) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to Task", row.Item(1)), MsgBoxStyle.Critical)
                     Else
@@ -624,7 +624,7 @@ Public Class frmRecordView
     End Sub
     Sub Load_TASK_USER()
         Try
-            'Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE LOWER(USERNAME) = '" & Environment.UserName & "' AND WF_TASK_ID = " & Me.GUIDTextBox.Text
+            'Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE LOWER(USERNAME) = '" & USER_USERNAME & "' AND WF_TASK_ID = " & Me.GUIDTextBox.Text
             Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE WF_TASK_ID = " & WF_TASK_ID
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             Dim count As Integer = 0

app/DD-Record-Organiser/frmRight_Management.Designer.vb

@@ -25,7 +25,6 @@ Partial Class frmRight_Management
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRight_Management))
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.TBPMO_RIGHT_GROUPBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -64,9 +63,25 @@ Partial Class frmRight_Management
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colFORM_TITLE = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colUSERNAME = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colPRENAME = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colEDIT_REC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colADD_REC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colDELETE_REC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colADD_DOC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colREAD_ONLY_DOC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colDELETE_DOC = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.BindingNavigator2 = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.TBPMO_RIGHT_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.USER_RIGHTSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel()
         Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton()
@@ -79,7 +94,6 @@ Partial Class frmRight_Management
         Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
-        Me.TBPMO_RIGHT_USERDataGridView = New System.Windows.Forms.DataGridView()
         Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBWH_ENTITIESTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBWH_ENTITIESTableAdapter()
         Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
@@ -88,21 +102,9 @@ Partial Class frmRight_Management
         Me.TBDD_USER_GROUPSTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter()
         Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
         Me.TBPMO_RIGHT_GROUPTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_GROUPTableAdapter()
-        Me.TBPMO_RIGHT_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_USERTableAdapter()
         Me.TBDD_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter()
-        Me.FILES_VISIBLE = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.GUIDDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.USER_RIGHTSTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter()
-        Me.USERIDDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewComboBoxColumn()
-        Me.ENTITYIDDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewComboBoxColumn()
-        Me.EDITRECDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.ADDRECDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.DELETERECDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.ADDDOCDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.READONLYDOCDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.DELETEDOCDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.FILESVISIBLEDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.ADDEDWHENDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.CHANGEDWHENDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.BindingNavigator1.SuspendLayout()
         CType(Me.TBPMO_RIGHT_GROUPBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -115,12 +117,14 @@ Partial Class frmRight_Management
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.TabPage2.SuspendLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.BindingNavigator2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.BindingNavigator2.SuspendLayout()
-        CType(Me.TBPMO_RIGHT_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBPMO_RIGHT_USERDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'BindingNavigator1
@@ -426,8 +430,9 @@ Partial Class frmRight_Management
         'TabPage2
         '
         Me.TabPage2.AutoScroll = True
+        Me.TabPage2.Controls.Add(Me.GridControl1)
         Me.TabPage2.Controls.Add(Me.BindingNavigator2)
-        Me.TabPage2.Controls.Add(Me.TBPMO_RIGHT_USERDataGridView)
+        Me.TabPage2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
@@ -436,10 +441,153 @@ Partial Class frmRight_Management
         Me.TabPage2.Text = "Benutzer Rechte"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'GridControl1
+        '
+        Me.GridControl1.DataMember = "USER_RIGHTS"
+        Me.GridControl1.DataSource = Me.DD_ECMAdmin
+        Me.GridControl1.Location = New System.Drawing.Point(8, 43)
+        Me.GridControl1.MainView = Me.GridView1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.Size = New System.Drawing.Size(1039, 200)
+        Me.GridControl1.TabIndex = 2
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'GridView1
+        '
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colFORM_TITLE, Me.colUSERNAME, Me.colNAME, Me.colPRENAME, Me.colEDIT_REC, Me.colADD_REC, Me.colDELETE_REC, Me.colADD_DOC, Me.colREAD_ONLY_DOC, Me.colDELETE_DOC, Me.GridColumn1, Me.colADDED_WHEN, Me.colCHANGED_WHEN})
+        Me.GridView1.GridControl = Me.GridControl1
+        Me.GridView1.Name = "GridView1"
+        '
+        'colGUID
+        '
+        Me.colGUID.Caption = "GUID"
+        Me.colGUID.FieldName = "GUID"
+        Me.colGUID.Name = "colGUID"
+        Me.colGUID.Visible = True
+        Me.colGUID.VisibleIndex = 0
+        Me.colGUID.Width = 45
+        '
+        'colFORM_TITLE
+        '
+        Me.colFORM_TITLE.Caption = "Entity"
+        Me.colFORM_TITLE.FieldName = "FORM_TITLE"
+        Me.colFORM_TITLE.Name = "colFORM_TITLE"
+        Me.colFORM_TITLE.Visible = True
+        Me.colFORM_TITLE.VisibleIndex = 1
+        Me.colFORM_TITLE.Width = 153
+        '
+        'colUSERNAME
+        '
+        Me.colUSERNAME.Caption = "Username"
+        Me.colUSERNAME.FieldName = "USERNAME"
+        Me.colUSERNAME.Name = "colUSERNAME"
+        Me.colUSERNAME.Visible = True
+        Me.colUSERNAME.VisibleIndex = 2
+        Me.colUSERNAME.Width = 90
+        '
+        'colNAME
+        '
+        Me.colNAME.Caption = "Name"
+        Me.colNAME.FieldName = "NAME"
+        Me.colNAME.Name = "colNAME"
+        Me.colNAME.Visible = True
+        Me.colNAME.VisibleIndex = 3
+        Me.colNAME.Width = 91
+        '
+        'colPRENAME
+        '
+        Me.colPRENAME.Caption = "Prename"
+        Me.colPRENAME.FieldName = "PRENAME"
+        Me.colPRENAME.Name = "colPRENAME"
+        Me.colPRENAME.Visible = True
+        Me.colPRENAME.VisibleIndex = 4
+        Me.colPRENAME.Width = 60
+        '
+        'colEDIT_REC
+        '
+        Me.colEDIT_REC.Caption = "Edit record"
+        Me.colEDIT_REC.FieldName = "EDIT_REC"
+        Me.colEDIT_REC.Name = "colEDIT_REC"
+        Me.colEDIT_REC.Visible = True
+        Me.colEDIT_REC.VisibleIndex = 5
+        Me.colEDIT_REC.Width = 60
+        '
+        'colADD_REC
+        '
+        Me.colADD_REC.Caption = "Add record"
+        Me.colADD_REC.FieldName = "ADD_REC"
+        Me.colADD_REC.Name = "colADD_REC"
+        Me.colADD_REC.Visible = True
+        Me.colADD_REC.VisibleIndex = 6
+        Me.colADD_REC.Width = 60
+        '
+        'colDELETE_REC
+        '
+        Me.colDELETE_REC.Caption = "Delete record"
+        Me.colDELETE_REC.FieldName = "DELETE_REC"
+        Me.colDELETE_REC.Name = "colDELETE_REC"
+        Me.colDELETE_REC.Visible = True
+        Me.colDELETE_REC.VisibleIndex = 7
+        Me.colDELETE_REC.Width = 60
+        '
+        'colADD_DOC
+        '
+        Me.colADD_DOC.Caption = "Add doc"
+        Me.colADD_DOC.FieldName = "ADD_DOC"
+        Me.colADD_DOC.Name = "colADD_DOC"
+        Me.colADD_DOC.Visible = True
+        Me.colADD_DOC.VisibleIndex = 8
+        Me.colADD_DOC.Width = 60
+        '
+        'colREAD_ONLY_DOC
+        '
+        Me.colREAD_ONLY_DOC.Caption = "Read only doc"
+        Me.colREAD_ONLY_DOC.FieldName = "READ_ONLY_DOC"
+        Me.colREAD_ONLY_DOC.Name = "colREAD_ONLY_DOC"
+        Me.colREAD_ONLY_DOC.Visible = True
+        Me.colREAD_ONLY_DOC.VisibleIndex = 9
+        Me.colREAD_ONLY_DOC.Width = 60
+        '
+        'colDELETE_DOC
+        '
+        Me.colDELETE_DOC.Caption = "Delete doc"
+        Me.colDELETE_DOC.FieldName = "DELETE_DOC"
+        Me.colDELETE_DOC.Name = "colDELETE_DOC"
+        Me.colDELETE_DOC.Visible = True
+        Me.colDELETE_DOC.VisibleIndex = 10
+        Me.colDELETE_DOC.Width = 60
+        '
+        'GridColumn1
+        '
+        Me.GridColumn1.Caption = "Docs visible"
+        Me.GridColumn1.FieldName = "FILES_VISIBLE"
+        Me.GridColumn1.Name = "GridColumn1"
+        Me.GridColumn1.Visible = True
+        Me.GridColumn1.VisibleIndex = 11
+        Me.GridColumn1.Width = 60
+        '
+        'colADDED_WHEN
+        '
+        Me.colADDED_WHEN.Caption = "Added when"
+        Me.colADDED_WHEN.FieldName = "ADDED_WHEN"
+        Me.colADDED_WHEN.Name = "colADDED_WHEN"
+        Me.colADDED_WHEN.Visible = True
+        Me.colADDED_WHEN.VisibleIndex = 12
+        Me.colADDED_WHEN.Width = 60
+        '
+        'colCHANGED_WHEN
+        '
+        Me.colCHANGED_WHEN.Caption = "Changed when"
+        Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN"
+        Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN"
+        Me.colCHANGED_WHEN.Visible = True
+        Me.colCHANGED_WHEN.VisibleIndex = 13
+        Me.colCHANGED_WHEN.Width = 99
+        '
         'BindingNavigator2
         '
         Me.BindingNavigator2.AddNewItem = Me.BindingNavigatorAddNewItem1
-        Me.BindingNavigator2.BindingSource = Me.TBPMO_RIGHT_USERBindingSource
+        Me.BindingNavigator2.BindingSource = Me.USER_RIGHTSBindingSource
         Me.BindingNavigator2.CountItem = Me.BindingNavigatorCountItem1
         Me.BindingNavigator2.DeleteItem = Me.BindingNavigatorDeleteItem1
         Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.BindingNavigatorDeleteItem1, Me.ToolStripButton3, Me.ToolStripButton4})
@@ -463,10 +611,10 @@ Partial Class frmRight_Management
         Me.BindingNavigatorAddNewItem1.Size = New System.Drawing.Size(23, 22)
         Me.BindingNavigatorAddNewItem1.Text = "Neu hinzufügen"
         '
-        'TBPMO_RIGHT_USERBindingSource
+        'USER_RIGHTSBindingSource
         '
-        Me.TBPMO_RIGHT_USERBindingSource.DataMember = "TBPMO_RIGHT_USER"
+        Me.USER_RIGHTSBindingSource.DataSource = Me.DD_ECMAdmin
-        Me.TBPMO_RIGHT_USERBindingSource.DataSource = Me.DD_DMSDataSet
+        Me.USER_RIGHTSBindingSource.Position = 0
         '
         'BindingNavigatorCountItem1
         '
@@ -513,7 +661,7 @@ Partial Class frmRight_Management
         Me.BindingNavigatorPositionItem1.AutoSize = False
         Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem1"
         Me.BindingNavigatorPositionItem1.Size = New System.Drawing.Size(50, 23)
-        Me.BindingNavigatorPositionItem1.Text = "0"
+        Me.BindingNavigatorPositionItem1.Text = "1"
         Me.BindingNavigatorPositionItem1.ToolTipText = "Aktuelle Position"
         '
         'BindingNavigatorSeparator4
@@ -562,22 +710,6 @@ Partial Class frmRight_Management
         Me.ToolStripButton4.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton4.Text = "ToolStripButton4"
         '
-        'TBPMO_RIGHT_USERDataGridView
-        '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Lime
-        Me.TBPMO_RIGHT_USERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
-        Me.TBPMO_RIGHT_USERDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TBPMO_RIGHT_USERDataGridView.AutoGenerateColumns = False
-        Me.TBPMO_RIGHT_USERDataGridView.ColumnHeadersHeight = 34
-        Me.TBPMO_RIGHT_USERDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.FILES_VISIBLE, Me.GUIDDataGridViewTextBoxColumn, Me.USERIDDataGridViewTextBoxColumn, Me.ENTITYIDDataGridViewTextBoxColumn, Me.EDITRECDataGridViewCheckBoxColumn, Me.ADDRECDataGridViewCheckBoxColumn, Me.DELETERECDataGridViewCheckBoxColumn, Me.ADDDOCDataGridViewCheckBoxColumn, Me.READONLYDOCDataGridViewCheckBoxColumn, Me.DELETEDOCDataGridViewCheckBoxColumn, Me.FILESVISIBLEDataGridViewCheckBoxColumn, Me.ADDEDWHENDataGridViewTextBoxColumn, Me.CHANGEDWHENDataGridViewTextBoxColumn})
-        Me.TBPMO_RIGHT_USERDataGridView.DataSource = Me.TBPMO_RIGHT_USERBindingSource
-        Me.TBPMO_RIGHT_USERDataGridView.Location = New System.Drawing.Point(3, 31)
-        Me.TBPMO_RIGHT_USERDataGridView.Name = "TBPMO_RIGHT_USERDataGridView"
-        Me.TBPMO_RIGHT_USERDataGridView.Size = New System.Drawing.Size(1255, 509)
-        Me.TBPMO_RIGHT_USERDataGridView.TabIndex = 0
-        '
         'TBDD_USERBindingSource
         '
         Me.TBDD_USERBindingSource.DataMember = "TBDD_USER"
@@ -656,102 +788,18 @@ Partial Class frmRight_Management
         '
         Me.TBPMO_RIGHT_GROUPTableAdapter.ClearBeforeFill = True
         '
-        'TBPMO_RIGHT_USERTableAdapter
-        '
-        Me.TBPMO_RIGHT_USERTableAdapter.ClearBeforeFill = True
-        '
         'TBDD_USERTableAdapter
         '
         Me.TBDD_USERTableAdapter.ClearBeforeFill = True
         '
-        'FILES_VISIBLE
+        'TBAD_UsersBindingSource
         '
-        Me.FILES_VISIBLE.DataPropertyName = "FILES_VISIBLE"
+        Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users"
-        Me.FILES_VISIBLE.HeaderText = "FILES_VISIBLE"
+        Me.TBAD_UsersBindingSource.DataSource = Me.DD_ECMAdmin
-        Me.FILES_VISIBLE.Name = "FILES_VISIBLE"
         '
-        'GUIDDataGridViewTextBoxColumn
+        'USER_RIGHTSTableAdapter
         '
-        Me.GUIDDataGridViewTextBoxColumn.DataPropertyName = "GUID"
+        Me.USER_RIGHTSTableAdapter.ClearBeforeFill = True
-        Me.GUIDDataGridViewTextBoxColumn.HeaderText = "GUID"
-        Me.GUIDDataGridViewTextBoxColumn.Name = "GUIDDataGridViewTextBoxColumn"
-        Me.GUIDDataGridViewTextBoxColumn.ReadOnly = True
-        '
-        'USERIDDataGridViewTextBoxColumn
-        '
-        Me.USERIDDataGridViewTextBoxColumn.DataPropertyName = "USER_ID"
-        Me.USERIDDataGridViewTextBoxColumn.DataSource = Me.TBDD_USERBindingSource
-        Me.USERIDDataGridViewTextBoxColumn.DisplayMember = "USERNAME"
-        Me.USERIDDataGridViewTextBoxColumn.HeaderText = "Benutzer"
-        Me.USERIDDataGridViewTextBoxColumn.Name = "USERIDDataGridViewTextBoxColumn"
-        Me.USERIDDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.USERIDDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
-        Me.USERIDDataGridViewTextBoxColumn.ValueMember = "GUID"
-        '
-        'ENTITYIDDataGridViewTextBoxColumn
-        '
-        Me.ENTITYIDDataGridViewTextBoxColumn.DataPropertyName = "ENTITY_ID"
-        Me.ENTITYIDDataGridViewTextBoxColumn.DataSource = Me.TBWH_ENTITIESBindingSource
-        Me.ENTITYIDDataGridViewTextBoxColumn.DisplayMember = "FORM_TITLE"
-        Me.ENTITYIDDataGridViewTextBoxColumn.HeaderText = "Entität"
-        Me.ENTITYIDDataGridViewTextBoxColumn.Name = "ENTITYIDDataGridViewTextBoxColumn"
-        Me.ENTITYIDDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.ENTITYIDDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
-        Me.ENTITYIDDataGridViewTextBoxColumn.ValueMember = "GUID"
-        '
-        'EDITRECDataGridViewCheckBoxColumn
-        '
-        Me.EDITRECDataGridViewCheckBoxColumn.DataPropertyName = "EDIT_REC"
-        Me.EDITRECDataGridViewCheckBoxColumn.HeaderText = "Edit Record"
-        Me.EDITRECDataGridViewCheckBoxColumn.Name = "EDITRECDataGridViewCheckBoxColumn"
-        '
-        'ADDRECDataGridViewCheckBoxColumn
-        '
-        Me.ADDRECDataGridViewCheckBoxColumn.DataPropertyName = "ADD_REC"
-        Me.ADDRECDataGridViewCheckBoxColumn.HeaderText = "Add Record"
-        Me.ADDRECDataGridViewCheckBoxColumn.Name = "ADDRECDataGridViewCheckBoxColumn"
-        '
-        'DELETERECDataGridViewCheckBoxColumn
-        '
-        Me.DELETERECDataGridViewCheckBoxColumn.DataPropertyName = "DELETE_REC"
-        Me.DELETERECDataGridViewCheckBoxColumn.HeaderText = "Delete Record"
-        Me.DELETERECDataGridViewCheckBoxColumn.Name = "DELETERECDataGridViewCheckBoxColumn"
-        '
-        'ADDDOCDataGridViewCheckBoxColumn
-        '
-        Me.ADDDOCDataGridViewCheckBoxColumn.DataPropertyName = "ADD_DOC"
-        Me.ADDDOCDataGridViewCheckBoxColumn.HeaderText = "Add Doc"
-        Me.ADDDOCDataGridViewCheckBoxColumn.Name = "ADDDOCDataGridViewCheckBoxColumn"
-        '
-        'READONLYDOCDataGridViewCheckBoxColumn
-        '
-        Me.READONLYDOCDataGridViewCheckBoxColumn.DataPropertyName = "READ_ONLY_DOC"
-        Me.READONLYDOCDataGridViewCheckBoxColumn.HeaderText = "View Doc"
-        Me.READONLYDOCDataGridViewCheckBoxColumn.Name = "READONLYDOCDataGridViewCheckBoxColumn"
-        '
-        'DELETEDOCDataGridViewCheckBoxColumn
-        '
-        Me.DELETEDOCDataGridViewCheckBoxColumn.DataPropertyName = "DELETE_DOC"
-        Me.DELETEDOCDataGridViewCheckBoxColumn.HeaderText = "Delete Doc"
-        Me.DELETEDOCDataGridViewCheckBoxColumn.Name = "DELETEDOCDataGridViewCheckBoxColumn"
-        '
-        'FILESVISIBLEDataGridViewCheckBoxColumn
-        '
-        Me.FILESVISIBLEDataGridViewCheckBoxColumn.DataPropertyName = "FILES_VISIBLE"
-        Me.FILESVISIBLEDataGridViewCheckBoxColumn.HeaderText = "View Docs"
-        Me.FILESVISIBLEDataGridViewCheckBoxColumn.Name = "FILESVISIBLEDataGridViewCheckBoxColumn"
-        '
-        'ADDEDWHENDataGridViewTextBoxColumn
-        '
-        Me.ADDEDWHENDataGridViewTextBoxColumn.DataPropertyName = "ADDED_WHEN"
-        Me.ADDEDWHENDataGridViewTextBoxColumn.HeaderText = "ADDED_WHEN"
-        Me.ADDEDWHENDataGridViewTextBoxColumn.Name = "ADDEDWHENDataGridViewTextBoxColumn"
-        '
-        'CHANGEDWHENDataGridViewTextBoxColumn
-        '
-        Me.CHANGEDWHENDataGridViewTextBoxColumn.DataPropertyName = "CHANGED_WHEN"
-        Me.CHANGEDWHENDataGridViewTextBoxColumn.HeaderText = "CHANGED_WHEN"
-        Me.CHANGEDWHENDataGridViewTextBoxColumn.Name = "CHANGEDWHENDataGridViewTextBoxColumn"
         '
         'frmRight_Management
         '
@@ -780,17 +828,19 @@ Partial Class frmRight_Management
         Me.TabPage1.PerformLayout()
         Me.TabPage2.ResumeLayout(False)
         Me.TabPage2.PerformLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.BindingNavigator2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.BindingNavigator2.ResumeLayout(False)
         Me.BindingNavigator2.PerformLayout()
-        CType(Me.TBPMO_RIGHT_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBPMO_RIGHT_USERDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
-        Me.PerformLayout()
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents DD_DMSDataSet As DD_Record_Organiser.DD_DMSDataSet
     Friend WithEvents TBDD_USER_GROUPSBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBDD_USER_GROUPSTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter
@@ -836,8 +886,6 @@ Partial Class frmRight_Management
     Friend WithEvents DataGridViewTextBoxColumn5 As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents DataGridViewTextBoxColumn6 As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents DataGridViewTextBoxColumn7 As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents TBPMO_RIGHT_USERBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents TBPMO_RIGHT_USERTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_USERTableAdapter
     Friend WithEvents BindingNavigator2 As System.Windows.Forms.BindingNavigator
     Friend WithEvents BindingNavigatorAddNewItem1 As System.Windows.Forms.ToolStripButton
     Friend WithEvents BindingNavigatorCountItem1 As System.Windows.Forms.ToolStripLabel
@@ -850,23 +898,28 @@ Partial Class frmRight_Management
     Friend WithEvents BindingNavigatorMoveNextItem1 As System.Windows.Forms.ToolStripButton
     Friend WithEvents BindingNavigatorMoveLastItem1 As System.Windows.Forms.ToolStripButton
     Friend WithEvents BindingNavigatorSeparator5 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents TBPMO_RIGHT_USERDataGridView As System.Windows.Forms.DataGridView
     Friend WithEvents TBDD_USERBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBDD_USERTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter
     Friend WithEvents ToolStripButton3 As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton4 As System.Windows.Forms.ToolStripButton
     Friend WithEvents colFILES_VISIBLE As System.Windows.Forms.DataGridViewCheckBoxColumn
-    Friend WithEvents FILES_VISIBLE As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents TBAD_UsersBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents GUIDDataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents USER_RIGHTSBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents USERIDDataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewComboBoxColumn
+    Friend WithEvents USER_RIGHTSTableAdapter As DD_Record_Organiser.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter
-    Friend WithEvents ENTITYIDDataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewComboBoxColumn
+    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
-    Friend WithEvents EDITRECDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents ADDRECDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents DELETERECDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colFORM_TITLE As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents ADDDOCDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colUSERNAME As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents READONLYDOCDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents DELETEDOCDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colPRENAME As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents FILESVISIBLEDataGridViewCheckBoxColumn As System.Windows.Forms.DataGridViewCheckBoxColumn
+    Friend WithEvents colEDIT_REC As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents ADDEDWHENDataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents colADD_REC As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents CHANGEDWHENDataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents colDELETE_REC As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colADD_DOC As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colREAD_ONLY_DOC As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colDELETE_DOC As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colCHANGED_WHEN As DevExpress.XtraGrid.Columns.GridColumn
 End Class

app/DD-Record-Organiser/frmRight_Management.resx

@@ -218,8 +218,8 @@
         rkJggg==
 </value>
   </data>
-  <metadata name="TBPMO_RIGHT_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="USER_RIGHTSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>134, 95</value>
+    <value>17, 134</value>
   </metadata>
   <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -273,9 +273,6 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="FILES_VISIBLE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>772, 95</value>
   </metadata>
@@ -300,12 +297,15 @@
   <metadata name="TBPMO_RIGHT_GROUPTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1079, 17</value>
   </metadata>
-  <metadata name="TBPMO_RIGHT_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>379, 95</value>
-  </metadata>
   <metadata name="TBDD_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>967, 95</value>
   </metadata>
+  <metadata name="TBAD_UsersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1156, 95</value>
+  </metadata>
+  <metadata name="USER_RIGHTSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>222, 134</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>166</value>
   </metadata>

app/DD-Record-Organiser/frmRight_Management.vb

@@ -12,12 +12,12 @@
     Private Sub Save_User_Rights_Data()
         Try
             Me.Validate()
-            Me.TBPMO_RIGHT_USERBindingSource.EndEdit()
+            'Me.TBPMO_RIGHT_USERBindingSource.EndEdit()
 
             If DD_DMSDataSet.TBPMO_RIGHT_USER.GetChanges() Is Nothing = False Then
-                'Me.TBPMO_RIGHT_USERDataGridView.CurrentRow.Cells("colADDED_WHO").Value = Environment.UserName
+                'Me.TBPMO_RIGHT_USERDataGridView.CurrentRow.Cells("colADDED_WHO").Value = USER_USERNAME
-                Me.TBPMO_RIGHT_USERBindingSource.EndEdit()
+                'Me.TBPMO_RIGHT_USERBindingSource.EndEdit()
-                Me.TBPMO_RIGHT_USERTableAdapter.Update(DD_DMSDataSet.TBPMO_RIGHT_USER)
+                'Me.TBPMO_RIGHT_USERTableAdapter.Update(DD_DMSDataSet.TBPMO_RIGHT_USER)
                 tschangedlabel.Text = "Right User changed - " & Now
                 tschangedlabel.Visible = True
             Else
@@ -35,7 +35,7 @@
             Me.TBPMO_RIGHT_GROUPBindingSource.EndEdit()
 
             If DD_DMSDataSet.TBPMO_RIGHT_GROUP.GetChanges Is Nothing = False Then
-                Me.TBPMO_RIGHT_GROUPDataGridView.CurrentRow.Cells("DataGridViewTextBoxColumn6").Value = Environment.UserName
+                Me.TBPMO_RIGHT_GROUPDataGridView.CurrentRow.Cells("DataGridViewTextBoxColumn6").Value = USER_USERNAME
                 Me.TBPMO_RIGHT_GROUPBindingSource.EndEdit()
                 Me.TBPMO_RIGHT_GROUPTableAdapter.Update(DD_DMSDataSet.TBPMO_RIGHT_GROUP)
                 tschangedlabel.Text = "Right Group changed - " & Now
@@ -80,7 +80,7 @@
 
     Private Sub frmRight_Management_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         Save_Datagrid(TBPMO_RIGHT_GROUPDataGridView, "TBPMO_RIGHT_GROUPDataGridView")
-        Save_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView")
+        'Save_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView")
     End Sub
     Private Sub frmGroup_Rights_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Refresh_Entities()
@@ -89,25 +89,24 @@
             Me.TBWH_USER_GROUPSTableAdapter.Fill(Me.DD_ECMAdmin.TBWH_USER_GROUPS)
             Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_USER_GROUPSTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER_GROUPS)
-            Me.TBPMO_RIGHT_USERTableAdapter.Connection.ConnectionString = MyConnectionString
+          
-            Me.TBPMO_RIGHT_USERTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_RIGHT_USER)
             Me.TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_USERTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER)
         Catch ex As Exception
             MsgBox("Error in Loading Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
         Refresh_Rights_Groups()
-        Refresh_Rights_Users()
+
         Load_Datagrid(TBPMO_RIGHT_GROUPDataGridView, "TBPMO_RIGHT_GROUPDataGridView")
-        Load_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView")
+        'Load_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView")
     End Sub
 
     Sub Refresh_Rights_Users()
         Try
-            Me.TBPMO_RIGHT_USERTableAdapter.Connection.ConnectionString = MyConnectionString
+            USER_RIGHTSTableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPMO_RIGHT_USERTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_RIGHT_USER)
+            Me.USER_RIGHTSTableAdapter.Fill(Me.DD_ECMAdmin.USER_RIGHTS, USER_LANGUAGE)
         Catch ex As Exception
-            MsgBox("Error in Refresh_Users_Groups:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            MsgBox("Error loading users:" & vbNewLine & ex.Message)
         End Try
     End Sub
 
@@ -129,14 +128,14 @@
     End Sub
 
     Private Sub TBPMO_RIGHT_GROUPBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_RIGHT_GROUPBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBPMO_RIGHT_GROUP.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBPMO_RIGHT_GROUP.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
         Save_Group_Rights_Data()
     End Sub
 
-    Private Sub TBPMO_RIGHT_GROUPBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_RIGHT_GROUPBindingSource.CurrentChanged, TBPMO_RIGHT_USERBindingSource.CurrentChanged
+    Private Sub TBPMO_RIGHT_GROUPBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_RIGHT_GROUPBindingSource.CurrentChanged
         tschangedlabel.Visible = False
     End Sub
 
@@ -151,4 +150,11 @@
     Private Sub ToolStripButton4_Click(sender As Object, e As EventArgs) Handles ToolStripButton4.Click
         Refresh_Rights_Users()
     End Sub
+
+    Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
+        Select Case TabControl1.SelectedIndex
+            Case 1
+                Refresh_Rights_Users()
+        End Select
+    End Sub
 End Class

app/DD-Record-Organiser/frmSAP_FuBa.vb

@@ -7,7 +7,7 @@ Public Class frmSAP_FuBa
         Try
             Me.TBPMO_SAP_FUBABindingSource.EndEdit()
             If DD_ECMAdmin.TBPMO_SAP_FUBA.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_SAP_FUBABindingSource.EndEdit()
                 Me.TBPMO_SAP_FUBATableAdapter.Update(DD_ECMAdmin.TBPMO_SAP_FUBA)
                 lblSave.Visible = True
@@ -91,7 +91,7 @@ Public Class frmSAP_FuBa
     End Sub
 
     Private Sub TBPMO_SAP_FUBABindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_SAP_FUBABindingSource.AddingNew
-        DD_ECMAdmin.TBPMO_SAP_FUBA.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_ECMAdmin.TBPMO_SAP_FUBA.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub TBPMO_SAP_FUBABindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_SAP_FUBABindingSource.CurrentChanged

app/DD-Record-Organiser/frmSQLEditor.vb

@@ -314,7 +314,7 @@ Public Class frmSQLEditor
             If txtValue.Text.Contains("'") Then
                 sql_comamnd = txtValue.Text.Replace("'", "''")
             End If
-            Dim upd As String = "UPDATE TBPMO_CONTROL SET SQL_COMMAND_1 = '" & sql_comamnd & "', CONNECTION_ID_1 = " & cmbConnection.SelectedValue & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_CONTROL_ID
+            Dim upd As String = "UPDATE TBPMO_CONTROL SET SQL_COMMAND_1 = '" & sql_comamnd & "', CONNECTION_ID_1 = " & cmbConnection.SelectedValue & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE GUID = " & CURRENT_CONTROL_ID
             If ClassDatabase.Execute_non_Query(upd, True) Then
                 MsgBox("SQL-Befehl erfolgreich gespeichert!", MsgBoxStyle.Exclamation)
             End If

app/DD-Record-Organiser/frmScanFiles.vb

@@ -21,7 +21,7 @@ Public Class frmScanFiles
     End Sub
     Sub Load_Files()
         Try
-            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName)
+            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", USER_USERNAME)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles")
             If Not IsNothing(DT) Then
                 CURRENT_SCAN_TABLE = DT

app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb

@@ -24,17 +24,6 @@ Partial Class frmSearchAllOVer
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSearchAllOVer))
-        Me.ToolStripMain = New System.Windows.Forms.ToolStrip()
-        Me.tsbtnRefresh = New System.Windows.Forms.ToolStripButton()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.rbSearchRecord = New System.Windows.Forms.RadioButton()
-        Me.rbSearchFulltext = New System.Windows.Forms.RadioButton()
-        Me.rbSearchCombined = New System.Windows.Forms.RadioButton()
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.txtSearch = New System.Windows.Forms.TextBox()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
         Me.GridControlRecords = New DevExpress.XtraGrid.GridControl()
         Me.cmsRecords = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -51,9 +40,17 @@ Partial Class frmSearchAllOVer
         Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
         Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripMain.SuspendLayout()
+        Me.ToolStripMain = New System.Windows.Forms.ToolStrip()
-        Me.Panel1.SuspendLayout()
+        Me.tsbtnRefresh = New System.Windows.Forms.ToolStripButton()
-        Me.GroupBox1.SuspendLayout()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.rbSearchRecord = New System.Windows.Forms.RadioButton()
+        Me.rbSearchFulltext = New System.Windows.Forms.RadioButton()
+        Me.rbSearchCombined = New System.Windows.Forms.RadioButton()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.txtSearch = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -63,172 +60,71 @@ Partial Class frmSearchAllOVer
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStripDokumente.SuspendLayout()
+        Me.ToolStripMain.SuspendLayout()
+        Me.Panel1.SuspendLayout()
+        Me.GroupBox1.SuspendLayout()
         Me.SuspendLayout()
         '
-        'ToolStripMain
-        '
-        Me.ToolStripMain.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.ToolStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnRefresh})
-        Me.ToolStripMain.Location = New System.Drawing.Point(0, 92)
-        Me.ToolStripMain.Name = "ToolStripMain"
-        Me.ToolStripMain.Size = New System.Drawing.Size(1340, 25)
-        Me.ToolStripMain.TabIndex = 1
-        Me.ToolStripMain.Text = "ToolStrip1"
-        '
-        'tsbtnRefresh
-        '
-        Me.tsbtnRefresh.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
-        Me.tsbtnRefresh.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnRefresh.Name = "tsbtnRefresh"
-        Me.tsbtnRefresh.Size = New System.Drawing.Size(92, 22)
-        Me.tsbtnRefresh.Text = "Starte Suche"
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(12, 11)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(504, 13)
-        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "In diesem Formular können Sie systemweit (in Sichten und/oder Dateien) nach Vollt" & _
-    "extbegriffen suchen."
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(703, 112)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(38, 13)
-        Me.Label3.TabIndex = 3
-        Me.Label3.Text = "Label3"
-        '
-        'rbSearchRecord
-        '
-        Me.rbSearchRecord.AutoSize = True
-        Me.rbSearchRecord.Location = New System.Drawing.Point(423, 20)
-        Me.rbSearchRecord.Name = "rbSearchRecord"
-        Me.rbSearchRecord.Size = New System.Drawing.Size(183, 17)
-        Me.rbSearchRecord.TabIndex = 1
-        Me.rbSearchRecord.Text = "Nur in ADDI-Datensätzen suchen"
-        Me.rbSearchRecord.UseVisualStyleBackColor = True
-        '
-        'rbSearchFulltext
-        '
-        Me.rbSearchFulltext.AutoSize = True
-        Me.rbSearchFulltext.Location = New System.Drawing.Point(423, 43)
-        Me.rbSearchFulltext.Name = "rbSearchFulltext"
-        Me.rbSearchFulltext.Size = New System.Drawing.Size(188, 17)
-        Me.rbSearchFulltext.TabIndex = 2
-        Me.rbSearchFulltext.Text = "Nur in Volltext der Dateien suchen"
-        Me.rbSearchFulltext.UseVisualStyleBackColor = True
-        '
-        'rbSearchCombined
-        '
-        Me.rbSearchCombined.AutoSize = True
-        Me.rbSearchCombined.Checked = True
-        Me.rbSearchCombined.Location = New System.Drawing.Point(12, 20)
-        Me.rbSearchCombined.Name = "rbSearchCombined"
-        Me.rbSearchCombined.Size = New System.Drawing.Size(405, 17)
-        Me.rbSearchCombined.TabIndex = 0
-        Me.rbSearchCombined.TabStop = True
-        Me.rbSearchCombined.Text = "Kombinierte Suche (ADDI-Datensätzen und Dateien - wenn Volltext vorhanden)"
-        Me.rbSearchCombined.UseVisualStyleBackColor = True
-        '
-        '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)
-        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel1.Location = New System.Drawing.Point(0, 0)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1340, 117)
-        Me.Panel1.TabIndex = 7
-        '
-        'txtSearch
-        '
-        Me.txtSearch.Location = New System.Drawing.Point(15, 50)
-        Me.txtSearch.Name = "txtSearch"
-        Me.txtSearch.Size = New System.Drawing.Size(501, 21)
-        Me.txtSearch.TabIndex = 0
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(15, 31)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(66, 13)
-        Me.Label2.TabIndex = 8
-        Me.Label2.Text = "Suchbegriff:"
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.rbSearchRecord)
-        Me.GroupBox1.Controls.Add(Me.rbSearchFulltext)
-        Me.GroupBox1.Controls.Add(Me.rbSearchCombined)
-        Me.GroupBox1.Location = New System.Drawing.Point(538, 31)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(765, 78)
-        Me.GroupBox1.TabIndex = 7
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Bitte definieren Sie eine Suchvariante:"
-        '
         'SplitContainerMain
         '
+        resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain")
         Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
-        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 117)
         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)
-        Me.SplitContainerMain.Panel1.Text = "Panel1"
+        resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
         Me.SplitContainerMain.Panel2.Controls.Add(Me.GridControlFiles)
         Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStripDokumente)
-        Me.SplitContainerMain.Panel2.Text = "Panel2"
+        Me.SplitContainerMain.SplitterPosition = 751
-        Me.SplitContainerMain.Size = New System.Drawing.Size(1340, 430)
-        Me.SplitContainerMain.SplitterPosition = 692
-        Me.SplitContainerMain.TabIndex = 8
-        Me.SplitContainerMain.Text = "SplitContainerControl1"
         '
         'GridControlRecords
         '
+        resources.ApplyResources(Me.GridControlRecords, "GridControlRecords")
         Me.GridControlRecords.ContextMenuStrip = Me.cmsRecords
-        Me.GridControlRecords.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.GridControlRecords.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlRecords.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlRecords.Location = New System.Drawing.Point(0, 25)
+        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")
         Me.GridControlRecords.MainView = Me.GridViewRecords
         Me.GridControlRecords.Name = "GridControlRecords"
-        Me.GridControlRecords.Size = New System.Drawing.Size(692, 405)
-        Me.GridControlRecords.TabIndex = 0
         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"
-        Me.cmsRecords.Size = New System.Drawing.Size(144, 48)
         '
         'ExportExcelToolStripMenuItem
         '
+        resources.ApplyResources(Me.ExportExcelToolStripMenuItem, "ExportExcelToolStripMenuItem")
         Me.ExportExcelToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Excel_25ixel
         Me.ExportExcelToolStripMenuItem.Name = "ExportExcelToolStripMenuItem"
-        Me.ExportExcelToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
-        Me.ExportExcelToolStripMenuItem.Text = "Export Excel"
         '
         'ShowRecordToolStripMenuItem
         '
+        resources.ApplyResources(Me.ShowRecordToolStripMenuItem, "ShowRecordToolStripMenuItem")
         Me.ShowRecordToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.application_view_detail
         Me.ShowRecordToolStripMenuItem.Name = "ShowRecordToolStripMenuItem"
-        Me.ShowRecordToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
-        Me.ShowRecordToolStripMenuItem.Text = "Show Record"
         '
         'GridViewRecords
         '
-        Me.GridViewRecords.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua
+        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]
@@ -245,54 +141,60 @@ Partial Class frmSearchAllOVer
         '
         'ToolStripRecords
         '
+        resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords")
         Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.tsbtnviewDetail})
-        Me.ToolStripRecords.Location = New System.Drawing.Point(0, 0)
         Me.ToolStripRecords.Name = "ToolStripRecords"
-        Me.ToolStripRecords.Size = New System.Drawing.Size(692, 25)
-        Me.ToolStripRecords.TabIndex = 0
-        Me.ToolStripRecords.Text = "ToolStrip2"
         '
         'tslblRecordsResult
         '
+        resources.ApplyResources(Me.tslblRecordsResult, "tslblRecordsResult")
         Me.tslblRecordsResult.Name = "tslblRecordsResult"
-        Me.tslblRecordsResult.Size = New System.Drawing.Size(93, 22)
-        Me.tslblRecordsResult.Text = "0 Records found"
         '
         'ToolStripSeparator1
         '
+        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton1
         '
+        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
         Me.ToolStripButton1.Image = Global.DD_Record_Organiser.My.Resources.Resources.Excel_25ixel
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(60, 22)
-        Me.ToolStripButton1.Text = "Export"
         '
         'tsbtnviewDetail
         '
+        resources.ApplyResources(Me.tsbtnviewDetail, "tsbtnviewDetail")
         Me.tsbtnviewDetail.Image = Global.DD_Record_Organiser.My.Resources.Resources.application_view_detail
-        Me.tsbtnviewDetail.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnviewDetail.Name = "tsbtnviewDetail"
-        Me.tsbtnviewDetail.Size = New System.Drawing.Size(95, 22)
-        Me.tsbtnviewDetail.Text = "Detailansicht"
         '
         'GridControlFiles
         '
-        Me.GridControlFiles.Dock = System.Windows.Forms.DockStyle.Fill
+        resources.ApplyResources(Me.GridControlFiles, "GridControlFiles")
-        Me.GridControlFiles.Location = New System.Drawing.Point(0, 25)
+        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.Size = New System.Drawing.Size(636, 405)
-        Me.GridControlFiles.TabIndex = 4
         Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
         '
         'GridViewFiles
         '
-        Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange
+        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]
@@ -309,49 +211,103 @@ Partial Class frmSearchAllOVer
         '
         'ToolStripDokumente
         '
+        resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente")
         Me.ToolStripDokumente.AllowDrop = True
-        Me.ToolStripDokumente.Font = New System.Drawing.Font("Tahoma", 9.0!)
         Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView, Me.ToolStripButton2})
-        Me.ToolStripDokumente.Location = New System.Drawing.Point(0, 0)
         Me.ToolStripDokumente.Name = "ToolStripDokumente"
-        Me.ToolStripDokumente.Size = New System.Drawing.Size(636, 25)
-        Me.ToolStripDokumente.TabIndex = 3
-        Me.ToolStripDokumente.Text = "ToolStrip2"
         '
         'tslblDocView
         '
-        Me.tslblDocView.Font = New System.Drawing.Font("Segoe UI", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle))
+        resources.ApplyResources(Me.tslblDocView, "tslblDocView")
         Me.tslblDocView.Name = "tslblDocView"
-        Me.tslblDocView.Size = New System.Drawing.Size(126, 22)
-        Me.tslblDocView.Text = "Windream-Dokumente"
         '
         'ToolStripButton2
         '
+        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
         Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripButton2.Image = Global.DD_Record_Organiser.My.Resources.Resources.Excel_25ixel
-        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(63, 22)
+        '
-        Me.ToolStripButton2.Text = "Export"
+        'ToolStripMain
+        '
+        resources.ApplyResources(Me.ToolStripMain, "ToolStripMain")
+        Me.ToolStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnRefresh})
+        Me.ToolStripMain.Name = "ToolStripMain"
+        '
+        'tsbtnRefresh
+        '
+        resources.ApplyResources(Me.tsbtnRefresh, "tsbtnRefresh")
+        Me.tsbtnRefresh.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
+        Me.tsbtnRefresh.Name = "tsbtnRefresh"
+        '
+        'Label1
+        '
+        resources.ApplyResources(Me.Label1, "Label1")
+        Me.Label1.Name = "Label1"
+        '
+        'Label3
+        '
+        resources.ApplyResources(Me.Label3, "Label3")
+        Me.Label3.Name = "Label3"
+        '
+        'rbSearchRecord
+        '
+        resources.ApplyResources(Me.rbSearchRecord, "rbSearchRecord")
+        Me.rbSearchRecord.Name = "rbSearchRecord"
+        Me.rbSearchRecord.UseVisualStyleBackColor = True
+        '
+        'rbSearchFulltext
+        '
+        resources.ApplyResources(Me.rbSearchFulltext, "rbSearchFulltext")
+        Me.rbSearchFulltext.Name = "rbSearchFulltext"
+        Me.rbSearchFulltext.UseVisualStyleBackColor = True
+        '
+        'rbSearchCombined
+        '
+        resources.ApplyResources(Me.rbSearchCombined, "rbSearchCombined")
+        Me.rbSearchCombined.Checked = True
+        Me.rbSearchCombined.Name = "rbSearchCombined"
+        Me.rbSearchCombined.TabStop = True
+        Me.rbSearchCombined.UseVisualStyleBackColor = True
+        '
+        '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)
+        Me.Panel1.Name = "Panel1"
+        '
+        'txtSearch
+        '
+        resources.ApplyResources(Me.txtSearch, "txtSearch")
+        Me.txtSearch.Name = "txtSearch"
+        '
+        'Label2
+        '
+        resources.ApplyResources(Me.Label2, "Label2")
+        Me.Label2.Name = "Label2"
+        '
+        'GroupBox1
+        '
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
+        Me.GroupBox1.Controls.Add(Me.rbSearchRecord)
+        Me.GroupBox1.Controls.Add(Me.rbSearchFulltext)
+        Me.GroupBox1.Controls.Add(Me.rbSearchCombined)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.TabStop = False
         '
         'frmSearchAllOVer
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1340, 547)
         Me.Controls.Add(Me.SplitContainerMain)
         Me.Controls.Add(Me.Panel1)
-        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.KeyPreview = True
         Me.Name = "frmSearchAllOVer"
-        Me.Text = "Search all over"
-        Me.ToolStripMain.ResumeLayout(False)
-        Me.ToolStripMain.PerformLayout()
-        Me.Panel1.ResumeLayout(False)
-        Me.Panel1.PerformLayout()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerMain.ResumeLayout(False)
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit()
@@ -363,6 +319,12 @@ Partial Class frmSearchAllOVer
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ToolStripDokumente.ResumeLayout(False)
         Me.ToolStripDokumente.PerformLayout()
+        Me.ToolStripMain.ResumeLayout(False)
+        Me.ToolStripMain.PerformLayout()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub

app/DD-Record-Organiser/frmSearchAllOVer.resx

@@ -117,19 +117,162 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ToolStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <value>17, 17</value>
+  <data name="rbSearchCombined.TabIndex" type="System.Int32, mscorlib">
-  </metadata>
+    <value>0</value>
-  <metadata name="cmsRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
-    <value>454, 17</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  </metadata>
+  <data name="GridControlRecords.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-  <metadata name="ToolStripRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>Tile</value>
-    <value>145, 17</value>
+  </data>
-  </metadata>
+  <data name="&gt;&gt;GridControlFiles.ZOrder" xml:space="preserve">
-  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0</value>
-    <value>289, 17</value>
+  </data>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="GridViewFiles.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>Orange</value>
+  </data>
+  <data name="tsbtnRefresh.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 22</value>
+  </data>
+  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="GridViewFiles.Appearance.EvenRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
+    <value>Regular</value>
+  </data>
+  <data name="&gt;&gt;rbSearchCombined.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;ToolStripMain.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="ToolStripMain.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;tslblRecordsResult.Name" xml:space="preserve">
+    <value>tslblRecordsResult</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;GridControlRecords.Name" xml:space="preserve">
+    <value>GridControlRecords</value>
+  </data>
+  <data name="rbSearchFulltext.Location" type="System.Drawing.Point, System.Drawing">
+    <value>423, 43</value>
+  </data>
+  <data name="GridViewFiles.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;GridViewRecords.Name" xml:space="preserve">
+    <value>GridViewRecords</value>
+  </data>
+  <data name="GridViewRecords.Appearance.EvenRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="ToolStripMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="&gt;&gt;ToolStripRecords.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerMain.Name" xml:space="preserve">
+    <value>SplitContainerMain</value>
+  </data>
+  <data name="&gt;&gt;ToolStripButton2.Name" xml:space="preserve">
+    <value>ToolStripButton2</value>
+  </data>
+  <data name="&gt;&gt;rbSearchFulltext.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;tsbtnRefresh.Name" xml:space="preserve">
+    <value>tsbtnRefresh</value>
+  </data>
+  <data name="&gt;&gt;GridControlRecords.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="rbSearchFulltext.Text" xml:space="preserve">
+    <value>Nur in Volltext der Dateien suchen</value>
+  </data>
+  <data name="ToolStripButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="&gt;&gt;rbSearchRecord.Name" xml:space="preserve">
+    <value>rbSearchRecord</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="ToolStripDokumente.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 9pt</value>
+  </data>
+  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>6, 25</value>
+  </data>
+  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 11</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Search all over</value>
+  </data>
+  <data name="&gt;&gt;ToolStripDokumente.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmsRecords.Name" xml:space="preserve">
+    <value>cmsRecords</value>
+  </data>
+  <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
+    <value>751, 25</value>
+  </data>
+  <data name="&gt;&gt;rbSearchRecord.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;ShowRecordToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripRecords.Parent" xml:space="preserve">
+    <value>SplitContainerMain.Panel1</value>
+  </data>
+  <data name="GridViewRecords.Appearance.EvenRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
+    <value>Horizontal</value>
+  </data>
+  <data name="&gt;&gt;rbSearchFulltext.Name" xml:space="preserve">
+    <value>rbSearchFulltext</value>
+  </data>
+  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
+    <value>Label1</value>
+  </data>
+  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="tsbtnRefresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="&gt;&gt;GridControlFiles.Name" xml:space="preserve">
+    <value>GridControlFiles</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
@@ -182,4 +325,526 @@
         AADAAQAA4AAAAPAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPwBAAD+AwAA
 </value>
   </data>
+  <data name="rbSearchRecord.Size" type="System.Drawing.Size, System.Drawing">
+    <value>183, 17</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;ToolStripButton2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GridViewFiles.Name" xml:space="preserve">
+    <value>GridViewFiles</value>
+  </data>
+  <data name="rbSearchFulltext.Size" type="System.Drawing.Size, System.Drawing">
+    <value>188, 17</value>
+  </data>
+  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbSearchFulltext.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="SplitContainerMain.Panel1.Text" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="GridControlRecords.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
+  </data>
+  <data name="GridControlFiles.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <assembly alias="DevExpress.Data.v15.2" name="DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlRecords.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.2">
+    <value>Default</value>
+  </data>
+  <data name="GridViewRecords.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtSearch.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="rbSearchCombined.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 17</value>
+  </data>
+  <data name="&gt;&gt;rbSearchCombined.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;ToolStripMain.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;ShowRecordToolStripMenuItem.Name" xml:space="preserve">
+    <value>ShowRecordToolStripMenuItem</value>
+  </data>
+  <data name="rbSearchCombined.Text" xml:space="preserve">
+    <value>Kombinierte Suche (ADDI-Datensätzen und Dateien - wenn Volltext vorhanden)</value>
+  </data>
+  <data name="&gt;&gt;rbSearchRecord.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;cmsRecords.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbSearchRecord.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 13</value>
+  </data>
+  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;ExportExcelToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tslblDocView.Name" xml:space="preserve">
+    <value>tslblDocView</value>
+  </data>
+  <data name="&gt;&gt;ToolStripRecords.Name" xml:space="preserve">
+    <value>ToolStripRecords</value>
+  </data>
+  <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
+    <value>751, 405</value>
+  </data>
+  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
+    <value>Label3</value>
+  </data>
+  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>703, 112</value>
+  </data>
+  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="ToolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 22</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator1.Name" xml:space="preserve">
+    <value>ToolStripSeparator1</value>
+  </data>
+  <data name="GridViewRecords.Appearance.EvenRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
+    <value>Regular</value>
+  </data>
+  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1426, 117</value>
+  </data>
+  <data name="&gt;&gt;GridViewRecords.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <assembly alias="DevExpress.XtraEditors.v15.2" name="DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlRecords.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.2">
+    <value>Center</value>
+  </data>
+  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>38, 13</value>
+  </data>
+  <data name="&gt;&gt;tsbtnviewDetail.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;GridControlFiles.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="GridViewFiles.Appearance.EvenRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
+    <value>Horizontal</value>
+  </data>
+  <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="ToolStripButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="&gt;&gt;ToolStripDokumente.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="ToolStripButton1.Text" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
+    <value>Label2</value>
+  </data>
+  <data name="ExportExcelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 22</value>
+  </data>
+  <data name="rbSearchCombined.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;rbSearchCombined.Name" xml:space="preserve">
+    <value>rbSearchCombined</value>
+  </data>
+  <data name="&gt;&gt;ToolStripButton1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtSearch.Name" xml:space="preserve">
+    <value>txtSearch</value>
+  </data>
+  <data name="ToolStripRecords.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tslblRecordsResult.Text" xml:space="preserve">
+    <value>0 Records found</value>
+  </data>
+  <data name="txtSearch.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Italic</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;txtSearch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
+    <value />
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="tslblRecordsResult.Size" type="System.Drawing.Size, System.Drawing">
+    <value>93, 22</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Name" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>Suchbegriff:</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="ShowRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 22</value>
+  </data>
+  <data name="SplitContainerMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="ExportExcelToolStripMenuItem.Text" xml:space="preserve">
+    <value>Export Excel</value>
+  </data>
+  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 31</value>
+  </data>
+  <data name="ToolStripButton2.Text" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="txtSearch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>501, 21</value>
+  </data>
+  <data name="rbSearchCombined.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 20</value>
+  </data>
+  <data name="&gt;&gt;rbSearchRecord.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>504, 13</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmSearchAllOVer</value>
+  </data>
+  <data name="SplitContainerMain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 117</value>
+  </data>
+  <data name="&gt;&gt;tsbtnRefresh.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="tslblDocView.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 8.25pt, style=Bold, Italic</value>
+  </data>
+  <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
+    <value>670, 405</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>In diesem Formular können Sie systemweit (in Sichten und/oder Dateien) nach Volltextbegriffen suchen.</value>
+  </data>
+  <data name="ToolStripMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1426, 25</value>
+  </data>
+  <data name="rbSearchRecord.Location" type="System.Drawing.Point, System.Drawing">
+    <value>423, 20</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripMain.Name" xml:space="preserve">
+    <value>ToolStripMain</value>
+  </data>
+  <data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1426, 430</value>
+  </data>
+  <data name="&gt;&gt;ToolStripMain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlRecords.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+    <value>None</value>
+  </data>
+  <data name="&gt;&gt;ExportExcelToolStripMenuItem.Name" xml:space="preserve">
+    <value>ExportExcelToolStripMenuItem</value>
+  </data>
+  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>538, 31</value>
+  </data>
+  <data name="ToolStripMain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 92</value>
+  </data>
+  <data name="&gt;&gt;txtSearch.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;ToolStripRecords.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ToolStripDokumente.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;tslblRecordsResult.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Label3.Text" xml:space="preserve">
+    <value>Label3</value>
+  </data>
+  <data name="&gt;&gt;rbSearchFulltext.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtSearch.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 50</value>
+  </data>
+  <data name="GridControlFiles.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.2">
+    <value>Default</value>
+  </data>
+  <data name="tslblDocView.Text" xml:space="preserve">
+    <value>Windream-Dokumente</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tslblDocView.Size" type="System.Drawing.Size, System.Drawing">
+    <value>126, 22</value>
+  </data>
+  <data name="&gt;&gt;GridControlRecords.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="SplitContainerMain.Text" xml:space="preserve">
+    <value>SplitContainerControl1</value>
+  </data>
+  <data name="ShowRecordToolStripMenuItem.Text" xml:space="preserve">
+    <value>Show Record</value>
+  </data>
+  <data name="&gt;&gt;GridControlFiles.Parent" xml:space="preserve">
+    <value>SplitContainerMain.Panel2</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="tsbtnviewDetail.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>1426, 547</value>
+  </data>
+  <data name="ToolStripMain.Text" xml:space="preserve">
+    <value>ToolStrip1</value>
+  </data>
+  <data name="&gt;&gt;tslblDocView.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ToolStripDokumente.Text" xml:space="preserve">
+    <value>ToolStrip2</value>
+  </data>
+  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>765, 78</value>
+  </data>
+  <data name="&gt;&gt;ToolStripDokumente.Parent" xml:space="preserve">
+    <value>SplitContainerMain.Panel2</value>
+  </data>
+  <data name="rbSearchRecord.Text" xml:space="preserve">
+    <value>Nur in ADDI-Datensätzen suchen</value>
+  </data>
+  <data name="ToolStripButton2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>63, 22</value>
+  </data>
+  <data name="tsbtnRefresh.Text" xml:space="preserve">
+    <value>Starte Suche</value>
+  </data>
+  <data name="&gt;&gt;rbSearchFulltext.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
+    <value>670, 25</value>
+  </data>
+  <data name="&gt;&gt;rbSearchCombined.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripDokumente.Name" xml:space="preserve">
+    <value>ToolStripDokumente</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.2">
+    <value>Center</value>
+  </data>
+  <data name="cmsRecords.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 48</value>
+  </data>
+  <data name="tsbtnviewDetail.Text" xml:space="preserve">
+    <value>Detailansicht</value>
+  </data>
+  <data name="GridViewRecords.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>Aqua</value>
+  </data>
+  <data name="ToolStripRecords.Text" xml:space="preserve">
+    <value>ToolStrip2</value>
+  </data>
+  <data name="&gt;&gt;ToolStripButton1.Name" xml:space="preserve">
+    <value>ToolStripButton1</value>
+  </data>
+  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="tsbtnviewDetail.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 22</value>
+  </data>
+  <data name="&gt;&gt;GridControlRecords.Parent" xml:space="preserve">
+    <value>SplitContainerMain.Panel1</value>
+  </data>
+  <data name="GridViewFiles.Appearance.EvenRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="rbSearchRecord.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>Tile</value>
+  </data>
+  <data name="SplitContainerMain.Panel2.Text" xml:space="preserve">
+    <value>Panel2</value>
+  </data>
+  <data name="GridControlRecords.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+    <value>None</value>
+  </data>
+  <data name="GroupBox1.Text" xml:space="preserve">
+    <value>Bitte definieren Sie eine Suchvariante:</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerMain.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="rbSearchFulltext.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;tsbtnviewDetail.Name" xml:space="preserve">
+    <value>tsbtnviewDetail</value>
+  </data>
+  <data name="GridControlRecords.EmbeddedNavigator.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="GridControlFiles.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <metadata name="ToolStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ToolStripRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>145, 17</value>
+  </metadata>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cmsRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>454, 17</value>
+  </metadata>
+  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>289, 17</value>
+  </metadata>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>en-US</value>
+  </metadata>
 </root>

app/DD-Record-Organiser/frmSearchAllOver.en-US.resx

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tsbtnviewDetail.Size" type="System.Drawing.Size, System.Drawing">
+    <value>90, 22</value>
+  </data>
+  <data name="tsbtnviewDetail.Text" xml:space="preserve">
+    <value>View Details</value>
+  </data>
+  <data name="tsbtnRefresh.Size" type="System.Drawing.Size, System.Drawing">
+    <value>88, 22</value>
+  </data>
+  <data name="tsbtnRefresh.Text" xml:space="preserve">
+    <value>Start search</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>348, 13</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>Here You can search in all data (Addi-Records and filefulltext) for data.</value>
+  </data>
+  <data name="rbSearchRecord.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 17</value>
+  </data>
+  <data name="rbSearchRecord.Text" xml:space="preserve">
+    <value>Search only in ADDI-Records</value>
+  </data>
+  <data name="rbSearchFulltext.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 17</value>
+  </data>
+  <data name="rbSearchFulltext.Text" xml:space="preserve">
+    <value>Search only in fulltect of files</value>
+  </data>
+  <data name="rbSearchCombined.Size" type="System.Drawing.Size, System.Drawing">
+    <value>342, 17</value>
+  </data>
+  <data name="rbSearchCombined.Text" xml:space="preserve">
+    <value>Combined search (ADDI-Records and files - if fulltext is extracted)</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 13</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>search words:</value>
+  </data>
+  <data name="GroupBox1.Text" xml:space="preserve">
+    <value>Please define your search-variant:</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
+        AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA
+        AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAP8AAAAAAAAPd/AAAA
+        AAAPd3fwAAAAAA93d38AAAAAAPd3d///8AAAD3d3d3d/8AAA93d3d3fwAAAPd3//d38AAA93///3fwAA
+        D3f///d/AAAPd///938AAA93f/93fwAAAPd3d3fwAAAA/3d3f/AAAAAA///wAP//AADn/wAAw/8AAIH/
+        AACA/wAAwAcAAOABAADwAQAA+AAAAPgAAAD4AAAA+AAAAPgAAAD8AQAA/AEAAP8HAAAoAAAAEAAAACAA
+        AAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgBNTU0AWFhYAGRkZABubW4AeXl5AIaG
+        hgDg4OAA5uTlAOvr6wDx7/AA9vb2APr6+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAMDAAAAAAA
+        AAAAAAAAAAAKBAcMAAAAAAAAAAAAAAAMBAEBBwwAAAAAAAAAAAAADAQBAQEHDAAAAAAAAAAAAAAKBAEB
+        AQcMDAwMDAAAAAAAAAoEAQEBBAEBAQYIDQAAAAAACgQBAQEBAQEBAggAAAAAAAAKAwEGCAsIBQEGDAAA
+        AAAADAEBCAsLCwgBAQwAAAAAAAgBAQsLCwsLAwEMAAAAAAAMAQEICwsLCAEBDAAAAAAADAYBBggLCAUB
+        BgwAAAAAAAAIAgEBAQEBAggAAAAAAAAADQgGAQEBBggNAAAAAAAAAAAADAwMDAwAAAD//wAA5/8AAMP/
+        AACB/wAAgP8AAMAHAADgAQAA8AEAAPgAAAD4AAAA+AAAAPgAAAD4AAAA/AEAAPwBAAD/BwAAKAAAABAA
+        AAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vYwAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbv9vb27/b2
+        9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jDq6urvZGRk/4aG
+        hv/29vbv9vb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbvZGRk/0JC
+        Qv9CQkL/hoaG//b29u/29vYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYw9vb272Rk
+        ZP9CQkL/QkJC/0JCQv+Ghob/9vb27/b29jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9jDq6urvZGRk/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb2//b29v/29vb/9vb2z/b29lAAAAAAAAAAAAAA
+        AAAAAAAA9vb2MOrq6u9kZGT/QkJC/0JCQv9CQkL/ZGRk/0JCQv9CQkL/QkJC/3p6ev/g4OD/9vb2gAAA
+        AAAAAAAAAAAAAAAAAAD29vYw6urq72RkZP9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg
+        4P/29vZQAAAAAAAAAAAAAAAAAAAAAPb29jDr6+v/WVlZ/0JCQv95eHj/5uTl//Hv8P/m5OX/bm1u/0JC
+        Qv96enr/9vb2zwAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv9CQkL/5uTl//Hv8P/x7/D/8e/w/+bk
+        5f9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAODg4P9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
+        8P/x7/D/WFhY/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JCQv/m5OX/8e/w//Hv
+        8P/x7/D/5uTl/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2z3p6ev9CQkL/eXh4/+bk
+        5f/x7/D/5uTl/25tbv9CQkL/enp6//b29s8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29lDg4OD/TU1N/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg4P/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2gODg
+        4P96enr/QkJC/0JCQv9CQkL/enp6/+Dg4P/29vaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD29vZQ9vb2z/b29v/29vb/9vb2//b29s/29vZQAAAAAAAAAADn/wAAw/8AAIH/AAAA/wAAAH8AAIAD
+        AADAAQAA4AAAAPAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPwBAAD+AwAA
+</value>
+  </data>
+</root>

app/DD-Record-Organiser/frmSearchAllOver.vb

@@ -1,4 +1,7 @@
 Imports DevExpress.Utils
+Imports System.Text
+Imports System.IO
+
 Public Class frmSearchAllOVer
     Inherits Form
     Dim sel_Records, sel_FT As String
@@ -162,6 +165,11 @@ Public Class frmSearchAllOVer
         End Try
         JUMP_RECORD_ID = 0
     End Sub
+
+    Private Sub frmSearchAllOVer_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        Save_DocGrid_Layout()
+        Save_RecGrid_Layout()
+    End Sub
     Private Sub frmSearchAllOVer_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
         If e.KeyCode = Keys.Return Then
             Refresh_Search()
@@ -171,4 +179,78 @@ Public Class frmSearchAllOVer
     Private Sub tsbtnviewDetail_Click(sender As Object, e As EventArgs) Handles tsbtnviewDetail.Click
         Show_Detail_Record()
     End Sub
+
+    Private Sub GridControlFiles_DoubleClick(sender As Object, e As EventArgs) Handles GridControlFiles.DoubleClick
+        Me.Cursor = Cursors.WaitCursor
+
+        For Each row In GridViewFiles.GetSelectedRows
+            Dim SELECTED_DOC_PATH = GridViewFiles.GetRowCellValue(row, "FULL_FILENAME")
+            Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
+            If IsNothing(SELECTED_DOC_PATH) Then
+                MsgBox("Could not read File Parameters!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+
+            ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID)
+
+        Next
+        Me.Cursor = Cursors.Default
+    End Sub
+    Sub Save_DocGrid_Layout()
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            GridViewFiles.SaveLayoutToXml(XMLPath)
+            ' Update_Status_Label(True, "Grid Layout Loaded")
+        Catch ex As Exception
+            MsgBox("Error in Save_DocGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Sub Save_RecGrid_Layout()
+        Try
+            Dim XMLPath = Get_RecordGrid_Layout_Filename()
+            GridViewRecords.SaveLayoutToXml(XMLPath)
+            ' Update_Status_Label(True, "Grid Layout Loaded")
+        Catch ex As Exception
+            MsgBox("Error in Save_RecGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Sub Load_DocGrid_Layout()
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+                GridViewFiles.RestoreLayoutFromXml(XMLPath)
+                GridViewFiles.GuessAutoFilterRowValuesFromFilter()
+            End If
+
+        Catch ex As Exception
+            MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Sub Load_RecordGrid_Layout()
+        Try
+            Dim XMLPath = Get_RecordGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+                GridViewRecords.RestoreLayoutFromXml(XMLPath)
+                GridViewRecords.GuessAutoFilterRowValuesFromFilter()
+            End If
+
+        Catch ex As Exception
+            MsgBox("Error in Load_RecordGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Private Function Get_RecordGrid_Layout_Filename()
+        Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+        Dim Filename As String = "frmGlobalSearch_RecordGrid-UserLayout.xml"
+        Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+    End Function
+    Private Function Get_DocGrid_Layout_Filename()
+        Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+        Dim Filename As String = "frmGlobalSearch_DocGrid-UserLayout.xml"
+        Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+    End Function
+
+    Private Sub frmSearchAllOVer_Load(sender As Object, e As EventArgs) Handles Me.Load
+        Load_DocGrid_Layout()
+        Load_RecordGrid_Layout()
+    End Sub
 End Class

app/DD-Record-Organiser/frmSplash.Designer.vb

@@ -109,6 +109,7 @@ Partial Class frmSplash
         Me.Controls.Add(Me.PictureBox2)
         Me.DoubleBuffered = True
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.KeyPreview = True
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmSplash"

app/DD-Record-Organiser/frmSplash.vb

@@ -1,7 +1,6 @@
 Imports System.ComponentModel
 
 Public NotInheritable Class frmSplash
-
     'TODO: Dieses Formular kann einfach als Begrüßungsbildschirm für die Anwendung festgelegt werden, indem Sie zur Registerkarte "Anwendung"
     '  des Projekt-Designers wechseln (Menü "Projekt", Option "Eigenschaften").
     Private InitSteps As Integer = 6
@@ -12,6 +11,13 @@ Public NotInheritable Class frmSplash
 
     End Sub
 
+    Private Sub frmSplash_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
+        If e.KeyCode = Keys.Escape Then
+            ESC_Hidden = True
+        End If
+       
+    End Sub
+
 
     Private Sub frmSplash_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         'Richten Sie den Dialogtext zur Laufzeit gemäß den Assemblyinformationen der Anwendung ein.  
@@ -69,6 +75,7 @@ Public NotInheritable Class frmSplash
 
             bw.ReportProgress(CalcProgress(2), "Initializing Database")
             If Init.InitDatabase() = True Then
+
                 System.Threading.Thread.Sleep(500)
 
                 bw.ReportProgress(CalcProgress(3), "Initializing Basic-Configuration")

app/DD-Record-Organiser/frmStructureNodeConfig.vb

@@ -302,7 +302,7 @@
         Try
             Me.TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter.Update(DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION)
                 lblSave.Text = "Successfully saved - " & Now
                 lblSave.Visible = True
@@ -326,7 +326,7 @@
     End Sub
 
     Private Sub TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource.AddingNew
-        DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub btnSelectBackground_Click(sender As Object, e As EventArgs) Handles btnSelectBackground.Click

app/DD-Record-Organiser/frmTask_Editor.vb

@@ -5,13 +5,13 @@ Public Class frmTask_Editor
     Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
         Try
             Dim upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}', STATE_ID = {2}, ACTIVE = {3}, CHANGED_WHO = '{4}', TASK_DATE = '{5}' " & _
-                                    "WHERE GUID = {6}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, Environment.UserName, DateTimePicker1.Value, Me.GUIDTextBox.Text)
+                                    "WHERE GUID = {6}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text)
             If ClassDatabase.Execute_non_Query(upd, True) Then
                 Me.Close()
             Else
                 MsgBox("Update not successfull. Please check logfile.", MsgBoxStyle.Exclamation)
             End If
-            '  Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, Environment.UserName, DateTimePicker1.Value, Me.GUIDTextBox.Text)
+            '  Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text)
         Catch ex As Exception
             MsgBox("Error in Exit:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -33,7 +33,7 @@ Public Class frmTask_Editor
             If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count = 0 Then
                 Dim result As MsgBoxResult = MsgBox("Aktuell ist der Workflow anscheinend noch nicht aktiv - Wollen Sie diesen nun starten?", MsgBoxStyle.YesNo, "Frage:")
                 If result = MsgBoxResult.Yes Then
-                    TBPMO_WORKFLOW_TASKTableAdapter.cmdsetActive(Environment.UserName, CURRENT_RECORD_ID)
+                    TBPMO_WORKFLOW_TASKTableAdapter.cmdsetActive(USER_USERNAME, CURRENT_RECORD_ID)
                     Load_Task()
                     If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count = 0 Then
                         MsgBox("Keine aktiven Tasks - Bitte informieren Sie Ihren Systembetreuer.", MsgBoxStyle.Exclamation)
@@ -52,7 +52,7 @@ Public Class frmTask_Editor
 
     Sub Load_Task()
         Try
-            Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName, CURRENT_RECORD_ID)
+            Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME, CURRENT_RECORD_ID)
         Catch ex As Exception
             MsgBox("Error in Load_Task:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -116,7 +116,7 @@ Public Class frmTask_Editor
     End Sub
     Sub Load_TASK_USER()
         Try
-            'Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE LOWER(USERNAME) = '" & Environment.UserName & "' AND WF_TASK_ID = " & Me.GUIDTextBox.Text
+            'Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE LOWER(USERNAME) = '" & USER_USERNAME & "' AND WF_TASK_ID = " & Me.GUIDTextBox.Text
             Dim sql = "SELECT * FROM VWPMO_WF_USER WHERE WF_TASK_ID = " & Me.GUIDTextBox.Text
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             Dim count As Integer = 0

app/DD-Record-Organiser/frmTask_Management.vb

@@ -17,7 +17,7 @@
         Try
             Me.TBPMO_WORKFLOWBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_WORKFLOW.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox1.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox1.Text = USER_USERNAME
                 Me.TBPMO_WORKFLOWBindingSource.EndEdit()
                 Me.TBPMO_WORKFLOWTableAdapter.Update(DD_DMSDataSet.TBPMO_WORKFLOW)
                 toolstriplabel(True, "Änderungen Task erfolgreich gespeichert - " & Now)
@@ -133,7 +133,7 @@
 
     End Sub
     Private Sub TBPMO_WORKFLOWBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WORKFLOWBindingSource.AddingNew
-        DD_DMSDataSet.TBPMO_WORKFLOW.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_WORKFLOW.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
@@ -177,7 +177,7 @@
         Try
             Me.TBPMO_WORKFLOW_TASK_STATEBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_WORKFLOW_TASK_STATEBindingSource.EndEdit()
                 Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.Update(DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE)
                 toolstriplabel(True, "Änderungen erfolgreich gespeichert - " & Now)
@@ -188,8 +188,8 @@
 
     End Sub
     Private Sub TBPMO_WORKFLOW_TASK_STATEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WORKFLOW_TASK_STATEBindingSource.AddingNew
-        DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
-        DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE.CHANGED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE.CHANGED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     'Private Sub btnAddTask2Entity_Click(sender As Object, e As EventArgs) Handles btnAddTask2Entity.Click
@@ -203,7 +203,7 @@
     '            MsgBox("Please choose an entity.", MsgBoxStyle.Exclamation)
     '            Exit Sub
     '        End If
-    '        TBPMO_WORKFLOW_FORMTableAdapter.Insert(_ENTITYID, GUIDTextBox1.Text, 1, Environment.UserName)
+    '        TBPMO_WORKFLOW_FORMTableAdapter.Insert(_ENTITYID, GUIDTextBox1.Text, 1, USER_USERNAME)
     '        toolstriplabel(True, "Task erfolgreich zugeordnet - " & Now)
     '        Refresh_Workflow_Form(_ENTITYID)
     '        '  End If
@@ -388,7 +388,7 @@
     'Private Sub btnAddState2Entity_Click_1(sender As Object, e As EventArgs) Handles btnAddState2Entity.Click
     '    Try
     '        If GUIDTextBox.Text <> "" And GUIDTextBox1.Text <> "" And _ENTITYID <> 0 Then
-    '            Dim ins = String.Format("INSERT INTO TBPMO_WORKFLOW_ENTITY_STATE (WF_ID,ENTITY_ID,STATE_ID,ADDED_WHO) VALUES({0},{1},{2},'{3}')", GUIDTextBox1.Text, _ENTITYID, GUIDTextBox.Text, Environment.UserName)
+    '            Dim ins = String.Format("INSERT INTO TBPMO_WORKFLOW_ENTITY_STATE (WF_ID,ENTITY_ID,STATE_ID,ADDED_WHO) VALUES({0},{1},{2},'{3}')", GUIDTextBox1.Text, _ENTITYID, GUIDTextBox.Text, USER_USERNAME)
     '            If ClassDatabase.Execute_non_Query(ins) Then
     '                Dim txt As String = "Der Datensatz wurde erfolgreich hinzugefügt - " & Now
     '                If USER_LANGUAGE <> "de-DE" Then
@@ -497,7 +497,7 @@
                         final = 1
 
                 End Select
-                Dim ins = String.Format("INSERT INTO TBPMO_WORKFLOW_ENTITY_STATE (WF_ID,ENTITY_ID,STATE_ID,ADDED_WHO,FINAL) VALUES({0},{1},{2},'{3}',{4})", GUIDTextBox1.Text, txtEntity.Tag, txtState.Tag, Environment.UserName, final)
+                Dim ins = String.Format("INSERT INTO TBPMO_WORKFLOW_ENTITY_STATE (WF_ID,ENTITY_ID,STATE_ID,ADDED_WHO,FINAL) VALUES({0},{1},{2},'{3}',{4})", GUIDTextBox1.Text, txtEntity.Tag, txtState.Tag, USER_USERNAME, final)
                 If ClassDatabase.Execute_non_Query(ins) Then
                     Dim txt As String = "Der Datensatz wurde erfolgreich hinzugefügt - " & Now
                     If USER_LANGUAGE <> "de-DE" Then

app/DD-Record-Organiser/frmTemplates.vb

@@ -12,9 +12,9 @@
             MsgBox("Unexpected error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
         Try
-            DD_DMSDataSet.TBPMO_TEMPLATE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DD_DMSDataSet.TBPMO_TEMPLATE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
-            DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn.DefaultValue = USER_USERNAME
-            DD_DMSDataSet.TBPMO_TEMPLATE_PATTERN.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DD_DMSDataSet.TBPMO_TEMPLATE_PATTERN.ADDED_WHOColumn.DefaultValue = USER_USERNAME
         Catch ex As Exception
 
         End Try
@@ -96,7 +96,7 @@
             Me.Validate()
             Me.TBPMO_TEMPLATEBindingSource.EndEdit()
             If Me.DD_DMSDataSet.TBPMO_TEMPLATE.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_TEMPLATEBindingSource.EndEdit()
                 TBPMO_TEMPLATETableAdapter.Update(DD_DMSDataSet.TBPMO_TEMPLATE)
                 lblSaveTemplate.Visible = True
@@ -134,7 +134,7 @@
                         If Not IsNothing(cc) Then
                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Office-Pattern: " & cc.Tag, False)
                             If Pattern_exists(cc.tag.ToString.ToUpper) = False Then
-                                TBPMO_TEMPLATE_PATTERNTableAdapter.cmdInsertBasics(cc.tag.ToString, Environment.UserName, _TEMPLATE_ENTITY_ID)
+                                TBPMO_TEMPLATE_PATTERNTableAdapter.cmdInsertBasics(cc.tag.ToString, USER_USERNAME, _TEMPLATE_ENTITY_ID)
                             End If
                         End If
                     Next cc
@@ -181,7 +181,7 @@
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         If cmbEntities.SelectedIndex <> -1 Then
             Try
-                TBPMO_TEMPLATE_ENTITYTableAdapter.Insert(_TEMPLATEID, cmbEntities.SelectedValue, Environment.UserName)
+                TBPMO_TEMPLATE_ENTITYTableAdapter.Insert(_TEMPLATEID, cmbEntities.SelectedValue, USER_USERNAME)
                 Load_Template_Entity(_TEMPLATEID)
                 lblSaveEntity.Visible = True
             Catch ex As Exception
@@ -255,7 +255,7 @@
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnRefreshControlPattern.Click
         If cmbControls.SelectedIndex <> -1 Then
             Dim ctrlstring = cmbControls.SelectedValue.ToString
-            Dim sql = String.Format("UPDATE TBPMO_TEMPLATE_PATTERN SET FIXED_VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", ctrlstring, Environment.UserName, GUIDTextBox2.Text)
+            Dim sql = String.Format("UPDATE TBPMO_TEMPLATE_PATTERN SET FIXED_VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", ctrlstring, USER_USERNAME, GUIDTextBox2.Text)
             If ClassDatabase.Execute_non_Query(sql, True) Then
                 FIXED_VALUETextBox.Text = ctrlstring
                 lblSavePattern.Visible = True

app/DD-Record-Organiser/frmUserKonfig.Designer.vb

@@ -1658,6 +1658,7 @@ Partial Class frmUserKonfig
         Me.Controls.Add(CHANGED_WHENLabel)
         Me.Controls.Add(Me.CHANGED_WHENTextBox)
         Me.Controls.Add(Me.TBDD_USERBindingNavigator)
+        Me.KeyPreview = True
         Me.Name = "frmUserKonfig"
         CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()

app/DD-Record-Organiser/frmUserKonfig.resx

@@ -1914,7 +1914,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1097, 293</value>
+    <value>1101, 296</value>
   </data>
   <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>

app/DD-Record-Organiser/frmUserKonfig.vb

@@ -44,7 +44,7 @@
         Try
             Me.TBDD_CLIENTBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_CLIENT.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox2.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox2.Text = USER_USERNAME
                 Me.TBDD_CLIENTBindingSource.EndEdit()
                 Me.TBDD_CLIENTTableAdapter.Update(Me.DD_DMSDataSet.TBDD_CLIENT)
                 Label7.Visible = True
@@ -60,7 +60,7 @@
         Try
             Me.TBDD_USERBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_USER.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBDD_USERBindingSource.EndEdit()
                 Me.TBDD_USERTableAdapter.Update(Me.DD_DMSDataSet.TBDD_USER)
                 lblsave.Visible = True
@@ -72,7 +72,7 @@
         End Try
     End Sub
     Private Sub TBDD_USERBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew
-        DD_DMSDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub tsAddUser_Click(sender As Object, e As EventArgs) Handles tsAddUser.Click
@@ -106,7 +106,7 @@
                 MsgBox(String.Format("Der Benutzer {0} ist bereits Mitglied der Gruppe {1}", USERNAMETextBox.Text, groupName), MsgBoxStyle.Exclamation)
                 Exit Sub
             Else
-                SQL = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", userID, groupID, Environment.UserName)
+                SQL = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", userID, groupID, USER_USERNAME)
                 If ClassDatabase.Execute_non_Query(SQL) = True Then
                     LoadGroupsForSelectedUser()
                 Else
@@ -136,16 +136,16 @@
         End Try
         Dim SQL As String = String.Format("SELECT GROUP_NAME FROM VWPMO_USERS_GROUPS WHERE USER_ID = {0}", userID)
 
-            Try
+        Try
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
 
-                lbGroups.Items.Clear()
+            lbGroups.Items.Clear()
-                For Each row As DataRow In dt.Rows
+            For Each row As DataRow In dt.Rows
-                    lbGroups.Items.Add(row.Item(0).ToString)
+                lbGroups.Items.Add(row.Item(0).ToString)
-                Next
+            Next
-            Catch ex As Exception
+        Catch ex As Exception
-                MsgBox("Error in LoadGroupsForSelectedUser:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            MsgBox("Error in LoadGroupsForSelectedUser:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End Try
+        End Try
 
     End Sub
     Private Sub GetMandantForSelectedUser()
@@ -204,7 +204,7 @@
     End Sub
 
     Private Sub TBDD_USER_GROUPSBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USER_GROUPSBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_USER_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_USER_GROUPS.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
@@ -215,7 +215,7 @@
         Try
             Me.TBDD_USER_GROUPSBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_USER_GROUPS.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox1.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox1.Text = USER_USERNAME
                 Me.TBDD_USER_GROUPSBindingSource.EndEdit()
                 Me.TBDD_USER_GROUPSTableAdapter.Update(Me.DD_DMSDataSet.TBDD_USER_GROUPS)
             End If
@@ -326,7 +326,7 @@
             If row.Item(0) = CBool(True) Then
                 Dim sql = "select count(*) from TBDD_GROUPS_USER Where user_id = " & row.Item(5) & " AND GROUP_ID = " & cmbGroups_Group2User.SelectedValue
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                    sql = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbGroups_Group2User.SelectedValue, Environment.UserName)
+                    sql = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbGroups_Group2User.SelectedValue, USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(sql) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to Group {1}", row.Item(1), cmbGroups_Group2User.Text), MsgBoxStyle.Critical)
                     End If
@@ -413,7 +413,7 @@
         Save_Clients()
     End Sub
     Private Sub TBDD_CLIENTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CLIENTBindingSource.AddingNew
-        DD_DMSDataSet.TBDD_CLIENT.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBDD_CLIENT.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub TabControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl3.SelectedIndexChanged
@@ -458,7 +458,7 @@
             If row.Item(0) = CBool(True) Then
                 Dim sql = "select count(*) from TBDD_CLIENT_USER Where user_id = " & row.Item(5) & " AND CLIENT_ID = " & cmbClientsforUser.SelectedValue
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                    sql = String.Format("INSERT INTO TBDD_CLIENT_USER (USER_ID, CLIENT_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbClientsforUser.SelectedValue, Environment.UserName)
+                    sql = String.Format("INSERT INTO TBDD_CLIENT_USER (USER_ID, CLIENT_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbClientsforUser.SelectedValue, USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(sql) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to Client {1}", row.Item(1), cmbGroups_Group2User.Text), MsgBoxStyle.Critical)
                     End If
@@ -552,6 +552,11 @@
     'End Sub
 
     Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
+        delete_user()
+
+
+    End Sub
+    Sub Delete_user()
         Dim msg = "Sind Sie sicher, dass Sie diesen User löschen wollen?"
         If USER_LANGUAGE <> "de-DE" Then
             msg = "Are You sure You want to delete the selected user?"
@@ -566,7 +571,10 @@
                 MsgBox("Unexpected Error while deleting User.", MsgBoxStyle.Exclamation)
             End If
         End If
-
+    End Sub
-
+    Private Sub frmUserKonfig_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
+        If e.KeyCode = Keys.Delete Then
+            Delete_user()
+        End If
     End Sub
 End Class

app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb

@@ -19,7 +19,7 @@ Public Class frmUserKonfig_AddUsers
     Private Sub formUserConfig_AddUsers_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             Cursor = Cursors.WaitCursor
-            GetGroups(Environment.UserName)
+            GetGroups(USER_USERNAME)
         Catch ex As Exception
             MsgBox("Error in Load Groups:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -140,7 +140,7 @@ Public Class frmUserKonfig_AddUsers
                 End Try
                 Dim SQL
                 If Not UserExists(USERNAME) Then
-                    SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_RECORD_ORG,LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "','" & Environment.UserName & "')"
+                    SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_RECORD_ORG,LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "','" & USER_USERNAME & "')"
                     If ClassDatabase.Execute_non_Query(SQL) = True Then
                         Dim ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_USER")
                         Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, USERNAME)
@@ -218,7 +218,7 @@ Public Class frmUserKonfig_AddUsers
 
     Private Sub RBCheck2_CheckedChanged(sender As Object, e As EventArgs) Handles RBCheck2.CheckedChanged
         If RBCheck2.Checked Then
-            GetGroups(Environment.UserName)
+            GetGroups(USER_USERNAME)
         End If
     End Sub
     Public Sub GetGroups(ByVal samAccountName As String)

app/DD-Record-Organiser/frmViewsUser.vb

@@ -61,7 +61,7 @@
         Try
             For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
                 If row.Item(0) = CBool(True) Then
-                    Dim insert = "INSERT INTO TBPMO_USER_GLOBAL_SEARCH (USER_ID,ADDED_WHO) VALUES (" & row.Item(5) & ", '" & Environment.UserName & "')"
+                    Dim insert = "INSERT INTO TBPMO_USER_GLOBAL_SEARCH (USER_ID,ADDED_WHO) VALUES (" & row.Item(5) & ", '" & USER_USERNAME & "')"
                     If ClassDatabase.Execute_non_Query(insert, False) = False Then
                         MsgBox("Could not insert the User-Definition....Check the logfile!", MsgBoxStyle.Exclamation)
                     End If

app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.vb

@@ -60,7 +60,7 @@
             lblSaveDokart.Text = msg
             Me.TBDD_DOKUMENTARTBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_DOKUMENTART.GetChanges Is Nothing = False Then
-                Me.GEANDERTWERTextBox.Text = Environment.UserName
+                Me.GEANDERTWERTextBox.Text = USER_USERNAME
                 Me.TBDD_DOKUMENTARTBindingSource.EndEdit()
                 Me.TBDD_DOKUMENTARTTableAdapter.Update(Me.DD_DMSDataSet.TBDD_DOKUMENTART)
                 If IsInsert = True Then
@@ -108,7 +108,7 @@
         Try
             Me.TBDD_INDEX_AUTOMBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_INDEX_AUTOM.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBDD_INDEX_AUTOMBindingSource.EndEdit()
                 Me.TBDD_INDEX_AUTOMTableAdapter.Update(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM)
                 Me.lblSaveIndex.Visible = True
@@ -129,16 +129,16 @@
         End Try
     End Sub
     Private Sub TBDD_DOKUMENTARTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_DOKUMENTARTBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_DOKUMENTART.ERSTELLTWERColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_DOKUMENTART.ERSTELLTWERColumn.DefaultValue = USER_USERNAME
         IsInsert = True
     End Sub
 
     Private Sub TBDD_EINGANGSARTENBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_EINGANGSARTENBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_EINGANGSARTEN.ERSTELLTWERColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_EINGANGSARTEN.ERSTELLTWERColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub TBDD_INDEX_AUTOMBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_INDEX_AUTOMBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_INDEX_AUTOM.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_INDEX_AUTOM.ADDED_WHOColumn.DefaultValue = USER_USERNAME
         Me.DD_DMSDataSet.TBDD_INDEX_AUTOM.DOCTYPE_IDColumn.DefaultValue = GUIDTextBox.Text
         load_Indices()
     End Sub
@@ -238,7 +238,7 @@
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddDokart_Entity.Click
-        Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter.cmdInsert(Me.cmbEntity_Doctype.SelectedValue, Me.GUIDTextBox.Text, Me.OBJEKTTYPComboBox.Text, Environment.UserName)
+        Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter.cmdInsert(Me.cmbEntity_Doctype.SelectedValue, Me.GUIDTextBox.Text, Me.OBJEKTTYPComboBox.Text, USER_USERNAME)
         Refresh_DokID_FORM_VIEW()
     End Sub
 
@@ -500,7 +500,7 @@
         End If
        
         If Changes = True Then
-            Dim upd = String.Format("UPDATE TBDD_DOKUMENTART SET FOLDER_FOR_INDEX = '{0}', GEANDERTWER = '{1}' WHERE GUID = {2}", FOLDER_FOR_INDEXTextBox.Text, Environment.UserName, GUIDTextBox.Text)
+            Dim upd = String.Format("UPDATE TBDD_DOKUMENTART SET FOLDER_FOR_INDEX = '{0}', GEANDERTWER = '{1}' WHERE GUID = {2}", FOLDER_FOR_INDEXTextBox.Text, USER_USERNAME, GUIDTextBox.Text)
             If ClassDatabase.Execute_non_Query(upd) = False Then
                 MsgBox("Unexpected Error in Adding Variable path - Check logfile", MsgBoxStyle.Exclamation)
             End If
@@ -517,7 +517,7 @@
 
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
         Try
-            Dim upd = String.Format("UPDATE TBDD_DOKUMENTART SET FOLDER_FOR_INDEX = '{0}', GEANDERTWER = '{1}' WHERE GUID = {2}", FOLDER_FOR_INDEXTextBox.Text, Environment.UserName, GUIDTextBox.Text)
+            Dim upd = String.Format("UPDATE TBDD_DOKUMENTART SET FOLDER_FOR_INDEX = '{0}', GEANDERTWER = '{1}' WHERE GUID = {2}", FOLDER_FOR_INDEXTextBox.Text, USER_USERNAME, GUIDTextBox.Text)
             If ClassDatabase.Execute_non_Query(upd) = False Then
                 MsgBox("Unexpected Error in Adding Variable path - Check logfile", MsgBoxStyle.Exclamation)
             Else

app/DD-Record-Organiser/frmWD_Import_Doc_Record.vb

@@ -29,7 +29,7 @@ Public Class frmWD_Import_Doc_Record
             lblSaveProfile.Text = msg
             Me.TBPMO_WD_IMPORT_PROFILEBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_WD_IMPORT_PROFILEBindingSource.EndEdit()
                 Me.TBPMO_WD_IMPORT_PROFILETableAdapter.Update(Me.DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE)
                 Me.lblSaveProfile.Visible = True
@@ -111,7 +111,7 @@ Public Class frmWD_Import_Doc_Record
     End Sub
 
     Private Sub TBPMO_WD_IMPORT_PROFILEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WD_IMPORT_PROFILEBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub btnStartStop_Click(sender As Object, e As EventArgs) Handles btnStartStop.Click
@@ -287,7 +287,7 @@ Public Class frmWD_Import_Doc_Record
                                     If CONTROL_ID = -1 Then
                                         Continue For
                                     End If
-                                    Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, IMPORT_REC_ID, idxvalue, Environment.UserName)
+                                    Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, IMPORT_REC_ID, idxvalue, USER_USERNAME)
                                     ClassDatabase.Execute_non_Query(ins)
                                     'ByVal WD_File As String, ByVal _Indexname As String, ByVal _Value As String
                                 Next
@@ -652,7 +652,7 @@ Public Class frmWD_Import_Doc_Record
             lblSaveProfile.Text = msg
             Me.TBPMO_WD_IMPORT_PROFILE_IDXBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE_IDX.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox1.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox1.Text = USER_USERNAME
                 Me.TBPMO_WD_IMPORT_PROFILE_IDXBindingSource.EndEdit()
                 Me.TBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(Me.DD_DMSDataSet.TBPMO_WD_IMPORT_PROFILE_IDX)
                 Me.lblSaveIDX.Visible = True

app/DD-Record-Organiser/frmWD_IndexFile.vb

@@ -27,13 +27,13 @@ Public Class frmWD_IndexFile
             '#################################################################
             If streamresult = True Then
                 Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
+                Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql)
                 Dim indexierung_erfolgreich As Boolean = False
                 'Einbauen dass auch Konfigurationen erlaubt sind wo der Doktyp und der Record fest gestzt sind
-                If dt Is Nothing = False Then 'CHECK DD
+                If DT_AUTO_INDEXE Is Nothing = False Then 'CHECK DD
-                    If dt.Rows.Count >= 0 Then
+                    If DT_AUTO_INDEXE.Rows.Count >= 0 Then
                         Dim Count As Integer = 0
-                        For Each row As DataRow In dt.Rows
+                        For Each row As DataRow In DT_AUTO_INDEXE.Rows
                             Dim indexname = row.Item("INDEXNAME").ToString
                             Dim idxvalue = row.Item("VALUE")
                             If idxvalue.ToString.StartsWith("@") Then
@@ -103,15 +103,15 @@ Public Class frmWD_IndexFile
                             Return False
                         End If
                         'den Entity-Key auslesen
+                        Dim DT As DataTable
                         sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & ClassWindream._WDObjekttyp & "')"
                         dt = ClassDatabase.Return_Datatable(sql)
                         If Not dt Is Nothing Then
                             If dt.Rows.Count = 1 Then
                                 'den Entity-Key auslesen
                                 Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                                Dim idxvalue = CURRENT_FORM_ID
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_FORM_ID.ToString, False)
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False)
+                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_FORM_ID)
-                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue)
                                 If indexierung_erfolgreich = False Then
                                     err = True
                                     MsgBox("Unexpected Error in indexing file Entity - See log", MsgBoxStyle.Critical)
@@ -120,36 +120,25 @@ Public Class frmWD_IndexFile
                                 If CURRENT_REDUNDANT_FORM_ID <> 0 Then
                                     indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID)
                                 End If
-                                'den Parent-Key auslesen
+                                'den Doctype auslesen
-                                indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
+                                indexname = DT.Rows(0).Item("IDXNAME_DOCTYPE").ToString
-                                idxvalue = CURRENT_PARENT_ENTITY_ID
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & vDokart.ToString, False)
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-ID: " & idxvalue.ToString, False)
+                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart)
-                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue)
+                                If indexierung_erfolgreich = False Then
+                                    err = True
+                                    MsgBox("Unexpected Error in indexing file Doctype - See log", MsgBoxStyle.Critical)
+                                    Return False
+                                End If
+                                'den Record_Key auslesen
+                                indexname = dt.Rows(0).Item("IDXNAME_RECORDID").ToString
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & CURRENT_RECORD_ID.ToString, False)
+                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_RECORD_ID)
                                 If indexierung_erfolgreich = False Then
                                     err = True
                                     MsgBox("Unexpected Error in indexing file Parent-ID - See log", MsgBoxStyle.Critical)
                                     Return False
                                 End If
-                                ''den Record-Key auslesen
+
-                                'indexname = dt.Rows(0).Item("IDXNAME_RECORDID").ToString
-                                'idxvalue = CURRENT_RECORD_ID
-                                'If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & idxvalue.ToString, False)
-                                'indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_FILEIN_WD, indexname, idxvalue)
-                                'If indexierung_erfolgreich = False Then
-                                '    err = True
-                                '    MsgBox("Unexpected Error in indexing file Record-ID - See log", MsgBoxStyle.Critical)
-                                '    Return False
-                                'End If
-                                ''den Doctype-Key auslesen
-                                'indexname = dt.Rows(0).Item("IDXNAME_DOCTYPE").ToString
-                                'idxvalue = CURRENT_DOKARTSTRING
-                                'If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & idxvalue.ToString, False)
-                                'indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_FILEIN_WD, indexname, idxvalue)
-                                'If indexierung_erfolgreich = False Then
-                                '    err = True
-                                '    MsgBox("Unexpected Error in indexing file Doctype - See log", MsgBoxStyle.Critical)
-                                '    Return False
-                                'End If
                             End If
                         End If
                         If indexierung_erfolgreich = True Then
@@ -176,14 +165,14 @@ Public Class frmWD_IndexFile
                                 'Die temporäre Datei löschen
                                 File.Delete(aktFiledropped)
                             End If
-                            ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
+                            'ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
-                            sql = String.Format("SELECT DocID FROM  VWPMO_WD_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
+                            sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
                             CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                             If Not IsNothing(CURRENT_DOC_ID) Then
                                 If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID) = False Then
                                     MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine & _
                                            "ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation)
-                                    DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, Environment.UserName, 1)
+                                    DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, USER_USERNAME, 1)
                                 End If
                                 'Create Session um Fehler bei windows Session icht zu erzeugen
                                 FAU_AD_USER = ""
@@ -193,18 +182,23 @@ Public Class frmWD_IndexFile
                                 End If
                                 ClassFileResult.DocID = CURRENT_DOC_ID
                                 ClassFileResult.SET_DOCID_INDICES()
-                                If ClassDOC_SEARCH.SET_RECORD_DOCID_LINK(CURRENT_DOC_ID, CURRENT_RECORD_ID) = True Then
+                                If ClassDOC_SEARCH.CREATE_DOC_RELATED_LINKS(CURRENT_DOC_ID, CURRENT_RECORD_ID) = False Then
-                                    Dim sel = String.Format("SELECT RECORD_ID FROM TBPMO_DOC_RECORD_LINK WHERE DOC_ID = {0} AND RECORD_ID <> {1}", CURRENT_DOC_ID, CURRENT_RECORD_ID
+                                    'Dim vktIndex = ClassDatabase.Execute_Scalar(String.Format("SELECT IDXNAME_RECORDID FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", ClassWindream._WDObjekttyp))
-                                                            )
+                                    'indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, vktIndex, CURRENT_RECORD_ID)
-                                    Dim DT_RECORD_LINK As DataTable = ClassDatabase.Return_Datatable(sel)
+                                    stg = "Unerwarteter Fehler: Der Record-Link konnte nicht erzeugt werden! Überprüfen Sie das Log."
-                                    If DT_RECORD_LINK.Rows.Count > 0 Then
+                                    If USER_LANGUAGE <> "de-DE" Then
-                                        Dim vktIndex = ClassDatabase.Execute_Scalar(String.Format("SELECT IDXNAME_RECORDID FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", ClassWindream._WDObjekttyp))
+                                        stg = "Unexpected Error: Could not create the recordlink! Please check the log."
-                                        For Each recRow As DataRow In DT_RECORD_LINK.Rows
+
-                                            Dim recid = recRow.Item(0)
-                                            indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, vktIndex, recid)
-                                        Next
                                     End If
+                                    MsgBox(stg, MsgBoxStyle.Critical, stg1)
                                 End If
+                            Else
+                                stg = "Unerwarteter Fehler: Es konnte keine DocID für die übertragene Datei erzeugt werden!"
+                                If USER_LANGUAGE <> "de-DE" Then
+                                    stg = "Unexpected Error: Could not get a docId for transmitted file!"
+
+                                End If
+                                MsgBox(stg, MsgBoxStyle.Critical, stg1)
                             End If
                         Else
                             MsgBox("An unexpected error occured while indexing file. Please check the log!", MsgBoxStyle.Exclamation)
@@ -484,7 +478,7 @@ Public Class frmWD_IndexFile
                 'Die erste Datei indexieren
                 If WORK_FILE(Me.txtFilepath.Text, Me.PATHTextBox.Text, doctype_id, My.Settings.WD_INDEXDOKART_SAVE, True) = True Then
                     'Und nun die folgenden
-                    Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_FILEID & " AND UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')")
+                    Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_FILEID & " AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')")
                     If Not DTFiles2Work Is Nothing Then
                         Dim err = False
                         For Each filerow As DataRow In DTFiles2Work.Rows
@@ -513,7 +507,6 @@ Public Class frmWD_IndexFile
                                 stg = "All files were transferred via Multiindexing to windream"
                                 stg1 = "Success:"
                             End If
-                            ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
                             MsgBox(stg, MsgBoxStyle.Information, stg1)
                             Me.Close()
                         End If
@@ -1068,7 +1061,7 @@ Public Class frmWD_IndexFile
             chkdelete_origin.Visible = False
             CURRENT_FILENAME = ClassDatabase.Execute_Scalar("SELECT FILENAME2WORK FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID)
             Dim HandleType As String = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID)
-            MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_FILEID & " AND UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')")
+            MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_FILEID & " AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')")
             If MULTIFILES > 0 Then
                 chkMultiIndexer.Text = "Multi-Indexing - Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren"
                 chkMultiIndexer.Visible = True

app/DD-Record-Organiser/frmWD_ObjecttypeConfig.vb

@@ -15,7 +15,7 @@
         Try
             Me.TBPMO_WD_OBJECTTYPEBindingSource.EndEdit()
             If DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_WD_OBJECTTYPEBindingSource.EndEdit()
                 Me.TBPMO_WD_OBJECTTYPETableAdapter.Update(Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE)
                 Me.lblSaveDokart.Visible = True
@@ -81,7 +81,7 @@
 
     Private Sub TBPMO_WD_OBJECTTYPEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WD_OBJECTTYPEBindingSource.AddingNew
         Try
-            Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
         Catch ex As Exception
             MsgBox("Error in Save Objecttype-Config:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try

app/DD-Record-Organiser/frmWD_Resultlist_Config.vb

@@ -43,7 +43,7 @@
             Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource.EndEdit()
 
             If DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.GetChanges() IsNot Nothing Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource.EndEdit()
                 Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter.Update(Me.DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG)
                 labelSuccess.Visible = True
@@ -57,7 +57,7 @@
     End Sub
 
     Private Sub TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource.AddingNew
-        DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub grvwMain_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles grvwMain.FocusedRowChanged

app/RecordOrganizer_RightManager/frmUsersReworkRights.Designer.vb

@@ -37,6 +37,7 @@ Partial Class frmUsersReworkRights
         Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colID = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.ProgressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel()
         CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -177,11 +178,24 @@ Partial Class frmUsersReworkRights
         Me.colID.FieldName = "ID"
         Me.colID.Name = "colID"
         '
+        'ProgressPanel1
+        '
+        Me.ProgressPanel1.Appearance.BackColor = System.Drawing.Color.Transparent
+        Me.ProgressPanel1.Appearance.Options.UseBackColor = True
+        Me.ProgressPanel1.Description = "Collecting rights ..."
+        Me.ProgressPanel1.Location = New System.Drawing.Point(28, 324)
+        Me.ProgressPanel1.Name = "ProgressPanel1"
+        Me.ProgressPanel1.Size = New System.Drawing.Size(463, 45)
+        Me.ProgressPanel1.TabIndex = 90
+        Me.ProgressPanel1.Text = "ProgressPanel1"
+        Me.ProgressPanel1.Visible = False
+        '
         'frmUsersReworkRights
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(528, 324)
+        Me.ClientSize = New System.Drawing.Size(528, 381)
+        Me.Controls.Add(Me.ProgressPanel1)
         Me.Controls.Add(Me.GridControlUsers2Menue)
         Me.Controls.Add(Me.lblstate)
         Me.Controls.Add(Me.btncancel)
@@ -220,4 +234,5 @@ Partial Class frmUsersReworkRights
     Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colID As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents ProgressPanel1 As DevExpress.XtraWaitForm.ProgressPanel
 End Class

app/RecordOrganizer_RightManager/frmUsersReworkRights.vb

@@ -58,7 +58,9 @@ Public Class frmUsersReworkRights
                 ProgressBar1.Maximum = Count + 1
                 lblstate.Visible = True
                 lblstate.Text = "Background Worker started...."
+                ProgressPanel1.Description = "Preparing Right-Collector...."
                 Me.ProgressBar1.Visible = True
+                ProgressPanel1.Visible = True
                 btnCheckRights.Enabled = False
                 btncancel.Visible = True
                 AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork
@@ -76,6 +78,7 @@ Public Class frmUsersReworkRights
 
     Private Sub BW_RightsEntity_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BW_RightsEntity.ProgressChanged
         Me.ProgressBar1.Value = e.ProgressPercentage
+        ProgressPanel1.Description = "Collecting rights for user...."
     End Sub
     Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs)
         Dim worker As BackgroundWorker = CType(sender, BackgroundWorker)
@@ -83,6 +86,7 @@ Public Class frmUsersReworkRights
         Dim i As Integer = 1
         For Each row As DataRow In MyDataset.TBAD_Users.Rows
             If row.Item(0) = CBool(True) Then
+                ' ProgressPanel1.Description = "Collecting rights for user: " & row.Item("USERNAME")
                 Dim proc = String.Format("EXEC PRPMO_RIGHTS_SERVICE_CHECK_USER {0}, '{1}'", row.Item(5), Environment.UserName)
                 If ClassDatabase.Execute_non_Query(proc) = False Then
                     MsgBox("Unexpected Error in Executing rightprocedure - Check the log!", MsgBoxStyle.Critical)
@@ -108,16 +112,19 @@ Public Class frmUsersReworkRights
             btncancel.Visible = False
             ProgressBar1.Visible = False
             lblstate.Visible = False
+            btnCheckRights.Enabled = True
+            btncancel.Visible = False
+            ProgressPanel1.Visible = False
             If _error = False Then
                 MsgBox("All rights of files belonging to User were checked and transmitted to the server!" & vbNewLine & "The setting of the rights might take up to 10 minutes!", MsgBoxStyle.Information)
             Else
                 MsgBox("Some errors occured while checking and transmitting the rights...please check the log!", MsgBoxStyle.Exclamation)
             End If
-            btnCheckRights.Enabled = True
+         
-            btncancel.Visible = False
         Catch ex As Exception
             btnCheckRights.Enabled = True
             btncancel.Visible = False
+            ProgressPanel1.Visible = False
         End Try
     End Sub
 End Class