MS_1401

2016-01-14 17:01:52 +01:00 · 2016-01-14 17:01:52 +01:00 · 058ae78435
commit 058ae78435
parent 3fe8d1cd74
19 changed files with 488 additions and 303 deletions
--- a/app/DD-Record-Organiser/App.config
+++ b/app/DD-Record-Organiser/App.config
@ -45,6 +45,9 @@
            <setting name="Constructor_DetailsSplitter" serializeAs="String">
                <value>764</value>
            </setting>
            <setting name="User_InBoxScan_NotinFront" serializeAs="String">
                <value>False</value>
            </setting>
        </DD_Record_Organiser.My.MySettings>
    </userSettings>
 </configuration>
--- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
@ -13403,6 +13403,8 @@ Partial Public Class DD_DMSDataSet
        Private columnNAME As Global.System.Data.DataColumn
        Private columnCONSTRUCTOR_ID 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()
@ -13662,6 +13664,14 @@ 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 CONSTRUCTOR_IDColumn() As Global.System.Data.DataColumn
            Get
                Return Me.columnCONSTRUCTOR_ID
            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)>  _
@ -13726,9 +13736,10 @@ Partial Public Class DD_DMSDataSet
                    ByVal PROCESS_SELECT8 As String,  _
                    ByVal PROCESS_SELECT9 As String,  _
                    ByVal PROCESS_SELECT10 As String,  _
-                    ByVal NAME As String) As TBPMO_FOLLOW_UP_EMAILRow
+                    ByVal NAME As String,  _
                    ByVal CONSTRUCTOR_ID As Integer) As TBPMO_FOLLOW_UP_EMAILRow
            Dim rowTBPMO_FOLLOW_UP_EMAILRow As TBPMO_FOLLOW_UP_EMAILRow = CType(Me.NewRow,TBPMO_FOLLOW_UP_EMAILRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, Nothing, Nothing, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TIME_DIST, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, PROCESS_SELECT9, PROCESS_SELECT10, NAME}
+            Dim columnValuesArray() As Object = New Object() {Nothing, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, Nothing, Nothing, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TIME_DIST, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, PROCESS_SELECT9, PROCESS_SELECT10, NAME, CONSTRUCTOR_ID}
            If (Not (parentTBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID) Is Nothing) Then
                columnValuesArray(4) = parentTBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID(0)
            End If
@ -13791,6 +13802,7 @@ Partial Public Class DD_DMSDataSet
            Me.columnPROCESS_SELECT9 = MyBase.Columns("PROCESS_SELECT9")
            Me.columnPROCESS_SELECT10 = MyBase.Columns("PROCESS_SELECT10")
            Me.columnNAME = MyBase.Columns("NAME")
            Me.columnCONSTRUCTOR_ID = MyBase.Columns("CONSTRUCTOR_ID")
        End Sub
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@ -13852,6 +13864,8 @@ Partial Public Class DD_DMSDataSet
            MyBase.Columns.Add(Me.columnPROCESS_SELECT10)
            Me.columnNAME = New Global.System.Data.DataColumn("NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnNAME)
            Me.columnCONSTRUCTOR_ID = New Global.System.Data.DataColumn("CONSTRUCTOR_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnCONSTRUCTOR_ID)
            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
@ -13914,6 +13928,7 @@ Partial Public Class DD_DMSDataSet
            Me.columnPROCESS_SELECT10.MaxLength = 2000
            Me.columnNAME.AllowDBNull = false
            Me.columnNAME.MaxLength = 100
            Me.columnCONSTRUCTOR_ID.AllowDBNull = false
        End Sub
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@ -25272,6 +25287,17 @@ 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 CONSTRUCTOR_ID() As Integer
            Get
                Return CType(Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CONSTRUCTOR_IDColumn),Integer)
            End Get
            Set
                Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CONSTRUCTOR_IDColumn) = value
            End Set
        End Property
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Property TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID() As TBTEMP_QUICKDISPLAYRow
@ -39424,6 +39450,7 @@ Namespace DD_DMSDataSetTableAdapters
            tableMapping.ColumnMappings.Add("PROCESS_SELECT9", "PROCESS_SELECT9")
            tableMapping.ColumnMappings.Add("PROCESS_SELECT10", "PROCESS_SELECT10")
            tableMapping.ColumnMappings.Add("NAME", "NAME")
            tableMapping.ColumnMappings.Add("CONSTRUCTOR_ID", "CONSTRUCTOR_ID")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@ -39436,15 +39463,16 @@ Namespace DD_DMSDataSetTableAdapters
                "FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL"& _ 
                "_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY,"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"             "& _ 
                "             PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4,"& _ 
-                " ACTIVE, ADDED_WHO, TIME_DIST, NAME)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@FOLLOW_UP_SEQUENCE,@FOLLOW"& _ 
+                " ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@FOLLOW_UP_"& _ 
-                "_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@P"& _ 
+                "SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT"& _ 
-                "ARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PRO"& _ 
+                "_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROC"& _ 
-                "CESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NA"& _ 
+                "ESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WH"& _ 
-                "ME);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, D"& _ 
+                "O,@TIME_DIST,@NAME,@CONSTRUCTOR_ID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLO"& _ 
-                "EPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN,"& _ 
+                "W_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, "& _ 
-                " EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, P"& _ 
+                "PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PR"& _ 
-                "ROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TB"& _ 
+                "OCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, "& _ 
-                "PMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTITY())"
+                "CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTIT"& _ 
                "Y())"
            Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_SEQUENCE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_DAYS", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_DAYS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@ -39464,6 +39492,7 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TIME_DIST", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "TIME_DIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCTOR_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCTOR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.UpdateCommand.Connection = Me.Connection
            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPMO_FOLLOW_UP_EMAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                FOLLOW_UP_SEQUENCE = @FOLL"& _ 
@ -39478,12 +39507,12 @@ Namespace DD_DMSDataSetTableAdapters
                "        PROCESS_SELECT5 = @PROCESS_SELECT5, PROCESS_SELECT6 = @PROCESS_SELECT6, "& _ 
                "PROCESS_SELECT7 = @PROCESS_SELECT7, PROCESS_SELECT8 = @PROCESS_SELECT8, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"      "& _ 
                "                   PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCE"& _ 
-                "SS_SELECT10, NAME = @NAME"&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"& _ 
+                "SS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID "& _ 
-                ", FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_I"& _ 
+                "= @Original_GUID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_"& _ 
-                "D, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAI"& _ 
+                "UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UN"& _ 
-                "L_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTI"& _ 
+                "ITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PRO"& _ 
-                "VE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL "& _ 
+                "CESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ 
-                "WHERE (GUID = @GUID)"
+                "ED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_SEQUENCE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_DAYS", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_DAYS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@ -39509,6 +39538,7 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_SELECT9", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_SELECT9", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_SELECT10", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_SELECT10", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCTOR_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCTOR_ID", 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
@ -39532,7 +39562,7 @@ Namespace DD_DMSDataSetTableAdapters
                "PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, PROCESS_SELECT5, PROCESS_SELE"& _ 
                "CT6, PROCESS_SELECT7, PROCESS_SELECT8, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         PROCESS_SELECT"& _ 
                "9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, N"& _ 
-                "AME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_FOLLOW_UP_EMAIL"
+                "AME, CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_FOLLOW_UP_EMAIL"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
        End Sub
@ -39631,7 +39661,8 @@ Namespace DD_DMSDataSetTableAdapters
                    ByVal ACTIVE As Boolean,  _
                    ByVal ADDED_WHO As String,  _
                    ByVal TIME_DIST As String,  _
-                    ByVal NAME As String) As Integer
+                    ByVal NAME As String,  _
                    ByVal CONSTRUCTOR_ID As Integer) As Integer
            If (FOLLOW_UP_SEQUENCE Is Nothing) Then
                Throw New Global.System.ArgumentNullException("FOLLOW_UP_SEQUENCE")
            Else
@ -39702,6 +39733,7 @@ Namespace DD_DMSDataSetTableAdapters
            Else
                Me.Adapter.InsertCommand.Parameters(17).Value = CType(NAME,String)
            End If
            Me.Adapter.InsertCommand.Parameters(18).Value = CType(CONSTRUCTOR_ID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@ -39746,6 +39778,7 @@ Namespace DD_DMSDataSetTableAdapters
                    ByVal PROCESS_SELECT9 As String,  _
                    ByVal PROCESS_SELECT10 As String,  _
                    ByVal NAME As String,  _
                    ByVal CONSTRUCTOR_ID As Integer,  _
                    ByVal Original_GUID As Integer,  _
                    ByVal GUID As Integer) As Integer
            If (FOLLOW_UP_SEQUENCE Is Nothing) Then
