MS

app/DD-Record-Organiser/ClassControlBuilder.vb

@@ -185,7 +185,7 @@ Public Class ClassControlBuilder
            
             If CtrlCommandUI.IsEdit Then
                 Dim expression As String
-                expression = "ENTITY_ID = " & CURRENT_FORM_ID
+                expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
                 Dim foundControls() As DataRow
                 ' Use the Select method to find all rows matching the filter.
                 foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -437,7 +437,7 @@ Public Class ClassControlBuilder
                                         Select row1.Item("VALUE")).ToList()
 
 
-                            'ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, dependingControlId, dependingControl, values, CURRENT_FORM_ID)
+                            'ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, dependingControlId, dependingControl, values, CURRENT_ENTITY_ID)
                             ControlLoader.CheckedListBox.LoadValue(checkedlistbox, values)
 
                         Case "Label"
@@ -559,7 +559,7 @@ Public Class ClassControlBuilder
             CONTROL_ID = controlId
             If CtrlCommandUI.IsEdit Then
                 Dim expression As String
-                expression = "ENTITY_ID = " & CURRENT_FORM_ID
+                expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
                 Dim foundControls() As DataRow
                 ' Use the Select method to find all rows matching the filter.
                 foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -655,7 +655,7 @@ Public Class ClassControlBuilder
 
             If CtrlCommandUI.IsEdit Then
                 Dim expression As String
-                expression = "ENTITY_ID = " & CURRENT_FORM_ID
+                expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
                 Dim foundControls() As DataRow
                 ' Use the Select method to find all rows matching the filter.
                 foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -678,7 +678,7 @@ Public Class ClassControlBuilder
                                 Where row.Item("CONTROL_ID") = controlId
                                 Select row.Item("VALUE")).ToList()
 
-                            ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, CONTROL_ID, control, loadedValues, CURRENT_FORM_ID)
+                            ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, CONTROL_ID, control, loadedValues, CURRENT_ENTITY_ID)
                             RECORD_CHANGED = False
                             Exit Sub
                         End If
@@ -691,7 +691,7 @@ Public Class ClassControlBuilder
             'SQL für enable control
             Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
             'If CtrlCommandUI.IsInsert = True Then
-            '    CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
+            '    CtrlCommandUI.SaveRecord(0, CURRENT_ENTITY_ID, CURRENT_PARENT_ID)
             'End If
 
             Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)
@@ -746,7 +746,7 @@ Public Class ClassControlBuilder
             'SQL für enable control
             Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
             'If CtrlCommandUI.IsInsert = True Then
-            '    CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
+            '    CtrlCommandUI.SaveRecord(0, CURRENT_ENTITY_ID, CURRENT_PARENT_ID)
             'End If
 
             Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)

app/DD-Record-Organiser/ClassControlCommands.vb

@@ -90,7 +90,7 @@
             Dim DEFVALUE As String = ""
 
             If (control.Parent.GetType().Name = "GroupBox") Then
-                Dim ParentID As Integer = GetControlID_for_Name(control.Parent.Name, CURRENT_FORM_ID)
+                Dim ParentID As Integer = GetControlID_for_Name(control.Parent.Name, CURRENT_ENTITY_ID)
                 PARENT_CONTROL_ID = ParentID
             End If
 
@@ -100,14 +100,14 @@
 
             ' SQL Befehl für CONTROL TABELLE
             ' SQL_COMMAND_1 auf leeren String setzen
-            SQL = "INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_FORM_ID & ", " & CONTROL_TYPE_ID & ", '', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"
+            SQL = "INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_ENTITY_ID & ", " & CONTROL_TYPE_ID & ", '', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"
 
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
                 Dim GUID = ClassDatabase.Execute_Scalar(SQL)
 
 
-                Return InsertControlScreen(GUID, control, CURRENT_FORM_ID)
+                Return InsertControlScreen(GUID, control, CURRENT_ENTITY_ID)
             Else
                 Throw New Exception()
             End If
@@ -119,7 +119,7 @@
         End Try
     End Function
 
-    Public Shared Function InsertControlScreen(guid As Integer, ByRef control As Control, CURRENT_FORM_ID As Integer)
+    Public Shared Function InsertControlScreen(guid As Integer, ByRef control As Control, CURRENT_ENTITY_ID As Integer)
         Try
             Dim CurrentType As String = control.GetType.ToString
             Dim SQL As String
@@ -133,7 +133,7 @@
             CONTROL_TEXT = control.Text
 
             'Dim TAB_INDEX
-            'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE CURRENT_FORM_ID = " & CURRENT_FORM_ID & ")"
+            'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE CURRENT_ENTITY_ID = " & CURRENT_ENTITY_ID & ")"
             'TAB_INDEX = ClassDatabase.Execute_Scalar(SQL)
             'If Not TAB_INDEX Is Nothing Then
             '    If IsDBNull(TAB_INDEX) Then
@@ -172,7 +172,7 @@
 
     Public Shared Function UpdateControlPosition(ByVal x As Integer, ByVal y As Integer, control As Control)
         Try
-            Dim CONTROL_ID = GetControlID_for_Name(control.Name, CURRENT_FORM_ID)
+            Dim CONTROL_ID = GetControlID_for_Name(control.Name, CURRENT_ENTITY_ID)
 
             'If (ParentIsGroupBox(control)) Then
             '    Console.WriteLine("Before:" & x & ":" & y)
@@ -436,14 +436,14 @@
                         Dim SubjectString, Subject2String, PlaceString, DescString As String
 
                         If propExists(properties, "FromDate") And Not String.IsNullOrWhiteSpace(properties.FromDate) Then
-                            FromDateId = GetControlID_for_Name(properties.FromDate, CURRENT_FORM_ID)
+                            FromDateId = GetControlID_for_Name(properties.FromDate, CURRENT_ENTITY_ID)
                             If FromDateId = -1 Then
                                 Throw New Exception("Das Element für 'fromDate' mit dem Namen " & properties.FromDate & " existiert nicht!")
                             End If
                         End If
 
                         If propExists(properties, "ToDate") And Not String.IsNullOrWhiteSpace(properties.ToDate) Then
-                            ToDateId = GetControlID_for_Name(properties.ToDate, CURRENT_FORM_ID)
+                            ToDateId = GetControlID_for_Name(properties.ToDate, CURRENT_ENTITY_ID)
                             If ToDateId = -1 Then
                                 Throw New Exception("Das Element für 'ToDate' mit dem Namen " & properties.ToDate & " existiert nicht!")
                             End If

app/DD-Record-Organiser/ClassControlValues.vb

@@ -760,7 +760,7 @@ Public Class ClassControlValues
                         Dim vorgabe = defaultValue
                         'Wenn der Default Wert über einen Select kommt
                         If vorgabe.ToString.ToLower.StartsWith("select") Then
-                            vorgabe = defaultValue.Replace("@FORM_ID", CURRENT_FORM_ID)
+                            vorgabe = defaultValue.Replace("@FORM_ID", CURRENT_ENTITY_ID)
                             vorgabe = vorgabe.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                             vorgabe = vorgabe.Replace("@RECORDID", CURRENT_RECORD_ID)
                             vorgabe = vorgabe.Replace("@PARENTRECORD_ID", CURRENT_PARENT_RECORD_ID)

app/DD-Record-Organiser/ClassFileResult.vb

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

app/DD-Record-Organiser/ClassHelper.vb

@@ -283,7 +283,20 @@ Public Class ClassHelper
             ClassLogger.Add("Unexpected Error in DeleteRecord: " & ex.Message, True)
             Return False
         End Try
-       
     End Function
+    Public Shared Sub MSGBOX_Handler(type As String, Caption As String, lbl1 As String, txt1 As String, Optional lbl2 As String = "", Optional txt2 As String = "")
+        MSG_TYPE = type
+        MSG_TITLE = Caption
+        If lbl2 = String.Empty Then
+            MSG_LABLE2 = String.Empty
+            MSG_ERROR2 = String.Empty
+        Else
+            MSG_LABLE2 = lbl2
+            MSG_ERROR2 = txt2
+        End If
+        MSG_LABLE1 = lbl1
+        MSG_ERROR1 = txt1
+        frmMessageBox.ShowDialog()
+    End Sub
 
 End Class

app/DD-Record-Organiser/ClassImport_Windream.vb

@@ -60,7 +60,7 @@ Public Class ClassImport_Windream
                             If Not dt Is Nothing Then
                                 If dt.Rows.Count = 1 Then
                                     Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                                    Dim idxvalue = CURRENT_FORM_ID
+                                    Dim idxvalue = CURRENT_ENTITY_ID
                                     If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False)
                                     indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue)
                                     If indexierung_erfolgreich = False Then
@@ -290,8 +290,8 @@ Public Class ClassImport_Windream
                                                     Dim lblsql = DTtype.Rows(0).Item(1)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_FORM_ID)
+                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_FORM_ID)
+                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                                     If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
                                                     Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                                     If Not IsNothing(result) Then
@@ -566,8 +566,8 @@ Public Class ClassImport_Windream
                                     Else
                                         sql_command = sql_command.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                         sql_command = sql_command.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
-                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_FORM_ID)
+                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
-                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_FORM_ID)
+                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                         Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_command, True)
                                         If IsNothing(AUTOindexresult) Then
                                             ClassLogger.Add(">> unexpected: AUTOindexresult is nothing!!", False)
@@ -659,8 +659,8 @@ Public Class ClassImport_Windream
                                         Dim lblsql = DTtype.Rows(0).Item(1)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
-                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_FORM_ID)
+                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
-                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_FORM_ID)
+                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                         If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
                                         Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                         If Not IsNothing(result) Then

app/DD-Record-Organiser/ClassInit.vb

@@ -1,12 +1,13 @@
 Imports System.ComponentModel
 Imports System.IO
-
+Imports DD_LIB_Standards
 Public Class ClassInit
     Public Sub New()
     End Sub
 
     Public Sub InitLogger()
         ClassLogger.Init("", USER_USERNAME)
+        clsLogger.LOGFILE_PATH = ClassLogger.logDateiname
     End Sub
 
     Public Function InitDatabase()
@@ -20,14 +21,20 @@ Public Class ClassInit
             End If
 
             If MyConnectionString <> String.Empty Then
-                dbResult = ClassDatabase.Init()
+
+                dbResult = clsDatabase.Init(MyConnectionString)
             Else
                 frmConfig_Basic.ShowDialog()
-                dbResult = ClassDatabase.Init()
+                dbResult = clsDatabase.Init(MyConnectionString)
             End If
-
+            ClassDatabase.Init()
             If dbResult = False Then
-                Throw New Exception("Find more information in the logfile.")
+                If clsLogger.LOGG_MSG <> String.Empty Then
+                    Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG)
+                Else
+                    Throw New Exception("Find more information in the logfile.")
+                End If
+
             End If
             Return True
         Catch ex As Exception

app/DD-Record-Organiser/ClassOfficeTemplate.vb

