MS_13.11_Final

2015-11-13 15:51:25 +01:00
parent 9f80eb5a3d
commit 365e92e98b
21 changed files with 619 additions and 355 deletions
--- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
@@ -634,7 +634,7 @@ Public Class ClassControlCommandsUI
    Public Shared Function CreateRecord(FormID)
        Dim ADDED_WHO As String = Environment.UserName
        Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID) VALUES ('" & ADDED_WHO & "', " & FormID & ")"
-        Return ClassDatabase.Execute_non_Query(SQL)
+        Return ClassDatabase.Execute_non_Query(SQL, True)
    End Function

    Public Shared Function GetLastRecord()
@@ -647,7 +647,7 @@ Public Class ClassControlCommandsUI
        Dim ADDED_WHO As String = Environment.UserName
        Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & foreignRecordID & "," & recordID & ",'" & Comment & "','" & ADDED_WHO & "')"
        If LogErrorsOnly = False Then ClassLogger.Add(">> ConnectRecord SQL:  " & SQL, False)
-        Return ClassDatabase.Execute_non_Query(SQL)
+        Return ClassDatabase.Execute_non_Query(SQL, True)
    End Function

    'Function SaveRecord_OLD(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
--- a/app/DD-Record-Organiser/ClassOfficeTemplate.vb
+++ b/app/DD-Record-Organiser/ClassOfficeTemplate.vb
@@ -4,7 +4,7 @@ Public Class ClassOfficeTemplate
        Try
            Dim sql_Template As String = "SELECT * FROM VWPMO_TEMPLATE_ENTITY WHERE TEMPLATE_ID = " & Template_ID
            Dim DT_TEMPLATE As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_Template)
-            Dim sql_patterns As String = "select * from TBPMO_TEMPLATE_PATTERN where TEMPL_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND TEMPLATE_ID = " & Template_ID & ")"
+            Dim sql_patterns As String = String.Format("select * from TBPMO_TEMPLATE_PATTERN where TEMPLATE_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = {0}  AND TEMPLATE_ID = {1})", CURRENT_FORM_ID, Template_ID)
            Dim DT_PATTERNS As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_patterns)

            If IsNothing(DT_PATTERNS) Then
@@ -13,7 +13,7 @@ Public Class ClassOfficeTemplate
            End If

            Dim Original_Vorlage As String = DT_TEMPLATE.Rows(0).Item("TEMPLATE_PATH")
-            Dim DOCTYPE_ID As Integer = ClassDatabase.Execute_Scalar("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND TEMPLATE_ID = " & Template_ID)
+            Dim DOCTYPE_ID As Integer = ClassDatabase.Execute_Scalar("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE WHERE GUID = " & Template_ID, True)

            If System.IO.File.Exists(Original_Vorlage) = False Then
                MsgBox("Achtung: die Vorlage " & vbNewLine & Original_Vorlage & vbNewLine & "existiert nicht!", MsgBoxStyle.Critical)
@@ -48,27 +48,27 @@ Public Class ClassOfficeTemplate
                            'Fixed Value ist gefüllt
                            Dim fvalue As String = patternrow.Item("FIXED_VALUE").ToString.ToUpper
                            If fvalue <> "" Then
-                                If fvalue.Contains("@") Then
-                                    If fvalue.Contains("CONTROLID") Then
-                                        Dim Control_ID = fvalue.Replace("@CONTROLID:", "")
-                                        Try
-                                            If CInt(Control_ID) Then
-                                                If LogErrorsOnly = False Then ClassLogger.Add(">> Get Value for Control-ID: " & Control_ID.ToString, False)
-                                                Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID)
-                                                If Not IsNothing(value_akt) Then
-                                                    cc.Range.Text = value_akt.ToString
-                                                Else
-                                                    ClassLogger.Add("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!", True)
-                                                End If
-                                            End If
-                                        Catch ex As Exception
-                                            ClassLogger.Add("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message, True)
-                                        End Try
+                                ' If fvalue.Contains("@") Then
+                                'If fvalue.Contains("CONTROLID") Then
+                                Dim Control_ID = fvalue '.Replace("@CONTROLID:", "")
+                                Try
+                                    If CInt(Control_ID) Then
+                                        If LogErrorsOnly = False Then ClassLogger.Add(">> Get Value for Control-ID: " & Control_ID.ToString, False)
+                                        Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID)
+                                        If Not IsNothing(value_akt) Then
+                                            cc.Range.Text = value_akt.ToString
+                                        Else
+                                            ClassLogger.Add("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!", True)
+                                        End If
                                    End If
-                                Else
-                                    If LogErrorsOnly = False Then ClassLogger.Add(">> Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False)
-                                    cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString
-                                End If
+                                Catch ex As Exception
+                                    ClassLogger.Add("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message, True)
+                                End Try
+                                'End If
+                                'Else
+                                '    If LogErrorsOnly = False Then ClassLogger.Add(">> Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False)
+                                '    cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString
+                                'End If
                            End If
                        Else 'Kein Fixed Value, also wohl eher sql-result
                            If Not IsDBNull(patternrow.Item("CONNECTION_ID")) Then
@@ -89,6 +89,7 @@ Public Class ClassOfficeTemplate
            'doc.Bookmarks().Item("Produktion").Range.Text = "Testproduktion"

            doc.SaveAs(tempdoc)
+            TEMP_FILES.Add(tempdoc)
            'doc.Close()
            'speichern / drucken
            'doc.SaveAs("c:\Proforma.doc")
--- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
@@ -16445,6 +16445,10 @@ Partial Public Class DD_DMSDataSet
        
        Private columnSEARCH_PATTERN5 As Global.System.Data.DataColumn
        
+        Private columnLOAD_DIRECT As Global.System.Data.DataColumn
+        
+        Private columnSQL_QUICK_VIEW As Global.System.Data.DataColumn
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Sub New()
@@ -16640,6 +16644,22 @@ Partial Public Class DD_DMSDataSet
            End Get
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property LOAD_DIRECTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnLOAD_DIRECT
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property SQL_QUICK_VIEWColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnSQL_QUICK_VIEW
+            End Get
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
         Global.System.ComponentModel.Browsable(false)>  _
@@ -16696,9 +16716,11 @@ Partial Public Class DD_DMSDataSet
                    ByVal SEARCH_PATTERN2 As String,  _
                    ByVal SEARCH_PATTERN3 As String,  _
                    ByVal SEARCH_PATTERN4 As String,  _
-                    ByVal SEARCH_PATTERN5 As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
+                    ByVal SEARCH_PATTERN5 As String,  _
+                    ByVal LOAD_DIRECT As Boolean,  _
+                    ByVal SQL_QUICK_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
            Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow,TBPMO_FORM_CONSTRUCTOR_DETAILRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW}
            If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then
                columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0)
            End If
@@ -16753,6 +16775,8 @@ Partial Public Class DD_DMSDataSet
            Me.columnSEARCH_PATTERN3 = MyBase.Columns("SEARCH_PATTERN3")
            Me.columnSEARCH_PATTERN4 = MyBase.Columns("SEARCH_PATTERN4")
            Me.columnSEARCH_PATTERN5 = MyBase.Columns("SEARCH_PATTERN5")
+            Me.columnLOAD_DIRECT = MyBase.Columns("LOAD_DIRECT")
+            Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW")
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -16798,6 +16822,10 @@ Partial Public Class DD_DMSDataSet
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN4)
            Me.columnSEARCH_PATTERN5 = New Global.System.Data.DataColumn("SEARCH_PATTERN5", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN5)
+            Me.columnLOAD_DIRECT = New Global.System.Data.DataColumn("LOAD_DIRECT", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnLOAD_DIRECT)
+            Me.columnSQL_QUICK_VIEW = New Global.System.Data.DataColumn("SQL_QUICK_VIEW", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnSQL_QUICK_VIEW)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
            Me.columnGUID.AutoIncrement = true
            Me.columnGUID.AllowDBNull = false
@@ -16825,6 +16853,9 @@ Partial Public Class DD_DMSDataSet
            Me.columnSEARCH_PATTERN3.MaxLength = 50
            Me.columnSEARCH_PATTERN4.MaxLength = 50
            Me.columnSEARCH_PATTERN5.MaxLength = 50
+            Me.columnLOAD_DIRECT.AllowDBNull = false
+            Me.columnSQL_QUICK_VIEW.AllowDBNull = false
+            Me.columnSQL_QUICK_VIEW.MaxLength = 2147483647
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -26816,6 +26847,28 @@ Partial Public Class DD_DMSDataSet
            End Set
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property LOAD_DIRECT() As Boolean
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn),Boolean)
+            End Get
+            Set
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property SQL_QUICK_VIEW() As String
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn) = value
+            End Set
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow
@@ -42097,6 +42150,8 @@ Namespace DD_DMSDataSetTableAdapters
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN3", "SEARCH_PATTERN3")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN4", "SEARCH_PATTERN4")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN5", "SEARCH_PATTERN5")
+            tableMapping.ColumnMappings.Add("LOAD_DIRECT", "LOAD_DIRECT")
+            tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -42144,11 +42199,12 @@ Namespace DD_DMSDataSetTableAdapters
                "LUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTER"& _ 
                "N1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SEARCH_PATTER"& _ 
                "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE"& _ 
-                "ARCH_PATTERN5"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONSTRUCT_ID"& _ 
-                ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE"& _ 
-                "NE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME"& _ 
-                "2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PA"& _ 
-                "TTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)"
+                "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, SQL_QUICK_VIEW ="&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID "& _ 
+                "= @Original_GUID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELE"& _ 
+                "CT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANG"& _ 
+                "ED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTER"& _ 
+                "N1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPM"& _ 
+                "O_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -42166,6 +42222,7 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN3", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN3", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN4", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN4", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
        End Sub
@@ -42187,16 +42244,18 @@ Namespace DD_DMSDataSetTableAdapters
                "L_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_"& _ 
                "WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE"& _ 
                "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN"& _ 
-                "5"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @ID)"
+                "5, LOAD_DIRECT, SQL_QUICK_VIEW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"W"& _ 
+                "HERE        (GUID = @ID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(1).Connection = Me.Connection
-            Me._commandCollection(1).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAM"& _ 
-                "E2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, SEAR"& _ 
-                "CH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SE"& _ 
-                "LECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH FROM TBPMO_FORM_CONSTRUCTOR_DETA"& _ 
-                "IL WHERE (GUID = @ID)"
+            Me._commandCollection(1).CommandText = "SELECT        ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COL"& _ 
+                "UMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN"& _ 
+                "1, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4,"& _ 
+                " SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARC"& _ 
+                "H, LOAD_DIRECT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SQL_QUICK_VIEW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO"& _ 
+                "_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @ID)"
            Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
        End Sub
@@ -42419,6 +42478,7 @@ Namespace DD_DMSDataSetTableAdapters
                    ByVal SEARCH_PATTERN3 As String,  _
                    ByVal SEARCH_PATTERN4 As String,  _
                    ByVal SEARCH_PATTERN5 As String,  _
+                    ByVal LOAD_DIRECT As Boolean,  _
                    ByVal Original_GUID As Integer,  _
                    ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID,Integer)