@ -39848,8 +39881,9 @@ Namespace DD_DMSDataSetTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(NAME,String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(24).Value = CType(CONSTRUCTOR_ID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_GUID,Integer)
            Me.Adapter.UpdateCommand.Parameters(26).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
@ -1938,8 +1938,8 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO TBPMO_FOLLOW_UP_EMAIL
                         (FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY,
-                          PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, TIME_DIST, NAME)
+                          PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID)
-VALUES        (@FOLLOW_UP_SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NAME);   
+VALUES        (@FOLLOW_UP_SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NAME,@CONSTRUCTOR_ID);    
 SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="FOLLOW_UP_SEQUENCE" ColumnName="FOLLOW_UP_SEQUENCE" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@FOLLOW_UP_SEQUENCE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="FOLLOW_UP_SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
@ -1960,6 +1960,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" 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="TIME_DIST" ColumnName="TIME_DIST" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@TIME_DIST" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="TIME_DIST" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCTOR_ID" ColumnName="CONSTRUCTOR_ID" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCTOR_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCTOR_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@ -1967,7 +1968,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>SELECT        GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, TIME_DIST, 
                         EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, 
-                         PROCESS_SELECT9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME
+                         PROCESS_SELECT9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, CONSTRUCTOR_ID
 FROM            TBPMO_FOLLOW_UP_EMAIL</CommandText>
                    <Parameters />
                  </DbCommand>
@ -1980,7 +1981,7 @@ SET                FOLLOW_UP_SEQUENCE = @FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS = @F
                         TIME_SPAN = @TIME_SPAN, EMAIL_SUBJECT = @EMAIL_SUBJECT, EMAIL_BODY = @EMAIL_BODY, PROCESS_SELECT1 = @PROCESS_SELECT1, PROCESS_SELECT2 = @PROCESS_SELECT2, 
                         PROCESS_SELECT3 = @PROCESS_SELECT3, PROCESS_SELECT4 = @PROCESS_SELECT4, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, TIME_DIST = @TIME_DIST, 
                         PROCESS_SELECT5 = @PROCESS_SELECT5, PROCESS_SELECT6 = @PROCESS_SELECT6, PROCESS_SELECT7 = @PROCESS_SELECT7, PROCESS_SELECT8 = @PROCESS_SELECT8, 
-                         PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCESS_SELECT10, NAME = @NAME
+                         PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCESS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID
 WHERE        (GUID = @Original_GUID);    
 SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
@ -2008,6 +2009,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
                      <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_SELECT9" ColumnName="PROCESS_SELECT9" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_SELECT9" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="PROCESS_SELECT9" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_SELECT10" ColumnName="PROCESS_SELECT10" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_SELECT10" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="PROCESS_SELECT10" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="CONSTRUCTOR_ID" ColumnName="CONSTRUCTOR_ID" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONSTRUCTOR_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONSTRUCTOR_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" 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_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@ -2044,6 +2046,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
              <Mapping SourceColumn="PROCESS_SELECT9" DataSetColumn="PROCESS_SELECT9" />
              <Mapping SourceColumn="PROCESS_SELECT10" DataSetColumn="PROCESS_SELECT10" />
              <Mapping SourceColumn="NAME" DataSetColumn="NAME" />
              <Mapping SourceColumn="CONSTRUCTOR_ID" DataSetColumn="CONSTRUCTOR_ID" />
            </Mappings>
            <Sources />
          </TableAdapter>
@ -2849,7 +2852,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_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: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: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" />
@ -2890,7 +2893,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_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: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: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" />
@ -2968,7 +2971,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_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: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: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" />
@ -3063,7 +3066,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_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: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: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" />
@ -3086,7 +3089,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_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: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: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" />
@ -3131,7 +3134,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_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: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: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" />
@ -3169,7 +3172,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_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: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: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" />
@ -3204,7 +3207,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_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: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: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" />
@ -3241,7 +3244,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_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: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: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" />
@ -3262,7 +3265,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_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: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: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" />
@ -3299,7 +3302,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_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: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: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" />
@ -3325,7 +3328,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_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: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: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" />
@ -3366,7 +3369,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_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: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: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">
@ -3413,7 +3416,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_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: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: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">
@ -3458,7 +3461,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_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: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: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" />
@ -3525,7 +3528,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_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: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: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" />
@ -3562,7 +3565,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_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: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: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" />
@ -3617,7 +3620,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_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: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: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" />
@ -3656,7 +3659,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_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: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: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" />
@ -3780,7 +3783,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_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: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: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" />
@ -3842,7 +3845,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_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: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: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" />
@ -3872,7 +3875,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_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: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: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" />
@ -3902,7 +3905,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_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: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: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" />
@ -3939,7 +3942,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_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: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: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" />
@ -3964,7 +3967,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_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: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:complexType>
            <xs:sequence>
              <xs:element name="BEZEICHNUNG" msprop:Generator_ColumnVarNameInTable="columnBEZEICHNUNG" msprop:Generator_ColumnPropNameInRow="BEZEICHNUNG" msprop:Generator_ColumnPropNameInTable="BEZEICHNUNGColumn" msprop:Generator_UserColumnName="BEZEICHNUNG">
@ -3984,7 +3987,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_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" />
@ -4023,7 +4026,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_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: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: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" />
@ -4067,7 +4070,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_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: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: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" />
@ -4097,7 +4100,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_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: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: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" />
@ -4144,7 +4147,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_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: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: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" />
@ -4295,10 +4298,11 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
              <xs:element name="CONSTRUCTOR_ID" msprop:Generator_ColumnVarNameInTable="columnCONSTRUCTOR_ID" msprop:Generator_ColumnPropNameInRow="CONSTRUCTOR_ID" msprop:Generator_ColumnPropNameInTable="CONSTRUCTOR_IDColumn" msprop:Generator_UserColumnName="CONSTRUCTOR_ID" type="xs:int" />
            </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_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: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: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" />
@ -4323,7 +4327,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_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: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: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" />
@ -4358,7 +4362,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_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: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: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" />
@ -4387,7 +4391,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_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: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: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" />
@ -4442,7 +4446,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_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: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: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" />
@ -4501,7 +4505,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_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" 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" />
@ -4574,7 +4578,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_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" />
@ -4680,7 +4684,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <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: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: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" />
@ -4774,7 +4778,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_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: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: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" />
@ -4813,7 +4817,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_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: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: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" />
@ -4831,7 +4835,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_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: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: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" />
@ -4877,7 +4881,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_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: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: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" />
@ -5044,27 +5048,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_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_FORM_VIEW_FORM_ID" msprop:Generator_UserParentTable="TBPMO_FORM" />
+      <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_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_FORM_FV_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_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_ParentPropName="TBPMO_WORKFLOWRow" msprop:Generator_RelationVarName="relationFK_TTBPMO_WORKFLOW_FORM_WF_ID" msprop:Generator_UserParentTable="TBPMO_WORKFLOW" />
+      <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_ParentPropName="TBPMO_RECORDRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID" msprop:Generator_UserParentTable="TBPMO_RECORD" />
+      <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_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_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_ParentPropName="TBPMO_RECORDRow" msprop:Generator_RelationVarName="relationFK_TBPMO_WORKFLOW_TASK_RECORD_ID1" msprop:Generator_UserParentTable="TBPMO_RECORD" />
+      <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_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_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_ParentPropName="TBDD_EINGANGSARTENRow" msprop:Generator_RelationVarName="relationFK_TBDD_DOKUMENTART_EINGID" msprop:Generator_UserParentTable="TBDD_EINGANGSARTEN" />
+      <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_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" />
+      <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_ParentPropName="TBPMO_WD_FORMVIEW_DOKTYPESRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID1" msprop:Generator_UserParentTable="TBPMO_WD_FORMVIEW_DOKTYPES" />
+      <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_RelationVarName="relationFK_TBPMO_FORM_FORM_TYPE_ID" msprop:Generator_UserParentTable="TBPMO_FORM_TYPE" msprop:Generator_ParentPropName="TBPMO_FORM_TYPERow" />
+      <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_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_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_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <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_RelationVarName="relationFK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_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_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" />
-      <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_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_ParentPropName="TBPMO_FORMRow" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" 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_ParentPropName="TBPMO_TEMPLATERow" msprop:Generator_RelationVarName="relationFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" msprop:Generator_UserParentTable="TBPMO_TEMPLATE" />
+      <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_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_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_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_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_ParentPropName="TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_RelationVarName="relationFK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" msprop:Generator_UserParentTable="TBTEMP_QUICKDISPLAY" />
+      <msdata:Relationship name="FK_TBPMO_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" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xss
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss
@ -4,25 +4,25 @@
     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="-10" 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="-12" 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" />
