MS_18052016

app/DD-Record-Organiser/ClassControlCommandsUI.vb

@@ -310,41 +310,41 @@ Public Class ClassControlCommandsUI
     Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
         Try
             Dim ADDED_WHO As String = Environment.UserName
-            Dim RECORD_ID As Integer
+            'Dim RECORD_ID As Integer
 
-            If IsInsert Then
+            'If IsInsert Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Insert", False)
+            '    If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Insert", False)
 
-                ' Den Record erstellen
+            '    ' Den Record erstellen
-                If CreateRecord(FormID) = False Then
+            '    If CreateRecord(FormID) = False Then
-                    IsInsert = False
+            '        IsInsert = False
-                    Return "ERROR - INSERT RECORD NOT SUCCESSFUL"
+            '        Return "ERROR - INSERT RECORD NOT SUCCESSFUL"
-                End If
+            '    End If
 
-                ' Die eben erstellte RecordID holen
+            '    ' Die eben erstellte RecordID holen
-                RECORD_ID = GetLastRecord()
+            '    RECORD_ID = GetLastRecord()
-                CURRENT_RECORD_ID = RECORD_ID
+            '    CURRENT_RECORD_ID = RECORD_ID
-                ' Wenn gegeben, foreignrecordID mit Record verknüpfen
+            '    ' Wenn gegeben, foreignrecordID mit Record verknüpfen
-                If foreignRecordID > 0 Then
+            '    If foreignRecordID > 0 Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> foreignRecordID:  " & foreignRecordID & "; Record-ID: " & RECORD_ID, False)
+            '        If LogErrorsOnly = False Then ClassLogger.Add(" >> foreignRecordID:  " & foreignRecordID & "; Record-ID: " & RECORD_ID, False)
-                    ConnectRecord(foreignRecordID, RECORD_ID)
+            '        ConnectRecord(foreignRecordID, RECORD_ID)
-                End If
+            '    End If
 
-                ' Für angegebene Control Typen den Wert speichern
+            '    ' Für angegebene Control Typen den Wert speichern
-                InsertAllControls(FormID, RECORD_ID, _CtrlBuilder.AllControls)
+            '    InsertAllControls(FormID, RECORD_ID, _CtrlBuilder.AllControls)
 
-                ' Status zurücksetzen
+            '    ' Status zurücksetzen
-                IsInsert = False
+            '    IsInsert = False
 
-                NEW_RECORD_ID = RECORD_ID
+            '    NEW_RECORD_ID = RECORD_ID
 
-                Return "Neuer Datensatz eingefügt - " & Now
+            '    Return "Neuer Datensatz eingefügt - " & Now
-            ElseIf IsInsert = False Then
+            'ElseIf IsInsert = False Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Update RecordID: " & RECORD_ID, False)
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Update RecordID: " & RecordID, False)
-                UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls)
+            UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls)
 
-                Return "Datensatz aktualisiert - " & Now
+            Return "Datensatz aktualisiert - " & Now
-            End If
+            'End If
         Catch ex As Exception
             MsgBox("Unexpected Error in SaveRecord: " & ex.Message, MsgBoxStyle.Critical)
         End Try

app/DD-Record-Organiser/ClassControlValues.vb

@@ -695,9 +695,6 @@ Public Class ClassControlValues
                         Exit Sub
                     End If
 
-                    If SQL_AUTOVALUE.ToUpper.StartsWith("select RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE".ToUpper) Then
-                        SQL_AUTOVALUE = "SELECT MAX(RECORD_ENTITY_ID) + 1 FROM TBPMO_RECORD WHERE FORM_ID = " & entity_ID
-                    End If
                     If Not IsNothing(CONNID) Then
                         autoValue = ClassDatabase.Execute_ScalarWithConnection(CONNID, SQL_AUTOVALUE)
                     Else

app/DD-Record-Organiser/ClassEmail.vb

@@ -1,7 +1,7 @@
 Imports System.Net.Mail
 Public Class ClassEmail
     Private Shared MailSSL As Boolean = False
-    Public Shared Function Send_EMail(MailEmpfaenger As String, MailBetreff As String, vBody As String, MAIL_SMTP As String, MAIL_USER As String, MAIL_PW As String, MAIL_FROM As String)
+    Public Shared Function Send_EMail(MailEmpfaenger As String, MailBetreff As String, vBody As String, MAIL_SMTP As String, MAIL_USER As String, MAIL_PW As String, MAIL_FROM As String, port As Integer)
         '#### E-MAIL NACHRICHT VERSENDEN
         Try
             If MAIL_SMTP <> "" And MAIL_USER <> "" Then
@@ -17,7 +17,7 @@ Public Class ClassEmail
                     'Neue Nachricht erzeugen: 
                     Dim message As New MailMessage(MAIL_FROM, Trim(_mailempfaenger), MailBetreff, _
                                                              "<font face=""Tahoma"">" & vBody & "<br>" & _
-                                                             "<br>Creation TimeStamp: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" & _
+                                                             "<br>Time: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" & _
                                                              My.Computer.Clock.LocalTime.ToLongTimeString & "</font>")
                     ' create and add the attachment(s) */
                     ' Dim Attachment As Attachment = New Attachment("E:\test\Frachkostenreport.txt")
@@ -33,7 +33,7 @@ Public Class ClassEmail
                     Dim SMTPUserInfo As New System.Net.NetworkCredential(MAIL_USER, MAIL_PW) ', My.Settings.vDomain)
                     emailClient.UseDefaultCredentials = False
                     emailClient.Credentials = SMTPUserInfo
-                    emailClient.Port = 25
+                    emailClient.Port = port
                     '*Send the message */
                     emailClient.Send(message)
                 Next

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

@@ -583,10 +583,10 @@
     <Compile Include="frmTask_Editor.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmWiedervorlage.Designer.vb">
+    <Compile Include="frmFollowUp.Designer.vb">
-      <DependentUpon>frmWiedervorlage.vb</DependentUpon>
+      <DependentUpon>frmFollowUp.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmWiedervorlage.vb">
+    <Compile Include="frmFollowUp.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmwindreamView_Config.Designer.vb">
@@ -879,11 +879,11 @@
     <EmbeddedResource Include="frmTask_Editor.resx">
       <DependentUpon>frmTask_Editor.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmWiedervorlage.en-US.resx">
+    <EmbeddedResource Include="frmFollowUp.en-US.resx">
-      <DependentUpon>frmWiedervorlage.vb</DependentUpon>
+      <DependentUpon>frmFollowUp.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmWiedervorlage.resx">
+    <EmbeddedResource Include="frmFollowUp.resx">
-      <DependentUpon>frmWiedervorlage.vb</DependentUpon>
+      <DependentUpon>frmFollowUp.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmwindreamView_Config.en-US.resx">
       <DependentUpon>frmwindreamView_Config.vb</DependentUpon>

app/DD-Record-Organiser/DD_DMSDataSet.xsd

@@ -1772,8 +1772,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, CONSTRUCTOR_ID)
+                          PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID, CTRL_USER_DIRECT, CTRL_GROUP_DIRECT)
-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);    
+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,@CTRL_USER_DIRECT,@CTRL_GROUP_DIRECT);     
 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" />
@@ -1795,6 +1795,8 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
                       <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" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_USER_DIRECT" ColumnName="CTRL_USER_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CTRL_USER_DIRECT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CTRL_USER_DIRECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_GROUP_DIRECT" ColumnName="CTRL_GROUP_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CTRL_GROUP_DIRECT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CTRL_GROUP_DIRECT" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -1802,7 +1804,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, CONSTRUCTOR_ID
+                         PROCESS_SELECT9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, CONSTRUCTOR_ID, CTRL_USER_DIRECT, CTRL_GROUP_DIRECT
 FROM            TBPMO_FOLLOW_UP_EMAIL</CommandText>
                     <Parameters />
                   </DbCommand>
@@ -1815,8 +1817,9 @@ 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, CONSTRUCTOR_ID = @CONSTRUCTOR_ID
+                         PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCESS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID, CTRL_USER_DIRECT = @CTRL_USER_DIRECT, 
-WHERE        (GUID = @Original_GUID);    
+                         CTRL_GROUP_DIRECT = @CTRL_GROUP_DIRECT
+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>
                       <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" />
@@ -1844,6 +1847,8 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
                       <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="CTRL_USER_DIRECT" ColumnName="CTRL_USER_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CTRL_USER_DIRECT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CTRL_USER_DIRECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_GROUP_DIRECT" ColumnName="CTRL_GROUP_DIRECT" DataSourceName="DD_ECM.dbo.TBPMO_FOLLOW_UP_EMAIL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CTRL_GROUP_DIRECT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CTRL_GROUP_DIRECT" 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>
@@ -1881,6 +1886,8 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_
               <Mapping SourceColumn="PROCESS_SELECT10" DataSetColumn="PROCESS_SELECT10" />
               <Mapping SourceColumn="NAME" DataSetColumn="NAME" />
               <Mapping SourceColumn="CONSTRUCTOR_ID" DataSetColumn="CONSTRUCTOR_ID" />
+              <Mapping SourceColumn="CTRL_USER_DIRECT" DataSetColumn="CTRL_USER_DIRECT" />
+              <Mapping SourceColumn="CTRL_GROUP_DIRECT" DataSetColumn="CTRL_GROUP_DIRECT" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -2042,19 +2049,19 @@ WHERE        (RECORD_ID = @RECORD_ID)</CommandText>
             <MainSource>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM TBDD_EMAIL_ACCOUNT
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO TBDD_EMAIL_ACCOUNT
-                         (NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO)
+                         (NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, PORT)
-VALUES        (@NAME,@EMAIL_FROM,@EMAIL_SMTP,@EMAIL_USER,@EMAIL_PW,@ACTIVE,@ADDED_WHO); 
+VALUES        (@NAME,@EMAIL_FROM,@EMAIL_SMTP,@EMAIL_USER,@EMAIL_PW,@ACTIVE,@ADDED_WHO,@PORT);  
 SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2064,12 +2071,13 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_W
                       <Parameter AllowDbNull="false" AutogeneratedName="EMAIL_PW" ColumnName="EMAIL_PW" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL_PW" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL_PW" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" 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="PORT" ColumnName="PORT" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PORT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PORT" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT        TBDD_EMAIL_ACCOUNT.*
+                    <CommandText>SELECT        GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
 FROM            TBDD_EMAIL_ACCOUNT</CommandText>
                     <Parameters />
                   </DbCommand>