@@ -42481,8 +42541,9 @@ Namespace DD_DMSDataSetTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SEARCH_PATTERN5,String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(LOAD_DIRECT,Boolean)
+            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(18).Value = CType(GUID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd
@@ -2450,45 +2450,45 @@ SELECT GUID, DESCRIPTION, SQL_PROVIDER, SERVER, [DATABASE], USERNAME, PASSWORD,
            <MainSource>
              <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>DELETE FROM TBPMO_FORM_CONSTRUCTOR_DETAIL
 WHERE        (GUID = @Original_GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL
                         (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, 
                         SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5)
 VALUES        (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5); 
 SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="FORM_ID" ColumnName="FORM_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LEVEL1_SELECT" ColumnName="LEVEL1_SELECT" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LEVEL1_SELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LEVEL1_SELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_SELECT_EBENE1" ColumnName="SQL_SELECT_EBENE1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE1" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_SELECT_EBENE2" ColumnName="SQL_SELECT_EBENE2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE2" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME1" ColumnName="COLUMN_NAME1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME2" ColumnName="COLUMN_NAME2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WINDREAM_SEARCH" ColumnName="WINDREAM_SEARCH" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@WINDREAM_SEARCH" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="WINDREAM_SEARCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN1" ColumnName="SEARCH_PATTERN1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN1" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN2" ColumnName="SEARCH_PATTERN2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORM_ID" ColumnName="FORM_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LEVEL1_SELECT" ColumnName="LEVEL1_SELECT" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LEVEL1_SELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LEVEL1_SELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_SELECT_EBENE1" ColumnName="SQL_SELECT_EBENE1" DataSourceName="" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE1" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_SELECT_EBENE2" ColumnName="SQL_SELECT_EBENE2" DataSourceName="" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE2" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME1" ColumnName="COLUMN_NAME1" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME2" ColumnName="COLUMN_NAME2" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="WINDREAM_SEARCH" ColumnName="WINDREAM_SEARCH" DataSourceName="" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@WINDREAM_SEARCH" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="WINDREAM_SEARCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN1" ColumnName="SEARCH_PATTERN1" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN1" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN2" ColumnName="SEARCH_PATTERN2" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>SELECT        GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, 
-                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5
+                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW
 FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL
 WHERE        (GUID = @ID)</CommandText>
                    <Parameters>
@@ -2502,8 +2502,8 @@ WHERE        (GUID = @ID)</CommandText>
 SET                CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = @PARENT_ID, LEVEL1_SELECT = @LEVEL1_SELECT, SEQUENCE = @SEQUENCE, 
                         SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, 
                         COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, 
-                         SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5
-WHERE        (GUID = @Original_GUID); 
+                         SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, SQL_QUICK_VIEW =
+WHERE        (GUID = @Original_GUID);  
 SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2522,6 +2522,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_DIRECT" ColumnName="LOAD_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_DIRECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_DIRECT" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@@ -2550,12 +2551,18 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE
              <Mapping SourceColumn="SEARCH_PATTERN3" DataSetColumn="SEARCH_PATTERN3" />
              <Mapping SourceColumn="SEARCH_PATTERN4" DataSetColumn="SEARCH_PATTERN4" />
              <Mapping SourceColumn="SEARCH_PATTERN5" DataSetColumn="SEARCH_PATTERN5" />
+              <Mapping SourceColumn="LOAD_DIRECT" DataSetColumn="LOAD_DIRECT" />
+              <Mapping SourceColumn="SQL_QUICK_VIEW" DataSetColumn="SQL_QUICK_VIEW" />
            </Mappings>
            <Sources>
              <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByID" GeneratorSourceName="FillByID" GetMethodModifier="Public" GetMethodName="GetDataByID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByID" UserSourceName="FillByID">
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @ID)</CommandText>
+                    <CommandText>SELECT        ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, 
+                         SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH, LOAD_DIRECT, 
+                         SQL_QUICK_VIEW
+FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL
+WHERE        (GUID = @ID)</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="ID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
@@ -2842,7 +2849,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -2883,7 +2890,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -2961,7 +2968,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3056,7 +3063,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3079,7 +3086,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3124,7 +3131,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3162,7 +3169,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3197,7 +3204,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" 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" />
@@ -3234,7 +3241,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3255,7 +3262,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3292,7 +3299,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBPMO_WORKFLOW_FORM" msprop:Generator_TableClassName="TBPMO_WORKFLOW_FORMDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_FORM" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_FORMRowChanged" msprop:Generator_TablePropName="TBPMO_WORKFLOW_FORM" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_FORMRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_FORMRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_FORMRowDeleted" msprop:Generator_RowClassName="TBPMO_WORKFLOW_FORMRow" msprop:Generator_UserTableName="TBPMO_WORKFLOW_FORM" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_FORMRowChangeEvent">
+        <xs:element name="TBPMO_WORKFLOW_FORM" msprop:Generator_TableClassName="TBPMO_WORKFLOW_FORMDataTable" msprop:Generator_TableVarName="tableTBPMO_WORKFLOW_FORM" msprop:Generator_TablePropName="TBPMO_WORKFLOW_FORM" msprop:Generator_RowDeletingName="TBPMO_WORKFLOW_FORMRowDeleting" msprop:Generator_RowChangingName="TBPMO_WORKFLOW_FORMRowChanging" msprop:Generator_RowEvHandlerName="TBPMO_WORKFLOW_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPMO_WORKFLOW_FORMRowDeleted" msprop:Generator_UserTableName="TBPMO_WORKFLOW_FORM" msprop:Generator_RowChangedName="TBPMO_WORKFLOW_FORMRowChanged" msprop:Generator_RowEvArgName="TBPMO_WORKFLOW_FORMRowChangeEvent" msprop:Generator_RowClassName="TBPMO_WORKFLOW_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" />
@@ -3318,7 +3325,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="VWPMO_WF_USER_ACTIVE" msprop:Generator_TableClassName="VWPMO_WF_USER_ACTIVEDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_USER_ACTIVE" msprop:Generator_RowChangedName="VWPMO_WF_USER_ACTIVERowChanged" msprop:Generator_TablePropName="VWPMO_WF_USER_ACTIVE" msprop:Generator_RowDeletingName="VWPMO_WF_USER_ACTIVERowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_USER_ACTIVERowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_USER_ACTIVERowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_USER_ACTIVERowDeleted" msprop:Generator_RowClassName="VWPMO_WF_USER_ACTIVERow" msprop:Generator_UserTableName="VWPMO_WF_USER_ACTIVE" msprop:Generator_RowEvArgName="VWPMO_WF_USER_ACTIVERowChangeEvent">
+        <xs:element name="VWPMO_WF_USER_ACTIVE" msprop:Generator_TableClassName="VWPMO_WF_USER_ACTIVEDataTable" msprop:Generator_TableVarName="tableVWPMO_WF_USER_ACTIVE" msprop:Generator_TablePropName="VWPMO_WF_USER_ACTIVE" msprop:Generator_RowDeletingName="VWPMO_WF_USER_ACTIVERowDeleting" msprop:Generator_RowChangingName="VWPMO_WF_USER_ACTIVERowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WF_USER_ACTIVERowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WF_USER_ACTIVERowDeleted" msprop:Generator_UserTableName="VWPMO_WF_USER_ACTIVE" msprop:Generator_RowChangedName="VWPMO_WF_USER_ACTIVERowChanged" msprop:Generator_RowEvArgName="VWPMO_WF_USER_ACTIVERowChangeEvent" msprop:Generator_RowClassName="VWPMO_WF_USER_ACTIVERow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="WF_TASK_ID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" 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" />
@@ -3359,7 +3366,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="VWPMO_FOLLOWING_TASKS" msprop:Generator_TableClassName="VWPMO_FOLLOWING_TASKSDataTable" msprop:Generator_TableVarName="tableVWPMO_FOLLOWING_TASKS" msprop:Generator_RowChangedName="VWPMO_FOLLOWING_TASKSRowChanged" msprop:Generator_TablePropName="VWPMO_FOLLOWING_TASKS" msprop:Generator_RowDeletingName="VWPMO_FOLLOWING_TASKSRowDeleting" msprop:Generator_RowChangingName="VWPMO_FOLLOWING_TASKSRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_FOLLOWING_TASKSRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_FOLLOWING_TASKSRowDeleted" msprop:Generator_RowClassName="VWPMO_FOLLOWING_TASKSRow" msprop:Generator_UserTableName="VWPMO_FOLLOWING_TASKS" msprop:Generator_RowEvArgName="VWPMO_FOLLOWING_TASKSRowChangeEvent">
+        <xs:element name="VWPMO_FOLLOWING_TASKS" msprop:Generator_TableClassName="VWPMO_FOLLOWING_TASKSDataTable" msprop:Generator_TableVarName="tableVWPMO_FOLLOWING_TASKS" msprop:Generator_TablePropName="VWPMO_FOLLOWING_TASKS" msprop:Generator_RowDeletingName="VWPMO_FOLLOWING_TASKSRowDeleting" msprop:Generator_RowChangingName="VWPMO_FOLLOWING_TASKSRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_FOLLOWING_TASKSRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_FOLLOWING_TASKSRowDeleted" msprop:Generator_UserTableName="VWPMO_FOLLOWING_TASKS" msprop:Generator_RowChangedName="VWPMO_FOLLOWING_TASKSRowChanged" msprop:Generator_RowEvArgName="VWPMO_FOLLOWING_TASKSRowChangeEvent" msprop:Generator_RowClassName="VWPMO_FOLLOWING_TASKSRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="JOB" msprop:Generator_ColumnVarNameInTable="columnJOB" msprop:Generator_ColumnPropNameInRow="JOB" msprop:Generator_ColumnPropNameInTable="JOBColumn" msprop:Generator_UserColumnName="JOB" minOccurs="0">
@@ -3406,7 +3413,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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">
@@ -3451,7 +3458,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3518,7 +3525,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3555,7 +3562,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3610,7 +3617,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3649,7 +3656,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3773,7 +3780,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3835,7 +3842,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3865,7 +3872,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3895,7 +3902,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3932,7 +3939,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -3957,7 +3964,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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">
@@ -3977,7 +3984,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4016,7 +4023,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4060,7 +4067,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4090,7 +4097,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="VWPMO_WORKFLOW_FORM" msprop:Generator_TableClassName="VWPMO_WORKFLOW_FORMDataTable" msprop:Generator_TableVarName="tableVWPMO_WORKFLOW_FORM" msprop:Generator_RowChangedName="VWPMO_WORKFLOW_FORMRowChanged" msprop:Generator_TablePropName="VWPMO_WORKFLOW_FORM" msprop:Generator_RowDeletingName="VWPMO_WORKFLOW_FORMRowDeleting" msprop:Generator_RowChangingName="VWPMO_WORKFLOW_FORMRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WORKFLOW_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WORKFLOW_FORMRowDeleted" msprop:Generator_RowClassName="VWPMO_WORKFLOW_FORMRow" msprop:Generator_UserTableName="VWPMO_WORKFLOW_FORM" msprop:Generator_RowEvArgName="VWPMO_WORKFLOW_FORMRowChangeEvent">
+        <xs:element name="VWPMO_WORKFLOW_FORM" msprop:Generator_TableClassName="VWPMO_WORKFLOW_FORMDataTable" msprop:Generator_TableVarName="tableVWPMO_WORKFLOW_FORM" msprop:Generator_TablePropName="VWPMO_WORKFLOW_FORM" msprop:Generator_RowDeletingName="VWPMO_WORKFLOW_FORMRowDeleting" msprop:Generator_RowChangingName="VWPMO_WORKFLOW_FORMRowChanging" msprop:Generator_RowEvHandlerName="VWPMO_WORKFLOW_FORMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPMO_WORKFLOW_FORMRowDeleted" msprop:Generator_UserTableName="VWPMO_WORKFLOW_FORM" msprop:Generator_RowChangedName="VWPMO_WORKFLOW_FORMRowChanged" msprop:Generator_RowEvArgName="VWPMO_WORKFLOW_FORMRowChangeEvent" msprop:Generator_RowClassName="VWPMO_WORKFLOW_FORMRow">
          <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" />
@@ -4137,7 +4144,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4291,7 +4298,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4316,7 +4323,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4351,7 +4358,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4380,7 +4387,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4435,7 +4442,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4494,7 +4501,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4567,7 +4574,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4662,10 +4669,18 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
+              <xs:element name="LOAD_DIRECT" msprop:Generator_ColumnVarNameInTable="columnLOAD_DIRECT" msprop:Generator_ColumnPropNameInRow="LOAD_DIRECT" msprop:Generator_ColumnPropNameInTable="LOAD_DIRECTColumn" msprop:Generator_UserColumnName="LOAD_DIRECT" type="xs:boolean" />
+              <xs:element name="SQL_QUICK_VIEW" msprop:Generator_ColumnVarNameInTable="columnSQL_QUICK_VIEW" msprop:Generator_ColumnPropNameInRow="SQL_QUICK_VIEW" msprop:Generator_ColumnPropNameInTable="SQL_QUICK_VIEWColumn" msprop:Generator_UserColumnName="SQL_QUICK_VIEW">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
            </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" />
@@ -4759,7 +4774,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4798,7 +4813,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4816,7 +4831,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -4862,7 +4877,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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" />
@@ -5029,27 +5044,27 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</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_WORKFLOW_FORM_FV_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_WORKFLOW_FORM" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_WORKFLOW_FORM" msprop:Generator_ChildPropName="GetTBPMO_WORKFLOW_FORMRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_FORM_FV_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_FORM_FV_ID" msprop:Generator_UserParentTable="TBPMO_FORM" msprop:Generator_ParentPropName="TBPMO_FORMRow" />
-      <msdata:Relationship name="FK_TTBPMO_WORKFLOW_FORM_WF_ID" msdata:parent="TBPMO_WORKFLOW" msdata:child="TBPMO_WORKFLOW_FORM" msdata:parentkey="GUID" msdata:childkey="WF_ID" msprop:Generator_UserChildTable="TBPMO_WORKFLOW_FORM" msprop:Generator_ChildPropName="GetTBPMO_WORKFLOW_FORMRows" msprop:Generator_UserRelationName="FK_TTBPMO_WORKFLOW_FORM_WF_ID" msprop:Generator_RelationVarName="relationFK_TTBPMO_WORKFLOW_FORM_WF_ID" msprop:Generator_UserParentTable="TBPMO_WORKFLOW" msprop:Generator_ParentPropName="TBPMO_WORKFLOWRow" />
-      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_RECORD_ID" msdata:parent="TBPMO_RECORD" msdata:child="VWPMO_WF_USER_ACTIVE" msdata:parentkey="GUID" msdata:childkey="RECORD_ID" msprop:Generator_UserChildTable="VWPMO_WF_USER_ACTIVE" msprop:Generator_ChildPropName="GetVWPMO_WF_USER_ACTIVERows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_RECORD_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID" msprop:Generator_UserParentTable="TBPMO_RECORD" msprop:Generator_ParentPropName="TBPMO_RECORDRow" />
-      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_STATE_ID" msdata:parent="TBPMO_WORKFLOW_TASK_STATE" msdata:child="VWPMO_WF_USER_ACTIVE" msdata:parentkey="GUID" msdata:childkey="STATE_ID" msprop:Generator_UserChildTable="VWPMO_WF_USER_ACTIVE" msprop:Generator_ChildPropName="GetVWPMO_WF_USER_ACTIVERows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_STATE_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_STATE_ID" msprop:Generator_UserParentTable="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_ParentPropName="TBPMO_WORKFLOW_TASK_STATERow" />
-      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msdata:parent="TBPMO_RECORD" msdata:child="VWPMO_FOLLOWING_TASKS" msdata:parentkey="GUID" msdata:childkey="RECORD_ID" msprop:Generator_UserChildTable="VWPMO_FOLLOWING_TASKS" msprop:Generator_ChildPropName="GetVWPMO_FOLLOWING_TASKSRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msprop:Generator_UserParentTable="TBPMO_RECORD" msprop:Generator_ParentPropName="TBPMO_RECORDRow" />
-      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_STATE_ID1" msdata:parent="TBPMO_WORKFLOW_TASK_STATE" msdata:child="VWPMO_FOLLOWING_TASKS" msdata:parentkey="GUID" msdata:childkey="STATE_ID" msprop:Generator_UserChildTable="VWPMO_FOLLOWING_TASKS" msprop:Generator_ChildPropName="GetVWPMO_FOLLOWING_TASKSRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_STATE_ID1" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_STATE_ID1" msprop:Generator_UserParentTable="TBPMO_WORKFLOW_TASK_STATE" msprop:Generator_ParentPropName="TBPMO_WORKFLOW_TASK_STATERow" />
-      <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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_TBPMO_WORKFLOW_FORM_FV_ID" msdata:parent="TBPMO_FORM" msdata:child="TBPMO_WORKFLOW_FORM" msdata:parentkey="GUID" msdata:childkey="FORM_ID" msprop:Generator_UserChildTable="TBPMO_WORKFLOW_FORM" msprop:Generator_ChildPropName="GetTBPMO_WORKFLOW_FORMRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_FORM_FV_ID" msprop:Generator_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_FORM_FV_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
+      <msdata:Relationship name="FK_TTBPMO_WORKFLOW_FORM_WF_ID" msdata:parent="TBPMO_WORKFLOW" msdata:child="TBPMO_WORKFLOW_FORM" msdata:parentkey="GUID" msdata:childkey="WF_ID" msprop:Generator_UserChildTable="TBPMO_WORKFLOW_FORM" msprop:Generator_ChildPropName="GetTBPMO_WORKFLOW_FORMRows" msprop:Generator_UserRelationName="FK_TTBPMO_WORKFLOW_FORM_WF_ID" msprop:Generator_ParentPropName="TBPMO_WORKFLOWRow" msprop:Generator_RelationVarName="relationFK_TTBPMO_WORKFLOW_FORM_WF_ID" msprop:Generator_UserParentTable="TBPMO_WORKFLOW" />
+      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_RECORD_ID" msdata:parent="TBPMO_RECORD" msdata:child="VWPMO_WF_USER_ACTIVE" msdata:parentkey="GUID" msdata:childkey="RECORD_ID" msprop:Generator_UserChildTable="VWPMO_WF_USER_ACTIVE" msprop:Generator_ChildPropName="GetVWPMO_WF_USER_ACTIVERows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_RECORD_ID" msprop:Generator_ParentPropName="TBPMO_RECORDRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID" msprop:Generator_UserParentTable="TBPMO_RECORD" />
+      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_STATE_ID" msdata:parent="TBPMO_WORKFLOW_TASK_STATE" msdata:child="VWPMO_WF_USER_ACTIVE" msdata:parentkey="GUID" msdata:childkey="STATE_ID" msprop:Generator_UserChildTable="VWPMO_WF_USER_ACTIVE" msprop:Generator_ChildPropName="GetVWPMO_WF_USER_ACTIVERows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_STATE_ID" msprop:Generator_ParentPropName="TBPMO_WORKFLOW_TASK_STATERow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_STATE_ID" msprop:Generator_UserParentTable="TBPMO_WORKFLOW_TASK_STATE" />
+      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msdata:parent="TBPMO_RECORD" msdata:child="VWPMO_FOLLOWING_TASKS" msdata:parentkey="GUID" msdata:childkey="RECORD_ID" msprop:Generator_UserChildTable="VWPMO_FOLLOWING_TASKS" msprop:Generator_ChildPropName="GetVWPMO_FOLLOWING_TASKSRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msprop:Generator_ParentPropName="TBPMO_RECORDRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msprop:Generator_UserParentTable="TBPMO_RECORD" />
+      <msdata:Relationship name="FK_TBPMO_WORKFLOW_TASK_STATE_ID1" msdata:parent="TBPMO_WORKFLOW_TASK_STATE" msdata:child="VWPMO_FOLLOWING_TASKS" msdata:parentkey="GUID" msdata:childkey="STATE_ID" msprop:Generator_UserChildTable="VWPMO_FOLLOWING_TASKS" msprop:Generator_ChildPropName="GetVWPMO_FOLLOWING_TASKSRows" msprop:Generator_UserRelationName="FK_TBPMO_WORKFLOW_TASK_STATE_ID1" msprop:Generator_ParentPropName="TBPMO_WORKFLOW_TASK_STATERow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_STATE_ID1" msprop:Generator_UserParentTable="TBPMO_WORKFLOW_TASK_STATE" />
+      <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_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_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_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_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_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_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_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_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_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_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_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_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_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" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xss
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss
@@ -4,7 +4,7 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="589" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:TBPMO_FORM" ZOrder="45" X="70" Y="70" Height="286" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
    <Shape ID="DesignTable:VWPMO_CONTROL_SCREEN" ZOrder="27" X="78" Y="352" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -17,12 +17,12 @@
    <Shape ID="DesignTable:VWPMO_GUI_ENTITY" ZOrder="22" X="395" Y="443" Height="134" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW" ZOrder="56" X="192" Y="678" Height="210" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW_FORM" ZOrder="57" X="137" Y="932" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:VWPMO_WF_USER_ACTIVE" ZOrder="10" X="1878" Y="564" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWPMO_FOLLOWING_TASKS" ZOrder="12" X="1820" Y="45" Height="192" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VWPMO_WF_USER_ACTIVE" ZOrder="12" X="1878" Y="564" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWPMO_FOLLOWING_TASKS" ZOrder="14" X="1820" Y="45" Height="192" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
    <Shape ID="DesignTable:VWPMO_WF_OVERVIEW_AUTHORITY" ZOrder="24" X="877" Y="44" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:TBDD_DOKUMENTART" ZOrder="40" X="1349" Y="450" Height="344" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBDD_EINGANGSARTEN" ZOrder="51" X="1701" Y="652" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBDD_INDEX_AUTOM" ZOrder="13" X="1687" Y="332" Height="282" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="192" />
+    <Shape ID="DesignTable:TBDD_INDEX_AUTOM" ZOrder="15" X="1687" Y="332" Height="282" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="192" />
    <Shape ID="DesignTable:TBPMO_WD_FORMVIEW_DOKTYPES" ZOrder="50" X="427" Y="-11" Height="287" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_KONFIGURATION" ZOrder="46" X="1644" Y="247" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
    <Shape ID="DesignTable:TBDD_USER" ZOrder="41" X="1632" Y="12" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
@@ -31,23 +31,23 @@
    <Shape ID="DesignTable:VWPMO_USERS_GROUPS" ZOrder="38" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="37" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
    <Shape ID="DesignTable:TBWH_DOKART_MODULE" ZOrder="36" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="15" X="1185" Y="-27" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="2" X="1185" Y="-27" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_WD_OBJECTTYPE" ZOrder="33" X="-1" Y="1" Height="229" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
    <Shape ID="DesignTable:TBPMO_FILES_USER" ZOrder="32" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:VWPMO_WORKFLOW_FORM" ZOrder="11" X="1853" Y="319" Height="229" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:VWPMO_WORKFLOW_FORM" ZOrder="13" X="1853" Y="319" Height="229" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
    <Shape ID="DesignTable:TBPMO_FOLLOW_UP_EMAIL" ZOrder="29" X="997" Y="587" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="39" />
    <Shape ID="DesignTable:TBPMO_FOLLUPEMAIL_USER" ZOrder="31" X="59" Y="77" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
    <Shape ID="DesignTable:TBPMO_RECORD_LOG_CONFIG" ZOrder="23" X="1128" Y="408" Height="300" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="232" />
    <Shape ID="DesignTable:VWPMO_RECORD_CHANGES" ZOrder="28" X="1673" Y="790" Height="173" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:VWPMO_WF_ACTIVE" ZOrder="16" X="525" Y="19" Height="381" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="294" />
+    <Shape ID="DesignTable:VWPMO_WF_ACTIVE" ZOrder="17" X="525" Y="19" Height="381" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="294" />
    <Shape ID="DesignTable:TBDD_EMAIL_ACCOUNT" ZOrder="21" X="844" Y="42" Height="286" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="20" X="462" Y="673" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="19" X="1246" Y="352" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="14" X="1300" Y="812" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE" ZOrder="9" X="2444" Y="43" Height="229" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE_ENTITY" ZOrder="8" X="2068" Y="300" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE_PATTERN" ZOrder="5" X="2348" Y="521" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBTEMP_QUICKDISPLAY" ZOrder="3" X="2117" Y="51" Height="115" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="1" X="1246" Y="352" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="16" X="1300" Y="812" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE" ZOrder="11" X="2444" Y="43" Height="229" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE_ENTITY" ZOrder="10" X="2068" Y="300" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE_PATTERN" ZOrder="7" X="2348" Y="521" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBTEMP_QUICKDISPLAY" ZOrder="5" X="2117" Y="51" Height="115" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_TBPMO_FORM_VIEW_FORM_ID" ZOrder="63" LineWidth="11">
@@ -254,7 +254,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="19" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>1358</X>
@@ -266,7 +266,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="17" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="18" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>282</X>
@@ -282,7 +282,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="7" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="9" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>299</X>
@@ -294,7 +294,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="6" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="8" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2461</X>
@@ -310,7 +310,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" ZOrder="4" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" ZOrder="6" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2358</X>
@@ -322,7 +322,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" ZOrder="2" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" ZOrder="4" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2134</X>
@@ -338,7 +338,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="1" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="3" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2142</X>
--- a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb
+++ b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb
@@ -841,6 +841,10 @@ Partial Public Class DD_ECMAdmin

        Private columnSEARCH_PATTERN5 As Global.System.Data.DataColumn

+        Private columnLOAD_DIRECT As Global.System.Data.DataColumn
+
+        Private columnSQL_QUICK_VIEW As Global.System.Data.DataColumn
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Sub New()
@@ -1036,6 +1040,22 @@ Partial Public Class DD_ECMAdmin
            End Get
        End Property

+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public ReadOnly Property LOAD_DIRECTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnLOAD_DIRECT
+            End Get
+        End Property
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public ReadOnly Property SQL_QUICK_VIEWColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnSQL_QUICK_VIEW
+            End Get
+        End Property
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
         Global.System.ComponentModel.Browsable(False)> _
@@ -1092,9 +1112,11 @@ Partial Public Class DD_ECMAdmin
                    ByVal SEARCH_PATTERN2 As String, _
                    ByVal SEARCH_PATTERN3 As String, _
                    ByVal SEARCH_PATTERN4 As String, _
-                    ByVal SEARCH_PATTERN5 As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
+                    ByVal SEARCH_PATTERN5 As String, _
+                    ByVal LOAD_DIRECT As Boolean, _
+                    ByVal SQL_QUICK_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
            Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow, TBPMO_FORM_CONSTRUCTOR_DETAILRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW}
            If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then
                columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0)
            End If