@@ -4,7 +4,7 @@ Public Class ClassOfficeTemplate
         Try
             Dim sql_Template As String = "SELECT * FROM VWPMO_TEMPLATE_ENTITY WHERE TEMPLATE_ID = " & Template_ID
             Dim DT_TEMPLATE As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_Template)
-            Dim sql_patterns As String = String.Format("select * from TBPMO_TEMPLATE_PATTERN where TEMPLATE_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = {0}  AND TEMPLATE_ID = {1})", CURRENT_FORM_ID, Template_ID)
+            Dim sql_patterns As String = String.Format("select * from TBPMO_TEMPLATE_PATTERN where TEMPLATE_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = {0}  AND TEMPLATE_ID = {1})", CURRENT_ENTITY_ID, Template_ID)
             Dim DT_PATTERNS As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_patterns)
 
             If IsNothing(DT_PATTERNS) Then

app/DD-Record-Organiser/ClassWindreamDocGrid.vb

@@ -155,7 +155,7 @@ Public Class ClassWindreamDocGrid
             Dim ds As New DataSet()
 
             Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],T.[DocID],T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE,T.CHANGED_WHEN,T.CHANGED_WHO " &
-                                               "FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_FORM_ID, USER_LANGUAGE)
+                                               "FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_ENTITY_ID, USER_LANGUAGE)
             Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL)
             ' Tabellen zum DataSet hinzufügen
             ds.Tables.Add(DT_RESULT)

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

@@ -81,6 +81,9 @@
     <Reference Include="CommandLine">
       <HintPath>..\..\3rdparty\lib\Commandline\CommandLine.dll</HintPath>
     </Reference>
+    <Reference Include="DD_LIB_Standards">
+      <HintPath>..\..\..\DD_LIB_Standards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
+    </Reference>
     <Reference Include="DD_Rights, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
@@ -382,6 +385,18 @@
     <Compile Include="frmViewsUser.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmWDChangeDoctype.Designer.vb">
+      <DependentUpon>frmWDChangeDoctype.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmWDChangeDoctype.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmWD_CreateVersion.designer.vb">
+      <DependentUpon>frmWD_CreateVersion.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmWD_CreateVersion.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmWD_Import_Doc_Record.Designer.vb">
       <DependentUpon>frmWD_Import_Doc_Record.vb</DependentUpon>
     </Compile>
@@ -807,6 +822,12 @@
     <EmbeddedResource Include="frmViewsUser.resx">
       <DependentUpon>frmViewsUser.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmWDChangeDoctype.resx">
+      <DependentUpon>frmWDChangeDoctype.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmWD_CreateVersion.resx">
+      <DependentUpon>frmWD_CreateVersion.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmWD_Import_Doc_Record.resx">
       <DependentUpon>frmWD_Import_Doc_Record.vb</DependentUpon>
     </EmbeddedResource>
@@ -1371,6 +1392,9 @@
     <None Include="Resources\brick.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\error.png" />
+    <None Include="Resources\error.ico" />
+    <None Include="Resources\Error_red_21x20.png" />
     <None Include="Resources\Permission_12796.png" />
     <None Include="Resources\search_glyph.png" />
     <None Include="Resources\xml.png" />

app/DD-Record-Organiser/ModuleRuntimeVariables.vb

@@ -39,7 +39,7 @@
     Public CURRENT_NEWFILENAME As String
     Public CURRENT_CONTROL_DOCTYPE_MATCH As String = ""
 
-    Public CURRENT_FORM_ID As Integer
+    Public CURRENT_ENTITY_ID As Integer
     Public CURRENT_FORMVIEW_ID As Integer
     Public CURRENT_REDUNDANT_FORM_ID As Integer
     Public CURRENT_REDUNDANT_FORMVIEW_ID As Integer
@@ -128,6 +128,7 @@
     Public FAU_AD_USER_PW As String
     Public FAU_AD_SERVER As String
 
+    Public MSG_TYPE As String
     Public MSG_TITLE As String
     Public MSG_LABLE1 As String
     Public MSG_ERROR1 As String

app/DD-Record-Organiser/My Project/Resources.resx

@@ -133,9 +133,6 @@
   <data name="UserInterfaceEditor_5845_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\UserInterfaceEditor_5845_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="email_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="windream-Logo-transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -172,9 +169,6 @@
   <data name="Files_7954" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="asset_pie-series-chart_on_12X12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Men3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Men3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -184,6 +178,12 @@
   <data name="Arrow_RedoRetry_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Login_6031_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -205,11 +205,8 @@
   <data name="userAccounts" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="email_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="mail" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="user_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -247,6 +244,9 @@
   <data name="eye" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\eye.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\error.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="table_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -262,18 +262,18 @@
   <data name="table" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="changechartlegendalignment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="page_excel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="dtp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Reports-collapsed_12995_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="text1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\text1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -286,12 +286,24 @@
   <data name="application_view_tile" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application_view_tile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="application_view_detail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_1480524473_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\1480524473_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="brick_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="calendar_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\calendar_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,6 +325,9 @@
   <data name="flag_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ComboBox_672" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -325,8 +340,8 @@
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="windream_Logo_transparent_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="save_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -334,12 +349,12 @@
   <data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="base_globe_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\base_globe_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="AddTable_5632" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -349,9 +364,6 @@
   <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_Forward_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Arrow_RedoRetry_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Arrow_RedoRetry_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -367,9 +379,6 @@
   <data name="Property_501" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Works Finished (nonXP)" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -385,6 +394,9 @@
   <data name="WMI_Task_21x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WMI_Task_21x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Connection_Manager" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -403,15 +415,9 @@
   <data name="lock_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lock_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="sql" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="doc_excel_csv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="database_lightning" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -424,8 +430,8 @@
   <data name="Label_684" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="benutzer3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bug_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bug_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -463,20 +469,23 @@
   <data name="view_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="f3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Task_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Task_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Error_red_21x20" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Error_red_21x20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="database_key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="application_view_detail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="1532_Flag_Blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\xml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -487,8 +496,8 @@
   <data name="f2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="save_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="refresh_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -511,21 +520,18 @@
   <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="benutzer3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder_Open_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="138_PushPin_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bmp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="user_suit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="windream_Logo_transparent_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="WebUserControl(ascx)_11270_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WebUserControl(ascx)_11270_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -547,11 +553,11 @@
   <data name="action_add_16xSM" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_add_16xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="email_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_Forward_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Connection_Manager" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="mail" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bricks" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -580,14 +586,17 @@
   <data name="folder_Open_32xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="f3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="note_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -601,8 +610,8 @@
   <data name="Table_748" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="doc_excel_csv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bug_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -610,8 +619,8 @@
   <data name="Men4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Men4.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="asset_pie-series-chart_on_12X12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="keinbild" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -619,11 +628,11 @@
   <data name="UserInterfaceEditor_5845" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\UserInterfaceEditor_5845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="changechartlegendalignment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="1532_Flag_Blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Login_6031_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="email_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -631,8 +640,8 @@
   <data name="f1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\f1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -673,11 +682,11 @@
   <data name="FileSystemEditor_5852" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FileSystemEditor_5852.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NetworkPipes_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="138_PushPin_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -700,13 +709,13 @@
   <data name="112_RefreshArrow_Blue_24x24_721" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\112_RefreshArrow_Blue_24x24_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Reports-collapsed_12995_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="base_globe_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="NetworkPipes_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\base_globe_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_1480524473_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="error1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1480524473_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

app/DD-Record-Organiser/frmConstructorDesigner.vb

@@ -755,7 +755,7 @@ Public Class frmConstructorDesigner
                 Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = {0}", SelectedNode.Tag)
                 Dim FormId As Integer = ClassDatabase.Execute_Scalar(sql)
                 If FormId > 0 Then
-                    CURRENT_FORM_ID = FormId
+                    CURRENT_ENTITY_ID = FormId
                     OpenFormLevelDesigner()
                 End If
             End If

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

@@ -115,6 +115,9 @@ Partial Class frmConstructor_Main
         Me.tstbDisplayname = New System.Windows.Forms.ToolStripTextBox()
         Me.docCM_InWork = New System.Windows.Forms.ToolStripMenuItem()
         Me.docCM_linkRecord = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WindreamToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DateiVersionierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
         Me.docCM_CheckRights = New System.Windows.Forms.ToolStripMenuItem()
         Me.docCM_GetRights = New System.Windows.Forms.ToolStripMenuItem()
@@ -780,7 +783,7 @@ Partial Class frmConstructor_Main
         '
         'ContextMenuStripResultFiles
         '
-        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_Rename, Me.docCM_RenameDisplay, Me.docCM_InWork, Me.docCM_linkRecord, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_DeleteFile, Me.docCM_RemoveLink, Me.ToolStripSeparator9, Me.docCM_ResetView, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile})
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_Rename, Me.docCM_RenameDisplay, Me.docCM_InWork, Me.docCM_linkRecord, Me.WindreamToolStripMenuItem, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_DeleteFile, Me.docCM_RemoveLink, Me.ToolStripSeparator9, Me.docCM_ResetView, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile})
         Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
         resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles")
         '
@@ -849,6 +852,23 @@ Partial Class frmConstructor_Main
         Me.docCM_linkRecord.Name = "docCM_linkRecord"
         resources.ApplyResources(Me.docCM_linkRecord, "docCM_linkRecord")
         '
+        'WindreamToolStripMenuItem
+        '
+        Me.WindreamToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiVersionierenToolStripMenuItem, Me.DokumentartÄndernToolStripMenuItem})
+        Me.WindreamToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.windream_Logo_transparent_klein
+        Me.WindreamToolStripMenuItem.Name = "WindreamToolStripMenuItem"
+        resources.ApplyResources(Me.WindreamToolStripMenuItem, "WindreamToolStripMenuItem")
+        '
+        'DateiVersionierenToolStripMenuItem
+        '
+        Me.DateiVersionierenToolStripMenuItem.Name = "DateiVersionierenToolStripMenuItem"
+        resources.ApplyResources(Me.DateiVersionierenToolStripMenuItem, "DateiVersionierenToolStripMenuItem")
+        '
+        'DokumentartÄndernToolStripMenuItem
+        '
+        Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem"
+        resources.ApplyResources(Me.DokumentartÄndernToolStripMenuItem, "DokumentartÄndernToolStripMenuItem")
+        '
         'ToolStripSeparator7
         '
         Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
@@ -1516,71 +1536,71 @@ Partial Class frmConstructor_Main
         Me.Controls.Add(Me.StatusStrip_Main)
         Me.Controls.Add(Me.NavPane)
         Me.Name = "frmConstructor_Main"