@@ -2077,8 +2085,9 @@ FROM            TBDD_EMAIL_ACCOUNT</CommandText>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE       TBDD_EMAIL_ACCOUNT
-SET                NAME = @NAME, EMAIL_FROM = @EMAIL_FROM, EMAIL_SMTP = @EMAIL_SMTP, EMAIL_USER = @EMAIL_USER, EMAIL_PW = @EMAIL_PW, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO
+SET                NAME = @NAME, EMAIL_FROM = @EMAIL_FROM, EMAIL_SMTP = @EMAIL_SMTP, EMAIL_USER = @EMAIL_USER, EMAIL_PW = @EMAIL_PW, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, 
-WHERE        (GUID = @Original_GUID); 
+                         PORT = @PORT
+WHERE        (GUID = @Original_GUID);  
 SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2088,6 +2097,7 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_W
                       <Parameter AllowDbNull="false" AutogeneratedName="EMAIL_PW" ColumnName="EMAIL_PW" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL_PW" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL_PW" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PORT" ColumnName="PORT" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PORT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PORT" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_EMAIL_ACCOUNT" 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.TBDD_EMAIL_ACCOUNT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -2107,6 +2117,7 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_W
               <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+              <Mapping SourceColumn="PORT" DataSetColumn="PORT" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -4392,7 +4403,7 @@ SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_D
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="FOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnVarNameInTable="columnFOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnPropNameInRow="FOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnPropNameInTable="FOLLOW_UP_TIME_SPANColumn" msprop:Generator_UserColumnName="FOLLOW_UP_TIME_SPAN">
+              <xs:element name="FOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnVarNameInTable="columnFOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnPropNameInRow="FOLLOW_UP_TIME_SPAN" msprop:Generator_ColumnPropNameInTable="FOLLOW_UP_TIME_SPANColumn" msprop:Generator_UserColumnName="FOLLOW_UP_TIME_SPAN" default="08:00">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -4526,6 +4537,8 @@ SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_D
                 </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:element name="CTRL_USER_DIRECT" msprop:Generator_ColumnVarNameInTable="columnCTRL_USER_DIRECT" msprop:Generator_ColumnPropNameInRow="CTRL_USER_DIRECT" msprop:Generator_ColumnPropNameInTable="CTRL_USER_DIRECTColumn" msprop:Generator_UserColumnName="CTRL_USER_DIRECT" type="xs:int" default="0" />
+              <xs:element name="CTRL_GROUP_DIRECT" msprop:Generator_ColumnVarNameInTable="columnCTRL_GROUP_DIRECT" msprop:Generator_ColumnPropNameInRow="CTRL_GROUP_DIRECT" msprop:Generator_ColumnPropNameInTable="CTRL_GROUP_DIRECTColumn" msprop:Generator_UserColumnName="CTRL_GROUP_DIRECT" type="xs:int" default="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -4650,14 +4663,14 @@ SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_D
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_PW" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_UserColumnName="EMAIL_PW">
+              <xs:element name="EMAIL_PW" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_UserColumnName="EMAIL_PW" default="">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
               <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4674,6 +4687,7 @@ SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_D
                 </xs:simpleType>
               </xs:element>
               <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="PORT" msprop:Generator_ColumnVarNameInTable="columnPORT" msprop:Generator_ColumnPropNameInRow="PORT" msprop:Generator_ColumnPropNameInTable="PORTColumn" msprop:Generator_UserColumnName="PORT" type="xs:int" default="25" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

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

@@ -9054,7 +9054,7 @@ Partial Public Class DD_DMSDataSet
             Me.columnCOMMENT.MaxLength = 200
             Me.columnSHORTNAME.MaxLength = 30
             Me.columnWAN_ENVIRONMENT.AllowDBNull = false
-            Me.columnWAN_ENVIRONMENT.DefaultValue = CType(False, Boolean)
+            Me.columnWAN_ENVIRONMENT.DefaultValue = CType(false,Boolean)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -12030,6 +12030,10 @@ Partial Public Class DD_DMSDataSet
         
         Private columnCONSTRUCTOR_ID As Global.System.Data.DataColumn
         
+        Private columnCTRL_USER_DIRECT As Global.System.Data.DataColumn
+        
+        Private columnCTRL_GROUP_DIRECT 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()
@@ -12297,6 +12301,22 @@ Partial Public Class DD_DMSDataSet
             End Get
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property CTRL_USER_DIRECTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnCTRL_USER_DIRECT
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property CTRL_GROUP_DIRECTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnCTRL_GROUP_DIRECT
+            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)>  _
@@ -12362,9 +12382,11 @@ Partial Public Class DD_DMSDataSet
                     ByVal PROCESS_SELECT9 As String,  _
                     ByVal PROCESS_SELECT10 As String,  _
                     ByVal NAME As String,  _
-                    ByVal CONSTRUCTOR_ID As Integer) As TBPMO_FOLLOW_UP_EMAILRow
+                    ByVal CONSTRUCTOR_ID As Integer,  _
+                    ByVal CTRL_USER_DIRECT As Integer,  _
+                    ByVal CTRL_GROUP_DIRECT 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, CONSTRUCTOR_ID}
+            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, CTRL_USER_DIRECT, CTRL_GROUP_DIRECT}
             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
@@ -12428,6 +12450,8 @@ Partial Public Class DD_DMSDataSet
             Me.columnPROCESS_SELECT10 = MyBase.Columns("PROCESS_SELECT10")
             Me.columnNAME = MyBase.Columns("NAME")
             Me.columnCONSTRUCTOR_ID = MyBase.Columns("CONSTRUCTOR_ID")
+            Me.columnCTRL_USER_DIRECT = MyBase.Columns("CTRL_USER_DIRECT")
+            Me.columnCTRL_GROUP_DIRECT = MyBase.Columns("CTRL_GROUP_DIRECT")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -12491,6 +12515,10 @@ Partial Public Class DD_DMSDataSet
             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.columnCTRL_USER_DIRECT = New Global.System.Data.DataColumn("CTRL_USER_DIRECT", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnCTRL_USER_DIRECT)
+            Me.columnCTRL_GROUP_DIRECT = New Global.System.Data.DataColumn("CTRL_GROUP_DIRECT", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnCTRL_GROUP_DIRECT)
             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
@@ -12501,6 +12529,7 @@ Partial Public Class DD_DMSDataSet
             Me.columnFOLLOW_UP_DAYS.AllowDBNull = false
             Me.columnFOLLOW_UP_DAYS.MaxLength = 50
             Me.columnFOLLOW_UP_TIME_SPAN.AllowDBNull = false
+            Me.columnFOLLOW_UP_TIME_SPAN.DefaultValue = CType("08:00",String)
             Me.columnFOLLOW_UP_TIME_SPAN.MaxLength = 50
             Me.columnDEPENDENT_DATE_CTRL_ID.AllowDBNull = false
             Me.columnDEPENDENT_DONE_CTRL_ID.AllowDBNull = false
@@ -12554,6 +12583,10 @@ Partial Public Class DD_DMSDataSet
             Me.columnNAME.AllowDBNull = false
             Me.columnNAME.MaxLength = 100
             Me.columnCONSTRUCTOR_ID.AllowDBNull = false
+            Me.columnCTRL_USER_DIRECT.AllowDBNull = false
+            Me.columnCTRL_USER_DIRECT.DefaultValue = CType(0,Integer)
+            Me.columnCTRL_GROUP_DIRECT.AllowDBNull = false
+            Me.columnCTRL_GROUP_DIRECT.DefaultValue = CType(0,Integer)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -13795,6 +13828,8 @@ Partial Public Class DD_DMSDataSet
         
         Private columnCHANGED_WHEN As Global.System.Data.DataColumn
         
+        Private columnPORT 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()
@@ -13918,6 +13953,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 PORTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnPORT
+            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)>  _
@@ -13955,9 +13998,9 @@ Partial Public Class DD_DMSDataSet
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
-        Public Overloads Function AddTBDD_EMAIL_ACCOUNTRow(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_EMAIL_ACCOUNTRow
+        Public Overloads Function AddTBDD_EMAIL_ACCOUNTRow(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal PORT As Integer) As TBDD_EMAIL_ACCOUNTRow
             Dim rowTBDD_EMAIL_ACCOUNTRow As TBDD_EMAIL_ACCOUNTRow = CType(Me.NewRow,TBDD_EMAIL_ACCOUNTRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN}
+            Dim columnValuesArray() As Object = New Object() {Nothing, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PORT}
             rowTBDD_EMAIL_ACCOUNTRow.ItemArray = columnValuesArray
             Me.Rows.Add(rowTBDD_EMAIL_ACCOUNTRow)
             Return rowTBDD_EMAIL_ACCOUNTRow
@@ -13997,6 +14040,7 @@ Partial Public Class DD_DMSDataSet
             Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN")
             Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO")
             Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN")
+            Me.columnPORT = MyBase.Columns("PORT")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -14024,6 +14068,8 @@ Partial Public Class DD_DMSDataSet
             MyBase.Columns.Add(Me.columnCHANGED_WHO)
             Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.columnCHANGED_WHEN)
+            Me.columnPORT = New Global.System.Data.DataColumn("PORT", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnPORT)
             Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
             Me.columnGUID.AutoIncrement = true
             Me.columnGUID.AutoIncrementSeed = 1
@@ -14038,11 +14084,15 @@ Partial Public Class DD_DMSDataSet
             Me.columnEMAIL_USER.AllowDBNull = false
             Me.columnEMAIL_USER.MaxLength = 100
             Me.columnEMAIL_PW.AllowDBNull = false
+            Me.columnEMAIL_PW.DefaultValue = CType("",String)
             Me.columnEMAIL_PW.MaxLength = 100
             Me.columnACTIVE.AllowDBNull = false
+            Me.columnACTIVE.DefaultValue = CType(false,Boolean)
             Me.columnADDED_WHO.AllowDBNull = false
             Me.columnADDED_WHO.MaxLength = 50
             Me.columnCHANGED_WHO.MaxLength = 50
+            Me.columnPORT.AllowDBNull = false
+            Me.columnPORT.DefaultValue = CType(25,Integer)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -25819,6 +25869,28 @@ Partial Public Class DD_DMSDataSet
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property CTRL_USER_DIRECT() As Integer
+            Get
+                Return CType(Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CTRL_USER_DIRECTColumn),Integer)
+            End Get
+            Set
+                Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CTRL_USER_DIRECTColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property CTRL_GROUP_DIRECT() As Integer
+            Get
+                Return CType(Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CTRL_GROUP_DIRECTColumn),Integer)
+            End Get
+            Set
+                Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CTRL_GROUP_DIRECTColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Public Property TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID() As TBTEMP_QUICKDISPLAYRow
@@ -26534,6 +26606,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 PORT() As Integer
+            Get
+                Return CType(Me(Me.tableTBDD_EMAIL_ACCOUNT.PORTColumn),Integer)
+            End Get
+            Set
+                Me(Me.tableTBDD_EMAIL_ACCOUNT.PORTColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Public Function IsNAMENull() As Boolean
@@ -40616,6 +40699,8 @@ Namespace DD_DMSDataSetTableAdapters
             tableMapping.ColumnMappings.Add("PROCESS_SELECT10", "PROCESS_SELECT10")
             tableMapping.ColumnMappings.Add("NAME", "NAME")
             tableMapping.ColumnMappings.Add("CONSTRUCTOR_ID", "CONSTRUCTOR_ID")
+            tableMapping.ColumnMappings.Add("CTRL_USER_DIRECT", "CTRL_USER_DIRECT")
+            tableMapping.ColumnMappings.Add("CTRL_GROUP_DIRECT", "CTRL_GROUP_DIRECT")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -40628,16 +40713,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, CONSTRUCTOR_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@FOLLOW_UP_"& _ 
+                " ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID, CTRL_USER_DIRECT, CTRL_GROU"& _ 
-                "SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT"& _ 
+                "P_DIRECT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@FOLLOW_UP_SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SP"& _ 
-                "_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROC"& _ 
+                "AN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_"& _ 
-                "ESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WH"& _ 
+                "SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELEC"& _ 
-                "O,@TIME_DIST,@NAME,@CONSTRUCTOR_ID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLO"& _ 
+                "T3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NAME,@CONSTRUCTOR_ID,@CTRL_US"& _ 
-                "W_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, "& _ 
+                "ER_DIRECT,@CTRL_GROUP_DIRECT);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_"& _ 
-                "PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PR"& _ 
+                "DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PAREN"& _ 
-                "OCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, "& _ 
+                "T_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS"& _ 
-                "CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTIT"& _ 
+                "_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANG"& _ 
-                "Y())"
+                "ED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTITY())"
             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, "", "", ""))
