MS

app/DD-Record-Organiser/ClassDOC_SEARCH.vb

@@ -128,7 +128,7 @@ Public Class ClassDOC_SEARCH
                 '    ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN4','{7}')) AS DROPDOWN4 " & _
                 '"FROM VWPMO_WD_DOC_SEARCH WHERE RECORD_ID = {0} AND ENTITY_ID = {1} AND DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE)
             End If
-
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False)
             Return ClassDatabase.Return_Datatable_Connection(SQL_DOC_SEARCH, 1)
         Catch ex As Exception
             ClassLogger.Add("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message, True)

app/DD-Record-Organiser/ClassDragDrop.vb

@@ -79,7 +79,7 @@ Public Class ClassDragDrop
                     If (finTemp.Exists = True) Then
                         ReDim Preserve files_dropped(0)
                         files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile
-                        If LogErrorsOnly = False Then ClassLogger.Add(">> Drop an Attachment - File: " & strOutFile, False)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Drop an Attachment - File: " & strOutFile, False)
                         Return True
                     Else
                         ClassLogger.Add(">> Attachment File from Outlook could not be created", False)

app/DD-Record-Organiser/ClassFileResult.vb

@@ -33,8 +33,9 @@
     End Function
     Public Shared Function GET_DATATABLE_INDICES_PMO()
         Try
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_INDEX_MAN WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND DOCTYPE_ID = " & CURRENT_DOKARTID)
+            Dim sql = String.Format("SELECT * FROM TBPMO_INDEX_MAN WHERE ENTITY_ID = (SELECT CASE REDUNDANT_ENTITY WHEN 0 THEN GUID ELSE REDUNDANT_ENTITY END AS ENTITY_ID  FROM TBPMO_FORM WHERE GUID = {0}) AND DOCTYPE_ID = {1}", CURRENT_FORM_ID, CURRENT_DOKARTID)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> GET_DATATABLE_INDICES_PMO: SELECT * FROM TBPMO_INDEX_MAN WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND DOCTYPE_ID = " & CURRENT_DOKARTID, True)
+            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> GET_DATATABLE_INDICES_PMO: " & sql, True)
             CURRENT_TBPMO_INDEX_MAN = DT
             Return True
         Catch ex As Exception

app/DD-Record-Organiser/ClassImport_Windream.vb

@@ -231,7 +231,7 @@ Public Class ClassImport_Windream
                                                     sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                                     Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_AUTOindexresult, True)
                                                     If IsNothing(AUTOindexresult) Then
-                                                        ClassLogger.Add(">> unexpected: AUTOindexresult is nothing!!", False)
+                                                        ClassLogger.Add(">> ATTENTION: unexpected: AUTOindexresult is nothing!!", False)
                                                         ClassLogger.Add(">> " & sql_AUTOindexresult, False)
                                                         value = ""
                                                     Else
@@ -269,7 +269,7 @@ Public Class ClassImport_Windream
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_FORM_ID)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_FORM_ID)
-                                                    If LogErrorsOnly = False Then ClassLogger.Add(">> variable sql will be used for convention", False)
+                                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
                                                     Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                                     If Not IsNothing(result) Then
                                                         value = result.ToString
@@ -575,7 +575,7 @@ Public Class ClassImport_Windream
                             End Select
                             FolderConvention = FolderConvention.Replace(element.ToString, folder_temp)
                         End If
-                       
+
                     Case "C"
                         'Füllen mit Controlwert
                         Dim elmt = element.Value.Substring(3, element.Value.Length - 4).Split("#")
@@ -594,7 +594,7 @@ Public Class ClassImport_Windream
                                         lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_FORM_ID)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_FORM_ID)
-                                        If LogErrorsOnly = False Then ClassLogger.Add(">> variable sql will be used for convention", False)
+                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
                                         Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                         If Not IsNothing(result) Then
                                             FolderConvention = FolderConvention.Replace(element.ToString, result.ToString)

app/DD-Record-Organiser/ClassNodeNavigation.vb

