MS3103

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -441,7 +441,7 @@ Module ModuleHelperMethods
     Public Function Get_Grid_Sql(ConstructorId As Integer, FormId As Integer, ConstructorDetailID As Integer, ByRef GRID_TYPE As frmConstructor_Main.GridType, UserGuid As Integer, QUICK_VIEW_SQL As String,
                                  IS_SINGLE_RECORD As Boolean, FORM_TYPE As Integer, ByRef VIEW_ID As Integer, ByRef GridControlMain As GridControl, ByRef grvwGrid As GridView, Optional ByRef IS_GEOData As Boolean = False)
         Try
-            Dim ViewName As String = "TBPMO_ENTITY_TABLE" & FormId.ToString
+            Dim ViewName As String = "VWPMO_ENTITY_TABLE" & FormId.ToString
             CURRENT_VIEWNAME = ViewName
             Dim EntitySQL As String
 
@@ -457,7 +457,7 @@ Module ModuleHelperMethods
                 EntitySQL = QUICK_VIEW_SQL
 
                 If EntitySQL = String.Empty Then
-                    EntitySQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & FormId.ToString & " T"
+                    EntitySQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T"
                     If IS_SINGLE_RECORD = True Or FORM_TYPE = 5 Then
 
                     Else

app/DD-Record-Organizer/frmConstructorDesigner.vb

@@ -836,7 +836,7 @@ Public Class frmConstructorDesigner
 
     Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click
         Try
-            Dim EntSQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & SELECTED_ENTITY_ID.ToString & " T"
+            Dim EntSQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & SELECTED_ENTITY_ID.ToString & " T"
             Dim query As String = EntSQL & " " & SQL_COMMANDTextBox.Text
 
             For Each row As DataGridViewRow In dgvPlaceholders.Rows

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

@@ -386,8 +386,8 @@ Partial Class frmConstructor_Main
         'tsmINewText
         '
         Me.tsmINewText.BackColor = System.Drawing.Color.Yellow
-        Me.tsmINewText.Name = "tsmINewText"
         resources.ApplyResources(Me.tsmINewText, "tsmINewText")
+        Me.tsmINewText.Name = "tsmINewText"
         '
         'ToolStripSeparator15
         '
@@ -1310,8 +1310,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameFile
         '
         Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange
-        Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
         resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
+        Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
         '
         'DisplaynameUmbenennenToolStripMenuItem
         '
@@ -1322,8 +1322,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameDisplay
         '
         Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange
-        Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
         resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
+        Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
         '
         'docCM_InWork
         '

app/DD-Record-Organizer/frmConstructor_Main.en-US.resx

@@ -527,13 +527,13 @@
     <value>geodata navigation</value>
   </data>
   <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>578, 293</value>
+    <value>665, 293</value>
   </data>
   <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>578, 24</value>
+    <value>665, 24</value>
   </data>
   <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>578, 26</value>
+    <value>665, 26</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
     <value>1373, 347</value>
@@ -553,10 +553,10 @@
 </value>
   </data>
   <data name="tslblDocViewLocked.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 19</value>
+    <value>271, 19</value>
   </data>
   <data name="tslblDocViewLocked.Text" xml:space="preserve">
-    <value>View is locked - Click Work Record for unlocking</value>
+    <value>View is locked - Click Edit Record for unlocking</value>
   </data>
   <data name="ToolStripEdit.Size" type="System.Drawing.Size, System.Drawing">
     <value>1373, 25</value>
@@ -968,6 +968,28 @@
   <data name="docCM_CheckRights.Text" xml:space="preserve">
     <value>Check file-rights</value>
   </data>
+  <data name="docCM_GetRights.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        Qk02BAAAAAAAADYAAAAoAAAAEAAAABAAAAABACAAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2/wAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v8AAAAAAAAAAPb29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/AAAAAAAAAAD29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2/wAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/w==
+</value>
+  </data>
   <data name="docCM_GetRights.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 22</value>
   </data>