-        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerMain.ResumeLayout(False)
+        Me.SplitContainerMain.ResumeLayout(false)
-        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerTop.ResumeLayout(False)
+        Me.SplitContainerTop.ResumeLayout(false)
-        Me.CMSEntity.ResumeLayout(False)
+        Me.CMSEntity.ResumeLayout(false)
-        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ContextMenuGrid.ResumeLayout(False)
+        Me.ContextMenuGrid.ResumeLayout(false)
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ToolStripRecords.ResumeLayout(False)
+        Me.ToolStripRecords.ResumeLayout(false)
-        Me.ToolStripRecords.PerformLayout()
+        Me.ToolStripRecords.PerformLayout
-        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).EndInit
-        Me.TCDetails.ResumeLayout(False)
+        Me.TCDetails.ResumeLayout(false)
-        Me.TabDetails.ResumeLayout(False)
+        Me.TabDetails.ResumeLayout(false)
-        Me.TabDetails.PerformLayout()
+        Me.TabDetails.PerformLayout
-        CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerDetails,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerDetails.ResumeLayout(False)
+        Me.SplitContainerDetails.ResumeLayout(false)
-        Me.statStripDoc.ResumeLayout(False)
+        Me.statStripDoc.ResumeLayout(false)
-        Me.statStripDoc.PerformLayout()
+        Me.statStripDoc.PerformLayout
-        Me.ToolStripEdit.ResumeLayout(False)
+        Me.ToolStripEdit.ResumeLayout(false)
-        Me.ToolStripEdit.PerformLayout()
+        Me.ToolStripEdit.PerformLayout
-        Me.TabWindream.ResumeLayout(False)
+        Me.TabWindream.ResumeLayout(false)
-        Me.TabWindream.PerformLayout()
+        Me.TabWindream.PerformLayout
-        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ContextMenuStripResultFiles.ResumeLayout(False)
+        Me.ContextMenuStripResultFiles.ResumeLayout(false)
-        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ToolStripDokumente.ResumeLayout(False)
+        Me.ToolStripDokumente.ResumeLayout(false)
-        Me.ToolStripDokumente.PerformLayout()
+        Me.ToolStripDokumente.PerformLayout
-        Me.TabFollowUp.ResumeLayout(False)
+        Me.TabFollowUp.ResumeLayout(false)
-        Me.TabFollowUp.PerformLayout()
+        Me.TabFollowUp.PerformLayout
-        Me.grpbxFU_Profile.ResumeLayout(False)
+        Me.grpbxFU_Profile.ResumeLayout(false)
-        Me.grpbxFU_Profile.PerformLayout()
+        Me.grpbxFU_Profile.PerformLayout
-        Me.GroupBox4.ResumeLayout(False)
+        Me.GroupBox4.ResumeLayout(false)
-        Me.GroupBox4.PerformLayout()
+        Me.GroupBox4.PerformLayout
-        Me.TabPos.ResumeLayout(False)
+        Me.TabPos.ResumeLayout(false)
-        Me.TabPos.PerformLayout()
+        Me.TabPos.PerformLayout
-        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.ResumeLayout(false)
-        CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).EndInit
-        Me.BindingNavigatorPOS.ResumeLayout(False)
+        Me.BindingNavigatorPOS.ResumeLayout(false)
-        Me.BindingNavigatorPOS.PerformLayout()
+        Me.BindingNavigatorPOS.PerformLayout
-        Me.TabPageVariant.ResumeLayout(False)
+        Me.TabPageVariant.ResumeLayout(false)
-        Me.TabPageVariant.PerformLayout()
+        Me.TabPageVariant.PerformLayout
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControl1,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.TBPMO_RECORD_VARIANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBPMO_RECORD_VARIANTBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.GridViewVariants, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewVariants,System.ComponentModel.ISupportInitialize).EndInit
-        Me.tsVariants.ResumeLayout(False)
+        Me.tsVariants.ResumeLayout(false)
-        Me.tsVariants.PerformLayout()
+        Me.tsVariants.PerformLayout
-        CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerFORM,System.ComponentModel.ISupportInitialize).EndInit
-        Me.SplitContainerFORM.ResumeLayout(False)
+        Me.SplitContainerFORM.ResumeLayout(false)
-        Me.StatusStrip_Main.ResumeLayout(False)
+        Me.StatusStrip_Main.ResumeLayout(false)
-        Me.StatusStrip_Main.PerformLayout()
+        Me.StatusStrip_Main.PerformLayout
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).EndInit
-        Me.cmsrpContainer.ResumeLayout(False)
+        Me.cmsrpContainer.ResumeLayout(false)
-        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ResumeLayout(False)
+        Me.ResumeLayout(false)
-        Me.PerformLayout()
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents NavPane As DevExpress.XtraBars.Navigation.TileNavPane
     Friend WithEvents NavButtonHome As DevExpress.XtraBars.Navigation.NavButton
     Friend WithEvents StatusStrip_Main As System.Windows.Forms.StatusStrip
@@ -1765,4 +1785,7 @@ Partial Class frmConstructor_Main
     Friend WithEvents ToolStripSeparator21 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents ToolStripSeparator22 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents pnlDocFill As System.Windows.Forms.Panel
+    Friend WithEvents WindreamToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents DateiVersionierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents DokumentartÄndernToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
 End Class

app/DD-Record-Organiser/frmConstructor_Main.resx

@@ -177,7 +177,7 @@
     <value>Auswertung anzeigen</value>
   </data>
   <data name="CMSEntity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 160</value>
+    <value>195, 138</value>
   </data>
   <data name="&gt;&gt;CMSEntity.Name" xml:space="preserve">
     <value>CMSEntity</value>
@@ -343,7 +343,7 @@
     <value>0, 25</value>
   </data>
   <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1067, 212</value>
+    <value>1074, 212</value>
   </data>
   <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -466,7 +466,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1067, 25</value>
+    <value>1074, 25</value>
   </data>
   <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -550,7 +550,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 336</value>
+    <value>786, 343</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -580,7 +580,7 @@
     <value>0, 26</value>
   </data>
   <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 286</value>
+    <value>561, 293</value>
   </data>
   <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -613,10 +613,10 @@
     <value>Ansicht gesperrt - Klick Bearbeiten für Entsperren</value>
   </data>
   <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 312</value>
+    <value>0, 319</value>
   </data>
   <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 24</value>
+    <value>561, 24</value>
   </data>
   <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -643,7 +643,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 26</value>
+    <value>561, 26</value>
   </data>
   <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -664,7 +664,7 @@
     <value>Panel2</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
   </data>
   <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -840,7 +840,7 @@
     <value>1</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -858,7 +858,7 @@
     <value>0</value>
   </data>
   <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1362, 396</value>
+    <value>1362, 403</value>
   </data>
   <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -929,6 +929,24 @@
   <data name="docCM_linkRecord.Text" xml:space="preserve">
     <value>Datei mit Datensatz verknüpfen</value>
   </data>
+  <data name="DateiVersionierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>184, 22</value>
+  </data>
+  <data name="DateiVersionierenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Datei versionieren</value>
+  </data>
+  <data name="DokumentartÄndernToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>184, 22</value>
+  </data>
+  <data name="DokumentartÄndernToolStripMenuItem.Text" xml:space="preserve">
+    <value>Dokumentart ändern</value>
+  </data>
+  <data name="WindreamToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>251, 22</value>
+  </data>
+  <data name="WindreamToolStripMenuItem.Text" xml:space="preserve">
+    <value>windream</value>
+  </data>
   <data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
     <value>248, 6</value>
   </data>
@@ -984,7 +1002,7 @@
     <value>Eigenschaften</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 348</value>
+    <value>252, 370</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>
@@ -1005,7 +1023,7 @@
     <value>Aqua</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1095,7 +1113,7 @@
     <value>1</value>
   </data>
   <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
   </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1526,7 +1544,7 @@
     <value>2</value>
   </data>
   <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
   </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Wiedervorlage</value>
@@ -1553,7 +1571,7 @@
     <value>Cyan</value>
   </data>
   <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
   </data>
   <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1577,7 +1595,7 @@
     <value>0, 25</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1781,7 +1799,7 @@
 </value>
   </data>
   <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
   </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>Positionen</value>
@@ -1892,7 +1910,7 @@
     <value>5</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>90</value>
@@ -1964,7 +1982,7 @@
     <value>1</value>
   </data>
   <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
   </data>
   <data name="TabPageVariant.Text" xml:space="preserve">
     <value>Vorgängervarianten</value>
@@ -3131,6 +3149,24 @@
   <data name="&gt;&gt;docCM_linkRecord.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;WindreamToolStripMenuItem.Name" xml:space="preserve">
+    <value>WindreamToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;WindreamToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DateiVersionierenToolStripMenuItem.Name" xml:space="preserve">
+    <value>DateiVersionierenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;DateiVersionierenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DokumentartÄndernToolStripMenuItem.Name" xml:space="preserve">
+    <value>DokumentartÄndernToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;DokumentartÄndernToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ToolStripSeparator7.Name" xml:space="preserve">
     <value>ToolStripSeparator7</value>
   </data>

app/DD-Record-Organiser/frmDiagrams.vb

@@ -15,9 +15,9 @@ Public Class frmDiagrams
         Dim CHART_ENTITY_SQL, CHART_GROUPS_SQL, CHART_TITLE_SQL As String
         Dim CHART_ENTITY_DT, CHART_GROUPS_DT As DataTable
 
-        CHART_TITLE_SQL = String.Format("SELECT NAME FROM TBPMO_FORM WHERE GUID = {0}", CURRENT_FORM_ID)
+        CHART_TITLE_SQL = String.Format("SELECT NAME FROM TBPMO_FORM WHERE GUID = {0}", CURRENT_ENTITY_ID)
-        CHART_ENTITY_SQL = String.Format("SELECT * FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0}", CURRENT_FORM_ID)
+        CHART_ENTITY_SQL = String.Format("SELECT * FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0}", CURRENT_ENTITY_ID)
-        CHART_GROUPS_SQL = String.Format("SELECT DISTINCT GROUP_ID FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0} ORDER BY GROUP_ID", CURRENT_FORM_ID)
+        CHART_GROUPS_SQL = String.Format("SELECT DISTINCT GROUP_ID FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0} ORDER BY GROUP_ID", CURRENT_ENTITY_ID)
         CHART_TITLE_STRING = ClassDatabase.Execute_Scalar(CHART_TITLE_SQL)
         CHART_ENTITY_DT = ClassDatabase.Return_Datatable(CHART_ENTITY_SQL)
         CHART_GROUPS_DT = ClassDatabase.Return_Datatable(CHART_GROUPS_SQL)
@@ -128,7 +128,7 @@ Public Class frmDiagrams
     End Sub
 
     Private Function Get_Splitter_Layout_Filename() As String
-        Dim Filename As String = String.Format("{0}-Diagram-SplitterLayout.xml", CURRENT_FORM_ID)
+        Dim Filename As String = String.Format("{0}-Diagram-SplitterLayout.xml", CURRENT_ENTITY_ID)
         Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
     End Function
 

app/DD-Record-Organiser/frmEntities.vb

@@ -163,7 +163,7 @@ Public Class frmEntities
             If GUIDTextBox.Text <> "" Then
                 Dim FormId As Integer = GUIDTextBox.Text 'GetCurrentGUID()
                 If FormId <> -1 Then