@@ -1146,6 +1168,8 @@ Partial Public Class DD_ECMAdmin
            Me.columnSEARCH_PATTERN3 = MyBase.Columns("SEARCH_PATTERN3")
            Me.columnSEARCH_PATTERN4 = MyBase.Columns("SEARCH_PATTERN4")
            Me.columnSEARCH_PATTERN5 = MyBase.Columns("SEARCH_PATTERN5")
+            Me.columnLOAD_DIRECT = MyBase.Columns("LOAD_DIRECT")
+            Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW")
        End Sub

        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -1191,6 +1215,10 @@ Partial Public Class DD_ECMAdmin
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN4)
            Me.columnSEARCH_PATTERN5 = New Global.System.Data.DataColumn("SEARCH_PATTERN5", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN5)
+            Me.columnLOAD_DIRECT = New Global.System.Data.DataColumn("LOAD_DIRECT", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnLOAD_DIRECT)
+            Me.columnSQL_QUICK_VIEW = New Global.System.Data.DataColumn("SQL_QUICK_VIEW", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnSQL_QUICK_VIEW)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, True))
            Me.columnGUID.AutoIncrement = True
            Me.columnGUID.AllowDBNull = False
@@ -1205,6 +1233,7 @@ Partial Public Class DD_ECMAdmin
            Me.columnSQL_SELECT_EBENE2.AllowDBNull = False
            Me.columnSQL_SELECT_EBENE2.MaxLength = 4000
            Me.columnADDED_WHO.MaxLength = 50
+            Me.columnADDED_WHEN.AllowDBNull = False
            Me.columnCHANGED_WHO.MaxLength = 50
            Me.columnCOLUMN_NAME1.AllowDBNull = False
            Me.columnCOLUMN_NAME1.MaxLength = 100
@@ -1216,6 +1245,9 @@ Partial Public Class DD_ECMAdmin
            Me.columnSEARCH_PATTERN3.MaxLength = 50
            Me.columnSEARCH_PATTERN4.MaxLength = 50
            Me.columnSEARCH_PATTERN5.MaxLength = 50
+            Me.columnLOAD_DIRECT.AllowDBNull = False
+            Me.columnSQL_QUICK_VIEW.AllowDBNull = False
+            Me.columnSQL_QUICK_VIEW.MaxLength = 2147483647
        End Sub

        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -2701,12 +2733,7 @@ Partial Public Class DD_ECMAdmin
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Property ADDED_WHEN() As Date
            Get