@@ -992,11 +1014,24 @@
   <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
     <value>206, 6</value>
   </data>
-  <data name="docCM_ResetView.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="docCM_showGridSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>209, 22</value>
+    <value>
-  </data>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-  <data name="docCM_ResetView.Text" xml:space="preserve">
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAAC+klE
-    <value>Reset view</value>
+        QVQ4T42S+0+TZxiG+V/MYkycidHpNP7gIaTooAbQDwsC4qilHMqhYC1yKNKPOhmjtANKELSVTSbBMVo/
+        goeI4AFD0GWZAw8YNZxMLZiJqQf0sq/LPlyyLPvhfvIm73tfb57nuaMAVaX1yvqIZGtdYKjcpczbm/uf
+        H6rzX805csZmtHWu/fTt31IPZQ19eRVu5YFvcIgLD0ZRJvvwTVRRoBiQ5BNklvrG9WWnDJ+ahT6Ww04l
+        V/YqL7vvnOPWn78z9mqakp4anPfLyf5Fy1ZHLSnyMMnW9oUMS9s/IFGWusC6cndgomXERd+sl4G5EUYX
+        7jAWDtI15cfgcaDx/MEGdw8bm/RIhfXje4ua1XYEoLrap+C5XUvThAXvEze+SQfNv/nI+bELY0uIlLpH
+        rDqdyIofYtlsz2dPXoNNBRQf6x1sCTxGVpzk3txJ4UgcZq+Vkg4F+fjPyK52rLX1pLuyWdmoYeWxBBKN
+        tQMqoMDRE2o9/wpbayva0xq+UpLRN7toPOXn4uBVZoLPeDIbpONsL2llJpbVxKDNlEMqwGTvDrkCYQ53
+        BEm36olt/RpzRzX9lwcj9/B2EV6E3zE9t4i7/QybTInsSK9cAuQe6RoobHqI6fhrjK4JEkpNVLi/Zepp
+        UDXPPn/L3ak3+IfGSUxLJTrZutRCdtVPtpyjV8j8/iUZzjmS7dc4dFRm8mnoL/P8YsT8muG7YVq6h4mX
+        ktgimZeGKBImQrK/5ha6b2bRVI0g2c309l9mZj7y8/QbbtwLc250gTxLJXHSvvnq8uI2FSCKSFiaxbew
+        p+Iaq4odrDankmUuoq0zQM/QGJ6zw+QdrCRJt5tOZyq9nvz3DXKJXQUIiYTp8hvHtxe4iNbnoDU6kLJs
+        SHv3kyDpSEmKx23exsxJDe+uZ+D9rkhAtCpASCRMhETsWaxKTFsMTPScoo22ZMWt5dfKL5j0bCHkT+Kg
+        YeeS+f8oAthliF3DJcuXHIj5HF3s+vh/ffhfEpBNq5cTs/GzXUDUB9hlsqaYQE4mAAAAAElFTkSuQmCC
+</value>
   </data>
   <data name="docCM_showGridSearch.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 22</value>
@@ -1013,6 +1048,12 @@
   <data name="docCM_PropertiesFile.Text" xml:space="preserve">
     <value>Properties</value>
   </data>
+  <data name="docCM_ResetView.Size" type="System.Drawing.Size, System.Drawing">
+    <value>209, 22</value>
+  </data>
+  <data name="docCM_ResetView.Text" xml:space="preserve">
+    <value>Reset view</value>
+  </data>
   <data name="NavButtonHome.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

app/DD-Record-Organizer/frmConstructor_Main.resx

@@ -285,6 +285,9 @@
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
   </data>
+  <data name="tsmINewText.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="tsmINewText.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -1209,6 +1212,9 @@
   <data name="BindingNavigatorPositionItem.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="BindingNavigatorPositionItem.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -2279,6 +2285,9 @@
   <data name="ToolStripSeparator20.Size" type="System.Drawing.Size, System.Drawing">
     <value>248, 6</value>
   </data>