-                    CURRENT_FORM_ID = FormId
+                    CURRENT_ENTITY_ID = FormId
                     Open_Designer()
                 End If
             End If

app/DD-Record-Organiser/frmGeodataNavigation.vb

@@ -100,14 +100,14 @@ Public Class frmGeodataNavigation
 
             LoadItemList()
 
-            Dim sql = Get_Grid_Sql(CURRENT_CONSTRUCTOR_ID, CURRENT_FORM_ID, CURRENT_CONSTRUCTOR_DETAIL_ID, frmConstructor_Main.GridType.Grid, USER_GUID, String.Empty, False, 1, 0, GridControlGeo, grvwMain, True)
+            Dim sql = Get_Grid_Sql(CURRENT_CONSTRUCTOR_ID, CURRENT_ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID, frmConstructor_Main.GridType.Grid, USER_GUID, String.Empty, False, 1, 0, GridControlGeo, grvwMain, True)
             If Not IsNothing(sql) Then
                 Dim DT_GEO As DataTable = ClassDatabase.Return_Datatable(sql)
                 GridControlGeo.DataSource = DT_GEO
             End If
 
-            Dim listcheck As List(Of String) = ClassHelper.Return_listcheck(CURRENT_FORM_ID)
+            Dim listcheck As List(Of String) = ClassHelper.Return_listcheck(CURRENT_ENTITY_ID)
-            Dim listdate As List(Of String) = ClassHelper.Return_listdate(CURRENT_FORM_ID)
+            Dim listdate As List(Of String) = ClassHelper.Return_listdate(CURRENT_ENTITY_ID)
 
             For Each col As String In listdate
                 Dim date_edit As New DevExpress.XtraEditors.Repository.RepositoryItemTimeEdit

app/DD-Record-Organiser/frmLevel_Designer.vb

@@ -21,7 +21,7 @@
         Me.Text = "Formdesigner: " & title
     End Sub
     Public Sub SetFormName(name As String)
-        Me.lblFormName.Text = "Name: " & name & " - Form-ID: " & CURRENT_FORM_ID
+        Me.lblFormName.Text = "Name: " & name & " - Form-ID: " & CURRENT_ENTITY_ID
     End Sub
 #Region "+++++ Drag Drop Funktionen +++++"
 
@@ -86,14 +86,14 @@
                     DesignerCtrlBuilder.FunctionAddAppointment(0, "f_addappointment" & random, defaultCalendarCaption, 0, 0, 0, 0, True, Parent)
 
                     If ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl) = True Then
-                        Dim ControlId = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID)
+                        Dim ControlId = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_ENTITY_ID)
                         ClassFunctionCommands.InsertFunction(ControlId, "ADDAPPOINTMENT")
                     End If
                 Case "f_addformdata"
                     DesignerCtrlBuilder.FunctionAddFormData(0, "f_addformdata" & random, "Add Form Data", 0, 0, 0, 0, True, Parent)
 
                     If ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl) = True Then
-                        Dim ControlId = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID)
+                        Dim ControlId = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_ENTITY_ID)
                         ClassFunctionCommands.InsertFunction(ControlId, "ADDFORMDATA")
                     End If
                 Case "lstbxcheck"
@@ -164,7 +164,7 @@
             Console.WriteLine(String.Format("RebuildView took {0}ms", sw.ElapsedMilliseconds))
 
             Dim wid As Integer = Me.Width
-            Dim update_sizepnl As String = "UPDATE TBPMO_FORM_VIEW SET HEIGHT = " & pnlDesigner.Height & ",WIDTH = " & wid & " where FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+            Dim update_sizepnl As String = "UPDATE TBPMO_FORM_VIEW SET HEIGHT = " & pnlDesigner.Height & ",WIDTH = " & wid & " where FORM_ID = " & CURRENT_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
             ClassDatabase.Execute_non_Query(update_sizepnl)
         Catch ex As Exception
             MsgBox("Error in frmLevel_Designer_FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -195,14 +195,14 @@
 
 #Region "+++++ Load Funktionen +++++"
     Public Sub LoadFormProperties()
-        Dim NAME_SQL As String = "SELECT NAME FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID
+        Dim NAME_SQL As String = "SELECT NAME FROM TBPMO_FORM WHERE GUID = " & CURRENT_ENTITY_ID
-        Dim formviewid = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID)
+        Dim formviewid = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID)
         Dim TITLE_SQL As String = "SELECT CAPTION FROM TBPMO_LANGUAGE_OBJECT WHERE PMO_OBJECT_NAME = 'FORMVIEW_TITLE" & formviewid & "' and SCREEN_ID = " & CURRENT_SCREEN_ID & " AND LANGUAGE_TYPE = '" & USER_LANGUAGE & "'"
-        Dim Height = ClassDatabase.Execute_Scalar("SELECT HEIGHT FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
+        Dim Height = ClassDatabase.Execute_Scalar("SELECT HEIGHT FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
-        Dim width = ClassDatabase.Execute_Scalar("SELECT WIDTH FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
+        Dim width = ClassDatabase.Execute_Scalar("SELECT WIDTH FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
         Dim name = ClassDatabase.Execute_Scalar(NAME_SQL)
         Dim title = ClassDatabase.Execute_Scalar(TITLE_SQL)
-        '  Check_Document_Config(CURRENT_FORM_ID)
+        '  Check_Document_Config(CURRENT_ENTITY_ID)
         If Not IsDBNull(Height) Then
             If Height > 100 Then
                 Me.pnlDesigner.Height = Height
@@ -220,14 +220,14 @@
 
     Public Sub LoadControls()
         Dim sql = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{0}', {1},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T" & _
-                                " where T.FORM_ID = {2} and T.SCREEN_ID = {3}", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_FORM_ID, CURRENT_SCREEN_ID)
+                                " where T.FORM_ID = {2} and T.SCREEN_ID = {3}", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_ENTITY_ID, CURRENT_SCREEN_ID)
         Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
 
         For Each dr As DataRow In dt.Rows
 
             Dim parent As GroupBox = Nothing
             If (dr.Item("CONTROL_PARENT_ID") <> 0) Then
-                Dim parentname As String = Get_Name_for_ControlID(dr.Item("CONTROL_PARENT_ID"), CURRENT_FORM_ID)
+                Dim parentname As String = Get_Name_for_ControlID(dr.Item("CONTROL_PARENT_ID"), CURRENT_ENTITY_ID)
                 parent = DesignerCtrlBuilder.GetControlByName(parentname)
             End If
 
@@ -629,14 +629,14 @@
 
     Private Function RebuildView()
         Try
-            'Dim sql = "EXECUTE PRPMO_CREATE_SQL " & CURRENT_FORM_ID
+            'Dim sql = "EXECUTE PRPMO_CREATE_SQL " & CURRENT_ENTITY_ID
             'ClassDatabase.Execute_non_Query_Async(sql)
             'Dim sql2 = "EXECUTE PRPMO_CREATE_TEMP_VIEWS"
             'ClassDatabase.Execute_non_Query_Async(sql2)
             'Return True
 
             Dim noerror As Boolean = False
-            Dim sql = "EXECUTE PRPMO_CREATE_SQL " & CURRENT_FORM_ID
+            Dim sql = "EXECUTE PRPMO_CREATE_SQL " & CURRENT_ENTITY_ID
             noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1)
             sql = "EXECUTE PRPMO_CREATE_TEMP_VIEWS"
             noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1)
@@ -893,14 +893,14 @@
                     If IsDBNull(FromDateId) OrElse FromDateId = 0 Then
                         props.FromDate = ""
                     Else
-                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_FORM_ID)
+                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_ENTITY_ID)
                     End If
 
                     ToDateId = f.Item("INTEGER2")
                     If IsDBNull(ToDateId) OrElse ToDateId = 0 Then
                         props.ToDate = ""
                     Else
-                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_FORM_ID)
+                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_ENTITY_ID)
                     End If
 
                     SubjectString = f.Item("STRING1")
@@ -993,7 +993,7 @@
     Private Sub btnDeleteControl_Click(sender As Object, e As EventArgs) Handles btnDeleteControl.Click
         If MsgBox("Wollen Sie das Element wirklich löschen?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
             If IsGroupBox(DesignerCtrlBuilder.CurrentControl) Then
-                Dim parentID As Integer = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID)
+                Dim parentID As Integer = GetControlID_for_Name(DesignerCtrlBuilder.CurrentControl.Name, CURRENT_ENTITY_ID)
                 Dim SQL = "SELECT GUID FROM TBPMO_CONTROL WHERE PARENT_CONTROL_ID = " & parentID
                 Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
 

app/DD-Record-Organiser/frmMass_Change.vb

@@ -37,7 +37,7 @@
                 result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If result = MsgBoxResult.Yes Then
                     Dim val = txtNewValue.Text
-                    Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_FORM_ID)
+                    Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID)
                     Dim control_Id = ClassDatabase.Execute_Scalar(SQL)
                     If Not IsNothing(control_Id) Then
                         If control_Id > 0 Then

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

@@ -22,81 +22,92 @@ Partial Class frmMessageBox
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessageBox))
+        Me.lblmsg1 = New System.Windows.Forms.Label()
+        Me.lblmsg2 = New System.Windows.Forms.Label()
+        Me.txtmsg1 = New System.Windows.Forms.TextBox()
+        Me.txtmsg2 = New System.Windows.Forms.TextBox()
         Me.OK_Button = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
         Me.SuspendLayout()
         '
+        'lblmsg1
+        '
+        Me.lblmsg1.AutoSize = True
+        Me.lblmsg1.Location = New System.Drawing.Point(12, 9)
+        Me.lblmsg1.Name = "lblmsg1"
+        Me.lblmsg1.Size = New System.Drawing.Size(38, 13)
+        Me.lblmsg1.TabIndex = 1
+        Me.lblmsg1.Text = "Label1"
+        '
+        'lblmsg2
+        '
+        Me.lblmsg2.AutoSize = True
+        Me.lblmsg2.Location = New System.Drawing.Point(12, 77)
+        Me.lblmsg2.Name = "lblmsg2"
+        Me.lblmsg2.Size = New System.Drawing.Size(38, 13)
+        Me.lblmsg2.TabIndex = 2
+        Me.lblmsg2.Text = "Label2"
+        '
+        'txtmsg1
+        '
+        Me.txtmsg1.BackColor = System.Drawing.SystemColors.Control
+        Me.txtmsg1.Location = New System.Drawing.Point(12, 25)
+        Me.txtmsg1.Multiline = True
+        Me.txtmsg1.Name = "txtmsg1"
+        Me.txtmsg1.ReadOnly = True
+        Me.txtmsg1.Size = New System.Drawing.Size(411, 49)
+        Me.txtmsg1.TabIndex = 3
+        '
+        'txtmsg2
+        '
+        Me.txtmsg2.BackColor = System.Drawing.SystemColors.Control
+        Me.txtmsg2.Location = New System.Drawing.Point(15, 93)
+        Me.txtmsg2.Multiline = True
+        Me.txtmsg2.Name = "txtmsg2"
+        Me.txtmsg2.ReadOnly = True
+        Me.txtmsg2.Size = New System.Drawing.Size(408, 54)
+        Me.txtmsg2.TabIndex = 4
+        '
         'OK_Button
         '