@@ -0,0 +1,336 @@
+Public Class ClassNodeNavigation
+    Public Shared Function CreateTreeViewNodes(DT_TREEVIEW_PER_CONTROLS As DataTable, TREEVIEW_IMAGELIST As ImageList)
+        Try
+            ' Rootnode erstellen und taggen
+            If DT_TREEVIEW_PER_CONTROLS.Rows.Count > 1 Then
+                ' Presuming the DataTable has a column named ENTITY_ID and TYPE_NODE.
+                Dim expression As String
+                expression = "TYPE_NODE = 0"
+                Dim foundRowsLevel0() As DataRow
+                ' Use the Select method to find all rows matching the filter.
+                foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression, "NODE_CAPTION")
+                Dim i As Integer
+                Dim NODE_CONFIG_ID
+                Dim LEVEL0_NODE As TreeNode
+
+                ' For each row create a Node
+                For i = 0 To foundRowsLevel0.GetUpperBound(0)
+                    Dim ID = foundRowsLevel0(i)("GUID")
+                    Dim LevelEntity = foundRowsLevel0(i)("ENTITY_ID")
+                    Dim controlID = foundRowsLevel0(i)("CONTROL_ID")
+                    Dim nodetext = foundRowsLevel0(i)("NODE_CAPTION")
+                    Dim Type_node = foundRowsLevel0(i)("TYPE_NODE")
+                    Dim RECORD_ID = foundRowsLevel0(i)("RECORD_ID")
+                    NODE_CONFIG_ID = foundRowsLevel0(i)("NODE_CONFIG_ID")
+
+                    LEVEL0_NODE = New TreeNode(nodetext)
+                    If Not IsDBNull(RECORD_ID) Then
+                        LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID & "#RECORD-ID" & RECORD_ID.ToString
+                    Else
+                        LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID
+                    End If
+
+                    Dim index As Integer = 0
+                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                        If img = NODE_CONFIG_ID & "#" & LevelEntity Then
+                            Exit For
+                        End If
+                        index += 1
+                    Next
+                    LEVEL0_NODE.ImageIndex = index
+                    LEVEL0_NODE.SelectedImageIndex = index
+
+                    '### LEVEL 1 laden #######
+                    Dim expressionLevel1 As String
+                    expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND  Einschränkung auf Type 2 und Parent_Guid
+                    Dim foundRowsLevel1() As DataRow
+                    foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1, "NODE_CAPTION")
+                    Dim j As Integer
+                    For j = 0 To foundRowsLevel1.GetUpperBound(0)
+                        Dim ID1 = foundRowsLevel1(j)("GUID")
+                        Dim LevelEntity1 = foundRowsLevel1(j)("ENTITY_ID")
+                        Dim controlID1 = foundRowsLevel1(j)("CONTROL_ID")
+                        Dim nodetext1 = foundRowsLevel1(j)("NODE_CAPTION")
+                        Dim Type_node1 = foundRowsLevel1(j)("TYPE_NODE")
+                        RECORD_ID = foundRowsLevel1(j)("RECORD_ID")
+                        NODE_CONFIG_ID = foundRowsLevel1(j)("NODE_CONFIG_ID")
+                        ' Node erstellen..
+                        Dim LEVEL1_NODE As TreeNode
+                        LEVEL1_NODE = New TreeNode(nodetext1)
+                        If Not IsDBNull(RECORD_ID) Then
+                            LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1 & "#RECORD-ID" & RECORD_ID.ToString
+                        Else
+                            LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1
+                        End If
+
+                        index = 0
+                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                            If img = NODE_CONFIG_ID & "#" & LevelEntity1 Then
+                                Exit For
+                            End If
+                            index += 1
+                        Next
+                        LEVEL1_NODE.ImageIndex = index
+                        LEVEL1_NODE.SelectedImageIndex = index
+                        ' ..und einfügen
+                        LEVEL0_NODE.Nodes.Add(LEVEL1_NODE)
+                        '### LEVEL 2 laden #######
+                        Dim expressionLevel2 As String
+                        expressionLevel2 = "PARENT_GUID = " & ID1 'TYPE_NODE = 2 AND Einschränkung auf Type  und Parent_Guid
+                        Dim foundRowsLevel2() As DataRow
+                        foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2, "NODE_CAPTION")
+                        Dim k As Integer
+                        For k = 0 To foundRowsLevel2.GetUpperBound(0)
+                            Dim ID2 = foundRowsLevel2(k)("GUID")
+                            Dim LevelEntity2 = foundRowsLevel2(k)("ENTITY_ID")
+                            Dim controlID2 = foundRowsLevel2(k)("CONTROL_ID")
+                            Dim nodetext2 = foundRowsLevel2(k)("NODE_CAPTION")
+                            RECORD_ID = foundRowsLevel2(k)("RECORD_ID")
+                            NODE_CONFIG_ID = foundRowsLevel2(k)("NODE_CONFIG_ID")
+                            ' Node erstellen..
+                            Dim LEVEL2_NODE As TreeNode
+                            LEVEL2_NODE = New TreeNode(nodetext2)
+                            If Not IsDBNull(RECORD_ID) Then
+                                LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2 & "#RECORD-ID" & RECORD_ID.ToString
+                            Else
+                                LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2
+                            End If
+
+                            index = 0
+                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                If img = NODE_CONFIG_ID & "#" & LevelEntity2 Then
+                                    Exit For
+                                End If
+                                index += 1
+                            Next
+                            LEVEL2_NODE.ImageIndex = index
+                            LEVEL2_NODE.SelectedImageIndex = index
+                            ' ..und einfügen
+                            LEVEL1_NODE.Nodes.Add(LEVEL2_NODE)
+                            '### LEVEL 3 laden #######
+                            Dim expressionLevel3 As String
+                            expressionLevel3 = "PARENT_GUID = " & ID2 'TYPE_NODE = 3 AND  Einschränkung auf Type  und Parent_Guid
+                            Dim foundRowsLevel3() As DataRow
+                            foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3, "NODE_CAPTION")
+                            Dim l As Integer
+                            For l = 0 To foundRowsLevel3.GetUpperBound(0)
+                                Dim ID3 = foundRowsLevel3(l)("GUID")
+                                Dim LevelEntity3 = foundRowsLevel3(l)("ENTITY_ID")
+                                Dim controlID3 = foundRowsLevel3(l)("CONTROL_ID")
+                                Dim nodetext3 = foundRowsLevel3(l)("NODE_CAPTION")
+                                RECORD_ID = foundRowsLevel3(l)("RECORD_ID")
+                                NODE_CONFIG_ID = foundRowsLevel3(l)("NODE_CONFIG_ID")
+                                ' Node erstellen..
+                                Dim LEVEL3_NODE As TreeNode
+                                LEVEL3_NODE = New TreeNode(nodetext3)
+                                If Not IsDBNull(RECORD_ID) Then
+                                    LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3 & "#RECORD-ID" & RECORD_ID.ToString
+                                Else
+                                    LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3
+                                End If
+
+                                index = 0
+                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                    If img = NODE_CONFIG_ID & "#" & LevelEntity3 Then
+                                        Exit For
+                                    End If
+                                    index += 1
+                                Next
+                                LEVEL3_NODE.ImageIndex = index
+                                LEVEL3_NODE.SelectedImageIndex = index
+                                ' ..und einfügen
+                                LEVEL2_NODE.Nodes.Add(LEVEL3_NODE)
+                                '### LEVEL 4 laden #######
+                                Dim expressionLevel4 As String
+                                expressionLevel4 = "PARENT_GUID = " & ID3 'TYPE_NODE = 4 AND Einschränkung auf Type  und Parent_Guid
+                                Dim foundRowsLevel4() As DataRow
+                                foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4, "NODE_CAPTION")
+                                Dim m As Integer
+                                For m = 0 To foundRowsLevel4.GetUpperBound(0)
+                                    Dim ID5 = foundRowsLevel4(m)("GUID")
+                                    Dim LevelEntity5 = foundRowsLevel4(m)("ENTITY_ID")
+                                    Dim controlID5 = foundRowsLevel4(m)("CONTROL_ID")
+                                    Dim nodetext5 = foundRowsLevel4(m)("NODE_CAPTION")
+                                    RECORD_ID = foundRowsLevel4(m)("RECORD_ID")
+                                    NODE_CONFIG_ID = foundRowsLevel4(m)("NODE_CONFIG_ID")
+                                    ' Node erstellen..
+                                    Dim LEVEL4_NODE As TreeNode
+                                    LEVEL4_NODE = New TreeNode(nodetext5)
+                                    If Not IsDBNull(RECORD_ID) Then
+                                        LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5 & "#RECORD-ID" & RECORD_ID.ToString
+                                    Else
+                                        LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5
+                                    End If
+
+                                    index = 0
+                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                        If img = NODE_CONFIG_ID & "#" & LevelEntity5 Then
+                                            Exit For
+                                        End If
+                                        index += 1
+                                    Next
+                                    LEVEL4_NODE.ImageIndex = index
+                                    LEVEL4_NODE.SelectedImageIndex = index
+                                    ' ..und einfügen
+                                    LEVEL3_NODE.Nodes.Add(LEVEL4_NODE)
+                                    '### LEVEL 5 laden #######
+                                    Dim expressionLevel5 As String
+                                    Dim sortExp As String = "NODE_CONFIG_ID, NODE_CAPTION"
+                                    expressionLevel5 = "PARENT_GUID = " & ID5 'TYPE_NODE = 5 AND  Einschränkung auf Type  und Parent_Guid
+                                    Dim foundRowsLevel5() As DataRow
+                                    foundRowsLevel5 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel5, sortExp)
+                                    Dim n As Integer
+                                    If ID5 = 1146 Then
+                                        Console.WriteLine("Aha")
+                                    End If
+                                    For n = 0 To foundRowsLevel5.GetUpperBound(0)
+                                        Dim ID6 = foundRowsLevel5(n)("GUID")
+                                        Dim LevelEntity6 = foundRowsLevel5(n)("ENTITY_ID")
+                                        Dim controlID6 = foundRowsLevel5(n)("CONTROL_ID")
+                                        Dim nodetext6 = foundRowsLevel5(n)("NODE_CAPTION")
+                                        RECORD_ID = foundRowsLevel5(n)("RECORD_ID")
+                                        NODE_CONFIG_ID = foundRowsLevel5(n)("NODE_CONFIG_ID")
+                                        ' Node erstellen..
+                                        Dim LEVEL5_NODE As TreeNode
+                                        LEVEL5_NODE = New TreeNode(nodetext6)
+                                        If Not IsDBNull(RECORD_ID) Then
+                                            LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6 & "#RECORD-ID" & RECORD_ID.ToString
+                                        Else
+                                            LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6
+                                        End If
+
+                                        index = 0
+                                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                            If img = NODE_CONFIG_ID & "#" & LevelEntity6 Then
+                                                Exit For
+                                            End If
+                                            index += 1
+                                        Next
+                                        LEVEL5_NODE.ImageIndex = index
+                                        LEVEL5_NODE.SelectedImageIndex = index
+                                        ' ..und einfügen
+                                        LEVEL4_NODE.Nodes.Add(LEVEL5_NODE)
+                                        '### LEVEL 5 laden #######
+                                        Dim expressionLevel6 As String
+                                        expressionLevel6 = "PARENT_GUID = " & ID6 'TYPE_NODE = 6 AND  Einschränkung auf Type  und Parent_Guid
+                                        Dim foundRowsLevel6() As DataRow
+                                        foundRowsLevel6 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel6, sortExp)
+                                        If ID6 = 1146 Then
+                                            Console.WriteLine("Aha")
+                                        End If
+                                        Dim o As Integer
+                                        For o = 0 To foundRowsLevel6.GetUpperBound(0)
+                                            Dim ID7 = foundRowsLevel6(o)("GUID")
+                                            Dim LevelEntity7 = foundRowsLevel6(o)("ENTITY_ID")
+                                            Dim controlID7 = foundRowsLevel6(o)("CONTROL_ID")
+                                            Dim nodetext7 = foundRowsLevel6(o)("NODE_CAPTION")
+                                            RECORD_ID = foundRowsLevel6(o)("RECORD_ID")
+                                            NODE_CONFIG_ID = foundRowsLevel6(o)("NODE_CONFIG_ID")
+                                            ' Node erstellen..
+                                            Dim LEVEL6_NODE As TreeNode
+                                            LEVEL6_NODE = New TreeNode(nodetext7)
+                                            If Not IsDBNull(RECORD_ID) Then
+                                                LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7 & "#RECORD-ID" & RECORD_ID.ToString
+                                            Else
+                                                LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7
+                                            End If
+
+                                            index = 0
+                                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                                If img = NODE_CONFIG_ID & "#" & LevelEntity7 Then
+                                                    Exit For
+                                                End If
+                                                index += 1
+                                            Next
+                                            LEVEL6_NODE.ImageIndex = index
+                                            LEVEL6_NODE.SelectedImageIndex = index
+                                            ' ..und einfügen
+                                            LEVEL5_NODE.Nodes.Add(LEVEL6_NODE)
+                                            '### LEVEL 7 laden #######
+                                            Dim expressionLevel7 As String
+                                            expressionLevel7 = "PARENT_GUID = " & ID7 'TYPE_NODE = 7 AND Einschränkung auf Type  und Parent_Guid
+                                            Dim foundRowsLevel7() As DataRow
+                                            foundRowsLevel7 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel7, sortExp)
+                                            Dim p As Integer
+                                            For p = 0 To foundRowsLevel7.GetUpperBound(0)
+                                                Dim ID8 = foundRowsLevel7(p)("GUID")
+                                                Dim LevelEntity8 = foundRowsLevel7(p)("ENTITY_ID")
+                                                Dim controlID8 = foundRowsLevel7(p)("CONTROL_ID")
+                                                Dim nodetext8 = foundRowsLevel7(p)("NODE_CAPTION")
+                                                RECORD_ID = foundRowsLevel7(p)("RECORD_ID")
+                                                NODE_CONFIG_ID = foundRowsLevel7(p)("NODE_CONFIG_ID")
+                                                ' Node erstellen..
+                                                Dim LEVEL7_NODE As TreeNode
+                                                LEVEL7_NODE = New TreeNode(nodetext8)
+                                                If Not IsDBNull(RECORD_ID) Then
+                                                    LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8 & "#RECORD-ID" & RECORD_ID.ToString
+                                                Else
+                                                    LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8
+                                                End If
+
+                                                index = 0
+                                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                                    If img = NODE_CONFIG_ID & "#" & LevelEntity8 Then
+                                                        Exit For
+                                                    End If
+                                                    index += 1
+                                                Next
+                                                LEVEL7_NODE.ImageIndex = index
+                                                LEVEL7_NODE.SelectedImageIndex = index
+                                                ' ..und einfügen
+                                                LEVEL6_NODE.Nodes.Add(LEVEL7_NODE)
+                                                '### LEVEL 7 laden #######
+                                                Dim expressionLevel8 As String
+                                                expressionLevel8 = "PARENT_GUID = " & ID8 'TYPE_NODE = 7 AND  Einschränkung auf Type  und Parent_Guid
+                                                Dim foundRowsLevel8() As DataRow
+                                                foundRowsLevel8 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel8, sortExp)
+                                                Dim q As Integer
+                                                For q = 0 To foundRowsLevel8.GetUpperBound(0)
+                                                    Dim ID9 = foundRowsLevel8(q)("GUID")
+                                                    Dim LevelEntity9 = foundRowsLevel8(q)("ENTITY_ID")
+                                                    Dim controlID9 = foundRowsLevel8(q)("CONTROL_ID")
+                                                    Dim nodetext9 = foundRowsLevel8(q)("NODE_CAPTION")
+                                                    RECORD_ID = foundRowsLevel8(q)("RECORD_ID")
+                                                    NODE_CONFIG_ID = foundRowsLevel8(q)("NODE_CONFIG_ID")
+                                                    ' Node erstellen..
+                                                    Dim LEVEL8_NODE As TreeNode
+                                                    LEVEL8_NODE = New TreeNode(nodetext9)
+                                                    If Not IsDBNull(RECORD_ID) Then
+                                                        LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9 & "#RECORD-ID" & RECORD_ID.ToString
+                                                    Else
+                                                        LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9
+                                                    End If
+
+                                                    index = 0
+                                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+                                                        If img = NODE_CONFIG_ID & "#" & LevelEntity9 Then
+                                                            Exit For
+                                                        End If
+                                                        index += 1
+                                                    Next
+                                                    LEVEL8_NODE.ImageIndex = index
+                                                    LEVEL8_NODE.SelectedImageIndex = index
+                                                    ' ..und einfügen
+                                                    LEVEL7_NODE.Nodes.Add(LEVEL8_NODE)
+                                                    '### LEVEL 8 laden #######
+                                                Next ' Level 7 Ende
+                                            Next ' Level 7 Ende
+                                        Next ' Level 6 Ende
+                                    Next ' Level 5 Ende
+                                Next 'Level 4 Ende
+                            Next 'Level 3 Ende
+                        Next ' Level 2 Ende
+                    Next 'Level 1 Ende
+                Next
+                Return LEVEL0_NODE
+            Else
+                MsgBox("Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical)
+                Return Nothing
+            End If
+        Catch ex As Exception
+            ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodes (NodeNavigation): " & ex.Message, True)
+            MsgBox("Error in CreateTreeViewNodes (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            Return Nothing
+        End Try
+    End Function
+End Class

app/DD-Record-Organiser/ClassSAP.vb

@@ -133,7 +133,7 @@ Public Class ClassSAP
     Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0)
         Try
             Dim RESULT_TABLE As DataTable = New DataTable
-            If LogErrorsOnly = False Then ClassLogger.Add(">> Get data from SAP Table", False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> Get data from SAP Table", False)
             Dim table As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
             'Dim cWhereClause = "SAP_OBJECT EQ '<ObjectType>' AND AR_DATE GE '<AR_DATE>'"
             'Dim sSearchDate1 = "20160101"
@@ -146,9 +146,9 @@ Public Class ClassSAP
             If RowLimit <> 0 Then
                 table.RowCount = RowLimit
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(">>Table.Run executing.....", False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >>Table.Run executing.....", False)
             table.Run()
-            If LogErrorsOnly = False Then ClassLogger.Add(">>Table.Run executed", False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >>Table.Run executed", False)
             RESULT_TABLE = table.Result
             SAP_CONNECTION.Close()
             Return RESULT_TABLE

app/DD-Record-Organiser/ClassWindreamDocGrid.vb

@@ -6,48 +6,153 @@ Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 
 Public Class ClassWindreamDocGrid
-    Public Shared RESULT_DOC_PATH As String
+    Public Shared SELECTED_DOC_PATH As String
-    Public Shared RESULT_OBJECTTYPE As String
+    'Public Shared RESULT_OBJECTTYPE As String
-    Public Shared RESULT_INWORK As Boolean
+    Public Shared SELECTED_INWORK As Boolean
-    Public Shared RESULT_DOC_ID As Integer
+    Public Shared SELECTED_DOC_ID As Integer
-    Public Shared RESULT_DISPLAYNAME As String
+    'Public Shared RESULT_DISPLAYNAME As String
     Public Shared RESULT_CONFIG_IDS As Hashtable
 
+    Public Shared DT_RESULTFILES As DataTable
+
     Private Shared _dropdownValueChangedHandler As EventHandler
     Private Shared _datepickerValueChangedHandler As EventHandler
     Private Shared _textValueChangedHandler As EventHandler
-
+    Private Shared Function Init_Table()
+        Try
+            Dim table As New DataTable
+            table.TableName = "TBSELECTED_FILES"
+            ' Create two columns, ID and Name.
+            table.Columns.Add("DOC_ID", GetType(Integer))
+            table.Columns.Add("DOC_PATH", GetType(System.String))
+            table.Columns.Add("OBJECTTYPE", GetType(System.String))
+            table.Columns.Add("INWORK", GetType(System.Boolean))
+            table.Columns.Add("DISPLAYNAME", GetType(System.String))
+            DT_RESULTFILES = table
+            Return True
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in Initting TableResult Docs: " & ex.Message, True)
+            DT_RESULTFILES = Nothing
+            Return False
+        End Try
+     
+    End Function
     Public Shared Sub GetDocItems(gridView As GridView)
-        Try
+        If Init_Table() = True Then
-            RESULT_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+            If gridView.SelectedRowsCount > 0 Then
-        Catch ex As Exception
+                DT_RESULTFILES.Clear()
-            ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_PATH: " & ex.Message, False)
+                For Each row In gridView.GetSelectedRows
-            RESULT_DOC_PATH = Nothing
+                    Dim newRow As DataRow = DT_RESULTFILES.NewRow()
-        End Try
+                    Try
-        Try
+                        Dim DOC_ID = gridView.GetRowCellValue(row, "DocID")
-            RESULT_OBJECTTYPE = gridView.GetFocusedRowCellValue(gridView.Columns("OBJECTTYPE"))
+                        SELECTED_DOC_ID = DOC_ID
-        Catch ex As Exception
+                        newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
-            ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_OBJECTTYPE: " & ex.Message, False)
+                    Catch ex As Exception
-            RESULT_OBJECTTYPE = ""
+                        newRow("DOC_ID") = 0
-        End Try
+                    End Try
-        Try
+                    Try
-            RESULT_INWORK = gridView.GetFocusedRowCellValue(gridView.Columns("in work?"))
+                        SELECTED_DOC_PATH = gridView.GetRowCellValue(row, "FULLPATH")
-        Catch ex As Exception
+                        newRow("DOC_PATH") = gridView.GetRowCellValue(row, "FULLPATH")
-            ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_INWORK: " & ex.Message, False)
+                    Catch ex As Exception
-            RESULT_INWORK = ""
+                        newRow("DOC_PATH") = ""
-        End Try
+                    End Try
-        Try
+                    Try
-            RESULT_DOC_ID = gridView.GetFocusedRowCellValue(gridView.Columns("DocID"))
+                        newRow("OBJECTTYPE") = gridView.GetRowCellValue(row, "OBJECTTYPE")
-        Catch ex As Exception
+                    Catch ex As Exception
-            ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_ID: " & ex.Message, False)
+                        newRow("OBJECTTYPE") = ""
-            RESULT_DOC_ID = Nothing
+                    End Try
-        End Try
+                    Try
-        Try
+                        newRow("INWORK") = gridView.GetRowCellValue(row, "in work?")
-            RESULT_DISPLAYNAME = gridView.GetFocusedRowCellValue(gridView.Columns("Displayname"))
+                    Catch ex As Exception
-        Catch ex As Exception
+                        newRow("INWORK") = False
-            ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DISPLAYNAME: " & ex.Message, False)
+                    End Try
-            RESULT_DISPLAYNAME = ""
+                    Try
-        End Try
+                        Dim dpn = gridView.GetRowCellValue(row, "Displayname")
+                        If IsDBNull(dpn) Then
+                            dpn = ""
+                        End If
+                        newRow("DISPLAYNAME") = dpn
+                    Catch ex As Exception
+                        newRow("DISPLAYNAME") = ""
+                    End Try
+                    DT_RESULTFILES.Rows.Add(newRow)
+                    DT_RESULTFILES.AcceptChanges()
+                Next
+            Else
+                Dim newRow As DataRow = DT_RESULTFILES.NewRow()
+                Try
+                    Dim DOC_ID = gridView.GetFocusedRowCellValue(gridView.Columns("DocID"))
+                    SELECTED_DOC_ID = DOC_ID
+                    newRow("DOC_ID") = gridView.GetFocusedRowCellValue(gridView.Columns("DocID"))
+                Catch ex As Exception
+                    newRow("DOC_ID") = 0
+                End Try
+                Try
+                    SELECTED_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+                    newRow("DOC_PATH") = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+                Catch ex As Exception
+                    newRow("DOC_PATH") = ""
+                End Try
+                Try
+                    newRow("OBJECTTYPE") = gridView.GetFocusedRowCellValue(gridView.Columns("OBJECTTYPE"))
+                Catch ex As Exception
+                    newRow("OBJECTTYPE") = ""
+                End Try
+                Try
+                    newRow("INWORK") = gridView.GetFocusedRowCellValue(gridView.Columns("in work?"))
+                Catch ex As Exception
+                    newRow("INWORK") = False
+                End Try
+                Try
+                    Dim dpn = gridView.GetFocusedRowCellValue(gridView.Columns("Displayname"))
+                    If IsDBNull(dpn) Then
+                        dpn = ""
+                    End If
+                    newRow("DISPLAYNAME") = dpn
+                Catch ex As Exception
+                    newRow("DISPLAYNAME") = ""
+                End Try
+                DT_RESULTFILES.Rows.Add(newRow)
+                DT_RESULTFILES.AcceptChanges()
+            End If
+
+        End If
+        'If gridView.SelectedRowsCount = 1 Then
+        '    Try
+        '        RESULT_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH"))
+        '    Catch ex As Exception
+        '        ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_PATH: " & ex.Message, False)
+        '        RESULT_DOC_PATH = Nothing
+        '    End Try
+        '    Try
+        '        RESULT_OBJECTTYPE = gridView.GetFocusedRowCellValue(gridView.Columns("OBJECTTYPE"))
+        '    Catch ex As Exception
+        '        ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_OBJECTTYPE: " & ex.Message, False)
+        '        RESULT_OBJECTTYPE = ""
+        '    End Try
+        '    Try
+        '        RESULT_INWORK = gridView.GetFocusedRowCellValue(gridView.Columns("in work?"))
+        '    Catch ex As Exception
+        '        ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_INWORK: " & ex.Message, False)
+        '        RESULT_INWORK = ""
+        '    End Try
+        '    Try
+        '        RESULT_DOC_ID = gridView.GetFocusedRowCellValue(gridView.Columns("DocID"))
+        '    Catch ex As Exception
+        '        ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_ID: " & ex.Message, False)
+        '        RESULT_DOC_ID = Nothing
+        '    End Try
+        '    Try
+        '        RESULT_DISPLAYNAME = gridView.GetFocusedRowCellValue(gridView.Columns("Displayname"))
+        '    Catch ex As Exception
+        '        ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DISPLAYNAME: " & ex.Message, False)
+        '        RESULT_DISPLAYNAME = ""
+        '    End Try
+        'Else
+
+
+        'End If
+
     End Sub
 
     Public Shared Sub FillColumns(gridView As GridView, DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable, DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler)

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

@@ -255,6 +255,7 @@
     <Compile Include="ClassJumpRecord.vb" />
     <Compile Include="ClassLicence.vb" />
     <Compile Include="ClassAsyncSQL.vb" />
+    <Compile Include="ClassNodeNavigation.vb" />
     <Compile Include="ClassNodes.vb" />
     <Compile Include="ClassRecordState.vb" />
     <Compile Include="ClassRecordView.vb" />

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

@@ -36604,7 +36604,7 @@ Namespace DD_DMSDataSetTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(2) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        FORMVIEW_ID, FORM_ID, FORM_TITLE, DOKUMENTTYPE_ID, DOKUMENTTYPE, PA"& _ 
@@ -36618,6 +36618,13 @@ Namespace DD_DMSDataSetTableAdapters
                 "TH, SHORTNAME, OBJECT_TYPE, FW_DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            VWPMO_DOKUMENTTYPES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
                 "ORDER BY DOKUMENTTYPE"
             Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(2).Connection = Me.Connection
+            Me._commandCollection(2).CommandText = "SELECT        FORMVIEW_ID, FORM_ID, FORM_TITLE, DOKUMENTTYPE_ID, DOKUMENTTYPE, PA"& _ 
+                "TH, SHORTNAME, OBJECT_TYPE, FW_DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            VWPMO_DOKUMENTTYPES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
+                "WHERE        (FORM_ID = @ENTITY_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY DOKUMENTTYPE"
+            Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -36669,6 +36676,32 @@ Namespace DD_DMSDataSetTableAdapters
             Me.Adapter.Fill(dataTable)
             Return dataTable
         End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
+        Public Overloads Overridable Function FillByENTITY_ID(ByVal dataTable As DD_DMSDataSet.VWPMO_DOKUMENTTYPESDataTable, ByVal ENTITY_ID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByENTITY_ID(ByVal ENTITY_ID As Integer) As DD_DMSDataSet.VWPMO_DOKUMENTTYPESDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
+            Dim dataTable As DD_DMSDataSet.VWPMO_DOKUMENTTYPESDataTable = New DD_DMSDataSet.VWPMO_DOKUMENTTYPESDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
     End Class
     
     '''<summary>
@@ -51138,258 +51171,258 @@ Namespace DD_DMSDataSetTableAdapters
             Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPMO_STRUCTURE_NODES_CONFIGURATION" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                         (ENTITY" & _
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPMO_STRUCTURE_NODES_CONFIGURATION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (ENTITY"& _ 
-                "_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, NAME, COMMENT, PARENT_NODE" & _
+                "_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, NAME, COMMENT, PARENT_NODE"& _ 
-                ")" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES        (@ENTITY_ID,@TYPE_NODE,@NODE_IMAGE,@CREATE_RECORD,@ADDED_WHO,@N" & _
+                ")"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@ENTITY_ID,@TYPE_NODE,@NODE_IMAGE,@CREATE_RECORD,@ADDED_WHO,@N"& _ 
-                "AME,@COMMENT,@PARENT_NODE);   " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, C" & _
+                "AME,@COMMENT,@PARENT_NODE);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, C"& _ 
-                "REATE_RECORD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_STRUCT" & _
+                "REATE_RECORD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_STRUCT"& _ 
                 "URE_NODES_CONFIGURATION WHERE (GUID = SCOPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NODE_IMAGE", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "NODE_IMAGE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NODE_IMAGE", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "NODE_IMAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATE_RECORD", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATE_RECORD", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATE_RECORD", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATE_RECORD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 300, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 300, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_NODE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_NODE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_NODE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
-            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPMO_STRUCTURE_NODES_CONFIGURATION" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET                ENTITY_ID = " & _
+            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPMO_STRUCTURE_NODES_CONFIGURATION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                ENTITY_ID = "& _ 
-                "@ENTITY_ID, TYPE_NODE = @TYPE_NODE, NODE_IMAGE = @NODE_IMAGE, CREATE_RECORD = @C" & _
+                "@ENTITY_ID, TYPE_NODE = @TYPE_NODE, NODE_IMAGE = @NODE_IMAGE, CREATE_RECORD = @C"& _ 
-                "REATE_RECORD, CHANGED_WHO = @CHANGED_WHO, NAME = @NAME, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                      " & _
+                "REATE_RECORD, CHANGED_WHO = @CHANGED_WHO, NAME = @NAME, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                      "& _ 
-                "   COMMENT = @COMMENT, PARENT_NODE = @PARENT_NODE" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (GUID = @Origina" & _
+                "   COMMENT = @COMMENT, PARENT_NODE = @PARENT_NODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Origina"& _ 
-                "l_GUID);   " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED" & _
+                "l_GUID);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED"& _ 
-                "_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_STRUCTURE_NODES_CONFIGURA" & _
+                "_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_STRUCTURE_NODES_CONFIGURA"& _ 
                 "TION WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NODE_IMAGE", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "NODE_IMAGE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NODE_IMAGE", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "NODE_IMAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATE_RECORD", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATE_RECORD", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATE_RECORD", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATE_RECORD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 300, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 300, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_NODE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_NODE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_NODE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
             Me._connection.ConnectionString = Global.DD_Record_Organiser.My.MySettings.Default.DD_DMSConnectionString
         End Sub
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Private Sub InitCommandCollection()
             Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, A" & _
+            Me._commandCollection(0).CommandText = "SELECT        GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, A"& _ 
-                "DDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM          " & _
+                "DDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM          "& _ 
-                "  TBPMO_STRUCTURE_NODES_CONFIGURATION" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (ENTITY_ID = @ENTITY_ID)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "OR" & _
+                "  TBPMO_STRUCTURE_NODES_CONFIGURATION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (ENTITY_ID = @ENTITY_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"OR"& _ 
                 "DER BY ENTITY_ID, TYPE_NODE"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(1).Connection = Me.Connection
-            Me._commandCollection(1).CommandText = "SELECT        GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, A" & _
+            Me._commandCollection(1).CommandText = "SELECT        GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, A"& _ 
-                "DDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM          " & _
+                "DDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM          "& _ 
                 "  TBPMO_STRUCTURE_NODES_CONFIGURATION where GUID = @GUID"
             Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, True)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)>  _
-        Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable, ByVal ENTITY_ID As Integer) As Integer
+        Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable, ByVal ENTITY_ID As Integer) As Integer
             Me.Adapter.SelectCommand = Me.CommandCollection(0)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
-            If (Me.ClearBeforeFill = True) Then
+            If (Me.ClearBeforeFill = true) Then
-                dataTable.Clear()
+                dataTable.Clear
             End If
             Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
             Return returnValue
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], True)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)>  _
-        Public Overridable Overloads Function GetData(ByVal ENTITY_ID As Integer) As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable
+        Public Overloads Overridable Function GetData(ByVal ENTITY_ID As Integer) As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable
             Me.Adapter.SelectCommand = Me.CommandCollection(0)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
             Dim dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable = New DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable()
             Me.Adapter.Fill(dataTable)
             Return dataTable
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, False)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
-        Public Overridable Overloads Function FillByID(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function FillByID(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable, ByVal GUID As Integer) As Integer
             Me.Adapter.SelectCommand = Me.CommandCollection(1)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID, Integer)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
-            If (Me.ClearBeforeFill = True) Then
+            If (Me.ClearBeforeFill = true) Then
-                dataTable.Clear()
+                dataTable.Clear
             End If
             Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
             Return returnValue
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], False)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
-        Public Overridable Overloads Function GetDataByID(ByVal GUID As Integer) As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable
+        Public Overloads Overridable Function GetDataByID(ByVal GUID As Integer) As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable
             Me.Adapter.SelectCommand = Me.CommandCollection(1)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID, Integer)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             Dim dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable = New DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable()
             Me.Adapter.Fill(dataTable)
             Return dataTable
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
-        Public Overridable Overloads Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable) As Integer
+        Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable) As Integer
             Return Me.Adapter.Update(dataTable)
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
-        Public Overridable Overloads Function Update(ByVal dataSet As DD_DMSDataSet) As Integer
+        Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSDataSet) As Integer
             Return Me.Adapter.Update(dataSet, "TBPMO_STRUCTURE_NODES_CONFIGURATION")
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
-        Public Overridable Overloads Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer
+        Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer
             Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow})
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
-        Public Overridable Overloads Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer
+        Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer
             Return Me.Adapter.Update(dataRows)
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, True)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)>  _
-        Public Overridable Overloads Function Delete(ByVal Original_GUID As Integer) As Integer
+        Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer
-            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID, Integer)
+            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State
-            If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
+            If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
-                Me.Adapter.DeleteCommand.Connection.Open()
+                Me.Adapter.DeleteCommand.Connection.Open
             End If
-            Try
+            Try 
                 Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery
                 Return returnValue
             Finally
                 If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
-                    Me.Adapter.DeleteCommand.Connection.Close()
+                    Me.Adapter.DeleteCommand.Connection.Close
                 End If
             End Try
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, True)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overridable Overloads Function Insert(ByVal ENTITY_ID As Integer, ByVal TYPE_NODE As Short, ByVal NODE_IMAGE() As Byte, ByVal CREATE_RECORD As Boolean, ByVal ADDED_WHO As String, ByVal NAME As String, ByVal COMMENT As String, ByVal PARENT_NODE As Integer) As Integer
+        Public Overloads Overridable Function Insert(ByVal ENTITY_ID As Integer, ByVal TYPE_NODE As Short, ByVal NODE_IMAGE() As Byte, ByVal CREATE_RECORD As Boolean, ByVal ADDED_WHO As String, ByVal NAME As String, ByVal COMMENT As String, ByVal PARENT_NODE As Integer) As Integer
-            Me.Adapter.InsertCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
+            Me.Adapter.InsertCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
-            Me.Adapter.InsertCommand.Parameters(1).Value = CType(TYPE_NODE, Short)
+            Me.Adapter.InsertCommand.Parameters(1).Value = CType(TYPE_NODE,Short)
             If (NODE_IMAGE Is Nothing) Then
                 Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(2).Value = CType(NODE_IMAGE, Byte())
+                Me.Adapter.InsertCommand.Parameters(2).Value = CType(NODE_IMAGE,Byte())
             End If
-            Me.Adapter.InsertCommand.Parameters(3).Value = CType(CREATE_RECORD, Boolean)
+            Me.Adapter.InsertCommand.Parameters(3).Value = CType(CREATE_RECORD,Boolean)
             If (ADDED_WHO Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("ADDED_WHO")
             Else
-                Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO, String)
+                Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String)
             End If
             If (NAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("NAME")
             Else
-                Me.Adapter.InsertCommand.Parameters(5).Value = CType(NAME, String)
+                Me.Adapter.InsertCommand.Parameters(5).Value = CType(NAME,String)
             End If
             If (COMMENT Is Nothing) Then
                 Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(6).Value = CType(COMMENT, String)
+                Me.Adapter.InsertCommand.Parameters(6).Value = CType(COMMENT,String)
             End If
-            Me.Adapter.InsertCommand.Parameters(7).Value = CType(PARENT_NODE, Integer)
+            Me.Adapter.InsertCommand.Parameters(7).Value = CType(PARENT_NODE,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
-            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
+            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
-                Me.Adapter.InsertCommand.Connection.Open()
+                Me.Adapter.InsertCommand.Connection.Open
             End If
-            Try
+            Try 
                 Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery
                 Return returnValue
             Finally
                 If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
-                    Me.Adapter.InsertCommand.Connection.Close()
+                    Me.Adapter.InsertCommand.Connection.Close
                 End If
             End Try
         End Function
-
+        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, True)> _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overridable Overloads Function Update(ByVal ENTITY_ID As Integer, ByVal TYPE_NODE As Short, ByVal NODE_IMAGE() As Byte, ByVal CREATE_RECORD As Boolean, ByVal CHANGED_WHO As String, ByVal NAME As String, ByVal COMMENT As String, ByVal PARENT_NODE As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function Update(ByVal ENTITY_ID As Integer, ByVal TYPE_NODE As Short, ByVal NODE_IMAGE() As Byte, ByVal CREATE_RECORD As Boolean, ByVal CHANGED_WHO As String, ByVal NAME As String, ByVal COMMENT As String, ByVal PARENT_NODE As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
-            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(1).Value = CType(TYPE_NODE, Short)
+            Me.Adapter.UpdateCommand.Parameters(1).Value = CType(TYPE_NODE,Short)
             If (NODE_IMAGE Is Nothing) Then
                 Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(2).Value = CType(NODE_IMAGE, Byte())
+                Me.Adapter.UpdateCommand.Parameters(2).Value = CType(NODE_IMAGE,Byte())
             End If
-            Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CREATE_RECORD, Boolean)
+            Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CREATE_RECORD,Boolean)
             If (CHANGED_WHO Is Nothing) Then
                 Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO, String)
+                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String)
             End If
             If (NAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("NAME")
             Else
-                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(NAME, String)
+                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(NAME,String)
             End If
             If (COMMENT Is Nothing) Then
                 Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(COMMENT, String)
+                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(COMMENT,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(PARENT_NODE, Integer)
+            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(PARENT_NODE,Integer)
-            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
-            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
+            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
-                Me.Adapter.UpdateCommand.Connection.Open()
+                Me.Adapter.UpdateCommand.Connection.Open
             End If
-            Try
+            Try 
                 Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery
                 Return returnValue
             Finally
                 If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
-                    Me.Adapter.UpdateCommand.Connection.Close()
+                    Me.Adapter.UpdateCommand.Connection.Close
                 End If
             End Try
         End Function

app/DD-Record-Organiser/DD_DMSDataSet.xsd

@@ -373,6 +373,19 @@ ORDER BY DOKUMENTTYPE</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.VWPMO_DOKUMENTTYPES" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByENTITY_ID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByENTITY_ID" GeneratorSourceName="FillByENTITY_ID" GetMethodModifier="Public" GetMethodName="GetDataByENTITY_ID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByENTITY_ID" UserSourceName="FillByENTITY_ID">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        FORMVIEW_ID, FORM_ID, FORM_TITLE, DOKUMENTTYPE_ID, DOKUMENTTYPE, PATH, SHORTNAME, OBJECT_TYPE, FW_DOCTYPE_ID
+FROM            VWPMO_DOKUMENTTYPES
+WHERE        (FORM_ID = @ENTITY_ID)
+ORDER BY DOKUMENTTYPE</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="ENTITY_ID" ColumnName="FORM_ID" DataSourceName="DD_ECM.dbo.VWPMO_DOKUMENTTYPES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ENTITY_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
             </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBPMO_WD_FVIEW_DT_INDEXTableAdapter" GeneratorDataComponentClassName="TBPMO_WD_FVIEW_DT_INDEXTableAdapter" Name="TBPMO_WD_FVIEW_DT_INDEX" UserDataComponentName="TBPMO_WD_FVIEW_DT_INDEXTableAdapter">
@@ -3448,7 +3461,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
   <xs:element name="DD_DMSDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="DD_DMSDataSet" msprop:Generator_UserDSName="DD_DMSDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPMO_FORM" msprop:Generator_TableClassName="TBPMO_FORMDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM" msprop:Generator_RowChangedName="TBPMO_FORMRowChanged" msprop:Generator_TablePropName="TBPMO_FORM" msprop:Generator_RowDeletingName="TBPMO_FORMRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORMRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORMRowDeleted" msprop:Generator_RowClassName="TBPMO_FORMRow" msprop:Generator_UserTableName="TBPMO_FORM" msprop:Generator_RowEvArgName="TBPMO_FORMRowChangeEvent">
+        <xs:element name="TBPMO_FORM" msprop:Generator_TableClassName="TBPMO_FORMDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM" msprop:Generator_TablePropName="TBPMO_FORM" msprop:Generator_RowDeletingName="TBPMO_FORMRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORMRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORMRowDeleted" msprop:Generator_UserTableName="TBPMO_FORM" msprop:Generator_RowChangedName="TBPMO_FORMRowChanged" msprop:Generator_RowEvArgName="TBPMO_FORMRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FORMRow">
           <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" />
@@ -3489,7 +3502,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_CONTROL_SCREEN" msprop:Generator_TableClassName="VWPMO_CONTROL_SCREENDataTable" msprop:Generator_TableVarName="tableVWPMO_CONTROL_SCREEN" msprop:Generator_TablePropName="VWPMO_CONTROL_SCREEN" msprop:Generator_RowDeletingName="VWPMO_CONTROL_SCREENRowDeleting" msprop:Generator_RowChangingName="VWPMO_CONTROL_SCREENRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_CONTROL_SCREENRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_CONTROL_SCREENRowDeleted" msprop:Generator_UserTableName="VWPMO_CONTROL_SCREEN" msprop:Generator_RowChangedName="VWPMO_CONTROL_SCREENRowChanged" msprop:Generator_RowEvArgName="VWPMO_CONTROL_SCREENRowChangeEvent" msprop:Generator_RowClassName="VWPMO_CONTROL_SCREENRow">
+        <xs:element name="VWPMO_CONTROL_SCREEN" msprop:Generator_TableClassName="VWPMO_CONTROL_SCREENDataTable" msprop:Generator_TableVarName="tableVWPMO_CONTROL_SCREEN" msprop:Generator_RowChangedName="VWPMO_CONTROL_SCREENRowChanged" msprop:Generator_TablePropName="VWPMO_CONTROL_SCREEN" msprop:Generator_RowDeletingName="VWPMO_CONTROL_SCREENRowDeleting" msprop:Generator_RowChangingName="VWPMO_CONTROL_SCREENRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_CONTROL_SCREENRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_CONTROL_SCREENRowDeleted" msprop:Generator_RowClassName="VWPMO_CONTROL_SCREENRow" msprop:Generator_UserTableName="VWPMO_CONTROL_SCREEN" msprop:Generator_RowEvArgName="VWPMO_CONTROL_SCREENRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CONTROL_ID" msprop:Generator_ColumnVarNameInTable="columnCONTROL_ID" msprop:Generator_ColumnPropNameInRow="CONTROL_ID" msprop:Generator_ColumnPropNameInTable="CONTROL_IDColumn" msprop:Generator_UserColumnName="CONTROL_ID" type="xs:int" />
@@ -3567,7 +3580,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FORM_VIEW" msprop:Generator_TableClassName="TBPMO_FORM_VIEWDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_VIEW" msprop:Generator_RowChangedName="TBPMO_FORM_VIEWRowChanged" msprop:Generator_TablePropName="TBPMO_FORM_VIEW" msprop:Generator_RowDeletingName="TBPMO_FORM_VIEWRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_VIEWRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_VIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_VIEWRowDeleted" msprop:Generator_RowClassName="TBPMO_FORM_VIEWRow" msprop:Generator_UserTableName="TBPMO_FORM_VIEW" msprop:Generator_RowEvArgName="TBPMO_FORM_VIEWRowChangeEvent">
+        <xs:element name="TBPMO_FORM_VIEW" msprop:Generator_TableClassName="TBPMO_FORM_VIEWDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_VIEW" msprop:Generator_TablePropName="TBPMO_FORM_VIEW" msprop:Generator_RowDeletingName="TBPMO_FORM_VIEWRowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_VIEWRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_VIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_VIEWRowDeleted" msprop:Generator_UserTableName="TBPMO_FORM_VIEW" msprop:Generator_RowChangedName="TBPMO_FORM_VIEWRowChanged" msprop:Generator_RowEvArgName="TBPMO_FORM_VIEWRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FORM_VIEWRow">
           <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" />
@@ -3662,7 +3675,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_RECORD" msprop:Generator_TableClassName="TBPMO_RECORDDataTable" msprop:Generator_TableVarName="tableTBPMO_RECORD" msprop:Generator_RowChangedName="TBPMO_RECORDRowChanged" msprop:Generator_TablePropName="TBPMO_RECORD" msprop:Generator_RowDeletingName="TBPMO_RECORDRowDeleting" msprop:Generator_RowChangingName="TBPMO_RECORDRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RECORDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RECORDRowDeleted" msprop:Generator_RowClassName="TBPMO_RECORDRow" msprop:Generator_UserTableName="TBPMO_RECORD" msprop:Generator_RowEvArgName="TBPMO_RECORDRowChangeEvent">
+        <xs:element name="TBPMO_RECORD" msprop:Generator_TableClassName="TBPMO_RECORDDataTable" msprop:Generator_TableVarName="tableTBPMO_RECORD" msprop:Generator_TablePropName="TBPMO_RECORD" msprop:Generator_RowDeletingName="TBPMO_RECORDRowDeleting" msprop:Generator_RowChangingName="TBPMO_RECORDRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RECORDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RECORDRowDeleted" msprop:Generator_UserTableName="TBPMO_RECORD" msprop:Generator_RowChangedName="TBPMO_RECORDRowChanged" msprop:Generator_RowEvArgName="TBPMO_RECORDRowChangeEvent" msprop:Generator_RowClassName="TBPMO_RECORDRow">
           <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" />
@@ -3685,7 +3698,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_DOKUMENTTYPES" msprop:Generator_TableClassName="VWPMO_DOKUMENTTYPESDataTable" msprop:Generator_TableVarName="tableVWPMO_DOKUMENTTYPES" msprop:Generator_TablePropName="VWPMO_DOKUMENTTYPES" msprop:Generator_RowDeletingName="VWPMO_DOKUMENTTYPESRowDeleting" msprop:Generator_RowChangingName="VWPMO_DOKUMENTTYPESRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_DOKUMENTTYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_DOKUMENTTYPESRowDeleted" msprop:Generator_UserTableName="VWPMO_DOKUMENTTYPES" msprop:Generator_RowChangedName="VWPMO_DOKUMENTTYPESRowChanged" msprop:Generator_RowEvArgName="VWPMO_DOKUMENTTYPESRowChangeEvent" msprop:Generator_RowClassName="VWPMO_DOKUMENTTYPESRow">
+        <xs:element name="VWPMO_DOKUMENTTYPES" msprop:Generator_TableClassName="VWPMO_DOKUMENTTYPESDataTable" msprop:Generator_TableVarName="tableVWPMO_DOKUMENTTYPES" msprop:Generator_RowChangedName="VWPMO_DOKUMENTTYPESRowChanged" msprop:Generator_TablePropName="VWPMO_DOKUMENTTYPES" msprop:Generator_RowDeletingName="VWPMO_DOKUMENTTYPESRowDeleting" msprop:Generator_RowChangingName="VWPMO_DOKUMENTTYPESRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_DOKUMENTTYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_DOKUMENTTYPESRowDeleted" msprop:Generator_RowClassName="VWPMO_DOKUMENTTYPESRow" msprop:Generator_UserTableName="VWPMO_DOKUMENTTYPES" msprop:Generator_RowEvArgName="VWPMO_DOKUMENTTYPESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FORMVIEW_ID" msprop:Generator_ColumnVarNameInTable="columnFORMVIEW_ID" msprop:Generator_ColumnPropNameInRow="FORMVIEW_ID" msprop:Generator_ColumnPropNameInTable="FORMVIEW_IDColumn" msprop:Generator_UserColumnName="FORMVIEW_ID" type="xs:int" />
@@ -3730,7 +3743,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_TableClassName="TBPMO_WD_FVIEW_DT_INDEXDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_TablePropName="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_RowDeletingName="TBPMO_WD_FVIEW_DT_INDEXRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_FVIEW_DT_INDEXRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_FVIEW_DT_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_FVIEW_DT_INDEXRowDeleted" msprop:Generator_UserTableName="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_RowChangedName="TBPMO_WD_FVIEW_DT_INDEXRowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_FVIEW_DT_INDEXRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_FVIEW_DT_INDEXRow">
+        <xs:element name="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_TableClassName="TBPMO_WD_FVIEW_DT_INDEXDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_RowChangedName="TBPMO_WD_FVIEW_DT_INDEXRowChanged" msprop:Generator_TablePropName="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_RowDeletingName="TBPMO_WD_FVIEW_DT_INDEXRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_FVIEW_DT_INDEXRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_FVIEW_DT_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_FVIEW_DT_INDEXRowDeleted" msprop:Generator_RowClassName="TBPMO_WD_FVIEW_DT_INDEXRow" msprop:Generator_UserTableName="TBPMO_WD_FVIEW_DT_INDEX" msprop:Generator_RowEvArgName="TBPMO_WD_FVIEW_DT_INDEXRowChangeEvent">
           <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" />
@@ -3768,7 +3781,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WORKFLOW_TASK" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASKDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASKRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASKRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASKRowDeleted" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASKRowChanged" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASKRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASKRow">
+        <xs:element name="TBPMO_WORKFLOW_TASK" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASKDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASKRowChanged" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASKRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASKRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASKRowDeleted" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASKRow" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASKRowChangeEvent">
           <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" />
@@ -3803,7 +3816,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASK_STATEDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK_STATE" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASK_STATERowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASK_STATERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASK_STATERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASK_STATERowDeleted" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASK_STATERowChanged" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASK_STATERowChangeEvent" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASK_STATERow">
+        <xs:element name="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASK_STATEDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK_STATE" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASK_STATERowChanged" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASK_STATERowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASK_STATERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASK_STATERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASK_STATERowDeleted" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASK_STATERow" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASK_STATERowChangeEvent">
           <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" />
@@ -3847,7 +3860,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_GUI_ENTITY" msprop:Generator_TableClassName="VWPMO_GUI_ENTITYDataTable" msprop:Generator_TableVarName="tableVWPMO_GUI_ENTITY" msprop:Generator_RowChangedName="VWPMO_GUI_ENTITYRowChanged" msprop:Generator_TablePropName="VWPMO_GUI_ENTITY" msprop:Generator_RowDeletingName="VWPMO_GUI_ENTITYRowDeleting" msprop:Generator_RowChangingName="VWPMO_GUI_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_GUI_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_GUI_ENTITYRowDeleted" msprop:Generator_RowClassName="VWPMO_GUI_ENTITYRow" msprop:Generator_UserTableName="VWPMO_GUI_ENTITY" msprop:Generator_RowEvArgName="VWPMO_GUI_ENTITYRowChangeEvent">
+        <xs:element name="VWPMO_GUI_ENTITY" msprop:Generator_TableClassName="VWPMO_GUI_ENTITYDataTable" msprop:Generator_TableVarName="tableVWPMO_GUI_ENTITY" msprop:Generator_TablePropName="VWPMO_GUI_ENTITY" msprop:Generator_RowDeletingName="VWPMO_GUI_ENTITYRowDeleting" msprop:Generator_RowChangingName="VWPMO_GUI_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_GUI_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_GUI_ENTITYRowDeleted" msprop:Generator_UserTableName="VWPMO_GUI_ENTITY" msprop:Generator_RowChangedName="VWPMO_GUI_ENTITYRowChanged" msprop:Generator_RowEvArgName="VWPMO_GUI_ENTITYRowChangeEvent" msprop:Generator_RowClassName="VWPMO_GUI_ENTITYRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -3868,7 +3881,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WORKFLOW" msprop:Generator_TableClassName="TBPMO_WORKFLOWDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW" msprop:Generator_RowChangedName="TBPMO_WORKFLOWRowChanged" msprop:Generator_TablePropName="TBPMO_WORKFLOW" msprop:Generator_RowDeletingName="TBPMO_WORKFLOWRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOWRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOWRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOWRowDeleted" msprop:Generator_RowClassName="TBPMO_WORKFLOWRow" msprop:Generator_UserTableName="TBPMO_WORKFLOW" msprop:Generator_RowEvArgName="TBPMO_WORKFLOWRowChangeEvent">
+        <xs:element name="TBPMO_WORKFLOW" msprop:Generator_TableClassName="TBPMO_WORKFLOWDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW" msprop:Generator_TablePropName="TBPMO_WORKFLOW" msprop:Generator_RowDeletingName="TBPMO_WORKFLOWRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOWRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOWRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOWRowDeleted" msprop:Generator_UserTableName="TBPMO_WORKFLOW" msprop:Generator_RowChangedName="TBPMO_WORKFLOWRowChanged" msprop:Generator_RowEvArgName="TBPMO_WORKFLOWRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WORKFLOWRow">
           <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" />
@@ -3905,7 +3918,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_TableClassName="VWPMO_WF_OVERVIEW_AUTHORITYDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_TablePropName="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_RowDeletingName="VWPMO_WF_OVERVIEW_AUTHORITYRowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_OVERVIEW_AUTHORITYRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_OVERVIEW_AUTHORITYRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_OVERVIEW_AUTHORITYRowDeleted" msprop:Generator_UserTableName="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_RowChangedName="VWPMO_WF_OVERVIEW_AUTHORITYRowChanged" msprop:Generator_RowEvArgName="VWPMO_WF_OVERVIEW_AUTHORITYRowChangeEvent" msprop:Generator_RowClassName="VWPMO_WF_OVERVIEW_AUTHORITYRow">
+        <xs:element name="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_TableClassName="VWPMO_WF_OVERVIEW_AUTHORITYDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_RowChangedName="VWPMO_WF_OVERVIEW_AUTHORITYRowChanged" msprop:Generator_TablePropName="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_RowDeletingName="VWPMO_WF_OVERVIEW_AUTHORITYRowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_OVERVIEW_AUTHORITYRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_OVERVIEW_AUTHORITYRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_OVERVIEW_AUTHORITYRowDeleted" msprop:Generator_RowClassName="VWPMO_WF_OVERVIEW_AUTHORITYRow" msprop:Generator_UserTableName="VWPMO_WF_OVERVIEW_AUTHORITY" msprop:Generator_RowEvArgName="VWPMO_WF_OVERVIEW_AUTHORITYRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="STATE" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnSTATE" msprop:Generator_ColumnPropNameInRow="STATE" msprop:Generator_ColumnPropNameInTable="STATEColumn" msprop:Generator_UserColumnName="STATE" minOccurs="0">
@@ -3950,7 +3963,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_DOKUMENTART" msprop:Generator_TableClassName="TBDD_DOKUMENTARTDataTable" msprop:Generator_TableVarName="tableTBDD_DOKUMENTART" msprop:Generator_TablePropName="TBDD_DOKUMENTART" msprop:Generator_RowDeletingName="TBDD_DOKUMENTARTRowDeleting" msprop:Generator_RowChangingName="TBDD_DOKUMENTARTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKUMENTARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKUMENTARTRowDeleted" msprop:Generator_UserTableName="TBDD_DOKUMENTART" msprop:Generator_RowChangedName="TBDD_DOKUMENTARTRowChanged" msprop:Generator_RowEvArgName="TBDD_DOKUMENTARTRowChangeEvent" msprop:Generator_RowClassName="TBDD_DOKUMENTARTRow">
+        <xs:element name="TBDD_DOKUMENTART" msprop:Generator_TableClassName="TBDD_DOKUMENTARTDataTable" msprop:Generator_TableVarName="tableTBDD_DOKUMENTART" msprop:Generator_RowChangedName="TBDD_DOKUMENTARTRowChanged" msprop:Generator_TablePropName="TBDD_DOKUMENTART" msprop:Generator_RowDeletingName="TBDD_DOKUMENTARTRowDeleting" msprop:Generator_RowChangingName="TBDD_DOKUMENTARTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKUMENTARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKUMENTARTRowDeleted" msprop:Generator_RowClassName="TBDD_DOKUMENTARTRow" msprop:Generator_UserTableName="TBDD_DOKUMENTART" msprop:Generator_RowEvArgName="TBDD_DOKUMENTARTRowChangeEvent">
           <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" />
@@ -4017,7 +4030,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_EINGANGSARTEN" msprop:Generator_TableClassName="TBDD_EINGANGSARTENDataTable" msprop:Generator_TableVarName="tableTBDD_EINGANGSARTEN" msprop:Generator_TablePropName="TBDD_EINGANGSARTEN" msprop:Generator_RowDeletingName="TBDD_EINGANGSARTENRowDeleting" msprop:Generator_RowChangingName="TBDD_EINGANGSARTENRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EINGANGSARTENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EINGANGSARTENRowDeleted" msprop:Generator_UserTableName="TBDD_EINGANGSARTEN" msprop:Generator_RowChangedName="TBDD_EINGANGSARTENRowChanged" msprop:Generator_RowEvArgName="TBDD_EINGANGSARTENRowChangeEvent" msprop:Generator_RowClassName="TBDD_EINGANGSARTENRow">
+        <xs:element name="TBDD_EINGANGSARTEN" msprop:Generator_TableClassName="TBDD_EINGANGSARTENDataTable" msprop:Generator_TableVarName="tableTBDD_EINGANGSARTEN" msprop:Generator_RowChangedName="TBDD_EINGANGSARTENRowChanged" msprop:Generator_TablePropName="TBDD_EINGANGSARTEN" msprop:Generator_RowDeletingName="TBDD_EINGANGSARTENRowDeleting" msprop:Generator_RowChangingName="TBDD_EINGANGSARTENRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EINGANGSARTENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EINGANGSARTENRowDeleted" msprop:Generator_RowClassName="TBDD_EINGANGSARTENRow" msprop:Generator_UserTableName="TBDD_EINGANGSARTEN" msprop:Generator_RowEvArgName="TBDD_EINGANGSARTENRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -4054,7 +4067,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_INDEX_AUTOM" msprop:Generator_TableClassName="TBDD_INDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_AUTOM" msprop:Generator_TablePropName="TBDD_INDEX_AUTOM" msprop:Generator_RowDeletingName="TBDD_INDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_AUTOMRowDeleted" msprop:Generator_UserTableName="TBDD_INDEX_AUTOM" msprop:Generator_RowChangedName="TBDD_INDEX_AUTOMRowChanged" msprop:Generator_RowEvArgName="TBDD_INDEX_AUTOMRowChangeEvent" msprop:Generator_RowClassName="TBDD_INDEX_AUTOMRow">
+        <xs:element name="TBDD_INDEX_AUTOM" msprop:Generator_TableClassName="TBDD_INDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_AUTOM" msprop:Generator_RowChangedName="TBDD_INDEX_AUTOMRowChanged" msprop:Generator_TablePropName="TBDD_INDEX_AUTOM" msprop:Generator_RowDeletingName="TBDD_INDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_AUTOMRowDeleted" msprop:Generator_RowClassName="TBDD_INDEX_AUTOMRow" msprop:Generator_UserTableName="TBDD_INDEX_AUTOM" msprop:Generator_RowEvArgName="TBDD_INDEX_AUTOMRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -4110,7 +4123,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_TableClassName="TBPMO_WD_FORMVIEW_DOKTYPESDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_TablePropName="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_RowDeletingName="TBPMO_WD_FORMVIEW_DOKTYPESRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_FORMVIEW_DOKTYPESRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_FORMVIEW_DOKTYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_FORMVIEW_DOKTYPESRowDeleted" msprop:Generator_UserTableName="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_RowChangedName="TBPMO_WD_FORMVIEW_DOKTYPESRowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_FORMVIEW_DOKTYPESRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_FORMVIEW_DOKTYPESRow">
+        <xs:element name="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_TableClassName="TBPMO_WD_FORMVIEW_DOKTYPESDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_RowChangedName="TBPMO_WD_FORMVIEW_DOKTYPESRowChanged" msprop:Generator_TablePropName="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_RowDeletingName="TBPMO_WD_FORMVIEW_DOKTYPESRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_FORMVIEW_DOKTYPESRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_FORMVIEW_DOKTYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_FORMVIEW_DOKTYPESRowDeleted" msprop:Generator_RowClassName="TBPMO_WD_FORMVIEW_DOKTYPESRow" msprop:Generator_UserTableName="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_RowEvArgName="TBPMO_WD_FORMVIEW_DOKTYPESRowChangeEvent">
           <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" />
@@ -4149,7 +4162,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_KONFIGURATION" msprop:Generator_TableClassName="TBPMO_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPMO_KONFIGURATION" msprop:Generator_TablePropName="TBPMO_KONFIGURATION" msprop:Generator_RowDeletingName="TBPMO_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPMO_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_KONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPMO_KONFIGURATION" msprop:Generator_RowChangedName="TBPMO_KONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPMO_KONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPMO_KONFIGURATIONRow">
+        <xs:element name="TBPMO_KONFIGURATION" msprop:Generator_TableClassName="TBPMO_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPMO_KONFIGURATION" msprop:Generator_RowChangedName="TBPMO_KONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPMO_KONFIGURATION" msprop:Generator_RowDeletingName="TBPMO_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPMO_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_KONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPMO_KONFIGURATIONRow" msprop:Generator_UserTableName="TBPMO_KONFIGURATION" msprop:Generator_RowEvArgName="TBPMO_KONFIGURATIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -4273,7 +4286,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
           <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" />
@@ -4371,7 +4384,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FORM_TYPE" msprop:Generator_TableClassName="TBPMO_FORM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_TYPE" msprop:Generator_RowChangedName="TBPMO_FORM_TYPERowChanged" msprop:Generator_TablePropName="TBPMO_FORM_TYPE" msprop:Generator_RowDeletingName="TBPMO_FORM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_TYPERowDeleted" msprop:Generator_RowClassName="TBPMO_FORM_TYPERow" msprop:Generator_UserTableName="TBPMO_FORM_TYPE" msprop:Generator_RowEvArgName="TBPMO_FORM_TYPERowChangeEvent">
+        <xs:element name="TBPMO_FORM_TYPE" msprop:Generator_TableClassName="TBPMO_FORM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_TYPE" msprop:Generator_TablePropName="TBPMO_FORM_TYPE" msprop:Generator_RowDeletingName="TBPMO_FORM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPMO_FORM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FORM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FORM_TYPERowDeleted" msprop:Generator_UserTableName="TBPMO_FORM_TYPE" msprop:Generator_RowChangedName="TBPMO_FORM_TYPERowChanged" msprop:Generator_RowEvArgName="TBPMO_FORM_TYPERowChangeEvent" msprop:Generator_RowClassName="TBPMO_FORM_TYPERow">
           <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" />
@@ -4401,7 +4414,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER_GROUPS" msprop:Generator_TableClassName="TBDD_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_USER_GROUPS" msprop:Generator_RowChangedName="TBDD_USER_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_USER_GROUPS" msprop:Generator_RowDeletingName="TBDD_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_USER_GROUPSRow" msprop:Generator_UserTableName="TBDD_USER_GROUPS" msprop:Generator_RowEvArgName="TBDD_USER_GROUPSRowChangeEvent">
+        <xs:element name="TBDD_USER_GROUPS" msprop:Generator_TableClassName="TBDD_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_USER_GROUPS" msprop:Generator_TablePropName="TBDD_USER_GROUPS" msprop:Generator_RowDeletingName="TBDD_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_USER_GROUPS" msprop:Generator_RowChangedName="TBDD_USER_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_USER_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_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" />
@@ -4438,7 +4451,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_USERS_GROUPS" msprop:Generator_TableClassName="VWPMO_USERS_GROUPSDataTable" msprop:Generator_TableVarName="tableVWPMO_USERS_GROUPS" msprop:Generator_RowChangedName="VWPMO_USERS_GROUPSRowChanged" msprop:Generator_TablePropName="VWPMO_USERS_GROUPS" msprop:Generator_RowDeletingName="VWPMO_USERS_GROUPSRowDeleting" msprop:Generator_RowChangingName="VWPMO_USERS_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_USERS_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_USERS_GROUPSRowDeleted" msprop:Generator_RowClassName="VWPMO_USERS_GROUPSRow" msprop:Generator_UserTableName="VWPMO_USERS_GROUPS" msprop:Generator_RowEvArgName="VWPMO_USERS_GROUPSRowChangeEvent">
+        <xs:element name="VWPMO_USERS_GROUPS" msprop:Generator_TableClassName="VWPMO_USERS_GROUPSDataTable" msprop:Generator_TableVarName="tableVWPMO_USERS_GROUPS" msprop:Generator_TablePropName="VWPMO_USERS_GROUPS" msprop:Generator_RowDeletingName="VWPMO_USERS_GROUPSRowDeleting" msprop:Generator_RowChangingName="VWPMO_USERS_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_USERS_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_USERS_GROUPSRowDeleted" msprop:Generator_UserTableName="VWPMO_USERS_GROUPS" msprop:Generator_RowChangedName="VWPMO_USERS_GROUPSRowChanged" msprop:Generator_RowEvArgName="VWPMO_USERS_GROUPSRowChangeEvent" msprop:Generator_RowClassName="VWPMO_USERS_GROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -4475,7 +4488,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent">
+        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow">
           <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" />
@@ -4507,7 +4520,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_DOKART_MODULE" msprop:Generator_TableClassName="TBWH_DOKART_MODULEDataTable" msprop:Generator_TableVarName="tableTBWH_DOKART_MODULE" msprop:Generator_RowChangedName="TBWH_DOKART_MODULERowChanged" msprop:Generator_TablePropName="TBWH_DOKART_MODULE" msprop:Generator_RowDeletingName="TBWH_DOKART_MODULERowDeleting" msprop:Generator_RowChangingName="TBWH_DOKART_MODULERowChanging" msprop:Generator_RowEvHandlerName="TBWH_DOKART_MODULERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_DOKART_MODULERowDeleted" msprop:Generator_RowClassName="TBWH_DOKART_MODULERow" msprop:Generator_UserTableName="TBWH_DOKART_MODULE" msprop:Generator_RowEvArgName="TBWH_DOKART_MODULERowChangeEvent">
+        <xs:element name="TBWH_DOKART_MODULE" msprop:Generator_TableClassName="TBWH_DOKART_MODULEDataTable" msprop:Generator_TableVarName="tableTBWH_DOKART_MODULE" msprop:Generator_TablePropName="TBWH_DOKART_MODULE" msprop:Generator_RowDeletingName="TBWH_DOKART_MODULERowDeleting" msprop:Generator_RowChangingName="TBWH_DOKART_MODULERowChanging" msprop:Generator_RowEvHandlerName="TBWH_DOKART_MODULERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_DOKART_MODULERowDeleted" msprop:Generator_UserTableName="TBWH_DOKART_MODULE" msprop:Generator_RowChangedName="TBWH_DOKART_MODULERowChanged" msprop:Generator_RowEvArgName="TBWH_DOKART_MODULERowChangeEvent" msprop:Generator_RowClassName="TBWH_DOKART_MODULERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BEZEICHNUNG" msprop:Generator_ColumnVarNameInTable="columnBEZEICHNUNG" msprop:Generator_ColumnPropNameInRow="BEZEICHNUNG" msprop:Generator_ColumnPropNameInTable="BEZEICHNUNGColumn" msprop:Generator_UserColumnName="BEZEICHNUNG">
@@ -4527,7 +4540,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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" />
@@ -4573,7 +4586,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_OBJECTTYPE" msprop:Generator_TableClassName="TBPMO_WD_OBJECTTYPEDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_OBJECTTYPE" msprop:Generator_TablePropName="TBPMO_WD_OBJECTTYPE" msprop:Generator_RowDeletingName="TBPMO_WD_OBJECTTYPERowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_OBJECTTYPERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_OBJECTTYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_OBJECTTYPERowDeleted" msprop:Generator_UserTableName="TBPMO_WD_OBJECTTYPE" msprop:Generator_RowChangedName="TBPMO_WD_OBJECTTYPERowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_OBJECTTYPERowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_OBJECTTYPERow">
+        <xs:element name="TBPMO_WD_OBJECTTYPE" msprop:Generator_TableClassName="TBPMO_WD_OBJECTTYPEDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_OBJECTTYPE" msprop:Generator_RowChangedName="TBPMO_WD_OBJECTTYPERowChanged" msprop:Generator_TablePropName="TBPMO_WD_OBJECTTYPE" msprop:Generator_RowDeletingName="TBPMO_WD_OBJECTTYPERowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_OBJECTTYPERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_OBJECTTYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_OBJECTTYPERowDeleted" msprop:Generator_RowClassName="TBPMO_WD_OBJECTTYPERow" msprop:Generator_UserTableName="TBPMO_WD_OBJECTTYPE" msprop:Generator_RowEvArgName="TBPMO_WD_OBJECTTYPERowChangeEvent">
           <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" />
@@ -4631,7 +4644,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FILES_USER" msprop:Generator_TableClassName="TBPMO_FILES_USERDataTable" msprop:Generator_TableVarName="tableTBPMO_FILES_USER" msprop:Generator_TablePropName="TBPMO_FILES_USER" msprop:Generator_RowDeletingName="TBPMO_FILES_USERRowDeleting" msprop:Generator_RowChangingName="TBPMO_FILES_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FILES_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FILES_USERRowDeleted" msprop:Generator_UserTableName="TBPMO_FILES_USER" msprop:Generator_RowChangedName="TBPMO_FILES_USERRowChanged" msprop:Generator_RowEvArgName="TBPMO_FILES_USERRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FILES_USERRow">
+        <xs:element name="TBPMO_FILES_USER" msprop:Generator_TableClassName="TBPMO_FILES_USERDataTable" msprop:Generator_TableVarName="tableTBPMO_FILES_USER" msprop:Generator_RowChangedName="TBPMO_FILES_USERRowChanged" msprop:Generator_TablePropName="TBPMO_FILES_USER" msprop:Generator_RowDeletingName="TBPMO_FILES_USERRowDeleting" msprop:Generator_RowChangingName="TBPMO_FILES_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FILES_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FILES_USERRowDeleted" msprop:Generator_RowClassName="TBPMO_FILES_USERRow" msprop:Generator_UserTableName="TBPMO_FILES_USER" msprop:Generator_RowEvArgName="TBPMO_FILES_USERRowChangeEvent">
           <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" />
@@ -4661,7 +4674,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_TableClassName="TBPMO_FOLLOW_UP_EMAILDataTable" msprop:Generator_TableVarName="tableTBPMO_FOLLOW_UP_EMAIL" msprop:Generator_RowChangedName="TBPMO_FOLLOW_UP_EMAILRowChanged" msprop:Generator_TablePropName="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_RowDeletingName="TBPMO_FOLLOW_UP_EMAILRowDeleting" msprop:Generator_RowChangingName="TBPMO_FOLLOW_UP_EMAILRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FOLLOW_UP_EMAILRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FOLLOW_UP_EMAILRowDeleted" msprop:Generator_RowClassName="TBPMO_FOLLOW_UP_EMAILRow" msprop:Generator_UserTableName="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_RowEvArgName="TBPMO_FOLLOW_UP_EMAILRowChangeEvent">
+        <xs:element name="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_TableClassName="TBPMO_FOLLOW_UP_EMAILDataTable" msprop:Generator_TableVarName="tableTBPMO_FOLLOW_UP_EMAIL" msprop:Generator_TablePropName="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_RowDeletingName="TBPMO_FOLLOW_UP_EMAILRowDeleting" msprop:Generator_RowChangingName="TBPMO_FOLLOW_UP_EMAILRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FOLLOW_UP_EMAILRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FOLLOW_UP_EMAILRowDeleted" msprop:Generator_UserTableName="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_RowChangedName="TBPMO_FOLLOW_UP_EMAILRowChanged" msprop:Generator_RowEvArgName="TBPMO_FOLLOW_UP_EMAILRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FOLLOW_UP_EMAILRow">
           <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" />
@@ -4818,7 +4831,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_TableClassName="TBPMO_FOLLUPEMAIL_USERDataTable" msprop:Generator_TableVarName="tableTBPMO_FOLLUPEMAIL_USER" msprop:Generator_TablePropName="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_RowDeletingName="TBPMO_FOLLUPEMAIL_USERRowDeleting" msprop:Generator_RowChangingName="TBPMO_FOLLUPEMAIL_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FOLLUPEMAIL_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FOLLUPEMAIL_USERRowDeleted" msprop:Generator_UserTableName="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_RowChangedName="TBPMO_FOLLUPEMAIL_USERRowChanged" msprop:Generator_RowEvArgName="TBPMO_FOLLUPEMAIL_USERRowChangeEvent" msprop:Generator_RowClassName="TBPMO_FOLLUPEMAIL_USERRow">
+        <xs:element name="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_TableClassName="TBPMO_FOLLUPEMAIL_USERDataTable" msprop:Generator_TableVarName="tableTBPMO_FOLLUPEMAIL_USER" msprop:Generator_RowChangedName="TBPMO_FOLLUPEMAIL_USERRowChanged" msprop:Generator_TablePropName="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_RowDeletingName="TBPMO_FOLLUPEMAIL_USERRowDeleting" msprop:Generator_RowChangingName="TBPMO_FOLLUPEMAIL_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_FOLLUPEMAIL_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_FOLLUPEMAIL_USERRowDeleted" msprop:Generator_RowClassName="TBPMO_FOLLUPEMAIL_USERRow" msprop:Generator_UserTableName="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_RowEvArgName="TBPMO_FOLLUPEMAIL_USERRowChangeEvent">
           <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" />
@@ -4843,7 +4856,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_TableClassName="TBPMO_RECORD_LOG_CONFIGDataTable" msprop:Generator_TableVarName="tableTBPMO_RECORD_LOG_CONFIG" msprop:Generator_RowChangedName="TBPMO_RECORD_LOG_CONFIGRowChanged" msprop:Generator_TablePropName="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_RowDeletingName="TBPMO_RECORD_LOG_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBPMO_RECORD_LOG_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RECORD_LOG_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RECORD_LOG_CONFIGRowDeleted" msprop:Generator_RowClassName="TBPMO_RECORD_LOG_CONFIGRow" msprop:Generator_UserTableName="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_RowEvArgName="TBPMO_RECORD_LOG_CONFIGRowChangeEvent">
+        <xs:element name="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_TableClassName="TBPMO_RECORD_LOG_CONFIGDataTable" msprop:Generator_TableVarName="tableTBPMO_RECORD_LOG_CONFIG" msprop:Generator_TablePropName="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_RowDeletingName="TBPMO_RECORD_LOG_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBPMO_RECORD_LOG_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RECORD_LOG_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RECORD_LOG_CONFIGRowDeleted" msprop:Generator_UserTableName="TBPMO_RECORD_LOG_CONFIG" msprop:Generator_RowChangedName="TBPMO_RECORD_LOG_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBPMO_RECORD_LOG_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBPMO_RECORD_LOG_CONFIGRow">
           <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" />
@@ -4878,7 +4891,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_RECORD_CHANGES" msprop:Generator_TableClassName="VWPMO_RECORD_CHANGESDataTable" msprop:Generator_TableVarName="tableVWPMO_RECORD_CHANGES" msprop:Generator_RowChangedName="VWPMO_RECORD_CHANGESRowChanged" msprop:Generator_TablePropName="VWPMO_RECORD_CHANGES" msprop:Generator_RowDeletingName="VWPMO_RECORD_CHANGESRowDeleting" msprop:Generator_RowChangingName="VWPMO_RECORD_CHANGESRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_RECORD_CHANGESRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_RECORD_CHANGESRowDeleted" msprop:Generator_RowClassName="VWPMO_RECORD_CHANGESRow" msprop:Generator_UserTableName="VWPMO_RECORD_CHANGES" msprop:Generator_RowEvArgName="VWPMO_RECORD_CHANGESRowChangeEvent">
+        <xs:element name="VWPMO_RECORD_CHANGES" msprop:Generator_TableClassName="VWPMO_RECORD_CHANGESDataTable" msprop:Generator_TableVarName="tableVWPMO_RECORD_CHANGES" msprop:Generator_TablePropName="VWPMO_RECORD_CHANGES" msprop:Generator_RowDeletingName="VWPMO_RECORD_CHANGESRowDeleting" msprop:Generator_RowChangingName="VWPMO_RECORD_CHANGESRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_RECORD_CHANGESRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_RECORD_CHANGESRowDeleted" msprop:Generator_UserTableName="VWPMO_RECORD_CHANGES" msprop:Generator_RowChangedName="VWPMO_RECORD_CHANGESRowChanged" msprop:Generator_RowEvArgName="VWPMO_RECORD_CHANGESRowChangeEvent" msprop:Generator_RowClassName="VWPMO_RECORD_CHANGESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -4907,7 +4920,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent">
+        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -4967,7 +4980,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </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" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -5040,7 +5053,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </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" />
@@ -5147,7 +5160,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWDDINDEX_AUTOM" msprop:Generator_TableClassName="VWDDINDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_AUTOM" msprop:Generator_RowChangedName="VWDDINDEX_AUTOMRowChanged" msprop:Generator_TablePropName="VWDDINDEX_AUTOM" msprop:Generator_RowDeletingName="VWDDINDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_AUTOMRowDeleted" msprop:Generator_RowClassName="VWDDINDEX_AUTOMRow" msprop:Generator_UserTableName="VWDDINDEX_AUTOM" msprop:Generator_RowEvArgName="VWDDINDEX_AUTOMRowChangeEvent">
+        <xs:element name="VWDDINDEX_AUTOM" msprop:Generator_TableClassName="VWDDINDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_AUTOM" msprop:Generator_TablePropName="VWDDINDEX_AUTOM" msprop:Generator_RowDeletingName="VWDDINDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_AUTOMRowDeleted" msprop:Generator_UserTableName="VWDDINDEX_AUTOM" msprop:Generator_RowChangedName="VWDDINDEX_AUTOMRowChanged" msprop:Generator_RowEvArgName="VWDDINDEX_AUTOMRowChangeEvent" msprop:Generator_RowClassName="VWDDINDEX_AUTOMRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -5241,7 +5254,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_TEMPLATE" msprop:Generator_TableClassName="TBPMO_TEMPLATEDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE" msprop:Generator_RowChangedName="TBPMO_TEMPLATERowChanged" msprop:Generator_TablePropName="TBPMO_TEMPLATE" msprop:Generator_RowDeletingName="TBPMO_TEMPLATERowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATERowDeleted" msprop:Generator_RowClassName="TBPMO_TEMPLATERow" msprop:Generator_UserTableName="TBPMO_TEMPLATE" msprop:Generator_RowEvArgName="TBPMO_TEMPLATERowChangeEvent">
+        <xs:element name="TBPMO_TEMPLATE" msprop:Generator_TableClassName="TBPMO_TEMPLATEDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE" msprop:Generator_TablePropName="TBPMO_TEMPLATE" msprop:Generator_RowDeletingName="TBPMO_TEMPLATERowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATERowDeleted" msprop:Generator_UserTableName="TBPMO_TEMPLATE" msprop:Generator_RowChangedName="TBPMO_TEMPLATERowChanged" msprop:Generator_RowEvArgName="TBPMO_TEMPLATERowChangeEvent" msprop:Generator_RowClassName="TBPMO_TEMPLATERow">
           <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" />
@@ -5280,7 +5293,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_TEMPLATE_ENTITY" msprop:Generator_TableClassName="TBPMO_TEMPLATE_ENTITYDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE_ENTITY" msprop:Generator_RowChangedName="TBPMO_TEMPLATE_ENTITYRowChanged" msprop:Generator_TablePropName="TBPMO_TEMPLATE_ENTITY" msprop:Generator_RowDeletingName="TBPMO_TEMPLATE_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATE_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATE_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATE_ENTITYRowDeleted" msprop:Generator_RowClassName="TBPMO_TEMPLATE_ENTITYRow" msprop:Generator_UserTableName="TBPMO_TEMPLATE_ENTITY" msprop:Generator_RowEvArgName="TBPMO_TEMPLATE_ENTITYRowChangeEvent">
+        <xs:element name="TBPMO_TEMPLATE_ENTITY" msprop:Generator_TableClassName="TBPMO_TEMPLATE_ENTITYDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE_ENTITY" msprop:Generator_TablePropName="TBPMO_TEMPLATE_ENTITY" msprop:Generator_RowDeletingName="TBPMO_TEMPLATE_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATE_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATE_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATE_ENTITYRowDeleted" msprop:Generator_UserTableName="TBPMO_TEMPLATE_ENTITY" msprop:Generator_RowChangedName="TBPMO_TEMPLATE_ENTITYRowChanged" msprop:Generator_RowEvArgName="TBPMO_TEMPLATE_ENTITYRowChangeEvent" msprop:Generator_RowClassName="TBPMO_TEMPLATE_ENTITYRow">
           <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" />
@@ -5298,7 +5311,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_TEMPLATE_PATTERN" msprop:Generator_TableClassName="TBPMO_TEMPLATE_PATTERNDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE_PATTERN" msprop:Generator_RowChangedName="TBPMO_TEMPLATE_PATTERNRowChanged" msprop:Generator_TablePropName="TBPMO_TEMPLATE_PATTERN" msprop:Generator_RowDeletingName="TBPMO_TEMPLATE_PATTERNRowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATE_PATTERNRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATE_PATTERNRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATE_PATTERNRowDeleted" msprop:Generator_RowClassName="TBPMO_TEMPLATE_PATTERNRow" msprop:Generator_UserTableName="TBPMO_TEMPLATE_PATTERN" msprop:Generator_RowEvArgName="TBPMO_TEMPLATE_PATTERNRowChangeEvent">
+        <xs:element name="TBPMO_TEMPLATE_PATTERN" msprop:Generator_TableClassName="TBPMO_TEMPLATE_PATTERNDataTable" msprop:Generator_TableVarName="tableTBPMO_TEMPLATE_PATTERN" msprop:Generator_TablePropName="TBPMO_TEMPLATE_PATTERN" msprop:Generator_RowDeletingName="TBPMO_TEMPLATE_PATTERNRowDeleting" msprop:Generator_RowChangingName="TBPMO_TEMPLATE_PATTERNRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_TEMPLATE_PATTERNRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_TEMPLATE_PATTERNRowDeleted" msprop:Generator_UserTableName="TBPMO_TEMPLATE_PATTERN" msprop:Generator_RowChangedName="TBPMO_TEMPLATE_PATTERNRowChanged" msprop:Generator_RowEvArgName="TBPMO_TEMPLATE_PATTERNRowChangeEvent" msprop:Generator_RowClassName="TBPMO_TEMPLATE_PATTERNRow">
           <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" />
@@ -5344,7 +5357,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBTEMP_QUICKDISPLAY" msprop:Generator_TableClassName="TBTEMP_QUICKDISPLAYDataTable" msprop:Generator_TableVarName="tableTBTEMP_QUICKDISPLAY" msprop:Generator_TablePropName="TBTEMP_QUICKDISPLAY" msprop:Generator_RowDeletingName="TBTEMP_QUICKDISPLAYRowDeleting" msprop:Generator_RowChangingName="TBTEMP_QUICKDISPLAYRowChanging" msprop:Generator_RowEvHandlerName="TBTEMP_QUICKDISPLAYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTEMP_QUICKDISPLAYRowDeleted" msprop:Generator_UserTableName="TBTEMP_QUICKDISPLAY" msprop:Generator_RowChangedName="TBTEMP_QUICKDISPLAYRowChanged" msprop:Generator_RowEvArgName="TBTEMP_QUICKDISPLAYRowChangeEvent" msprop:Generator_RowClassName="TBTEMP_QUICKDISPLAYRow">
+        <xs:element name="TBTEMP_QUICKDISPLAY" msprop:Generator_TableClassName="TBTEMP_QUICKDISPLAYDataTable" msprop:Generator_TableVarName="tableTBTEMP_QUICKDISPLAY" msprop:Generator_RowChangedName="TBTEMP_QUICKDISPLAYRowChanged" msprop:Generator_TablePropName="TBTEMP_QUICKDISPLAY" msprop:Generator_RowDeletingName="TBTEMP_QUICKDISPLAYRowDeleting" msprop:Generator_RowChangingName="TBTEMP_QUICKDISPLAYRowChanging" msprop:Generator_RowEvHandlerName="TBTEMP_QUICKDISPLAYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTEMP_QUICKDISPLAYRowDeleted" msprop:Generator_RowClassName="TBTEMP_QUICKDISPLAYRow" msprop:Generator_UserTableName="TBTEMP_QUICKDISPLAY" msprop:Generator_RowEvArgName="TBTEMP_QUICKDISPLAYRowChangeEvent">
           <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" />
@@ -5358,7 +5371,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_LANGUAGE_OBJECT" msprop:Generator_TableClassName="TBPMO_LANGUAGE_OBJECTDataTable" msprop:Generator_TableVarName="tableTBPMO_LANGUAGE_OBJECT" msprop:Generator_TablePropName="TBPMO_LANGUAGE_OBJECT" msprop:Generator_RowDeletingName="TBPMO_LANGUAGE_OBJECTRowDeleting" msprop:Generator_RowChangingName="TBPMO_LANGUAGE_OBJECTRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_LANGUAGE_OBJECTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_LANGUAGE_OBJECTRowDeleted" msprop:Generator_UserTableName="TBPMO_LANGUAGE_OBJECT" msprop:Generator_RowChangedName="TBPMO_LANGUAGE_OBJECTRowChanged" msprop:Generator_RowEvArgName="TBPMO_LANGUAGE_OBJECTRowChangeEvent" msprop:Generator_RowClassName="TBPMO_LANGUAGE_OBJECTRow">
+        <xs:element name="TBPMO_LANGUAGE_OBJECT" msprop:Generator_TableClassName="TBPMO_LANGUAGE_OBJECTDataTable" msprop:Generator_TableVarName="tableTBPMO_LANGUAGE_OBJECT" msprop:Generator_RowChangedName="TBPMO_LANGUAGE_OBJECTRowChanged" msprop:Generator_TablePropName="TBPMO_LANGUAGE_OBJECT" msprop:Generator_RowDeletingName="TBPMO_LANGUAGE_OBJECTRowDeleting" msprop:Generator_RowChangingName="TBPMO_LANGUAGE_OBJECTRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_LANGUAGE_OBJECTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_LANGUAGE_OBJECTRowDeleted" msprop:Generator_RowClassName="TBPMO_LANGUAGE_OBJECTRow" msprop:Generator_UserTableName="TBPMO_LANGUAGE_OBJECT" msprop:Generator_RowEvArgName="TBPMO_LANGUAGE_OBJECTRowChangeEvent">
           <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" />
@@ -5410,7 +5423,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_RowClassName="TBDD_CLIENTRow" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent">
+        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_CLIENTRow">
           <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" />
@@ -5454,7 +5467,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_TableClassName="TBPMO_CONSTRUCTOR_USER_SQLDataTable" msprop:Generator_TableVarName="tableTBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_RowChangedName="TBPMO_CONSTRUCTOR_USER_SQLRowChanged" msprop:Generator_TablePropName="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_RowDeletingName="TBPMO_CONSTRUCTOR_USER_SQLRowDeleting" msprop:Generator_RowChangingName="TBPMO_CONSTRUCTOR_USER_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_CONSTRUCTOR_USER_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_CONSTRUCTOR_USER_SQLRowDeleted" msprop:Generator_RowClassName="TBPMO_CONSTRUCTOR_USER_SQLRow" msprop:Generator_UserTableName="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_RowEvArgName="TBPMO_CONSTRUCTOR_USER_SQLRowChangeEvent">
+        <xs:element name="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_TableClassName="TBPMO_CONSTRUCTOR_USER_SQLDataTable" msprop:Generator_TableVarName="tableTBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_TablePropName="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_RowDeletingName="TBPMO_CONSTRUCTOR_USER_SQLRowDeleting" msprop:Generator_RowChangingName="TBPMO_CONSTRUCTOR_USER_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_CONSTRUCTOR_USER_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_CONSTRUCTOR_USER_SQLRowDeleted" msprop:Generator_UserTableName="TBPMO_CONSTRUCTOR_USER_SQL" msprop:Generator_RowChangedName="TBPMO_CONSTRUCTOR_USER_SQLRowChanged" msprop:Generator_RowEvArgName="TBPMO_CONSTRUCTOR_USER_SQLRowChangeEvent" msprop:Generator_RowClassName="TBPMO_CONSTRUCTOR_USER_SQLRow">
           <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" />
@@ -5486,7 +5499,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_TableClassName="TBPMO_WD_IMPORT_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_IMPORT_PROFILE" msprop:Generator_TablePropName="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_RowDeletingName="TBPMO_WD_IMPORT_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_IMPORT_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_IMPORT_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_IMPORT_PROFILERowDeleted" msprop:Generator_UserTableName="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_RowChangedName="TBPMO_WD_IMPORT_PROFILERowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_IMPORT_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_IMPORT_PROFILERow">
+        <xs:element name="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_TableClassName="TBPMO_WD_IMPORT_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_IMPORT_PROFILE" msprop:Generator_RowChangedName="TBPMO_WD_IMPORT_PROFILERowChanged" msprop:Generator_TablePropName="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_RowDeletingName="TBPMO_WD_IMPORT_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_IMPORT_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_IMPORT_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_IMPORT_PROFILERowDeleted" msprop:Generator_RowClassName="TBPMO_WD_IMPORT_PROFILERow" msprop:Generator_UserTableName="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_RowEvArgName="TBPMO_WD_IMPORT_PROFILERowChangeEvent">
           <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" />
@@ -5568,7 +5581,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_TableClassName="TBPMO_WD_IMPORT_PROFILE_IDXDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_TablePropName="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_RowDeletingName="TBPMO_WD_IMPORT_PROFILE_IDXRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_IMPORT_PROFILE_IDXRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_IMPORT_PROFILE_IDXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_IMPORT_PROFILE_IDXRowDeleted" msprop:Generator_UserTableName="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_RowChangedName="TBPMO_WD_IMPORT_PROFILE_IDXRowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_IMPORT_PROFILE_IDXRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_IMPORT_PROFILE_IDXRow">
+        <xs:element name="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_TableClassName="TBPMO_WD_IMPORT_PROFILE_IDXDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_RowChangedName="TBPMO_WD_IMPORT_PROFILE_IDXRowChanged" msprop:Generator_TablePropName="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_RowDeletingName="TBPMO_WD_IMPORT_PROFILE_IDXRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_IMPORT_PROFILE_IDXRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_IMPORT_PROFILE_IDXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_IMPORT_PROFILE_IDXRowDeleted" msprop:Generator_RowClassName="TBPMO_WD_IMPORT_PROFILE_IDXRow" msprop:Generator_UserTableName="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_RowEvArgName="TBPMO_WD_IMPORT_PROFILE_IDXRowChangeEvent">
           <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" />
@@ -5620,7 +5633,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_WF_ACTIVE" msprop:Generator_TableClassName="VWPMO_WF_ACTIVEDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_ACTIVE" msprop:Generator_TablePropName="VWPMO_WF_ACTIVE" msprop:Generator_RowDeletingName="VWPMO_WF_ACTIVERowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_ACTIVERowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_ACTIVERowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_ACTIVERowDeleted" msprop:Generator_UserTableName="VWPMO_WF_ACTIVE" msprop:Generator_RowChangedName="VWPMO_WF_ACTIVERowChanged" msprop:Generator_RowEvArgName="VWPMO_WF_ACTIVERowChangeEvent" msprop:Generator_RowClassName="VWPMO_WF_ACTIVERow">
+        <xs:element name="VWPMO_WF_ACTIVE" msprop:Generator_TableClassName="VWPMO_WF_ACTIVEDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_ACTIVE" msprop:Generator_RowChangedName="VWPMO_WF_ACTIVERowChanged" msprop:Generator_TablePropName="VWPMO_WF_ACTIVE" msprop:Generator_RowDeletingName="VWPMO_WF_ACTIVERowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_ACTIVERowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_ACTIVERowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_ACTIVERowDeleted" msprop:Generator_RowClassName="VWPMO_WF_ACTIVERow" msprop:Generator_UserTableName="VWPMO_WF_ACTIVE" msprop:Generator_RowEvArgName="VWPMO_WF_ACTIVERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="WF_TASK_ID" msprop:Generator_ColumnVarNameInTable="columnWF_TASK_ID" msprop:Generator_ColumnPropNameInRow="WF_TASK_ID" msprop:Generator_ColumnPropNameInTable="WF_TASK_IDColumn" msprop:Generator_UserColumnName="WF_TASK_ID" type="xs:int" />
@@ -5711,7 +5724,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_RIGHT_GROUP" msprop:Generator_TableClassName="TBPMO_RIGHT_GROUPDataTable" msprop:Generator_TableVarName="tableTBPMO_RIGHT_GROUP" msprop:Generator_RowChangedName="TBPMO_RIGHT_GROUPRowChanged" msprop:Generator_TablePropName="TBPMO_RIGHT_GROUP" msprop:Generator_RowDeletingName="TBPMO_RIGHT_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPMO_RIGHT_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RIGHT_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RIGHT_GROUPRowDeleted" msprop:Generator_RowClassName="TBPMO_RIGHT_GROUPRow" msprop:Generator_UserTableName="TBPMO_RIGHT_GROUP" msprop:Generator_RowEvArgName="TBPMO_RIGHT_GROUPRowChangeEvent">
+        <xs:element name="TBPMO_RIGHT_GROUP" msprop:Generator_TableClassName="TBPMO_RIGHT_GROUPDataTable" msprop:Generator_TableVarName="tableTBPMO_RIGHT_GROUP" msprop:Generator_TablePropName="TBPMO_RIGHT_GROUP" msprop:Generator_RowDeletingName="TBPMO_RIGHT_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPMO_RIGHT_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_RIGHT_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_RIGHT_GROUPRowDeleted" msprop:Generator_UserTableName="TBPMO_RIGHT_GROUP" msprop:Generator_RowChangedName="TBPMO_RIGHT_GROUPRowChanged" msprop:Generator_RowEvArgName="TBPMO_RIGHT_GROUPRowChangeEvent" msprop:Generator_RowClassName="TBPMO_RIGHT_GROUPRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -5742,7 +5755,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_TableClassName="TBPMO_WD_NAMECONVENTION_FORMATDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_TablePropName="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_RowDeletingName="TBPMO_WD_NAMECONVENTION_FORMATRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_NAMECONVENTION_FORMATRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_NAMECONVENTION_FORMATRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_NAMECONVENTION_FORMATRowDeleted" msprop:Generator_UserTableName="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_RowChangedName="TBPMO_WD_NAMECONVENTION_FORMATRowChanged" msprop:Generator_RowEvArgName="TBPMO_WD_NAMECONVENTION_FORMATRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WD_NAMECONVENTION_FORMATRow">
+        <xs:element name="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_TableClassName="TBPMO_WD_NAMECONVENTION_FORMATDataTable" msprop:Generator_TableVarName="tableTBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_RowChangedName="TBPMO_WD_NAMECONVENTION_FORMATRowChanged" msprop:Generator_TablePropName="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_RowDeletingName="TBPMO_WD_NAMECONVENTION_FORMATRowDeleting" msprop:Generator_RowChangingName="TBPMO_WD_NAMECONVENTION_FORMATRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WD_NAMECONVENTION_FORMATRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WD_NAMECONVENTION_FORMATRowDeleted" msprop:Generator_RowClassName="TBPMO_WD_NAMECONVENTION_FORMATRow" msprop:Generator_UserTableName="TBPMO_WD_NAMECONVENTION_FORMAT" msprop:Generator_RowEvArgName="TBPMO_WD_NAMECONVENTION_FORMATRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -5780,7 +5793,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_TableClassName="TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_RowChangedName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_RowDeletingName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRow" msprop:Generator_UserTableName="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_RowEvArgName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChangeEvent">
+        <xs:element name="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_TableClassName="TBPMO_STRUCTURE_NODES_CONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_TablePropName="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_RowDeletingName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_RowChangedName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPMO_STRUCTURE_NODES_CONFIGURATIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -5822,7 +5835,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_ENTITY" msprop:Generator_TableClassName="TBWH_ENTITYDataTable" msprop:Generator_TableVarName="tableTBWH_ENTITY" msprop:Generator_TablePropName="TBWH_ENTITY" msprop:Generator_RowDeletingName="TBWH_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBWH_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBWH_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ENTITYRowDeleted" msprop:Generator_UserTableName="TBWH_ENTITY" msprop:Generator_RowChangedName="TBWH_ENTITYRowChanged" msprop:Generator_RowEvArgName="TBWH_ENTITYRowChangeEvent" msprop:Generator_RowClassName="TBWH_ENTITYRow">
+        <xs:element name="TBWH_ENTITY" msprop:Generator_TableClassName="TBWH_ENTITYDataTable" msprop:Generator_TableVarName="tableTBWH_ENTITY" msprop:Generator_RowChangedName="TBWH_ENTITYRowChanged" msprop:Generator_TablePropName="TBWH_ENTITY" msprop:Generator_RowDeletingName="TBWH_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBWH_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBWH_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ENTITYRowDeleted" msprop:Generator_RowClassName="TBWH_ENTITYRow" msprop:Generator_UserTableName="TBWH_ENTITY" msprop:Generator_RowEvArgName="TBWH_ENTITYRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="FORM_ID" msprop:Generator_ColumnVarNameInTable="columnFORM_ID" msprop:Generator_ColumnPropNameInRow="FORM_ID" msprop:Generator_ColumnPropNameInTable="FORM_IDColumn" msprop:Generator_UserColumnName="FORM_ID" type="xs:int" />
@@ -5836,7 +5849,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASK_HISTORYDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASK_HISTORYRowChanged" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASK_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASK_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASK_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASK_HISTORYRowDeleted" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASK_HISTORYRow" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASK_HISTORYRowChangeEvent">
+        <xs:element name="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_TableClassName="TBPMO_WORKFLOW_TASK_HISTORYDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_TablePropName="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_TASK_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_TASK_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_TASK_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_TASK_HISTORYRowDeleted" msprop:Generator_UserTableName="TBPMO_WORKFLOW_TASK_HISTORY" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_TASK_HISTORYRowChanged" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_TASK_HISTORYRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WORKFLOW_TASK_HISTORYRow">
           <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" />
@@ -5865,7 +5878,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_TableClassName="VWPMO_RIGHTS_2B_WORKEDDataTable" msprop:Generator_TableVarName="tableVWPMO_RIGHTS_2B_WORKED" msprop:Generator_TablePropName="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_RowDeletingName="VWPMO_RIGHTS_2B_WORKEDRowDeleting" msprop:Generator_RowChangingName="VWPMO_RIGHTS_2B_WORKEDRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_RIGHTS_2B_WORKEDRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_RIGHTS_2B_WORKEDRowDeleted" msprop:Generator_UserTableName="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_RowChangedName="VWPMO_RIGHTS_2B_WORKEDRowChanged" msprop:Generator_RowEvArgName="VWPMO_RIGHTS_2B_WORKEDRowChangeEvent" msprop:Generator_RowClassName="VWPMO_RIGHTS_2B_WORKEDRow">
+        <xs:element name="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_TableClassName="VWPMO_RIGHTS_2B_WORKEDDataTable" msprop:Generator_TableVarName="tableVWPMO_RIGHTS_2B_WORKED" msprop:Generator_RowChangedName="VWPMO_RIGHTS_2B_WORKEDRowChanged" msprop:Generator_TablePropName="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_RowDeletingName="VWPMO_RIGHTS_2B_WORKEDRowDeleting" msprop:Generator_RowChangingName="VWPMO_RIGHTS_2B_WORKEDRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_RIGHTS_2B_WORKEDRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_RIGHTS_2B_WORKEDRowDeleted" msprop:Generator_RowClassName="VWPMO_RIGHTS_2B_WORKEDRow" msprop:Generator_UserTableName="VWPMO_RIGHTS_2B_WORKED" msprop:Generator_RowEvArgName="VWPMO_RIGHTS_2B_WORKEDRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -6076,26 +6089,26 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPMO_FORM_VIEW_FORM_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_FORM_VIEW" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_FORM_VIEW" msprop:Generator_ChildPropName="GetTBPMO_FORM_VIEWRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_VIEW_FORM_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_VIEW_FORM_ID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
+      <msdata:Relationship name="FK_TBPMO_FORM_VIEW_FORM_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_FORM_VIEW" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_FORM_VIEW" msprop:Generator_ChildPropName="GetTBPMO_FORM_VIEWRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_VIEW_FORM_ID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_VIEW_FORM_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
-      <msdata:Relationship name="FK_TBDD_DOKUMENTART_EINGID" msdata:parent="TBDD_EINGANGSARTEN" msdata:child="TBDD_DOKUMENTART" msdata:parentkey="GUID" msdata:childkey="EINGANGSART_ID" msprop:Generator_UserChildTable="TBDD_DOKUMENTART" msprop:Generator_ChildPropName="GetTBDD_DOKUMENTARTRows" msprop:Generator_UserRelationName="FK_TBDD_DOKUMENTART_EINGID" msprop:Generator_RelationVarName="relationFK_TBDD_DOKUMENTART_EINGID" msprop:Generator_UserParentTable="TBDD_EINGANGSARTEN" msprop:Generator_ParentPropName="TBDD_EINGANGSARTENRow" />
+      <msdata:Relationship name="FK_TBDD_DOKUMENTART_EINGID" msdata:parent="TBDD_EINGANGSARTEN" msdata:child="TBDD_DOKUMENTART" msdata:parentkey="GUID" msdata:childkey="EINGANGSART_ID" msprop:Generator_UserChildTable="TBDD_DOKUMENTART" msprop:Generator_ChildPropName="GetTBDD_DOKUMENTARTRows" msprop:Generator_UserRelationName="FK_TBDD_DOKUMENTART_EINGID" msprop:Generator_ParentPropName="TBDD_EINGANGSARTENRow" msprop:Generator_RelationVarName="relationFK_TBDD_DOKUMENTART_EINGID" msprop:Generator_UserParentTable="TBDD_EINGANGSARTEN" />
-      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" />
+      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" />
-      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID1" msdata:parent="TBPMO_WD_FORMVIEW_DOKTYPES" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID1" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID1" msprop:Generator_UserParentTable="TBPMO_WD_FORMVIEW_DOKTYPES" msprop:Generator_ParentPropName="TBPMO_WD_FORMVIEW_DOKTYPESRow" />
+      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID1" msdata:parent="TBPMO_WD_FORMVIEW_DOKTYPES" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID1" msprop:Generator_ParentPropName="TBPMO_WD_FORMVIEW_DOKTYPESRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID1" msprop:Generator_UserParentTable="TBPMO_WD_FORMVIEW_DOKTYPES" />
-      <msdata:Relationship name="FK_TBPMO_FORM_FORM_TYPE_ID" msdata:parent="TBPMO_FORM_TYPE" msdata:child="TBPMO_FORM" msdata:parentkey="GUID" msdata:childkey="FORM_TYPE_ID" msprop:Generator_UserChildTable="TBPMO_FORM" msprop:Generator_ChildPropName="GetTBPMO_FORMRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_FORM_TYPE_ID" msprop:Generator_ParentPropName="TBPMO_FORM_TYPERow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_FORM_TYPE_ID" msprop:Generator_UserParentTable="TBPMO_FORM_TYPE" />
+      <msdata:Relationship name="FK_TBPMO_FORM_FORM_TYPE_ID" msdata:parent="TBPMO_FORM_TYPE" msdata:child="TBPMO_FORM" msdata:parentkey="GUID" msdata:childkey="FORM_TYPE_ID" msprop:Generator_UserChildTable="TBPMO_FORM" msprop:Generator_ChildPropName="GetTBPMO_FORMRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_FORM_TYPE_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_FORM_TYPE_ID" msprop:Generator_UserParentTable="TBPMO_FORM_TYPE" msprop:Generator_ParentPropName="TBPMO_FORM_TYPERow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_USER_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" msprop:Generator_ParentPropName="TBDD_USER_GROUPSRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_USER_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_USER_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
-      <msdata:Relationship name="FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msdata:parent="TBDD_USER" msdata:child="TBPMO_FOLLUPEMAIL_USER" msdata:parentkey="GUID" msdata:childkey="FOLLOW_UP_ID" msprop:Generator_UserChildTable="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_ChildPropName="GetTBPMO_FOLLUPEMAIL_USERRows" msprop:Generator_UserRelationName="FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <msdata:Relationship name="FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msdata:parent="TBDD_USER" msdata:child="TBPMO_FOLLUPEMAIL_USER" msdata:parentkey="GUID" msdata:childkey="FOLLOW_UP_ID" msprop:Generator_UserChildTable="TBPMO_FOLLUPEMAIL_USER" msprop:Generator_ChildPropName="GetTBPMO_FOLLUPEMAIL_USERRows" msprop:Generator_UserRelationName="FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
-      <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" />
-      <msdata:Relationship name="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_FORM_CONSTRUCTOR_DETAIL" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_ChildPropName="GetTBPMO_FORM_CONSTRUCTOR_DETAILRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msprop:Generator_UserParentTable="TBPMO_FORM" />
+      <msdata:Relationship name="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_FORM_CONSTRUCTOR_DETAIL" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_ChildPropName="GetTBPMO_FORM_CONSTRUCTOR_DETAILRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
-      <msdata:Relationship name="FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_TEMPLATE_ENTITY" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_ENTITY" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
+      <msdata:Relationship name="FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_TEMPLATE_ENTITY" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_ENTITY" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
-      <msdata:Relationship name="FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msdata:parent="TBPMO_TEMPLATE" msdata:child="TBPMO_TEMPLATE_ENTITY" msdata:parentkey="GUID" msdata:childkey="TEMPLATE_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_ENTITY" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msprop:Generator_UserParentTable="TBPMO_TEMPLATE" msprop:Generator_ParentPropName="TBPMO_TEMPLATERow" />
+      <msdata:Relationship name="FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msdata:parent="TBPMO_TEMPLATE" msdata:child="TBPMO_TEMPLATE_ENTITY" msdata:parentkey="GUID" msdata:childkey="TEMPLATE_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_ENTITY" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msprop:Generator_ParentPropName="TBPMO_TEMPLATERow" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msprop:Generator_UserParentTable="TBPMO_TEMPLATE" />
-      <msdata:Relationship name="FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msdata:parent="TBPMO_TEMPLATE_ENTITY" msdata:child="TBPMO_TEMPLATE_PATTERN" msdata:parentkey="GUID" msdata:childkey="TEMPLATE_ENT_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_PATTERN" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_PATTERNRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msprop:Generator_UserParentTable="TBPMO_TEMPLATE_ENTITY" msprop:Generator_ParentPropName="TBPMO_TEMPLATE_ENTITYRow" />
+      <msdata:Relationship name="FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msdata:parent="TBPMO_TEMPLATE_ENTITY" msdata:child="TBPMO_TEMPLATE_PATTERN" msdata:parentkey="GUID" msdata:childkey="TEMPLATE_ENT_ID" msprop:Generator_UserChildTable="TBPMO_TEMPLATE_PATTERN" msprop:Generator_ChildPropName="GetTBPMO_TEMPLATE_PATTERNRows" msprop:Generator_UserRelationName="FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msprop:Generator_ParentPropName="TBPMO_TEMPLATE_ENTITYRow" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" msprop:Generator_UserParentTable="TBPMO_TEMPLATE_ENTITY" />
-      <msdata:Relationship name="FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msdata:parent="TBTEMP_QUICKDISPLAY" msdata:child="TBPMO_FOLLOW_UP_EMAIL" msdata:parentkey="GUID" msdata:childkey="DEPENDENT_DATE_CTRL_ID" msprop:Generator_UserChildTable="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_ChildPropName="GetTBPMO_FOLLOW_UP_EMAILRowsByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_UserRelationName="FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_UserParentTable="TBTEMP_QUICKDISPLAY" msprop:Generator_ParentPropName="TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" />
+      <msdata:Relationship name="FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msdata:parent="TBTEMP_QUICKDISPLAY" msdata:child="TBPMO_FOLLOW_UP_EMAIL" msdata:parentkey="GUID" msdata:childkey="DEPENDENT_DATE_CTRL_ID" msprop:Generator_UserChildTable="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_ChildPropName="GetTBPMO_FOLLOW_UP_EMAILRowsByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_UserRelationName="FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_ParentPropName="TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" msprop:Generator_UserParentTable="TBTEMP_QUICKDISPLAY" />
-      <msdata:Relationship name="FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msdata:parent="TBTEMP_QUICKDISPLAY" msdata:child="TBPMO_FOLLOW_UP_EMAIL" msdata:parentkey="GUID" msdata:childkey="DEPENDENT_DONE_CTRL_ID" msprop:Generator_UserChildTable="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_ChildPropName="GetTBPMO_FOLLOW_UP_EMAILRowsByFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_UserRelationName="FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_UserParentTable="TBTEMP_QUICKDISPLAY" msprop:Generator_ParentPropName="TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" />
+      <msdata:Relationship name="FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msdata:parent="TBTEMP_QUICKDISPLAY" msdata:child="TBPMO_FOLLOW_UP_EMAIL" msdata:parentkey="GUID" msdata:childkey="DEPENDENT_DONE_CTRL_ID" msprop:Generator_UserChildTable="TBPMO_FOLLOW_UP_EMAIL" msprop:Generator_ChildPropName="GetTBPMO_FOLLOW_UP_EMAILRowsByFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_UserRelationName="FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_ParentPropName="TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_UserParentTable="TBTEMP_QUICKDISPLAY" />
-      <msdata:Relationship name="FK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msdata:parent="TBPMO_WD_IMPORT_PROFILE" msdata:child="TBPMO_WD_IMPORT_PROFILE_IDX" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_ChildPropName="GetTBPMO_WD_IMPORT_PROFILE_IDXRows" msprop:Generator_UserRelationName="FK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msprop:Generator_ParentPropName="TBPMO_WD_IMPORT_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msprop:Generator_UserParentTable="TBPMO_WD_IMPORT_PROFILE" />
+      <msdata:Relationship name="FK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msdata:parent="TBPMO_WD_IMPORT_PROFILE" msdata:child="TBPMO_WD_IMPORT_PROFILE_IDX" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBPMO_WD_IMPORT_PROFILE_IDX" msprop:Generator_ChildPropName="GetTBPMO_WD_IMPORT_PROFILE_IDXRows" msprop:Generator_UserRelationName="FK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msprop:Generator_RelationVarName="relationFK_TBPMO_WD_IMPORT_PROFILE_IDX_1" msprop:Generator_UserParentTable="TBPMO_WD_IMPORT_PROFILE" msprop:Generator_ParentPropName="TBPMO_WD_IMPORT_PROFILERow" />
-      <msdata:Relationship name="FK_TBPMO_RIGHT_GROUP_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_RIGHT_GROUP" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_RIGHT_GROUP" msprop:Generator_ChildPropName="GetTBPMO_RIGHT_GROUPRows" msprop:Generator_UserRelationName="FK_TBPMO_RIGHT_GROUP_ENTITY_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_RIGHT_GROUP_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
+      <msdata:Relationship name="FK_TBPMO_RIGHT_GROUP_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_RIGHT_GROUP" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_RIGHT_GROUP" msprop:Generator_ChildPropName="GetTBPMO_RIGHT_GROUPRows" msprop:Generator_UserRelationName="FK_TBPMO_RIGHT_GROUP_ENTITY_ID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_RIGHT_GROUP_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
-      <msdata:Relationship name="FK_TBPMO_RIGHT_GROUP_GROUP_ID" msdata:parent="TBDD_USER_GROUPS" msdata:child="TBPMO_RIGHT_GROUP" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBPMO_RIGHT_GROUP" msprop:Generator_ChildPropName="GetTBPMO_RIGHT_GROUPRows" msprop:Generator_UserRelationName="FK_TBPMO_RIGHT_GROUP_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_RIGHT_GROUP_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" msprop:Generator_ParentPropName="TBDD_USER_GROUPSRow" />
+      <msdata:Relationship name="FK_TBPMO_RIGHT_GROUP_GROUP_ID" msdata:parent="TBDD_USER_GROUPS" msdata:child="TBPMO_RIGHT_GROUP" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBPMO_RIGHT_GROUP" msprop:Generator_ChildPropName="GetTBPMO_RIGHT_GROUPRows" msprop:Generator_UserRelationName="FK_TBPMO_RIGHT_GROUP_GROUP_ID" msprop:Generator_ParentPropName="TBDD_USER_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBPMO_RIGHT_GROUP_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" />
-      <msdata:Relationship name="FK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_STRUCTURE_NODES_CONFIGURATION" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_ChildPropName="GetTBPMO_STRUCTURE_NODES_CONFIGURATIONRows" msprop:Generator_UserRelationName="FK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
+      <msdata:Relationship name="FK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_STRUCTURE_NODES_CONFIGURATION" msdata:parentkey="GUID" msdata:childkey="ENTITY_ID" msprop:Generator_UserChildTable="TBPMO_STRUCTURE_NODES_CONFIGURATION" msprop:Generator_ChildPropName="GetTBPMO_STRUCTURE_NODES_CONFIGURATIONRows" msprop:Generator_UserRelationName="FK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_STRUCTURE_NODES_CONFIGURATION_ENTITY_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
-      <msdata:Relationship name="FK_TBPMO_FORM_VIEW_FORM_ID1" msdata:parent="TBPMO_FORM" msdata:child="TBWH_ENTITY" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBWH_ENTITY" msprop:Generator_ChildPropName="GetTBWH_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_VIEW_FORM_ID1" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_VIEW_FORM_ID1" msprop:Generator_UserParentTable="TBPMO_FORM" />
+      <msdata:Relationship name="FK_TBPMO_FORM_VIEW_FORM_ID1" msdata:parent="TBPMO_FORM" msdata:child="TBWH_ENTITY" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBWH_ENTITY" msprop:Generator_ChildPropName="GetTBWH_ENTITYRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_VIEW_FORM_ID1" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_VIEW_FORM_ID1" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

app/DD-Record-Organiser/DD_DMSDataSet.xss

@@ -10,7 +10,7 @@
     <Shape ID="DesignTable:VWPMO_CONTROL_SCREEN" ZOrder="3" X="78" Y="352" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBPMO_FORM_VIEW" ZOrder="18" X="492" Y="68" Height="324" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBPMO_RECORD" ZOrder="51" X="875" Y="408" Height="172" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:VWPMO_DOKUMENTTYPES" ZOrder="2" X="555" Y="415" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:VWPMO_DOKUMENTTYPES" ZOrder="1" X="556" Y="356" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:TBPMO_WD_FVIEW_DT_INDEX" ZOrder="68" X="819" Y="147" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK" ZOrder="50" X="603" Y="718" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK_STATE" ZOrder="15" X="950" Y="736" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
@@ -51,7 +51,7 @@
     <Shape ID="DesignTable:VWPMO_WF_ACTIVE" ZOrder="16" X="1910" Y="509" Height="357" Width="378" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="270" />
     <Shape ID="DesignTable:TBPMO_RIGHT_GROUP" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBPMO_WD_NAMECONVENTION_FORMAT" ZOrder="10" X="0" Y="0" Height="90" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_STRUCTURE_NODES_CONFIGURATION" ZOrder="1" X="64" Y="2" Height="359" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="289" />
+    <Shape ID="DesignTable:TBPMO_STRUCTURE_NODES_CONFIGURATION" ZOrder="2" X="64" Y="2" Height="359" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="289" />
     <Shape ID="DesignTable:TBWH_ENTITY" ZOrder="9" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK_HISTORY" ZOrder="8" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:VWPMO_RIGHTS_2B_WORKED" ZOrder="5" X="2579" Y="410" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />

app/DD-Record-Organiser/ModuleRuntimeVariables.vb

@@ -6,7 +6,7 @@
 
     ' Diese Werte müssen später zur Laufzeit geladen werden
 
-    Public CURRENT_FORM_ID As Integer
+
     Public CURRENT_PARENT_ENTITY_ID As Integer
     Public CURRENT_PARENT_RECORD_ID As Integer
     Public CURRENT_ACT_LEVEL As Integer
@@ -15,6 +15,7 @@
 
     Public CURRENT_ENTITYSTRING As String = ""
     Public CURRENT_ENTITYSQL As String
+    Public CURRENT_ENTITY_REDUNDANT_ID As Integer
     'Public CURRENT_ENTITYSQL As String
 
     Public CURRENT_SCREEN_ID As Integer = 1
@@ -36,7 +37,10 @@
     Public CURRENT_NEWFILENAME As String
     Public CURRENT_CONTROL_DOCTYPE_MATCH As String = ""
 
+    Public CURRENT_FORM_ID As Integer
     Public CURRENT_FORMVIEW_ID As Integer
+    Public CURRENT_REDUNDANT_FORM_ID As Integer
+    Public CURRENT_REDUNDANT_FORMVIEW_ID As Integer
     'Public CURRENT_MASTER_FORM_ID As Integer
     Public CURRENT_FILEIN_WD As String
     Public CURRENT_DOC_ID

app/DD-Record-Organiser/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.7.5")> 
+<Assembly: AssemblyVersion("2.4.7.6")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

app/DD-Record-Organiser/frmConfig_Basic.resx

@@ -1414,6 +1414,9 @@
   <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>en-US</value>
+  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

app/DD-Record-Organiser/frmConfig_Basic.vb

@@ -85,7 +85,7 @@ Public Class frmConfig_Basic
                 Loop
                 cmbDatenbank.DroppedDown = True
             Else
-                MsgBox("The standard-databases could not be retrieved. Check rights in sql-server for user: " & Me.txtUser.Text, MsgBoxStyle.Exclamation)
+                MsgBox("The standard-databases could not be retrieved. The default database will be set!" & vbNewLine & "Check rights in sql-server for user: " & Me.txtUser.Text, MsgBoxStyle.Exclamation)
             End If
             connection.Close()
         Catch ex As Exception
@@ -423,4 +423,8 @@ Public Class frmConfig_Basic
     Private Sub chkSubfolder_CheckedChanged(sender As Object, e As EventArgs) Handles chkSubfolder.CheckedChanged
         CheckScanFolder(txtScanFolderWatch.Text, chkSubfolder.Checked)
     End Sub
+
+    Private Sub txtPasswort_TextChanged(sender As Object, e As EventArgs) Handles txtPasswort.TextChanged
+
+    End Sub
 End Class

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

@@ -22,6 +22,7 @@ Partial Class frmConstructorDesigner
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim GUIDLabel As System.Windows.Forms.Label
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructorDesigner))
         Dim FORM_TITLELabel As System.Windows.Forms.Label
@@ -36,7 +37,6 @@ Partial Class frmConstructorDesigner
         Dim ADDED_WHENLabel1 As System.Windows.Forms.Label
         Dim CHANGED_WHOLabel1 As System.Windows.Forms.Label
         Dim CHANGED_WHENLabel1 As System.Windows.Forms.Label
-        Dim SQL_SELECT_EBENE1Label As System.Windows.Forms.Label
         Dim COLUMN_NAME1Label1 As System.Windows.Forms.Label
         Dim GUIDLabel2 As System.Windows.Forms.Label
         Dim SQL_COMMANDLabel As System.Windows.Forms.Label
@@ -47,14 +47,14 @@ Partial Class frmConstructorDesigner
         Dim Label19 As System.Windows.Forms.Label
         Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label
         Dim SQL_RIGHT_WINDREAM_VIEWLabel As System.Windows.Forms.Label
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
         Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
         Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter()
-        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator()
+        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = 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()
@@ -67,11 +67,11 @@ Partial Class frmConstructorDesigner
         Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
-        Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TreeViewDetails = New System.Windows.Forms.TreeView()
-        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip()
+        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ImageList1 = New System.Windows.Forms.ImageList()
+        Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
         Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox()
         Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox()
         Me.SEQUENCE_MENUNumericUpDown = New System.Windows.Forms.NumericUpDown()
@@ -93,7 +93,6 @@ Partial Class frmConstructorDesigner
         Me.Label4 = New System.Windows.Forms.Label()
         Me.COLUMN_NAME1ComboBox = New System.Windows.Forms.ComboBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.SQL_SELECT_EBENE1TextBox = New System.Windows.Forms.TextBox()
         Me.CHANGED_WHENTextBox1 = New System.Windows.Forms.TextBox()
         Me.CHANGED_WHOTextBox1 = New System.Windows.Forms.TextBox()
         Me.ADDED_WHENTextBox1 = New System.Windows.Forms.TextBox()
@@ -114,41 +113,48 @@ Partial Class frmConstructorDesigner
         Me.listBoxControls = New System.Windows.Forms.ListBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
-        Me.btndeleteSupervisorControl = New System.Windows.Forms.Button()
+        Me.XtraTabControlSV = New DevExpress.XtraTab.XtraTabControl()
-        Me.btnAddSupervisorControl = New System.Windows.Forms.Button()
+        Me.XtraTabPage7 = New DevExpress.XtraTab.XtraTabPage()
-        Me.Label15 = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
-        Me.CheckedListBoxSupervisorControls = New System.Windows.Forms.CheckedListBox()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.cmbSupervisorControls = New System.Windows.Forms.ComboBox()
-        Me.Label13 = New System.Windows.Forms.Label()
         Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
-        Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn14 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname3 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn15 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn16 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn17 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.cmbRight = New System.Windows.Forms.ComboBox()
         Me.GridControlSupervisorAdd = New DevExpress.XtraGrid.GridControl()
-        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.GridViewSupervisorsAdd = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn11 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn12 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn13 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.cmbRight = New System.Windows.Forms.ComboBox()
         Me.btnDeleteUserSupervisor = New System.Windows.Forms.Button()
         Me.btnAddUser2Supervisor = New System.Windows.Forms.Button()
-        Me.Label9 = New System.Windows.Forms.Label()
+        Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.btndeleteSupervisorControl = New System.Windows.Forms.Button()
+        Me.btnAddSupervisorControl = New System.Windows.Forms.Button()
+        Me.Label13 = New System.Windows.Forms.Label()
+        Me.Label15 = New System.Windows.Forms.Label()
+        Me.cmbSupervisorControls = New System.Windows.Forms.ComboBox()
+        Me.CheckedListBoxSupervisorControls = New System.Windows.Forms.CheckedListBox()
+        Me.Label14 = New System.Windows.Forms.Label()
         Me.chkWDSearch_Active = New System.Windows.Forms.CheckBox()
         Me.lblSaveDocSearch = New System.Windows.Forms.Label()
         Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.GridControlUserSQL = New DevExpress.XtraGrid.GridControl()
-        Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSurname4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -163,7 +169,7 @@ Partial Class frmConstructorDesigner
         Me.btnAddUserSQL = New System.Windows.Forms.Button()
         Me.lblsaveSQLUser = New System.Windows.Forms.Label()
         Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox()
-        Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
         Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox()
         Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox()
@@ -183,17 +189,17 @@ Partial Class frmConstructorDesigner
         Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnSave = New System.Windows.Forms.ToolStripButton()
-        Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.ListBox1 = New System.Windows.Forms.ListBox()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBPMO_FORM_CONSTRUCTORTableAdapter1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
         Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
         Me.lblSave = New System.Windows.Forms.Label()
         Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog()
         Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter()
         Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
         Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button()
         Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button()
         Me.lblConfiguredUsers = New System.Windows.Forms.Label()
@@ -207,19 +213,17 @@ Partial Class frmConstructorDesigner
         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.GridControl1 = New DevExpress.XtraGrid.GridControl()
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.XtraTabControlSV = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage7 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage()
-        Me.Label20 = New System.Windows.Forms.Label()
         GUIDLabel = New System.Windows.Forms.Label()
         FORM_TITLELabel = New System.Windows.Forms.Label()
         SEQUENCE_MENULabel = New System.Windows.Forms.Label()
@@ -233,7 +237,6 @@ Partial Class frmConstructorDesigner
         ADDED_WHENLabel1 = New System.Windows.Forms.Label()
         CHANGED_WHOLabel1 = New System.Windows.Forms.Label()
         CHANGED_WHENLabel1 = New System.Windows.Forms.Label()
-        SQL_SELECT_EBENE1Label = New System.Windows.Forms.Label()
         COLUMN_NAME1Label1 = New System.Windows.Forms.Label()
         GUIDLabel2 = New System.Windows.Forms.Label()
         SQL_COMMANDLabel = New System.Windows.Forms.Label()
@@ -259,12 +262,16 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage3.SuspendLayout()
         Me.XtraTabPage5.SuspendLayout()
         Me.XtraTabPage4.SuspendLayout()
+        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabControlSV.SuspendLayout()
+        Me.XtraTabPage7.SuspendLayout()
         CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabPage8.SuspendLayout()
         Me.XtraTabPage2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -285,10 +292,6 @@ Partial Class frmConstructorDesigner
         CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabControlSV.SuspendLayout()
-        Me.XtraTabPage7.SuspendLayout()
-        Me.XtraTabPage8.SuspendLayout()
         Me.SuspendLayout()
         '
         'GUIDLabel
@@ -356,11 +359,6 @@ Partial Class frmConstructorDesigner
         resources.ApplyResources(CHANGED_WHENLabel1, "CHANGED_WHENLabel1")
         CHANGED_WHENLabel1.Name = "CHANGED_WHENLabel1"
         '
-        'SQL_SELECT_EBENE1Label
-        '
-        resources.ApplyResources(SQL_SELECT_EBENE1Label, "SQL_SELECT_EBENE1Label")
-        SQL_SELECT_EBENE1Label.Name = "SQL_SELECT_EBENE1Label"
-        '
         'COLUMN_NAME1Label1
         '
         resources.ApplyResources(COLUMN_NAME1Label1, "COLUMN_NAME1Label1")
@@ -663,10 +661,8 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage3.Controls.Add(COLUMN_NAME1Label1)
         Me.XtraTabPage3.Controls.Add(Me.COLUMN_NAME1ComboBox)
         Me.XtraTabPage3.Controls.Add(Me.Label2)
-        Me.XtraTabPage3.Controls.Add(Me.SQL_SELECT_EBENE1TextBox)
         Me.XtraTabPage3.Controls.Add(CHANGED_WHENLabel1)
         Me.XtraTabPage3.Controls.Add(Me.CHANGED_WHENTextBox1)
-        Me.XtraTabPage3.Controls.Add(SQL_SELECT_EBENE1Label)
         Me.XtraTabPage3.Controls.Add(CHANGED_WHOLabel1)
         Me.XtraTabPage3.Controls.Add(Me.CHANGED_WHOTextBox1)
         Me.XtraTabPage3.Controls.Add(ADDED_WHENLabel1)
@@ -720,12 +716,6 @@ Partial Class frmConstructorDesigner
         resources.ApplyResources(Me.Label2, "Label2")
         Me.Label2.Name = "Label2"
         '
-        'SQL_SELECT_EBENE1TextBox
-        '
-        Me.SQL_SELECT_EBENE1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SQL_SELECT_EBENE1", True))
-        resources.ApplyResources(Me.SQL_SELECT_EBENE1TextBox, "SQL_SELECT_EBENE1TextBox")
-        Me.SQL_SELECT_EBENE1TextBox.Name = "SQL_SELECT_EBENE1TextBox"
-        '
         'CHANGED_WHENTextBox1
         '
         Me.CHANGED_WHENTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -865,46 +855,31 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch)
         Me.XtraTabPage4.Name = "XtraTabPage4"
         '
-        'btndeleteSupervisorControl
+        'XtraTabControlSV
         '
-        resources.ApplyResources(Me.btndeleteSupervisorControl, "btndeleteSupervisorControl")
+        resources.ApplyResources(Me.XtraTabControlSV, "XtraTabControlSV")
-        Me.btndeleteSupervisorControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.XtraTabControlSV.Name = "XtraTabControlSV"
-        Me.btndeleteSupervisorControl.Name = "btndeleteSupervisorControl"
+        Me.XtraTabControlSV.SelectedTabPage = Me.XtraTabPage7
-        Me.btndeleteSupervisorControl.UseVisualStyleBackColor = True
+        Me.XtraTabControlSV.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage7, Me.XtraTabPage8})
         '
-        'btnAddSupervisorControl
+        'XtraTabPage7
         '
-        resources.ApplyResources(Me.btnAddSupervisorControl, "btnAddSupervisorControl")
+        Me.XtraTabPage7.Controls.Add(Me.Label20)
-        Me.btnAddSupervisorControl.Name = "btnAddSupervisorControl"
+        Me.XtraTabPage7.Controls.Add(Me.GridControl2)
-        Me.btnAddSupervisorControl.UseVisualStyleBackColor = True
+        Me.XtraTabPage7.Controls.Add(Me.Label7)
+        Me.XtraTabPage7.Controls.Add(Me.Label9)
+        Me.XtraTabPage7.Controls.Add(Me.Label11)
+        Me.XtraTabPage7.Controls.Add(Me.cmbRight)
+        Me.XtraTabPage7.Controls.Add(Me.GridControlSupervisorAdd)
+        Me.XtraTabPage7.Controls.Add(Me.btnDeleteUserSupervisor)
+        Me.XtraTabPage7.Controls.Add(Me.btnAddUser2Supervisor)
+        Me.XtraTabPage7.Name = "XtraTabPage7"
+        resources.ApplyResources(Me.XtraTabPage7, "XtraTabPage7")
         '
-        'Label15
+        'Label20
         '
-        resources.ApplyResources(Me.Label15, "Label15")
+        resources.ApplyResources(Me.Label20, "Label20")
-        Me.Label15.Name = "Label15"
+        Me.Label20.Name = "Label20"
-        '
-        'CheckedListBoxSupervisorControls
-        '
-        resources.ApplyResources(Me.CheckedListBoxSupervisorControls, "CheckedListBoxSupervisorControls")
-        Me.CheckedListBoxSupervisorControls.BackColor = System.Drawing.SystemColors.GradientActiveCaption
-        Me.CheckedListBoxSupervisorControls.FormattingEnabled = True
-        Me.CheckedListBoxSupervisorControls.Name = "CheckedListBoxSupervisorControls"
-        '
-        'Label14
-        '
-        resources.ApplyResources(Me.Label14, "Label14")
-        Me.Label14.Name = "Label14"
-        '
-        'cmbSupervisorControls
-        '
-        resources.ApplyResources(Me.cmbSupervisorControls, "cmbSupervisorControls")
-        Me.cmbSupervisorControls.FormattingEnabled = True
-        Me.cmbSupervisorControls.Name = "cmbSupervisorControls"
-        '
-        'Label13
-        '
-        resources.ApplyResources(Me.Label13, "Label13")
-        Me.Label13.Name = "Label13"
         '
         'GridControl2
         '
@@ -926,7 +901,7 @@ Partial Class frmConstructorDesigner
         Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn14, Me.GridColumn15, Me.GridColumn16, Me.GridColumn17})
+        Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn14, Me.colSurname3, Me.GridColumn15, Me.GridColumn16, Me.GridColumn17})
         Me.GridView2.GridControl = Me.GridControl2
         Me.GridView2.Name = "GridView2"
         Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -944,6 +919,12 @@ Partial Class frmConstructorDesigner
         Me.GridColumn14.FieldName = "Select"
         Me.GridColumn14.Name = "GridColumn14"
         '
+        'colSurname3
+        '
+        resources.ApplyResources(Me.colSurname3, "colSurname3")
+        Me.colSurname3.FieldName = "Surname"
+        Me.colSurname3.Name = "colSurname3"
+        '
         'GridColumn15
         '
         Me.GridColumn15.FieldName = "Username"
@@ -963,6 +944,28 @@ Partial Class frmConstructorDesigner
         Me.GridColumn17.FieldName = "ID"
         Me.GridColumn17.Name = "GridColumn17"
         '
+        'Label7
+        '
+        resources.ApplyResources(Me.Label7, "Label7")
+        Me.Label7.Name = "Label7"
+        '
+        'Label9
+        '
+        resources.ApplyResources(Me.Label9, "Label9")
+        Me.Label9.Name = "Label9"
+        '
+        'Label11
+        '
+        resources.ApplyResources(Me.Label11, "Label11")
+        Me.Label11.Name = "Label11"
+        '
+        'cmbRight
+        '
+        resources.ApplyResources(Me.cmbRight, "cmbRight")
+        Me.cmbRight.FormattingEnabled = True
+        Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1")})
+        Me.cmbRight.Name = "cmbRight"
+        '
         'GridControlSupervisorAdd
         '
         resources.ApplyResources(Me.GridControlSupervisorAdd, "GridControlSupervisorAdd")
@@ -983,7 +986,7 @@ Partial Class frmConstructorDesigner
         Me.GridViewSupervisorsAdd.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridViewSupervisorsAdd.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridViewSupervisorsAdd.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn10, Me.GridColumn11, Me.GridColumn12, Me.GridColumn13})
+        Me.GridViewSupervisorsAdd.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn10, Me.colSurname2, Me.GridColumn11, Me.GridColumn12, Me.GridColumn13})
         Me.GridViewSupervisorsAdd.GridControl = Me.GridControlSupervisorAdd
         Me.GridViewSupervisorsAdd.Name = "GridViewSupervisorsAdd"
         Me.GridViewSupervisorsAdd.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1001,6 +1004,12 @@ Partial Class frmConstructorDesigner
         Me.GridColumn10.FieldName = "Select"
         Me.GridColumn10.Name = "GridColumn10"
         '
+        'colSurname2
+        '
+        resources.ApplyResources(Me.colSurname2, "colSurname2")
+        Me.colSurname2.FieldName = "Surname"
+        Me.colSurname2.Name = "colSurname2"
+        '
         'GridColumn11
         '
         Me.GridColumn11.FieldName = "Username"
@@ -1020,18 +1029,6 @@ Partial Class frmConstructorDesigner
         Me.GridColumn13.FieldName = "ID"
         Me.GridColumn13.Name = "GridColumn13"
         '
-        'Label11
-        '
-        resources.ApplyResources(Me.Label11, "Label11")
-        Me.Label11.Name = "Label11"
-        '
-        'cmbRight
-        '
-        resources.ApplyResources(Me.cmbRight, "cmbRight")
-        Me.cmbRight.FormattingEnabled = True
-        Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1")})
-        Me.cmbRight.Name = "cmbRight"
-        '
         'btnDeleteUserSupervisor
         '
         resources.ApplyResources(Me.btnDeleteUserSupervisor, "btnDeleteUserSupervisor")
@@ -1044,15 +1041,58 @@ Partial Class frmConstructorDesigner
         Me.btnAddUser2Supervisor.Name = "btnAddUser2Supervisor"
         Me.btnAddUser2Supervisor.UseVisualStyleBackColor = True
         '
-        'Label9
+        'XtraTabPage8
         '
-        resources.ApplyResources(Me.Label9, "Label9")
+        Me.XtraTabPage8.Controls.Add(Me.btndeleteSupervisorControl)
-        Me.Label9.Name = "Label9"
+        Me.XtraTabPage8.Controls.Add(Me.btnAddSupervisorControl)
+        Me.XtraTabPage8.Controls.Add(Me.Label13)
+        Me.XtraTabPage8.Controls.Add(Me.Label15)
+        Me.XtraTabPage8.Controls.Add(Me.cmbSupervisorControls)
+        Me.XtraTabPage8.Controls.Add(Me.CheckedListBoxSupervisorControls)
+        Me.XtraTabPage8.Controls.Add(Me.Label14)
+        Me.XtraTabPage8.Name = "XtraTabPage8"
+        resources.ApplyResources(Me.XtraTabPage8, "XtraTabPage8")
         '
-        'Label7
+        'btndeleteSupervisorControl
         '
-        resources.ApplyResources(Me.Label7, "Label7")
+        resources.ApplyResources(Me.btndeleteSupervisorControl, "btndeleteSupervisorControl")
-        Me.Label7.Name = "Label7"
+        Me.btndeleteSupervisorControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.btndeleteSupervisorControl.Name = "btndeleteSupervisorControl"
+        Me.btndeleteSupervisorControl.UseVisualStyleBackColor = True
+        '
+        'btnAddSupervisorControl
+        '
+        resources.ApplyResources(Me.btnAddSupervisorControl, "btnAddSupervisorControl")
+        Me.btnAddSupervisorControl.Name = "btnAddSupervisorControl"
+        Me.btnAddSupervisorControl.UseVisualStyleBackColor = True
+        '
+        'Label13
+        '
+        resources.ApplyResources(Me.Label13, "Label13")
+        Me.Label13.Name = "Label13"
+        '
+        'Label15
+        '
+        resources.ApplyResources(Me.Label15, "Label15")
+        Me.Label15.Name = "Label15"
+        '
+        'cmbSupervisorControls
+        '
+        resources.ApplyResources(Me.cmbSupervisorControls, "cmbSupervisorControls")
+        Me.cmbSupervisorControls.FormattingEnabled = True
+        Me.cmbSupervisorControls.Name = "cmbSupervisorControls"
+        '
+        'CheckedListBoxSupervisorControls
+        '
+        resources.ApplyResources(Me.CheckedListBoxSupervisorControls, "CheckedListBoxSupervisorControls")
+        Me.CheckedListBoxSupervisorControls.BackColor = System.Drawing.SystemColors.GradientActiveCaption
+        Me.CheckedListBoxSupervisorControls.FormattingEnabled = True
+        Me.CheckedListBoxSupervisorControls.Name = "CheckedListBoxSupervisorControls"
+        '
+        'Label14
+        '
+        resources.ApplyResources(Me.Label14, "Label14")
+        Me.Label14.Name = "Label14"
         '
         'chkWDSearch_Active
         '
@@ -1127,7 +1167,7 @@ Partial Class frmConstructorDesigner
         Me.GridViewUserSQL.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewUserSQL.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridViewUserSQL.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridViewUserSQL.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.colID1})
+        Me.GridViewUserSQL.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSurname4, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.colID1})
         Me.GridViewUserSQL.GridControl = Me.GridControlUserSQL
         Me.GridViewUserSQL.Name = "GridViewUserSQL"
         Me.GridViewUserSQL.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1139,6 +1179,12 @@ Partial Class frmConstructorDesigner
         Me.GridViewUserSQL.OptionsView.ShowAutoFilterRow = True
         Me.GridViewUserSQL.OptionsView.ShowGroupPanel = False
         '
+        'colSurname4
+        '
+        resources.ApplyResources(Me.colSurname4, "colSurname4")
+        Me.colSurname4.FieldName = "Surname"
+        Me.colSurname4.Name = "colSurname4"
+        '
         'GridColumn4
         '
         Me.GridColumn4.FieldName = "Username"
@@ -1177,8 +1223,8 @@ Partial Class frmConstructorDesigner
         '
         Me.dgvResult.AllowUserToAddRows = False
         Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         resources.ApplyResources(Me.dgvResult, "dgvResult")
         Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvResult.Name = "dgvResult"
@@ -1188,11 +1234,11 @@ Partial Class frmConstructorDesigner
         '
         Me.dgvPlaceholders.AllowUserToAddRows = False
         Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
-        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
         Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
+        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
         Me.dgvPlaceholders.Name = "dgvPlaceholders"
         '
         'colPlaceholder
@@ -1532,7 +1578,7 @@ Partial Class frmConstructorDesigner
         Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
+        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]
@@ -1550,6 +1596,12 @@ Partial Class frmConstructorDesigner
         Me.colSelect.FieldName = "Select"
         Me.colSelect.Name = "colSelect"
         '
+        'colSurname
+        '
+        resources.ApplyResources(Me.colSurname, "colSurname")
+        Me.colSurname.FieldName = "Surname"
+        Me.colSurname.Name = "colSurname"
+        '
         'GridColumn1
         '
         Me.GridColumn1.FieldName = "Username"
@@ -1584,7 +1636,7 @@ Partial Class frmConstructorDesigner
         Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn7, Me.GridColumn8, Me.GridColumn9})
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.colSurname1, Me.GridColumn7, Me.GridColumn8, Me.GridColumn9})
         Me.GridView1.GridControl = Me.GridControl1
         Me.GridView1.Name = "GridView1"
         Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1602,6 +1654,12 @@ Partial Class frmConstructorDesigner
         Me.GridColumn3.FieldName = "Select"
         Me.GridColumn3.Name = "GridColumn3"
         '
+        'colSurname1
+        '
+        resources.ApplyResources(Me.colSurname1, "colSurname1")
+        Me.colSurname1.FieldName = "Surname"
+        Me.colSurname1.Name = "colSurname1"
+        '
         'GridColumn7
         '
         Me.GridColumn7.FieldName = "Username"
@@ -1621,44 +1679,6 @@ Partial Class frmConstructorDesigner
         Me.GridColumn9.FieldName = "ID"
         Me.GridColumn9.Name = "GridColumn9"
         '
-        'XtraTabControlSV
-        '
-        resources.ApplyResources(Me.XtraTabControlSV, "XtraTabControlSV")
-        Me.XtraTabControlSV.Name = "XtraTabControlSV"
-        Me.XtraTabControlSV.SelectedTabPage = Me.XtraTabPage7
-        Me.XtraTabControlSV.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage7, Me.XtraTabPage8})
-        '
-        'XtraTabPage7
-        '
-        Me.XtraTabPage7.Controls.Add(Me.Label20)
-        Me.XtraTabPage7.Controls.Add(Me.GridControl2)
-        Me.XtraTabPage7.Controls.Add(Me.Label7)
-        Me.XtraTabPage7.Controls.Add(Me.Label9)
-        Me.XtraTabPage7.Controls.Add(Me.Label11)
-        Me.XtraTabPage7.Controls.Add(Me.cmbRight)
-        Me.XtraTabPage7.Controls.Add(Me.GridControlSupervisorAdd)
-        Me.XtraTabPage7.Controls.Add(Me.btnDeleteUserSupervisor)
-        Me.XtraTabPage7.Controls.Add(Me.btnAddUser2Supervisor)
-        Me.XtraTabPage7.Name = "XtraTabPage7"
-        resources.ApplyResources(Me.XtraTabPage7, "XtraTabPage7")
-        '
-        'XtraTabPage8
-        '
-        Me.XtraTabPage8.Controls.Add(Me.btndeleteSupervisorControl)
-        Me.XtraTabPage8.Controls.Add(Me.btnAddSupervisorControl)
-        Me.XtraTabPage8.Controls.Add(Me.Label13)
-        Me.XtraTabPage8.Controls.Add(Me.Label15)
-        Me.XtraTabPage8.Controls.Add(Me.cmbSupervisorControls)
-        Me.XtraTabPage8.Controls.Add(Me.CheckedListBoxSupervisorControls)
-        Me.XtraTabPage8.Controls.Add(Me.Label14)
-        Me.XtraTabPage8.Name = "XtraTabPage8"
-        resources.ApplyResources(Me.XtraTabPage8, "XtraTabPage8")
-        '
-        'Label20
-        '
-        resources.ApplyResources(Me.Label20, "Label20")
-        Me.Label20.Name = "Label20"
-        '
         'frmConstructorDesigner
         '
         resources.ApplyResources(Me, "$this")
@@ -1715,12 +1735,18 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage5.PerformLayout()
         Me.XtraTabPage4.ResumeLayout(False)
         Me.XtraTabPage4.PerformLayout()
+        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabControlSV.ResumeLayout(False)
+        Me.XtraTabPage7.ResumeLayout(False)
+        Me.XtraTabPage7.PerformLayout()
         CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabPage8.ResumeLayout(False)
+        Me.XtraTabPage8.PerformLayout()
         Me.XtraTabPage2.ResumeLayout(False)
         Me.TabControl1.ResumeLayout(False)
         Me.TabPage1.ResumeLayout(False)
@@ -1745,12 +1771,6 @@ Partial Class frmConstructorDesigner
         CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabControlSV.ResumeLayout(False)
-        Me.XtraTabPage7.ResumeLayout(False)
-        Me.XtraTabPage7.PerformLayout()
-        Me.XtraTabPage8.ResumeLayout(False)
-        Me.XtraTabPage8.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1805,7 +1825,6 @@ Partial Class frmConstructorDesigner
     Friend WithEvents ADDED_WHENTextBox1 As System.Windows.Forms.TextBox
     Friend WithEvents ADDED_WHOTextBox1 As System.Windows.Forms.TextBox
     Friend WithEvents XtraTabPage5 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SQL_SELECT_EBENE1TextBox As System.Windows.Forms.TextBox
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents COLUMN_NAME1ComboBox As System.Windows.Forms.ComboBox
     Friend WithEvents Label4 As System.Windows.Forms.Label
@@ -1926,4 +1945,9 @@ Partial Class frmConstructorDesigner
     Friend WithEvents XtraTabPage7 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents Label20 As System.Windows.Forms.Label
     Friend WithEvents XtraTabPage8 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents colSurname3 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname4 As DevExpress.XtraGrid.Columns.GridColumn
 End Class

app/DD-Record-Organiser/frmConstructorDesigner.vb

@@ -110,9 +110,9 @@ Public Class frmConstructorDesigner
     End Sub
     Public Sub Load_ConstructorUser()
         Try
-            Dim Sql = String.Format("SELECT GUID, USERNAME, EMAIL FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1 AND GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER By USERNAME", CONSTRUCTOR_IDTextBox.Text)
+            Dim Sql = String.Format("SELECT * FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1 AND GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER By USERNAME", CONSTRUCTOR_IDTextBox.Text)
             Dim DT_USER = ClassDatabase.Return_Datatable(Sql)
-            Sql = String.Format("SELECT T1.GUID, T.USERNAME + ' - ' + CASE T1.HOME_MENUE WHEN 1 THEN 'HOME' ELSE 'STANDARD' END AS USERNAME FROM TBDD_USER T, TBPMO_CONSTRUCTOR_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CONSTRUCT_ID = {0} ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
+            Sql = String.Format("SELECT T1.GUID, T.USERNAME + ' - ' + CASE T1.HOME_MENUE WHEN 1 THEN 'HOME' ELSE 'STANDARD' END AS USERNAME, T.EMAIL, T.NAME, T.PRENAME FROM TBDD_USER T, TBPMO_CONSTRUCTOR_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CONSTRUCT_ID = {0} ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
             Dim DT_USER_CONSTR As DataTable = ClassDatabase.Return_Datatable(Sql, "LOAD USERS FOR CONSTRUCT")
             Try
                 DD_ECMAdmin.TBAD_Users.Clear()
@@ -120,15 +120,16 @@ Public Class frmConstructorDesigner
                 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.Username = row.Item(1)
+                    newUserRow.Surname = row.Item("NAME")
+                    newUserRow.Prename = row.Item("PRENAME")
                     Try
-                        newUserRow.Email = row.Item(2)
+                        newUserRow.Email = row.Item("EMAIL")
                     Catch ex As Exception
                         newUserRow.Email = ""
                     End Try
 
-                    newUserRow.ID = row.Item(0)
+                    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
@@ -142,15 +143,16 @@ Public Class frmConstructorDesigner
                 For Each row As DataRow In DT_USER_CONSTR.Rows
                     Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
                     newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
-
+                    newUserRow.Surname = row.Item("NAME")
-                    newUserRow.Username = row.Item(1)
+                    newUserRow.Prename = row.Item("PRENAME")
+                    newUserRow.Username = row.Item("USERNAME")
                     Try
-                        newUserRow.Email = row.Item(2)
+                        newUserRow.Email = row.Item("EMAIL")
                     Catch ex As Exception
                         newUserRow.Email = ""
                     End Try
 
-                    newUserRow.ID = row.Item(0)
+                    newUserRow.ID = row.Item("GUID")
                     DD_ECMAdmin.TBWH_Users1.Rows.Add(newUserRow)
                     ' chklbxUserForGroup.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
                 Next
@@ -278,29 +280,29 @@ Public Class frmConstructorDesigner
     End Sub
 
     Private Sub LEVEL1_SELECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LEVEL1_SELECTCheckBox.CheckedChanged
-        Try
+        'Try
-            If LEVEL1_SELECTCheckBox.Checked Then
+        '    If LEVEL1_SELECTCheckBox.Checked Then
-                SQL_SELECT_EBENE1TextBox.Enabled = True
+        '        SQL_SELECT_EBENE1TextBox.Enabled = True
-            Else
+        '    Else
-                SQL_SELECT_EBENE1TextBox.Enabled = False
+        '        SQL_SELECT_EBENE1TextBox.Enabled = False
-            End If
+        '    End If
-            Dim view As String
+        '    Dim view As String
-            If SQL_SELECT_EBENE1TextBox.Text <> "" Then
+        '    If SQL_SELECT_EBENE1TextBox.Text <> "" Then
-                view = SQL_SELECT_EBENE1TextBox.Text.ToUpper.Replace("SELECT * FROM ", "")
+        '        view = SQL_SELECT_EBENE1TextBox.Text.ToUpper.Replace("SELECT * FROM ", "")
-                view = view.Trim
+        '        view = view.Trim
-                Dim Sql = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & view & "')"
+        '        Dim Sql = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & view & "')"
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> " & Sql, False)
+        '        If LogErrorsOnly = False Then ClassLogger.Add(" >> " & Sql, False)
-                Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql)
+        '        Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql)
-                If DT IsNot Nothing Then
+        '        If DT IsNot Nothing Then
-                    COLUMN_NAME1ComboBox.Items.Clear()
+        '            COLUMN_NAME1ComboBox.Items.Clear()
-                    For Each row As DataRow In DT.Rows
+        '            For Each row As DataRow In DT.Rows
-                        COLUMN_NAME1ComboBox.Items.Add(row.Item(0))
+        '                COLUMN_NAME1ComboBox.Items.Add(row.Item(0))
-                    Next
+        '            Next
-                End If
+        '        End If
-            End If
+        '    End If
-        Catch ex As Exception
+        'Catch ex As Exception
-            MsgBox("Error in LEVEL1_SELECTCheckBox:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        '    MsgBox("Error in LEVEL1_SELECTCheckBox:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
+        'End Try
     End Sub
 
     Private Sub tsbtnSave_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click
@@ -461,20 +463,22 @@ Public Class frmConstructorDesigner
     End Sub
     Public Sub Load_TBWH_Users1()
         Try
-            Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
+            Dim sql = String.Format("SELECT T.* FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             DD_ECMAdmin.TBWH_Users1.Clear()
             For Each row As DataRow In DT.Rows
                 Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
                 newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
-                newUserRow.Username = row.Item(1)
+                newUserRow.Username = row.Item("USERNAME")
+                newUserRow.Surname = row.Item("NAME")
+                newUserRow.Prename = row.Item("PRENAME")
                 Try
-                    newUserRow.Email = row.Item(2)
+                    newUserRow.Email = row.Item("EMAIL")
                 Catch ex As Exception
                     newUserRow.Email = ""
                 End Try
 
-                newUserRow.ID = row.Item(0)
+                newUserRow.ID = row.Item("GUID")
                 DD_ECMAdmin.TBWH_Users1.Rows.Add(newUserRow)
                 ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
             Next
@@ -484,20 +488,22 @@ Public Class frmConstructorDesigner
     End Sub
     Public Sub Load_TBAD_Users()
         Try
-            Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
+            Dim sql = String.Format("SELECT T.* FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             DD_ECMAdmin.TBAD_Users.Clear()
             For Each row As DataRow In DT.Rows
                 Dim newUserRow As DD_ECMAdmin.TBAD_UsersRow
                 newUserRow = DD_ECMAdmin.TBAD_Users.NewTBAD_UsersRow
-                newUserRow.Username = row.Item(1)
+                newUserRow.Username = row.Item("USERNAME")
+                newUserRow.Surname = row.Item("NAME")
+                newUserRow.Prename = row.Item("PRENAME")
                 Try
-                    newUserRow.Email = row.Item(2)
+                    newUserRow.Email = row.Item("EMAIL")
                 Catch ex As Exception
                     newUserRow.Email = ""
                 End Try
 
-                newUserRow.ID = row.Item(0)
+                newUserRow.ID = row.Item("GUID")
                 DD_ECMAdmin.TBAD_Users.Rows.Add(newUserRow)
                 ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
             Next
@@ -508,20 +514,22 @@ Public Class frmConstructorDesigner
 
     Public Sub Load_Supervisor()
         Try
-            Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", SELECTED_ENTITY_ID)
+            Dim sql = String.Format("SELECT T.* FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", SELECTED_ENTITY_ID)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             DD_ECMAdmin.TBWH_Users2.Clear()
             For Each row As DataRow In DT.Rows
                 Dim newUserRow As DD_ECMAdmin.TBWH_Users2Row
                 newUserRow = DD_ECMAdmin.TBWH_Users2.NewTBWH_Users2Row
-                newUserRow.Username = row.Item(1)
+                newUserRow.Username = row.Item("USERNAME")
+                newUserRow.Surname = row.Item("NAME")
+                newUserRow.Prename = row.Item("PRENAME")
                 Try
-                    newUserRow.Email = row.Item(2)
+                    newUserRow.Email = row.Item("EMAIL")
                 Catch ex As Exception
                     newUserRow.Email = ""
                 End Try
 
-                newUserRow.ID = row.Item(0)
+                newUserRow.ID = row.Item("GUID")
                 DD_ECMAdmin.TBWH_Users2.Rows.Add(newUserRow)
                 ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
             Next
@@ -670,10 +678,15 @@ Public Class frmConstructorDesigner
         Try
             For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
                 If row.Item(0) = CBool(True) Then
-                    Dim home As Integer = CInt(CheckBoxHome.Checked)
+                    Dim home As Integer
+                    If CheckBoxHome.Checked Then
+                        home = 1
+                    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 & ")"
-                    If ClassDatabase.Execute_non_Query(insert, True) Then
+                    If ClassDatabase.Execute_non_Query(insert, False) = False Then
-
+                        MsgBox("Could not insert the User-Definition....Check the logfile!", MsgBoxStyle.Exclamation)
                     End If
                 End If
             Next

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,13 +30,13 @@ 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.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EntitätssucheStartenToolStripMenuItem = 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,7 +63,7 @@ Partial Class frmConstructor_Main
         Me.pnlDetails = New System.Windows.Forms.Panel()
         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.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
         Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -106,7 +107,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()
@@ -140,7 +141,7 @@ Partial Class frmConstructor_Main
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SplitContainer1 = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
+        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components)
         Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane()
         Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton()
         Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton()
@@ -151,18 +152,18 @@ Partial Class frmConstructor_Main
         Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel()
         Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar()
         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)
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -162,6 +162,7 @@ Public Class frmConstructor_Main
 
     Private FORM_TYPE As Integer
     Private ENTITY_ID As Integer
+    Private REDUNDANT_FORM As Integer
 
     Private FORMVIEW_ID As Integer
     Private _ENTITYSQL As String
@@ -1016,7 +1017,9 @@ Public Class frmConstructor_Main
                     tempsql = tempsql.Replace("@RECORD_ID", RECORD_ID)
                     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("@USER_NAME", Environment.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
@@ -1232,335 +1235,14 @@ Public Class frmConstructor_Main
 
             TreeViewMain.Nodes.Clear()
             If NODE_NAVIGATION = True Then
-                ' Rootnode erstellen und taggen
+                 Try
-                If DT_TREEVIEW_PER_CONTROLS.Rows.Count > 1 Then
+                    Dim MainNode = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_PER_CONTROLS, TREEVIEW_IMAGELIST)
-                    ' Presuming the DataTable has a column named ENTITY_ID and TYPE_NODE.
+                    If Not IsNothing(MainNode) Then
-                    Dim expression As String
+                        TreeViewMain.Nodes.Add(MainNode)
-                    expression = "TYPE_NODE = 0"
+                    End If
-                    Dim foundRowsLevel0() As DataRow
+                Catch ex As Exception
-                    ' Use the Select method to find all rows matching the filter.
+                    MsgBox("Error in Load TreeView NodesNavigation:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                    foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression, "NODE_CAPTION")
+                End Try
-                    Dim i As Integer
-                    Dim NODE_CONFIG_ID
-                    Dim LEVEL0_NODE As TreeNode
-
-                    ' For each row create a Node
-                    For i = 0 To foundRowsLevel0.GetUpperBound(0)
-                        Dim ID = foundRowsLevel0(i)("GUID")
-                        Dim LevelEntity = foundRowsLevel0(i)("ENTITY_ID")
-                        Dim controlID = foundRowsLevel0(i)("CONTROL_ID")
-                        Dim nodetext = foundRowsLevel0(i)("NODE_CAPTION")
-                        Dim Type_node = foundRowsLevel0(i)("TYPE_NODE")
-                        Dim RECORD_ID = foundRowsLevel0(i)("RECORD_ID")
-                        NODE_CONFIG_ID = foundRowsLevel0(i)("NODE_CONFIG_ID")
-
-                        LEVEL0_NODE = New TreeNode(nodetext)
-                        If Not IsDBNull(RECORD_ID) Then
-                            LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID & "#RECORD-ID" & RECORD_ID.ToString
-                        Else
-                            LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID
-                        End If
-
-                        Dim index As Integer = 0
-                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                            If img = NODE_CONFIG_ID & "#" & LevelEntity Then
-                                Exit For
-                            End If
-                            index += 1
-                        Next
-                        LEVEL0_NODE.ImageIndex = index
-                        LEVEL0_NODE.SelectedImageIndex = index
-
-                        '### LEVEL 1 laden #######
-                        Dim expressionLevel1 As String
-                        expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND  Einschränkung auf Type 2 und Parent_Guid
-                        Dim foundRowsLevel1() As DataRow
-                        foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1, "NODE_CAPTION")
-                        Dim j As Integer
-                        For j = 0 To foundRowsLevel1.GetUpperBound(0)
-                            Dim ID1 = foundRowsLevel1(j)("GUID")
-                            Dim LevelEntity1 = foundRowsLevel1(j)("ENTITY_ID")
-                            Dim controlID1 = foundRowsLevel1(j)("CONTROL_ID")
-                            Dim nodetext1 = foundRowsLevel1(j)("NODE_CAPTION")
-                            Dim Type_node1 = foundRowsLevel1(j)("TYPE_NODE")
-                            RECORD_ID = foundRowsLevel1(j)("RECORD_ID")
-                            NODE_CONFIG_ID = foundRowsLevel1(j)("NODE_CONFIG_ID")
-                            ' Node erstellen..
-                            Dim LEVEL1_NODE As TreeNode
-                            LEVEL1_NODE = New TreeNode(nodetext1)
-                            If Not IsDBNull(RECORD_ID) Then
-                                LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1 & "#RECORD-ID" & RECORD_ID.ToString
-                            Else
-                                LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1
-                            End If
-
-                            index = 0
-                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                If img = NODE_CONFIG_ID & "#" & LevelEntity1 Then
-                                    Exit For
-                                End If
-                                index += 1
-                            Next
-                            LEVEL1_NODE.ImageIndex = index
-                            LEVEL1_NODE.SelectedImageIndex = index
-                            ' ..und einfügen
-                            LEVEL0_NODE.Nodes.Add(LEVEL1_NODE)
-                            '### LEVEL 2 laden #######
-                            Dim expressionLevel2 As String
-                            expressionLevel2 = "PARENT_GUID = " & ID1 'TYPE_NODE = 2 AND Einschränkung auf Type  und Parent_Guid
-                            Dim foundRowsLevel2() As DataRow
-                            foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2, "NODE_CAPTION")
-                            Dim k As Integer
-                            For k = 0 To foundRowsLevel2.GetUpperBound(0)
-                                Dim ID2 = foundRowsLevel2(k)("GUID")
-                                Dim LevelEntity2 = foundRowsLevel2(k)("ENTITY_ID")
-                                Dim controlID2 = foundRowsLevel2(k)("CONTROL_ID")
-                                Dim nodetext2 = foundRowsLevel2(k)("NODE_CAPTION")
-                                RECORD_ID = foundRowsLevel2(k)("RECORD_ID")
-                                NODE_CONFIG_ID = foundRowsLevel2(k)("NODE_CONFIG_ID")
-                                ' Node erstellen..
-                                Dim LEVEL2_NODE As TreeNode
-                                LEVEL2_NODE = New TreeNode(nodetext2)
-                                If Not IsDBNull(RECORD_ID) Then
-                                    LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2 & "#RECORD-ID" & RECORD_ID.ToString
-                                Else
-                                    LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2
-                                End If
-
-                                index = 0
-                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                    If img = NODE_CONFIG_ID & "#" & LevelEntity2 Then
-                                        Exit For
-                                    End If
-                                    index += 1
-                                Next
-                                LEVEL2_NODE.ImageIndex = index
-                                LEVEL2_NODE.SelectedImageIndex = index
-                                ' ..und einfügen
-                                LEVEL1_NODE.Nodes.Add(LEVEL2_NODE)
-                                '### LEVEL 3 laden #######
-                                Dim expressionLevel3 As String
-                                expressionLevel3 = "PARENT_GUID = " & ID2 'TYPE_NODE = 3 AND  Einschränkung auf Type  und Parent_Guid
-                                Dim foundRowsLevel3() As DataRow
-                                foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3, "NODE_CAPTION")
-                                Dim l As Integer
-                                For l = 0 To foundRowsLevel3.GetUpperBound(0)
-                                    Dim ID3 = foundRowsLevel3(l)("GUID")
-                                    Dim LevelEntity3 = foundRowsLevel3(l)("ENTITY_ID")
-                                    Dim controlID3 = foundRowsLevel3(l)("CONTROL_ID")
-                                    Dim nodetext3 = foundRowsLevel3(l)("NODE_CAPTION")
-                                    RECORD_ID = foundRowsLevel3(l)("RECORD_ID")
-                                    NODE_CONFIG_ID = foundRowsLevel3(l)("NODE_CONFIG_ID")
-                                    ' Node erstellen..
-                                    Dim LEVEL3_NODE As TreeNode
-                                    LEVEL3_NODE = New TreeNode(nodetext3)
-                                    If Not IsDBNull(RECORD_ID) Then
-                                        LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3 & "#RECORD-ID" & RECORD_ID.ToString
-                                    Else
-                                        LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3
-                                    End If
-
-                                    index = 0
-                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                        If img = NODE_CONFIG_ID & "#" & LevelEntity3 Then
-                                            Exit For
-                                        End If
-                                        index += 1
-                                    Next
-                                    LEVEL3_NODE.ImageIndex = index
-                                    LEVEL3_NODE.SelectedImageIndex = index
-                                    ' ..und einfügen
-                                    LEVEL2_NODE.Nodes.Add(LEVEL3_NODE)
-                                    '### LEVEL 4 laden #######
-                                    Dim expressionLevel4 As String
-                                    expressionLevel4 = "PARENT_GUID = " & ID3 'TYPE_NODE = 4 AND Einschränkung auf Type  und Parent_Guid
-                                    Dim foundRowsLevel4() As DataRow
-                                    foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4, "NODE_CAPTION")
-                                    Dim m As Integer
-                                    For m = 0 To foundRowsLevel4.GetUpperBound(0)
-                                        Dim ID5 = foundRowsLevel4(m)("GUID")
-                                        Dim LevelEntity5 = foundRowsLevel4(m)("ENTITY_ID")
-                                        Dim controlID5 = foundRowsLevel4(m)("CONTROL_ID")
-                                        Dim nodetext5 = foundRowsLevel4(m)("NODE_CAPTION")
-                                        RECORD_ID = foundRowsLevel4(m)("RECORD_ID")
-                                        NODE_CONFIG_ID = foundRowsLevel4(m)("NODE_CONFIG_ID")
-                                        ' Node erstellen..
-                                        Dim LEVEL4_NODE As TreeNode
-                                        LEVEL4_NODE = New TreeNode(nodetext5)
-                                        If Not IsDBNull(RECORD_ID) Then
-                                            LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5 & "#RECORD-ID" & RECORD_ID.ToString
-                                        Else
-                                            LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5
-                                        End If
-
-                                        index = 0
-                                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                            If img = NODE_CONFIG_ID & "#" & LevelEntity5 Then
-                                                Exit For
-                                            End If
-                                            index += 1
-                                        Next
-                                        LEVEL4_NODE.ImageIndex = index
-                                        LEVEL4_NODE.SelectedImageIndex = index
-                                        ' ..und einfügen
-                                        LEVEL3_NODE.Nodes.Add(LEVEL4_NODE)
-                                        '### LEVEL 5 laden #######
-                                        Dim expressionLevel5 As String
-                                        Dim sortExp As String = "NODE_CONFIG_ID, NODE_CAPTION"
-                                        expressionLevel5 = "PARENT_GUID = " & ID5 'TYPE_NODE = 5 AND  Einschränkung auf Type  und Parent_Guid
-                                        Dim foundRowsLevel5() As DataRow
-                                        foundRowsLevel5 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel5, sortExp)
-                                        Dim n As Integer
-                                        If ID5 = 1146 Then
-                                            Console.WriteLine("Aha")
-                                        End If
-                                        For n = 0 To foundRowsLevel5.GetUpperBound(0)
-                                            Dim ID6 = foundRowsLevel5(n)("GUID")
-                                            Dim LevelEntity6 = foundRowsLevel5(n)("ENTITY_ID")
-                                            Dim controlID6 = foundRowsLevel5(n)("CONTROL_ID")
-                                            Dim nodetext6 = foundRowsLevel5(n)("NODE_CAPTION")
-                                            RECORD_ID = foundRowsLevel5(n)("RECORD_ID")
-                                            NODE_CONFIG_ID = foundRowsLevel5(n)("NODE_CONFIG_ID")
-                                            ' Node erstellen..
-                                            Dim LEVEL5_NODE As TreeNode
-                                            LEVEL5_NODE = New TreeNode(nodetext6)
-                                            If Not IsDBNull(RECORD_ID) Then
-                                                LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6 & "#RECORD-ID" & RECORD_ID.ToString
-                                            Else
-                                                LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6
-                                            End If
-
-                                            index = 0
-                                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                If img = NODE_CONFIG_ID & "#" & LevelEntity6 Then
-                                                    Exit For
-                                                End If
-                                                index += 1
-                                            Next
-                                            LEVEL5_NODE.ImageIndex = index
-                                            LEVEL5_NODE.SelectedImageIndex = index
-                                            ' ..und einfügen
-                                            LEVEL4_NODE.Nodes.Add(LEVEL5_NODE)
-                                            '### LEVEL 5 laden #######
-                                            Dim expressionLevel6 As String
-                                            expressionLevel6 = "PARENT_GUID = " & ID6 'TYPE_NODE = 6 AND  Einschränkung auf Type  und Parent_Guid
-                                            Dim foundRowsLevel6() As DataRow
-                                            foundRowsLevel6 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel6, sortExp)
-                                            If ID6 = 1146 Then
-                                                Console.WriteLine("Aha")
-                                            End If
-                                            Dim o As Integer
-                                            For o = 0 To foundRowsLevel6.GetUpperBound(0)
-                                                Dim ID7 = foundRowsLevel6(o)("GUID")
-                                                Dim LevelEntity7 = foundRowsLevel6(o)("ENTITY_ID")
-                                                Dim controlID7 = foundRowsLevel6(o)("CONTROL_ID")
-                                                Dim nodetext7 = foundRowsLevel6(o)("NODE_CAPTION")
-                                                RECORD_ID = foundRowsLevel6(o)("RECORD_ID")
-                                                NODE_CONFIG_ID = foundRowsLevel6(o)("NODE_CONFIG_ID")
-                                                ' Node erstellen..
-                                                Dim LEVEL6_NODE As TreeNode
-                                                LEVEL6_NODE = New TreeNode(nodetext7)
-                                                If Not IsDBNull(RECORD_ID) Then
-                                                    LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7 & "#RECORD-ID" & RECORD_ID.ToString
-                                                Else
-                                                    LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7
-                                                End If
-
-                                                index = 0
-                                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                    If img = NODE_CONFIG_ID & "#" & LevelEntity7 Then
-                                                        Exit For
-                                                    End If
-                                                    index += 1
-                                                Next
-                                                LEVEL6_NODE.ImageIndex = index
-                                                LEVEL6_NODE.SelectedImageIndex = index
-                                                ' ..und einfügen
-                                                LEVEL5_NODE.Nodes.Add(LEVEL6_NODE)
-                                                '### LEVEL 7 laden #######
-                                                Dim expressionLevel7 As String
-                                                expressionLevel7 = "PARENT_GUID = " & ID7 'TYPE_NODE = 7 AND Einschränkung auf Type  und Parent_Guid
-                                                Dim foundRowsLevel7() As DataRow
-                                                foundRowsLevel7 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel7, sortExp)
-                                                Dim p As Integer
-                                                For p = 0 To foundRowsLevel7.GetUpperBound(0)
-                                                    Dim ID8 = foundRowsLevel7(p)("GUID")
-                                                    Dim LevelEntity8 = foundRowsLevel7(p)("ENTITY_ID")
-                                                    Dim controlID8 = foundRowsLevel7(p)("CONTROL_ID")
-                                                    Dim nodetext8 = foundRowsLevel7(p)("NODE_CAPTION")
-                                                    RECORD_ID = foundRowsLevel7(p)("RECORD_ID")
-                                                    NODE_CONFIG_ID = foundRowsLevel7(p)("NODE_CONFIG_ID")
-                                                    ' Node erstellen..
-                                                    Dim LEVEL7_NODE As TreeNode
-                                                    LEVEL7_NODE = New TreeNode(nodetext8)
-                                                    If Not IsDBNull(RECORD_ID) Then
-                                                        LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8 & "#RECORD-ID" & RECORD_ID.ToString
-                                                    Else
-                                                        LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8
-                                                    End If
-
-                                                    index = 0
-                                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                        If img = NODE_CONFIG_ID & "#" & LevelEntity8 Then
-                                                            Exit For
-                                                        End If
-                                                        index += 1
-                                                    Next
-                                                    LEVEL7_NODE.ImageIndex = index
-                                                    LEVEL7_NODE.SelectedImageIndex = index
-                                                    ' ..und einfügen
-                                                    LEVEL6_NODE.Nodes.Add(LEVEL7_NODE)
-                                                    '### LEVEL 7 laden #######
-                                                    Dim expressionLevel8 As String
-                                                    expressionLevel8 = "PARENT_GUID = " & ID8 'TYPE_NODE = 7 AND  Einschränkung auf Type  und Parent_Guid
-                                                    Dim foundRowsLevel8() As DataRow
-                                                    foundRowsLevel8 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel8, sortExp)
-                                                    Dim q As Integer
-                                                    For q = 0 To foundRowsLevel8.GetUpperBound(0)
-                                                        Dim ID9 = foundRowsLevel8(q)("GUID")
-                                                        Dim LevelEntity9 = foundRowsLevel8(q)("ENTITY_ID")
-                                                        Dim controlID9 = foundRowsLevel8(q)("CONTROL_ID")
-                                                        Dim nodetext9 = foundRowsLevel8(q)("NODE_CAPTION")
-                                                        RECORD_ID = foundRowsLevel8(q)("RECORD_ID")
-                                                        NODE_CONFIG_ID = foundRowsLevel8(q)("NODE_CONFIG_ID")
-                                                        ' Node erstellen..
-                                                        Dim LEVEL8_NODE As TreeNode
-                                                        LEVEL8_NODE = New TreeNode(nodetext9)
-                                                        If Not IsDBNull(RECORD_ID) Then
-                                                            LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9 & "#RECORD-ID" & RECORD_ID.ToString
-                                                        Else
-                                                            LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9
-                                                        End If
-
-                                                        index = 0
-                                                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                            If img = NODE_CONFIG_ID & "#" & LevelEntity9 Then
-                                                                Exit For
-                                                            End If
-                                                            index += 1
-                                                        Next
-                                                        LEVEL8_NODE.ImageIndex = index
-                                                        LEVEL8_NODE.SelectedImageIndex = index
-                                                        ' ..und einfügen
-                                                        LEVEL7_NODE.Nodes.Add(LEVEL8_NODE)
-                                                        '### LEVEL 8 laden #######
-                                                    Next ' Level 7 Ende
-                                                Next ' Level 7 Ende
-                                            Next ' Level 6 Ende
-                                        Next ' Level 5 Ende
-                                    Next 'Level 4 Ende
-                                Next 'Level 3 Ende
-                            Next ' Level 2 Ende
-                        Next 'Level 1 Ende
-                    Next
-
-                    TreeViewMain.Nodes.Add(LEVEL0_NODE)
-
-
-                Else
-                    MsgBox("Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical)
-                    Me.Close()
-                End If
             Else
                 ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS
                 Dim query1 = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
@@ -2551,6 +2233,12 @@ Public Class frmConstructor_Main
             FORM_TYPE = ENTITY_ROW.Item("FORM_TYPE_ID")
             IS_SINGLE_RECORD = ENTITY_ROW.Item("SINGLE_RECORD")
             POS_ENTITY = ENTITY_ROW.Item("POS_ENTITY")
+            REDUNDANT_FORM = ENTITY_ROW.Item("REDUNDANT_ENTITY")
+            If REDUNDANT_FORM <> 0 Then
+                CURRENT_ENTITY_REDUNDANT_ID = REDUNDANT_FORM
+            Else
+                CURRENT_ENTITY_REDUNDANT_ID = 0
+            End If
             If VIEW_ID_RUNTIME <> -1 Then
                 GRID_TYPE_ID = VIEW_ID_RUNTIME
             Else
@@ -4504,7 +4192,7 @@ Public Class frmConstructor_Main
             Dim item As ClassWindreamDocGrid.WindreamDocGridComboboxItem = ComboBox.SelectedItem
             Dim value As String = item.Value
             Dim configId As Integer = item.ConfigID
-            Dim docId As Integer = ClassWindreamDocGrid.RESULT_DOC_ID
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
             Dim user As String = Environment.UserName
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
@@ -4520,7 +4208,7 @@ Public Class frmConstructor_Main
             Dim value As DateTime = DatePicker.EditValue
             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.RESULT_DOC_ID
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
             Dim user As String = Environment.UserName
 
             Dim dateString = value.ToString("yyyy-MM-dd hh:mm:ss.fff")
@@ -4538,7 +4226,7 @@ Public Class frmConstructor_Main
             Dim value = TextBox.EditValue
             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.RESULT_DOC_ID
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
             Dim user As String = Environment.UserName
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
@@ -4852,9 +4540,17 @@ Public Class frmConstructor_Main
     Sub Drag_Drop(e As DragEventArgs)
         If act_FormViewID <> 0 And RIGHT_WINDREAM_FORBIDDEN = False Then
             Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
-            If ClassDatabase.Execute_Scalar(sql, True) = 0 Then
+            Dim count_DT = ClassDatabase.Execute_Scalar(sql, True)
+            If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
                 MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
                 Exit Sub
+            ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+                sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
+                count_DT = ClassDatabase.Execute_Scalar(sql, True)
+                If count_DT = 0 Then
+                    MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                    Exit Sub
+                End If
             End If
             If RECORD_CHANGED = True Then
                 If Save_Record() = False Then
@@ -4945,32 +4641,41 @@ Public Class frmConstructor_Main
 
             Next
             Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
-            If ClassDatabase.Execute_Scalar(sql, True) >= 1 Then
+            Dim count_DT = ClassDatabase.Execute_Scalar(sql, True)
-                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)
+            If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
-                Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1)
-                If Not IsNothing(DT) Then
-                    If DT.Rows.Count > 0 Then
-                        For Each Filerow As DataRow In DT.Rows
-                            'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "")
-                            CURRENT_FILEID = Filerow.Item(0)
-                            CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
-                            CURRENT_RECORD_ID = RECORD_ID
-                            CURRENT_FORM_ID = ENTITY_ID
-                            CURRENT_FORMVIEW_ID = FORMVIEW_ID
-                            If ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID & " AND WORKED = 0") = 1 Then
-                                frmWD_IndexFile.ShowDialog()
-                            Else
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> File was deleted or worked meanwhile!")
-                            End If
-                        Next
-                        RUN_WDSEARCH_GRID("RECORD")
-                        ' RUN_WD_SEARCH(WD_Suche, "RECORD")
-                    End If
-                End If
-            Else
                 MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
                 Exit Sub
+            ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+                sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
+                count_DT = ClassDatabase.Execute_Scalar(sql, True)
+                If count_DT = 0 Then
+                    MsgBox("No documenttypes for the redundant entity configured either! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                    Exit Sub
+                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 DT As DataTable = ClassDatabase.Return_Datatable(sql1)
+            If Not IsNothing(DT) Then
+                If DT.Rows.Count > 0 Then
+                    For Each Filerow As DataRow In DT.Rows
+                        'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "")
+                        CURRENT_FILEID = Filerow.Item(0)
+                        CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
+                        CURRENT_RECORD_ID = RECORD_ID
+                        CURRENT_FORM_ID = ENTITY_ID
+                        CURRENT_FORMVIEW_ID = FORMVIEW_ID
+                        If ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID & " AND WORKED = 0") = 1 Then
+                            frmWD_IndexFile.ShowDialog()
+                        Else
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> File was deleted or worked meanwhile!")
+                        End If
+                    Next
+                    RUN_WDSEARCH_GRID("RECORD")
+                    ' RUN_WD_SEARCH(WD_Suche, "RECORD")
+                End If
+            End If
+
         Catch ex As Exception
             MsgBox("Check_Dropped_Files: " & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -5779,11 +5484,11 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub KopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CopyToolStripMenuItem.Click
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If ClassWindreamDocGrid.SELECTED_DOC_PATH <> "" Then
             Try
                 Dim selectedfile(0) As String
 
-                selectedfile(0) = ClassWindreamDocGrid.RESULT_DOC_PATH
+                selectedfile(0) = ClassWindreamDocGrid.SELECTED_DOC_PATH
 
                 Dim dataobj As New DataObject
 
@@ -5808,34 +5513,40 @@ Public Class frmConstructor_Main
             MsgBox("Please select a record!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Dim msg = "Wollen Sie die Verknüpfung der Datei wirklich entfernen?" & vbNewLine & "Datei bleibt im DMS/Archiv/Explorer erhalten!"
+            Exit Sub
+        End If
+        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count > 0 Then
+            Dim msg = "Wollen Sie die Verknüpfung der gewählten Datei/en wirklich entfernen?" & vbNewLine & "Datei/en bleibt/bleiben im DMS/Archiv/Explorer erhalten!"
             If USER_LANGUAGE <> "de-DE" Then
-                msg = "Would You like to delete only the references?" & vbNewLine & "File will stay in ECM/Archive/Explorer!"
+                msg = "Would You like to delete only the references?" & vbNewLine & "File(s) will stay in ECM/Archive/Explorer!"
             End If
             Dim result As MsgBoxResult
             result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 Try
-                    Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & ClassWindreamDocGrid.RESULT_OBJECTTYPE & "'")
+                    For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-                    If Not IsNothing(DT_INDICES) Then
+                        Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & row.Item("OBJECTTYPE") & "'")
-                        If DT_INDICES.Rows.Count = 1 Then
+                        If Not IsNothing(DT_INDICES) Then
-                            'Record-Links entfernen
+                            If DT_INDICES.Rows.Count = 1 Then
-                            If ClassWindream.REMOVE_VEKTOR_LINK(ClassWindreamDocGrid.RESULT_DOC_PATH, DT_INDICES.Rows(0).Item("IDXNAME_RECORDID"), RECORD_ID) = True Then
+                                'Record-Links entfernen
-                                'ENTITY-Links entfernen
+                                If ClassWindream.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_RECORDID"), RECORD_ID) = True Then
-                                If ClassWindream.REMOVE_VEKTOR_LINK(ClassWindreamDocGrid.RESULT_DOC_PATH, DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) = True Then
+                                    'ENTITY-Links entfernen
-                                    If ClassFileResult.Delete_ResultFile(ClassWindreamDocGrid.RESULT_DOC_ID) = True Then
+                                    If ClassWindream.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) = True Then
-                                        ClassHelper.InsertEssential_Log(ClassWindreamDocGrid.RESULT_DOC_ID, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
+                                        If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID")) = True Then
-                                        RUN_WDSEARCH_GRID("RECORD")
+                                            ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
+                                            RUN_WDSEARCH_GRID("RECORD")
+                                        End If
+                                    Else
+                                        MsgBox("Could not remove Vektor-Link ENTITY! Check logfile.", MsgBoxStyle.Exclamation)
                                     End If
                                 Else
-                                    MsgBox("Could not remove Vektor-Link ENTITY! Check logfile.", MsgBoxStyle.Exclamation)
+                                    MsgBox("Could not remove Vektor-Link RECORD! Check logfile.", MsgBoxStyle.Exclamation)
                                 End If
-                            Else
-                                MsgBox("Could not remove Vektor-Link RECORD! Check logfile.", MsgBoxStyle.Exclamation)
                             End If
                         End If
-                    End If
+                    Next
+                   
                 Catch ex As Exception
                     MsgBox("Unexpected Error in Removing links from file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                 End Try
@@ -5844,30 +5555,50 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PropertiesToolStripMenuItem.Click
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Cursor = Cursors.WaitCursor
+            MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
-            Dim sei As New SHELLEXECUTEINFO
+            Exit Sub
-            sei.cbSize = Marshal.SizeOf(sei)
-            sei.lpVerb = "properties"
-            sei.lpFile = ClassWindreamDocGrid.RESULT_DOC_PATH
-            sei.nShow = SW_SHOW
-            sei.fMask = SEE_MASK_INVOKEIDLIST
-            If Not ShellExecuteEx(sei) Then
-                Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
-                MsgBox("Unexpected Error in Open file propertys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End If
         End If
-        Cursor = Cursors.Default
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If row.Item("DOC_PATH") <> "" Then
+                Cursor = Cursors.WaitCursor
+                Dim sei As New SHELLEXECUTEINFO
+                sei.cbSize = Marshal.SizeOf(sei)
+                sei.lpVerb = "properties"
+                sei.lpFile = row.Item("DOC_PATH")
+                sei.nShow = SW_SHOW
+                sei.fMask = SEE_MASK_INVOKEIDLIST
+                If Not ShellExecuteEx(sei) Then
+                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    MsgBox("Unexpected Error in Open file propertys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                End If
+            End If
+            Cursor = Cursors.Default
+        Next
+        
     End Sub
 
     Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
-        ClassHelper.File_open(ClassWindreamDocGrid.RESULT_DOC_PATH, ClassWindreamDocGrid.RESULT_DOC_ID)
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
+        Next
+
     End Sub
     Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
         'Get_Doc_Items()
         ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
         If RIGHT_WINDREAM_FORBIDDEN = False Then
-            ClassHelper.File_open(ClassWindreamDocGrid.RESULT_DOC_PATH, ClassWindreamDocGrid.RESULT_DOC_ID)
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+            For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+                ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
+            Next
         End If
     End Sub
 
@@ -6134,11 +5865,11 @@ Public Class frmConstructor_Main
             Try
                 If tsTextBoxRenameFile.Text <> "" Then
                     Dim OldName, NewName As String
-                    OldName = ClassWindreamDocGrid.RESULT_DOC_PATH
+                    OldName = ClassWindreamDocGrid.SELECTED_DOC_PATH
                     ' Define file names.
                     NewName = tsTextBoxRenameFile.Text
-                    Dim name1 = Path.Combine(Path.GetDirectoryName(ClassWindreamDocGrid.RESULT_DOC_PATH), NewName)
+                    Dim name1 = Path.Combine(Path.GetDirectoryName(ClassWindreamDocGrid.SELECTED_DOC_PATH), NewName)
-                    NewName = NewName & Path.GetExtension(ClassWindreamDocGrid.RESULT_DOC_PATH)
+                    NewName = NewName & Path.GetExtension(ClassWindreamDocGrid.SELECTED_DOC_PATH)
                     ' Rename file.
                     My.Computer.FileSystem.RenameFile(OldName, NewName)
                     RUN_WDSEARCH_GRID("RECORD")
@@ -6158,9 +5889,20 @@ Public Class frmConstructor_Main
     End Sub
     Sub Display_Filename()
         Try
-            If ClassWindreamDocGrid.RESULT_DOC_PATH <> "" Then
+            Dim RENAME_DOC_PATH
+            Try
+                RENAME_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
+            Catch ex As Exception
+                ClassLogger.Add(">> Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message, False)
+                RENAME_DOC_PATH = Nothing
+            End Try
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+            If RENAME_DOC_PATH <> "" Then
                 Dim FileToRename As String
-                FileToRename = Path.GetFileNameWithoutExtension(ClassWindreamDocGrid.RESULT_DOC_PATH)
+                FileToRename = Path.GetFileNameWithoutExtension(RENAME_DOC_PATH)
                 tsTextBoxRenameFile.Text = FileToRename
                 tsTextBoxRenameFile.Enabled = True
             Else
@@ -6172,10 +5914,19 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub DateiMitDatensatzVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TSMI_linkRecord.Click
-        Dim fileName As String = ClassWindreamDocGrid.RESULT_DOC_PATH
+        Try
-        CURRENT_DOC_ID = ClassWindreamDocGrid.RESULT_DOC_ID
+            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-        Dim frm As New frmWD_Link_to_Record(fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE)
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-        frm.Show()
+                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+            Dim fileName As String = ClassWindreamDocGrid.SELECTED_DOC_PATH
+            CURRENT_DOC_ID = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim frm As New frmWD_Link_to_Record() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE)
+            frm.Show()
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
     End Sub
 
     Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click
@@ -6214,41 +5965,44 @@ Public Class frmConstructor_Main
 
             Try
                 Dim DROPDOWN_VALUE
-                'Den ColumnTitle aus ConfigTableholen
+                If Not IsNothing(CURRENT_DOC_DROPDOWN) Then
-                If CURRENT_DOC_DROPDOWN.Rows.Count > 0 Then
+                    'Den ColumnTitle aus ConfigTableholen
-                    For Each confrow As DataRow In CURRENT_DOC_DROPDOWN.Rows
+                    If CURRENT_DOC_DROPDOWN.Rows.Count > 0 Then
-                        Dim CAPTION = confrow.Item("HEADER_CAPTION")
+                        For Each confrow As DataRow In CURRENT_DOC_DROPDOWN.Rows
-                        DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION)
+                            Dim CAPTION = confrow.Item("HEADER_CAPTION")
-                        If Not IsNothing(DROPDOWN_VALUE) Then
+                            DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION)
-                            Exit For
+                            If Not IsNothing(DROPDOWN_VALUE) Then
-                        End If
-                    Next
-
-                    If Not IsNothing(DROPDOWN_VALUE) Then
-                        Dim ColorRow As Color
-                        Dim expression As String = String.Format("VALUE = '{0}'", DROPDOWN_VALUE)
-                        Dim matchingRows() As DataRow = DT_DOCRESULT_DROPDOWN_ITEMS.Select(expression, "SEQUENCE")
-                        Dim rowcolorname As String
-                        'Die Color für den value auswählen
-                        For Each matchingRow As DataRow In matchingRows
-
-                            rowcolorname = matchingRow.Item("COLOR")
-                            If rowcolorname <> "" Then
                                 Exit For
                             End If
                         Next
-                        If rowcolorname <> "" Then
+
-                            ColorRow = Color.FromName(rowcolorname)
+                        If Not IsNothing(DROPDOWN_VALUE) Then
-                            e.Appearance.BackColor = ColorRow
+                            Dim ColorRow As Color
-                            e.HighPriority = True
+                            Dim expression As String = String.Format("VALUE = '{0}'", DROPDOWN_VALUE)
+                            Dim matchingRows() As DataRow = DT_DOCRESULT_DROPDOWN_ITEMS.Select(expression, "SEQUENCE")
+                            Dim rowcolorname As String = ""
+                            'Die Color für den value auswählen
+                            For Each matchingRow As DataRow In matchingRows
+
+                                rowcolorname = matchingRow.Item("COLOR")
+                                If rowcolorname <> "" Then
+                                    Exit For
+                                End If
+                            Next
+                            If rowcolorname <> "" Then
+                                ColorRow = Color.FromName(rowcolorname)
+                                e.Appearance.BackColor = ColorRow
+                                e.HighPriority = True
+                            End If
+
+
+                            'Dim c As Color = DirectCast(rowCellValue, Color)
+
                         End If
-
-
-                        'Dim c As Color = DirectCast(rowCellValue, Color)
-
                     End If
+
+           
                 End If
-                
             Catch ex As Exception
                 ClassLogger.Add(">> Unexpected Error in RowStyle-Color Dropdown: " & ex.Message, False)
             End Try
@@ -6258,18 +6012,24 @@ Public Class frmConstructor_Main
 
     Private Sub ContextMenuStripResultFiles_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripResultFiles.Opening
         File_in_Work()
-        If ClassWindreamDocGrid.RESULT_DISPLAYNAME <> "" Then
+        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-            TSMIDisplayname.Visible = True
+            If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
-            Set_Displayname()
+                TSMIDisplayname.Visible = True
+                Set_Displayname()
+            Else
+                TSMIDisplayname.Visible = False
+            End If
         Else
             TSMIDisplayname.Visible = False
         End If
+
+       
     End Sub
     Sub File_in_Work()
         TSMI_inWork.Enabled = True
         Try
             Dim expression As String
-            expression = "DocID = " & ClassWindreamDocGrid.RESULT_DOC_ID
+            expression = "DocID = " & ClassWindreamDocGrid.SELECTED_DOC_ID
             Dim foundRowsLevel0() As DataRow
             ' Use the Select method to find all rows matching the filter.
             foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
@@ -6285,7 +6045,7 @@ Public Class frmConstructor_Main
 
             Dim displ As String
 
-            If CBool(ClassWindreamDocGrid.RESULT_INWORK) = True Then
+            If CBool(ClassWindreamDocGrid.SELECTED_INWORK) = True Then
                 If IW_USER.ToUpper = Environment.UserName.ToUpper Then
                     displ = "Datei wieder freigeben"
                     If USER_LANGUAGE <> "de-DE" Then
@@ -6310,8 +6070,12 @@ Public Class frmConstructor_Main
         End Try
     End Sub
     Private Sub TSMI_inWork_Click(sender As Object, e As EventArgs) Handles TSMI_inWork.Click
-        ClassFileResult.DocID = ClassWindreamDocGrid.RESULT_DOC_ID
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-        If ClassWindreamDocGrid.RESULT_INWORK = True Then ' Datei ist in Bearbeitung
+            MsgBox("Could not read File Parameters (3)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        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 ClassFileResult.Set_InWork(0, "") = True Then
@@ -6326,21 +6090,14 @@ Public Class frmConstructor_Main
             End If
         Else
             frmFileInWork.ShowDialog()
-            ClassWindreamDocGrid.RESULT_INWORK = ClassFileResult.InWork
+            ClassWindreamDocGrid.SELECTED_INWORK = ClassFileResult.InWork
             RUN_WDSEARCH_GRID("RECORD")
         End If
     End Sub
-
-    Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
-        'Get_Doc_Items()
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-    End Sub
-
-
     Private Sub AnsichtZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnsichtZurücksetzenToolStripMenuItem.Click
         ' TODO: Ansicht zurücksetzen
         Try
-            Dim XMLPath = Get_DocGRid_Layout_Filename()
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
             If File.Exists(XMLPath) Then
                 Me.Cursor = Cursors.WaitCursor
                 File.Delete(XMLPath)
@@ -6365,9 +6122,11 @@ Public Class frmConstructor_Main
     End Sub
     Sub Set_Displayname()
         Try
-            If ClassWindreamDocGrid.RESULT_DISPLAYNAME <> "" Then
+            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                tstbDisplayname.Text = ClassWindreamDocGrid.RESULT_DISPLAYNAME
+                If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
-                tstbDisplayname.Enabled = True
+                    tstbDisplayname.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME")
+                    tstbDisplayname.Enabled = True
+                End If
             Else
                 tstbDisplayname.Enabled = False
             End If
@@ -6380,7 +6139,7 @@ Public Class frmConstructor_Main
     Private Sub tstbDisplayname_KeyUp(sender As Object, e As KeyEventArgs) Handles tstbDisplayname.KeyUp
         If e.KeyCode = Keys.Return Then
             Try
-                ClassFileResult.DocID = ClassWindreamDocGrid.RESULT_DOC_ID
+                ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
                 If tstbDisplayname.Text <> "" Then
 
                     If ClassFileResult.Set_Displayname(tstbDisplayname.Text) Then
@@ -6397,18 +6156,25 @@ Public Class frmConstructor_Main
     Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiRights.Click
         Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!"
         CURRENT_RECORD_ID = RECORD_ID
-        If ClassDOC_SEARCH.SET_WD_RIGHTS(ClassWindreamDocGrid.RESULT_DOC_ID, ClassWindreamDocGrid.RESULT_DOC_PATH, ENTITY_ID) = True Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            If USER_LANGUAGE <> "de-DE" Then
+            MsgBox("Could not read File Parameters (6)!", MsgBoxStyle.Exclamation)
-                msg = "The rights were successfully renewed!"
+            Exit Sub
-            End If
-            MsgBox(msg, MsgBoxStyle.Information)
-        Else
-            msg = "Unerwarteter Fehler im Rechtemodul. Bitte prüfen Sie die Logdatei!"
-            If USER_LANGUAGE <> "de-DE" Then
-                msg = "Unexpected error in rights-module. Please check the logfile!"
-            End If
-            MsgBox(msg, MsgBoxStyle.Exclamation)
         End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH"), ENTITY_ID) = True Then
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "The rights were successfully renewed!"
+                End If
+                MsgBox(msg, MsgBoxStyle.Information)
+            Else
+                msg = "Unerwarteter Fehler im Rechtemodul. Bitte prüfen Sie die Logdatei!"
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "Unexpected error in rights-module. Please check the logfile!"
+                End If
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+            End If
+        Next
+       
     End Sub
 
     Public Sub ActivateAllTabs()
@@ -6446,34 +6212,41 @@ Public Class frmConstructor_Main
             MsgBox("Please select a record!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Dim msg = "Sind Sie sicher, dass Sie die Datei " & vbNewLine & ClassWindreamDocGrid.RESULT_DOC_PATH & vbNewLine & "endgültig löschen wollen?"
+            MsgBox("Could not read File Parameters (DELETE FILES)!", MsgBoxStyle.Exclamation)
-            If USER_LANGUAGE <> "de-DE" Then
+            Exit Sub
-                msg = "Are You sure You want to permanently delete this file?" & vbNewLine & ClassWindreamDocGrid.RESULT_DOC_PATH
+        End If
-            End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            Dim result1 As MsgBoxResult
+            If row.Item("DOC_PATH") <> "" Then
-            result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                Dim msg = "Sind Sie sicher, dass Sie die Datei " & vbNewLine & row.Item("DOC_PATH") & vbNewLine & "endgültig löschen wollen?"
-            If result1 = MsgBoxResult.Yes Then
+                If USER_LANGUAGE <> "de-DE" Then
-                Try
+                    msg = "Are You sure You want to permanently delete this file?" & vbNewLine & row.Item("DOC_PATH")
-                    If Not IsNothing(ClassWindreamDocGrid.RESULT_DOC_ID) Then
+                End If
-                        If ClassWindream.Delete_WDFile(ClassWindreamDocGrid.RESULT_DOC_PATH) = True Then
+                Dim result1 As MsgBoxResult
-                            If ClassFileResult.Delete_ResultFile(ClassWindreamDocGrid.RESULT_DOC_ID) = True Then
+                result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                                ClassHelper.InsertEssential_Log(ClassWindreamDocGrid.RESULT_DOC_ID, "DOC-ID", "FILE DELETED BY USER")
+                If result1 = MsgBoxResult.Yes Then
-                                RUN_WDSEARCH_GRID("RECORD")
+                    Try
-                            Else
+                        If Not IsNothing(row.Item("DOC_ID")) Then
-                                msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", ClassWindreamDocGrid.RESULT_DOC_PATH)
+                            If ClassWindream.Delete_WDFile(row.Item("DOC_PATH")) = True Then
-                                If USER_LANGUAGE <> "de-DE" Then
+                                If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID")) = True Then
-                                    msg = String.Format("The file {0} could not be deleted! Check the logfile!", ClassWindreamDocGrid.RESULT_DOC_PATH)
+                                    ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER")
+                                    RUN_WDSEARCH_GRID("RECORD")
+                                Else
+                                    msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", row.Item("DOC_PATH"))
+                                    If USER_LANGUAGE <> "de-DE" Then
+                                        msg = String.Format("The file {0} could not be deleted! Check the logfile!", row.Item("DOC_PATH"))
+                                    End If
+                                    MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
                                 End If
-                                MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
                             End If
                         End If
-                    End If
+                    Catch ex As Exception
-                Catch ex As Exception
+                        MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                    MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                    End Try
-                End Try
+                End If
             End If
-        End If
+        Next
+        
 
     End Sub
 End Class

app/DD-Record-Organiser/frmRecordView.vb

@@ -78,7 +78,7 @@ Public Class frmRecordView
             Dim item As ClassWindreamDocGrid.WindreamDocGridComboboxItem = ComboBox.SelectedItem
             Dim value As String = item.Value
             Dim configId As Integer = item.ConfigID
-            Dim docId As Integer = ClassWindreamDocGrid.RESULT_DOC_ID
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
             Dim user As String = Environment.UserName
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, Environment.UserName)
@@ -336,84 +336,122 @@ Public Class frmRecordView
     End Sub
 
     Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs)
-        Try
+        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            ClassWindreamDocGrid.RESULT_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
+        'Try
-        Catch ex As Exception
+        '    ClassWindreamDocGrid.RESULT_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
-            ClassWindreamDocGrid.RESULT_DOC_PATH = Nothing
+        'Catch ex As Exception
-        End Try
+        '    ClassWindreamDocGrid.RESULT_DOC_PATH = Nothing
+        'End Try
     End Sub
 
     Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs)
-        Try
+        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            ClassWindreamDocGrid.RESULT_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
+        'Try
-        Catch ex As Exception
+        '    ClassWindreamDocGrid.RESULT_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
-            ClassWindreamDocGrid.RESULT_DOC_PATH = Nothing
+        'Catch ex As Exception
-        End Try
+        '    ClassWindreamDocGrid.RESULT_DOC_PATH = Nothing
-        ClassHelper.File_open(ClassWindreamDocGrid.RESULT_DOC_PATH, 0)
+        'End Try
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            MsgBox("Could not read File Parameters(DoubleClick)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            ClassHelper.File_open(row.Item("DOC_PATH"), 0)
+        Next
+
     End Sub
 
     Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
-        ClassHelper.File_open(ClassWindreamDocGrid.RESULT_DOC_PATH, 0)
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            MsgBox("Could not read File Parameters(DoubleClick)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            ClassHelper.File_open(row.Item("DOC_PATH"), 0)
+        Next
+
     End Sub
 
     Private Sub CopyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CopyToolStripMenuItem.Click
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Try
+            MsgBox("Could not read File Parameters(DoubleClick)!", MsgBoxStyle.Exclamation)
-                Dim selectedfile(0) As String
+            Exit Sub
-
-                selectedfile(0) = ClassWindreamDocGrid.RESULT_DOC_PATH
-
-                Dim dataobj As New DataObject
-
-                dataobj.SetData(DataFormats.FileDrop, True, selectedfile)
-
-                Clipboard.Clear()
-                Clipboard.SetDataObject(dataobj, True)
-            Catch ex As Exception
-                MsgBox("Unexpected Error in Copy file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End Try
-            Cursor = Cursors.Default
         End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If row.Item("DOC_PATH") <> "" Then
+                Try
+                    Dim selectedfile(0) As String
+
+                    selectedfile(0) = row.Item("DOC_PATH")
+
+                    Dim dataobj As New DataObject
+
+                    dataobj.SetData(DataFormats.FileDrop, True, selectedfile)
+
+                    Clipboard.Clear()
+                    Clipboard.SetDataObject(dataobj, True)
+                    Exit For
+                Catch ex As Exception
+                    MsgBox("Unexpected Error in Copy file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                End Try
+                Cursor = Cursors.Default
+            End If
+        Next
+        
     End Sub
 
     Private Sub DeleteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeleteToolStripMenuItem.Click
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Dim msg = "Sind Sie sicher, dass Sie diese Datei löschen wollen?"
+            MsgBox("Could not read File Parameters(DoubleClick)!", MsgBoxStyle.Exclamation)
-            If USER_LANGUAGE <> "de-DE" Then
+            Exit Sub
-                msg = "Are You sure You want to delete this file?"
-            End If
-            Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-            If result = MsgBoxResult.Yes Then
-                Try
-                    Dim FileToDelete As String
-                    FileToDelete = ClassWindreamDocGrid.RESULT_DOC_PATH
-
-                    If System.IO.File.Exists(FileToDelete) = True Then
-                        System.IO.File.Delete(FileToDelete)
-                        RUN_WDSEARCH_GRID()
-                    End If
-                Catch ex As Exception
-                    MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                End Try
-            End If
         End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If row.Item("DOC_PATH") <> "" Then
+                Dim msg = "Sind Sie sicher, dass Sie die Datei löschen wollen?"
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "Are You sure You want to delete this file?"
+                End If
+                Dim result As MsgBoxResult
+                result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = MsgBoxResult.Yes Then
+                    Try
+                        Dim FileToDelete As String
+                        FileToDelete = row.Item("DOC_PATH")
+
+                        If System.IO.File.Exists(FileToDelete) = True Then
+                            System.IO.File.Delete(FileToDelete)
+                            RUN_WDSEARCH_GRID()
+                        End If
+                    Catch ex As Exception
+                        MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                    End Try
+                End If
+            End If
+        Next
+        
     End Sub
 
     Private Sub PropertiesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PropertiesToolStripMenuItem.Click
-        If ClassWindreamDocGrid.RESULT_DOC_PATH <> Nothing Then
+        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-            Cursor = Cursors.WaitCursor
+            MsgBox("Could not read File Parameters(Properties RecordView)!", MsgBoxStyle.Exclamation)
-            Dim sei As New SHELLEXECUTEINFO
+            Exit Sub
-            sei.cbSize = Marshal.SizeOf(sei)
-            sei.lpVerb = "properties"
-            sei.lpFile = ClassWindreamDocGrid.RESULT_DOC_PATH
-            sei.nShow = SW_SHOW
-            sei.fMask = SEE_MASK_INVOKEIDLIST
-            If Not ShellExecuteEx(sei) Then
-                Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
-                MsgBox("Unexpected Error in Open file propertys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End If
         End If
+        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            If row.Item("DOC_PATH") <> "" Then
+                Cursor = Cursors.WaitCursor
+                Dim sei As New SHELLEXECUTEINFO
+                sei.cbSize = Marshal.SizeOf(sei)
+                sei.lpVerb = "properties"
+                sei.lpFile = row.Item("DOC_PATH")
+                sei.nShow = SW_SHOW
+                sei.fMask = SEE_MASK_INVOKEIDLIST
+                If Not ShellExecuteEx(sei) Then
+                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    MsgBox("Unexpected Error in Open file propertys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                End If
+            End If
+        Next
+        
         Cursor = Cursors.Default
     End Sub
 

app/DD-Record-Organiser/frmSAP_FuBa.vb

@@ -64,7 +64,7 @@ Public Class frmSAP_FuBa
         'Try
         '    Me.Cursor = Cursors.WaitCursor
         '    If LogErrorsOnly = False Then ClassLogger.Add("", False)
-        '    If LogErrorsOnly = False Then ClassLogger.Add(">> SAP Connect started:", False)
+        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP Connect started:", False)
         '    ERPConnect.LIC.SetLic("W86DWC992C")
         '    con.Host = HostTextBox.Text
         '    con.SystemNumber = SystemNumberTextBox.Text
@@ -72,9 +72,9 @@ Public Class frmSAP_FuBa
         '    con.Password = PasswordTextBox.Text
         '    con.Client = ClientTextBox.Text
         '    con.Language = LanguageTextBox.Text
-        '    If LogErrorsOnly = False Then ClassLogger.Add(">> HOST: " & HostTextBox.Text & " |SystemNumber: " & SystemNumberTextBox.Text & " |UserName: " & UserNameTextBox.Text & " |Password: " & PasswordTextBox.Text & " |Client: " & ClientTextBox.Text & " |Language: " & LanguageTextBox.Text, False)
+        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> HOST: " & HostTextBox.Text & " |SystemNumber: " & SystemNumberTextBox.Text & " |UserName: " & UserNameTextBox.Text & " |Password: " & PasswordTextBox.Text & " |Client: " & ClientTextBox.Text & " |Language: " & LanguageTextBox.Text, False)
         '    con.Open(False)
-        '    If LogErrorsOnly = False Then ClassLogger.Add(">> SAP-Connection erfolgreich aufgebaut!", False)
+        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP-Connection erfolgreich aufgebaut!", False)
         '    If LogErrorsOnly = False Then ClassLogger.Add("", False)
         '    lblConnectionopen.Visible = True
         '    Me.Cursor = Cursors.Default
@@ -162,12 +162,12 @@ Public Class frmSAP_FuBa
             Next
             createtablesql += ")"
             ''Die Tabelle anlegen
-            If LogErrorsOnly = False Then ClassLogger.Add(">> Create Table: " & createtablesql, False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> Create Table: " & createtablesql, False)
             If ClassDatabase.Execute_non_Query_withConn(createtablesql, 1) = False Then
                 MsgBox("Error in creating TempTable: Check log", MsgBoxStyle.Critical)
                 Exit Sub
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(">> table has been created", False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> table has been created", False)
 
             Dim alter = String.Format("ALTER TABLE {0} ADD GUID INTEGER NOT NULL IDENTITY(1,1)", tablename)
             ClassDatabase.Execute_non_Query_withConn(alter, 1)
@@ -212,7 +212,7 @@ Public Class frmSAP_FuBa
                 End Using
                 SQLconnect.Close()
                 Me.Cursor = Cursors.Default
-                If LogErrorsOnly = False Then ClassLogger.Add(">> Create table from SAP FuBa was successfull " & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Create table from SAP FuBa was successfull " & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!", False)
                 MsgBox("Create table was successfull! " & vbNewLine & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!", MsgBoxStyle.Information)
             Catch ex As Exception
                 MsgBox("Unexpected Error in SQL bulkCopy: " & ex.Message, MsgBoxStyle.Critical)

app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb

@@ -119,9 +119,19 @@ Public Class frmUserKonfig_AddUsers
         For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
             If row.Item(0) = CBool(True) Then
                 Dim USERNAME As String = row.Item(1)
-
+                Dim PRENAME As String
-                Dim PRENAME As String = row.Item(2)
+                Try
+                    PRENAME = row.Item(2)
+                Catch ex As Exception
+                    PRENAME = ""
+                End Try
                 Dim NAME As String = row.Item(3)
+                Try
+                    NAME = row.Item(3)
+                Catch ex As Exception
+                    NAME = ""
+                End Try
+
                 Dim email As String
                 Try
                     email = row.Item(4)
@@ -130,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) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "')"
+                    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 & "')"
                     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)
@@ -139,7 +149,7 @@ Public Class frmUserKonfig_AddUsers
                         usersAdded = usersAdded + 1
                     End If
                 Else
-                    SQL = "UPDATE TBDD_USER SET MODULE_RECORD_ORG = 1 WHERE UPPER(USERNAME) = UPPER('" & USERNAME & "')"
+                    SQL = String.Format("UPDATE TBDD_USER SET MODULE_RECORD_ORG = 1,PRENAME = '{0}', NAME = '{1}', EMAIL = '{2}' WHERE UPPER(USERNAME) = UPPER('{3}')", PRENAME, NAME, email, USERNAME)
                     If ClassDatabase.Execute_non_Query(SQL) = True Then
                         usersAdded = usersAdded + 1
                     End If
@@ -156,11 +166,10 @@ Public Class frmUserKonfig_AddUsers
         '    Dim SQL
 
         'Next
-
+        If USER_LANGUAGE = "de-DE" Then
-        If usersAdded = 1 Then
+            MsgBox(usersAdded & " Benutzer hinzugefügt/upgedatet!", MsgBoxStyle.Information)
-            MsgBox(usersAdded & " neuer Benutzer hinzugefügt", MsgBoxStyle.Information)
         Else
-            MsgBox(usersAdded & " neue Benutzer hinzugefügt", MsgBoxStyle.Information)
+            MsgBox(usersAdded & " User added/updatet!", MsgBoxStyle.Information)
         End If
     End Sub
 

app/DD-Record-Organiser/frmWD_IndexFile.vb

@@ -10,13 +10,6 @@ Public Class frmWD_IndexFile
     Dim MULTIFILES As Integer = 0
     Dim formloaded As Boolean = False
 
-    Private Sub FillToolStripButton_Click(sender As Object, e As EventArgs)
-        Try
-            Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID)
-        Catch ex As System.Exception
-            System.Windows.Forms.MessageBox.Show(ex.Message)
-        End Try
-    End Sub
     Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean)
         Try
             CURRENT_DOKARTSTRING = vDokart
@@ -124,6 +117,9 @@ Public Class frmWD_IndexFile
                                     MsgBox("Unexpected Error in indexing file Entity - See log", MsgBoxStyle.Critical)
                                     Return False
                                 End If
+                                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
                                 indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
                                 idxvalue = CURRENT_PARENT_ENTITY_ID
@@ -189,6 +185,9 @@ Public Class frmWD_IndexFile
                                            "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)
                                 End If
+                                If CURRENT_REDUNDANT_FORM_ID <> 0 Then
+                                    ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_REDUNDANT_FORM_ID)
+                                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
@@ -617,7 +616,12 @@ Public Class frmWD_IndexFile
     End Sub
     Sub Check_Subfolder()
         Try
-            Dim sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
+            Dim sel
+            If CURRENT_REDUNDANT_FORM_ID <> 0 Then
+                sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_REDUNDANT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
+            Else
+                sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
+            End If
             Dim chk = ClassDatabase.Execute_Scalar(sel)
             If Not IsNothing(chk) Then
                 If CBool(chk) = True Then
@@ -1017,7 +1021,12 @@ Public Class frmWD_IndexFile
                         lvwIndices.Items(Count).SubItems.Add(CURRENT_FORM_ID)
                         Count = Count + 1
                         lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_PARENTID").ToString)
-                        Dim ParentID = ClassDatabase.Execute_Scalar("SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID, True)
+                        If CURRENT_REDUNDANT_FORM_ID <> 0 Then
+                            sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_REDUNDANT_FORM_ID
+                        Else
+                            sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID
+                        End If
+                        Dim ParentID = ClassDatabase.Execute_Scalar(sql, True)
                         Try
                             If IsNumeric(ParentID) And ParentID > 0 Then
                                 lvwIndices.Items(Count).SubItems.Add(ParentID)
@@ -1034,7 +1043,7 @@ Public Class frmWD_IndexFile
                         'lvwIndices.Items(Count).SubItems.Add(CURRENT_DOKARTSTRING)
                     End If
 
-                End If
+                    End If
             End If
         Catch ex As Exception
             MsgBox("Error in Refresh Indices for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -1048,7 +1057,7 @@ Public Class frmWD_IndexFile
         Try
             Me.VWDDINDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString
             chkMultiIndexer.Checked = False
-            ClassLogger.Add(">> frmWD_Index_Dokart_Load", False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> frmWD_Index_Dokart_Load", False)
             chkdelete_origin.Checked = False
             chkdelete_origin.Visible = False
             CURRENT_FILENAME = ClassDatabase.Execute_Scalar("SELECT FILENAME2WORK FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID)
@@ -1080,9 +1089,29 @@ Public Class frmWD_IndexFile
             TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID)
-            If cmbDokumentart.Items.Count = 0 Then
+
-                MsgBox("No dcumenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+            CURRENT_REDUNDANT_FORM_ID = 0
-                Exit Sub
+            CURRENT_REDUNDANT_FORMVIEW_ID = 0
+            If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
+                If CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+
+                    Dim FVID = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = {0} and SCREEN_ID = 1", CURRENT_ENTITY_REDUNDANT_ID))
+                    Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, FVID)
+                    If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
+                        MsgBox("No documenttypes for the redundant entity configured either! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                        Exit Sub
+                    Else
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Redundant EntityID: " & CURRENT_ENTITY_REDUNDANT_ID)
+                        CURRENT_REDUNDANT_FORM_ID = CURRENT_ENTITY_REDUNDANT_ID
+                        CURRENT_REDUNDANT_FORMVIEW_ID = FVID
+                        CURRENT_FORM_ID = CURRENT_ENTITY_REDUNDANT_ID
+                        CURRENT_FORMVIEW_ID = FVID
+                    End If
+                Else
+                    MsgBox("No dcumenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                    Exit Sub
+                End If
+               
             End If
         Catch ex As Exception
             MsgBox("Error in frmWD_Index_Dokart_Load:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)

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

@@ -33,14 +33,14 @@ Partial Class frmWD_Link_to_Record
         Me.btnLink = New System.Windows.Forms.Button()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
-        Me.txtFilename = New System.Windows.Forms.TextBox()
+        Me.txtFileInfo = New System.Windows.Forms.TextBox()
         Me.txtRecordId = New System.Windows.Forms.TextBox()
         Me.Label5 = New System.Windows.Forms.Label()
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerControl1,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SplitContainerControl1.SuspendLayout()
+        Me.SplitContainerControl1.SuspendLayout
-        CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgEntityRecords,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SuspendLayout()
+        Me.SuspendLayout
         '
         'SplitContainerControl1
         '
@@ -66,21 +66,26 @@ Partial Class frmWD_Link_to_Record
         '
         '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.Appearance.FilterPanel.BackColor = CType(resources.GetObject("grvwGrid.Appearance.FilterPanel.BackColor"), System.Drawing.Color)
+        Me.grvwGrid.Appearance.FilterPanel.BackColor = CType(resources.GetObject("grvwGrid.Appearance.FilterPanel.BackColor"),System.Drawing.Color)
-        Me.grvwGrid.Appearance.FilterPanel.Options.UseBackColor = True
+        Me.grvwGrid.Appearance.FilterPanel.Options.UseBackColor = true
+        Me.grvwGrid.Appearance.HideSelectionRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.HideSelectionRow.BackColor"),System.Drawing.Color)
+        Me.grvwGrid.Appearance.HideSelectionRow.Options.UseBackColor = true
+        Me.grvwGrid.Appearance.SelectedRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.SelectedRow.BackColor"),System.Drawing.Color)
+        Me.grvwGrid.Appearance.SelectedRow.Options.UseBackColor = true
+        Me.grvwGrid.Appearance.SelectedRow.Options.UseForeColor = true
         Me.grvwGrid.GridControl = Me.dgEntityRecords
         Me.grvwGrid.Name = "grvwGrid"
-        Me.grvwGrid.OptionsBehavior.Editable = False
+        Me.grvwGrid.OptionsBehavior.Editable = false
-        Me.grvwGrid.OptionsBehavior.ReadOnly = True
+        Me.grvwGrid.OptionsBehavior.ReadOnly = true
-        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
         '
         'cmbConstructorForms
         '
-        Me.cmbConstructorForms.FormattingEnabled = True
+        Me.cmbConstructorForms.FormattingEnabled = true
         resources.ApplyResources(Me.cmbConstructorForms, "cmbConstructorForms")
         Me.cmbConstructorForms.Name = "cmbConstructorForms"
         '
@@ -98,7 +103,7 @@ Partial Class frmWD_Link_to_Record
         '
         resources.ApplyResources(Me.btnLink, "btnLink")
         Me.btnLink.Name = "btnLink"
-        Me.btnLink.UseVisualStyleBackColor = True
+        Me.btnLink.UseVisualStyleBackColor = true
         '
         'Label3
         '
@@ -110,17 +115,17 @@ Partial Class frmWD_Link_to_Record
         resources.ApplyResources(Me.Label4, "Label4")
         Me.Label4.Name = "Label4"
         '
-        'txtFilename
+        'txtFileInfo
         '
-        resources.ApplyResources(Me.txtFilename, "txtFilename")
+        resources.ApplyResources(Me.txtFileInfo, "txtFileInfo")
-        Me.txtFilename.Name = "txtFilename"
+        Me.txtFileInfo.Name = "txtFileInfo"
-        Me.txtFilename.ReadOnly = True
+        Me.txtFileInfo.ReadOnly = true
         '
         'txtRecordId
         '
         resources.ApplyResources(Me.txtRecordId, "txtRecordId")
         Me.txtRecordId.Name = "txtRecordId"
-        Me.txtRecordId.ReadOnly = True
+        Me.txtRecordId.ReadOnly = true
         '
         'Label5
         '
@@ -133,7 +138,7 @@ Partial Class frmWD_Link_to_Record
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.SplitContainerControl1)
         Me.Controls.Add(Me.txtRecordId)
-        Me.Controls.Add(Me.txtFilename)
+        Me.Controls.Add(Me.txtFileInfo)
         Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.btnLink)
@@ -143,14 +148,14 @@ Partial Class frmWD_Link_to_Record
         Me.Controls.Add(Me.cmbConstructorForms)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Name = "frmWD_Link_to_Record"
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerControl1,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerControl1.ResumeLayout(False)
+        Me.SplitContainerControl1.ResumeLayout(false)
-        CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgEntityRecords,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ResumeLayout(False)
+        Me.ResumeLayout(false)
-        Me.PerformLayout()
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents cmbConstructorForms As System.Windows.Forms.ComboBox
     Friend WithEvents Label1 As System.Windows.Forms.Label
     Friend WithEvents trvwMain As System.Windows.Forms.TreeView
@@ -160,7 +165,7 @@ Partial Class frmWD_Link_to_Record
     Friend WithEvents btnLink As System.Windows.Forms.Button
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents txtFilename As System.Windows.Forms.TextBox
+    Friend WithEvents txtFileInfo As System.Windows.Forms.TextBox
     Friend WithEvents txtRecordId As System.Windows.Forms.TextBox
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl

app/DD-Record-Organiser/frmWD_Link_to_Record.resx

@@ -165,6 +165,12 @@
   <data name="grvwGrid.Appearance.FilterPanel.BackColor" type="System.Drawing.Color, System.Drawing">
     <value>255, 128, 0</value>
   </data>
+  <data name="grvwGrid.Appearance.HideSelectionRow.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>Yellow</value>
+  </data>
+  <data name="grvwGrid.Appearance.SelectedRow.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>Yellow</value>
+  </data>
   <data name="dgEntityRecords.Size" type="System.Drawing.Size, System.Drawing">
     <value>907, 503</value>
   </data>
@@ -325,13 +331,13 @@
     <value>347, 17</value>
   </data>
   <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>37, 13</value>
+    <value>110, 13</value>
   </data>
   <data name="Label3.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
   </data>
   <data name="Label3.Text" xml:space="preserve">
-    <value>Datei:</value>
+    <value>Dateieigenschaften:</value>
   </data>
   <data name="&gt;&gt;Label3.Name" xml:space="preserve">
     <value>Label3</value>
@@ -375,25 +381,25 @@
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="txtFilename.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="txtFileInfo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>390, 14</value>
+    <value>463, 14</value>
   </data>
-  <data name="txtFilename.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="txtFileInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>425, 22</value>
+    <value>352, 22</value>
   </data>
-  <data name="txtFilename.TabIndex" type="System.Int32, mscorlib">
+  <data name="txtFileInfo.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
   </data>
-  <data name="&gt;&gt;txtFilename.Name" xml:space="preserve">
+  <data name="&gt;&gt;txtFileInfo.Name" xml:space="preserve">
-    <value>txtFilename</value>
+    <value>txtFileInfo</value>
   </data>
-  <data name="&gt;&gt;txtFilename.Type" xml:space="preserve">
+  <data name="&gt;&gt;txtFileInfo.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;txtFilename.Parent" xml:space="preserve">
+  <data name="&gt;&gt;txtFileInfo.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;txtFilename.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;txtFileInfo.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <data name="txtRecordId.Location" type="System.Drawing.Point, System.Drawing">

app/DD-Record-Organiser/frmWD_Link_to_Record.vb

@@ -13,7 +13,7 @@ Public Class frmWD_Link_to_Record
     Private ENTITY_LOADED As Boolean = False
     Private ENTITY_ID As Integer
     Private RECORD_ID As Integer
-    Private _objecttype As String
+    ' Private _objecttype As String
     Private Class ClassConstructor
         Public title As String
         Public id As Integer
@@ -25,10 +25,15 @@ Public Class frmWD_Link_to_Record
 
     Private CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_ID, FORM_ID As Integer
 
-    Public Sub New(fileName As String, Objecttype As String)
+    Public Sub New() 'fileName As String, Objecttype As String)
         InitializeComponent()
-        txtFilename.Text = fileName
+        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-        _objecttype = Objecttype
+            txtFileInfo.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")
+        Else
+            txtFileInfo.Text = String.Format("{0} files selected for Record2Link", ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count)
+        End If
+        'txtFilename.Text = fileName
+        '_objecttype = Objecttype
     End Sub
 
     Private Function GetConstructorForms() As DataTable
@@ -73,326 +78,17 @@ Public Class frmWD_Link_to_Record
     End Sub
 
     Sub Load_TreeViewEbene(constructorId As Integer)
+        Cursor = Cursors.WaitCursor
         trvwMain.Nodes.Clear()
         If NODE_NAVIGATION = True Then
-            ' Rootnode erstellen und taggen
+            Try
-            If DT_TREEVIEW_PER_CONTROLS.Rows.Count > 1 Then
+                Dim MainNode = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_PER_CONTROLS, TREEVIEW_IMAGELIST)
-                ' Presuming the DataTable has a column named ENTITY_ID and TYPE_NODE.
+                If Not IsNothing(MainNode) Then
-                Dim expression As String
+                    trvwMain.Nodes.Add(MainNode)
-                expression = "TYPE_NODE = 0"
+                End If
-                Dim foundRowsLevel0() As DataRow
+            Catch ex As Exception
-                ' Use the Select method to find all rows matching the filter.
+                MsgBox("Error in Load TreeView NodesNavigation:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression)
+            End Try
-                Dim i As Integer
-                Dim NODE_CONFIG_ID
-                ' For each row create a Node
-                For i = 0 To foundRowsLevel0.GetUpperBound(0)
-                    Dim ID = foundRowsLevel0(i)("GUID")
-                    Dim LevelEntity = foundRowsLevel0(i)("ENTITY_ID")
-                    Dim controlID = foundRowsLevel0(i)("CONTROL_ID")
-                    Dim nodetext = foundRowsLevel0(i)("NODE_CAPTION")
-                    Dim Type_node = foundRowsLevel0(i)("TYPE_NODE")
-                    Dim RECORD_ID = foundRowsLevel0(i)("RECORD_ID")
-                    NODE_CONFIG_ID = foundRowsLevel0(i)("NODE_CONFIG_ID")
-                    Dim LEVEL0_NODE As TreeNode
-                    LEVEL0_NODE = New TreeNode(nodetext)
-                    If Not IsDBNull(RECORD_ID) Then
-                        LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID & "#RECORD-ID" & RECORD_ID.ToString
-                    Else
-                        LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID
-                    End If
-
-                    Dim index As Integer = 0
-                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                        If img = NODE_CONFIG_ID & "#" & LevelEntity Then
-                            Exit For
-                        End If
-                        index += 1
-                    Next
-                    LEVEL0_NODE.ImageIndex = index
-                    LEVEL0_NODE.SelectedImageIndex = index
-                    trvwMain.Nodes.Add(LEVEL0_NODE)
-                    '### LEVEL 1 laden #######
-                    Dim expressionLevel1 As String
-                    expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND  Einschränkung auf Type 2 und Parent_Guid
-                    Dim foundRowsLevel1() As DataRow
-                    foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1)
-                    Dim j As Integer
-                    For j = 0 To foundRowsLevel1.GetUpperBound(0)
-                        Dim ID1 = foundRowsLevel1(j)("GUID")
-                        Dim LevelEntity1 = foundRowsLevel1(j)("ENTITY_ID")
-                        Dim controlID1 = foundRowsLevel1(j)("CONTROL_ID")
-                        Dim nodetext1 = foundRowsLevel1(j)("NODE_CAPTION")
-                        Dim Type_node1 = foundRowsLevel1(j)("TYPE_NODE")
-                        RECORD_ID = foundRowsLevel1(j)("RECORD_ID")
-                        NODE_CONFIG_ID = foundRowsLevel1(j)("NODE_CONFIG_ID")
-                        ' Node erstellen..
-                        Dim LEVEL1_NODE As TreeNode
-                        LEVEL1_NODE = New TreeNode(nodetext1)
-                        If Not IsDBNull(RECORD_ID) Then
-                            LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1 & "#RECORD-ID" & RECORD_ID.ToString
-                        Else
-                            LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1
-                        End If
-
-                        index = 0
-                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                            If img = NODE_CONFIG_ID & "#" & LevelEntity1 Then
-                                Exit For
-                            End If
-                            index += 1
-                        Next
-                        LEVEL1_NODE.ImageIndex = index
-                        LEVEL1_NODE.SelectedImageIndex = index
-                        ' ..und einfügen
-                        LEVEL0_NODE.Nodes.Add(LEVEL1_NODE)
-                        '### LEVEL 2 laden #######
-                        Dim expressionLevel2 As String
-                        expressionLevel2 = "PARENT_GUID = " & ID1 'TYPE_NODE = 2 AND Einschränkung auf Type  und Parent_Guid
-                        Dim foundRowsLevel2() As DataRow
-                        foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2)
-                        Dim k As Integer
-                        For k = 0 To foundRowsLevel2.GetUpperBound(0)
-                            Dim ID2 = foundRowsLevel2(k)("GUID")
-                            Dim LevelEntity2 = foundRowsLevel2(k)("ENTITY_ID")
-                            Dim controlID2 = foundRowsLevel2(k)("CONTROL_ID")
-                            Dim nodetext2 = foundRowsLevel2(k)("NODE_CAPTION")
-                            RECORD_ID = foundRowsLevel2(k)("RECORD_ID")
-                            NODE_CONFIG_ID = foundRowsLevel2(k)("NODE_CONFIG_ID")
-                            ' Node erstellen..
-                            Dim LEVEL2_NODE As TreeNode
-                            LEVEL2_NODE = New TreeNode(nodetext2)
-                            If Not IsDBNull(RECORD_ID) Then
-                                LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2 & "#RECORD-ID" & RECORD_ID.ToString
-                            Else
-                                LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2
-                            End If
-
-                            index = 0
-                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                If img = NODE_CONFIG_ID & "#" & LevelEntity2 Then
-                                    Exit For
-                                End If
-                                index += 1
-                            Next
-                            LEVEL2_NODE.ImageIndex = index
-                            LEVEL2_NODE.SelectedImageIndex = index
-                            ' ..und einfügen
-                            LEVEL1_NODE.Nodes.Add(LEVEL2_NODE)
-                            '### LEVEL 3 laden #######
-                            Dim expressionLevel3 As String
-                            expressionLevel3 = "PARENT_GUID = " & ID2 'TYPE_NODE = 3 AND  Einschränkung auf Type  und Parent_Guid
-                            Dim foundRowsLevel3() As DataRow
-                            foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3)
-                            Dim l As Integer
-                            For l = 0 To foundRowsLevel3.GetUpperBound(0)
-                                Dim ID3 = foundRowsLevel3(l)("GUID")
-                                Dim LevelEntity3 = foundRowsLevel3(l)("ENTITY_ID")
-                                Dim controlID3 = foundRowsLevel3(l)("CONTROL_ID")
-                                Dim nodetext3 = foundRowsLevel3(l)("NODE_CAPTION")
-                                RECORD_ID = foundRowsLevel3(l)("RECORD_ID")
-                                NODE_CONFIG_ID = foundRowsLevel3(l)("NODE_CONFIG_ID")
-                                ' Node erstellen..
-                                Dim LEVEL3_NODE As TreeNode
-                                LEVEL3_NODE = New TreeNode(nodetext3)
-                                If Not IsDBNull(RECORD_ID) Then
-                                    LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3 & "#RECORD-ID" & RECORD_ID.ToString
-                                Else
-                                    LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3
-                                End If
-
-                                index = 0
-                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                    If img = NODE_CONFIG_ID & "#" & LevelEntity3 Then
-                                        Exit For
-                                    End If
-                                    index += 1
-                                Next
-                                LEVEL3_NODE.ImageIndex = index
-                                LEVEL3_NODE.SelectedImageIndex = index
-                                ' ..und einfügen
-                                LEVEL2_NODE.Nodes.Add(LEVEL3_NODE)
-                                '### LEVEL 4 laden #######
-                                Dim expressionLevel4 As String
-                                expressionLevel4 = "PARENT_GUID = " & ID3 'TYPE_NODE = 4 AND Einschränkung auf Type  und Parent_Guid
-                                Dim foundRowsLevel4() As DataRow
-                                foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4)
-                                Dim m As Integer
-                                For m = 0 To foundRowsLevel4.GetUpperBound(0)
-                                    Dim ID5 = foundRowsLevel4(m)("GUID")
-                                    Dim LevelEntity5 = foundRowsLevel4(m)("ENTITY_ID")
-                                    Dim controlID5 = foundRowsLevel4(m)("CONTROL_ID")
-                                    Dim nodetext5 = foundRowsLevel4(m)("NODE_CAPTION")
-                                    RECORD_ID = foundRowsLevel4(m)("RECORD_ID")
-                                    NODE_CONFIG_ID = foundRowsLevel4(m)("NODE_CONFIG_ID")
-                                    ' Node erstellen..
-                                    Dim LEVEL4_NODE As TreeNode
-                                    LEVEL4_NODE = New TreeNode(nodetext5)
-                                    If Not IsDBNull(RECORD_ID) Then
-                                        LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5 & "#RECORD-ID" & RECORD_ID.ToString
-                                    Else
-                                        LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5
-                                    End If
-
-                                    index = 0
-                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                        If img = NODE_CONFIG_ID & "#" & LevelEntity5 Then
-                                            Exit For
-                                        End If
-                                        index += 1
-                                    Next
-                                    LEVEL4_NODE.ImageIndex = index
-                                    LEVEL4_NODE.SelectedImageIndex = index
-                                    ' ..und einfügen
-                                    LEVEL3_NODE.Nodes.Add(LEVEL4_NODE)
-                                    '### LEVEL 5 laden #######
-                                    Dim expressionLevel5 As String
-                                    expressionLevel5 = "PARENT_GUID = " & ID5 'TYPE_NODE = 5 AND  Einschränkung auf Type  und Parent_Guid
-                                    Dim foundRowsLevel5() As DataRow
-                                    foundRowsLevel5 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel5)
-                                    Dim n As Integer
-                                    For n = 0 To foundRowsLevel5.GetUpperBound(0)
-                                        Dim ID6 = foundRowsLevel5(n)("GUID")
-                                        Dim LevelEntity6 = foundRowsLevel5(n)("ENTITY_ID")
-                                        Dim controlID6 = foundRowsLevel5(n)("CONTROL_ID")
-                                        Dim nodetext6 = foundRowsLevel5(n)("NODE_CAPTION")
-                                        RECORD_ID = foundRowsLevel5(n)("RECORD_ID")
-                                        NODE_CONFIG_ID = foundRowsLevel5(n)("NODE_CONFIG_ID")
-                                        ' Node erstellen..
-                                        Dim LEVEL5_NODE As TreeNode
-                                        LEVEL5_NODE = New TreeNode(nodetext6)
-                                        If Not IsDBNull(RECORD_ID) Then
-                                            LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6 & "#RECORD-ID" & RECORD_ID.ToString
-                                        Else
-                                            LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6
-                                        End If
-
-                                        index = 0
-                                        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                            If img = NODE_CONFIG_ID & "#" & LevelEntity6 Then
-                                                Exit For
-                                            End If
-                                            index += 1
-                                        Next
-                                        LEVEL5_NODE.ImageIndex = index
-                                        LEVEL5_NODE.SelectedImageIndex = index
-                                        ' ..und einfügen
-                                        LEVEL4_NODE.Nodes.Add(LEVEL5_NODE)
-                                        '### LEVEL 5 laden #######
-                                        Dim expressionLevel6 As String
-                                        expressionLevel6 = "PARENT_GUID = " & ID6 'TYPE_NODE = 6 AND  Einschränkung auf Type  und Parent_Guid
-                                        Dim foundRowsLevel6() As DataRow
-                                        foundRowsLevel6 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel6)
-                                        Dim o As Integer
-                                        For o = 0 To foundRowsLevel6.GetUpperBound(0)
-                                            Dim ID7 = foundRowsLevel6(o)("GUID")
-                                            Dim LevelEntity7 = foundRowsLevel6(o)("ENTITY_ID")
-                                            Dim controlID7 = foundRowsLevel6(o)("CONTROL_ID")
-                                            Dim nodetext7 = foundRowsLevel6(o)("NODE_CAPTION")
-                                            RECORD_ID = foundRowsLevel6(o)("RECORD_ID")
-                                            NODE_CONFIG_ID = foundRowsLevel6(o)("NODE_CONFIG_ID")
-                                            ' Node erstellen..
-                                            Dim LEVEL6_NODE As TreeNode
-                                            LEVEL6_NODE = New TreeNode(nodetext7)
-                                            If Not IsDBNull(RECORD_ID) Then
-                                                LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7 & "#RECORD-ID" & RECORD_ID.ToString
-                                            Else
-                                                LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7
-                                            End If
-
-                                            index = 0
-                                            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                If img = NODE_CONFIG_ID & "#" & LevelEntity7 Then
-                                                    Exit For
-                                                End If
-                                                index += 1
-                                            Next
-                                            LEVEL6_NODE.ImageIndex = index
-                                            LEVEL6_NODE.SelectedImageIndex = index
-                                            ' ..und einfügen
-                                            LEVEL5_NODE.Nodes.Add(LEVEL6_NODE)
-                                            '### LEVEL 7 laden #######
-                                            Dim expressionLevel7 As String
-                                            expressionLevel7 = "PARENT_GUID = " & ID7 'TYPE_NODE = 7 AND Einschränkung auf Type  und Parent_Guid
-                                            Dim foundRowsLevel7() As DataRow
-                                            foundRowsLevel7 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel7)
-                                            Dim p As Integer
-                                            For p = 0 To foundRowsLevel7.GetUpperBound(0)
-                                                Dim ID8 = foundRowsLevel7(p)("GUID")
-                                                Dim LevelEntity8 = foundRowsLevel7(p)("ENTITY_ID")
-                                                Dim controlID8 = foundRowsLevel7(p)("CONTROL_ID")
-                                                Dim nodetext8 = foundRowsLevel7(p)("NODE_CAPTION")
-                                                RECORD_ID = foundRowsLevel7(p)("RECORD_ID")
-                                                NODE_CONFIG_ID = foundRowsLevel7(p)("NODE_CONFIG_ID")
-                                                ' Node erstellen..
-                                                Dim LEVEL7_NODE As TreeNode
-                                                LEVEL7_NODE = New TreeNode(nodetext8)
-                                                If Not IsDBNull(RECORD_ID) Then
-                                                    LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8 & "#RECORD-ID" & RECORD_ID.ToString
-                                                Else
-                                                    LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8
-                                                End If
-
-                                                index = 0
-                                                For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                    If img = NODE_CONFIG_ID & "#" & LevelEntity8 Then
-                                                        Exit For
-                                                    End If
-                                                    index += 1
-                                                Next
-                                                LEVEL7_NODE.ImageIndex = index
-                                                LEVEL7_NODE.SelectedImageIndex = index
-                                                ' ..und einfügen
-                                                LEVEL6_NODE.Nodes.Add(LEVEL7_NODE)
-                                                '### LEVEL 7 laden #######
-                                                Dim expressionLevel8 As String
-                                                expressionLevel8 = "PARENT_GUID = " & ID8 'TYPE_NODE = 7 AND  Einschränkung auf Type  und Parent_Guid
-                                                Dim foundRowsLevel8() As DataRow
-                                                foundRowsLevel8 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel8)
-                                                Dim q As Integer
-                                                For q = 0 To foundRowsLevel8.GetUpperBound(0)
-                                                    Dim ID9 = foundRowsLevel8(q)("GUID")
-                                                    Dim LevelEntity9 = foundRowsLevel8(q)("ENTITY_ID")
-                                                    Dim controlID9 = foundRowsLevel8(q)("CONTROL_ID")
-                                                    Dim nodetext9 = foundRowsLevel8(q)("NODE_CAPTION")
-                                                    RECORD_ID = foundRowsLevel8(q)("RECORD_ID")
-                                                    NODE_CONFIG_ID = foundRowsLevel8(q)("NODE_CONFIG_ID")
-                                                    ' Node erstellen..
-                                                    Dim LEVEL8_NODE As TreeNode
-                                                    LEVEL8_NODE = New TreeNode(nodetext9)
-                                                    If Not IsDBNull(RECORD_ID) Then
-                                                        LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9 & "#RECORD-ID" & RECORD_ID.ToString
-                                                    Else
-                                                        LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9
-                                                    End If
-
-                                                    index = 0
-                                                    For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                                                        If img = NODE_CONFIG_ID & "#" & LevelEntity9 Then
-                                                            Exit For
-                                                        End If
-                                                        index += 1
-                                                    Next
-                                                    LEVEL8_NODE.ImageIndex = index
-                                                    LEVEL8_NODE.SelectedImageIndex = index
-                                                    ' ..und einfügen
-                                                    LEVEL7_NODE.Nodes.Add(LEVEL8_NODE)
-                                                    '### LEVEL 8 laden #######
-                                                Next ' Level 7 Ende
-                                            Next ' Level 7 Ende
-                                        Next ' Level 6 Ende
-                                    Next ' Level 5 Ende
-                                Next 'Level 4 Ende
-                            Next 'Level 3 Ende
-                        Next ' Level 2 Ende
-                    Next 'Level 1 Ende
-                Next
-
-
-            Else
-                MsgBox("Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical)
-                Me.Close()
-            End If
         Else
             Try
                 Dim sel_sql = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
@@ -441,8 +137,8 @@ Public Class frmWD_Link_to_Record
                 MsgBox("Error in Load_TreeViewEbene in LinkToRecord:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
         End If
-        
 
+        Cursor = Cursors.Default
     End Sub
 
     Public Function Get_Grid_Sql(FormId As Integer, ConstructorDetailID As Integer) As String
@@ -497,21 +193,30 @@ Public Class frmWD_Link_to_Record
                 SQL = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTOR_ID)
                 DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(Sql)
 
-                Try
+                ' Try
-                    TREEVIEW_IMAGELIST = New ImageList
+                TREEVIEW_IMAGELIST = New ImageList
-                    For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows
+                For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows
-                        Dim bimage() As Byte = row.Item("NODE_IMAGE")
+                    Try
+                        Dim bimage = row.Item("NODE_IMAGE")
                         If Not IsDBNull(bimage) Then
                             Dim Node_image = ByteArrayToBitmap(bimage)
                             TREEVIEW_IMAGELIST.Images.Add(row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID"), Node_image)
                         End If
-                    Next
+                    Catch ex As Exception
-                    trvwMain.ImageList = TREEVIEW_IMAGELIST
+
-                Catch ex As Exception
+                    End Try
-                    MsgBox("Error in Adding NodeConfigurations to TreeView: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+
-                End Try
+                Next
+                trvwMain.ImageList = TREEVIEW_IMAGELIST
+                'Catch ex As Exception
+                '    MsgBox("Error in Adding NodeConfigurations to TreeView: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                'End Try
+
 
                 NODE_NAVIGATION = True
+                NODE_NAVIGATION_LOADED = False
+                grvwGrid.Columns.Clear()
+                dgEntityRecords.DataSource = Nothing
             Else
                 TreeView_perControl = False
                 NODE_NAVIGATION = False
@@ -551,71 +256,83 @@ Public Class frmWD_Link_to_Record
         
     End Sub
 
-    Private Sub tvEntities_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles trvwMain.AfterSelect
+    Private Sub trvwMain_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles trvwMain.AfterSelect
-        Try
+        ' Try
-            Dim dt As DataTable
+      
-            If NODE_NAVIGATION = False Then
+        Dim dt As DataTable
-                SetSelectedNodeStyle(trvwMain.Nodes)
+        If NODE_NAVIGATION = False Then
-                CONSTRUCTOR_DETAIL_ID = Integer.Parse(e.Node.Tag)
+            SetSelectedNodeStyle(trvwMain.Nodes)
-                Dim SQL As String = String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = {0} AND CONSTRUCT_ID = {1}", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_ID)
+            CONSTRUCTOR_DETAIL_ID = Integer.Parse(e.Node.Tag)
-                FORM_ID = ClassDatabase.Execute_Scalar(SQL)
+            Dim SQL As String = String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = {0} AND CONSTRUCT_ID = {1}", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_ID)
-                SQL = Get_Grid_Sql(FORM_ID, CONSTRUCTOR_DETAIL_ID)
+            FORM_ID = ClassDatabase.Execute_Scalar(SQL)
+            SQL = Get_Grid_Sql(FORM_ID, CONSTRUCTOR_DETAIL_ID)
+            dt = ClassDatabase.Return_Datatable(SQL)
+            dgEntityRecords.DataSource = dt
+            grvwGrid.PopulateColumns()
+            dgEntityRecords.RefreshDataSource()
+        Else
+            RECORD_ID = 0
+            Dim SelectedNode As TreeNode = TryCast(trvwMain.SelectedNode, TreeNode)
+            If SelectedNode IsNot Nothing Then
+                SelectedNode.NodeFont = New Font(trvwMain.Font.FontFamily, trvwMain.Font.Size, FontStyle.Bold)
+                SelectedNode.Text = SelectedNode.Text
+            Else
+                Exit Sub
+            End If
+
+
+            If NODE_NAVIGATION_LOADED = False Then
+                ENTITY_ID = Return_ENTITY_FOR_TAG(SelectedNode.Tag)
+                Dim SQL As String '= String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1}", CONSTRUCTOR_ID, ENTITY_ID)
+                SQL = Get_Grid_Sql(ENTITY_ID, CONSTRUCTOR_DETAIL_ID)
                 dt = ClassDatabase.Return_Datatable(SQL)
+                If IsNothing(dt) Then
+                    Exit Sub
+                End If
                 dgEntityRecords.DataSource = dt
                 grvwGrid.PopulateColumns()
                 dgEntityRecords.RefreshDataSource()
-            Else
+                NODE_NAVIGATION_LOADED = True
-                RECORD_ID = 0
+            End If
-                Dim SelectedNode As TreeNode = TryCast(trvwMain.SelectedNode, TreeNode)
+
-                If SelectedNode IsNot Nothing Then
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> NodeTag: " & SelectedNode.Tag.ToString, False)
-                    SelectedNode.NodeFont = New Font(trvwMain.Font.FontFamily, trvwMain.Font.Size, FontStyle.Bold)
+            If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then
-                    SelectedNode.Text = SelectedNode.Text
+                Dim Record = Return_RECORD_forTag(SelectedNode.Tag)
-                Else
+                If Record <> 0 Then
-                    Exit Sub
+                    txtRecordId.Text = Record
+                    RECORD_ID = Record
                 End If
 
-
-                If NODE_NAVIGATION_LOADED = False Then
-                    ENTITY_ID = Return_ENTITY_FOR_TAG(SelectedNode.Tag)
-                    Dim SQL As String = String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1}", CONSTRUCTOR_ID, ENTITY_ID)
-                    SQL = Get_Grid_Sql(ENTITY_ID, CONSTRUCTOR_DETAIL_ID)
-                    dt = ClassDatabase.Return_Datatable(SQL)
-                    dgEntityRecords.DataSource = dt
-                    grvwGrid.PopulateColumns()
-                    dgEntityRecords.RefreshDataSource()
-                    NODE_NAVIGATION_LOADED = True
-                End If
-
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> NodeTag: " & SelectedNode.Tag.ToString, False)
-                If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then
-                    Dim Record = Return_RECORD_forTag(SelectedNode.Tag)
-                    If Record <> 0 Then
-                        txtRecordId.Text = Record
-                        RECORD_ID = Record
-                    End If
-
-                End If
-                Dim RecordId As Integer = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns(0))
-                txtRecordId.Text = RecordId
-
             End If
-            ' Datasource neu setzen und columns laden
+            If Not IsNothing(dgEntityRecords.DataSource) Then
+                Dim RecordId As Integer = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns(0))
+                txtRecordId.Text = RecordId
+            Else
+                txtRecordId.Text = ""
+                RECORD_ID = 0
+            End If
            
-            Dim constructor = DirectCast(cmbConstructorForms.Items.Item(cmbConstructorForms.SelectedIndex), ClassConstructor)
-            Dim constructorName As String = constructor.title
 
+        End If
+        ' Datasource neu setzen und columns laden
+
+        Dim constructor = DirectCast(cmbConstructorForms.Items.Item(cmbConstructorForms.SelectedIndex), ClassConstructor)
+        Dim constructorName As String = constructor.title
+        If Not IsNothing(dgEntityRecords.DataSource) Then
             Load_Grid_Layout(constructorName)
             grvwGrid.Columns.Item("Form-ID").Visible = False
             grvwGrid.Columns.Item("ROW_COLOR").Visible = False
-            If RECORD_ID > 0 Then
+        End If
-                Dim rowHandle = grvwGrid.LocateByValue(0, grvwGrid.Columns("Record-ID"), RECORD_ID)
+     
-                grvwGrid.FocusedRowHandle = rowHandle
+        If RECORD_ID > 0 Then
-            End If
+            Dim rowHandle = grvwGrid.LocateByValue(0, grvwGrid.Columns("Record-ID"), RECORD_ID)
+            grvwGrid.FocusedRowHandle = rowHandle
+        End If
 
-        Catch ex As Exception
+        'Catch ex As Exception
-            MsgBox("Entität " + CONSTRUCTOR_DETAIL_ID + " konnte nicht geladen werden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        '    MsgBox("Entität " + CONSTRUCTOR_DETAIL_ID + " konnte nicht geladen werden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            Exit Sub
+        '    Exit Sub
-        End Try
+        'End Try
     End Sub
     Private Function Return_RECORD_forTag(NodeString As String)
         If IsNumeric(NodeString) Then
@@ -647,7 +364,7 @@ Public Class frmWD_Link_to_Record
             If NodeString.Contains("CONTROL-ID") Then
                 Try
                     Dim _index = NodeString.IndexOf("C")
-                    Dim Entity = NodeString.Substring(0, _index)
+                    Dim Entity = NodeString.Substring(0, _index).Replace(" ", "").Replace("-", "")
                     Return Entity
                 Catch ex As Exception
                     ClassLogger.Add("Unexpected Error in Return_ENTITY_FOR_TAG ('" & NodeString & "'): " & ex.Message, True)
@@ -695,52 +412,58 @@ Public Class frmWD_Link_to_Record
     End Sub
 
     Private Sub GridView1_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles grvwGrid.FocusedRowChanged
-        Dim RecordId As Integer = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns(0))
+        If Not IsNothing(dgEntityRecords.DataSource) Then
-        txtRecordId.Text = RecordId
+            Dim RecordId As Integer = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns(0))
+            txtRecordId.Text = RecordId
+        End If
     End Sub
 
     Private Sub btnLink_Click(sender As Object, e As EventArgs) Handles btnLink.Click
         Dim RecordId As Integer
-        Dim FileName As String
 
         If txtRecordId.Text.Trim.Count > 0 Then
             RecordId = Integer.Parse(txtRecordId.Text)
-            FileName = txtFilename.Text
             Try
-                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)
+                For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-                If ClassDatabase.Execute_non_Query(ins) = False Then
+                    CURRENT_DOC_ID = row.Item("DOC_ID")
-                    MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical)
+                    Dim DOC_PATH = row.Item("DOC_PATH")
-                End If
+                    Dim _objecttype = row.Item("OBJECTTYPE")
-                Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _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 DT_OBJTYPE As DataTable = ClassDatabase.Return_Datatable(sql)
+                    If ClassDatabase.Execute_non_Query(ins) = False Then
-                If DT_OBJTYPE.Rows.Count = 1 Then
+                        MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical)
-                    Dim Entity_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_ENTITYID")
+                    End If
-                    Dim Record_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_RECORDID")
+                    Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype)
-                    Dim ENT_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", RecordId))
+                    Dim DT_OBJTYPE As DataTable = ClassDatabase.Return_Datatable(sql)
-                    If ENT_ID > 1 Then
+                    If DT_OBJTYPE.Rows.Count = 1 Then
-                        If ClassWindream.IndexFile(FileName, Entity_Index, ENT_ID, True, _objecttype) = False Then
+                        Dim Entity_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_ENTITYID")
-                            Dim msg = "Die Entität-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
+                        Dim Record_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_RECORDID")
+                        Dim ENT_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", RecordId))
+                        If ENT_ID > 1 Then
+                            If ClassWindream.IndexFile(DOC_PATH, Entity_Index, ENT_ID, True, _objecttype) = False Then
+                                Dim msg = "Die Entität-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
+                                If USER_LANGUAGE <> "de-DE" Then
+                                    msg = "Could not index Entity-ID! Please check logfile!"
+                                End If
+                                MsgBox(msg, MsgBoxStyle.Exclamation)
+                            End If
+                        End If
+                        If ClassWindream.IndexFile(DOC_PATH, Record_Index, RecordId, True, _objecttype) = False Then
+                            Dim msg = "Die Record-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
                             If USER_LANGUAGE <> "de-DE" Then
-                                msg = "Could not index Entity-ID! Please check logfile!"
+                                msg = "Could not index Record-ID! Please check logfile!"
                             End If
                             MsgBox(msg, MsgBoxStyle.Exclamation)
+                        Else
+                            Dim msg = "Der Datensatz wurde erfolgreich mit der Datei verknüpft!"
+                            If USER_LANGUAGE <> "de-DE" Then
+                                msg = "The record was successfully added to the file!"
+                            End If
+                            MsgBox(msg, MsgBoxStyle.Information)
+                            ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & RecordId.ToString)
                         End If
                     End If
-                    If ClassWindream.IndexFile(FileName, Record_Index, RecordId, True, _objecttype) = False Then
+                Next
-                        Dim msg = "Die Record-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
+               
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "Could not index Record-ID! Please check logfile!"
-                        End If
-                        MsgBox(msg, MsgBoxStyle.Exclamation)
-                    Else
-                        Dim msg = "Der Datensatz wurde erfolgreich mit der Datei verknüpft!"
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "The record was successfully added to the file!"
-                        End If
-                        MsgBox(msg, MsgBoxStyle.Information)
-                        ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & RecordId.ToString)
-                    End If
-                End If
             Catch ex As Exception
                 MsgBox("Unexpected Error in Linking Record to file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try