+    <Shape ID="DesignTable:VWPMO_CONTROL_SCREEN" ZOrder="29" X="78" Y="352" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBPMO_FORM_VIEW" ZOrder="42" X="454" Y="68" Height="324" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPMO_RECORD" ZOrder="26" X="875" Y="408" Height="172" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBPMO_RECORD" ZOrder="28" X="875" Y="408" Height="172" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
    <Shape ID="DesignTable:VWPMO_DOKUMENTTYPES" ZOrder="62" X="554" Y="415" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_WD_FVIEW_DT_INDEX" ZOrder="61" X="819" Y="147" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK" ZOrder="25" X="603" Y="718" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK" ZOrder="27" X="603" Y="718" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK_STATE" ZOrder="60" X="950" Y="736" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <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:VWPMO_GUI_ENTITY" ZOrder="24" 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="12" X="1878" Y="564" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWPMO_WF_USER_ACTIVE" ZOrder="14" 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_FOLLOWING_TASKS" ZOrder="16" 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:VWPMO_WF_OVERVIEW_AUTHORITY" ZOrder="26" 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="15" 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="17" 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="2" 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="4" 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:TBPMO_FILES_USER" ZOrder="2" 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="13" 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="15" 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_FOLLOW_UP_EMAIL" ZOrder="1" X="903" Y="388" Height="204" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="136" />
-    <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_FOLLUPEMAIL_USER" ZOrder="32" 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:TBPMO_RECORD_LOG_CONFIG" ZOrder="25" 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_RECORD_CHANGES" ZOrder="30" 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="17" 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="19" 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_EMAIL_ACCOUNT" ZOrder="23" 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:TBDD_CONNECTION" ZOrder="22" 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="1" X="1246" Y="352" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="3" 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:VWDDINDEX_AUTOM" ZOrder="18" 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" ZOrder="13" 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_ENTITY" ZOrder="12" 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:TBPMO_TEMPLATE_PATTERN" ZOrder="9" 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" />
+    <Shape ID="DesignTable:TBTEMP_QUICKDISPLAY" ZOrder="7" 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">
@ -242,7 +242,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" ZOrder="30" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" ZOrder="31" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>1632</X>
@ -254,7 +254,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="19" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="21" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>1358</X>
@ -266,7 +266,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="20" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>282</X>
@ -282,7 +282,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="9" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="11" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>299</X>
@ -294,7 +294,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="8" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="10" 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="6" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" ZOrder="8" 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="4" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" ZOrder="6" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2134</X>
@ -330,15 +330,15 @@
        </Point>
        <Point>
          <X>2134</X>
-          <Y>605</Y>
+          <Y>406</Y>
        </Point>
        <Point>
-          <X>1155</X>
+          <X>1061</X>
-          <Y>605</Y>
+          <Y>406</Y>
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="3" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="5" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2142</X>
@ -346,11 +346,11 @@
        </Point>
        <Point>
          <X>2142</X>
-          <Y>613</Y>
+          <Y>414</Y>
        </Point>
        <Point>
-          <X>1155</X>
+          <X>1061</X>
-          <Y>613</Y>
+          <Y>414</Y>
        </Point>
      </RoutePoints>
    </Connector>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.34014
+'     Laufzeitversion:4.0.30319.34209
 '
 '     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 '     der Code erneut generiert wird.
@ -184,6 +184,18 @@ Namespace My
                Me("Constructor_DetailsSplitter") = value
            End Set
        End Property
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
        Public Property User_InBoxScan_NotinFront() As Boolean
            Get
                Return CType(Me("User_InBoxScan_NotinFront"),Boolean)
            End Get
            Set
                Me("User_InBoxScan_NotinFront") = value
            End Set
        End Property
    End Class
 End Namespace
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -40,5 +40,8 @@
    <Setting Name="Constructor_DetailsSplitter" Type="System.Int32" Scope="User">
      <Value Profile="(Default)">764</Value>
    </Setting>
    <Setting Name="User_InBoxScan_NotinFront" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
    </Setting>
  </Settings>
 </SettingsFile>
--- a/app/DD-Record-Organiser/frmForm_Constructor.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.vb
@ -1249,7 +1249,7 @@ Public Class frmForm_Constructor
    Sub Refresh_TaskOverview()
        Dim frmCollection As New FormCollection()
        frmCollection = Application.OpenForms()
-        If frmTaskOverview.IsHandleCreated Then
+        If frmTaskOverview.IsHandleCreated = False Then
            If Sett_TaskOverviewKeepInFront = True Then
                frmTaskOverview.Refresh()
            End If
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb
@ -23,9 +23,9 @@ Partial Class frmForm_Constructor_Main_2
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmForm_Constructor_Main_2))
        Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
@ -179,6 +179,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.grvwGrid.GridControl = Me.GridControlMain
        Me.grvwGrid.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & _
    "ssen"
        Me.grvwGrid.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always
        Me.grvwGrid.Name = "grvwGrid"
        Me.grvwGrid.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
        Me.grvwGrid.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
@ -188,6 +189,8 @@ Partial Class frmForm_Constructor_Main_2
        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False
        Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False
        Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False
        Me.grvwGrid.OptionsSelection.MultiSelect = True
        Me.grvwGrid.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
        Me.grvwGrid.OptionsView.ColumnAutoWidth = False
        Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True
        Me.grvwGrid.OptionsView.EnableAppearanceOddRow = True
@ -200,16 +203,16 @@ Partial Class frmForm_Constructor_Main_2
        Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
        Me.GridControlMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.GridControlMain.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        GridLevelNode4.LevelTemplate = Me.grvwGrid
+        GridLevelNode1.LevelTemplate = Me.grvwGrid
-        GridLevelNode4.RelationName = "Level1"
+        GridLevelNode1.RelationName = "Level1"
-        GridLevelNode5.LevelTemplate = Me.grvwCarousel
+        GridLevelNode2.LevelTemplate = Me.grvwCarousel
-        GridLevelNode5.RelationName = "Level2"
+        GridLevelNode2.RelationName = "Level2"
-        GridLevelNode6.RelationName = "Level3"
+        GridLevelNode3.RelationName = "Level3"
-        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4, GridLevelNode5, GridLevelNode6})
+        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
        Me.GridControlMain.Location = New System.Drawing.Point(0, 0)
        Me.GridControlMain.MainView = Me.grvwTiles
        Me.GridControlMain.Name = "GridControlMain"
-        Me.GridControlMain.Size = New System.Drawing.Size(795, 270)
+        Me.GridControlMain.Size = New System.Drawing.Size(788, 270)
        Me.GridControlMain.TabIndex = 0
        Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid})
        '
@ -464,7 +467,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.SplitContainerBottom.Panel1.Text = "Panel1"
        Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2)
        Me.SplitContainerBottom.Panel2.Text = "Panel2"
-        Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 372)
+        Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365)
        Me.SplitContainerBottom.SplitterPosition = 576
        Me.SplitContainerBottom.TabIndex = 0
        Me.SplitContainerBottom.Text = "SplitContainerControl1"
@ -480,7 +483,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.TCDetails.Location = New System.Drawing.Point(0, 25)
        Me.TCDetails.Name = "TCDetails"
        Me.TCDetails.SelectedTabPage = Me.TabDetails
-        Me.TCDetails.Size = New System.Drawing.Size(1078, 347)
+        Me.TCDetails.Size = New System.Drawing.Size(1071, 340)
        Me.TCDetails.TabIndex = 1
        Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos})
        '
@ -489,7 +492,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.TabDetails.Controls.Add(Me.pnlDetails)
        Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD
        Me.TabDetails.Name = "TabDetails"
-        Me.TabDetails.Size = New System.Drawing.Size(1072, 316)
+        Me.TabDetails.Size = New System.Drawing.Size(1069, 312)
        Me.TabDetails.Text = "Detailansicht"
        '
        'pnlDetails
@ -498,7 +501,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlDetails.Location = New System.Drawing.Point(0, 0)
        Me.pnlDetails.Name = "pnlDetails"
-        Me.pnlDetails.Size = New System.Drawing.Size(1072, 316)
+        Me.pnlDetails.Size = New System.Drawing.Size(1069, 312)
        Me.pnlDetails.TabIndex = 0
        '
        'TabWindream
@ -881,7 +884,7 @@ Partial Class frmForm_Constructor_Main_2
        Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEditMode, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks})
        Me.ToolStripEdit.Location = New System.Drawing.Point(0, 0)
        Me.ToolStripEdit.Name = "ToolStripEdit"