-                Try
-                    Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn), Date)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPMO_FORM_CONSTRUCTOR_DETAIL ist DBNul" & _
-                            "l.", e)
-                End Try
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn), Date)
            End Get
            Set(value As Date)
                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = value
@@ -2863,6 +2890,28 @@ Partial Public Class DD_ECMAdmin
            End Set
        End Property

+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public Property LOAD_DIRECT() As Boolean
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn), Boolean)
+            End Get
+            Set(value As Boolean)
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn) = value
+            End Set
+        End Property
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public Property SQL_QUICK_VIEW() As String
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn), String)
+            End Get
+            Set(value As String)
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn) = value
+            End Set
+        End Property
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow
@@ -2898,18 +2947,6 @@ Partial Public Class DD_ECMAdmin
            Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHOColumn) = Global.System.Convert.DBNull
        End Sub

-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
-        Public Function IsADDED_WHENNull() As Boolean
-            Return Me.IsNull(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn)
-        End Function
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
-        Public Sub SetADDED_WHENNull()
-            Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = Global.System.Convert.DBNull
-        End Sub
-
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Function IsCHANGED_WHONull() As Boolean
@@ -4184,6 +4221,8 @@ Namespace DD_ECMAdminTableAdapters
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN3", "SEARCH_PATTERN3")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN4", "SEARCH_PATTERN4")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN5", "SEARCH_PATTERN5")
+            tableMapping.ColumnMappings.Add("LOAD_DIRECT", "LOAD_DIRECT")
+            tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -4231,11 +4270,12 @@ Namespace DD_ECMAdminTableAdapters
                "LUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTER" & _
                "N1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                         SEARCH_PATTER" & _
                "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE" & _
-                "ARCH_PATTERN5" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID" & _
-                ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE" & _
-                "NE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME" & _
-                "2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PA" & _
-                "TTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)"
+                "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (GUID = @Original_GUID);" & _
+                "  " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_" & _
+                "SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH" & _
+                "EN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN" & _
+                "2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR" & _
+                "_DETAIL WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
@@ -4253,6 +4293,7 @@ Namespace DD_ECMAdminTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN3", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN3", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN4", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN4", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
        End Sub
@@ -4270,8 +4311,12 @@ Namespace DD_ECMAdminTableAdapters
            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
            Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        TBPMO_FORM_CONSTRUCTOR_DETAIL.*" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM            TBPMO_FORM_CONSTRU" & _
-                "CTOR_DETAIL where GUID = @ID"
+            Me._commandCollection(0).CommandText = "SELECT        GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQ" & _
+                "L_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_" & _
+                "WHEN, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE" & _
+                "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN" & _
+                "5, LOAD_DIRECT, SQL_QUICK_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "W" & _
+                "HERE        (GUID = @ID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
        End Sub
@@ -4468,6 +4513,7 @@ Namespace DD_ECMAdminTableAdapters
                    ByVal SEARCH_PATTERN3 As String, _
                    ByVal SEARCH_PATTERN4 As String, _
                    ByVal SEARCH_PATTERN5 As String, _
+                    ByVal LOAD_DIRECT As Boolean, _
                    ByVal Original_GUID As Integer, _
                    ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer)
@@ -4530,8 +4576,9 @@ Namespace DD_ECMAdminTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SEARCH_PATTERN5, String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID, Integer)
-            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(LOAD_DIRECT, Boolean)
+            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(18).Value = CType(GUID, Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
                        <> Global.System.Data.ConnectionState.Open) Then
--- a/app/DD-Record-Organiser/DD_ECMAdmin.xsc
+++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsc
@@ -9,39 +9,53 @@
    <TableUISetting Name="TBPMO_FORM_CONSTRUCTOR_DETAIL">
      <ColumnUISettings>
        <ColumnUISetting Name="ADDED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="CHANGED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="COLUMN_NAME1">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="SEARCH_PATTERN1">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="SEARCH_PATTERN2">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="SEARCH_PATTERN3">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
        <ColumnUISetting Name="SEARCH_PATTERN4">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
+            </ControlSetting>
+          </ControlSettings>
        </ColumnUISetting>
      </ColumnUISettings>
    </TableUISetting>
--- a/app/DD-Record-Organiser/DD_ECMAdmin.xsd
+++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsd
@@ -77,45 +77,47 @@ SELECT GUID, FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHAN
            <MainSource>
              <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>DELETE FROM TBPMO_FORM_CONSTRUCTOR_DETAIL
 WHERE        (GUID = @Original_GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL
                         (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, 
                         SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5)
 VALUES        (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5); 
 SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="FORM_ID" ColumnName="FORM_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LEVEL1_SELECT" ColumnName="LEVEL1_SELECT" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LEVEL1_SELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LEVEL1_SELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_SELECT_EBENE1" ColumnName="SQL_SELECT_EBENE1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE1" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_SELECT_EBENE2" ColumnName="SQL_SELECT_EBENE2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE2" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME1" ColumnName="COLUMN_NAME1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME2" ColumnName="COLUMN_NAME2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WINDREAM_SEARCH" ColumnName="WINDREAM_SEARCH" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@WINDREAM_SEARCH" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="WINDREAM_SEARCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN1" ColumnName="SEARCH_PATTERN1" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN1" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN2" ColumnName="SEARCH_PATTERN2" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FORM_ID" ColumnName="FORM_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LEVEL1_SELECT" ColumnName="LEVEL1_SELECT" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LEVEL1_SELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LEVEL1_SELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_SELECT_EBENE1" ColumnName="SQL_SELECT_EBENE1" DataSourceName="" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE1" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_SELECT_EBENE2" ColumnName="SQL_SELECT_EBENE2" DataSourceName="" DataTypeServer="varchar(4000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_SELECT_EBENE2" Precision="0" ProviderType="VarChar" Scale="0" Size="4000" SourceColumn="SQL_SELECT_EBENE2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME1" ColumnName="COLUMN_NAME1" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMN_NAME2" ColumnName="COLUMN_NAME2" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@COLUMN_NAME2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="COLUMN_NAME2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="WINDREAM_SEARCH" ColumnName="WINDREAM_SEARCH" DataSourceName="" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@WINDREAM_SEARCH" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="WINDREAM_SEARCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN1" ColumnName="SEARCH_PATTERN1" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN1" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN2" ColumnName="SEARCH_PATTERN2" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBPMO_FORM_CONSTRUCTOR_DETAIL.*
-FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL where GUID = @ID</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT        GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, 
+                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW
+FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL
+WHERE        (GUID = @ID)</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="ID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
@@ -127,8 +129,8 @@ FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL where GUID = @ID</CommandText>
 SET                CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = @PARENT_ID, LEVEL1_SELECT = @LEVEL1_SELECT, SEQUENCE = @SEQUENCE, 
                         SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, 
                         COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, 
-                         SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5
-WHERE        (GUID = @Original_GUID); 
+                         SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT
+WHERE        (GUID = @Original_GUID);  
 SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCT_ID" ColumnName="CONSTRUCT_ID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -147,6 +149,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN3" ColumnName="SEARCH_PATTERN3" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN3" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN3" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN4" ColumnName="SEARCH_PATTERN4" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN4" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN4" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEARCH_PATTERN5" ColumnName="SEARCH_PATTERN5" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@SEARCH_PATTERN5" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SEARCH_PATTERN5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_DIRECT" ColumnName="LOAD_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_DIRECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_DIRECT" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FORM_CONSTRUCTOR_DETAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@@ -175,6 +178,8 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE
              <Mapping SourceColumn="SEARCH_PATTERN3" DataSetColumn="SEARCH_PATTERN3" />
              <Mapping SourceColumn="SEARCH_PATTERN4" DataSetColumn="SEARCH_PATTERN4" />
              <Mapping SourceColumn="SEARCH_PATTERN5" DataSetColumn="SEARCH_PATTERN5" />
+              <Mapping SourceColumn="LOAD_DIRECT" DataSetColumn="LOAD_DIRECT" />
+              <Mapping SourceColumn="SQL_QUICK_VIEW" DataSetColumn="SQL_QUICK_VIEW" />
            </Mappings>
            <Sources />
          </TableAdapter>
@@ -286,7 +291,7 @@ FROM            VWTEMPQUICKVIEW</CommandText>
  <xs:element name="DD_ECMAdmin" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DD_ECMAdmin" msprop:Generator_UserDSName="DD_ECMAdmin">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPMO_FORM_CONSTRUCTOR" msprop:Generator_TableClassName="TBPMO_FORM_CONSTRUCTORDataTable" msprop:Generator_TableVarName="tableTBPMO_FORM_CONSTRUCTOR" msprop:Generator_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: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: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" />
@@ -325,7 +330,7 @@ FROM            VWTEMPQUICKVIEW</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_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: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: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" />
@@ -355,7 +360,7 @@ FROM            VWTEMPQUICKVIEW</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" />
              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
@@ -420,10 +425,18 @@ FROM            VWTEMPQUICKVIEW</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
+              <xs:element name="LOAD_DIRECT" msprop:Generator_ColumnVarNameInTable="columnLOAD_DIRECT" msprop:Generator_ColumnPropNameInRow="LOAD_DIRECT" msprop:Generator_ColumnPropNameInTable="LOAD_DIRECTColumn" msprop:Generator_UserColumnName="LOAD_DIRECT" type="xs:boolean" />
+              <xs:element name="SQL_QUICK_VIEW" msprop:Generator_ColumnVarNameInTable="columnSQL_QUICK_VIEW" msprop:Generator_ColumnPropNameInRow="SQL_QUICK_VIEW" msprop:Generator_ColumnPropNameInTable="SQL_QUICK_VIEWColumn" msprop:Generator_UserColumnName="SQL_QUICK_VIEW">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <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: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:complexType>
            <xs:sequence>
              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -496,14 +509,14 @@ FROM            VWTEMPQUICKVIEW</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="DT_VORSCHAU" msprop:Generator_TableClassName="DT_VORSCHAUDataTable" msprop:Generator_TableVarName="tableDT_VORSCHAU" msprop:Generator_RowChangedName="DT_VORSCHAURowChanged" msprop:Generator_TablePropName="DT_VORSCHAU" msprop:Generator_RowDeletingName="DT_VORSCHAURowDeleting" msprop:Generator_RowChangingName="DT_VORSCHAURowChanging" msprop:Generator_RowEvHandlerName="DT_VORSCHAURowChangeEventHandler" msprop:Generator_RowDeletedName="DT_VORSCHAURowDeleted" msprop:Generator_RowClassName="DT_VORSCHAURow" msprop:Generator_UserTableName="DT_VORSCHAU" msprop:Generator_RowEvArgName="DT_VORSCHAURowChangeEvent">
+        <xs:element name="DT_VORSCHAU" msprop:Generator_TableClassName="DT_VORSCHAUDataTable" msprop:Generator_TableVarName="tableDT_VORSCHAU" msprop:Generator_TablePropName="DT_VORSCHAU" msprop:Generator_RowDeletingName="DT_VORSCHAURowDeleting" msprop:Generator_RowChangingName="DT_VORSCHAURowChanging" msprop:Generator_RowEvHandlerName="DT_VORSCHAURowChangeEventHandler" msprop:Generator_RowDeletedName="DT_VORSCHAURowDeleted" msprop:Generator_UserTableName="DT_VORSCHAU" msprop:Generator_RowChangedName="DT_VORSCHAURowChanged" msprop:Generator_RowEvArgName="DT_VORSCHAURowChangeEvent" msprop:Generator_RowClassName="DT_VORSCHAURow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="VALUE" msprop:Generator_ColumnVarNameInTable="columnVALUE" msprop:Generator_ColumnPropNameInRow="VALUE" msprop:Generator_ColumnPropNameInTable="VALUEColumn" msprop:Generator_UserColumnName="VALUE" type="xs:string" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="VWTEMPQUICKVIEW" msprop:Generator_TableClassName="VWTEMPQUICKVIEWDataTable" msprop:Generator_TableVarName="tableVWTEMPQUICKVIEW" msprop:Generator_TablePropName="VWTEMPQUICKVIEW" msprop:Generator_RowDeletingName="VWTEMPQUICKVIEWRowDeleting" msprop:Generator_RowChangingName="VWTEMPQUICKVIEWRowChanging" msprop:Generator_RowEvHandlerName="VWTEMPQUICKVIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="VWTEMPQUICKVIEWRowDeleted" msprop:Generator_UserTableName="VWTEMPQUICKVIEW" msprop:Generator_RowChangedName="VWTEMPQUICKVIEWRowChanged" msprop:Generator_RowEvArgName="VWTEMPQUICKVIEWRowChangeEvent" msprop:Generator_RowClassName="VWTEMPQUICKVIEWRow">
+        <xs:element name="VWTEMPQUICKVIEW" msprop:Generator_TableClassName="VWTEMPQUICKVIEWDataTable" msprop:Generator_TableVarName="tableVWTEMPQUICKVIEW" msprop:Generator_RowChangedName="VWTEMPQUICKVIEWRowChanged" msprop:Generator_TablePropName="VWTEMPQUICKVIEW" msprop:Generator_RowDeletingName="VWTEMPQUICKVIEWRowDeleting" msprop:Generator_RowChangingName="VWTEMPQUICKVIEWRowChanging" msprop:Generator_RowEvHandlerName="VWTEMPQUICKVIEWRowChangeEventHandler" msprop:Generator_RowDeletedName="VWTEMPQUICKVIEWRowDeleted" msprop:Generator_RowClassName="VWTEMPQUICKVIEWRow" msprop:Generator_UserTableName="VWTEMPQUICKVIEW" msprop:Generator_RowEvArgName="VWTEMPQUICKVIEWRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="Record-ID" msprop:Generator_ColumnVarNameInTable="_columnRecord_ID" msprop:Generator_ColumnPropNameInRow="_Record_ID" msprop:Generator_ColumnPropNameInTable="_Record_IDColumn" msprop:Generator_UserColumnName="Record-ID" type="xs:int" />
@@ -553,7 +566,7 @@ FROM            VWTEMPQUICKVIEW</CommandText>
  </xs:element>
  <xs:annotation>
    <xs:appinfo>
-      <msdata:Relationship name="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msdata:parent="TBPMO_FORM_CONSTRUCTOR" msdata:child="TBPMO_FORM_CONSTRUCTOR_DETAIL" msdata:parentkey="GUID" msdata:childkey="CONSTRUCT_ID" msprop:Generator_UserChildTable="TBPMO_FORM_CONSTRUCTOR_DETAIL" msprop:Generator_ChildPropName="GetTBPMO_FORM_CONSTRUCTOR_DETAILRows" msprop:Generator_UserRelationName="FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" msprop:Generator_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_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" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
--- a/app/DD-Record-Organiser/DD_ECMAdmin.xss
+++ b/app/DD-Record-Organiser/DD_ECMAdmin.xss
@@ -9,8 +9,8 @@
    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="6" X="45" Y="38" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="5" X="385" Y="38" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="3" X="866" Y="324" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="2" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
    <Shape ID="DesignTable:VWTEMPQUICKVIEW" ZOrder="1" X="1089" Y="129" Height="172" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="2" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="4" LineWidth="11">
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.6.1.0")> 
-<Assembly: AssemblyFileVersion("1.6.1.0")> 
+<Assembly: AssemblyVersion("1.9.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.0.0")> 
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -92,8 +92,6 @@ Partial Class frmConstructorDesigner
        Me.ADDED_WHOTextBox1 = New System.Windows.Forms.TextBox()
        Me.XtraTabPage5 = New DevExpress.XtraTab.XtraTabPage()
        Me.Button3 = New System.Windows.Forms.Button()
-        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
-        Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.lblQuickViewAdded = New System.Windows.Forms.Label()
        Me.btnSetQuickViewPicture = New System.Windows.Forms.Button()
@@ -135,6 +133,8 @@ 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.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView()
        Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
@@ -147,6 +147,7 @@ Partial Class frmConstructorDesigner
        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.components)