+  <data name="CMDoc_TextBoxRenameFile.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="CMDoc_TextBoxRenameFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -2291,6 +2300,9 @@
   <data name="NeuToolStripMenuItem.Text" xml:space="preserve">
     <value>Dateinamen umbenennen</value>
   </data>
+  <data name="CMDoc_TextBoxRenameDisplay.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="CMDoc_TextBoxRenameDisplay.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -736,7 +736,7 @@ Public Class frmConstructor_Main
         GridControlMain.MainView = grvwTiles
     End Sub
     Public Function Get_Pos_SQL(FormId As Integer)
-        POS_SQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID"
+        POS_SQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID"
     End Function
     Public Sub Clear_Grid_View()
         GridControlMain.DataSource = Nothing
@@ -1438,7 +1438,7 @@ Public Class frmConstructor_Main
     Function ReturnAmountofRecords(EntityID As Integer)
         ' Statt eine Table zurückzugeben, können wir die anzahl der Zeilen auch in der Datenbank berechnen,
         ' dadurch wird die Abfrage um einiges schneller
-        Dim SQL As String = "SELECT COUNT(*) FROM ( SELECT T.* FROM TBPMO_ENTITY_TABLE" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID ) x"
+        Dim SQL As String = "SELECT COUNT(*) FROM ( SELECT T.* FROM VWTEMP_PMO_FORM" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID ) x"
 
         'Abhängig von der Entität dieAnzahl der Datensätze laden
         Select Case ACT_EBENE
@@ -1610,7 +1610,7 @@ Public Class frmConstructor_Main
                 MsgBox(msg, MsgBoxStyle.Exclamation)
                 Try
                     Dim sql
-                    sql = "select * from TBPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString
+                    sql = "select * from VWTEMP_PMO_FORM" & PARENT_ENTITYID.ToString
                     CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True)
                     frmChooseParentRecord.ShowDialog()
                     If CURRENT_PARENT_RECORD_ID = 0 Then
@@ -2260,7 +2260,7 @@ Public Class frmConstructor_Main
                     If EBENE1_RECID > 0 Then
                         PARENT_RECORDID = EBENE1_RECID
                         If GRID_TYPE = GridType.Grid Then
-                            _ENTITYSQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
+                            _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
                         Else
                             _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID)
                             _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
@@ -2301,7 +2301,7 @@ Public Class frmConstructor_Main
                         PARENT_RECORDID = EBENE2_RECID
                         Try
                             If GRID_TYPE = GridType.Grid Then
-                                _ENTITYSQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
+                                _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
                             Else
                                 _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID)
                                 _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
@@ -2404,7 +2404,7 @@ Public Class frmConstructor_Main
                 If IsNothing(DTEntity) Then
                     ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile")
                 Else
-                    DTEntity.TableName = "TBPMO_ENTITY_TABLE" & ENTITY_ID
+                    DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID
                     Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID
                     Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True)
                     CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES
@@ -3427,19 +3427,19 @@ Public Class frmConstructor_Main
                                     End If
                                     MsgBox(msg, MsgBoxStyle.Information)
                                     ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 0)
-                            Else
-                                If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then
-                                    msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", path)
-                                    If USER_LANGUAGE <> "de-DE" Then
-                                        msg = String.Format("The file {0} could not be deleted! Check the logfile!", path)
-                                    End If
-                                    MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
                                 Else
-                                    If clsWD_SET.Delete_WDFile(path) Then
+                                    If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then
-                                        ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
+                                        msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", path)
+                                        If USER_LANGUAGE <> "de-DE" Then
+                                            msg = String.Format("The file {0} could not be deleted! Check the logfile!", path)
+                                        End If
+                                        MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
+                                    Else
+                                        If clsWD_SET.Delete_WDFile(path) Then
+                                            ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
+                                        End If
                                     End If
                                 End If
-                            End If
 
                             End If
                         Next
@@ -4058,96 +4058,96 @@ Public Class frmConstructor_Main
             If ClassDragDrop.Drop_File(e) = False Then
                 Exit Sub
             End If