-        Me.ToolStripEdit.Size = New System.Drawing.Size(1078, 25)
+        Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25)
        Me.ToolStripEdit.TabIndex = 0
        Me.ToolStripEdit.Text = "ToolStrip1"
        '
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx
@ -154,23 +154,6 @@
  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 93</value>
  </metadata>
  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1157, 15</value>
  </metadata>
  <metadata name="BindingNavigatorPOS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>124, 93</value>
  </metadata>
  <data name="TabPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
        SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
        wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
 </value>
  </data>
  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>773, 15</value>
  </metadata>
  <data name="AxObjectListControl.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@ -262,6 +245,17 @@
        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="TabPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
        SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
        wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
 </value>
  </data>
  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>773, 15</value>
  </metadata>
  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>162, 11</value>
  </metadata>
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
@ -2082,7 +2082,7 @@ Public Class frmForm_Constructor_Main_2
                Refresh_FollowUps()
                dtpFollowUp.Enabled = False
                lblWiedervorlage_Control.Text = "<< Waiting for Selection:"
-                ListBoxUser2Profile.Items.Clear()
+                'ListBoxUser2Profile.Items.Clear()
                grpbxFU_Profile.Enabled = False
            End If
            ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
@ -2909,7 +2909,12 @@ Public Class frmForm_Constructor_Main_2
                            dtpFollowUp.Value = CDate(Now)
                        End If
                        FOLL_UP_RECORD_DEFINED = True
                        Try
                            dtpFollowUp.Value = CDate(datevalue)
                        Catch ex As Exception
                            dtpFollowUp.Value = CDate(Now)
                        End Try
                    Else
                        dtpFollowUp.Value = CDate(Now)
                        FOLL_UP_RECORD_DEFINED = False
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@ -57,7 +57,7 @@ Partial Class frmMain
        Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem()
        Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.groupQuickAccess = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.pageForms = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.pageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroupProgram = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -69,6 +69,7 @@ Partial Class frmMain
        Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
        Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
        Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components)
        Me.TimerScan = New System.Windows.Forms.Timer(Me.components)
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ribbonMain, System.ComponentModel.ISupportInitialize).BeginInit()
@ -340,7 +341,7 @@ Partial Class frmMain
        '
        'pageHome
        '
-        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess})
+        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm})
        Me.pageHome.Image = Global.DD_Record_Organiser.My.Resources.Resources.HomeHS
        Me.pageHome.Name = "pageHome"
        Me.pageHome.Text = "Home"
@ -353,10 +354,10 @@ Partial Class frmMain
        Me.RibbonPageGroup2.ShowCaptionButton = False
        Me.RibbonPageGroup2.Text = "Kalender"
        '
-        'groupQuickAccessDemo
+        'groupQuickAccessForm
        '
-        Me.groupQuickAccess.Name = "groupQuickAccessDemo"
+        Me.groupQuickAccessForm.Name = "groupQuickAccessForm"
-        Me.groupQuickAccess.Text = "Schnellstart "
+        Me.groupQuickAccessForm.Text = "Schnellstart "
        '
        'pageForms
        '
@ -443,6 +444,10 @@ Partial Class frmMain
        '
        Me.TimerClose3Minutes.Interval = 180000
        '
        'TimerScan
        '
        Me.TimerScan.Interval = 10000
        '
        'frmMain
        '
        Me.Appearance.BackColor = System.Drawing.Color.White
@ -514,5 +519,7 @@ Partial Class frmMain
    Friend WithEvents BarButtonItem17 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents groupQuickAccess As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents TimerClose3Minutes As System.Windows.Forms.Timer
    Friend WithEvents groupQuickAccessForm As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents TimerScan As System.Windows.Forms.Timer
 End Class
--- a/app/DD-Record-Organiser/frmMain.resx
+++ b/app/DD-Record-Organiser/frmMain.resx
@ -1690,6 +1690,9 @@
  <metadata name="TimerClose3Minutes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1365, 17</value>
  </metadata>
  <metadata name="TimerScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 56</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIUAAAEAGAD4zwAAFgAAACgAAACAAAAACgEAAAEAGAAAAAAAAAAAAEgAAABIAAAAAAAAAAAA
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -49,17 +49,7 @@ Public Class frmMain
        LoadQuickStartItems()
        VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
        VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
-        Try
+        
            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles")
            If Not IsNothing(DT) Then
                If DT.Rows.Count > 0 Then
                    frmScanFiles.Show()
                End If
            End If
        Catch ex As Exception
            MsgBox("Error in Load InBox Scan:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
    Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
        Try
@ -157,6 +147,7 @@ Public Class frmMain
    End Sub
    Public Sub LoadQuickStartItems()
        Try
            Dim SQL2 As String = "SELECT * FROM TBPMO_FORM_CONSTRUCTOR ORDER BY SEQUENCE_MENU"
            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
            Dim image2 As Bitmap = LoadNoImage()
@ -190,11 +181,17 @@ Public Class frmMain
            '    Next
            'End If
-
+            Try
-
+                If Not IsNothing(groupQuickAccessForm) Then
-        Do While 0 < groupQuickAccess.ItemLinks.Count
+                    Do While 0 < groupQuickAccessForm.ItemLinks.Count
-            groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0))
+                        groupQuickAccessForm.ItemLinks.Remove(groupQuickAccessForm.ItemLinks(0))
                    Loop
                End If
            Catch ex As Exception
            End Try
            If dt.Rows.Count <> 0 Then
@ -215,11 +212,15 @@ Public Class frmMain
                    item.Glyph = image2
                    AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick
-                groupQuickAccess.ItemLinks.Add(item)
+                    groupQuickAccessForm.ItemLinks.Add(item)
                Next
            End If
        Catch ex As Exception
            MsgBox("Unexpected Error in Load QuickStart-Items:" & vbNewLine & ex.Message)
        End Try
    End Sub
@ -356,6 +357,7 @@ Public Class frmMain
    Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        Refresh_TaskReminder()
        Timer1.Start()
        TimerScan.Start()
        If Sett_ConstructorStart <> 0 Then
            Cursor = Cursors.WaitCursor
            OpenFormConstructor(Sett_ConstructorStart)