+        Me.LOAD_DIRECTCheckBox = New System.Windows.Forms.CheckBox()
        GUIDLabel = New System.Windows.Forms.Label()
        FORM_TITLELabel = New System.Windows.Forms.Label()
        SEQUENCE_MENULabel = New System.Windows.Forms.Label()
@@ -181,13 +182,13 @@ Partial Class frmConstructorDesigner
        Me.XtraTabControl2.SuspendLayout()
        Me.XtraTabPage3.SuspendLayout()
        Me.XtraTabPage5.SuspendLayout()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabPage4.SuspendLayout()
        Me.grpbxWD_RecordSearch.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        Me.StatusStrip1.SuspendLayout()
        Me.ToolStrip1.SuspendLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBTEMP_QUICKDISPLAYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -271,7 +272,7 @@ Partial Class frmConstructorDesigner
        GUIDLabel1.AutoSize = True
        GUIDLabel1.Location = New System.Drawing.Point(12, 11)
        GUIDLabel1.Name = "GUIDLabel1"
-        GUIDLabel1.Size = New System.Drawing.Size(21, 13)
+        GUIDLabel1.Size = New System.Drawing.Size(22, 13)
        GUIDLabel1.TabIndex = 18
        GUIDLabel1.Text = "ID:"
        '
@@ -280,7 +281,7 @@ Partial Class frmConstructorDesigner
        WINDREAM_SEARCHLabel.AutoSize = True
        WINDREAM_SEARCHLabel.Location = New System.Drawing.Point(6, 18)
        WINDREAM_SEARCHLabel.Name = "WINDREAM_SEARCHLabel"
-        WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(96, 13)
+        WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(90, 13)
        WINDREAM_SEARCHLabel.TabIndex = 34
        WINDREAM_SEARCHLabel.Text = "windream-Suche:"
        '
@@ -289,7 +290,7 @@ Partial Class frmConstructorDesigner
        ADDED_WHOLabel1.AutoSize = True
        ADDED_WHOLabel1.Location = New System.Drawing.Point(70, 183)
        ADDED_WHOLabel1.Name = "ADDED_WHOLabel1"
-        ADDED_WHOLabel1.Size = New System.Drawing.Size(67, 13)
+        ADDED_WHOLabel1.Size = New System.Drawing.Size(65, 13)
        ADDED_WHOLabel1.TabIndex = 43
        ADDED_WHOLabel1.Text = "Erstellt wer:"
        '
@@ -298,7 +299,7 @@ Partial Class frmConstructorDesigner
        ADDED_WHENLabel1.AutoSize = True
        ADDED_WHENLabel1.Location = New System.Drawing.Point(236, 183)
        ADDED_WHENLabel1.Name = "ADDED_WHENLabel1"
-        ADDED_WHENLabel1.Size = New System.Drawing.Size(77, 13)
+        ADDED_WHENLabel1.Size = New System.Drawing.Size(73, 13)
        ADDED_WHENLabel1.TabIndex = 44
        ADDED_WHENLabel1.Text = "Erstellt wann:"
        '
@@ -307,7 +308,7 @@ Partial Class frmConstructorDesigner
        CHANGED_WHOLabel1.AutoSize = True
        CHANGED_WHOLabel1.Location = New System.Drawing.Point(70, 224)
        CHANGED_WHOLabel1.Name = "CHANGED_WHOLabel1"
-        CHANGED_WHOLabel1.Size = New System.Drawing.Size(80, 13)
+        CHANGED_WHOLabel1.Size = New System.Drawing.Size(77, 13)
        CHANGED_WHOLabel1.TabIndex = 45
        CHANGED_WHOLabel1.Text = "Geändert wer:"
        '
@@ -316,7 +317,7 @@ Partial Class frmConstructorDesigner
        CHANGED_WHENLabel1.AutoSize = True
        CHANGED_WHENLabel1.Location = New System.Drawing.Point(236, 224)
        CHANGED_WHENLabel1.Name = "CHANGED_WHENLabel1"
-        CHANGED_WHENLabel1.Size = New System.Drawing.Size(90, 13)
+        CHANGED_WHENLabel1.Size = New System.Drawing.Size(85, 13)
        CHANGED_WHENLabel1.TabIndex = 46
        CHANGED_WHENLabel1.Text = "Geändert wann:"
        '
@@ -325,7 +326,7 @@ Partial Class frmConstructorDesigner
        SQL_SELECT_EBENE1Label.AutoSize = True
        SQL_SELECT_EBENE1Label.Location = New System.Drawing.Point(69, 48)
        SQL_SELECT_EBENE1Label.Name = "SQL_SELECT_EBENE1Label"
-        SQL_SELECT_EBENE1Label.Size = New System.Drawing.Size(73, 13)
+        SQL_SELECT_EBENE1Label.Size = New System.Drawing.Size(72, 13)
        SQL_SELECT_EBENE1Label.TabIndex = 34
        SQL_SELECT_EBENE1Label.Text = "SQL Ebene 1:"
        '
@@ -334,7 +335,7 @@ Partial Class frmConstructorDesigner
        SQL_SELECT_EBENE2Label.AutoSize = True
        SQL_SELECT_EBENE2Label.Location = New System.Drawing.Point(69, 91)
        SQL_SELECT_EBENE2Label.Name = "SQL_SELECT_EBENE2Label"
-        SQL_SELECT_EBENE2Label.Size = New System.Drawing.Size(73, 13)
+        SQL_SELECT_EBENE2Label.Size = New System.Drawing.Size(72, 13)
        SQL_SELECT_EBENE2Label.TabIndex = 36
        SQL_SELECT_EBENE2Label.Text = "SQL Ebene 2:"
        '
@@ -343,7 +344,7 @@ Partial Class frmConstructorDesigner
        COLUMN_NAME1Label1.AutoSize = True
        COLUMN_NAME1Label1.Location = New System.Drawing.Point(69, 133)
        COLUMN_NAME1Label1.Name = "COLUMN_NAME1Label1"
-        COLUMN_NAME1Label1.Size = New System.Drawing.Size(114, 13)
+        COLUMN_NAME1Label1.Size = New System.Drawing.Size(108, 13)
        COLUMN_NAME1Label1.TabIndex = 48
        COLUMN_NAME1Label1.Text = "Spaltenname Entität:"
        '
@@ -352,7 +353,7 @@ Partial Class frmConstructorDesigner
        SEARCH_PATTERN1Label1.AutoSize = True
        SEARCH_PATTERN1Label1.Location = New System.Drawing.Point(6, 59)
        SEARCH_PATTERN1Label1.Name = "SEARCH_PATTERN1Label1"
-        SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(93, 13)
+        SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(92, 13)
        SEARCH_PATTERN1Label1.TabIndex = 39
        SEARCH_PATTERN1Label1.Text = "Search Pattern 1:"
        '
@@ -361,7 +362,7 @@ Partial Class frmConstructorDesigner
        SEARCH_PATTERN2Label1.AutoSize = True
        SEARCH_PATTERN2Label1.Location = New System.Drawing.Point(181, 59)
        SEARCH_PATTERN2Label1.Name = "SEARCH_PATTERN2Label1"
-        SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(93, 13)
+        SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(92, 13)
        SEARCH_PATTERN2Label1.TabIndex = 40
        SEARCH_PATTERN2Label1.Text = "Search Pattern 2:"
        '
@@ -370,7 +371,7 @@ Partial Class frmConstructorDesigner
        SEARCH_PATTERN3Label.AutoSize = True
        SEARCH_PATTERN3Label.Location = New System.Drawing.Point(6, 99)
        SEARCH_PATTERN3Label.Name = "SEARCH_PATTERN3Label"
-        SEARCH_PATTERN3Label.Size = New System.Drawing.Size(93, 13)
+        SEARCH_PATTERN3Label.Size = New System.Drawing.Size(92, 13)
        SEARCH_PATTERN3Label.TabIndex = 41
        SEARCH_PATTERN3Label.Text = "Search Pattern 3:"
        '
@@ -379,7 +380,7 @@ Partial Class frmConstructorDesigner
        SEARCH_PATTERN4Label.AutoSize = True
        SEARCH_PATTERN4Label.Location = New System.Drawing.Point(181, 99)
        SEARCH_PATTERN4Label.Name = "SEARCH_PATTERN4Label"
-        SEARCH_PATTERN4Label.Size = New System.Drawing.Size(93, 13)
+        SEARCH_PATTERN4Label.Size = New System.Drawing.Size(92, 13)
        SEARCH_PATTERN4Label.TabIndex = 42
        SEARCH_PATTERN4Label.Text = "Search Pattern 4:"
        '
@@ -625,7 +626,7 @@ Partial Class frmConstructorDesigner
        Me.GUIDTextBox1.Location = New System.Drawing.Point(15, 27)
        Me.GUIDTextBox1.Name = "GUIDTextBox1"
        Me.GUIDTextBox1.ReadOnly = True
-        Me.GUIDTextBox1.Size = New System.Drawing.Size(34, 22)
+        Me.GUIDTextBox1.Size = New System.Drawing.Size(34, 21)
        Me.GUIDTextBox1.TabIndex = 19
        '
        'LEVEL1_SELECTCheckBox
@@ -644,7 +645,7 @@ Partial Class frmConstructorDesigner
        Me.WINDREAM_SEARCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "WINDREAM_SEARCH", True))
        Me.WINDREAM_SEARCHTextBox.Location = New System.Drawing.Point(9, 34)
        Me.WINDREAM_SEARCHTextBox.Name = "WINDREAM_SEARCHTextBox"
-        Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(543, 22)
+        Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(543, 21)
        Me.WINDREAM_SEARCHTextBox.TabIndex = 35
        '
        'XtraTabControl1
@@ -682,6 +683,7 @@ Partial Class frmConstructorDesigner
        'XtraTabPage3
        '
        Me.XtraTabPage3.AutoScroll = True
+        Me.XtraTabPage3.Controls.Add(Me.LOAD_DIRECTCheckBox)
        Me.XtraTabPage3.Controls.Add(Me.Label4)
        Me.XtraTabPage3.Controls.Add(COLUMN_NAME1Label1)
        Me.XtraTabPage3.Controls.Add(Me.COLUMN_NAME1ComboBox)
@@ -702,7 +704,7 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1)
        Me.XtraTabPage3.Controls.Add(Me.LEVEL1_SELECTCheckBox)
        Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(843, 332)
+        Me.XtraTabPage3.Size = New System.Drawing.Size(1002, 332)
        Me.XtraTabPage3.Text = "Allgemein"
        '
        'Label4
@@ -750,7 +752,7 @@ Partial Class frmConstructorDesigner
        Me.CHANGED_WHENTextBox1.Location = New System.Drawing.Point(239, 240)
        Me.CHANGED_WHENTextBox1.Name = "CHANGED_WHENTextBox1"
        Me.CHANGED_WHENTextBox1.ReadOnly = True
-        Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(160, 22)
+        Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(160, 21)
        Me.CHANGED_WHENTextBox1.TabIndex = 47
        '
        'CHANGED_WHOTextBox1