-        Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.OK_Button.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
-        Me.OK_Button.Location = New System.Drawing.Point(305, 153)
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.OK_Button.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.OK_Button.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.OK_Button.Location = New System.Drawing.Point(14, 151)
         Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(118, 23)
+        Me.OK_Button.Size = New System.Drawing.Size(409, 54)
         Me.OK_Button.TabIndex = 0
         Me.OK_Button.Text = "OK"
         '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(321, 13)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(38, 13)
-        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "Label1"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(324, 30)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(38, 13)
-        Me.Label2.TabIndex = 2
-        Me.Label2.Text = "Label2"
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Location = New System.Drawing.Point(305, 64)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(100, 21)
-        Me.TextBox1.TabIndex = 3
-        '
-        'TextBox2
-        '
-        Me.TextBox2.Location = New System.Drawing.Point(327, 106)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(100, 21)
-        Me.TextBox2.TabIndex = 4
-        '
         'frmMessageBox
         '
         Me.AcceptButton = Me.OK_Button
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(435, 188)
+        Me.ClientSize = New System.Drawing.Size(433, 210)
-        Me.Controls.Add(Me.TextBox2)
+        Me.Controls.Add(Me.txtmsg2)
-        Me.Controls.Add(Me.TextBox1)
+        Me.Controls.Add(Me.txtmsg1)
-        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.lblmsg2)
-        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.lblmsg1)
         Me.Controls.Add(Me.OK_Button)
-        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
+        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.MinimizeBox = False
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
         Me.Name = "frmMessageBox"
-        Me.ShowInTaskbar = False
+        Me.ShowInTaskbar = false
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
         Me.Text = "frmMessageBox"
-        Me.ResumeLayout(False)
+        Me.ResumeLayout(false)
-        Me.PerformLayout()
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents OK_Button As System.Windows.Forms.Button
-    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents lblmsg1 As System.Windows.Forms.Label
-    Friend WithEvents Label2 As System.Windows.Forms.Label
+    Friend WithEvents lblmsg2 As System.Windows.Forms.Label
-    Friend WithEvents TextBox1 As System.Windows.Forms.TextBox
+    Friend WithEvents txtmsg1 As System.Windows.Forms.TextBox
-    Friend WithEvents TextBox2 As System.Windows.Forms.TextBox
+    Friend WithEvents txtmsg2 As System.Windows.Forms.TextBox
 
 End Class

app/DD-Record-Organiser/frmMessageBox.resx

@@ -117,4 +117,178 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
+        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
+        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
+        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAA//////8AAAAAAAAAAAAA/////////wAAAAAAAA
+        AA//+I7u7uiP//AAAAAAAAD/+O7u7u7u7o//AAAAAAAP+O7u7u7u7u7uj/AAAAAA/47u7u7u7u7u7uj/
+        AAAAD/ju7u7u///u7u7uj/AAAP+O7u7u7v//7u7u7uj/AAD/7u7u7u7//+7u7u7u/wAP+O7u7u7u///u
+        7u7u7o/wD/7u7u7u7v//7u7u7u7v8P+O7u7u7u7//+7u7u7u6P//ju7u7u7u///u7u7u7uj//+7u7u7u
+        7v//7u7u7u7u///u7u7u7u7//+7u7u7u7v//7u7u7u7u///u7u7u7u7//+7u7u7u7v//7u7u7u7u///u
+        7u7u7u7//+7u7u7u7v//7u7u7u7u///u7u7u7u7//47u7u7u7v//7u7u7u7o//+O7u7u7u7u7u7u7u7u
+        6P8P/u7u7u7u7u7u7u7u7u/wD/ju7u7u7o/47u7u7u6P8AD/7u7u7u7//+7u7u7u/wAA/47u7u7u///u
+        7u7u6P8AAA/47u7u7o/47u7u7o/wAAAA/47u7u7u7u7u7uj/AAAAAA/47u7u7u7u7u6P8AAAAAAA//ju
+        7u7u7u6P/wAAAAAAAA//+I7u7uiP//AAAAAAAAAAD/////////AAAAAAAAAAAAAP//////AAAAAAAP/g
+        B///gAH//gAAf/wAAD/4AAAf8AAAD+AAAAfAAAADwAAAA4AAAAGAAAABAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAGAAAABwAAAA8AAAAPgAAAH8AAAD/gAAB/8AAA//gAAf/+A
+        Af//4Af/KAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAA////AAAAAP
+        iO7uiPAAAPju7u7ujwAPju7v/u7o8Aju7u/+7u6A+O7u7/7u7o/+7u7v/u7u7/7u7u/+7u7v/u7u7/7u
+        7u/+7u7v/u7u7/ju7u7u7u6PCO7u7/7u7oAPju7v/u7o8AD47u7u7o8AAA+I7u6I8AAAAA////AAAPgf
+        AADgBwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAIABAADAAwAA4AcAAPgf
+        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAOKgGgDjpSgA6LteAOrA
+        bADrxXoA8dCMAO3RlQDw27EA9fHoAPb29gD4+PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAACwsK
+        CgoKCgoLCwAAAAAAAAAAAAAAAAAAAAAAAAAACgoKCgoKCgoKCgoKCgoAAAAAAAAAAAAAAAAAAAAACwoK
+        CQcDAgEBAQECAwcJCgoLAAAAAAAAAAAAAAAAAAoKCQQBAQEBAQEBAQEBAQEECQoKAAAAAAAAAAAAAAAK
+        CggCAQEBAQEBAQEBAQEBAQECCAoKAAAAAAAAAAAACgoFAQEBAQEBAQEBAQEBAQEBAQEBBQoKAAAAAAAA
+        AAoKBQEBAQEBAQEBCwsLCwEBAQEBAQEBBQoKAAAAAAALCggBAQEBAQEBAQELCwsLAQEBAQEBAQEBCAoL
+        AAAAAAoJAgEBAQEBAQEBAQsLCwsBAQEBAQEBAQECCQoAAAAKCgQBAQEBAQEBAQEBCwsLCwEBAQEBAQEB
+        AQEECgoAAAoJAQEBAQEBAQEBAQELCwsLAQEBAQEBAQEBAQEJCgALCgcBAQEBAQEBAQEBAQsLCwsBAQEB
+        AQEBAQEBAQcKCwsKAwEBAQEBAQEBAQEBCwsLCwEBAQEBAQEBAQEBAwoLCgoCAQEBAQEBAQEBAQELCwsL
+        AQEBAQEBAQEBAQECCgoKCgEBAQEBAQEBAQEBAQsLCwsBAQEBAQEBAQEBAQEKCgoKAQEBAQEBAQEBAQEB
+        CwsLCwEBAQEBAQEBAQEBAQoKCgoBAQEBAQEBAQEBAQELCwsLAQEBAQEBAQEBAQEBCgoKCgEBAQEBAQEB
+        AQEBAQsLCwsBAQEBAQEBAQEBAQEKCgoKAgEBAQEBAQEBAQEBCwsLCwEBAQEBAQEBAQEBAgoKCwoDAQEB
+        AQEBAQEBAQELCwsLAQEBAQEBAQEBAQEDCgsLCgcBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQcKCwAK
+        CQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBCQoAAAoKBAEBAQEBAQEBAQEGCwsGAQEBAQEBAQEBAQQK
+        CgAAAAoJAgEBAQEBAQEBAQsLCwsBAQEBAQEBAQECCQoAAAAACwoIAQEBAQEBAQEBCwsLCwEBAQEBAQEB
+        AQgKCwAAAAAACgoFAQEBAQEBAQEGCwsGAQEBAQEBAQEFCgoAAAAAAAAACgoFAQEBAQEBAQEBAQEBAQEB
+        AQEBBQoKAAAAAAAAAAAACgoIAgEBAQEBAQEBAQEBAQEBAggKCgAAAAAAAAAAAAAACgoJBAEBAQEBAQEB
+        AQEBAQQJCgoAAAAAAAAAAAAAAAAACwoKCQcDAgEBAQECAwcJCgoLAAAAAAAAAAAAAAAAAAAAAAoKCgoK
+        CgoKCgoKCgoKAAAAAAAAAAAAAAAAAAAAAAAAAAALCwoKCgoKCgsLAAAAAAAAAAAAAAD/4Af//4AB//4A
+        AH/8AAA/+AAAH/AAAA/gAAAHwAAAA8AAAAOAAAABgAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/4AAH//gAH//+AH/ygA
+        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAA4qEbAOi8XwDqwW0A68Z7APHh
+        vwD29vYA+Pj4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAHBgYGBgcAAAAAAAAA
+        AAYFAgEBAQECBQYAAAAAAAYEAQEBAQEBAQEEBgAAAAYDAQEBAQcHAQEBAQQGAAAFAQEBAQEHBwEBAQEB
+        BQAHAgEBAQEBBwcBAQEBAQIHBgEBAQEBAQcHAQEBAQEBBgYBAQEBAQEHBwEBAQEBAQYGAQEBAQEBBwcB
+        AQEBAQEGBgEBAQEBAQcHAQEBAQEBBgcCAQEBAQEBAQEBAQEBAgcABQEBAQEBBwcBAQEBAQUAAAYEAQEB
+        AQcHAQEBAQQGAAAABgMBAQEBAQEBAQQGAAAAAAAGBQIBAQEBAgUGAAAAAAAAAAAHBgYGBgcAAAAAAPgf
+        AADgBwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAIABAADAAwAA4AcAAPgf
+        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vaA9vb2v/b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9r/29vaA9vb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29mD29vbP9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2z/b29lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29iD29va/9vb2//b29v/18ej/7dGV/+i7Xv/jpSj/4qAa/+Kg
+        Gv/ioBr/4qAa/+OlKP/ou17/7dGV//Xx6P/29vb/9vb2//b29r/29vYgAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vZQ9vb27/b29v/18ej/6sBs/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+rAbP/18ej/9vb2//b29u/29vZQAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2YPb29v/29vb/8Nux/+OlKP/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+OlKP/w27H/9vb2//b2
+        9v/29vZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29lD29vb/9vb2/+vFev/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/rxXr/9vb2//b29v/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYg9vb27/b29v/rxXr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv//////////////////////4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/rxXr/9vb2//b29u/29vYgAAAAAAAAAAAAAAAAAAAAAPb29r/29vb/8Nux/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa///////////////////////ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/w27H/9vb2//b29r8AAAAAAAAAAAAAAAD29vZg9vb2//Xx
+        6P/jpSj/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr//////////////////////+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+OlKP/18ej/9vb2//b29lAAAAAAAAAAAPb2
+        9s/29vb/6sBs/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv//////////////
+        ////////4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+rAbP/29vb/9vb2zwAA
+        AAD29vYw9vb2//Xx6P/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa////
+        ///////////////////ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa//Xx
+        6P/29vb/9vb2MPb29oD29vb/7dGV/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr//////////////////////+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/7dGV//b29v/29vaA9vb2v/b29v/ou17/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv//////////////////////4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ou17/9vb2//b29r/29vb/9vb2/+OlKP/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa///////////////////////ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+OlKP/29vb/9vb2//b29v/29vb/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr//////////////////////+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa//b29v/29vb/9vb2//b29v/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv//////////////////////4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/9vb2//b29v/29vb/9vb2/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa////////////////////
+        ///ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/29vb/9vb2//b2
+        9v/29vb/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/////////
+        /////////////+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa//b2
+        9v/29vb/9vb2//b29v/jpSj/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv//////////////////////4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/jpSj/9vb2//b29v/29va/9vb2/+i7Xv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa///////////////////////ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+i7Xv/29vb/9vb2v/b29oD29vb/7dGV/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/7dGV//b29v/29vaA9vb2MPb29v/18ej/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/18ej/9vb2//b29jAAAAAA9vb2z/b29v/qwGz/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa//HQjP////////////HQjP/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/6sBs//b29v/29vbPAAAAAAAAAAD29vZg9vb2//Xx
+        6P/jpSj/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr//////////////////////+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+OlKP/18ej/9vb2//b29mAAAAAAAAAAAAAA
+        AAD29va/9vb2//Dbsf/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv//////////////
+        ////////4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/8Nux//b29v/29va/AAAAAAAA
+        AAAAAAAAAAAAAPb29iD29vbv9vb2/+vFev/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa//HQ
+        jP////////////HQjP/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+vFev/29vb/9vb27/b2
+        9iAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29lD29vb/9vb2/+vFev/ioBr/4qAa/+KgGv/ioBr/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/rxXr/9vb2//b2
+        9v/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29mD29vb/9vb2//Dbsf/jpSj/4qAa/+Kg
+        Gv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/jpSj/8Nux//b2
+        9v/29vb/9vb2YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29lD29vbv9vb2//Xx
+        6P/qwGz/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/4qAa/+KgGv/ioBr/6sBs//Xx
+        6P/29vb/9vb27/b29lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9iD29va/9vb2//b29v/18ej/7dGV/+i7Xv/jpSj/4qAa/+KgGv/ioBr/4qAa/+OlKP/ou17/7dGV//Xx
+        6P/29vb/9vb2//b29r/29vYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD29vZg9vb2z/b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29s/29vZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2MPb29oD29va/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2v/b29oD29vYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/A
+        A///AAD//AAAP/gAAB/wAAAP4AAAB8AAAAPAAAADgAAAAYAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/8A
+        AP//wAP/KAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD29vZg9vb2v/b29v/29vb/9vb2//b29v/29va/9vb2YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9iD29vbP8eG//+i8X//ioRv/4qEb/+KhG//ioRv/6Lxf//Hhv//29vbP9vb2IAAAAAAAAAAAAAAAAPb2
+        9iD29vbv68Z7/+KhG//ioRv/4qEb/+KhG//ioRv/4qEb/+KhG//ioRv/68Z7//b29u/29vYgAAAAAAAA
+        AAD29vbP6sFt/+KhG//ioRv/4qEb/+KhG////////////+KhG//ioRv/4qEb/+KhG//rxnv/9vb2zwAA
+        AAD29vZg8eG//+KhG//ioRv/4qEb/+KhG//ioRv////////////ioRv/4qEb/+KhG//ioRv/4qEb//Hh
+        v//29vZg9vb2v+i8X//ioRv/4qEb/+KhG//ioRv/4qEb////////////4qEb/+KhG//ioRv/4qEb/+Kh
+        G//ovF//9vb2v/b29v/ioRv/4qEb/+KhG//ioRv/4qEb/+KhG////////////+KhG//ioRv/4qEb/+Kh
+        G//ioRv/4qEb//b29v/29vb/4qEb/+KhG//ioRv/4qEb/+KhG//ioRv////////////ioRv/4qEb/+Kh
+        G//ioRv/4qEb/+KhG//29vb/9vb2/+KhG//ioRv/4qEb/+KhG//ioRv/4qEb////////////4qEb/+Kh
+        G//ioRv/4qEb/+KhG//ioRv/9vb2//b29v/ioRv/4qEb/+KhG//ioRv/4qEb/+KhG////////////+Kh
+        G//ioRv/4qEb/+KhG//ioRv/4qEb//b29v/29va/6Lxf/+KhG//ioRv/4qEb/+KhG//ioRv/4qEb/+Kh
+        G//ioRv/4qEb/+KhG//ioRv/4qEb/+i8X//29va/9vb2YPHhv//ioRv/4qEb/+KhG//ioRv/4qEb////
+        ////////4qEb/+KhG//ioRv/4qEb/+KhG//x4b//9vb2YAAAAAD29vbP68Z7/+KhG//ioRv/4qEb/+Kh
+        G////////////+KhG//ioRv/4qEb/+KhG//rxnv/9vb2zwAAAAAAAAAA9vb2IPb29u/qwW3/4qEb/+Kh
+        G//ioRv/4qEb/+KhG//ioRv/4qEb/+KhG//rxnv/9vb27/b29iAAAAAAAAAAAAAAAAD29vYg9vb2z/Hh
+        v//ovF//4qEb/+KhG//ioRv/4qEb/+i8X//x4b//9vb2z/b29iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD29vZg9vb2v/b29v/29vb/9vb2//b29v/29va/9vb2YAAAAAAAAAAAAAAAAAAAAADwDwAAwAMAAIAB
+        AACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAgAEAAMADAADwDwAA
+</value>
+  </data>
 </root>