@ -542,4 +544,41 @@ Public Class frmMain
                End Try
        End Select
    End Sub
    Private Sub TimerScan_Tick(sender As Object, e As EventArgs) Handles TimerScan.Tick
        Check_Scan()
    End Sub
    Sub Check_scan()
        Try
            Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles")
            If Not IsNothing(DT) Then
                If DT.Rows.Count > 0 Then
                    Dim open As Boolean = False
                    For Each form In My.Application.OpenForms
                        If (form.name = frmScanFiles.Name) Then
                            'form is loaded so can do work 
                            'if you need to check whether it is actually visible
                            If form.Visible Then
                                open = True
                                'do work when visible
                                If My.Settings.User_InBoxScan_NotinFront = False Then
                                    frmScanFiles.BringToFront()
                                End If
                            Else
                            End If
                        End If
                    Next
                    If open = False Then
                        Dim frm As New frmScanFiles
                        frm = frmScanFiles.Instance()
                        frm.Show()
                    End If
                End If
            End If
        Catch ex As Exception
            MsgBox("Error in Load InBox Scan:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmScanFiles.Designer.vb
+++ b/app/DD-Record-Organiser/frmScanFiles.Designer.vb
@ -68,13 +68,12 @@ Partial Class frmScanFiles
        Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController()
        Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController()
        Me.btndelete = New System.Windows.Forms.Button()
-        Me.ImageListBoxControl1 = New DevExpress.XtraEditors.ImageListBoxControl()
+        Me.chkInFront = New System.Windows.Forms.CheckBox()
        Me.Panel1.SuspendLayout()
        Me.StatusStrip2.SuspendLayout()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'ListView1
@ -96,7 +95,7 @@ Partial Class frmScanFiles
        '
        'ColumnHeader2
        '
-        Me.ColumnHeader2.Text = "Datei - Drag and Drop fähig"
+        Me.ColumnHeader2.Text = "Scandatei - Drag and Drop fähig"
        Me.ColumnHeader2.Width = 315
        '
        'ImageList1
@ -385,28 +384,33 @@ Partial Class frmScanFiles
        Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btndelete.UseVisualStyleBackColor = True
        '
-        'ImageListBoxControl1
+        'chkInFront
        '
-        Me.ImageListBoxControl1.Location = New System.Drawing.Point(26, 269)
+        Me.chkInFront.AutoSize = True
-        Me.ImageListBoxControl1.Name = "ImageListBoxControl1"
+        Me.chkInFront.Checked = Global.DD_Record_Organiser.My.MySettings.Default.User_InBoxScan_NotinFront
-        Me.ImageListBoxControl1.Size = New System.Drawing.Size(293, 194)
+        Me.chkInFront.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organiser.My.MySettings.Default, "User_InBoxScan_NotinFront", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.ImageListBoxControl1.TabIndex = 5
+        Me.chkInFront.Location = New System.Drawing.Point(12, 256)
        Me.chkInFront.Name = "chkInFront"
        Me.chkInFront.Size = New System.Drawing.Size(193, 17)
        Me.chkInFront.TabIndex = 5
        Me.chkInFront.Text = "Inaktiviere ""In den Vordergrund"""
        Me.chkInFront.UseVisualStyleBackColor = True
        '
        'frmScanFiles
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(934, 577)
-        Me.Controls.Add(Me.ImageListBoxControl1)
+        Me.Controls.Add(Me.chkInFront)
        Me.Controls.Add(Me.btndelete)
        Me.Controls.Add(Me.Panel1)
        Me.Controls.Add(Me.btnrefresh)
        Me.Controls.Add(Me.ListView1)
        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximizeBox = False
        Me.Name = "frmScanFiles"
-        Me.Text = "Inbox - Scanned Files"
+        Me.Text = "Inbox - Scan"
        Me.TopMost = True
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        Me.StatusStrip2.ResumeLayout(False)
@ -414,8 +418,8 @@ Partial Class frmScanFiles
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
    End Sub
    Friend WithEvents ListView1 As System.Windows.Forms.ListView
@ -462,5 +466,5 @@ Partial Class frmScanFiles
    Friend WithEvents PdfFormDataBarPageGroup1 As DevExpress.XtraPdfViewer.Bars.PdfFormDataBarPageGroup
    Friend WithEvents PdfBarController2 As DevExpress.XtraPdfViewer.Bars.PdfBarController
    Friend WithEvents btndelete As System.Windows.Forms.Button
-    Friend WithEvents ImageListBoxControl1 As DevExpress.XtraEditors.ImageListBoxControl
+    Friend WithEvents chkInFront As System.Windows.Forms.CheckBox
 End Class
--- a/app/DD-Record-Organiser/frmScanFiles.resx
+++ b/app/DD-Record-Organiser/frmScanFiles.resx
@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADm
-        BwAAAk1TRnQBSQFMAwEBAAGQAQABkAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        BwAAAk1TRnQBSQFMAwEBAAHAAQABwAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
        AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
        AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
--- a/app/DD-Record-Organiser/frmScanFiles.vb
+++ b/app/DD-Record-Organiser/frmScanFiles.vb
@ -1,8 +1,17 @@
 Imports System.IO
 Public Class frmScanFiles
    Dim DragID
    Dim MouseIsDown As Boolean = False
    Private Shared _Instance As frmScanFiles = Nothing
    Public Shared Function Instance() As frmScanFiles
        If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then
            _Instance = New frmScanFiles
        End If
        _Instance.BringToFront()
        Return _Instance
    End Function
    Private Sub frmScanFiles_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
        ClassWindowLocation.SaveFormLocationSize(Me, 9999, CURRENT_SCREEN_ID, Me.Name)
    End Sub
@ -28,6 +37,7 @@ Public Class frmScanFiles
                        If extension.Contains("pdf") Then
                            'Add the file to the ListView, with the executable path as the key to the ImageList's image
                            ListView1.Items.Add(filename, 0)
                        Else
                            ListView1.Items.Add(filename)
                        End If
@ -141,4 +151,12 @@ Public Class frmScanFiles
    End Sub
    Private Sub frmScanFiles_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        Me.BringToFront()
    End Sub
    Private Sub chkInFront_CheckedChanged(sender As Object, e As EventArgs) Handles chkInFront.CheckedChanged
        My.Settings.Save()
    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb
+++ b/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb
@ -45,9 +45,14 @@ Partial Class frmWiedervorlage
        Dim PROCESS_SELECT4Label As System.Windows.Forms.Label
        Dim PROCESS_SELECT5Label As System.Windows.Forms.Label
        Dim Label6 As System.Windows.Forms.Label
        Dim Label8 As System.Windows.Forms.Label
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWiedervorlage))
        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
        Me.cmbConstructor = New System.Windows.Forms.ComboBox()
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
        Me.ListBoxUser2Profile = New System.Windows.Forms.ListBox()
        Me.Label5 = New System.Windows.Forms.Label()
@ -55,8 +60,6 @@ Partial Class frmWiedervorlage
        Me.btnAddUser_WV = New System.Windows.Forms.Button()
        Me.btndelete = New System.Windows.Forms.Button()
        Me.FOLLOW_UP_DAYSTextBox = New System.Windows.Forms.TextBox()
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.chkSonntag = New System.Windows.Forms.CheckBox()
        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
@ -116,6 +119,7 @@ Partial Class frmWiedervorlage
        Me.Label7 = New System.Windows.Forms.Label()
        Me.TBPMO_FOLLOW_UP_EMAILTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FOLLOW_UP_EMAILTableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
        GUIDLabel = New System.Windows.Forms.Label()
        FOLLOW_UP_SEQUENCELabel = New System.Windows.Forms.Label()
        FOLLOW_UP_TIME_SPANLabel = New System.Windows.Forms.Label()