-        If USER_PERSONIFIED_TEST = True Then
+            If USER_PERSONIFIED_TEST = True Then
-            ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDi in personified mode! Adding files is not allowed!")
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDi in personified mode! Adding files is not allowed!")
-            Exit Sub
-        End If
-        If clsWindream.SESSION_CREATED = False Then
-            ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart ADDI afterwards.", "Could not create a windream session!")
-            Exit Sub
-        End If
-        If act_FormViewID <> 0 And (RIGHT_READ_ONLY_DOC = False And GridControlDocSearch.ContextMenuStrip.Name = "ContextMenuStripResultFiles") Or RIGHT_ADD_DOC = True Then
-            Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
-            Dim count_DT = ClassDatabase.Execute_Scalar(sql, True)
-            If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
-                MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
                 Exit Sub
-            ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+            End If
-                sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
+            If clsWindream.SESSION_CREATED = False Then
-                count_DT = ClassDatabase.Execute_Scalar(sql, True)
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart ADDI afterwards.", "Could not create a windream session!")
-                If count_DT = 0 Then
+                Exit Sub
+            End If
+            If act_FormViewID <> 0 And (RIGHT_READ_ONLY_DOC = False And GridControlDocSearch.ContextMenuStrip.Name = "ContextMenuStripResultFiles") Or RIGHT_ADD_DOC = True Then
+                Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
+                Dim count_DT = ClassDatabase.Execute_Scalar(sql, True)
+                If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
                     MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
                     Exit Sub
+                ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+                    sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
+                    count_DT = ClassDatabase.Execute_Scalar(sql, True)
+                    If count_DT = 0 Then
+                        MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                        Exit Sub
+                    End If
                 End If
-            End If
+                If RECORD_CHANGED = True Then
-            If RECORD_CHANGED = True Then
+                    If Save_Record() = False Then
-                If Save_Record() = False Then
+                        Exit Sub
-                    Exit Sub
+                    End If
                 End If
-            End If
+                CURRENT_CONTROL_DOCTYPE_MATCH = 0
-            CURRENT_CONTROL_DOCTYPE_MATCH = 0
+                If CONTROL_DOCTYPE_MATCH <> 0 Then
-            If CONTROL_DOCTYPE_MATCH <> 0 Then
+                    Try
-                Try
+                        CURRENT_CONTROL_DOCTYPE_MATCH = ""
-                    CURRENT_CONTROL_DOCTYPE_MATCH = ""
+                        CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(RECORD_ID, CONTROL_DOCTYPE_MATCH)
-                    CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(RECORD_ID, CONTROL_DOCTYPE_MATCH)
+                    Catch ex As Exception
-                Catch ex As Exception
+                        CURRENT_CONTROL_DOCTYPE_MATCH = 0
-                    CURRENT_CONTROL_DOCTYPE_MATCH = 0
+                        CURRENT_CONTROL_DOCTYPE_MATCH = ""
-                    CURRENT_CONTROL_DOCTYPE_MATCH = ""
+                    End Try
-                End Try
 