@@ -760,7 +762,7 @@ Partial Class frmConstructorDesigner
        Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(73, 240)
        Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1"
        Me.CHANGED_WHOTextBox1.ReadOnly = True
-        Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(160, 22)
+        Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(160, 21)
        Me.CHANGED_WHOTextBox1.TabIndex = 46
        '
        'SQL_SELECT_EBENE2TextBox
@@ -779,7 +781,7 @@ Partial Class frmConstructorDesigner
        Me.ADDED_WHENTextBox1.Location = New System.Drawing.Point(239, 199)
        Me.ADDED_WHENTextBox1.Name = "ADDED_WHENTextBox1"
        Me.ADDED_WHENTextBox1.ReadOnly = True
-        Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(160, 22)
+        Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(160, 21)
        Me.ADDED_WHENTextBox1.TabIndex = 45
        '
        'ADDED_WHOTextBox1
@@ -789,7 +791,7 @@ Partial Class frmConstructorDesigner
        Me.ADDED_WHOTextBox1.Location = New System.Drawing.Point(73, 199)
        Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1"
        Me.ADDED_WHOTextBox1.ReadOnly = True
-        Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(160, 22)
+        Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(160, 21)
        Me.ADDED_WHOTextBox1.TabIndex = 44
        '
        'XtraTabPage5
@@ -823,24 +825,6 @@ Partial Class frmConstructorDesigner
        Me.Button3.Text = "Button3"
        Me.Button3.UseVisualStyleBackColor = True
        '
-        'GridControl1
-        '
-        Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GridControl1.Location = New System.Drawing.Point(789, 43)
-        Me.GridControl1.MainView = Me.TileView1
-        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(532, 211)
-        Me.GridControl1.TabIndex = 53
-        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1})
-        '
-        'TileView1
-        '
-        Me.TileView1.AppearanceItem.Normal.ForeColor = System.Drawing.Color.Maroon
-        Me.TileView1.AppearanceItem.Normal.Options.UseForeColor = True
-        Me.TileView1.GridControl = Me.GridControl1
-        Me.TileView1.Name = "TileView1"
-        '
        'Button2
        '
        Me.Button2.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
@@ -883,7 +867,7 @@ Partial Class frmConstructorDesigner
        Me.txtQuickViewPicture.Location = New System.Drawing.Point(299, 153)
        Me.txtQuickViewPicture.Name = "txtQuickViewPicture"
        Me.txtQuickViewPicture.ReadOnly = True
-        Me.txtQuickViewPicture.Size = New System.Drawing.Size(175, 22)
+        Me.txtQuickViewPicture.Size = New System.Drawing.Size(175, 21)
        Me.txtQuickViewPicture.TabIndex = 49
        '
        'Label8
@@ -891,7 +875,7 @@ Partial Class frmConstructorDesigner
        Me.Label8.AutoSize = True
        Me.Label8.Location = New System.Drawing.Point(296, 137)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(130, 13)
+        Me.Label8.Size = New System.Drawing.Size(117, 13)
        Me.Label8.TabIndex = 48
        Me.Label8.Text = "QuickView Bild-Control:"
        '
@@ -954,7 +938,7 @@ Partial Class frmConstructorDesigner
        Me.Label6.AutoSize = True
        Me.Label6.Location = New System.Drawing.Point(296, 33)
        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(146, 13)
+        Me.Label6.Size = New System.Drawing.Size(135, 13)
        Me.Label6.TabIndex = 3
        Me.Label6.Text = "Konfigurierte Feldauswahl:"
        '
@@ -963,7 +947,7 @@ Partial Class frmConstructorDesigner
        Me.Label5.AutoSize = True
        Me.Label5.Location = New System.Drawing.Point(5, 33)
        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(108, 13)
+        Me.Label5.Size = New System.Drawing.Size(102, 13)
        Me.Label5.TabIndex = 2
        Me.Label5.Text = "Felder zur Auswahl:"
        '
@@ -980,7 +964,7 @@ Partial Class frmConstructorDesigner
        Me.Label3.AutoSize = True
        Me.Label3.Location = New System.Drawing.Point(3, 10)
        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(449, 13)
+        Me.Label3.Size = New System.Drawing.Size(416, 13)
        Me.Label3.TabIndex = 0
        Me.Label3.Text = "Konfigurieren Sie hier die Erstansicht zur Navigation innerhalb der Eintitätsdate" & _
    "nsätze"
@@ -991,7 +975,7 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage4.Controls.Add(Me.grpbxWD_RecordSearch)
        Me.XtraTabPage4.Controls.Add(Me.GroupBox1)
        Me.XtraTabPage4.Name = "XtraTabPage4"
-        Me.XtraTabPage4.Size = New System.Drawing.Size(843, 332)
+        Me.XtraTabPage4.Size = New System.Drawing.Size(1002, 332)
        Me.XtraTabPage4.Text = "windream-Suche Konfiguration"
        '
        'chkWDSearch_Active
@@ -999,7 +983,7 @@ Partial Class frmConstructorDesigner
        Me.chkWDSearch_Active.AutoSize = True
        Me.chkWDSearch_Active.Location = New System.Drawing.Point(14, 3)
        Me.chkWDSearch_Active.Name = "chkWDSearch_Active"
-        Me.chkWDSearch_Active.Size = New System.Drawing.Size(141, 17)
+        Me.chkWDSearch_Active.Size = New System.Drawing.Size(133, 17)
        Me.chkWDSearch_Active.TabIndex = 79
        Me.chkWDSearch_Active.Text = "Windream-Suche aktiv"
        Me.chkWDSearch_Active.UseVisualStyleBackColor = True
@@ -1278,6 +1262,24 @@ Partial Class frmConstructorDesigner
        Me.tsbtnSave.Size = New System.Drawing.Size(79, 22)
        Me.tsbtnSave.Text = "Speichern"
        '
+        'GridControl1
+        '
+        Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.GridControl1.Location = New System.Drawing.Point(789, 43)
+        Me.GridControl1.MainView = Me.TileView1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.Size = New System.Drawing.Size(532, 211)
+        Me.GridControl1.TabIndex = 53
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1})
+        '
+        'TileView1
+        '
+        Me.TileView1.AppearanceItem.Normal.ForeColor = System.Drawing.Color.Maroon
+        Me.TileView1.AppearanceItem.Normal.Options.UseForeColor = True
+        Me.TileView1.GridControl = Me.GridControl1
+        Me.TileView1.Name = "TileView1"
+        '
        'TBTEMP_QUICKDISPLAYBindingSource
        '
        Me.TBTEMP_QUICKDISPLAYBindingSource.DataMember = "TBTEMP_QUICKDISPLAY"
@@ -1383,6 +1385,16 @@ Partial Class frmConstructorDesigner
        Me.ImageCollection1.Images.SetKeyName(2, "tesla_black.jpg")
        Me.ImageCollection1.Images.SetKeyName(3, "whitejeep.jpg")
        '
+        'LOAD_DIRECTCheckBox
+        '
+        Me.LOAD_DIRECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "LOAD_DIRECT", True))
+        Me.LOAD_DIRECTCheckBox.Location = New System.Drawing.Point(701, 25)
+        Me.LOAD_DIRECTCheckBox.Name = "LOAD_DIRECTCheckBox"
+        Me.LOAD_DIRECTCheckBox.Size = New System.Drawing.Size(128, 24)
+        Me.LOAD_DIRECTCheckBox.TabIndex = 52
+        Me.LOAD_DIRECTCheckBox.Text = "Ersten Record laden"
+        Me.LOAD_DIRECTCheckBox.UseVisualStyleBackColor = True
+        '
        'frmConstructorDesigner
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1431,8 +1443,6 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage3.PerformLayout()
        Me.XtraTabPage5.ResumeLayout(False)
        Me.XtraTabPage5.PerformLayout()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabPage4.ResumeLayout(False)
        Me.XtraTabPage4.PerformLayout()
        Me.grpbxWD_RecordSearch.ResumeLayout(False)
@@ -1443,6 +1453,8 @@ Partial Class frmConstructorDesigner
        Me.StatusStrip1.PerformLayout()
        Me.ToolStrip1.ResumeLayout(False)
        Me.ToolStrip1.PerformLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBTEMP_QUICKDISPLAYBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1553,4 +1565,5 @@ Partial Class frmConstructorDesigner
    Friend WithEvents TileView1 As DevExpress.XtraGrid.Views.Tile.TileView
    Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection
    Friend WithEvents Button3 As System.Windows.Forms.Button
+    Friend WithEvents LOAD_DIRECTCheckBox As System.Windows.Forms.CheckBox
 End Class
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx
@@ -281,7 +281,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAagBCQGoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAbgBCQG4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -335,6 +335,9 @@
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>584, 95</value>
  </metadata>
+  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>584, 95</value>
+  </metadata>
  <metadata name="TBPMO_FORM_CONSTRUCTORBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>969, 56</value>
  </metadata>
@@ -359,8 +362,8 @@
  <assembly alias="DevExpress.Utils.v15.1" name="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNC4yLCBWZXJzaW9uPTE0LjIu
-        My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu
+        Ny4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
        eXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRv
        a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0
        cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P//
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@@ -522,4 +522,8 @@ Public Class frmConstructorDesigner
    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
        CreateTile()
    End Sub
+
+    Private Sub LOAD_DIRECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOAD_DIRECTCheckBox.CheckedChanged
+
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmForm_Constructor.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.vb
@@ -52,7 +52,6 @@ Public Class frmForm_Constructor
    Private RECORD_CHANGED As Boolean = False
    Private RECORD_NEEDS_REFRESH As Boolean = False

-    Private PARENT_RECORDID As Integer = 0
    Private act_ParentEntity_String As String
    Private act_PKEntity_String As String
    'Private act_ParentGridView As DevExpress.XtraGrid.Views.Grid.GridView
@@ -416,7 +415,7 @@ Public Class frmForm_Constructor
            'Die aktuelle Ebene überprüfen und den Datensatz übergeben, ebenso den PARENT-Record setzen
            Select Case ACT_EBENE
                Case 1
-                    PARENT_RECORDID = 0
+                    CURRENT_PARENTID = 0
                    EBENE1_RECID = SelectedRecordID
                    CURRENT_PARENTID = EBENE1_RECID
                    If Not EBENE1_COLUMNNAME Is Nothing Then
@@ -433,7 +432,6 @@ Public Class frmForm_Constructor

                    End If
                    If EBENE1_RECID > 0 Then
-                        PARENT_RECORDID = EBENE1_RECID
                        CURRENT_PARENTID = EBENE1_RECID
                    Else
                        CURRENT_PARENTID = EBENE2_RECID
@@ -445,7 +443,6 @@ Public Class frmForm_Constructor
                        'EBENE3_GRID_RESULT = grvwSelection.GetFocusedRowCellValue(grvwSelection.Columns(EBENE3_COLUMNNAME))
                    End If
                    If EBENE2_RECID > 0 Then
-                        PARENT_RECORDID = EBENE2_RECID
                        CURRENT_PARENTID = EBENE2_RECID
                    End If
            End Select
@@ -808,21 +805,33 @@ Public Class frmForm_Constructor
                End If
                If _sp2.ToString <> String.Empty Then
                    _sp2 = Return_SearchPattern(_sp2.ToString)
+                    If _sp2 = 0 Then
+                        _sp2 = ""
+                    End If
                    fileContents = fileContents.Replace("%pattern2%", _sp2)
                    fileContents = fileContents.Replace("471102", _sp2)
                End If
                If _sp3.ToString <> String.Empty Then
                    _sp3 = Return_SearchPattern(_sp3.ToString)
+                    If _sp3 = 0 Then
+                        _sp3 = ""
+                    End If
                    fileContents = fileContents.Replace("%pattern3%", _sp3)
                    fileContents = fileContents.Replace("471103", _sp3)
                End If
                If _sp4.ToString <> String.Empty Then
                    _sp4 = Return_SearchPattern(_sp4.ToString)
+                    If _sp4 = 0 Then
+                        _sp4 = ""
+                    End If
                    fileContents = fileContents.Replace("%pattern4%", _sp4)
                    fileContents = fileContents.Replace("471104", _sp4)
                End If
                If _sp5.ToString <> String.Empty Then
                    _sp5 = Return_SearchPattern(_sp5.ToString)
+                    If _sp5 = 0 Then
+                        _sp5 = ""
+                    End If
                    fileContents = fileContents.Replace("%pattern5%", _sp5)
                    fileContents = fileContents.Replace("471105", _sp5)
                End If
@@ -971,7 +980,7 @@ Public Class frmForm_Constructor
            Case "@EntityID".ToUpper
                Return CURRENT_FORM_ID
            Case "@ParentID".ToUpper
-                Return PARENT_RECORDID
+                Return CURRENT_PARENTID
            Case Else
                MsgBox("Undefinierter Pattern '" & content & "' in der Windream-SuchKonfiguration. Bitte den Administrator verständigen", MsgBoxStyle.Exclamation)
                ClassLogger.Add(" >> Undefinierter Such-Pattern: " & content, True)
@@ -993,7 +1002,7 @@ Public Class frmForm_Constructor

    Private Function Update_Record_OnChange() As String
        ' Record Speichern
-        Dim ResultMessage = CtrlCommandUI.SaveRecord(SelectedRecordID, CURRENT_FORM_ID, PARENT_RECORDID)
+        Dim ResultMessage = CtrlCommandUI.SaveRecord(SelectedRecordID, CURRENT_FORM_ID, CURRENT_PARENTID)
        'Jetzt die für die Entität notwendigen Prroceduren ausführen
        Customer_Run_Procedures()