@ -138,12 +142,14 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT4Label = New System.Windows.Forms.Label()
        PROCESS_SELECT5Label = New System.Windows.Forms.Label()
        Label6 = New System.Windows.Forms.Label()
        Label8 = New System.Windows.Forms.Label()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl1.SuspendLayout()
        Me.XtraTabPage1.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
        CType(Me.TBPMO_FOLLOW_UP_EMAILBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox3.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.SuspendLayout()
@ -176,7 +182,7 @@ Partial Class frmWiedervorlage
        FOLLOW_UP_TIME_SPANLabel.AutoSize = True
        FOLLOW_UP_TIME_SPANLabel.Location = New System.Drawing.Point(620, 99)
        FOLLOW_UP_TIME_SPANLabel.Name = "FOLLOW_UP_TIME_SPANLabel"
-        FOLLOW_UP_TIME_SPANLabel.Size = New System.Drawing.Size(60, 13)
+        FOLLOW_UP_TIME_SPANLabel.Size = New System.Drawing.Size(57, 13)
        FOLLOW_UP_TIME_SPANLabel.TabIndex = 8
        FOLLOW_UP_TIME_SPANLabel.Text = "Uhrzeiten:"
        '
@ -186,7 +192,7 @@ Partial Class frmWiedervorlage
        DEPENDENT_DATE_CTRL_IDLabel.ForeColor = System.Drawing.Color.OrangeRed
        DEPENDENT_DATE_CTRL_IDLabel.Location = New System.Drawing.Point(356, 150)
        DEPENDENT_DATE_CTRL_IDLabel.Name = "DEPENDENT_DATE_CTRL_IDLabel"
-        DEPENDENT_DATE_CTRL_IDLabel.Size = New System.Drawing.Size(87, 13)
+        DEPENDENT_DATE_CTRL_IDLabel.Size = New System.Drawing.Size(81, 13)
        DEPENDENT_DATE_CTRL_IDLabel.TabIndex = 10
        DEPENDENT_DATE_CTRL_IDLabel.Text = "Datum-Control:"
        '
@ -196,7 +202,7 @@ Partial Class frmWiedervorlage
        DEPENDENT_DONE_CTRL_IDLabel.ForeColor = System.Drawing.Color.OrangeRed
        DEPENDENT_DONE_CTRL_IDLabel.Location = New System.Drawing.Point(551, 148)
        DEPENDENT_DONE_CTRL_IDLabel.Name = "DEPENDENT_DONE_CTRL_IDLabel"
-        DEPENDENT_DONE_CTRL_IDLabel.Size = New System.Drawing.Size(92, 13)
+        DEPENDENT_DONE_CTRL_IDLabel.Size = New System.Drawing.Size(85, 13)
        DEPENDENT_DONE_CTRL_IDLabel.TabIndex = 12
        DEPENDENT_DONE_CTRL_IDLabel.Text = "Erledigt Control:"
        '
@ -205,7 +211,7 @@ Partial Class frmWiedervorlage
        PARENT_IDLabel.AutoSize = True
        PARENT_IDLabel.Location = New System.Drawing.Point(64, 190)
        PARENT_IDLabel.Name = "PARENT_IDLabel"
-        PARENT_IDLabel.Size = New System.Drawing.Size(123, 13)
+        PARENT_IDLabel.Size = New System.Drawing.Size(116, 13)
        PARENT_IDLabel.TabIndex = 14
        PARENT_IDLabel.Text = "Nachfolgevorlage von:"
        '
@ -214,7 +220,7 @@ Partial Class frmWiedervorlage
        TIME_UNITYLabel.AutoSize = True
        TIME_UNITYLabel.Location = New System.Drawing.Point(137, 149)
        TIME_UNITYLabel.Name = "TIME_UNITYLabel"
-        TIME_UNITYLabel.Size = New System.Drawing.Size(68, 13)
+        TIME_UNITYLabel.Size = New System.Drawing.Size(64, 13)
        TIME_UNITYLabel.TabIndex = 16
        TIME_UNITYLabel.Text = "Zeit Einheit:"
        '
@ -223,7 +229,7 @@ Partial Class frmWiedervorlage
        TIME_SPANLabel.AutoSize = True
        TIME_SPANLabel.Location = New System.Drawing.Point(64, 149)
        TIME_SPANLabel.Name = "TIME_SPANLabel"
-        TIME_SPANLabel.Size = New System.Drawing.Size(70, 13)
+        TIME_SPANLabel.Size = New System.Drawing.Size(67, 13)
        TIME_SPANLabel.TabIndex = 18
        TIME_SPANLabel.Text = "Zeit Distanz:"
        '
@ -232,7 +238,7 @@ Partial Class frmWiedervorlage
        TIME_DISTLabel.AutoSize = True
        TIME_DISTLabel.Location = New System.Drawing.Point(229, 149)
        TIME_DISTLabel.Name = "TIME_DISTLabel"
-        TIME_DISTLabel.Size = New System.Drawing.Size(96, 13)
+        TIME_DISTLabel.Size = New System.Drawing.Size(89, 13)
        TIME_DISTLabel.TabIndex = 22
        TIME_DISTLabel.Text = "Zeit-Abhängikeit:"
        '
@ -281,7 +287,7 @@ Partial Class frmWiedervorlage
        NAMELabel.AutoSize = True
        NAMELabel.Location = New System.Drawing.Point(64, 59)
        NAMELabel.Name = "NAMELabel"
-        NAMELabel.Size = New System.Drawing.Size(77, 13)
+        NAMELabel.Size = New System.Drawing.Size(71, 13)
        NAMELabel.TabIndex = 78
        NAMELabel.Text = "Bezeichnung:"
        '
@ -290,7 +296,7 @@ Partial Class frmWiedervorlage
        EMAIL_SUBJECTLabel.AutoSize = True
        EMAIL_SUBJECTLabel.Location = New System.Drawing.Point(64, 230)
        EMAIL_SUBJECTLabel.Name = "EMAIL_SUBJECTLabel"
-        EMAIL_SUBJECTLabel.Size = New System.Drawing.Size(76, 13)
+        EMAIL_SUBJECTLabel.Size = New System.Drawing.Size(73, 13)
        EMAIL_SUBJECTLabel.TabIndex = 80
        EMAIL_SUBJECTLabel.Text = "Email-Betreff:"
        '
@ -299,7 +305,7 @@ Partial Class frmWiedervorlage
        EMAIL_BODYLabel.AutoSize = True
        EMAIL_BODYLabel.Location = New System.Drawing.Point(64, 271)
        EMAIL_BODYLabel.Name = "EMAIL_BODYLabel"
-        EMAIL_BODYLabel.Size = New System.Drawing.Size(67, 13)
+        EMAIL_BODYLabel.Size = New System.Drawing.Size(63, 13)
        EMAIL_BODYLabel.TabIndex = 81
        EMAIL_BODYLabel.Text = "Email-Body:"
        '
@ -308,7 +314,7 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT1Label.AutoSize = True
        PROCESS_SELECT1Label.Location = New System.Drawing.Point(551, 230)
        PROCESS_SELECT1Label.Name = "PROCESS_SELECT1Label"
-        PROCESS_SELECT1Label.Size = New System.Drawing.Size(102, 13)
+        PROCESS_SELECT1Label.Size = New System.Drawing.Size(104, 13)
        PROCESS_SELECT1Label.TabIndex = 82
        PROCESS_SELECT1Label.Text = "Select [%pattern1]:"
        '
@ -317,7 +323,7 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT2Label.AutoSize = True
        PROCESS_SELECT2Label.Location = New System.Drawing.Point(551, 271)
        PROCESS_SELECT2Label.Name = "PROCESS_SELECT2Label"
-        PROCESS_SELECT2Label.Size = New System.Drawing.Size(102, 13)
+        PROCESS_SELECT2Label.Size = New System.Drawing.Size(104, 13)
        PROCESS_SELECT2Label.TabIndex = 83
        PROCESS_SELECT2Label.Text = "Select [%pattern2]:"
        '
@ -326,7 +332,7 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT3Label.AutoSize = True
        PROCESS_SELECT3Label.Location = New System.Drawing.Point(551, 312)
        PROCESS_SELECT3Label.Name = "PROCESS_SELECT3Label"
-        PROCESS_SELECT3Label.Size = New System.Drawing.Size(102, 13)
+        PROCESS_SELECT3Label.Size = New System.Drawing.Size(104, 13)
        PROCESS_SELECT3Label.TabIndex = 84
        PROCESS_SELECT3Label.Text = "Select [%pattern3]:"
        '
@ -335,7 +341,7 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT4Label.AutoSize = True
        PROCESS_SELECT4Label.Location = New System.Drawing.Point(551, 353)
        PROCESS_SELECT4Label.Name = "PROCESS_SELECT4Label"
-        PROCESS_SELECT4Label.Size = New System.Drawing.Size(102, 13)
+        PROCESS_SELECT4Label.Size = New System.Drawing.Size(104, 13)
        PROCESS_SELECT4Label.TabIndex = 85
        PROCESS_SELECT4Label.Text = "Select [%pattern4]:"
        '
@ -344,7 +350,7 @@ Partial Class frmWiedervorlage
        PROCESS_SELECT5Label.AutoSize = True
        PROCESS_SELECT5Label.Location = New System.Drawing.Point(551, 394)
        PROCESS_SELECT5Label.Name = "PROCESS_SELECT5Label"
-        PROCESS_SELECT5Label.Size = New System.Drawing.Size(102, 13)
+        PROCESS_SELECT5Label.Size = New System.Drawing.Size(104, 13)
        PROCESS_SELECT5Label.TabIndex = 92
        PROCESS_SELECT5Label.Text = "Select [%pattern5]:"
        '
@ -358,6 +364,15 @@ Partial Class frmWiedervorlage
        Label6.TabIndex = 102
        Label6.Text = "Tage:"
        '
        'Label8
        '
        Label8.AutoSize = True
        Label8.Location = New System.Drawing.Point(441, 59)
        Label8.Name = "Label8"
        Label8.Size = New System.Drawing.Size(172, 13)
        Label8.TabIndex = 105
        Label8.Text = "Constructor für Jump To Function:"
        '
        'XtraTabControl1
        '
        Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
@ -376,6 +391,8 @@ Partial Class frmWiedervorlage
        'XtraTabPage1
        '
        Me.XtraTabPage1.AutoScroll = True
        Me.XtraTabPage1.Controls.Add(Label8)
        Me.XtraTabPage1.Controls.Add(Me.cmbConstructor)
        Me.XtraTabPage1.Controls.Add(Me.GroupBox3)
        Me.XtraTabPage1.Controls.Add(Label6)
        Me.XtraTabPage1.Controls.Add(Me.FOLLOW_UP_DAYSTextBox)
@ -429,9 +446,36 @@ Partial Class frmWiedervorlage
        Me.XtraTabPage1.Controls.Add(Me.Label1)
        Me.XtraTabPage1.Controls.Add(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator)
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(991, 617)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(987, 614)
        Me.XtraTabPage1.Text = "Wiedervorlage per E-Mail"
        '
        'cmbConstructor
        '
        Me.cmbConstructor.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CONSTRUCTOR_ID", True))
        Me.cmbConstructor.DataSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource
        Me.cmbConstructor.DisplayMember = "FORM_TITLE"
        Me.cmbConstructor.FormattingEnabled = True
        Me.cmbConstructor.Location = New System.Drawing.Point(444, 76)
        Me.cmbConstructor.Name = "cmbConstructor"
        Me.cmbConstructor.Size = New System.Drawing.Size(259, 21)
        Me.cmbConstructor.TabIndex = 104
        Me.cmbConstructor.ValueMember = "GUID"
        '
        'TBPMO_FOLLOW_UP_EMAILBindingSource
        '
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataMember = "TBPMO_FOLLOW_UP_EMAIL"
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataSource = Me.DD_DMSDataSet
        '
        'DD_DMSDataSet
        '
        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
        '
        'TBPMO_FORM_CONSTRUCTORBindingSource
        '
        Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataMember = "TBPMO_FORM_CONSTRUCTOR"
        Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataSource = Me.DD_DMSDataSet
        '
        'GroupBox3
        '
        Me.GroupBox3.Controls.Add(Me.ListBoxUser2Profile)
@ -514,20 +558,10 @@ Partial Class frmWiedervorlage
        Me.FOLLOW_UP_DAYSTextBox.Location = New System.Drawing.Point(554, 545)
        Me.FOLLOW_UP_DAYSTextBox.Name = "FOLLOW_UP_DAYSTextBox"
        Me.FOLLOW_UP_DAYSTextBox.ReadOnly = True
-        Me.FOLLOW_UP_DAYSTextBox.Size = New System.Drawing.Size(99, 22)
+        Me.FOLLOW_UP_DAYSTextBox.Size = New System.Drawing.Size(99, 21)
        Me.FOLLOW_UP_DAYSTextBox.TabIndex = 101
        Me.FOLLOW_UP_DAYSTextBox.TabStop = False
        '
        'TBPMO_FOLLOW_UP_EMAILBindingSource
        '
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataMember = "TBPMO_FOLLOW_UP_EMAIL"
        Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataSource = Me.DD_DMSDataSet
        '
        'DD_DMSDataSet
        '
        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
        '
        'GroupBox1
        '
        Me.GroupBox1.Controls.Add(Me.chkSonntag)
@ -549,7 +583,7 @@ Partial Class frmWiedervorlage
        Me.chkSonntag.AutoSize = True
        Me.chkSonntag.Location = New System.Drawing.Point(472, 18)
        Me.chkSonntag.Name = "chkSonntag"
-        Me.chkSonntag.Size = New System.Drawing.Size(70, 17)
+        Me.chkSonntag.Size = New System.Drawing.Size(66, 17)
        Me.chkSonntag.TabIndex = 100
        Me.chkSonntag.Text = "Sonntag"
        Me.chkSonntag.UseVisualStyleBackColor = True
@ -559,7 +593,7 @@ Partial Class frmWiedervorlage
        Me.CheckBox1.AutoSize = True
        Me.CheckBox1.Location = New System.Drawing.Point(10, 18)
        Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(67, 17)
+        Me.CheckBox1.Size = New System.Drawing.Size(62, 17)
        Me.CheckBox1.TabIndex = 94
        Me.CheckBox1.Text = "Montag"
        Me.CheckBox1.UseVisualStyleBackColor = True
@ -569,7 +603,7 @@ Partial Class frmWiedervorlage
        Me.chkSamstag.AutoSize = True
        Me.chkSamstag.Location = New System.Drawing.Point(402, 18)
        Me.chkSamstag.Name = "chkSamstag"
-        Me.chkSamstag.Size = New System.Drawing.Size(69, 17)
+        Me.chkSamstag.Size = New System.Drawing.Size(67, 17)
        Me.chkSamstag.TabIndex = 99
        Me.chkSamstag.Text = "Samstag"
        Me.chkSamstag.UseVisualStyleBackColor = True
@ -579,7 +613,7 @@ Partial Class frmWiedervorlage
        Me.chkDienstag.AutoSize = True
        Me.chkDienstag.Location = New System.Drawing.Point(83, 18)
        Me.chkDienstag.Name = "chkDienstag"
-        Me.chkDienstag.Size = New System.Drawing.Size(72, 17)
+        Me.chkDienstag.Size = New System.Drawing.Size(68, 17)
        Me.chkDienstag.TabIndex = 95
        Me.chkDienstag.Text = "Dienstag"
        Me.chkDienstag.UseVisualStyleBackColor = True
@ -589,7 +623,7 @@ Partial Class frmWiedervorlage
        Me.chkFreitag.AutoSize = True
        Me.chkFreitag.Location = New System.Drawing.Point(335, 18)
        Me.chkFreitag.Name = "chkFreitag"
-        Me.chkFreitag.Size = New System.Drawing.Size(62, 17)
+        Me.chkFreitag.Size = New System.Drawing.Size(60, 17)
        Me.chkFreitag.TabIndex = 98
        Me.chkFreitag.Text = "Freitag"
        Me.chkFreitag.UseVisualStyleBackColor = True
@ -599,7 +633,7 @@ Partial Class frmWiedervorlage
        Me.chkMittwoch.AutoSize = True
        Me.chkMittwoch.Location = New System.Drawing.Point(162, 18)
        Me.chkMittwoch.Name = "chkMittwoch"
-        Me.chkMittwoch.Size = New System.Drawing.Size(75, 17)
+        Me.chkMittwoch.Size = New System.Drawing.Size(69, 17)
        Me.chkMittwoch.TabIndex = 96
        Me.chkMittwoch.Text = "Mittwoch"
        Me.chkMittwoch.UseVisualStyleBackColor = True
@ -609,7 +643,7 @@ Partial Class frmWiedervorlage
        Me.chkDonnerstag.AutoSize = True
        Me.chkDonnerstag.Location = New System.Drawing.Point(243, 18)
        Me.chkDonnerstag.Name = "chkDonnerstag"
-        Me.chkDonnerstag.Size = New System.Drawing.Size(87, 17)
+        Me.chkDonnerstag.Size = New System.Drawing.Size(82, 17)
        Me.chkDonnerstag.TabIndex = 97
        Me.chkDonnerstag.Text = "Donnerstag"
        Me.chkDonnerstag.UseVisualStyleBackColor = True
@ -619,7 +653,7 @@ Partial Class frmWiedervorlage
        Me.PROCESS_SELECT5TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT5", True))
        Me.PROCESS_SELECT5TextBox.Location = New System.Drawing.Point(554, 410)
        Me.PROCESS_SELECT5TextBox.Name = "PROCESS_SELECT5TextBox"
-        Me.PROCESS_SELECT5TextBox.Size = New System.Drawing.Size(420, 22)
+        Me.PROCESS_SELECT5TextBox.Size = New System.Drawing.Size(420, 21)
        Me.PROCESS_SELECT5TextBox.TabIndex = 93
        '
        'Label4
@ -627,7 +661,7 @@ Partial Class frmWiedervorlage
        Me.Label4.AutoSize = True
        Me.Label4.Location = New System.Drawing.Point(706, 26)
        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(119, 13)
+        Me.Label4.Size = New System.Drawing.Size(111, 13)
        Me.Label4.TabIndex = 88
        Me.Label4.Text = "Wiedervorlageprofile:"
        '
@ -636,7 +670,7 @@ Partial Class frmWiedervorlage
        Me.PROCESS_SELECT4TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT4", True))
        Me.PROCESS_SELECT4TextBox.Location = New System.Drawing.Point(554, 369)
        Me.PROCESS_SELECT4TextBox.Name = "PROCESS_SELECT4TextBox"
-        Me.PROCESS_SELECT4TextBox.Size = New System.Drawing.Size(420, 22)
+        Me.PROCESS_SELECT4TextBox.Size = New System.Drawing.Size(420, 21)
        Me.PROCESS_SELECT4TextBox.TabIndex = 15
        '
        'PROCESS_SELECT3TextBox
@ -644,7 +678,7 @@ Partial Class frmWiedervorlage
        Me.PROCESS_SELECT3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT3", True))
        Me.PROCESS_SELECT3TextBox.Location = New System.Drawing.Point(554, 328)
        Me.PROCESS_SELECT3TextBox.Name = "PROCESS_SELECT3TextBox"
-        Me.PROCESS_SELECT3TextBox.Size = New System.Drawing.Size(420, 22)
+        Me.PROCESS_SELECT3TextBox.Size = New System.Drawing.Size(420, 21)
        Me.PROCESS_SELECT3TextBox.TabIndex = 14
        '
        'PROCESS_SELECT2TextBox
@ -652,7 +686,7 @@ Partial Class frmWiedervorlage
        Me.PROCESS_SELECT2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT2", True))
        Me.PROCESS_SELECT2TextBox.Location = New System.Drawing.Point(554, 287)
        Me.PROCESS_SELECT2TextBox.Name = "PROCESS_SELECT2TextBox"
-        Me.PROCESS_SELECT2TextBox.Size = New System.Drawing.Size(420, 22)
+        Me.PROCESS_SELECT2TextBox.Size = New System.Drawing.Size(420, 21)
        Me.PROCESS_SELECT2TextBox.TabIndex = 13
        '
        'PROCESS_SELECT1TextBox
@ -660,7 +694,7 @@ Partial Class frmWiedervorlage
        Me.PROCESS_SELECT1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT1", True))
        Me.PROCESS_SELECT1TextBox.Location = New System.Drawing.Point(554, 246)
        Me.PROCESS_SELECT1TextBox.Name = "PROCESS_SELECT1TextBox"
-        Me.PROCESS_SELECT1TextBox.Size = New System.Drawing.Size(420, 22)
+        Me.PROCESS_SELECT1TextBox.Size = New System.Drawing.Size(420, 21)
        Me.PROCESS_SELECT1TextBox.TabIndex = 12
        '
        'EMAIL_BODYTextBox
@ -679,7 +713,7 @@ Partial Class frmWiedervorlage
        Me.EMAIL_SUBJECTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "EMAIL_SUBJECT", True))
        Me.EMAIL_SUBJECTTextBox.Location = New System.Drawing.Point(67, 246)
        Me.EMAIL_SUBJECTTextBox.Name = "EMAIL_SUBJECTTextBox"