app/DD-Record-Organiser/frmMessageBox.vb

@@ -7,9 +7,35 @@ Public Class frmMessageBox
         Me.Close()
     End Sub
 
-    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
+
-        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
+    Private Sub frmMessageBox_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Me.Close()
+        Try
+            Select Case MSG_TYPE
+                Case "ERROR"
+                    OK_Button.Image = My.Resources.delete
+                Case Else
+                    OK_Button.Image = Nothing
+            End Select
+            Me.Text = MSG_TITLE
+            If MSG_LABLE2 = String.Empty Then
+                Me.Size = New Size(449, 177)
+                Me.lblmsg2.Visible = False
+                Me.txtmsg2.Visible = False
+            Else
+                Me.Size = New Size(449, 251)
+                Me.lblmsg2.Visible = True
+                Me.txtmsg2.Visible = True
+                Me.lblmsg2.Text = MSG_LABLE2
+                Me.txtmsg2.Text = MSG_ERROR2
+            End If
+            Me.lblmsg1.Text = MSG_LABLE1
+            Me.txtmsg1.Text = MSG_ERROR1
+        Catch ex As Exception
+            MsgBox("Unexpected Error: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
     End Sub
 
+    Private Sub frmMessageBox_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        Me.BringToFront()
+    End Sub
 End Class

app/DD-Record-Organiser/frmNewVariant.vb

@@ -48,7 +48,7 @@ Public Class frmNewVariant
 
     Private Sub frmNewVariant_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            Dim sel = String.Format("SELECT * FROM TBPMO_ENTITY_VARIANT_REASONS WHERE ENTITY_ID = {0}", CURRENT_FORM_ID)
+            Dim sel = String.Format("SELECT * FROM TBPMO_ENTITY_VARIANT_REASONS WHERE ENTITY_ID = {0}", CURRENT_ENTITY_ID)
             DT_REASONS = ClassDatabase.Return_Datatable(sel)
             cmbReason.DataSource = DT_REASONS
             cmbReason.DisplayMember = DT_REASONS.Columns("REASON_CODE").ColumnName

app/DD-Record-Organiser/frmRecordView.vb

@@ -581,7 +581,7 @@ Public Class frmRecordView
                             CURRENT_FILEID = Filerow.Item(0)
                             CURRENT_PARENT_ENTITY_ID = PARENT_ENTITY_ID
                             CURRENT_RECORD_ID = JUMP_RECORD_ID
-                            CURRENT_FORM_ID = ENTITY_ID
+                            CURRENT_ENTITY_ID = ENTITY_ID
                             CURRENT_FORMVIEW_ID = FORMVIEW_ID
                             If ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE GUID = " & CURRENT_FILEID & " AND WORKED = 0") = 1 Then
                                 frmWD_IndexFile.ShowDialog()

app/DD-Record-Organiser/frmTask_Editor.vb

@@ -136,7 +136,7 @@ Public Class frmTask_Editor
 
     Private Sub frmWF_TaskEditor_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         Try
-            Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.FillBy(Me.DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE, USER_LANGUAGE, WF_IDTextBox.Text, CURRENT_FORM_ID)
+            Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.FillBy(Me.DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE, USER_LANGUAGE, WF_IDTextBox.Text, CURRENT_ENTITY_ID)
             Dim state = DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("STATE_TITLE")
             Me.STATE_IDComboBox.SelectedIndex = STATE_IDComboBox.FindStringExact(state)
         Catch ex As Exception

app/DD-Record-Organiser/frmTool_ControlProperties.vb

@@ -204,14 +204,14 @@
                     If IsDBNull(FromDateId) OrElse FromDateId = 0 Then
                         props.FromDate = ""
                     Else
-                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_FORM_ID)
+                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_ENTITY_ID)
                     End If
 
                     ToDateId = f.Item("INTEGER2")
                     If IsDBNull(ToDateId) OrElse ToDateId = 0 Then
                         props.ToDate = ""
                     Else
-                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_FORM_ID)
+                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_ENTITY_ID)
                     End If
 
                     SubjectString = f.Item("STRING1")
@@ -272,7 +272,7 @@
     ' Wird von frmLevelDesigner aufgerufen
     'Public Sub LoadControlProperties(ctrl As Control)
     '    Try
-    '        Dim sql As String = "SELECT CTRLSCR_ID FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_NAME = '" & ctrl.Name & "' AND FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+    '        Dim sql As String = "SELECT CTRLSCR_ID FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_NAME = '" & ctrl.Name & "' AND FORM_ID = " & CURRENT_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
     '        Dim CTRLSCR_ID = ClassDatabase.Execute_Scalar(sql)
     '        If CTRLSCR_ID > 0 Then
     '            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE CTRLSCR_ID = " & CTRLSCR_ID)
@@ -366,7 +366,7 @@
     '                Me.Text = "Eigenschaften Control-ID: " & props.ID
 
     '                If type = "F_AddAppointment" Then
-    '                    Dim ControlId = GetControlID_for_Name(ctrl.Name, CURRENT_FORM_ID)
+    '                    Dim ControlId = GetControlID_for_Name(ctrl.Name, CURRENT_ENTITY_ID)
     '                    Dim dr = ClassFunctionCommands.LoadFunction(ControlId)
 
     '                    Dim FromDateId, ToDateId, SubjectString, Subject2String, PlaceString, DescString