@@ -40658,6 +40743,8 @@ Namespace DD_DMSDataSetTableAdapters
             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.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_USER_DIRECT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_USER_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_GROUP_DIRECT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_GROUP_DIRECT", 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"& _ 
@@ -40672,12 +40759,14 @@ 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, CONSTRUCTOR_ID = @CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID "& _ 
+                "SS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID, CTRL_USER_DIRECT = "& _ 
-                "= @Original_GUID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_"& _ 
+                "@CTRL_USER_DIRECT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CTRL_GROUP_DIRECT = @CTRL_GROUP_DI"& _ 
-                "UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UN"& _ 
+                "RECT"&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, FOLLOW_UP_SEQUENC"& _ 
-                "ITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PRO"& _ 
+                "E, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_C"& _ 
-                "CESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ 
+                "TRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SEL"& _ 
-                "ED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = @GUID)"
+                "ECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDE"& _ 
+                "D_WHEN, CHANGED_WHO, CHANGED_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, "", "", ""))
@@ -40704,6 +40793,8 @@ Namespace DD_DMSDataSetTableAdapters
             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("@CTRL_USER_DIRECT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_USER_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_GROUP_DIRECT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_GROUP_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
@@ -40727,7 +40818,8 @@ 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, CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_FOLLOW_UP_EMAIL"
+                "AME, CONSTRUCTOR_ID, CTRL_USER_DIRECT, CTRL_GROUP_DIRECT"&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
         
@@ -40827,7 +40919,9 @@ Namespace DD_DMSDataSetTableAdapters
                     ByVal ADDED_WHO As String,  _
                     ByVal TIME_DIST As String,  _
                     ByVal NAME As String,  _
-                    ByVal CONSTRUCTOR_ID As Integer) As Integer
+                    ByVal CONSTRUCTOR_ID As Integer,  _
+                    ByVal CTRL_USER_DIRECT As Integer,  _
+                    ByVal CTRL_GROUP_DIRECT As Integer) As Integer
             If (FOLLOW_UP_SEQUENCE Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("FOLLOW_UP_SEQUENCE")
             Else
@@ -40899,6 +40993,8 @@ Namespace DD_DMSDataSetTableAdapters
                 Me.Adapter.InsertCommand.Parameters(17).Value = CType(NAME,String)
             End If
             Me.Adapter.InsertCommand.Parameters(18).Value = CType(CONSTRUCTOR_ID,Integer)
+            Me.Adapter.InsertCommand.Parameters(19).Value = CType(CTRL_USER_DIRECT,Integer)
+            Me.Adapter.InsertCommand.Parameters(20).Value = CType(CTRL_GROUP_DIRECT,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
@@ -40944,6 +41040,8 @@ Namespace DD_DMSDataSetTableAdapters
                     ByVal PROCESS_SELECT10 As String,  _
                     ByVal NAME As String,  _
                     ByVal CONSTRUCTOR_ID As Integer,  _
+                    ByVal CTRL_USER_DIRECT As Integer,  _
+                    ByVal CTRL_GROUP_DIRECT As Integer,  _
                     ByVal Original_GUID As Integer,  _
                     ByVal GUID As Integer) As Integer
             If (FOLLOW_UP_SEQUENCE Is Nothing) Then
@@ -41047,8 +41145,10 @@ Namespace DD_DMSDataSetTableAdapters
                 Me.Adapter.UpdateCommand.Parameters(23).Value = CType(NAME,String)
             End If
             Me.Adapter.UpdateCommand.Parameters(24).Value = CType(CONSTRUCTOR_ID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(25).Value = CType(CTRL_USER_DIRECT,Integer)
-            Me.Adapter.UpdateCommand.Parameters(26).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(26).Value = CType(CTRL_GROUP_DIRECT,Integer)
+            Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(28).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
@@ -42019,6 +42119,7 @@ Namespace DD_DMSDataSetTableAdapters
             tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN")
             tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO")
             tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN")
+            tableMapping.ColumnMappings.Add("PORT", "PORT")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -42028,10 +42129,11 @@ Namespace DD_DMSDataSetTableAdapters
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
             Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_EMAIL_ACCOUNT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (NAME, EMAIL_FROM, EMAIL"& _ 
-                "_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@NAME,@EMAIL_FRO"& _ 
+                "_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, PORT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@NAME,@EMA"& _ 
-                "M,@EMAIL_SMTP,@EMAIL_USER,@EMAIL_PW,@ACTIVE,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, EM"& _ 
+                "IL_FROM,@EMAIL_SMTP,@EMAIL_USER,@EMAIL_PW,@ACTIVE,@ADDED_WHO,@PORT);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT G"& _ 
-                "AIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANG"& _ 
+                "UID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDE"& _ 
-                "ED_WHO, CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHERE (GUID = SCOPE_IDENTITY())"
+                "D_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHERE (GUID = SCOPE_ID"& _ 
+                "ENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL_FROM", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL_FROM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -42040,14 +42142,15 @@ Namespace DD_DMSDataSetTableAdapters
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL_PW", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL_PW", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PORT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PORT", 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       TBDD_EMAIL_ACCOUNT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                NAME = @NAME, EMAIL_FROM = @E"& _ 
                 "MAIL_FROM, EMAIL_SMTP = @EMAIL_SMTP, EMAIL_USER = @EMAIL_USER, EMAIL_PW = @EMAIL"& _ 
-                "_PW, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Origina"& _ 
+                "_PW, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         PO"& _ 
-                "l_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTI"& _ 
+                "RT = @PORT"&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, NAME, EMAIL_FR"& _ 
-                "VE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHE"& _ 
+                "OM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ 
-                "RE (GUID = @GUID)"
+                ", CHANGED_WHEN FROM TBDD_EMAIL_ACCOUNT WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL_FROM", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL_FROM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -42056,6 +42159,7 @@ Namespace DD_DMSDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL_PW", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL_PW", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PORT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PORT", 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
@@ -42073,7 +42177,9 @@ Namespace DD_DMSDataSetTableAdapters
             Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        TBDD_EMAIL_ACCOUNT.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_EMAIL_ACCOUNT"
+            Me._commandCollection(0).CommandText = "SELECT        GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACT"& _ 
+                "IVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_EMAI"& _ 
+                "L_ACCOUNT"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
         End Sub
         
@@ -42154,7 +42260,7 @@ Namespace DD_DMSDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String) As Integer
+        Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal PORT As Integer) As Integer
             If (NAME Is Nothing) Then
                 Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value
             Else
@@ -42186,6 +42292,7 @@ Namespace DD_DMSDataSetTableAdapters
             Else
                 Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String)
             End If
+            Me.Adapter.InsertCommand.Parameters(7).Value = CType(PORT,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
@@ -42205,7 +42312,7 @@ Namespace DD_DMSDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function Update(ByVal NAME As String, ByVal EMAIL_FROM As String, ByVal EMAIL_SMTP As String, ByVal EMAIL_USER As String, ByVal EMAIL_PW As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal PORT As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
             If (NAME Is Nothing) Then
                 Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value
             Else
@@ -42237,8 +42344,9 @@ Namespace DD_DMSDataSetTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHO,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(PORT,Integer)
-            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then

app/DD-Record-Organiser/ModuleHelperMethods.vb

@@ -350,7 +350,7 @@
         frm.Show()
     End Sub
     Public Sub OpenWiedervorlage()
-        Dim frm As New frmWiedervorlage
+        Dim frm As New frmFollowUp
         frm.MdiParent = MAIN_FORM
 
         Dim activeChild As Form = MAIN_FORM.ActiveMdiChild

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

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

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -1321,8 +1321,6 @@ Public Class frmConstructor_Main
         Try
             If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then
                 SELECTED_RECORD_ID = 0
-                CURRENT_RECORD_ID = 0
-                RECORD_ID = 0
                 Lock_RecordControls(False)
                 tsButtonShowWorkflowTasks.Enabled = True
                 tsButtonCancel.Visible = True
@@ -1411,11 +1409,12 @@ Public Class frmConstructor_Main
             Dim recid As Integer
             Update_Status_Label(True, ResultMessage, EDIT_STATE)
 
-            If EDIT_STATE = EditState.Update Then
+            'If EDIT_STATE = EditState.Update Then
-                recid = RECORD_ID
+            '    recid = RECORD_ID
-            Else
+            'Else
-                recid = NEW_RECORD_ID
+            '    recid = NEW_RECORD_ID
-            End If
+            'End If
+            recid = CURRENT_RECORD_ID
 
             SELECTED_RECORD_ID = recid
             RECORD_ID = recid
@@ -1549,19 +1548,18 @@ Public Class frmConstructor_Main
                 End If
                 Dim result1 As MsgBoxResult
                 result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                If result = MsgBoxResult.Yes Then
+                If result1 = MsgBoxResult.Yes Then
                     WD_DELETE_DOCS()
                 End If
+
                 SELECTED_RECORD_ID = 0
                 RECORD_ID = 0
                 CURRENT_RECORD_ID = 0
                 RECORD_CHANGED = False
-                Load_Tree_View_Data()
+                'Den derzeitigen Record Neuladen
-                ' Nach dem löschen muss die aktuelle Ansicht neugeladen werden
-                Load_Entity_Data(ACT_EBENE)
-
                 DisableEditMode()
-
+                Load_Entity_Data(ACT_EBENE)
+                RECORD_CHANGED = False
 
             End If
         End If
@@ -5091,4 +5089,11 @@ Public Class frmConstructor_Main
         ' Den derzeitigen Record Neuladen
         Column_Row_Handler()
     End Sub
+
+    Private Sub pnlDetails_MouseHover(sender As Object, e As EventArgs) Handles pnlDetails.MouseHover
+        If pnlDetails.Focus = False Then
+            pnlDetails.Focus()
+            Console.WriteLine("Focus panel")
+        End If
+    End Sub
 End Class

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

@@ -34,16 +34,22 @@ Partial Class frmDD_EMAIL_ACCOUNT
         Dim ADDED_WHENLabel As System.Windows.Forms.Label
         Dim CHANGED_WHENLabel As System.Windows.Forms.Label
         Dim CHANGED_WHOLabel As System.Windows.Forms.Label
-        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
+        Dim PORTLabel As System.Windows.Forms.Label
-        Me.TBDD_EMAIL_ACCOUNTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.TBDD_EMAIL_ACCOUNTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_EMAIL_ACCOUNTTableAdapter()
-        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
+        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
+        Me.TBDD_EMAIL_ACCOUNTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
+        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
+        Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
+        Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator()
         Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox()
         Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
+        Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
         Me.GUIDTextBox = New System.Windows.Forms.TextBox()
         Me.NAMETextBox = New System.Windows.Forms.TextBox()
         Me.EMAIL_FROMTextBox = New System.Windows.Forms.TextBox()
@@ -60,13 +66,9 @@ Partial Class frmDD_EMAIL_ACCOUNT
         Me.txttestReceipiant = New System.Windows.Forms.TextBox()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.btnEmailTest = New System.Windows.Forms.Button()
-        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
+        Me.TBDD_EMAIL_ACCOUNTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_EMAIL_ACCOUNTTableAdapter()
-        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
+        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
-        Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
+        Me.PORTTextBox = New System.Windows.Forms.TextBox()
-        Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
-        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
         GUIDLabel = New System.Windows.Forms.Label()
         NAMELabel = New System.Windows.Forms.Label()
         EMAIL_FROMLabel = New System.Windows.Forms.Label()
@@ -77,10 +79,11 @@ Partial Class frmDD_EMAIL_ACCOUNT
         ADDED_WHENLabel = New System.Windows.Forms.Label()
         CHANGED_WHENLabel = New System.Windows.Forms.Label()
         CHANGED_WHOLabel = New System.Windows.Forms.Label()
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
+        PORTLabel = New System.Windows.Forms.Label()
-        CType(Me.TBDD_EMAIL_ACCOUNTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_EMAIL_ACCOUNTBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.SuspendLayout()
+        CType(Me.TBDD_EMAIL_ACCOUNTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -134,61 +137,15 @@ Partial Class frmDD_EMAIL_ACCOUNT
         resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel")
         CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
         '
-        'DD_DMSDataSet
-        '
-        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
-        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
-        'TBDD_EMAIL_ACCOUNTBindingSource
-        '
-        Me.TBDD_EMAIL_ACCOUNTBindingSource.DataMember = "TBDD_EMAIL_ACCOUNT"
-        Me.TBDD_EMAIL_ACCOUNTBindingSource.DataSource = Me.DD_DMSDataSet
-        '
-        'TBDD_EMAIL_ACCOUNTTableAdapter
-        '
-        Me.TBDD_EMAIL_ACCOUNTTableAdapter.ClearBeforeFill = True
-        '
-        'TableAdapterManager
-        '
-        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
-        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Me.TBDD_EMAIL_ACCOUNTTableAdapter
-        Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FORM_TYPETableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FORM_VIEWTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_FORMTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_LANGUAGE_OBJECTTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_STATETableAdapter = Nothing
-        Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing
-        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
-        '
         'TBDD_EMAIL_ACCOUNTBindingNavigator
         '
-        resources.ApplyResources(Me.TBDD_EMAIL_ACCOUNTBindingNavigator, "TBDD_EMAIL_ACCOUNTBindingNavigator")
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.BindingSource = Me.TBDD_EMAIL_ACCOUNTBindingSource
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.CountItem = Me.BindingNavigatorCountItem
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.CountItemFormat = "of {0} Email-Profiles"
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem})
+        resources.ApplyResources(Me.TBDD_EMAIL_ACCOUNTBindingNavigator, "TBDD_EMAIL_ACCOUNTBindingNavigator")
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem
@@ -196,15 +153,49 @@ Partial Class frmDD_EMAIL_ACCOUNT
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.Name = "TBDD_EMAIL_ACCOUNTBindingNavigator"
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem
         '
+        'BindingNavigatorAddNewItem
+        '
+        Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
+        Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
+        '
+        'TBDD_EMAIL_ACCOUNTBindingSource
+        '
+        Me.TBDD_EMAIL_ACCOUNTBindingSource.DataMember = "TBDD_EMAIL_ACCOUNT"
+        Me.TBDD_EMAIL_ACCOUNTBindingSource.DataSource = Me.DD_DMSDataSet
+        '
+        'DD_DMSDataSet
+        '
+        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
+        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
         'BindingNavigatorCountItem
         '
-        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
         Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
+        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
+        '
+        'BindingNavigatorDeleteItem
+        '
+        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
+        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
+        '
+        'BindingNavigatorMoveFirstItem
+        '
+        Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
+        Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
+        '
+        'BindingNavigatorMovePreviousItem
+        '
+        Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
+        Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
         '
         'BindingNavigatorSeparator
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
         Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator"
+        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
         '
         'BindingNavigatorPositionItem
         '
@@ -213,88 +204,106 @@ Partial Class frmDD_EMAIL_ACCOUNT
         '
         'BindingNavigatorSeparator1
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
         Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1"
+        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
+        '
+        'BindingNavigatorMoveNextItem
+        '
+        Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
+        Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
+        '
+        'BindingNavigatorMoveLastItem
+        '
+        Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
+        Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
         '
         'BindingNavigatorSeparator2
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
+        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
+        '
+        'TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem
+        '
+        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem, "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem")
+        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Name = "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem"
         '
         'GUIDTextBox
         '
-        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
         Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "GUID", True))