@@ -1739,13 +1748,15 @@ Public Class frmForm_Constructor
            Load_Entity_Data(TreeViewEbeneSelect.SelectedNode.Tag)
        End If
    End Sub
-    Private Function GET_GROUP_RECORD(FORM_ID As Integer)
-        Dim sqlRecord As String = "select guid from TBPMO_RECORD where Form_ID = " & FORM_ID
+    Private Function GET_GROUP_RECORD()
+        Dim sqlRecord As String = "SELECT RECORD2_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_PARENTID
+
        Dim recid = ClassDatabase.Execute_Scalar(sqlRecord, True)
        If IsNothing(recid) Then
-            If ClassControlCommandsUI.CreateRecord(FORM_ID) = True Then
+            If ClassControlCommandsUI.CreateRecord(CURRENT_FORM_ID) = True Then
                recid = ClassControlCommandsUI.GetLastRecord
-                If IsNothing(recid) Then
+                If Not IsNothing(recid) Then
+                    'Die neue Record-ID setzen
                    CURRENT_RECORD_ID = recid
                    ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID, "Group-Entity Link")
                Else
@@ -1764,10 +1775,10 @@ Public Class frmForm_Constructor
                Return False
            End Try
        End If
-        Dim SQL1 As String = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & PARENT_RECORDID & " AND RECORD2_ID = " & CURRENT_RECORD_ID
+        Dim SQL1 As String = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_PARENTID & " AND RECORD2_ID = " & CURRENT_RECORD_ID

        If ClassDatabase.Execute_Scalar(SQL1) = 0 Then
-            ClassControlCommandsUI.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID)
+            ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID)
        End If
        Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID)
        Return True
@@ -1776,7 +1787,7 @@ Public Class frmForm_Constructor
    Sub Load_Entity_Data(FORM_ID As Integer)
        Try
            Me.Cursor = Cursors.WaitCursor
-
+            CURRENT_RECORD_ID = 0
            Dim IS_SINGLE_RECORD As Boolean
            Dim LOAD_DIRECT As Boolean
            VerknüpfungenToolStripMenuItem.Enabled = False
@@ -1796,7 +1807,6 @@ Public Class frmForm_Constructor
            Dim _sql As String
            Select Case ACT_EBENE
                Case 1
-                    PARENT_RECORDID = 0
                    CURRENT_PARENTID = 0
                    EBENE1_ENTITY = TreeViewEbeneSelect.SelectedNode.Text
                    ACT_EBENE_STRING = EBENE1_ENTITY
@@ -1844,13 +1854,12 @@ Public Class frmForm_Constructor
                    EBENE3_ENTITY = ""
                    'Parent-ID setzen
                    If EBENE1_RECID > 0 Then
-                        PARENT_RECORDID = EBENE1_RECID
                        CURRENT_PARENTID = EBENE1_RECID
                    End If
                    'tslblEntity3.Visible = False
                    Select Case CURRENT_FORM_TYPE
                        Case 5
-                            If GET_GROUP_RECORD(FORM_ID) = True Then
+                            If GET_GROUP_RECORD() = True Then
                                EBENE2_RECID = CURRENT_RECORD_ID
                            End If
                    End Select
@@ -1882,9 +1891,13 @@ Public Class frmForm_Constructor
                    End Try

                Case 3
+                    'Parent-ID setzen
+                    If EBENE2_RECID > 0 Then
+                        CURRENT_PARENTID = EBENE2_RECID
+                    End If
                    Select Case CURRENT_FORM_TYPE
                        Case 5
-                            If GET_GROUP_RECORD(FORM_ID) = True Then
+                            If GET_GROUP_RECORD() = True Then
                                EBENE3_RECID = CURRENT_RECORD_ID
                            End If
                    End Select
@@ -1900,7 +1913,6 @@ Public Class frmForm_Constructor
                    If LogErrorsOnly = False Then ClassLogger.Add(">> Ebene 3 in TreeView selektiert", False)
                    'Parent-ID setzen
                    If EBENE2_RECID > 0 Then
-                        PARENT_RECORDID = EBENE2_RECID
                        CURRENT_PARENTID = EBENE2_RECID
                    End If

@@ -1929,7 +1941,6 @@ Public Class frmForm_Constructor

            CURRENT_FORM_ID = FORM_ID
            CURRENT_ENTITYSTRING = ACT_EBENE_STRING
-            CURRENT_PARENTID = PARENT_RECORDID
            act_FormViewID = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FORM_VIEW where FORM_ID = " & FORM_ID)
            If EDIT_STATE = "none" Then
                'Die Controls der Entität laden
@@ -1984,7 +1995,7 @@ Public Class frmForm_Constructor
                    DTEntity.PrimaryKey = primaryKey
                    LoadGrid_Selection(_sql, DTEntity)

-                    If LOAD_DIRECT = True Then
+                    If LOAD_DIRECT = True Or IS_SINGLE_RECORD = True Then
                        Dim sql1 = CURRENT_ENTITYSQL
                        sql1.Replace("T.*", "TOP 1 [Record-ID]")
                        Dim id = ClassDatabase.Execute_Scalar(sql1, True)
@@ -1992,9 +2003,6 @@ Public Class frmForm_Constructor
                            If LogErrorsOnly = False Then ClassLogger.Add(">> Load Record directly - RecordID: " & CURRENT_RECORD_ID, False)
                            Load_Record_Data()
                        End If
-                    Else
-
-
                    End If
                        'Überprüfen ob es für diese Entität Wiedervorlagen gibt?
                        Check_FOLLOWUP_IsConfigured(CURRENT_FORM_ID)
@@ -2356,8 +2364,13 @@ Public Class frmForm_Constructor

                Refresh_CreatedChangedRecordByID(SelectedRecordID)
                RECORD_CHANGED = False
-            Case 1 'windream-Dokumente
-                RUN_WD_SEARCH(WD_Suche, "RECORD")
+            Case 1 'windream-Dokumente finden
+                If CURRENT_RECORD_ID = 0 Then
+                    RUN_WD_SEARCH(WD_Suche, "ENTITY")
+                Else
+                    RUN_WD_SEARCH(WD_Suche, "RECORD")
+                End If
+
            Case 2
                Refresh_FollowUps()
        End Select
@@ -2550,17 +2563,17 @@ Public Class frmForm_Constructor
        If lblParentID.Text = "" Then
            Exit Sub
        End If
-        If PARENT_RECORDID > 0 Then
+        If CURRENT_PARENTID > 0 Then
            Dim result As MsgBoxResult
            result = MessageBox.Show("Möchten Sie den Parent-Datensatz für den aktuellen Datensatz wirklich aktualisieren?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
            If result <> MsgBoxResult.Yes Then
                Exit Sub
            Else
-                If ClassDatabase.Execute_non_Query("DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & CURRENT_RECORD_ID & " AND RECORD1_ID = " & PARENT_RECORDID, True) = False Then
+                If ClassDatabase.Execute_non_Query("DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & CURRENT_RECORD_ID & " AND RECORD1_ID = " & CURRENT_PARENTID, True) = False Then
                    Exit Sub
                End If
            End If
-            
+
        End If
        If ClassControlCommandsUI.ConnectRecord(Linkparent_ID, CURRENT_RECORD_ID, "ENTITY" & CURRENT_FORM_ID.ToString) = True Then
            Save_GridViewParentEntityLayout()
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
@@ -239,6 +239,9 @@ Public Class frmForm_Constructor_Main
        GridControlMain.DataSource = Nothing

        If GRID_TYPE = GridType.Grid Then
+            If grvwGrid.Columns.Count > 0 Then
+
+            End If
            grvwGrid.Columns.Clear()
        ElseIf GRID_TYPE = GridType.Tiles Then
            grvwTiles.Columns.Clear()
--- a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
@@ -134,7 +134,7 @@ Partial Class frmLevel_Designer
        Me.grpbxDocumentView.Controls.Add(Me.Label1)
        Me.grpbxDocumentView.Location = New System.Drawing.Point(0, 11)
        Me.grpbxDocumentView.Name = "grpbxDocumentView"
-        Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 181)
+        Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 186)
        Me.grpbxDocumentView.TabIndex = 4
        Me.grpbxDocumentView.TabStop = False
        Me.grpbxDocumentView.Text = "Document View - Eigenschaften"
--- a/app/DD-Record-Organiser/frmTemplates.Designer.vb
+++ b/app/DD-Record-Organiser/frmTemplates.Designer.vb
@@ -94,7 +94,6 @@ Partial Class frmTemplates
        Me.tsbtnGetPatterns = New System.Windows.Forms.ToolStripButton()
        Me.GUIDTextBox2 = New System.Windows.Forms.TextBox()
        Me.NAME_PATTERNTextBox = New System.Windows.Forms.TextBox()
-        Me.FIXED_VALUETextBox = New System.Windows.Forms.TextBox()
        Me.CONNECTION_IDComboBox = New System.Windows.Forms.ComboBox()
        Me.SQL_COMMANDTextBox = New System.Windows.Forms.TextBox()
        Me.Label2 = New System.Windows.Forms.Label()
@@ -115,6 +114,9 @@ Partial Class frmTemplates
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
        Me.DT_VORSCHAUBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.ListBoxVorschau = New System.Windows.Forms.ListBox()
+        Me.FIXED_VALUETextBox = New System.Windows.Forms.TextBox()
+        Me.btnRefreshControlPattern = New System.Windows.Forms.Button()
+        Me.lblSavePattern = New System.Windows.Forms.Label()
        GUIDLabel = New System.Windows.Forms.Label()
        NAMELabel = New System.Windows.Forms.Label()
        TEMPLATE_PATHLabel = New System.Windows.Forms.Label()
@@ -240,7 +242,7 @@ Partial Class frmTemplates
        'NAME_PATTERNLabel
        '
        NAME_PATTERNLabel.AutoSize = True
-        NAME_PATTERNLabel.Location = New System.Drawing.Point(360, 435)
+        NAME_PATTERNLabel.Location = New System.Drawing.Point(348, 435)
        NAME_PATTERNLabel.Name = "NAME_PATTERNLabel"
        NAME_PATTERNLabel.Size = New System.Drawing.Size(157, 15)
        NAME_PATTERNLabel.TabIndex = 34
@@ -251,14 +253,14 @@ Partial Class frmTemplates
        FIXED_VALUELabel.AutoSize = True
        FIXED_VALUELabel.Location = New System.Drawing.Point(586, 435)
        FIXED_VALUELabel.Name = "FIXED_VALUELabel"
-        FIXED_VALUELabel.Size = New System.Drawing.Size(121, 15)
+        FIXED_VALUELabel.Size = New System.Drawing.Size(102, 15)
        FIXED_VALUELabel.TabIndex = 36
-        FIXED_VALUELabel.Text = "Platzhalter-Ersetzung:"
+        FIXED_VALUELabel.Text = "Platzhalter Entität:"
        '
        'CONNECTION_IDLabel
        '
        CONNECTION_IDLabel.AutoSize = True
-        CONNECTION_IDLabel.Location = New System.Drawing.Point(341, 503)
+        CONNECTION_IDLabel.Location = New System.Drawing.Point(299, 503)
        CONNECTION_IDLabel.Name = "CONNECTION_IDLabel"
        CONNECTION_IDLabel.Size = New System.Drawing.Size(101, 15)
        CONNECTION_IDLabel.TabIndex = 38
@@ -267,7 +269,7 @@ Partial Class frmTemplates
        'SQL_COMMANDLabel
        '
        SQL_COMMANDLabel.AutoSize = True
-        SQL_COMMANDLabel.Location = New System.Drawing.Point(477, 503)
+        SQL_COMMANDLabel.Location = New System.Drawing.Point(407, 503)
        SQL_COMMANDLabel.Name = "SQL_COMMANDLabel"
        SQL_COMMANDLabel.Size = New System.Drawing.Size(98, 15)
        SQL_COMMANDLabel.TabIndex = 40
@@ -277,7 +279,7 @@ Partial Class frmTemplates
        '
        Label5.AutoSize = True
        Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Label5.Location = New System.Drawing.Point(1083, 437)
+        Label5.Location = New System.Drawing.Point(1185, 436)
        Label5.Name = "Label5"
        Label5.Size = New System.Drawing.Size(90, 13)
        Label5.TabIndex = 87
@@ -617,7 +619,7 @@ Partial Class frmTemplates
        Me.BindingNavigator2.DeleteItem = Me.ToolStripButton10
        Me.BindingNavigator2.Dock = System.Windows.Forms.DockStyle.None
        Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton11, Me.ToolStripButton12, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton13, Me.ToolStripButton14, Me.ToolStripSeparator6, Me.ToolStripButton10, Me.ToolStripButton15, Me.ToolStripButton16, Me.ToolStripSeparator1, Me.tsbtnGetPatterns})
-        Me.BindingNavigator2.Location = New System.Drawing.Point(302, 405)
+        Me.BindingNavigator2.Location = New System.Drawing.Point(293, 405)
        Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton11
        Me.BindingNavigator2.MoveLastItem = Me.ToolStripButton14
        Me.BindingNavigator2.MoveNextItem = Me.ToolStripButton13
@@ -743,38 +745,31 @@ Partial Class frmTemplates
        Me.GUIDTextBox2.ReadOnly = True
        Me.GUIDTextBox2.Size = New System.Drawing.Size(42, 23)
        Me.GUIDTextBox2.TabIndex = 33