@@ -382,13 +382,13 @@
     '                    If IsDBNull(FromDateId) OrElse FromDateId = 0 Then
     '                        props.FromDate = ""
     '                    Else
-    '                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_FORM_ID)
+    '                        props.FromDate = Get_Name_for_ControlID(FromDateId, CURRENT_ENTITY_ID)
     '                    End If
 
     '                    If IsDBNull(ToDateId) OrElse ToDateId = 0 Then
     '                        props.ToDate = ""
     '                    Else
-    '                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_FORM_ID)
+    '                        props.ToDate = Get_Name_for_ControlID(ToDateId, CURRENT_ENTITY_ID)
     '                    End If
 
 
@@ -420,7 +420,7 @@
     '                    props.Caption = row.Item("CTRLSCR_CAPTION")
     '                ElseIf type = "F_AddFormData" Then
     '                    ' TODO
-    '                    Dim ControlId = GetControlID_for_Name(ctrl.Name, CURRENT_FORM_ID)
+    '                    Dim ControlId = GetControlID_for_Name(ctrl.Name, CURRENT_ENTITY_ID)
     '                    Dim dr = ClassFunctionCommands.LoadFunction(ControlId)
 
     '                    Dim FormId, ScreenId
@@ -587,7 +587,7 @@
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
         If MsgBox("Wollen Sie das Element wirklich löschen?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
             If IsGroupBox(CtrlBuilder.CurrentControl) Then
-                Dim parentID As Integer = GetControlID_for_Name(CtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID)
+                Dim parentID As Integer = GetControlID_for_Name(CtrlBuilder.CurrentControl.Name, CURRENT_ENTITY_ID)
                 Dim SQL = "SELECT GUID FROM TBPMO_CONTROL WHERE PARENT_CONTROL_ID = " & parentID
                 Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
 

app/DD-Record-Organiser/frmWD_CreateVersion.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

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

@@ -42,7 +42,7 @@ Partial Class frmWD_Dokumentart_Konfig
         Dim CHANGED_WHOLabel As System.Windows.Forms.Label
         Dim CHANGED_WHENLabel As System.Windows.Forms.Label
         Dim OBJEKTTYPLabel As System.Windows.Forms.Label
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -1109,8 +1109,8 @@ Partial Class frmWD_Dokumentart_Konfig
         '
         Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToAddRows = False
         Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
-        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         resources.ApplyResources(Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView, "TBPMO_WD_FORMVIEW_DOKTYPESDataGridView")
         Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AutoGenerateColumns = False
         Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize

app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx

@@ -904,9 +904,6 @@
   <data name="&gt;&gt;TBDD_DOKUMENTARTBindingNavigator.ZOrder" xml:space="preserve">
     <value>28</value>
   </data>
-  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="GridControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 59</value>
   </data>
@@ -1016,12 +1013,12 @@
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <metadata name="TBWH_DOKART_MODULEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>339, 95</value>
-  </metadata>
   <data name="ListBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
   </data>
+  <metadata name="TBWH_DOKART_MODULEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>339, 95</value>
+  </metadata>
   <data name="ListBox3.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt, style=Italic</value>
   </data>
@@ -1439,9 +1436,6 @@
   <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <metadata name="TBWH_DOKART_MODULEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>339, 95</value>
-  </metadata>
   <metadata name="TBDD_EINGANGSARTENBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>160, 17</value>
   </metadata>
@@ -1466,6 +1460,12 @@
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>403, 56</value>
   </metadata>
+  <data name="ToolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>121, 17</value>
+  </data>
+  <data name="ToolStripStatusLabel1.Text" xml:space="preserve">
+    <value>ToolStripStatusLabel1</value>
+  </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 581</value>
   </data>
@@ -1490,459 +1490,15 @@
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="ToolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 17</value>
-  </data>
-  <data name="ToolStripStatusLabel1.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
-  </data>
   <data name="XtraTabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 304</value>
   </data>
-  <metadata name="TBDD_INDEX_AUTOMBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>520, 56</value>
-  </metadata>
   <data name="XtraTabPage1.AutoScroll" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="&gt;&gt;chkEntityData.Name" xml:space="preserve">
-    <value>chkEntityData</value>
-  </data>
-  <data name="&gt;&gt;chkEntityData.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;chkEntityData.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;chkEntityData.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Name" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
-    <value>Label2</value>
-  </data>
-  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;lblSaveIndex.Name" xml:space="preserve">
-    <value>lblSaveIndex</value>
-  </data>
-  <data name="&gt;&gt;lblSaveIndex.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblSaveIndex.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;lblSaveIndex.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHENTextBox.Name" xml:space="preserve">
-    <value>CHANGED_WHENTextBox</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHENTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHENTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHENTextBox.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBox.Name" xml:space="preserve">
-    <value>CHANGED_WHOTextBox</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBox.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHENTextBox.Name" xml:space="preserve">
-    <value>ADDED_WHENTextBox</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHENTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHENTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHENTextBox.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox.Name" xml:space="preserve">
-    <value>ADDED_WHOTextBox</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;ACTIVECheckBox.Name" xml:space="preserve">
-    <value>ACTIVECheckBox</value>
-  </data>
-  <data name="&gt;&gt;ACTIVECheckBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ACTIVECheckBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;ACTIVECheckBox.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
-  <data name="&gt;&gt;COMMENTTextBox.Name" xml:space="preserve">
-    <value>COMMENTTextBox</value>
-  </data>
-  <data name="&gt;&gt;COMMENTTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;COMMENTTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;COMMENTTextBox.ZOrder" xml:space="preserve">
-    <value>14</value>
-  </data>
-  <data name="&gt;&gt;VALUEComboBox.Name" xml:space="preserve">
-    <value>VALUEComboBox</value>
-  </data>
-  <data name="&gt;&gt;VALUEComboBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;VALUEComboBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;VALUEComboBox.ZOrder" xml:space="preserve">
-    <value>15</value>
-  </data>
-  <data name="&gt;&gt;INDEXNAMEComboBox.Name" xml:space="preserve">
-    <value>INDEXNAMEComboBox</value>
-  </data>
-  <data name="&gt;&gt;INDEXNAMEComboBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;INDEXNAMEComboBox.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;INDEXNAMEComboBox.ZOrder" xml:space="preserve">
-    <value>17</value>
-  </data>
-  <data name="&gt;&gt;GUIDTextBox1.Name" xml:space="preserve">
-    <value>GUIDTextBox1</value>
-  </data>
-  <data name="&gt;&gt;GUIDTextBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GUIDTextBox1.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;GUIDTextBox1.ZOrder" xml:space="preserve">
-    <value>20</value>
-  </data>
-  <data name="&gt;&gt;ListBox2.Name" xml:space="preserve">
-    <value>ListBox2</value>
-  </data>
-  <data name="&gt;&gt;ListBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ListBox2.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;ListBox2.ZOrder" xml:space="preserve">
-    <value>21</value>
-  </data>
-  <data name="&gt;&gt;TBDD_INDEX_AUTOMBindingNavigator.Name" xml:space="preserve">
-    <value>TBDD_INDEX_AUTOMBindingNavigator</value>
-  </data>
-  <data name="&gt;&gt;TBDD_INDEX_AUTOMBindingNavigator.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TBDD_INDEX_AUTOMBindingNavigator.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;TBDD_INDEX_AUTOMBindingNavigator.ZOrder" xml:space="preserve">
-    <value>22</value>
-  </data>
-  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1261, 249</value>
-  </data>
-  <data name="XtraTabPage1.Text" xml:space="preserve">
-    <value>Automatische Indexe</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Name" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1267, 277</value>
-  </data>
-  <data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1029, 95</value>
-  </metadata>
-  <data name="&gt;&gt;ListBox1.Name" xml:space="preserve">
-    <value>ListBox1</value>
-  </data>
-  <data name="&gt;&gt;ListBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ListBox1.Parent" xml:space="preserve">
-    <value>XtraTabPage3</value>
-  </data>
-  <data name="&gt;&gt;ListBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator2.Name" xml:space="preserve">
-    <value>BindingNavigator2</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator2.Parent" xml:space="preserve">
-    <value>XtraTabPage3</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1261, 249</value>
-  </data>
-  <data name="XtraTabPage3.Text" xml:space="preserve">
-    <value>Manuelle Indexe</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage3.Name" xml:space="preserve">
-    <value>XtraTabPage3</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>786, 56</value>
-  </metadata>
-  <data name="XtraTabPage2.AutoScroll" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
-    <value>Label3</value>
-  </data>
-  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Name" xml:space="preserve">
-    <value>TBPMO_WD_FORMVIEW_DOKTYPESDataGridView</value>
-  </data>
-  <data name="&gt;&gt;TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Type" xml:space="preserve">
-    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
-    <value>Label1</value>
-  </data>
-  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;btnAddDokart_Entity.Name" xml:space="preserve">
-    <value>btnAddDokart_Entity</value>
-  </data>
-  <data name="&gt;&gt;btnAddDokart_Entity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAddDokart_Entity.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;btnAddDokart_Entity.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity_Doctype.Name" xml:space="preserve">
-    <value>cmbEntity_Doctype</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity_Doctype.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity_Doctype.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity_Doctype.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator1.Name" xml:space="preserve">
-    <value>BindingNavigator1</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator1.Parent" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigator1.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1261, 249</value>
-  </data>
-  <data name="XtraTabPage2.Text" xml:space="preserve">
-    <value>Zurodnung Dokumentart - Entität</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Name" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;lblpathsaved.Name" xml:space="preserve">
-    <value>lblpathsaved</value>
-  </data>
-  <data name="&gt;&gt;lblpathsaved.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblpathsaved.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;lblpathsaved.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;Button3.Name" xml:space="preserve">
-    <value>Button3</value>
-  </data>
-  <data name="&gt;&gt;Button3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Button3.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;Button3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;FOLDER_FOR_INDEXTextBox.Name" xml:space="preserve">
-    <value>FOLDER_FOR_INDEXTextBox</value>
-  </data>
-  <data name="&gt;&gt;FOLDER_FOR_INDEXTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;FOLDER_FOR_INDEXTextBox.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;FOLDER_FOR_INDEXTextBox.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Name" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;Label17.Name" xml:space="preserve">
-    <value>Label17</value>
-  </data>
-  <data name="&gt;&gt;Label17.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label17.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;Label17.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1261, 249</value>
-  </data>
-  <data name="XtraTabPage4.Text" xml:space="preserve">
-    <value>Variabler Ordnerpfad</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage4.Name" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage4.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <data name="chkEntityData.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1970,114 +1526,6 @@
   <data name="&gt;&gt;chkEntityData.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;VALUETextBox.Name" xml:space="preserve">
-    <value>VALUETextBox</value>
-  </data>
-  <data name="&gt;&gt;VALUETextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;VALUETextBox.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;VALUETextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;Button2.Name" xml:space="preserve">
-    <value>Button2</value>
-  </data>
-  <data name="&gt;&gt;Button2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Button2.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;Button2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;cmbControlsEntity.Name" xml:space="preserve">
-    <value>cmbControlsEntity</value>
-  </data>
-  <data name="&gt;&gt;cmbControlsEntity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbControlsEntity.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbControlsEntity.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;btnAddIndexA.Name" xml:space="preserve">
-    <value>btnAddIndexA</value>
-  </data>
-  <data name="&gt;&gt;btnAddIndexA.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAddIndexA.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;btnAddIndexA.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;Label5.Name" xml:space="preserve">
-    <value>Label5</value>
-  </data>
-  <data name="&gt;&gt;Label5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label5.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity.Name" xml:space="preserve">
-    <value>cmbEntity</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbEntity.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;Label6.Name" xml:space="preserve">
-    <value>Label6</value>
-  </data>
-  <data name="&gt;&gt;Label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label6.Parent" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="GroupBox2.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>868, 63</value>
-  </data>
-  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>479, 143</value>
-  </data>
-  <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>80</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Name" xml:space="preserve">
-    <value>GroupBox2</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="VALUETextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 110</value>
   </data>
@@ -2270,6 +1718,30 @@
   <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="GroupBox2.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>868, 63</value>
+  </data>
+  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>479, 143</value>
+  </data>
+  <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
+    <value>80</value>
+  </data>
+  <data name="&gt;&gt;GroupBox2.Name" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;GroupBox2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GroupBox2.Parent" xml:space="preserve">
+    <value>XtraTabPage1</value>
+  </data>
+  <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2544,7 +2016,7 @@
     <value>0, 25</value>
   </data>
   <data name="ListBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>305, 207</value>
+    <value>305, 224</value>
   </data>
   <data name="ListBox2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -2732,7 +2204,7 @@
     <value>0, 0</value>
   </data>
   <data name="TBDD_INDEX_AUTOMBindingNavigator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1347, 25</value>
+    <value>1261, 25</value>
   </data>
   <data name="TBDD_INDEX_AUTOMBindingNavigator.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2752,6 +2224,30 @@
   <data name="&gt;&gt;TBDD_INDEX_AUTOMBindingNavigator.ZOrder" xml:space="preserve">
     <value>22</value>
   </data>
+  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1261, 249</value>
+  </data>
+  <data name="XtraTabPage1.Text" xml:space="preserve">
+    <value>Automatische Indexe</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage1.Name" xml:space="preserve">
+    <value>XtraTabPage1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
+    <value>XtraTabControl1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1267, 277</value>
+  </data>
+  <data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
   <data name="ListBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Left</value>
   </data>
@@ -2973,6 +2469,27 @@
   <data name="&gt;&gt;BindingNavigator2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1261, 249</value>
+  </data>
+  <data name="XtraTabPage3.Text" xml:space="preserve">
+    <value>Manuelle Indexe</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Name" xml:space="preserve">
+    <value>XtraTabPage3</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
+    <value>XtraTabControl1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="XtraTabPage2.AutoScroll" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -3132,9 +2649,6 @@
   <data name="&gt;&gt;cmbEntity_Doctype.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>940, 56</value>
-  </metadata>
   <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>786, 56</value>
   </metadata>
@@ -3314,6 +2828,24 @@
   <data name="&gt;&gt;BindingNavigator1.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
+  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1261, 249</value>
+  </data>
+  <data name="XtraTabPage2.Text" xml:space="preserve">
+    <value>Zurodnung Dokumentart - Entität</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage2.Name" xml:space="preserve">
+    <value>XtraTabPage2</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
+    <value>XtraTabControl1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="lblpathsaved.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold, Italic</value>
   </data>
@@ -3404,117 +2936,6 @@
   <data name="&gt;&gt;FOLDER_FOR_INDEXTextBox.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="&gt;&gt;Label7.Name" xml:space="preserve">
-    <value>Label7</value>
-  </data>
-  <data name="&gt;&gt;Label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label7.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;cmbIndex_Controls.Name" xml:space="preserve">
-    <value>cmbIndex_Controls</value>
-  </data>
-  <data name="&gt;&gt;cmbIndex_Controls.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbIndex_Controls.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;cmbIndex_Controls.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderDate.Name" xml:space="preserve">
-    <value>cmbCrFolderDate</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderDate.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderDate.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderDate.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;Label20.Name" xml:space="preserve">
-    <value>Label20</value>
-  </data>
-  <data name="&gt;&gt;Label20.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label20.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;Label20.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnaddcrFolderParameter.Name" xml:space="preserve">
-    <value>btnaddcrFolderParameter</value>
-  </data>
-  <data name="&gt;&gt;btnaddcrFolderParameter.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnaddcrFolderParameter.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;btnaddcrFolderParameter.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;Label18.Name" xml:space="preserve">
-    <value>Label18</value>
-  </data>
-  <data name="&gt;&gt;Label18.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label18.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;Label18.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderIndex.Name" xml:space="preserve">
-    <value>cmbCrFolderIndex</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderIndex.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderIndex.Parent" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;cmbCrFolderIndex.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="grbxFolderforIndex.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="grbxFolderforIndex.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 56</value>
-  </data>
-  <data name="grbxFolderforIndex.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 119</value>
-  </data>
-  <data name="grbxFolderforIndex.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="grbxFolderforIndex.Text" xml:space="preserve">
-    <value>Neuer Unterordner:</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Name" xml:space="preserve">
-    <value>grbxFolderforIndex</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.Parent" xml:space="preserve">
-    <value>XtraTabPage4</value>
-  </data>
-  <data name="&gt;&gt;grbxFolderforIndex.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
   <data name="Label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -3734,6 +3155,33 @@
   <data name="&gt;&gt;cmbCrFolderIndex.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="grbxFolderforIndex.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="grbxFolderforIndex.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 56</value>
+  </data>
+  <data name="grbxFolderforIndex.Size" type="System.Drawing.Size, System.Drawing">
+    <value>573, 119</value>
+  </data>
+  <data name="grbxFolderforIndex.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="grbxFolderforIndex.Text" xml:space="preserve">
+    <value>Neuer Unterordner:</value>
+  </data>
+  <data name="&gt;&gt;grbxFolderforIndex.Name" xml:space="preserve">
+    <value>grbxFolderforIndex</value>
+  </data>
+  <data name="&gt;&gt;grbxFolderforIndex.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grbxFolderforIndex.Parent" xml:space="preserve">
+    <value>XtraTabPage4</value>
+  </data>
+  <data name="&gt;&gt;grbxFolderforIndex.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="Label17.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -3764,6 +3212,36 @@
   <data name="&gt;&gt;Label17.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
+  <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1261, 249</value>
+  </data>
+  <data name="XtraTabPage4.Text" xml:space="preserve">
+    <value>Variabler Ordnerpfad</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage4.Name" xml:space="preserve">
+    <value>XtraTabPage4</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
+    <value>XtraTabControl1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage4.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve">
+    <value>XtraTabControl1</value>
+  </data>
+  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="TBPMO_FORM_VIEWTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1184, 56</value>
   </metadata>

app/DD-Record-Organiser/frmWD_EntityImport.vb

@@ -151,7 +151,7 @@ Public Class frmWD_EntityImport
                         If Not dt Is Nothing Then
                             If dt.Rows.Count = 1 Then
                                 Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                                Dim idxvalue = CURRENT_FORM_ID
+                                Dim idxvalue = CURRENT_ENTITY_ID
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False)
                         indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue)
                         If indexierung_erfolgreich = False Then