+        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
         Me.GUIDTextBox.Name = "GUIDTextBox"
         Me.GUIDTextBox.ReadOnly = True
         Me.GUIDTextBox.TabStop = False
         '
         'NAMETextBox
         '
-        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
         Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "NAME", True))
+        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
         Me.NAMETextBox.Name = "NAMETextBox"
         '
         'EMAIL_FROMTextBox
         '
-        resources.ApplyResources(Me.EMAIL_FROMTextBox, "EMAIL_FROMTextBox")
         Me.EMAIL_FROMTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "EMAIL_FROM", True))
+        resources.ApplyResources(Me.EMAIL_FROMTextBox, "EMAIL_FROMTextBox")
         Me.EMAIL_FROMTextBox.Name = "EMAIL_FROMTextBox"
         '
         'EMAIL_SMTPTextBox
         '
-        resources.ApplyResources(Me.EMAIL_SMTPTextBox, "EMAIL_SMTPTextBox")
         Me.EMAIL_SMTPTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "EMAIL_SMTP", True))
+        resources.ApplyResources(Me.EMAIL_SMTPTextBox, "EMAIL_SMTPTextBox")
         Me.EMAIL_SMTPTextBox.Name = "EMAIL_SMTPTextBox"
         '
         'EMAIL_USERTextBox
         '
-        resources.ApplyResources(Me.EMAIL_USERTextBox, "EMAIL_USERTextBox")
         Me.EMAIL_USERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "EMAIL_USER", True))
+        resources.ApplyResources(Me.EMAIL_USERTextBox, "EMAIL_USERTextBox")
         Me.EMAIL_USERTextBox.Name = "EMAIL_USERTextBox"
         '
         'EMAIL_PWTextBox
         '
-        resources.ApplyResources(Me.EMAIL_PWTextBox, "EMAIL_PWTextBox")
         Me.EMAIL_PWTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "EMAIL_PW", True))
+        resources.ApplyResources(Me.EMAIL_PWTextBox, "EMAIL_PWTextBox")
         Me.EMAIL_PWTextBox.Name = "EMAIL_PWTextBox"
         Me.EMAIL_PWTextBox.UseSystemPasswordChar = True
         '
         'ACTIVECheckBox
         '
-        resources.ApplyResources(Me.ACTIVECheckBox, "ACTIVECheckBox")
         Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_EMAIL_ACCOUNTBindingSource, "ACTIVE", True))
+        resources.ApplyResources(Me.ACTIVECheckBox, "ACTIVECheckBox")
         Me.ACTIVECheckBox.Name = "ACTIVECheckBox"
         Me.ACTIVECheckBox.UseVisualStyleBackColor = True
         '
         'ADDED_WHOTextBox
         '
-        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
         Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "ADDED_WHO", True))
+        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
         Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
         Me.ADDED_WHOTextBox.ReadOnly = True
         Me.ADDED_WHOTextBox.TabStop = False
         '
         'ADDED_WHENTextBox
         '
-        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
         Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "ADDED_WHEN", True))
+        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
         Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
         Me.ADDED_WHENTextBox.ReadOnly = True
         Me.ADDED_WHENTextBox.TabStop = False
         '
         'CHANGED_WHENTextBox
         '
-        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
         Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "CHANGED_WHEN", True))
+        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
         Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
         Me.CHANGED_WHENTextBox.ReadOnly = True
         Me.CHANGED_WHENTextBox.TabStop = False
         '
         'CHANGED_WHOTextBox
         '
-        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
         Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "CHANGED_WHO", True))
+        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
         Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
         Me.CHANGED_WHOTextBox.ReadOnly = True
         Me.CHANGED_WHOTextBox.TabStop = False
@@ -317,10 +326,10 @@ Partial Class frmDD_EMAIL_ACCOUNT
         '
         'GroupBox1
         '
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Controls.Add(Me.txttestReceipiant)
         Me.GroupBox1.Controls.Add(Me.btnEmailTest)
         Me.GroupBox1.Controls.Add(Me.lbltest)
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
         '
@@ -331,52 +340,64 @@ Partial Class frmDD_EMAIL_ACCOUNT
         Me.btnEmailTest.Name = "btnEmailTest"
         Me.btnEmailTest.UseVisualStyleBackColor = True
         '
-        'BindingNavigatorAddNewItem
+        'TBDD_EMAIL_ACCOUNTTableAdapter
         '
-        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
+        Me.TBDD_EMAIL_ACCOUNTTableAdapter.ClearBeforeFill = True
-        Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
         '
-        'BindingNavigatorDeleteItem
+        'TableAdapterManager
         '
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
+        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
-        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
-        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
+        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Me.TBDD_EMAIL_ACCOUNTTableAdapter
+        Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FORM_TYPETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FORM_VIEWTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_FORMTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_LANGUAGE_OBJECTTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILE_IDXTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_STATETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing
+        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
-        'BindingNavigatorMoveFirstItem
+        'PORTLabel
         '
-        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
+        resources.ApplyResources(PORTLabel, "PORTLabel")
-        Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        PORTLabel.Name = "PORTLabel"
-        Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
         '
-        'BindingNavigatorMovePreviousItem
+        'PORTTextBox
         '
-        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
+        Me.PORTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "PORT", True))
-        Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.PORTTextBox, "PORTTextBox")
-        Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
+        Me.PORTTextBox.Name = "PORTTextBox"
-        '
-        'BindingNavigatorMoveNextItem
-        '
-        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
-        Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
-        '
-        'BindingNavigatorMoveLastItem
-        '
-        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
-        Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
-        '
-        'TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem
-        '
-        resources.ApplyResources(Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem, "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem")
-        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Name = "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem"
         '
         'frmDD_EMAIL_ACCOUNT
         '
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(PORTLabel)
+        Me.Controls.Add(Me.PORTTextBox)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.lblSave)
         Me.Controls.Add(CHANGED_WHOLabel)
@@ -403,11 +424,11 @@ Partial Class frmDD_EMAIL_ACCOUNT
         Me.Controls.Add(Me.TBDD_EMAIL_ACCOUNTBindingNavigator)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Name = "frmDD_EMAIL_ACCOUNT"
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBDD_EMAIL_ACCOUNTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_EMAIL_ACCOUNTBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.ResumeLayout(False)
         Me.TBDD_EMAIL_ACCOUNTBindingNavigator.PerformLayout()
+        CType(Me.TBDD_EMAIL_ACCOUNTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox1.PerformLayout()
         Me.ResumeLayout(False)
@@ -447,4 +468,5 @@ End Sub
     Friend WithEvents lbltest As System.Windows.Forms.Label
     Friend WithEvents txttestReceipiant As System.Windows.Forms.TextBox
     Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
+    Friend WithEvents PORTTextBox As System.Windows.Forms.TextBox
 End Class

app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.vb

@@ -33,8 +33,8 @@
 
     Private Sub btnEmailTest_Click(sender As Object, e As EventArgs) Handles btnEmailTest.Click
         If txttestReceipiant.Text <> "" Then
-            If ClassEmail.Send_EMail(txttestReceipiant.Text, "Test Email Wiedervorlage", "Default-Bodytext: Wird mit dem Profil Bodytext ersetzt.", EMAIL_SMTPTextBox.Text, EMAIL_USERTextBox.Text, EMAIL_PWTextBox.Text, EMAIL_FROMTextBox.Text) = True Then
+            If ClassEmail.Send_EMail(txttestReceipiant.Text, "Test Email Reminder", "Default-Bodytext: will be replaced with profile-bosytext.", EMAIL_SMTPTextBox.Text, EMAIL_USERTextBox.Text, EMAIL_PWTextBox.Text, EMAIL_FROMTextBox.Text, PORTTextBox.Text) = True Then
-                MsgBox("Die Test Email wurde erfolgrecih versendet!", MsgBoxStyle.Information, "Erfolgsmeldung:")
+                MsgBox("Testmail was send successfully!", MsgBoxStyle.Information, "Erfolgsmeldung:")
             End If
         End If
     End Sub

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

@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmWiedervorlage
+Partial Class frmFollowUp
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -24,7 +24,7 @@ Partial Class frmWiedervorlage
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim GUIDLabel As System.Windows.Forms.Label
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWiedervorlage))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFollowUp))
         Dim FOLLOW_UP_SEQUENCELabel As System.Windows.Forms.Label
         Dim FOLLOW_UP_TIME_SPANLabel As System.Windows.Forms.Label
         Dim DEPENDENT_DATE_CTRL_IDLabel As System.Windows.Forms.Label