-            End If
+                End If
-            CURRENT_RECORD_ID = RECORD_ID
+                CURRENT_RECORD_ID = RECORD_ID
-            CURRENT_ENTITY_ID = ENTITY_ID
+                CURRENT_ENTITY_ID = ENTITY_ID
-            DROPPED_CHECKED = False
+                DROPPED_CHECKED = False
-            If e.Data.GetDataPresent(DataFormats.StringFormat) Then
+                If e.Data.GetDataPresent(DataFormats.StringFormat) Then
-                Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
+                    Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
-                Console.WriteLine("DragDrop-Wert: " & Wert)
+                    Console.WriteLine("DragDrop-Wert: " & Wert)
-                If Wert.Contains("SCAN") Then
+                    If Wert.Contains("SCAN") Then
-                    Dim split() = Wert.Split(";")
+                        Dim split() = Wert.Split(";")
-                    If IsNumeric(split(1)) Then
+                        If IsNumeric(split(1)) Then
-                        CURRENT_FILEID = split(1)
+                            CURRENT_FILEID = split(1)
-                        CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
+                            CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
-                        CURRENT_FORMVIEW_ID = FORMVIEW_ID
+                            CURRENT_FORMVIEW_ID = FORMVIEW_ID
-                        ClassHelper.Create_USER_FILE_TABLE()
+                            ClassHelper.Create_USER_FILE_TABLE()
-                        If Not IsNothing(CURRENT_TBPMO_FILES_USER) Then
+                            If Not IsNothing(CURRENT_TBPMO_FILES_USER) Then
-                            If CURRENT_TBPMO_FILES_USER.Rows.Count > 0 Then
+                                If CURRENT_TBPMO_FILES_USER.Rows.Count > 0 Then
-                                frmWD_IndexFile.ShowDialog()
+                                    frmWD_IndexFile.ShowDialog()
+                                End If
                             End If
+
+                            'RUN_WD_SEARCH(WD_Suche, "RECORD")
+                        End If
+                    ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
+                        If ClassDragDrop.Drop_File(e) = True Then
+                            Check_Dropped_Files()
+                        End If
+                    ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
+                        If ClassDragDrop.Drop_File(e) = True Then
+                            Check_Dropped_Files()
                         End If
-
-                        'RUN_WD_SEARCH(WD_Suche, "RECORD")
                     End If
-                ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
+                Else
                     If ClassDragDrop.Drop_File(e) = True Then
                         Check_Dropped_Files()
                     End If
-                ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
-                    If ClassDragDrop.Drop_File(e) = True Then
-                        Check_Dropped_Files()
-                    End If
-                End If
-            Else
-                If ClassDragDrop.Drop_File(e) = True Then
-                    Check_Dropped_Files()
-                End If
 
-            End If
+                End If
-            'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren
+                'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren
-            If NEW_FILES_ADDED = True Then
+                If NEW_FILES_ADDED = True Then
-                Me.Cursor = Cursors.WaitCursor
+                    Me.Cursor = Cursors.WaitCursor
-                RUN_WDSEARCH_GRID()
+                    RUN_WDSEARCH_GRID()
-                TimerClearResultfiles.Start()
+                    TimerClearResultfiles.Start()
+                Else
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> No new files were added or windream tab is not focused!", False)
+                End If
+                Me.Cursor = Cursors.Default
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> No new files were added or windream tab is not focused!", False)
+                'If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
-            End If
+                '    ClassLogger.Add(">> RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed", False)
-            Me.Cursor = Cursors.Default
+                'End If
-        Else
+                If RIGHT_READ_ONLY_DOC = True Then
-            'If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
+                    ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False)
-            '    ClassLogger.Add(">> RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed", False)
+                End If
-            'End If
-            If RIGHT_READ_ONLY_DOC = True Then
-                ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False)
-            End If
 
             End If
         Catch ex As Exception
@@ -4893,7 +4893,7 @@ Public Class frmConstructor_Main
 
 
         Dim sql
-        sql = "select * from TBPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString
+        sql = "select * from VWTEMP_PMO_FORM" & PARENT_ENTITYID.ToString
         CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True)
         frmChooseParentRecord.ShowDialog()
 

app/DD-Record-Organizer/frmDocLink_to_Record.vb

@@ -152,7 +152,7 @@ Public Class frmDocLink_to_Record
             Dim RecordId As Integer
 
             If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False)
-            ResultViewName = "TBPMO_ENTITY_TABLE" & FormId.ToString
+            ResultViewName = "VWPMO_ENTITY_TABLE" & FormId.ToString
             ResultSQL = "SELECT T.* FROM " & ResultViewName & " T"
 
             Try

app/DD-Record-Organizer/frmEntities.resx

@@ -482,6 +482,9 @@
   <data name="&gt;&gt;TBPMO_FORMBindingNavigator.ZOrder" xml:space="preserve">
     <value>11</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>
   <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1104, 17</value>
   </metadata>