+        Me.GUIDTextBox2.TabStop = False
        '
        'NAME_PATTERNTextBox
        '
-        Me.NAME_PATTERNTextBox.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.NAME_PATTERNTextBox.BackColor = System.Drawing.Color.MistyRose
        Me.NAME_PATTERNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "NAME_PATTERN", True))
-        Me.NAME_PATTERNTextBox.Location = New System.Drawing.Point(363, 453)
+        Me.NAME_PATTERNTextBox.Location = New System.Drawing.Point(350, 453)
        Me.NAME_PATTERNTextBox.Name = "NAME_PATTERNTextBox"
        Me.NAME_PATTERNTextBox.ReadOnly = True
-        Me.NAME_PATTERNTextBox.Size = New System.Drawing.Size(217, 23)
+        Me.NAME_PATTERNTextBox.Size = New System.Drawing.Size(230, 23)
        Me.NAME_PATTERNTextBox.TabIndex = 35
        '
-        'FIXED_VALUETextBox
-        '
-        Me.FIXED_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "FIXED_VALUE", True))
-        Me.FIXED_VALUETextBox.Location = New System.Drawing.Point(586, 453)
-        Me.FIXED_VALUETextBox.Name = "FIXED_VALUETextBox"
-        Me.FIXED_VALUETextBox.Size = New System.Drawing.Size(217, 23)
-        Me.FIXED_VALUETextBox.TabIndex = 37
-        '
        'CONNECTION_IDComboBox
        '
        Me.CONNECTION_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "CONNECTION_ID", True))
        Me.CONNECTION_IDComboBox.FormattingEnabled = True
-        Me.CONNECTION_IDComboBox.Location = New System.Drawing.Point(344, 521)
+        Me.CONNECTION_IDComboBox.Location = New System.Drawing.Point(302, 521)
        Me.CONNECTION_IDComboBox.Name = "CONNECTION_IDComboBox"
-        Me.CONNECTION_IDComboBox.Size = New System.Drawing.Size(121, 23)
+        Me.CONNECTION_IDComboBox.Size = New System.Drawing.Size(98, 23)
        Me.CONNECTION_IDComboBox.TabIndex = 39
        '
        'SQL_COMMANDTextBox
        '
        Me.SQL_COMMANDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "SQL_COMMAND", True))
-        Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(480, 521)
+        Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(410, 521)
        Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox"
        Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(100, 23)
        Me.SQL_COMMANDTextBox.TabIndex = 41
@@ -873,7 +868,7 @@ Partial Class frmTemplates
        Me.GroupBox1.Controls.Add(ENTITY_IDLabel)
        Me.GroupBox1.Location = New System.Drawing.Point(293, 23)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(333, 100)
+        Me.GroupBox1.Size = New System.Drawing.Size(266, 100)
        Me.GroupBox1.TabIndex = 46
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "Zu weiterer Entität zuordnen:"
@@ -926,6 +921,7 @@ Partial Class frmTemplates
        '
        'Panel2
        '
+        Me.Panel2.BackColor = System.Drawing.SystemColors.GradientActiveCaption
        Me.Panel2.Controls.Add(Me.Label2)
        Me.Panel2.Controls.Add(Me.ListBox_Entity)
        Me.Panel2.Controls.Add(Me.btndeleteEntityZO)
@@ -950,9 +946,9 @@ Partial Class frmTemplates
        'cmbControls
        '
        Me.cmbControls.FormattingEnabled = True
-        Me.cmbControls.Location = New System.Drawing.Point(812, 453)
+        Me.cmbControls.Location = New System.Drawing.Point(589, 453)
        Me.cmbControls.Name = "cmbControls"
-        Me.cmbControls.Size = New System.Drawing.Size(265, 23)
+        Me.cmbControls.Size = New System.Drawing.Size(253, 23)
        Me.cmbControls.TabIndex = 85
        '
        'DD_ECMAdmin
@@ -973,17 +969,56 @@ Partial Class frmTemplates
        Me.ListBoxVorschau.DisplayMember = "NAME_PATTERN"
        Me.ListBoxVorschau.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.ListBoxVorschau.FormattingEnabled = True
-        Me.ListBoxVorschau.Location = New System.Drawing.Point(1086, 453)
+        Me.ListBoxVorschau.Location = New System.Drawing.Point(1188, 452)
        Me.ListBoxVorschau.Name = "ListBoxVorschau"
-        Me.ListBoxVorschau.Size = New System.Drawing.Size(176, 82)
+        Me.ListBoxVorschau.Size = New System.Drawing.Size(176, 121)
        Me.ListBoxVorschau.TabIndex = 86
+        Me.ListBoxVorschau.TabStop = False
        Me.ListBoxVorschau.ValueMember = "GUID"
        '
+        'FIXED_VALUETextBox
+        '
+        Me.FIXED_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "FIXED_VALUE", True))
+        Me.FIXED_VALUETextBox.Location = New System.Drawing.Point(848, 453)
+        Me.FIXED_VALUETextBox.Name = "FIXED_VALUETextBox"
+        Me.FIXED_VALUETextBox.ReadOnly = True
+        Me.FIXED_VALUETextBox.Size = New System.Drawing.Size(35, 23)
+        Me.FIXED_VALUETextBox.TabIndex = 37
+        Me.FIXED_VALUETextBox.TabStop = False
+        '
+        'btnRefreshControlPattern
+        '
+        Me.btnRefreshControlPattern.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG
+        Me.btnRefreshControlPattern.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRefreshControlPattern.Location = New System.Drawing.Point(589, 482)
+        Me.btnRefreshControlPattern.Name = "btnRefreshControlPattern"
+        Me.btnRefreshControlPattern.Size = New System.Drawing.Size(166, 23)
+        Me.btnRefreshControlPattern.TabIndex = 88
+        Me.btnRefreshControlPattern.Text = "Platzhalter aktualisieren"
+        Me.btnRefreshControlPattern.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRefreshControlPattern.UseVisualStyleBackColor = True
+        Me.btnRefreshControlPattern.Visible = False
+        '
+        'lblSavePattern
+        '
+        Me.lblSavePattern.AutoSize = True
+        Me.lblSavePattern.BackColor = System.Drawing.Color.Yellow
+        Me.lblSavePattern.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblSavePattern.Location = New System.Drawing.Point(586, 524)
+        Me.lblSavePattern.Name = "lblSavePattern"
+        Me.lblSavePattern.Size = New System.Drawing.Size(187, 15)
+        Me.lblSavePattern.TabIndex = 90
+        Me.lblSavePattern.Text = "Pattern erfolgreich gespeichert!"
+        Me.lblSavePattern.Visible = False
+        '
        'frmTemplates
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1426, 550)
+        Me.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
+        Me.ClientSize = New System.Drawing.Size(1426, 595)
+        Me.Controls.Add(Me.lblSavePattern)
+        Me.Controls.Add(Me.btnRefreshControlPattern)
        Me.Controls.Add(Label5)
        Me.Controls.Add(Me.ListBoxVorschau)
        Me.Controls.Add(Me.cmbControls)
@@ -1081,7 +1116,6 @@ Partial Class frmTemplates
    Friend WithEvents ToolStripButton16 As System.Windows.Forms.ToolStripButton
    Friend WithEvents GUIDTextBox2 As System.Windows.Forms.TextBox
    Friend WithEvents NAME_PATTERNTextBox As System.Windows.Forms.TextBox
-    Friend WithEvents FIXED_VALUETextBox As System.Windows.Forms.TextBox
    Friend WithEvents CONNECTION_IDComboBox As System.Windows.Forms.ComboBox
    Friend WithEvents SQL_COMMANDTextBox As System.Windows.Forms.TextBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
@@ -1105,4 +1139,7 @@ Partial Class frmTemplates
    Friend WithEvents ListBoxVorschau As System.Windows.Forms.ListBox
    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
    Friend WithEvents tsbtnGetPatterns As System.Windows.Forms.ToolStripButton
+    Friend WithEvents FIXED_VALUETextBox As System.Windows.Forms.TextBox
+    Friend WithEvents btnRefreshControlPattern As System.Windows.Forms.Button
+    Friend WithEvents lblSavePattern As System.Windows.Forms.Label
 End Class
--- a/app/DD-Record-Organiser/frmTemplates.resx
+++ b/app/DD-Record-Organiser/frmTemplates.resx
@@ -256,31 +256,25 @@
    <value>1322, 17</value>
  </metadata>
  <metadata name="TBPMO_TEMPLATE_PATTERNBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>1594, 17</value>
  </metadata>
  <metadata name="TBPMO_TEMPLATE_PATTERNTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>350, 56</value>
+    <value>17, 56</value>
  </metadata>
  <metadata name="VWPMO_GUI_ENTITYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
-  </metadata>
-  <metadata name="VWPMO_GUI_ENTITYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>859, 56</value>
  </metadata>
  <metadata name="VWPMO_DOKUMENTTYPESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>832, 56</value>
-  </metadata>
-  <metadata name="VWPMO_DOKUMENTTYPESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>832, 56</value>
+    <value>301, 56</value>
  </metadata>
  <metadata name="VWPMO_DOKUMENTTYPESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1114, 56</value>
+    <value>583, 56</value>
  </metadata>
  <metadata name="VWPMO_GUI_ENTITYTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>263, 95</value>
+    <value>1105, 56</value>
  </metadata>
  <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>503, 95</value>
+    <value>1345, 56</value>
  </metadata>
  <data name="ToolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -342,12 +336,12 @@
 </value>
  </data>
  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>657, 95</value>
+    <value>1499, 56</value>
  </metadata>
  <metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>799, 95</value>
+    <value>1641, 56</value>
  </metadata>
  <metadata name="DT_VORSCHAUBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>934, 95</value>
+    <value>17, 95</value>
  </metadata>
 </root>
--- a/app/DD-Record-Organiser/frmTemplates.vb
+++ b/app/DD-Record-Organiser/frmTemplates.vb
@@ -60,6 +60,7 @@
            cmbControls.DataSource = DT1
            cmbControls.DisplayMember = DT1.Columns(1).ColumnName
            cmbControls.ValueMember = DT1.Columns(0).ColumnName
+            Get_CONTROL_COMBOBOX()
        Catch ex As Exception
            MsgBox("Unexpected error in Load Template-Patterns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -226,6 +227,18 @@
                    ListBoxVorschau.DataSource = DT
                    ListBoxVorschau.DisplayMember = DT.Columns(0).ColumnName
                End If
+                If FIXED_VALUETextBox.Text <> "" Then
+                    Dim name = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = " & FIXED_VALUETextBox.Text
+                    name = ClassDatabase.Execute_Scalar(name, True)
+                    If cmbControls.Text <> name Then
+                        btnRefreshControlPattern.Visible = True
+                    Else
+                        btnRefreshControlPattern.Visible = False
+                    End If
+                Else
+                    btnRefreshControlPattern.Visible = True
+                End If
+               
            End If
         
        End If
@@ -234,4 +247,37 @@
    Private Sub tsbtnGetPatterns_Click(sender As Object, e As EventArgs) Handles tsbtnGetPatterns.Click
        GetPatterns()
    End Sub
+
+    Private Sub ToolStripButton15_Click(sender As Object, e As EventArgs) Handles ToolStripButton15.Click
+
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnRefreshControlPattern.Click
+        If cmbControls.SelectedIndex <> -1 Then
+            Dim ctrlstring = cmbControls.SelectedValue.ToString
+            Dim sql = String.Format("UPDATE TBPMO_TEMPLATE_PATTERN SET FIXED_VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", ctrlstring, Environment.UserName, GUIDTextBox2.Text)
+            If ClassDatabase.Execute_non_Query(sql, True) Then
+                FIXED_VALUETextBox.Text = ctrlstring
+                lblSavePattern.Visible = True
+            Else
+                lblSavePattern.Visible = False
+            End If
+        End If
+    End Sub
+    Private Sub TBPMO_TEMPLATE_PATTERNBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_TEMPLATE_PATTERNBindingSource.CurrentChanged
+        If loaded = True Then
+            Get_CONTROL_COMBOBOX()
+            lblSavePattern.Visible = False
+
+        End If
+    End Sub
+    Sub Get_CONTROL_COMBOBOX()
+        If IsNumeric(FIXED_VALUETextBox.Text) Then
+            Dim name = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = " & FIXED_VALUETextBox.Text
+            name = ClassDatabase.Execute_Scalar(name, True)
+            cmbControls.SelectedIndex = cmbControls.FindStringExact(name)
+        Else
+            btnRefreshControlPattern.Visible = True
+        End If
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb
+++ b/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb
@@ -57,11 +57,11 @@ Partial Class frmWD_EntityImport
        Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label1.Location = New System.Drawing.Point(12, 9)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(587, 30)
+        Me.Label1.Size = New System.Drawing.Size(585, 30)
        Me.Label1.TabIndex = 0
        Me.Label1.Text = "Designen Sie hier den Import für Dateien welche zur aktuellen Entität zugeordnet " & _
-    "werden sollen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Beachten Sie dass alle gefundenen Dateien NUR der Entität und NU" & _
-    "R der Parent-ID  zugeordnet werden."
+    "werden sollen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Beachten Sie dass alle gefundenen Dateien NUR die Entität und NU" & _
+    "R die Parent-ID  zugeordnet werden."
        '
        'Label2
        '
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="1.6.1.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="1.9.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
    <Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
    
    <!-- Nicht entfernen! -->