@@ -47,11 +47,15 @@ Partial Class frmWiedervorlage
         Dim PROCESS_SELECT5Label As System.Windows.Forms.Label
         Dim Label6 As System.Windows.Forms.Label
         Dim Label8 As System.Windows.Forms.Label
+        Dim Label7 As System.Windows.Forms.Label
+        Dim Label9 As System.Windows.Forms.Label
         Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
-        Me.cmbConstructor = New System.Windows.Forms.ComboBox()
+        Me.cmbCTRLGroup_direct = 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.cmbCTRLUser_direct = New System.Windows.Forms.ComboBox()
+        Me.cmbConstructor = New System.Windows.Forms.ComboBox()
         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()
@@ -114,9 +118,8 @@ Partial Class frmWiedervorlage
         Me.chkbxLogErrorsonly = New System.Windows.Forms.CheckBox()
         Me.cmbWWEmail = New System.Windows.Forms.ComboBox()
         Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.GridResult = New DevExpress.XtraGrid.GridControl()
-        Me.ListBox2 = New System.Windows.Forms.ListBox()
+        Me.grvwResult = New DevExpress.XtraGrid.Views.Grid.GridView()
-        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()
@@ -143,6 +146,8 @@ Partial Class frmWiedervorlage
         PROCESS_SELECT5Label = New System.Windows.Forms.Label()
         Label6 = New System.Windows.Forms.Label()
         Label8 = New System.Windows.Forms.Label()
+        Label7 = New System.Windows.Forms.Label()
+        Label9 = New System.Windows.Forms.Label()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
         Me.XtraTabPage1.SuspendLayout()
@@ -155,7 +160,8 @@ Partial Class frmWiedervorlage
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.SuspendLayout()
         Me.XtraTabPage2.SuspendLayout()
         Me.XtraTabPage3.SuspendLayout()
-        Me.GroupBox2.SuspendLayout()
+        CType(Me.GridResult, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.grvwResult, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'GUIDLabel
@@ -275,18 +281,26 @@ Partial Class frmWiedervorlage
         resources.ApplyResources(Label8, "Label8")
         Label8.Name = "Label8"
         '
+        'Label7
+        '
+        resources.ApplyResources(Label7, "Label7")
+        Label7.ForeColor = System.Drawing.Color.OrangeRed
+        Label7.Name = "Label7"
+        '
+        'Label9
+        '
+        resources.ApplyResources(Label9, "Label9")
+        Label9.ForeColor = System.Drawing.Color.OrangeRed
+        Label9.Name = "Label9"
+        '
         'XtraTabControl1
         '
-        resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
         Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color)
         Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color)
         Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font)
-        Me.XtraTabControl1.AppearancePage.HeaderHotTracked.FontSizeDelta = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.FontSizeDelta"), Integer)
-        Me.XtraTabControl1.AppearancePage.HeaderHotTracked.FontStyleDelta = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.XtraTabControl1.AppearancePage.HeaderHotTracked.GradientMode = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Image = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.Image"), System.Drawing.Image)
         Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Options.UseBackColor = True
         Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Options.UseFont = True
+        resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
         Me.XtraTabControl1.Name = "XtraTabControl1"
         Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
         Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage3})
@@ -294,6 +308,10 @@ Partial Class frmWiedervorlage
         'XtraTabPage1
         '
         resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
+        Me.XtraTabPage1.Controls.Add(Label9)
+        Me.XtraTabPage1.Controls.Add(Me.cmbCTRLGroup_direct)
+        Me.XtraTabPage1.Controls.Add(Label7)
+        Me.XtraTabPage1.Controls.Add(Me.cmbCTRLUser_direct)
         Me.XtraTabPage1.Controls.Add(Label8)
         Me.XtraTabPage1.Controls.Add(Me.cmbConstructor)
         Me.XtraTabPage1.Controls.Add(Me.GroupBox3)
@@ -350,15 +368,14 @@ Partial Class frmWiedervorlage
         Me.XtraTabPage1.Controls.Add(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator)
         Me.XtraTabPage1.Name = "XtraTabPage1"
         '
-        'cmbConstructor
+        'cmbCTRLGroup_direct
         '
-        resources.ApplyResources(Me.cmbConstructor, "cmbConstructor")
+        Me.cmbCTRLGroup_direct.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CTRL_GROUP_DIRECT", True))
-        Me.cmbConstructor.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CONSTRUCTOR_ID", True))
+        Me.cmbCTRLGroup_direct.DropDownWidth = 250
-        Me.cmbConstructor.DataSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource
+        resources.ApplyResources(Me.cmbCTRLGroup_direct, "cmbCTRLGroup_direct")
-        Me.cmbConstructor.DisplayMember = "FORM_TITLE"
+        Me.cmbCTRLGroup_direct.ForeColor = System.Drawing.Color.OrangeRed
-        Me.cmbConstructor.FormattingEnabled = True
+        Me.cmbCTRLGroup_direct.FormattingEnabled = True
-        Me.cmbConstructor.Name = "cmbConstructor"
+        Me.cmbCTRLGroup_direct.Name = "cmbCTRLGroup_direct"
-        Me.cmbConstructor.ValueMember = "GUID"
         '
         'TBPMO_FOLLOW_UP_EMAILBindingSource
         '
@@ -370,6 +387,25 @@ Partial Class frmWiedervorlage
         Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
         Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
         '
+        'cmbCTRLUser_direct
+        '
+        Me.cmbCTRLUser_direct.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CTRL_USER_DIRECT", True))
+        Me.cmbCTRLUser_direct.DropDownWidth = 250
+        resources.ApplyResources(Me.cmbCTRLUser_direct, "cmbCTRLUser_direct")
+        Me.cmbCTRLUser_direct.ForeColor = System.Drawing.Color.OrangeRed
+        Me.cmbCTRLUser_direct.FormattingEnabled = True
+        Me.cmbCTRLUser_direct.Name = "cmbCTRLUser_direct"
+        '
+        '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
+        resources.ApplyResources(Me.cmbConstructor, "cmbConstructor")
+        Me.cmbConstructor.Name = "cmbConstructor"
+        Me.cmbConstructor.ValueMember = "GUID"
+        '
         'TBPMO_FORM_CONSTRUCTORBindingSource
         '
         Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataMember = "TBPMO_FORM_CONSTRUCTOR"
@@ -377,12 +413,12 @@ Partial Class frmWiedervorlage
         '
         'GroupBox3
         '
-        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
         Me.GroupBox3.Controls.Add(Me.ListBoxUser2Profile)
         Me.GroupBox3.Controls.Add(Me.Label5)
         Me.GroupBox3.Controls.Add(Me.cmbUser)
         Me.GroupBox3.Controls.Add(Me.btnAddUser_WV)
         Me.GroupBox3.Controls.Add(Me.btndelete)
+        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.TabStop = False
         '
@@ -400,8 +436,8 @@ Partial Class frmWiedervorlage
         '
         'cmbUser
         '
-        resources.ApplyResources(Me.cmbUser, "cmbUser")
         Me.cmbUser.DisplayMember = "FORM_TITLE"
+        resources.ApplyResources(Me.cmbUser, "cmbUser")
         Me.cmbUser.FormattingEnabled = True
         Me.cmbUser.Name = "cmbUser"
         Me.cmbUser.TabStop = False
@@ -409,8 +445,8 @@ Partial Class frmWiedervorlage
         '
         'btnAddUser_WV
         '
-        resources.ApplyResources(Me.btnAddUser_WV, "btnAddUser_WV")
         Me.btnAddUser_WV.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer))
+        resources.ApplyResources(Me.btnAddUser_WV, "btnAddUser_WV")
         Me.btnAddUser_WV.Image = Global.DD_Record_Organiser.My.Resources.Resources.add
         Me.btnAddUser_WV.Name = "btnAddUser_WV"
         Me.btnAddUser_WV.TabStop = False
@@ -426,15 +462,14 @@ Partial Class frmWiedervorlage
         '
         'FOLLOW_UP_DAYSTextBox
         '
-        resources.ApplyResources(Me.FOLLOW_UP_DAYSTextBox, "FOLLOW_UP_DAYSTextBox")
         Me.FOLLOW_UP_DAYSTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "FOLLOW_UP_DAYS", True))
+        resources.ApplyResources(Me.FOLLOW_UP_DAYSTextBox, "FOLLOW_UP_DAYSTextBox")
         Me.FOLLOW_UP_DAYSTextBox.Name = "FOLLOW_UP_DAYSTextBox"
         Me.FOLLOW_UP_DAYSTextBox.ReadOnly = True
         Me.FOLLOW_UP_DAYSTextBox.TabStop = False
         '
         'GroupBox1
         '
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Controls.Add(Me.chkSonntag)
         Me.GroupBox1.Controls.Add(Me.CheckBox1)
         Me.GroupBox1.Controls.Add(Me.chkSamstag)
@@ -442,6 +477,7 @@ Partial Class frmWiedervorlage
         Me.GroupBox1.Controls.Add(Me.chkFreitag)
         Me.GroupBox1.Controls.Add(Me.chkMittwoch)
         Me.GroupBox1.Controls.Add(Me.chkDonnerstag)
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
         '
@@ -489,8 +525,8 @@ Partial Class frmWiedervorlage
         '
         'PROCESS_SELECT5TextBox
         '
-        resources.ApplyResources(Me.PROCESS_SELECT5TextBox, "PROCESS_SELECT5TextBox")
         Me.PROCESS_SELECT5TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT5", True))
+        resources.ApplyResources(Me.PROCESS_SELECT5TextBox, "PROCESS_SELECT5TextBox")
         Me.PROCESS_SELECT5TextBox.Name = "PROCESS_SELECT5TextBox"
         '
         'Label4
@@ -500,54 +536,54 @@ Partial Class frmWiedervorlage
         '
         'PROCESS_SELECT4TextBox
         '
-        resources.ApplyResources(Me.PROCESS_SELECT4TextBox, "PROCESS_SELECT4TextBox")
         Me.PROCESS_SELECT4TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT4", True))
+        resources.ApplyResources(Me.PROCESS_SELECT4TextBox, "PROCESS_SELECT4TextBox")
         Me.PROCESS_SELECT4TextBox.Name = "PROCESS_SELECT4TextBox"
         '
         'PROCESS_SELECT3TextBox
         '
-        resources.ApplyResources(Me.PROCESS_SELECT3TextBox, "PROCESS_SELECT3TextBox")
         Me.PROCESS_SELECT3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT3", True))
+        resources.ApplyResources(Me.PROCESS_SELECT3TextBox, "PROCESS_SELECT3TextBox")
         Me.PROCESS_SELECT3TextBox.Name = "PROCESS_SELECT3TextBox"
         '
         'PROCESS_SELECT2TextBox
         '
-        resources.ApplyResources(Me.PROCESS_SELECT2TextBox, "PROCESS_SELECT2TextBox")
         Me.PROCESS_SELECT2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT2", True))