-        Me.EMAIL_SUBJECTTextBox.Size = New System.Drawing.Size(479, 22)
+        Me.EMAIL_SUBJECTTextBox.Size = New System.Drawing.Size(479, 21)
        Me.EMAIL_SUBJECTTextBox.TabIndex = 10
        '
        'NAMETextBox
@ -687,7 +721,7 @@ Partial Class frmWiedervorlage
        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "NAME", True))
        Me.NAMETextBox.Location = New System.Drawing.Point(67, 74)
        Me.NAMETextBox.Name = "NAMETextBox"
-        Me.NAMETextBox.Size = New System.Drawing.Size(227, 22)
+        Me.NAMETextBox.Size = New System.Drawing.Size(227, 21)
        Me.NAMETextBox.TabIndex = 0
        '
        'ListBox1
@ -704,11 +738,10 @@ Partial Class frmWiedervorlage
        '
        'lblSaveWVEmail
        '
        Me.lblSaveWVEmail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblSaveWVEmail.AutoSize = True
        Me.lblSaveWVEmail.BackColor = System.Drawing.Color.Yellow
        Me.lblSaveWVEmail.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblSaveWVEmail.Location = New System.Drawing.Point(724, 196)
+        Me.lblSaveWVEmail.Location = New System.Drawing.Point(706, 192)
        Me.lblSaveWVEmail.Name = "lblSaveWVEmail"
        Me.lblSaveWVEmail.Size = New System.Drawing.Size(219, 17)
        Me.lblSaveWVEmail.TabIndex = 78