@@ -509,6 +512,9 @@
   <data name="&gt;&gt;DESCRIPTIONTextBox.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1104, 17</value>
+  </metadata>
   <data name="FORM_TITLETextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
@@ -644,6 +650,105 @@
   <metadata name="TBPMO_FORM_VIEWTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
+  <data name="&gt;&gt;Label4.Name" xml:space="preserve">
+    <value>Label4</value>
+  </data>
+  <data name="&gt;&gt;Label4.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;Label4.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;SINGLE_RECORDCheckBox.Name" xml:space="preserve">
+    <value>SINGLE_RECORDCheckBox</value>
+  </data>
+  <data name="&gt;&gt;SINGLE_RECORDCheckBox.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;SINGLE_RECORDCheckBox.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;SINGLE_RECORDCheckBox.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;NumericUpDown1.Name" xml:space="preserve">
+    <value>NumericUpDown1</value>
+  </data>
+  <data name="&gt;&gt;NumericUpDown1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;NumericUpDown1.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;NumericUpDown1.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;ENTITY_IDTextBox.Name" xml:space="preserve">
+    <value>ENTITY_IDTextBox</value>
+  </data>
+  <data name="&gt;&gt;ENTITY_IDTextBox.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;ENTITY_IDTextBox.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;ENTITY_IDTextBox.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;ComboBox1.Name" xml:space="preserve">
+    <value>ComboBox1</value>
+  </data>
+  <data name="&gt;&gt;ComboBox1.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;ComboBox1.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.Name" xml:space="preserve">
+    <value>SHOW_FORM_CONSTRUCTCheckBox</value>
+  </data>
+  <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.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;SHOW_FORM_CONSTRUCTCheckBox.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="GroupBox2.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9.75pt, style=Bold</value>
+  </data>
+  <data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>328, 53</value>
+  </data>
+  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>424, 368</value>
+  </data>
+  <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="GroupBox2.Text" xml:space="preserve">
+    <value>Entity Properties:</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>$this</value>
+  </data>
+  <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
   <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -777,6 +882,9 @@ diese Entität angelegt werden.</value>
   <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
+  <metadata name="TBPMO_FORM_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>255, 56</value>
+  </metadata>
   <data name="SHOW_FORM_CONSTRUCTCheckBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
@@ -804,33 +912,6 @@ diese Entität angelegt werden.</value>
   <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
-  <data name="GroupBox2.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt, style=Bold</value>
-  </data>
-  <data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>328, 53</value>
-  </data>
-  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>424, 368</value>
-  </data>
-  <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="GroupBox2.Text" xml:space="preserve">
-    <value>Entity Properties:</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>$this</value>
-  </data>
-  <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
   <data name="TreeViewEntity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
@@ -1197,10 +1278,10 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>MiddleRight</value>
   </data>
   <data name="btncancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>400, 73</value>
+    <value>289, 66</value>
   </data>
   <data name="btncancel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 31</value>
+    <value>87, 31</value>
   </data>
   <data name="btncancel.TabIndex" type="System.Int32, mscorlib">
     <value>35</value>
@@ -1233,10 +1314,10 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>Procedure is executing ......</value>
   </data>
   <data name="ProgressPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>178, 66</value>
+    <value>9, 66</value>
   </data>
   <data name="ProgressPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>246, 44</value>
+    <value>274, 44</value>
   </data>
   <data name="ProgressPanel1.TabIndex" type="System.Int32, mscorlib">
     <value>34</value>
@@ -1341,7 +1422,7 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>328, 427</value>
   </data>
   <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>596, 110</value>
+    <value>424, 125</value>
   </data>
   <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>32</value>

app/DD-Record-Organizer/frmEntities.vb

@@ -398,6 +398,7 @@ Public Class frmEntities
         EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine & _
                    "EXEC	@return_value = dbo.PRPMO_CREATE_ENTITY_TABLE {0}" & vbNewLine & _
                    "SELECT	'Return Value' = @return_value", CurrentID)