+        resources.ApplyResources(Me.PROCESS_SELECT2TextBox, "PROCESS_SELECT2TextBox")
         Me.PROCESS_SELECT2TextBox.Name = "PROCESS_SELECT2TextBox"
         '
         'PROCESS_SELECT1TextBox
         '
-        resources.ApplyResources(Me.PROCESS_SELECT1TextBox, "PROCESS_SELECT1TextBox")
         Me.PROCESS_SELECT1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT1", True))
+        resources.ApplyResources(Me.PROCESS_SELECT1TextBox, "PROCESS_SELECT1TextBox")
         Me.PROCESS_SELECT1TextBox.Name = "PROCESS_SELECT1TextBox"
         '
         'EMAIL_BODYTextBox
         '
         Me.EMAIL_BODYTextBox.AcceptsReturn = True
         Me.EMAIL_BODYTextBox.AcceptsTab = True
-        resources.ApplyResources(Me.EMAIL_BODYTextBox, "EMAIL_BODYTextBox")
         Me.EMAIL_BODYTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "EMAIL_BODY", True))
+        resources.ApplyResources(Me.EMAIL_BODYTextBox, "EMAIL_BODYTextBox")
         Me.EMAIL_BODYTextBox.Name = "EMAIL_BODYTextBox"
         '
         'EMAIL_SUBJECTTextBox
         '
-        resources.ApplyResources(Me.EMAIL_SUBJECTTextBox, "EMAIL_SUBJECTTextBox")
         Me.EMAIL_SUBJECTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "EMAIL_SUBJECT", True))
+        resources.ApplyResources(Me.EMAIL_SUBJECTTextBox, "EMAIL_SUBJECTTextBox")
         Me.EMAIL_SUBJECTTextBox.Name = "EMAIL_SUBJECTTextBox"
         '
         'NAMETextBox
         '
-        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
         Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "NAME", True))
+        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
         Me.NAMETextBox.Name = "NAMETextBox"
         '
         'ListBox1
         '
-        resources.ApplyResources(Me.ListBox1, "ListBox1")
         Me.ListBox1.DataSource = Me.TBPMO_FOLLOW_UP_EMAILBindingSource
         Me.ListBox1.DisplayMember = "NAME"
         Me.ListBox1.FormattingEnabled = True
+        resources.ApplyResources(Me.ListBox1, "ListBox1")
         Me.ListBox1.Name = "ListBox1"
         Me.ListBox1.TabStop = False
         Me.ListBox1.ValueMember = "GUID"
@@ -560,109 +596,109 @@ Partial Class frmWiedervorlage
         '
         'CHANGED_WHENTextBox
         '
-        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
         Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CHANGED_WHEN", True))
+        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
         Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
         Me.CHANGED_WHENTextBox.ReadOnly = True
         Me.CHANGED_WHENTextBox.TabStop = False
         '
         'CHANGED_WHOTextBox
         '
-        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
         Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CHANGED_WHO", True))
+        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
         Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
         Me.CHANGED_WHOTextBox.ReadOnly = True
         Me.CHANGED_WHOTextBox.TabStop = False
         '
         'ADDED_WHENTextBox
         '
-        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
         Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "ADDED_WHEN", True))
+        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
         Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
         Me.ADDED_WHENTextBox.ReadOnly = True
         Me.ADDED_WHENTextBox.TabStop = False
         '
         'ADDED_WHOTextBox
         '
-        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
         Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "ADDED_WHO", True))
+        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
         Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
         Me.ADDED_WHOTextBox.ReadOnly = True
         Me.ADDED_WHOTextBox.TabStop = False
         '
         'TIME_DISTComboBox
         '
-        resources.ApplyResources(Me.TIME_DISTComboBox, "TIME_DISTComboBox")
         Me.TIME_DISTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "TIME_DIST", True))
         Me.TIME_DISTComboBox.FormattingEnabled = True
         Me.TIME_DISTComboBox.Items.AddRange(New Object() {resources.GetString("TIME_DISTComboBox.Items"), resources.GetString("TIME_DISTComboBox.Items1")})
+        resources.ApplyResources(Me.TIME_DISTComboBox, "TIME_DISTComboBox")
         Me.TIME_DISTComboBox.Name = "TIME_DISTComboBox"
         '
         'ACTIVECheckBox
         '
-        resources.ApplyResources(Me.ACTIVECheckBox, "ACTIVECheckBox")
         Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "ACTIVE", True))
+        resources.ApplyResources(Me.ACTIVECheckBox, "ACTIVECheckBox")
         Me.ACTIVECheckBox.Name = "ACTIVECheckBox"
         Me.ACTIVECheckBox.TabStop = False
         Me.ACTIVECheckBox.UseVisualStyleBackColor = True
         '
         'TIME_SPANTextBox
         '
-        resources.ApplyResources(Me.TIME_SPANTextBox, "TIME_SPANTextBox")
         Me.TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "TIME_SPAN", True))
+        resources.ApplyResources(Me.TIME_SPANTextBox, "TIME_SPANTextBox")
         Me.TIME_SPANTextBox.Name = "TIME_SPANTextBox"
         '
         'TIME_UNITYComboBox
         '
-        resources.ApplyResources(Me.TIME_UNITYComboBox, "TIME_UNITYComboBox")
         Me.TIME_UNITYComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "TIME_UNITY", True))
         Me.TIME_UNITYComboBox.FormattingEnabled = True
         Me.TIME_UNITYComboBox.Items.AddRange(New Object() {resources.GetString("TIME_UNITYComboBox.Items"), resources.GetString("TIME_UNITYComboBox.Items1"), resources.GetString("TIME_UNITYComboBox.Items2")})
+        resources.ApplyResources(Me.TIME_UNITYComboBox, "TIME_UNITYComboBox")
         Me.TIME_UNITYComboBox.Name = "TIME_UNITYComboBox"
         '
         'PARENT_IDComboBox
         '
-        resources.ApplyResources(Me.PARENT_IDComboBox, "PARENT_IDComboBox")
         Me.PARENT_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PARENT_ID", True))
         Me.PARENT_IDComboBox.FormattingEnabled = True
+        resources.ApplyResources(Me.PARENT_IDComboBox, "PARENT_IDComboBox")
         Me.PARENT_IDComboBox.Name = "PARENT_IDComboBox"
         '
         'DEPENDENT_DONE_CTRL_IDComboBox
         '
-        resources.ApplyResources(Me.DEPENDENT_DONE_CTRL_IDComboBox, "DEPENDENT_DONE_CTRL_IDComboBox")
         Me.DEPENDENT_DONE_CTRL_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "DEPENDENT_DONE_CTRL_ID", True))
         Me.DEPENDENT_DONE_CTRL_IDComboBox.DropDownWidth = 250
+        resources.ApplyResources(Me.DEPENDENT_DONE_CTRL_IDComboBox, "DEPENDENT_DONE_CTRL_IDComboBox")
         Me.DEPENDENT_DONE_CTRL_IDComboBox.ForeColor = System.Drawing.Color.OrangeRed
         Me.DEPENDENT_DONE_CTRL_IDComboBox.FormattingEnabled = True
         Me.DEPENDENT_DONE_CTRL_IDComboBox.Name = "DEPENDENT_DONE_CTRL_IDComboBox"
         '
         'DEPENDENT_DATE_CTRL_IDComboBox
         '
-        resources.ApplyResources(Me.DEPENDENT_DATE_CTRL_IDComboBox, "DEPENDENT_DATE_CTRL_IDComboBox")
         Me.DEPENDENT_DATE_CTRL_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "DEPENDENT_DATE_CTRL_ID", True))
         Me.DEPENDENT_DATE_CTRL_IDComboBox.DropDownWidth = 250
+        resources.ApplyResources(Me.DEPENDENT_DATE_CTRL_IDComboBox, "DEPENDENT_DATE_CTRL_IDComboBox")
         Me.DEPENDENT_DATE_CTRL_IDComboBox.ForeColor = System.Drawing.Color.OrangeRed
         Me.DEPENDENT_DATE_CTRL_IDComboBox.FormattingEnabled = True
         Me.DEPENDENT_DATE_CTRL_IDComboBox.Name = "DEPENDENT_DATE_CTRL_IDComboBox"
         '
         'FOLLOW_UP_TIME_SPANTextBox
         '
-        resources.ApplyResources(Me.FOLLOW_UP_TIME_SPANTextBox, "FOLLOW_UP_TIME_SPANTextBox")
         Me.FOLLOW_UP_TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "FOLLOW_UP_TIME_SPAN", True))
+        resources.ApplyResources(Me.FOLLOW_UP_TIME_SPANTextBox, "FOLLOW_UP_TIME_SPANTextBox")
         Me.FOLLOW_UP_TIME_SPANTextBox.Name = "FOLLOW_UP_TIME_SPANTextBox"
         '
         'FOLLOW_UP_SEQUENCEComboBox
         '
-        resources.ApplyResources(Me.FOLLOW_UP_SEQUENCEComboBox, "FOLLOW_UP_SEQUENCEComboBox")
         Me.FOLLOW_UP_SEQUENCEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "FOLLOW_UP_SEQUENCE", True))
         Me.FOLLOW_UP_SEQUENCEComboBox.FormattingEnabled = True
         Me.FOLLOW_UP_SEQUENCEComboBox.Items.AddRange(New Object() {resources.GetString("FOLLOW_UP_SEQUENCEComboBox.Items"), resources.GetString("FOLLOW_UP_SEQUENCEComboBox.Items1"), resources.GetString("FOLLOW_UP_SEQUENCEComboBox.Items2")})
+        resources.ApplyResources(Me.FOLLOW_UP_SEQUENCEComboBox, "FOLLOW_UP_SEQUENCEComboBox")
         Me.FOLLOW_UP_SEQUENCEComboBox.Name = "FOLLOW_UP_SEQUENCEComboBox"
         '
         'GUIDTextBox
         '
-        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
         Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "GUID", True))
+        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
         Me.GUIDTextBox.Name = "GUIDTextBox"
         Me.GUIDTextBox.ReadOnly = True
         Me.GUIDTextBox.TabStop = False
@@ -674,13 +710,13 @@ Partial Class frmWiedervorlage
         '
         'TBPMO_FOLLOW_UP_EMAILBindingNavigator
         '
-        resources.ApplyResources(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, "TBPMO_FOLLOW_UP_EMAILBindingNavigator")
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.BindingSource = Me.TBPMO_FOLLOW_UP_EMAILBindingSource
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.CountItem = Me.BindingNavigatorCountItem
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.CountItemFormat = "of {0} Follow-up steps"
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem})
+        resources.ApplyResources(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, "TBPMO_FOLLOW_UP_EMAILBindingNavigator")
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem
@@ -690,37 +726,37 @@ Partial Class frmWiedervorlage
         '
         'BindingNavigatorAddNewItem
         '
-        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
         Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
         Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
         '
         'BindingNavigatorCountItem
         '
-        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
         Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
+        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
         '
         'BindingNavigatorDeleteItem
         '
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
         Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
         Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
         '
         'BindingNavigatorMoveFirstItem
         '
-        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
         Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
         Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
         '
         'BindingNavigatorMovePreviousItem
         '
-        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
         Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
         Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
         '
         'BindingNavigatorSeparator
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
         Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator"
+        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
         '
         'BindingNavigatorPositionItem
         '
@@ -729,41 +765,41 @@ Partial Class frmWiedervorlage
         '
         'BindingNavigatorSeparator1
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
         Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1"
+        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
         '
         'BindingNavigatorMoveNextItem
         '
-        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
         Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
         Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
         '
         'BindingNavigatorMoveLastItem
         '
-        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
         Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
         Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
         '
         'BindingNavigatorSeparator2
         '
-        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
+        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
         '
         'TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem
         '