@ -772,7 +805,7 @@ Partial Class frmWiedervorlage
        'ACTIVECheckBox
        '
        Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "ACTIVE", True))
-        Me.ACTIVECheckBox.Location = New System.Drawing.Point(469, 72)
+        Me.ACTIVECheckBox.Location = New System.Drawing.Point(623, 26)
        Me.ACTIVECheckBox.Name = "ACTIVECheckBox"
        Me.ACTIVECheckBox.Size = New System.Drawing.Size(58, 24)
        Me.ACTIVECheckBox.TabIndex = 21
@ -785,7 +818,7 @@ Partial Class frmWiedervorlage
        Me.TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "TIME_SPAN", True))
        Me.TIME_SPANTextBox.Location = New System.Drawing.Point(67, 165)
        Me.TIME_SPANTextBox.Name = "TIME_SPANTextBox"
-        Me.TIME_SPANTextBox.Size = New System.Drawing.Size(67, 22)
+        Me.TIME_SPANTextBox.Size = New System.Drawing.Size(67, 21)
        Me.TIME_SPANTextBox.TabIndex = 4
        '
        'TIME_UNITYComboBox
@ -836,7 +869,7 @@ Partial Class frmWiedervorlage
        Me.FOLLOW_UP_TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "FOLLOW_UP_TIME_SPAN", True))
        Me.FOLLOW_UP_TIME_SPANTextBox.Location = New System.Drawing.Point(623, 120)
        Me.FOLLOW_UP_TIME_SPANTextBox.Name = "FOLLOW_UP_TIME_SPANTextBox"
-        Me.FOLLOW_UP_TIME_SPANTextBox.Size = New System.Drawing.Size(80, 22)
+        Me.FOLLOW_UP_TIME_SPANTextBox.Size = New System.Drawing.Size(80, 21)
        Me.FOLLOW_UP_TIME_SPANTextBox.TabIndex = 3
        '
        'FOLLOW_UP_SEQUENCEComboBox
@ -886,7 +919,7 @@ Partial Class frmWiedervorlage
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Name = "TBPMO_FOLLOW_UP_EMAILBindingNavigator"
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem
-        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Size = New System.Drawing.Size(991, 25)
+        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Size = New System.Drawing.Size(987, 25)
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.TabIndex = 1
        Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Text = "BindingNavigator1"
        '
@ -1021,7 +1054,7 @@ Partial Class frmWiedervorlage
        Me.Label2.AutoSize = True
        Me.Label2.Location = New System.Drawing.Point(8, 16)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(283, 13)
+        Me.Label2.Size = New System.Drawing.Size(261, 13)
        Me.Label2.TabIndex = 3
        Me.Label2.Text = "Email-Profil zur Versendung der Wiedervorlage Emails"
        '
@ -1030,7 +1063,7 @@ Partial Class frmWiedervorlage
        Me.chkbxLogErrorsonly.AutoSize = True
        Me.chkbxLogErrorsonly.Location = New System.Drawing.Point(11, 69)
        Me.chkbxLogErrorsonly.Name = "chkbxLogErrorsonly"
-        Me.chkbxLogErrorsonly.Size = New System.Drawing.Size(152, 17)
+        Me.chkbxLogErrorsonly.Size = New System.Drawing.Size(147, 17)
        Me.chkbxLogErrorsonly.TabIndex = 1
        Me.chkbxLogErrorsonly.Text = "Log Errors Only (Ja/Nein)"
        Me.chkbxLogErrorsonly.UseVisualStyleBackColor = True
@ -1067,9 +1100,9 @@ Partial Class frmWiedervorlage
        '
        Me.ListBox2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.ListBox2.FormattingEnabled = True
-        Me.ListBox2.Location = New System.Drawing.Point(3, 18)
+        Me.ListBox2.Location = New System.Drawing.Point(3, 17)
        Me.ListBox2.Name = "ListBox2"
-        Me.ListBox2.Size = New System.Drawing.Size(464, 560)
+        Me.ListBox2.Size = New System.Drawing.Size(464, 561)
        Me.ListBox2.TabIndex = 0
        '
        'Label7
@ -1077,7 +1110,7 @@ Partial Class frmWiedervorlage
        Me.Label7.AutoSize = True
        Me.Label7.Location = New System.Drawing.Point(11, 9)
        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(414, 13)
+        Me.Label7.Size = New System.Drawing.Size(378, 13)
        Me.Label7.TabIndex = 0
        Me.Label7.Text = "Folgende Wiedervorlagen werden aktuell auf Ausführungsgültigkeit überprüft"
        '
@ -1117,6 +1150,10 @@ Partial Class frmWiedervorlage
        Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
        'TBPMO_FORM_CONSTRUCTORTableAdapter
        '
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter.ClearBeforeFill = True
        '
        'frmWiedervorlage
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -1131,10 +1168,11 @@ Partial Class frmWiedervorlage
        Me.XtraTabControl1.ResumeLayout(False)
        Me.XtraTabPage1.ResumeLayout(False)
        Me.XtraTabPage1.PerformLayout()
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
        CType(Me.TBPMO_FOLLOW_UP_EMAILBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        CType(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
@ -1218,4 +1256,7 @@ Partial Class frmWiedervorlage
    Friend WithEvents Label7 As System.Windows.Forms.Label
    Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents cmbConstructor As System.Windows.Forms.ComboBox
    Friend WithEvents TBPMO_FORM_CONSTRUCTORBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents TBPMO_FORM_CONSTRUCTORTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter
 End Class
--- a/app/DD-Record-Organiser/frmWiedervorlage.resx
+++ b/app/DD-Record-Organiser/frmWiedervorlage.resx
@ -183,12 +183,18 @@
  <metadata name="Label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
  <metadata name="Label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
  <metadata name="TBPMO_FOLLOW_UP_EMAILBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>160, 17</value>
  </metadata>
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="TBPMO_FORM_CONSTRUCTORBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 56</value>
  </metadata>
  <metadata name="TBPMO_FOLLOW_UP_EMAILBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>896, 17</value>
  </metadata>
@ -270,6 +276,9 @@
  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>723, 17</value>
  </metadata>
  <metadata name="TBPMO_FORM_CONSTRUCTORTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>318, 56</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA
--- a/app/DD-Record-Organiser/frmWiedervorlage.vb
+++ b/app/DD-Record-Organiser/frmWiedervorlage.vb
@ -19,6 +19,8 @@
        End Try
    End Sub
    Private Sub frmWiedervorlage_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBPMO_FORM_CONSTRUCTOR". Sie können sie bei Bedarf verschieben oder entfernen.
        Try
            Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] ,[FORM_NAME] + ' | ' + [CONTROL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 4 ORDER BY FORM_ID")
            Dim DT2 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] ,[FORM_NAME] + ' | ' + [CONTROL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 10 ORDER BY FORM_ID")
@ -39,6 +41,9 @@
            cmbUser.DisplayMember = DTUser.Columns(1).ColumnName
            cmbUser.ValueMember = DTUser.Columns(0).ColumnName
            TBPMO_FOLLOW_UP_EMAILTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_FORM_CONSTRUCTOR)
            Load_WV_Profiles()
        Catch ex As Exception
            MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -134,6 +139,7 @@
            Load_User_2_Profile(GUIDTextBox.Text)
            SetCheckbox()
        End If
        lblSaveWVEmail.Visible = False
    End Sub
    Private Sub btnAddUser_WV_Click(sender As Object, e As EventArgs) Handles btnAddUser_WV.Click