@@ -264,7 +264,7 @@ Public Class frmWD_EntityImport
             If DT.Rows.Count = 1 Then
                 ListView1.Items.Clear()
                 ListView1.Items.Add(DT.Rows(0).Item("IDXNAME_ENTITYID").ToString)
-                ListView1.Items(count).SubItems.Add(CURRENT_FORM_ID)
+                ListView1.Items(count).SubItems.Add(CURRENT_ENTITY_ID)
                 ListView1.Items.Add(DT.Rows(0).Item("IDXNAME_PARENTID").ToString)
                 ListView1.Items(count + 1).SubItems.Add(CURRENT_PARENT_ENTITY_ID)
             End If

app/DD-Record-Organiser/frmWD_IndexFile.vb

@@ -110,8 +110,8 @@ Public Class frmWD_IndexFile
                             If dt.Rows.Count = 1 Then
                                 'den Entity-Key auslesen
                                 Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_FORM_ID.ToString, False)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_ENTITY_ID.ToString, False)
-                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_FORM_ID)
+                                indexierung_erfolgreich = ClassWindream.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_ENTITY_ID)
                                 If indexierung_erfolgreich = False Then
                                     err = True
                                     MsgBox("Unexpected Error in indexing file Entity - See log", MsgBoxStyle.Critical)
@@ -169,7 +169,7 @@ Public Class frmWD_IndexFile
                             sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
                             CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                             If Not IsNothing(CURRENT_DOC_ID) Then
-                                If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID) = False Then
+                                If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_ENTITY_ID) = False Then
                                     MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine & _
                                            "ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation)
                                     DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, USER_USERNAME, 1)
@@ -619,7 +619,7 @@ Public Class frmWD_IndexFile
             If CURRENT_REDUNDANT_FORM_ID <> 0 Then
                 sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_REDUNDANT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
             Else
-                sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
+                sel = "select MANUAL_SUBFOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & CURRENT_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID & ")"
             End If
             Dim chk = ClassDatabase.Execute_Scalar(sel)
             If Not IsNothing(chk) Then
@@ -1017,13 +1017,13 @@ Public Class frmWD_IndexFile
                 If Not dt Is Nothing Then
                     If dt.Rows.Count = 1 Then
                         lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_ENTITYID").ToString)
-                        lvwIndices.Items(Count).SubItems.Add(CURRENT_FORM_ID)
+                        lvwIndices.Items(Count).SubItems.Add(CURRENT_ENTITY_ID)
                         Count = Count + 1
                         lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_PARENTID").ToString)
                         If CURRENT_REDUNDANT_FORM_ID <> 0 Then
                             sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_REDUNDANT_FORM_ID
                         Else
-                            sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID
+                            sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_ENTITY_ID
                         End If
                         Dim ParentID = ClassDatabase.Execute_Scalar(sql, True)
                         Try
@@ -1103,7 +1103,7 @@ Public Class frmWD_IndexFile
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Redundant EntityID: " & CURRENT_ENTITY_REDUNDANT_ID)
                         CURRENT_REDUNDANT_FORM_ID = CURRENT_ENTITY_REDUNDANT_ID
                         CURRENT_REDUNDANT_FORMVIEW_ID = FVID
-                        CURRENT_FORM_ID = CURRENT_ENTITY_REDUNDANT_ID
+                        CURRENT_ENTITY_ID = CURRENT_ENTITY_REDUNDANT_ID
                         CURRENT_FORMVIEW_ID = FVID
                     End If
                 Else