-        resources.ApplyResources(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem, "TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem")
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem, "TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem")
         Me.TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem.Name = "TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem"
         '
         'XtraTabPage2
         '
-        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         Me.XtraTabPage2.Controls.Add(Me.Label3)
         Me.XtraTabPage2.Controls.Add(Me.btnEmailConfig)
         Me.XtraTabPage2.Controls.Add(Me.Label2)
         Me.XtraTabPage2.Controls.Add(Me.chkbxLogErrorsonly)
         Me.XtraTabPage2.Controls.Add(Me.cmbWWEmail)
         Me.XtraTabPage2.Name = "XtraTabPage2"
+        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         '
         'Label3
         '
@@ -772,8 +808,8 @@ Partial Class frmWiedervorlage
         '
         'btnEmailConfig
         '
-        resources.ApplyResources(Me.btnEmailConfig, "btnEmailConfig")
         Me.btnEmailConfig.Image = Global.DD_Record_Organiser.My.Resources.Resources.email_edit
+        resources.ApplyResources(Me.btnEmailConfig, "btnEmailConfig")
         Me.btnEmailConfig.Name = "btnEmailConfig"
         Me.btnEmailConfig.UseVisualStyleBackColor = True
         '
@@ -790,34 +826,35 @@ Partial Class frmWiedervorlage
         '
         'cmbWWEmail
         '
-        resources.ApplyResources(Me.cmbWWEmail, "cmbWWEmail")
         Me.cmbWWEmail.FormattingEnabled = True
+        resources.ApplyResources(Me.cmbWWEmail, "cmbWWEmail")
         Me.cmbWWEmail.Name = "cmbWWEmail"
         '
         'XtraTabPage3
         '
-        resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
+        Me.XtraTabPage3.Controls.Add(Me.GridResult)
-        Me.XtraTabPage3.Controls.Add(Me.GroupBox2)
-        Me.XtraTabPage3.Controls.Add(Me.Label7)
         Me.XtraTabPage3.Name = "XtraTabPage3"
+        resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
         '
-        'GroupBox2
+        'GridResult
         '
-        resources.ApplyResources(Me.GroupBox2, "GroupBox2")
+        resources.ApplyResources(Me.GridResult, "GridResult")
-        Me.GroupBox2.Controls.Add(Me.ListBox2)
+        Me.GridResult.MainView = Me.grvwResult
-        Me.GroupBox2.Name = "GroupBox2"
+        Me.GridResult.Name = "GridResult"
-        Me.GroupBox2.TabStop = False
+        Me.GridResult.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwResult})
         '
-        'ListBox2
+        'grvwResult
         '
-        resources.ApplyResources(Me.ListBox2, "ListBox2")
+        Me.grvwResult.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwResult.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.ListBox2.FormattingEnabled = True
+        Me.grvwResult.Appearance.EvenRow.Options.UseBackColor = True
-        Me.ListBox2.Name = "ListBox2"
+        Me.grvwResult.GridControl = Me.GridResult
-        '
+        Me.grvwResult.Name = "grvwResult"
-        'Label7
+        Me.grvwResult.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        '
+        Me.grvwResult.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        resources.ApplyResources(Me.Label7, "Label7")
+        Me.grvwResult.OptionsBehavior.Editable = False
-        Me.Label7.Name = "Label7"
+        Me.grvwResult.OptionsBehavior.ReadOnly = True
+        Me.grvwResult.OptionsView.EnableAppearanceEvenRow = True
+        Me.grvwResult.OptionsView.ShowAutoFilterRow = True
         '
         'TBPMO_FOLLOW_UP_EMAILTableAdapter
         '
@@ -826,6 +863,7 @@ Partial Class frmWiedervorlage
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
@@ -834,6 +872,7 @@ Partial Class frmWiedervorlage
         Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Me.TBPMO_FOLLOW_UP_EMAILTableAdapter
         Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
@@ -846,12 +885,14 @@ Partial Class frmWiedervorlage
         Me.TableAdapterManager.TBPMO_LANGUAGE_OBJECTTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILE_IDXTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
-
         Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_STATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
@@ -860,12 +901,12 @@ Partial Class frmWiedervorlage
         '
         Me.TBPMO_FORM_CONSTRUCTORTableAdapter.ClearBeforeFill = True
         '
-        'frmWiedervorlage
+        'frmFollowUp
         '
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.XtraTabControl1)
-        Me.Name = "frmWiedervorlage"
+        Me.Name = "frmFollowUp"
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl1.ResumeLayout(False)
         Me.XtraTabPage1.ResumeLayout(False)
@@ -883,8 +924,8 @@ Partial Class frmWiedervorlage
         Me.XtraTabPage2.ResumeLayout(False)
         Me.XtraTabPage2.PerformLayout()
         Me.XtraTabPage3.ResumeLayout(False)