+        ProgressPanel1.Description = "Creating the Entity-table....."
         ProgressPanel1.Visible = True
         btncancel.Visible = True
         '.. und starten
@@ -431,6 +432,7 @@ Public Class frmEntities
         EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine & _
                   "EXEC	@return_value = dbo.PRPMO_ENTITY_TABLE_IMPORT_RECORDS {0}" & vbNewLine & _
                   "SELECT	'Return Value' = @return_value", CurrentID)
+        ProgressPanel1.Description = "Inserting Records...."
         ProgressPanel1.Visible = True
         btncancel.Visible = True
         '.. und starten

app/DD-Record-Organizer/frmGeodataNavigation.vb

@@ -80,7 +80,7 @@ Public Class frmGeodataNavigation
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         Me.ConstructorMain_Grid = gridControl
         'Me.EntityId = EntityId
-        'Me.EntitySql = String.Format("SELECT T.*, T1.LATITUDE, T1.LONGITUDE from TBPMO_ENTITY_TABLE{0} T,TBPMO_RECORD_GEODATA T1 WHERE T.[Record-ID] = T1.RECORD_ID", Me.EntityId)
+        'Me.EntitySql = String.Format("SELECT T.*, T1.LATITUDE, T1.LONGITUDE from VWPMO_ENTITY_TABLE{0} T,TBPMO_RECORD_GEODATA T1 WHERE T.[Record-ID] = T1.RECORD_ID", Me.EntityId)
     End Sub
 
     Private Sub frmGeodataNavigation_Load(sender As Object, e As EventArgs) Handles MyBase.Load

app/DD-Record-Organizer/frmLevel_Designer.vb

@@ -639,10 +639,10 @@
             Dim noerror As Boolean = False
             Dim sql = "EXECUTE PRPMO_CREATE_SQL " & CURRENT_ENTITY_ID
             noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1)
-            sql = "EXECUTE PRPMO_CREATE_TEMP_VIEWS"
+            sql = "EXECUTE PRPMO_CREATE_ENTITY_TABLE_VIEW " & CURRENT_ENTITY_ID
             noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1)
             If noerror = False Then
-                MsgBox("Error while Rebuilding Views! See Log for more information", MsgBoxStyle.Critical)
+                MsgBox("Error while rebuilding view! See Log for more information", MsgBoxStyle.Critical)
             End If
             Return noerror
         Catch ex As Exception

app/DD-Record-Organizer/frmTemplates.vb

@@ -220,7 +220,7 @@
         If loaded = False Then Exit Sub
         If cmbControls.SelectedIndex <> -1 Then
             If cmbControls.Text <> "System.Data.DataRowView" Then
-                Dim Sql = "select TOP 30 [" & cmbControls.Text & "] FROM TBPMO_ENTITY_TABLE" & _ENTITY_ID & " WHERE [" & cmbControls.Text & "] IS NOT NULL AND [" & cmbControls.Text & "] <> '' GROUP BY [" & cmbControls.Text & "]"
+                Dim Sql = "select TOP 30 [" & cmbControls.Text & "] FROM VWPMO_ENTITY_TABLE" & _ENTITY_ID & " WHERE [" & cmbControls.Text & "] IS NOT NULL AND [" & cmbControls.Text & "] <> '' GROUP BY [" & cmbControls.Text & "]"
                 Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql)
                 If DT.Rows.Count > 0 Then
                     ListBoxVorschau.DataSource = DT

app/VERSION_CHECKER/frmVersionCheck.vb

@@ -257,7 +257,7 @@ Public Class frmVersionCheck
                 startInfo.FileName = PMO_PATH
                 Process.Start(startInfo)
             Else
-                MsgBox("Can not find ADDI-Executable in '" & filename & "'! Please inform your systemadmin.", MsgBoxStyle.Critical)
+                MsgBox("Can not find ADDI-Executable in regular path! Please inform your systemadmin.", MsgBoxStyle.Critical)
             End If
           
         Catch ex As Exception