-        Me.XtraTabPage3.PerformLayout()
+        CType(Me.GridResult, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox2.ResumeLayout(False)
+        CType(Me.grvwResult, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -953,12 +994,13 @@ Partial Class frmWiedervorlage
     Friend WithEvents chkDonnerstag As System.Windows.Forms.CheckBox
     Friend WithEvents FOLLOW_UP_DAYSTextBox As System.Windows.Forms.TextBox
     Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
-    Friend WithEvents ListBox2 As System.Windows.Forms.ListBox
-    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
+    Friend WithEvents cmbCTRLGroup_direct As System.Windows.Forms.ComboBox
+    Friend WithEvents cmbCTRLUser_direct As System.Windows.Forms.ComboBox
+    Friend WithEvents GridResult As DevExpress.XtraGrid.GridControl
+    Friend WithEvents grvwResult As DevExpress.XtraGrid.Views.Grid.GridView
 End Class

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

@@ -214,15 +214,6 @@
   <data name="XtraTabPage2.Text" xml:space="preserve">
     <value>Basic settings</value>
   </data>
-  <data name="GroupBox2.Text" xml:space="preserve">
-    <value>Follow-up email</value>
-  </data>
-  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>332, 13</value>
-  </data>
-  <data name="Label7.Text" xml:space="preserve">
-    <value>These follow-ups are currently being checked for Execution validity:</value>
-  </data>
   <data name="XtraTabPage3.Text" xml:space="preserve">
     <value>Current overview</value>
   </data>
@@ -408,6 +399,15 @@
   <data name="chkbxLogErrorsonly.Text" xml:space="preserve">
     <value>Log Errors Only (Yes/no)</value>
   </data>
+  <data name="GroupBox2.Text" xml:space="preserve">
+    <value>Follow-up email</value>
+  </data>
+  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>332, 13</value>
+  </data>
+  <data name="Label7.Text" xml:space="preserve">
+    <value>These follow-ups are currently being checked for Execution validity:</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA

app/DD-Record-Organiser/frmFollowUp.vb

@@ -1,7 +1,7 @@
-Public Class frmWiedervorlage
+Public Class frmFollowUp
     Dim Formloaded As Boolean = False
     Private Sub TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_FOLLOW_UP_EMAILBindingNavigatorSaveItem.Click
-      Save_FollowUP_EMail
+        Save_FollowUP_EMail()
     End Sub
     Sub Save_FollowUP_EMail()
         Try
@@ -18,6 +18,37 @@
             MsgBox("Fehler in Save_FollowUP_EMail:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
+
+    Sub Load_entity_Data()
+        Try
+
+            Dim sql = String.Format("SELECT [CONTROL_ID] ,[FORM_NAME] + ' | ' + [CONTROL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID IN (2,3,12) ORDER BY FORM_ID", cmbConstructor.SelectedValue)
+            Dim DTCTRL_USR As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim DTCTRL_GRP As DataTable = ClassDatabase.Return_Datatable(sql)
+
+            Dim newRow As DataRow = DTCTRL_USR.NewRow()
+
+            newRow("CONTROL_ID") = "0"
+            newRow("DISPLAY") = "(EMPTY)"
+            DTCTRL_USR.Rows.Add(newRow)
+            Dim newRow1 As DataRow = DTCTRL_GRP.NewRow()
+
+            newRow1("CONTROL_ID") = "0"
+            newRow1("DISPLAY") = "(EMPTY)"
+            DTCTRL_GRP.Rows.Add(newRow1)
+
+            cmbCTRLGroup_direct.DataSource = DTCTRL_GRP
+            cmbCTRLGroup_direct.DisplayMember = DTCTRL_GRP.Columns(1).ColumnName
+            cmbCTRLGroup_direct.ValueMember = DTCTRL_GRP.Columns(0).ColumnName
+
+            cmbCTRLUser_direct.DataSource = DTCTRL_USR
+            cmbCTRLUser_direct.DisplayMember = DTCTRL_USR.Columns(1).ColumnName
+            cmbCTRLUser_direct.ValueMember = DTCTRL_USR.Columns(0).ColumnName
+        Catch ex As Exception
+            MsgBox("Error in Load Entity related Data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        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.
 
@@ -26,7 +57,7 @@
             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")
             Dim DT3 As DataTable = ClassDatabase.Return_Datatable("select GUID,NAME FROM TBPMO_FOLLOW_UP_EMAIL ORDER BY NAME")
             Dim DTUser As DataTable = ClassDatabase.Return_Datatable("select guid, username from TBDD_USER t where T.EMAIL IS NOT NULL AND MODULE_RECORD_ORG = 1 order by USERNAME")
-
+            Load_entity_Data()
             PARENT_IDComboBox.DataSource = DT3
             PARENT_IDComboBox.DisplayMember = DT3.Columns(1).ColumnName
             PARENT_IDComboBox.ValueMember = DT3.Columns(0).ColumnName
@@ -34,9 +65,13 @@
             DEPENDENT_DATE_CTRL_IDComboBox.DataSource = DT1
             DEPENDENT_DATE_CTRL_IDComboBox.DisplayMember = DT1.Columns(1).ColumnName
             DEPENDENT_DATE_CTRL_IDComboBox.ValueMember = DT1.Columns(0).ColumnName
+
             DEPENDENT_DONE_CTRL_IDComboBox.DataSource = DT2
             DEPENDENT_DONE_CTRL_IDComboBox.DisplayMember = DT2.Columns(1).ColumnName
             DEPENDENT_DONE_CTRL_IDComboBox.ValueMember = DT2.Columns(0).ColumnName
+
+
+
             cmbUser.DataSource = DTUser
             cmbUser.DisplayMember = DTUser.Columns(1).ColumnName
             cmbUser.ValueMember = DTUser.Columns(0).ColumnName
@@ -44,7 +79,7 @@
             Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_FORM_CONSTRUCTOR, USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
 
-            Load_WV_Profiles()
+            Load_WV_PRofiles()
         Catch ex As Exception
             MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -67,10 +102,22 @@
                     Dim sql2 = "SELECT FOLLOW_UP_LOG_ERR_ONLY FROM TBPMO_KONFIGURATION WHERE GUID = 1"
                     chkbxLogErrorsonly.Checked = CBool(ClassDatabase.Execute_Scalar(sql2))
                     load_EmailProfiles()
+                    sql2 = "SELECT FOLLOW_UP_EMAIL_PROFILE FROM TBPMO_KONFIGURATION WHERE GUID = 1"
+                    cmbWWEmail.SelectedValue = CInt(ClassDatabase.Execute_Scalar(sql2))
                 Catch ex As Exception
                     MsgBox("Fehler beim Laden der Grundeinstellungen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                 End Try
                 loaded = True
+            Case 2
+                Try
+                    Dim sql = "SELECT [FOLLOW_UP_ID],[NAME],[FOLLOW_UP_SEQUENCE],[FOLLOW_UP_DAYS],[FOLLOW_UP_TIME_SPAN],[NOW_TIME],[RECORD_ID],[VALUE]" & _
+                    ",[EMAIL_SUBJECT],[EMAIL_BODY],[TIME_UNITY],[TIME_DIST],[TIME_SPAN],[DEPENDENT_DATE_CTRL_ID],[DEPENDENT_DONE_CTRL_ID],[DONE_VALUE],[CONSTRUCTOR_ID]" & _
+                    ",[CONSTRUCTOR_TITLE] FROM VWPMO_FOLLOW_UP_EMAIL"
+                    Dim DT = ClassDatabase.Return_Datatable(sql)
+                    GridResult.DataSource = DT
+                Catch ex As Exception
+                    MsgBox("Unexpected Error in show follow up records:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                End Try
         End Select
     End Sub
 
@@ -168,9 +215,12 @@
         End If
     End Sub
     Private Sub frmWiedervorlage_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        Load_User_2_Profile(Me.GUIDTextBox.Text)
+        If Me.GUIDTextBox.Text <> "" Then
-        Formloaded = True
+            Load_User_2_Profile(Me.GUIDTextBox.Text)
-        SetCheckbox()
+            Formloaded = True
+            SetCheckbox()
+        End If
+
     End Sub
 
     Private Sub FOLLOW_UP_SEQUENCEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles FOLLOW_UP_SEQUENCEComboBox.SelectedIndexChanged
@@ -179,7 +229,7 @@
                 Case "ONCE_WEEKLY"
                 Case "ONCE_DAILY"
                 Case "Hour"
-                  
+
             End Select
         End If
     End Sub
@@ -337,4 +387,20 @@
         chkSamstag.CheckedChanged, chkSonntag.CheckedChanged
         CheckBox_CheckChanged()
     End Sub
+
+    Private Sub cmbWWEmail_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbWWEmail.SelectedIndexChanged
+        If cmbWWEmail.SelectedIndex <> -1 Then
+            Try
+                Dim i = CInt(cmbWWEmail.SelectedValue)
+            Catch ex As Exception
+                Exit Sub
+            End Try
+            Try
+                Dim upd = "Update TBPMO_KONFIGURATION SET FOLLOW_UP_EMAIL_PROFILE = " & cmbWWEmail.SelectedValue & " WHERE GUID = 1"
+                ClassDatabase.Execute_non_Query(upd, True)
+            Catch ex As Exception
+                MsgBox("Check logfile - unexpected error in updating email-profile: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            End Try
+        End If
+    End Sub
 End Class

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

@@ -90,6 +90,8 @@ Partial Class frmSAP_FuBa
         Me.btnGetResult = New System.Windows.Forms.Button()
         Me.FuBa_SplitCharacterTextBox = New System.Windows.Forms.TextBox()
         Me.lblSplitchr = New System.Windows.Forms.Label()
+        Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
+        Me.Label2 = New System.Windows.Forms.Label()
         GUIDLabel = New System.Windows.Forms.Label()
         NAMELabel = New System.Windows.Forms.Label()
         COMMENTLabel = New System.Windows.Forms.Label()
@@ -197,16 +199,16 @@ Partial Class frmSAP_FuBa
         'TempTableNameLabel
         '
         TempTableNameLabel.AutoSize = True
-        TempTableNameLabel.Location = New System.Drawing.Point(184, 148)
+        TempTableNameLabel.Location = New System.Drawing.Point(276, 149)
         TempTableNameLabel.Name = "TempTableNameLabel"
-        TempTableNameLabel.Size = New System.Drawing.Size(99, 13)
+        TempTableNameLabel.Size = New System.Drawing.Size(97, 13)
         TempTableNameLabel.TabIndex = 21
-        TempTableNameLabel.Text = "Temp Table Name:"
+        TempTableNameLabel.Text = "Table SQL-Server: "
         '
         'ADDED_WHOLabel
         '
         ADDED_WHOLabel.AutoSize = True
-        ADDED_WHOLabel.Location = New System.Drawing.Point(180, 280)
+        ADDED_WHOLabel.Location = New System.Drawing.Point(184, 280)
         ADDED_WHOLabel.Name = "ADDED_WHOLabel"
         ADDED_WHOLabel.Size = New System.Drawing.Size(67, 13)
         ADDED_WHOLabel.TabIndex = 25
@@ -470,9 +472,9 @@ Partial Class frmSAP_FuBa
         'TempTableNameTextBox
         '
         Me.TempTableNameTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "TempTableName", True))
-        Me.TempTableNameTextBox.Location = New System.Drawing.Point(187, 164)
+        Me.TempTableNameTextBox.Location = New System.Drawing.Point(279, 164)
         Me.TempTableNameTextBox.Name = "TempTableNameTextBox"
-        Me.TempTableNameTextBox.Size = New System.Drawing.Size(182, 22)
+        Me.TempTableNameTextBox.Size = New System.Drawing.Size(90, 22)
         Me.TempTableNameTextBox.TabIndex = 22
         '
         'ACTIVECheckBox
@@ -491,9 +493,9 @@ Partial Class frmSAP_FuBa
         Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "ADDED_WHO", True))
         Me.ADDED_WHOTextBox.Enabled = False
         Me.ADDED_WHOTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(183, 296)
+        Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(187, 296)
         Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
-        Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(140, 22)
+        Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(136, 22)
         Me.ADDED_WHOTextBox.TabIndex = 26
         '
         'ADDED_WHENTextBox
@@ -735,11 +737,23 @@ Partial Class frmSAP_FuBa
         Me.lblSplitchr.Text = "SplitCharacter"
         Me.lblSplitchr.Visible = False
         '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(184, 167)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(96, 13)
+        Me.Label2.TabIndex = 98
+        Me.Label2.Text = "TBPMO_SAPFUBA_"
+        '
         'frmSAP_FuBa
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1215, 717)
+        Me.Controls.Add(Me.TempTableNameTextBox)
+        Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.lblSplitchr)
         Me.Controls.Add(Me.FuBa_SplitCharacterTextBox)
         Me.Controls.Add(Me.btnGetResult)
@@ -767,7 +781,6 @@ Partial Class frmSAP_FuBa
         Me.Controls.Add(Me.ADDED_WHOTextBox)
         Me.Controls.Add(Me.ACTIVECheckBox)
         Me.Controls.Add(TempTableNameLabel)
-        Me.Controls.Add(Me.TempTableNameTextBox)
         Me.Controls.Add(LanguageLabel)
         Me.Controls.Add(Me.LanguageTextBox)
         Me.Controls.Add(ClientLabel)
@@ -855,4 +868,6 @@ Partial Class frmSAP_FuBa
     Friend WithEvents btnGetResult As System.Windows.Forms.Button
     Friend WithEvents FuBa_SplitCharacterTextBox As System.Windows.Forms.TextBox
     Friend WithEvents lblSplitchr As System.Windows.Forms.Label
+    Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
+    Friend WithEvents Label2 As System.Windows.Forms.Label
 End Class

app/DD-Record-Organiser/frmSAP_FuBa.resx

@@ -249,6 +249,9 @@
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="BackgroundWorker1.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>
         AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA

app/DD-Record-Organiser/frmSAP_FuBa.vb

@@ -2,7 +2,7 @@
 Imports System.Data.SqlClient
 
 Public Class frmSAP_FuBa
-
+    Dim m_CountTo As Integer = 0
     Private Sub TBPMO_SAP_FUBABindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_SAP_FUBABindingNavigatorSaveItem.Click
         Try
             Me.TBPMO_SAP_FUBABindingSource.EndEdit()
@@ -141,8 +141,8 @@ Public Class frmSAP_FuBa
             End If
             '######
             Dim i = 0
-            Dim tablename = "[TPPMO_SAPFUBA_" & TempTableNameTextBox.Text & "]"
+            Dim tablename = "[TBPMO_SAPFUBA_" & TempTableNameTextBox.Text & "]"
-            Dim createtablesql = "CREATE TABLE TPPMO_SAPFUBA_" & TempTableNameTextBox.Text & " ("
+            Dim createtablesql = "CREATE TABLE TBPMO_SAPFUBA_" & TempTableNameTextBox.Text & " ("
 
 
             For Each col As System.Data.DataColumn In SAPResulttable.Columns
@@ -158,7 +158,7 @@ Public Class frmSAP_FuBa
 
             If ClassDatabase.Execute_Scalar(check) = 1 Then
                 If LogErrorsOnly = False Then ClassLogger.Add(">> TempTable " & tablename & " exists and will now be deleted!", False)
-                '    ClassDatabase.Execute_non_Query_withConn("DROP TABLE " & tablename, 1)
+                ClassDatabase.Execute_non_Query_withConn("DROP TABLE " & tablename, 1)
             End If
 
             ''Die Tabelle anlegen
@@ -245,6 +245,9 @@ Public Class frmSAP_FuBa
 
     Private Sub btnGetResult_Click(sender As Object, e As EventArgs) Handles btnGetResult.Click
         Dim SAPCon As New R3Connection
+        Dim sw As New Stopwatch
+        sw.Start()
+        m_CountTo = 100
 
         Me.Cursor = Cursors.WaitCursor
         If ClassSAP.ConnectionInit(HostTextBox.Text, SystemNumberTextBox.Text, UserNameTextBox.Text, PasswordTextBox.Text, ClientTextBox.Text, LanguageTextBox.Text) = True Then
@@ -255,6 +258,7 @@ Public Class frmSAP_FuBa
             lblResult.Visible = False
             GridControl2.DataSource = Nothing
             lblSave.Visible = False
+            sw.Stop()
             Exit Sub
         End If
        
@@ -311,6 +315,7 @@ Public Class frmSAP_FuBa
                 Me.Cursor = Cursors.Default
                 lblSave.Visible = False
             Catch ex As Exception
+                sw.Stop()
                 ClassLogger.Add(">> Unexpected Error in SAP Table Result: " & ex.Message, False)
                 MsgBox("Unexpected Error in SAP Table Result: " & ex.Message, MsgBoxStyle.Critical)
                 lblResult.Visible = False
@@ -491,6 +496,7 @@ Public Class frmSAP_FuBa
             Me.Cursor = Cursors.Default
             lblSave.Visible = False
             GridControl2.DataSource = Nothing
+            sw.Stop()
             ClassLogger.Add(">> SAPResulttable is nothing", False)
         End If
 
@@ -502,14 +508,18 @@ Public Class frmSAP_FuBa
                 GridControl2.DataSource = SAPResulttable
             End If
             SAPCon.Close()
-            If txtLimitRows.Text <> "" Then
+            Dim elapsed As Double
-                lblResult.Text = "Result of FuBa (limited to " & txtLimitRows.Text & " rows)"
+            elapsed = sw.Elapsed.TotalSeconds
+            sw.Stop()
+            If txtLimitRows.Text <> "" And SAPResulttable.Rows.Count >= CInt(txtLimitRows.Text) Then
+                lblResult.Text = "Result of FuBa (limited to " & txtLimitRows.Text & " rows) - Duration: " & Format(elapsed, "0.00") & " seconds"
             Else
-                lblResult.Text = "Result of FuBa (unlimited) >> " & SAPResulttable.Rows.Count & " rows retreived"
+                lblResult.Text = "Result of FuBa (unlimited) >> " & SAPResulttable.Rows.Count & " rows retrieved - Duration: " & Format(elapsed, "0.00") & " seconds"
             End If
             lblResult.Visible = True
             Me.Cursor = Cursors.Default
             lblSave.Visible = False
+           
         Catch ex As Exception
             SAPCon.Close()
             lblResult.Visible = False