MS

app/DD-Record-Organizer/Classes/ClassHelper.vb

@@ -436,4 +436,13 @@ Public Class ClassHelper
         End Try
 
     End Function
+    Public Shared Function GetDocrecordLinks(pRECORDID As Integer)
+        Try
+            Dim oSQL = $"SELECT * FROM TBPMO_DOC_RECORD_LINK WHERE RECORD_ID = {pRECORDID}"
+            CURRENT_DT_TBPMO_DOC_RECORD_LINK = clsDatabase.Return_Datatable(oSQL, False)
+        Catch ex As Exception
+            LOGGER.Warn("Unexpected Error in GetDocrecordLinks: " & ex.Message)
+            Return False
+        End Try
+    End Function
 End Class

app/DD-Record-Organizer/Classes/ClassUpdate.vb

@@ -206,7 +206,7 @@ Public Class ClassUpdate
             msg = "There is a new release available for an ADDI-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
         End If
         Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.No Then
                 UPDATE_CANCELLED = True
                 Exit Sub

app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb

@@ -60,8 +60,14 @@ Public Class ClassWindreamDocGrid
                     Dim newRow As DataRow = DT_RESULTFILES.NewRow()
                     Try
                         Dim DOC_ID = gridView.GetRowCellValue(row, "DocID")
-                        SELECTED_DOC_ID = DOC_ID
+                        Dim CHeckDT As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_DT_TBPMO_DOC_RECORD_LINK, "DOC_ID = " + DOC_ID.ToString, "")
-                        newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
+                        If CHeckDT.Rows.Count = 1 Then
+                            SELECTED_DOC_ID = DOC_ID
+                            newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
+                        Else
+                            Continue For
+                        End If
+
                     Catch ex As Exception
                         newRow("DOC_ID") = 0
                         SELECTED_DOC_ID = 0

app/DD-Record-Organizer/ModuleMySettings.vb

@@ -27,7 +27,7 @@ Module ModuleMySettings
     Public WM_READ_ONLY As Boolean = False
     Public GridDocResult_BestFitColumns As Boolean = True
     Public SQL_FULLTEXT As String
-
+    Public CAPTION_CONFIRMATION As String = "Bestätigung"
     'Public WD_ShowEnitityDocs As Boolean = True
     Public WD_ShowDocs As Boolean = False
 

app/DD-Record-Organizer/ModuleRuntimeVariables.vb

@@ -65,6 +65,7 @@ Module ModuleRuntimeVariables
     Public CURRENT_NOTIFICATION_MSG As String
 
     Public CURRENT_ENTITY_ID As Integer
+    Public CURRENT_LINK_ENTITY_ID As Integer = 0
     Public CURRENT_FORMVIEW_ID As Integer
     Public CURRENT_REDUNDANT_FORM_ID As Integer
     Public CURRENT_REDUNDANT_FORMVIEW_ID As Integer
@@ -195,4 +196,6 @@ Module ModuleRuntimeVariables
     Public CURRENT_FILE_RIGHT As String
 
     Public SQL_DOC_RESULT_RECORD As String = ""
+
+    Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable
 End Module

app/DD-Record-Organizer/frmConstructor_Main.resx

@@ -146,7 +146,7 @@
   <data name="FormDesignerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5
+        vgAADr4B6kKxwAAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5
         Z9IaHNHm0SaIMXati44MGVLwOt61bdGRIeOvAlmroOx7cHXGykcuewA+uDoDgpmU4QpPKRFarp+4x8vf
         zAgkHK+CBTjFusAFRzwCNxyxCqbgiEUwDUeuBEtw5EywDEdGglvgiCa4DY5cCZbgCARlGBCtAJvgYqZr
         E+BVyPIGnMT05CNGJ9j+P9gukJ0V/DDOPjLPmqLNo1WwrxQ+GCNWVrb1cMEAAAAASUVORK5CYII=
@@ -219,7 +219,7 @@
   <data name="tsmiNodeRename.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAFBJREFUOE9joBh8+/btPz4MVYYbgBQ5OTmBMUwTMh+qDDegigHYNBKL4S6A0chs
+        vQAADr0BR/uQrQAAAFBJREFUOE9joBh8+/btPz4MVYYbgBQ5OTmBMUwTMh+qDDegigHYNBKL4S6A0chs
         YmjauYAQhqkbTi5A1ojMJ0QTNIAQRvECNgxNb4MWMDAAAPsOTf9dAGOQAAAAAElFTkSuQmCC
 </value>
   </data>
@@ -230,7 +230,7 @@
     <value>Knoten umbenennen</value>
   </data>
   <data name="SdsdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
@@ -242,18 +242,18 @@
     <value>152, 23</value>
   </data>
   <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>209, 6</value>
+    <value>213, 6</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ
+        vgAADr4B6kKxwAAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ
         4X7xiEg/UUD3yUgosNjYjphZiWg8n5JF4IOFSAIFNsyYJf8IENufMMdG2bElFFzHgPw3vgWWFWBZAZb7
         aDsAn1PBeUq8SBsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="OberhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Auf dieser Ebene</value>
@@ -261,14 +261,14 @@
   <data name="UnterhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm
+        vgAADr4B6kKxwAAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm
         rWVVYSsvRgxCYwzXVcELfwDuCnBjvi0QYIBckB7zbYECdlGBi/m2QIDmnFKQHvNtgTKIQBbk83FBDdeS
         0wL/WPwG8HBjvi1uxO/KkhrGTXgxYrKkhjHCi1EmSn5hjPBs3GprnsueLz0XwXnZAqB7AAAAAElFTkSu
         QmCC
 </value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Unterhalb</value>
@@ -276,7 +276,7 @@
   <data name="tsmiNodeNew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
+        vgAADr4B6kKxwAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
         yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
         TkSuQmCC
 </value>
@@ -290,7 +290,7 @@
   <data name="tsmiNodeDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACLUlE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsNAAALDQHtB8AsAAACLUlE
         QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
         TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
         hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
@@ -322,7 +322,7 @@
     <value>Suche Knoten</value>
   </data>
   <data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>225, 235</value>
+    <value>225, 257</value>
   </data>
   <data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve">
     <value>cmsTreeView</value>
@@ -952,7 +952,7 @@
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
+        vgAADr4B6kKxwAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
         yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
         TkSuQmCC
 </value>
@@ -978,7 +978,7 @@
   <data name="BindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -998,7 +998,7 @@
   <data name="BindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -1040,7 +1040,7 @@
   <data name="BindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -1058,7 +1058,7 @@
   <data name="BindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -1093,7 +1093,7 @@
   <data name="BindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
+        vgAADr4B6kKxwAAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
         Yd/tLPvK4wJ34iaZ9GVndxh4WwtYluVCfBIVcSYGLPwA1SPp0bxpIaiqSjmOw2zbdhMJdL4S6yzLlG3b
         qigK6JHI3FCmacoi6HmeGscRSZAswDmOY9bQR7WXjK5AExJoAzBJEjTOXdexIWowoVpNvMjoChQg5Hm+
         M8HT8Eo4G6muMrbHmQkIk2ma8PRPaT8G3Ikc1TSAKdWf0nYMGT5M4Lrun/E/iDM+nDlofgPf9/kDysgG
@@ -1212,7 +1212,7 @@
   <data name="cmDoc1FileProperties.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo
+        vQAADr0BR/uQrQAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo
         KQX39aS0BTzNciTIaAuQCesjQcYS4NPFSp2ARZV/b2Cbkd2ME6CwzUj7BhTFzBnUliXgYAaHdxy9gf5l
         H2jwhCrrig80uuiKCZEPDBGoa/9+56EAAAAASUVORK5CYII=
 </value>
@@ -2109,7 +2109,7 @@
   <data name="docCM_Showlinks.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
+        vQAADr0BR/uQrQAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
         f/+eABLEhX19ffEbABR4n5KSAlcA0rB582YwDRIHacAbjQ8ePABLgDSdPHny/5w5c8Ds5cuXg8VBYjDN
         WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC
 </value>
@@ -2162,7 +2162,7 @@
   <data name="DateiVersionierenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAFFJREFUKFOdj0EKACAIBH2b/3+P16JwRTQzWphD0dhKIjI81GU9YuZNlE/YD17A
+        vQAADr0BR/uQrQAAAFFJREFUKFOdj0EKACAIBH2b/3+P16JwRTQzWphD0dhKIjI81GU9YuZNlE/YD17A
         gEgp3EiCNq0DAeh1nS/BL9VxXBoDIibg8EKqpE3reLsXiCYgi0Ps3hQ2TwAAAABJRU5ErkJggg==
 </value>
   </data>
@@ -2242,7 +2242,7 @@
   <data name="docCM_showGridSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAAC+klE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsNAAALDQHtB8AsAAAC+klE
         QVQ4T42S+0+TZxiG+V/MYkycidHpNP7gIaTooAbQDwsC4qilHMqhYC1yKNKPOhmjtANKELSVTSbBMVo/
         goeI4AFD0GWZAw8YNZxMLZiJqQf0sq/LPlyyLPvhfvIm73tfb57nuaMAVaX1yvqIZGtdYKjcpczbm/uf
         H6rzX805csZmtHWu/fTt31IPZQ19eRVu5YFvcIgLD0ZRJvvwTVRRoBiQ5BNklvrG9WWnDJ+ahT6Ww04l
@@ -2289,7 +2289,7 @@
     <value>Ansicht zurücksetzen</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 542</value>
+    <value>256, 520</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -1059,7 +1059,7 @@ Public Class frmConstructor_Main
             End If
             CURRENT_RECORD_ID = RECID
             CURRENT_SEARCH_TYPE = "RECORD"
-
+            ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
             If RECID = RECORD_ID And ENTITY_RECORD_COUNT > 1 And _refresh = False And ERROR_WHILE_SAVING = False Then
                 Exit Sub
             End If
@@ -2104,6 +2104,7 @@ Public Class frmConstructor_Main
             SELECTED_RECORD_ID = recid
             RECORD_ID = recid
             CURRENT_RECORD_ID = RECORD_ID
+            ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
             If RECORD_ID = 0 Then
                 ClassHelper.MSGBOX_Handler("ERROR", "Attention:", "No Current row selected")
                 Me.Cursor = Cursors.Default
@@ -2235,7 +2236,7 @@ Public Class frmConstructor_Main
                 msg = "Are You sure You want to delete the selected record '" & SELECTED_RECORD_ID.ToString & "'?"
             End If
             Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 RECORD_ID = SELECTED_RECORD_ID
                 ClassRightManagement.Check_Set_Rights(RECORD_ID, ENTITY_ID)
@@ -2357,6 +2358,7 @@ Public Class frmConstructor_Main
         End If
 
         CURRENT_RECORD_ID = RECORD_ID
+        ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
         CtrlCommandUI.IsEdit = True
         ' Abhängige Listen laden
         CtrlBuilder.WatchRecordChanges = False
@@ -3744,7 +3746,7 @@ Public Class frmConstructor_Main
                         msg = "Do You want to delete the related files (" & DT_RESULT.Rows.Count.ToString & ")?"
                     End If
                     Dim result1 As MsgBoxResult
-                    result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    result1 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                     If result1 = MsgBoxResult.Yes Then
                         For Each row As DataRow In DT_RESULT.Rows
                             Dim DOC_ID = row.Item(0)
@@ -5494,7 +5496,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                 msg = "Would You like to delete only the references?" & vbNewLine & "File(s) will stay in ECM/Archive/Explorer!"
             End If
             Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 Try
                     For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
@@ -6205,7 +6207,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             msg = "Are You sure You want to permanently delete this file(s)?"
         End If
         Dim result1 As MsgBoxResult
-        result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        result1 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result1 = MsgBoxResult.Yes Then
             For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
                 If row.Item("DOC_PATH") <> "" Then
@@ -6218,7 +6220,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                                     msg = "This file is also linked to other records! Would You like to delete these links also?"
                                 End If
                                 Dim result2 As MsgBoxResult
-                                result2 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                                result2 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                                 Dim oDElWMFile As Boolean = False
                                 If result2 = MsgBoxResult.Yes Then
                                     oDElWMFile = True
@@ -6309,7 +6311,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         msg = String.Format("Do You really want to change the entity-link of the selected record to '{0}'?", ENTITY_STRING.ToString)
                     End If
                     Dim result As MsgBoxResult
-                    result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                     If result = MsgBoxResult.Yes Then
                         Save_Grid_Layout()
 
@@ -6803,7 +6805,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     msg = "Are You sure You want to delete the node'" & TreeViewMain.SelectedNode.Text & "'?"
                 End If
                 Dim result As MsgBoxResult
-                result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If result = MsgBoxResult.Yes Then
                     Dim oDelete = String.Format("EXEC PRPMO_DELETE_NODE {0},'{1}'", NODE_GUID, USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(oDelete) Then
@@ -6901,7 +6903,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     msg = "Are You sure You want to delete this position?"
                 End If
                 Dim result As MsgBoxResult
-                result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If result = MsgBoxResult.Yes Then
                     If ClassHelper.DeleteRecord(POS_RECORD_ID) = True Then
                         Load_Pos_Data()
@@ -7167,7 +7169,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         OMsg = "Are You sure You want to rename the node'" & TreeViewMain.SelectedNode.Text & "'?"
                     End If
                     Dim oResult As MsgBoxResult
-                    oResult = MessageBox.Show(OMsg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    oResult = MessageBox.Show(OMsg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                     If oResult = MsgBoxResult.Yes Then
                         Dim oUpdate = String.Format("UPDATE TBPMO_STRUCTURE_NODES SET NODE_CAPTION = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", Me.tstxtRenameNode.Text, USER_USERNAME, NODE_GUID)
                         If ClassDatabase.Execute_non_Query(oUpdate) Then

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

@@ -30,17 +30,19 @@ Partial Class frmDocRecordLink
         Me.cmbConstructorForms = New System.Windows.Forms.ComboBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.btnloadData2Entity = New System.Windows.Forms.Button()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.txtEntity = New System.Windows.Forms.TextBox()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.Label2 = New System.Windows.Forms.Label()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.txtcurrSichtData = New System.Windows.Forms.TextBox()
         CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -89,9 +91,9 @@ Partial Class frmDocRecordLink
         '
         'cmbConstructorForms
         '
-        resources.ApplyResources(Me.cmbConstructorForms, "cmbConstructorForms")
         Me.cmbConstructorForms.BackColor = System.Drawing.SystemColors.ControlLight
         Me.cmbConstructorForms.FormattingEnabled = True
+        resources.ApplyResources(Me.cmbConstructorForms, "cmbConstructorForms")
         Me.cmbConstructorForms.Name = "cmbConstructorForms"
         '
         'Label1
@@ -101,29 +103,17 @@ Partial Class frmDocRecordLink
         '
         'btnloadData2Entity
         '
-        resources.ApplyResources(Me.btnloadData2Entity, "btnloadData2Entity")
         Me.btnloadData2Entity.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
+        resources.ApplyResources(Me.btnloadData2Entity, "btnloadData2Entity")
         Me.btnloadData2Entity.Name = "btnloadData2Entity"
         Me.btnloadData2Entity.UseVisualStyleBackColor = True
         '
-        'Label2
-        '
-        resources.ApplyResources(Me.Label2, "Label2")
-        Me.Label2.Name = "Label2"
-        '
-        'txtEntity
-        '
-        Me.txtEntity.BackColor = System.Drawing.SystemColors.ControlLight
-        resources.ApplyResources(Me.txtEntity, "txtEntity")
-        Me.txtEntity.Name = "txtEntity"
-        Me.txtEntity.ReadOnly = True
-        '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem1, Me.BarButtonItem2})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 4
+        Me.RibbonControl1.MaxItemId = 5
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -140,14 +130,29 @@ Partial Class frmDocRecordLink
         '
         'BarButtonItem1
         '
+        Me.BarButtonItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left
         resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
         Me.BarButtonItem1.Id = 2
         Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem1.Name = "BarButtonItem1"
         '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 3
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'BarButtonItem3
+        '
+        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
+        Me.BarButtonItem3.Id = 4
+        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -155,10 +160,20 @@ Partial Class frmDocRecordLink
         '
         Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
@@ -171,22 +186,22 @@ Partial Class frmDocRecordLink
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
-        'RibbonPageGroup2
+        'Label2
         '
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        resources.ApplyResources(Me.Label2, "Label2")
+        Me.Label2.Name = "Label2"
         '
-        'BarButtonItem2
+        'txtcurrSichtData
         '
-        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        resources.ApplyResources(Me.txtcurrSichtData, "txtcurrSichtData")
-        Me.BarButtonItem2.Id = 3
+        Me.txtcurrSichtData.Name = "txtcurrSichtData"
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.txtcurrSichtData.ReadOnly = True
-        Me.BarButtonItem2.Name = "BarButtonItem2"
         '
         'frmDocRecordLink
         '
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.txtEntity)
+        Me.Controls.Add(Me.txtcurrSichtData)
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.btnloadData2Entity)
         Me.Controls.Add(Me.Label1)
@@ -214,8 +229,6 @@ Partial Class frmDocRecordLink
     Friend WithEvents cmbConstructorForms As ComboBox
     Friend WithEvents Label1 As Label
     Friend WithEvents btnloadData2Entity As Button
-    Friend WithEvents Label2 As Label
-    Friend WithEvents txtEntity As TextBox
     Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
     Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
@@ -225,4 +238,8 @@ Partial Class frmDocRecordLink
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtcurrSichtData As TextBox
 End Class

app/DD-Record-Organizer/frmDocRecordLink.resx

@@ -123,10 +123,10 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="txtFileInfo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 174</value>
+    <value>169, 166</value>
   </data>
   <data name="txtFileInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1006, 21</value>
+    <value>974, 21</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="txtFileInfo.TabIndex" type="System.Int32, mscorlib">
@@ -154,7 +154,7 @@
     <value>NoControl</value>
   </data>
   <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 177</value>
+    <value>12, 169</value>
   </data>
   <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>110, 13</value>
@@ -181,10 +181,10 @@
     <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="dgEntityRecords.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 228</value>
+    <value>12, 261</value>
   </data>
   <data name="dgEntityRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1138, 430</value>
+    <value>1131, 372</value>
   </data>
   <data name="dgEntityRecords.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -201,14 +201,11 @@
   <data name="&gt;&gt;dgEntityRecords.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-  <data name="cmbConstructorForms.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
   <data name="cmbConstructorForms.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 683</value>
+    <value>169, 223</value>
   </data>
   <data name="cmbConstructorForms.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 21</value>
+    <value>259, 21</value>
   </data>
   <data name="cmbConstructorForms.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -225,9 +222,6 @@
   <data name="&gt;&gt;cmbConstructorForms.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="Label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
   <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -238,16 +232,16 @@
     <value>NoControl</value>
   </data>
   <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 686</value>
+    <value>12, 226</value>
   </data>
   <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>124, 13</value>
+    <value>151, 13</value>
   </data>
   <data name="Label1.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
   </data>
   <data name="Label1.Text" xml:space="preserve">
-    <value>andere Entität wählen:</value>
+    <value>Andere Sicht-Daten wählen:</value>
   </data>
   <data name="&gt;&gt;Label1.Name" xml:space="preserve">
     <value>Label1</value>
@@ -261,14 +255,11 @@
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="btnloadData2Entity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
   <data name="btnloadData2Entity.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
   <data name="btnloadData2Entity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>384, 681</value>
+    <value>434, 221</value>
   </data>
   <data name="btnloadData2Entity.Size" type="System.Drawing.Size, System.Drawing">
     <value>122, 23</value>
@@ -294,60 +285,6 @@
   <data name="&gt;&gt;btnloadData2Entity.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Bold, Italic</value>
-  </data>
-  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 204</value>
-  </data>
-  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>124, 13</value>
-  </data>
-  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="Label2.Text" xml:space="preserve">
-    <value>Ausgewählte Entität:</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>$this</value>
-  </data>
-  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtEntity.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Bold, Italic</value>
-  </data>
-  <data name="txtEntity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>144, 201</value>
-  </data>
-  <data name="txtEntity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 21</value>
-  </data>
-  <data name="txtEntity.TabIndex" type="System.Int32, mscorlib">
-    <value>21</value>
-  </data>
-  <data name="&gt;&gt;txtEntity.Name" xml:space="preserve">
-    <value>txtEntity</value>
-  </data>
-  <data name="&gt;&gt;txtEntity.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;txtEntity.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;txtEntity.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <data name="bsiInfo.Caption" xml:space="preserve">
     <value>Waiting for Record-Selection...</value>
   </data>
@@ -377,42 +314,68 @@
 </value>
   </data>
   <data name="BarButtonItem2.Caption" xml:space="preserve">
-    <value>Save GridLayout</value>
+    <value>...speichern</value>
   </data>
   <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFkCAAAC77u/
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
         IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
         MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
+        Y2U9InByZXNlcnZlIiBpZD0iTmV3VGFibGVTdHlsZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5l
-        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
+        dyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3
-        bGU+DQogIDxwYXRoIGQ9Ik0zMSwwSDE5Yy0wLjYsMC0xLDAuNC0xLDF2MTZjMCwwLjYsMC40LDEsMSwx
+        O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFj
-        aDEyYzAuNiwwLDEtMC40LDEtMVYxQzMyLDAuNCwzMS42LDAsMzEsMHogTTMwLDE2SDIwVjJoMTBWMTZ6
+        aXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0wLDIwaDh2
-        IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yMiwyMHY0SDZ2LTZoMTB2LTRINlY0SDNDMi40
+        NkgwVjIweiBNMTAsMjZoOHYtNmgtOFYyNnogTTIwLDEydjZoOHYtNkgyMHogTTIwLDI2aDh2LTZoLThW
-        LDQsMiw0LjQsMiw1djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTF2LTdIMjJ6IE0x
+        MjZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTAsNGg4djZIMFY0eiBNMCwx
-        Niw0SDh2OGg4VjR6ICAgTTEyLDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+        OGg4di02SDBWMTh6IE0xMCwxMGg4VjRoLThWMTB6IE0xMCwxOGg4di02aC04VjE4eiIgY2xhc3M9IkJs
+        dWUiIC8+DQogIDxwb2x5Z29uIHBvaW50cz0iMjUsMiAyNywwIDI3LDMgMzAsMyAyOCw1IDMwLDcgMjcs
+        NyAyNywxMCAyNSw4IDIzLDEwIDIzLDcgMjAsNyAyMiw1IDIwLDMgMjMsMyAyMywwICIgY2xhc3M9Illl
+        bGxvdyIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem3.Caption" xml:space="preserve">
+    <value>...zurücksetzen</value>
+  </data>
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKIDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJUYWJsZVN0eWxlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6
+        bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3
+        RDc7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwaC04
+        VjRoOFYxMHogTTI0LjYsMTQuOWMwLjYtMC42LDEuNC0wLjksMi4yLTAuOWMwLjQsMCwwLjgsMC4xLDEu
+        MiwwLjJWMTJoLTh2NmgxLjVMMjQuNiwxNC45eiBNMCwyNiAgIGg4di02SDBWMjZ6IE0xNC45LDI0LjZs
+        My4xLTMuMVYyMGgtOHY2aDQuMUMxNC4zLDI1LjUsMTQuNSwyNSwxNC45LDI0LjZ6IiBjbGFzcz0iQmxh
+        Y2siIC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTAsNGg4djZIMFY0eiBNMCwxOGg4di02SDBWMTh6IE0x
+        MCwxMGg4VjRoLThWMTB6IE0xMCwxOGg4di02aC04VjE4eiBNMTksMjMuM0wxNi4zLDI2ICBjLTAuNCww
+        LjQtMC40LDEuMiwwLDEuNmw0LDRjMC40LDAuNCwxLjIsMC40LDEuNiwwbDIuNy0yLjdMMTksMjMuM3oi
+        IGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEuNywyMC40bC00LTRjLTAuNC0wLjQtMS4yLTAu
+        NC0xLjYsMGwtNi4xLDYuMWw1LjYsNS42bDYuMS02LjFDMzIuMSwyMS41LDMyLjEsMjAuOCwzMS43LDIw
+        LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Funktionen</value>
-  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1162, 158</value>
+    <value>1155, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 712</value>
+    <value>0, 639</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1162, 22</value>
+    <value>1155, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -438,9 +401,69 @@
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Layout</value>
+  </data>
+  <data name="RibbonPageGroup3.Text" xml:space="preserve">
+    <value>Funktionen</value>
+  </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
+  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 196</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 13</value>
+  </data>
+  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>Aktuelle Sicht-Daten:</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>$this</value>
+  </data>
+  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtcurrSichtData.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="txtcurrSichtData.Location" type="System.Drawing.Point, System.Drawing">
+    <value>169, 193</value>
+  </data>
+  <data name="txtcurrSichtData.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 21</value>
+  </data>
+  <data name="txtcurrSichtData.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="&gt;&gt;txtcurrSichtData.Name" xml:space="preserve">
+    <value>txtcurrSichtData</value>
+  </data>
+  <data name="&gt;&gt;txtcurrSichtData.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;txtcurrSichtData.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtcurrSichtData.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -448,7 +471,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1162, 734</value>
+    <value>1155, 661</value>
   </data>
   <data name="frmDocRecordLink.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1705,6 +1728,18 @@
   <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
+    <value>BarButtonItem3</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1717,23 +1752,23 @@
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
-    <value>RibbonPage2</value>
-  </data>
-  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
     <value>RibbonPageGroup2</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
-    <value>BarButtonItem2</value>
+    <value>RibbonPageGroup3</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
+    <value>RibbonPage2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmDocRecordLink</value>

app/DD-Record-Organizer/frmDocRecordLink.vb

@@ -12,10 +12,10 @@ Public Class frmDocRecordLink
         End Function
     End Class
     Private Function GET_CURRENT_ENTITY_DATA()
-        Dim oDatatabel As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy
+        Dim oDatatable As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy
-        Return oDatatabel
+        Return oDatatable
     End Function
-    Sub Refresh_Grid_Data(current As Boolean, ENTITY_DATATABLE As DataTable, ENTITY_ID As Integer)
+    Sub Refresh_Grid_Data(current As Boolean, ENTITY_DATATABLE As DataTable)
         Dim DT_RECORDS As DataTable
         If current = True Then
             DT_RECORDS = GET_CURRENT_ENTITY_DATA()
@@ -34,7 +34,7 @@ Public Class frmDocRecordLink
         Try
             For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
                 Dim DOC_ID = row.Item("DOC_ID")
-                Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", ENTITY_ID, DOC_ID)
+                Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", CURRENT_LINK_ENTITY_ID, DOC_ID)
                 Dim DTRECS_LINKED As DataTable = clsDatabase.Return_Datatable(sel)
                 For Each recrow As DataRow In DTRECS_LINKED.Rows
                     For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows
@@ -58,7 +58,7 @@ Public Class frmDocRecordLink
         grvwGrid.BestFitColumns()
     End Sub
     Private Sub frmDocRecordLink_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Me.txtEntity.Text = CURRENT_ENTITYSTRING
+        ENTITY_LOAD_ACTIVE = True
         If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
             txtFileInfo.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")
         Else
@@ -68,21 +68,40 @@ Public Class frmDocRecordLink
             If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
                 Me.Close()
             End If
-            Refresh_Grid_Data(True, Nothing, CURRENT_ENTITY_ID)
+            If CURRENT_LINK_ENTITY_ID = 0 Then
+                Refresh_Grid_Data(True, Nothing)
+                CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID
+            Else
+                Dim DT_RESULT As DataTable
+                If CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID Then
+                    DT_RESULT = CURRENT_DT_ENTITY_RECORDS
+                Else
+                    DT_RESULT = ReturnDataforEntity(CURRENT_LINK_ENTITY_ID)
+                End If
+
+                If Not IsNothing(DT_RESULT) Then
+                    Refresh_Grid_Data(False, DT_RESULT)
+                End If
+            End If
+
 
             Dim DT_ENTITIES As DataTable = GetENTITIES()
-            Dim selected As Integer = 0
+            Dim oSelectedIndex As Integer = 0
 
             If DT_ENTITIES.Rows.Count = 0 Then
                 Exit Sub
             End If
-
+            Dim oCount = 0
             For Each row As DataRow In DT_ENTITIES.Rows
                 Dim entity As New ClassEntity
                 entity.title = row.Item("FORM_TITLE")
                 entity.id = row.Item("FORM_ID")
                 cmbConstructorForms.Items.Add(entity)
-
+                If CURRENT_LINK_ENTITY_ID = entity.id Then
+                    txtcurrSichtData.Text = entity.title
+                    oSelectedIndex = oCount
+                End If
+                oCount += 1
             Next
             If USER_LANGUAGE = "de-DE" Then
                 Me.Text = CURRENT_DT_SELECTED_FILES.Rows.Count.ToString & " Datei(en) mit Datensatz verknüpfen:"
@@ -90,7 +109,7 @@ Public Class frmDocRecordLink
                 Me.Text = "Link " & CURRENT_DT_SELECTED_FILES.Rows.Count.ToString & " files with record:"
             End If
             ' Den index der aktuell geöffneten ConstructorForm setzen
-            cmbConstructorForms.SelectedIndex = selected
+            cmbConstructorForms.SelectedIndex = oSelectedIndex
 
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDocRecordLink_Load", ex.Message, ex.StackTrace)
@@ -148,7 +167,7 @@ Public Class frmDocRecordLink
         End Try
     End Sub
     Private Function Get_DocGrid_Layout_Filename()
-        Dim Filename As String = String.Format("GridViewDocRecordLink-{0}-UserLayout.xml", CURRENT_ENTITY_ID)
+        Dim Filename As String = String.Format("GridViewDocRecordLink-{0}-UserLayout.xml", CURRENT_LINK_ENTITY_ID)
         Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
     End Function
     Private Sub frmDocRecordLink_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
@@ -161,20 +180,25 @@ Public Class frmDocRecordLink
         If cmbConstructorForms.SelectedIndex <> -1 Then
             ENTITY_LOAD_ACTIVE = True
             Save_DocGrid_Layout()
-            Dim ResultSQL, ResultViewName As String
+            Dim DT_RESULT = ReturnDataforEntity(entity.id)
-            LOGGER.Debug("GridType = Grid", False)
-            ResultViewName = $"VWPMO_ENTITY_TABLE{entity.id}"
-            ResultSQL = $"SELECT T.* FROM {ResultViewName} T"
-            txtEntity.Text = cmbConstructorForms.Text
-            LOGGER.Debug("ResultSQL: " & ResultSQL, False)
-            Me.Cursor = Cursors.WaitCursor
-            Dim DT_RESULT = clsDatabase.Return_Datatable(ResultSQL, True)
             If Not IsNothing(DT_RESULT) Then
-                Refresh_Grid_Data(False, DT_RESULT, entity.id)
+                CURRENT_LINK_ENTITY_ID = entity.id
+                txtcurrSichtData.Text = entity.title
+                Refresh_Grid_Data(False, DT_RESULT)
             End If
         End If
+        Load_DocGrid_Layout()
         Me.Cursor = Cursors.Default
     End Sub
+    Private Function ReturnDataforEntity(oEntityID As Integer) As DataTable
+        Dim ResultSQL, ResultViewName As String
+        LOGGER.Debug("GridType = Grid", False)
+        ResultViewName = $"VWPMO_ENTITY_TABLE{oEntityID}"
+
+        ResultSQL = $"SELECT T.* FROM {ResultViewName} T"
+        LOGGER.Debug("ResultSQL: " & ResultSQL, False)
+        Return clsDatabase.Return_Datatable(ResultSQL, True)
+    End Function
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         If clsWindream.Create_Session = False Then
@@ -183,7 +207,7 @@ Public Class frmDocRecordLink
         End If
 
         Dim selectedRows As Integer() = grvwGrid.GetSelectedRows()
-        Dim i As Integer = 0
+        Dim oLinkCount As Integer = 0
         For Each rowhandle As Integer In selectedRows
             Dim SELECTED_RECORDID = grvwGrid.GetRowCellValue(rowhandle, "Record-ID")
             If IsNothing(SELECTED_RECORDID) Then
@@ -211,6 +235,7 @@ Public Class frmDocRecordLink
                         End If
                         bsiInfo.Caption = msg
                         ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & SELECTED_RECORDID.ToString)
+                        oLinkCount += 1
                     End If
                     Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype)
                     Dim DT_OBJTYPE As DataTable = ClassDatabase.Return_Datatable(sql, True)
@@ -240,6 +265,8 @@ Public Class frmDocRecordLink
                         End If
                     End If
                 Next
+                bsiInfo.Caption = $"[{oLinkCount}] records successfully linked - {Now.ToShortTimeString}"
+
             Catch ex As Exception
                 ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Linking Record to file", ex.Message, ex.StackTrace)
             End Try
@@ -250,4 +277,34 @@ Public Class frmDocRecordLink
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         Save_DocGrid_Layout()
     End Sub
+
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        Reset_View_layout()
+    End Sub
+    Sub Reset_View_layout()
+        Me.Cursor = Cursors.WaitCursor
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+
+                File.Delete(XMLPath)
+                Refresh_Grid_Data(True, Nothing)
+            Else
+                MsgBox("Resetting the layout was not successful - File not existing!", MsgBoxStyle.Information)
+            End If
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset_View_layout: ", ex.Message)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub grvwGrid_StyleChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnPositionChanged, grvwGrid.ColumnWidthChanged
+        If ENTITY_LOAD_ACTIVE = False Then
+            Save_DocGrid_Layout()
+        End If
+    End Sub
+
+    Private Sub frmDocRecordLink_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        ENTITY_LOAD_ACTIVE = False
+    End Sub
 End Class

app/DD-Record-Organizer/frmFileRename.vb

@@ -20,7 +20,7 @@ Public Class frmFileRename
         If USER_LANGUAGE <> "de-DE" Then
             oMSG = "Do You really want to rename the file?"
         End If
-        result = MessageBox.Show(oMSG, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        result = MessageBox.Show(oMSG, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
             If oRenameType = "Displayname" Then
                 Try

app/DD-Record-Organizer/frmMain.vb

@@ -618,7 +618,7 @@ Public Class frmMain
                                         End If
                                         ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Unexpected errors occured during client-update update of version {0}!", ClassUpdate.VERSION_SERVER))
                                         Dim result As MsgBoxResult
-                                        result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                                        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                                         If result = MsgBoxResult.Yes Then
                                             Process.Start(LOGCONFIG.LogFile)
                                         End If
@@ -1061,7 +1061,7 @@ Public Class frmMain
                 If USER_LANGUAGE <> "de-DE" Then
                     msg = "Would You like to change the Connection-configuration to '" & oSQLDescription & "'?"
                 End If
-                oresult = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                oresult = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If oresult = MsgBoxResult.Yes Then
                     BarButtonItemSwitchCon.Caption = "Switch Connection to: " & oSQLDescription
                     Try

app/DD-Record-Organizer/frmMass_Change.vb

@@ -39,7 +39,7 @@ Public Class frmMass_Change
                 End If
 
                 Dim result As MsgBoxResult
-                result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If result = MsgBoxResult.Yes Then
                     Cursor = Cursors.WaitCursor
                     LOGGER.Info(String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text))
@@ -94,7 +94,7 @@ Public Class frmMass_Change
                     '    msg = "Attention: there are multiple values for this column. These values will be deleted." & vbNewLine & "Would You like to continue?"
                     'End If
                     'Dim result1 As MsgBoxResult
-                    'result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    'result1 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                     For Each Record As String In MASS_RECORD_IDs2CHANGE
                     Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", _CONTROLID, CInt(Record))
                     ClassDatabase.Execute_non_Query(del, False)

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

@@ -24,7 +24,7 @@ Partial Class frmNodeNavigation
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNodeNavigation))
-        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.bbtnitmRecEdit = New DevExpress.XtraBars.BarButtonItem()
         Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
@@ -38,7 +38,7 @@ Partial Class frmNodeNavigation
         Me.BarStaticItemLocked = New DevExpress.XtraBars.BarStaticItem()
         Me.bsitmtInfoDoc = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitmReloadView = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -77,6 +77,8 @@ Partial Class frmNodeNavigation
         Me.tsmiFileDelete = New System.Windows.Forms.ToolStripMenuItem()
         Me.TimerFileHandle = New System.Windows.Forms.Timer(Me.components)
         Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components)
+        Me.cmsTreeView = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.UnterknotenNeuOrdnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -94,12 +96,13 @@ Partial Class frmNodeNavigation
         CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.cmsResultFilesBasic.SuspendLayout()
         Me.cmsResultFileDetail.SuspendLayout()
+        Me.cmsTreeView.SuspendLayout()
         Me.SuspendLayout()
         '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.BarButtonItem2})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl1.MaxItemId = 16
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -201,12 +204,12 @@ Partial Class frmNodeNavigation
         Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem1.Name = "BarButtonItem1"
         '
-        'BarButtonItem2
+        'bbtnitmReloadView
         '
-        Me.BarButtonItem2.Caption = "Sicht neu laden"
+        Me.bbtnitmReloadView.Caption = "Sicht neu laden"
-        Me.BarButtonItem2.Id = 14
+        Me.bbtnitmReloadView.Id = 14
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmReloadView.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmReloadView.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.bbtnitmReloadView.Name = "bbtnitmReloadView"
         '
         'RibbonPage1
         '
@@ -236,7 +239,7 @@ Partial Class frmNodeNavigation
         '
         'RibbonPageGroup1
         '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmReloadView)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "Funktionen"
         '
@@ -282,6 +285,7 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.Appearance.FocusedRow.BackColor = System.Drawing.Color.Aqua
         Me.TreeListDevexpress.Appearance.FocusedRow.Options.UseBackColor = True
         Me.TreeListDevexpress.Caption = "Instandhaltung View"
+        Me.TreeListDevexpress.ContextMenuStrip = Me.cmsTreeView
         Me.TreeListDevexpress.Dock = System.Windows.Forms.DockStyle.Fill
         Me.TreeListDevexpress.Location = New System.Drawing.Point(0, 0)
         Me.TreeListDevexpress.Name = "TreeListDevexpress"
@@ -299,6 +303,7 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.OptionsFind.ShowCloseButton = False
         Me.TreeListDevexpress.OptionsFind.ShowFindButton = False
         Me.TreeListDevexpress.OptionsLayout.AddNewColumns = False
+        Me.TreeListDevexpress.OptionsMenu.ShowExpandCollapseItems = False
         Me.TreeListDevexpress.OptionsSelection.EnableAppearanceFocusedCell = False
         Me.TreeListDevexpress.OptionsView.ShowColumns = False
         Me.TreeListDevexpress.OptionsView.ShowFirstLines = False
@@ -316,6 +321,7 @@ Partial Class frmNodeNavigation
         '
         'SplitContainer1
         '
+        Me.SplitContainer1.AllowDrop = True
         Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SplitContainer1.Location = New System.Drawing.Point(0, 0)
         Me.SplitContainer1.Name = "SplitContainer1"
@@ -344,11 +350,10 @@ Partial Class frmNodeNavigation
         'GridControlDocSearch
         '
         Me.GridControlDocSearch.AllowDrop = True
-        Me.GridControlDocSearch.BackgroundImage = CType(resources.GetObject("GridControlDocSearch.BackgroundImage"), System.Drawing.Image)
+        Me.GridControlDocSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.GridControlDocSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
-        GridLevelNode1.RelationName = "Level1"
+        GridLevelNode2.RelationName = "Level1"
-        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
         Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
         Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
         Me.GridControlDocSearch.Name = "GridControlDocSearch"
@@ -489,13 +494,13 @@ Partial Class frmNodeNavigation
         'tsmiFileRenameFilename
         '
         Me.tsmiFileRenameFilename.Name = "tsmiFileRenameFilename"
-        Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(180, 22)
+        Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(142, 22)
         Me.tsmiFileRenameFilename.Text = "Dateiname"
         '
         'tsmiFileRenameDisplayname
         '
         Me.tsmiFileRenameDisplayname.Name = "tsmiFileRenameDisplayname"
-        Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(180, 22)
+        Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(142, 22)
         Me.tsmiFileRenameDisplayname.Text = "Displayname"
         '
         'tsmiFileVersion
@@ -532,6 +537,19 @@ Partial Class frmNodeNavigation
         '
         Me.TimerClearResultfiles.Interval = 3000
         '
+        'cmsTreeView
+        '
+        Me.cmsTreeView.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UnterknotenNeuOrdnenToolStripMenuItem})
+        Me.cmsTreeView.Name = "cmsTreeView"
+        Me.cmsTreeView.Size = New System.Drawing.Size(205, 26)
+        '
+        'UnterknotenNeuOrdnenToolStripMenuItem
+        '
+        Me.UnterknotenNeuOrdnenToolStripMenuItem.Image = CType(resources.GetObject("UnterknotenNeuOrdnenToolStripMenuItem.Image"), System.Drawing.Image)
+        Me.UnterknotenNeuOrdnenToolStripMenuItem.Name = "UnterknotenNeuOrdnenToolStripMenuItem"
+        Me.UnterknotenNeuOrdnenToolStripMenuItem.Size = New System.Drawing.Size(204, 22)
+        Me.UnterknotenNeuOrdnenToolStripMenuItem.Text = "Unterknoten neu ordnen"
+        '
         'frmNodeNavigation
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -562,6 +580,7 @@ Partial Class frmNodeNavigation
         CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
         Me.cmsResultFilesBasic.ResumeLayout(False)
         Me.cmsResultFileDetail.ResumeLayout(False)
+        Me.cmsTreeView.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -614,9 +633,11 @@ Partial Class frmNodeNavigation
     Friend WithEvents tsmiFileVersion As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bbtnitmReloadView As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents tsmiFileDelete As ToolStripMenuItem
     Friend WithEvents TimerFileHandle As Timer
     Friend WithEvents TimerClearResultfiles As Timer
+    Friend WithEvents cmsTreeView As ContextMenuStrip
+    Friend WithEvents UnterknotenNeuOrdnenToolStripMenuItem As ToolStripMenuItem
 End Class

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -16,6 +16,8 @@ Imports System.IO
 Imports DD_LIB_Standards
 Imports System.Runtime.InteropServices
 
+
+
 Public Class frmNodeNavigation
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
     Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
@@ -72,7 +74,6 @@ Public Class frmNodeNavigation
     Private SELECTED_NODE_RECORD_ID As Integer
     Private SELECTED_NODE_CAPTION As String
     Private ENTITY_RECORD_COUNT As Integer = 0
-    Private act_FormViewID As Integer
     Private FORMVIEW_ID As Integer
     Private FORM_LOADED As Boolean = False
     Private FORM_SHOWN As Boolean = False
@@ -94,8 +95,109 @@ Public Class frmNodeNavigation
     Private Const SEE_MASK_FLAG_NO_UI = &H400
     Public Const SW_SHOW As Short = 5
     Private CONTROL_DOCTYPE_MATCH As Integer = 0
-#End Region
+    Private FocusedNode As TreeListNode
+    Private MyTreeListViewState As TreeListViewState
 
+#End Region
+    Public Class TreeListViewState
+        Private expanded As ArrayList
+        Private selected As ArrayList
+        Private focused As Object
+        Private topNode As Object
+
+        Public Sub New()
+            Me.New(Nothing)
+        End Sub
+        Public Sub New(ByVal treeList As TreeList)
+            Me.treeList_Renamed = treeList
+            expanded = New ArrayList()
+            selected = New ArrayList()
+        End Sub
+
+        Public Sub Clear()
+            expanded.Clear()
+            selected.Clear()
+            focused = Nothing
+            topNode = Nothing
+        End Sub
+        Private Function GetExpanded() As ArrayList
+            Dim op As New OperationSaveExpanded()
+            TreeList.NodesIterator.DoOperation(op)
+            Return op.Nodes
+        End Function
+        Private Function GetSelected() As ArrayList
+            Dim al As New ArrayList()
+            For Each node As TreeListNode In TreeList.Selection
+                al.Add(node.GetValue(TreeList.KeyFieldName))
+            Next node
+            Return al
+        End Function
+
+        Public Sub LoadState()
+            TreeList.BeginUpdate()
+            Try
+                TreeList.CollapseAll()
+                Dim node As TreeListNode
+                For Each key As Object In expanded
+                    node = TreeList.FindNodeByKeyID(key)
+                    If node IsNot Nothing Then
+                        node.Expanded = True
+                    End If
+                Next key
+                TreeList.FocusedNode = TreeList.FindNodeByKeyID(focused)
+                For Each key As Object In selected
+                    node = TreeList.FindNodeByKeyID(key)
+                    If node IsNot Nothing Then
+                        TreeList.Selection.Add(node)
+                    End If
+                Next key
+
+            Finally
+                TreeList.EndUpdate()
+                Dim topVisibleNode As TreeListNode = TreeList.FindNodeByKeyID(topNode)
+                If topVisibleNode Is Nothing Then
+                    topVisibleNode = TreeList.FocusedNode
+                End If
+                TreeList.TopVisibleNodeIndex = TreeList.GetVisibleIndexByNode(topVisibleNode)
+            End Try
+        End Sub
+        Public Sub SaveState()
+            If TreeList.FocusedNode IsNot Nothing Then
+                expanded = GetExpanded()
+                selected = GetSelected()
+                focused = TreeList.FocusedNode(TreeList.KeyFieldName)
+                topNode = TreeList.GetNodeByVisibleIndex(TreeList.TopVisibleNodeIndex)(TreeList.KeyFieldName)
+            Else
+                Clear()
+            End If
+        End Sub
+
+        Private treeList_Renamed As TreeList
+        Public Property TreeList() As TreeList
+            Get
+                Return treeList_Renamed
+            End Get
+            Set(ByVal value As TreeList)
+                treeList_Renamed = value
+                Clear()
+            End Set
+        End Property
+
+        Private Class OperationSaveExpanded
+            Inherits TreeListOperation
+            Private al As New ArrayList()
+            Public Overrides Sub Execute(ByVal node As TreeListNode)
+                If node.HasChildren AndAlso node.Expanded Then
+                    al.Add(node.GetValue(node.TreeList.KeyFieldName))
+                End If
+            End Sub
+            Public ReadOnly Property Nodes() As ArrayList
+                Get
+                    Return al
+                End Get
+            End Property
+        End Class
+    End Class
     Public Sub New(pEntityID As Int16, pConstructID As Int16)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -162,14 +264,13 @@ Public Class frmNodeNavigation
         DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(Sql, True)
         CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID), False)
         ' Hintergrund Bild initialisieren
-        If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-landscape_col_RGB.png")) Then
+        'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then
-            WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-landscape_col_RGB.png")
+        '    WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")
-            ' MessageBox.Show("File: " & Application.StartupPath + "\Resources\Pic1.png" & " doesn't exist. Check file and try again.")
+        '    BACKGROUND_HELPER = New ClassBackgroundHelper(GridViewDoc_Search, WM_LOGO) '
-            End
+        '    ' MessageBox.Show("File: " & Application.StartupPath + "\Resources\Pic1.png" & " doesn't exist. Check file and try again.")
-        End If
+        '    End
-
+        'End If
-        BACKGROUND_HELPER = New ClassBackgroundHelper(GridViewDoc_Search, WM_LOGO) '
+        ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "NODE_NAVIGATION")
-        ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
         Try
             DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID)
             Dim SEL1 = String.Format("SELECT * FROM TBPMO_FORM WHERE GUID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {0} AND  CONSTRUCT_ID = {1})", CURRENT_SCREEN_ID, CONSTRUCTORID)
@@ -190,6 +291,7 @@ Public Class frmNodeNavigation
             '            "GROUP BY T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP"
             'DT_WORKFLOWS_MANUAL = ClassDatabase.Return_Datatable(sql_ResultList)
             Load_Datafor_Entity()
+
             FORM_LOADED = True
         Catch ex As System.Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 4")
@@ -325,6 +427,7 @@ Public Class frmNodeNavigation
                 ' ClassNodeNavigation.Check_NODE_CONFIG_ID(oEntityID, SelectedNode)
 
                 CURRENT_RECORD_ID = pRecord
+                ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
                 CURRENT_ENTITY_ID = oEntityID
                 CURRENT_NODE_GUID = oID
                 SELECTED_NODE_CAPTION = oNode_Caption
@@ -935,7 +1038,7 @@ Public Class frmNodeNavigation
         Try
             CURRENT_RECORD_ID = pRecord
             CURRENT_SEARCH_TYPE = "RECORD"
-
+            ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
 
             'Wird jetzt bei BeforeRowChange überprüft
 
@@ -1009,7 +1112,7 @@ Public Class frmNodeNavigation
             e.Cancel = True
         End If
 
-        ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
+        ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "NODE_NAVIGATION")
 
         CURRENT_OPEN_CONSTRUCTOR_FORMS.Remove(CONSTRUCTORID)
 
@@ -1026,7 +1129,6 @@ Public Class frmNodeNavigation
 
     Private Sub pnlControls_Enter(sender As Object, e As EventArgs) Handles pnlControls.Enter
         In_Visible_Record_Group(True)
-        In_Visible_File_Group(False)
     End Sub
 
     Private Sub pnlControls_Leave(sender As Object, e As EventArgs) Handles pnlControls.Leave
@@ -1037,16 +1139,12 @@ Public Class frmNodeNavigation
         In_Visible_Record_Group(False)
     End Sub
     Private Sub pnlControls_MouseDown(sender As Object, e As MouseEventArgs) Handles pnlControls.MouseDown
-        In_Visible_File_Group(False)
+
     End Sub
     Sub In_Visible_Record_Group(oBool As Boolean)
         RibbonPageGroupRecord.Visible = oBool
         RibbonPageGroupRecord.Enabled = oBool
     End Sub
-    Sub In_Visible_File_Group(oBool As Boolean)
-        RibbonPageGroupRecord.Visible = oBool
-        RibbonPageGroupRecord.Enabled = oBool
-    End Sub
     Private Sub bbtnitmEditRec_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmRecEdit.ItemClick
         If RECORD_ENABLED = False Then
             EnableEditMode()
@@ -1113,6 +1211,7 @@ Public Class frmNodeNavigation
         End If
 
         CURRENT_RECORD_ID = SELECTED_NODE_RECORD_ID
+        ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
         CtrlCommandUI.IsEdit = True
         ' Abhängige Listen laden
         CtrlBuilder.WatchRecordChanges = False
@@ -1536,7 +1635,7 @@ Public Class frmNodeNavigation
             Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {oEntityID}"
             CURRENT_DOCSEARCH_SQL = ClassDatabase.Execute_Scalar(oSQL, True)
             If CURRENT_DOCSEARCH_SQL <> String.Empty Then
-                Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
+                Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und in einem separaten Fenster angezeigt sobald sie fertig ist."
                 If USER_LANGUAGE <> "de-De" Then
                     oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
                 End If
@@ -1722,13 +1821,11 @@ Public Class frmNodeNavigation
 
     End Sub
 #Region "GridViewEvents"
-    Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged
+    Private Sub GridViewDoc_Search_LayoutSave(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged, GridViewDoc_Search.ColumnWidthChanged, GridViewDoc_Search.ColumnPositionChanged
         Save_DocGrid_Layout()
     End Sub
 
-    Private Sub GridViewDoc_Search_ColumnWidthChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.ColumnEventArgs) Handles GridViewDoc_Search.ColumnWidthChanged
+
-        Save_DocGrid_Layout()
-    End Sub
 
     Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
 
@@ -1758,12 +1855,14 @@ Public Class frmNodeNavigation
     End Sub
     Sub Save_DocGrid_Layout()
         Try
-
+            If FORM_LOADED And Node_AfterSelect = False Then
-            Dim XMLPath = Get_DocGrid_Layout_Filename()
+                Dim XMLPath = Get_DocGrid_Layout_Filename()
-            GridViewDoc_Search.SaveLayoutToXml(XMLPath)
+                GridViewDoc_Search.SaveLayoutToXml(XMLPath)
 
 
-            Update_Status_Label(True, "Grid Layout Saved")
+                Update_Status_Label(True, "Grid Layout Saved")
+            End If
+
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
         End Try
@@ -1827,8 +1926,10 @@ Public Class frmNodeNavigation
     End Sub
 #Region "Dropping Files"
     Sub Drag_Enter(e As DragEventArgs)
-        If act_FormViewID <> 0 Then
+        If oEntityID <> 0 Then
             ClassDragDrop.Drag_enter(e)
+        Else
+            Update_Status_Label(True, "No entity selected", EditState.Insert)
         End If
     End Sub
     Sub Drag_Drop(e As DragEventArgs)
@@ -1844,7 +1945,7 @@ Public Class frmNodeNavigation
                 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
+            If oEntityID <> 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
@@ -2024,6 +2125,13 @@ Public Class frmNodeNavigation
     Private Sub pnlControls_DragEnter(sender As Object, e As DragEventArgs) Handles pnlControls.DragEnter
         Drag_Enter(e)
     End Sub
+    Private Sub SplitContainer1_DragEnter(sender As Object, e As DragEventArgs) Handles SplitContainer1.DragEnter
+        Drag_Enter(e)
+    End Sub
+
+    Private Sub SplitContainer1_DragDrop(sender As Object, e As DragEventArgs) Handles SplitContainer1.DragDrop
+        Drag_Drop(e)
+    End Sub
 #End Region
 
     Function Save_Record()
@@ -2489,7 +2597,7 @@ Public Class frmNodeNavigation
                 msg = "Would You like to delete only the references?" & vbNewLine & "File(s) will stay in ECM/Archive/Explorer!"
             End If
             Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 Try
                     For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
@@ -2569,4 +2677,62 @@ Public Class frmNodeNavigation
         CURRENT_SEARCH_TYPE = "ENTITY"
         RUN_ENTITY_DOC_SEARCH()
     End Sub
+
+    Private Sub bbtnitmReloadView_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmReloadView.ItemClick
+        ReloadTreeView()
+    End Sub
+    Sub ReloadTreeView()
+        TreeListDevexpress.Nodes.Clear()
+        Load_nodes()
+    End Sub
+
+    Private Sub UnterknotenNeuOrdnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UnterknotenNeuOrdnenToolStripMenuItem.Click
+        MyTreeListViewState = New TreeListViewState(TreeListDevexpress)
+        Dim oQuestion = "Wollen Sie die gesamte Struktur unterhalb dieses Knotens neu ordnen lassen?" & vbNewLine & "Nein, wenn nur die direkten Unterknoten neu geordnet werden sollen!"
+        If USER_LANGUAGE <> "de-DE" Then
+            oQuestion = "Do you want to reorder the entire structure below this node?" & vbNewLine & "No, if only the direct subnodes are to be reordered!"
+        End If
+        Dim result As MsgBoxResult
+        result = MessageBox.Show(oQuestion, CAPTION_CONFIRMATION, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question)
+        Dim oSubnodes As String = "0"
+        If result = MsgBoxResult.Yes Then
+            oSubnodes = "1"
+        ElseIf result = MsgBoxResult.Cancel Then
+            Exit Sub
+        End If
+        Cursor = Cursors.WaitCursor
+        Dim oSQL = $"EXEC PRCUST_REORDER_CHILD_NODES "
+        Dim oNodeGUID As Integer = 0
+        Dim oID = FocusedNode.Id
+        Dim PID = FocusedNode.ParentNode
+        Dim Column_pRecord As TreeListColumn = TreeListDevexpress.Columns("RECORD_ID")
+        Dim Column_Caption As TreeListColumn = TreeListDevexpress.Columns("NODE_CAPTION")
+
+        If oID > 0 Then
+            MyTreeListViewState.SaveState()
+            oNodeGUID = oID
+            oSQL += $" {oNodeGUID},{oSubnodes} "
+            ClassDatabase.Execute_non_Query(oSQL)
+            ReloadTreeView()
+            MyTreeListViewState.LoadState()
+            TreeListDevexpress.FocusedNode = FocusedNode
+
+        End If
+
+        Cursor = Cursors.Default
+
+    End Sub
+
+    Private Sub TreeListDevexpress_MouseUp(sender As Object, e As MouseEventArgs) Handles TreeListDevexpress.MouseUp
+        Dim tree As TreeList = TryCast(sender, TreeList)
+        If e.Button = MouseButtons.Right AndAlso ModifierKeys = Keys.None AndAlso tree.State = TreeListState.Regular Then
+
+            Dim info As TreeListHitInfo = tree.CalcHitInfo(e.Location)
+
+            FocusedNode = tree.FocusedNode
+            Dim SavedTopIndex As Integer = tree.TopVisibleNodeIndex
+            tree.FocusedNode = info.Node
+            cmsTreeView.Show(TreeListDevexpress, e.Location)
+        End If
+    End Sub
 End Class

app/DD-Record-Organizer/frmUserKonfig.vb

@@ -591,7 +591,7 @@ Public Class frmUserKonfig
             msg = "Are You sure You want to delete the selected user?"
         End If
         Dim result As MsgBoxResult
-        result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
             Dim del = "EXEC [dbo].[PRPMO_DELETE_USER] " & USER_GUIDTextBox.Text
             If ClassDatabase.Execute_non_Query(del) = True Then

app/DD-Record-Organizer/frmWM_DoctypeConfig.vb

@@ -393,7 +393,7 @@ Public Class frmWM_DoctypeConfig
             msg = "Are You sure You want to delete the selected Doctype?"
         End If
         Dim result As MsgBoxResult
-        result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
             Dim del = "EXEC [dbo].[PRPMO_DELETE_DOCTYPE] " & GUIDTextBox.Text
             If ClassDatabase.Execute_non_Query(del, True) = True Then

app/VERSION_CHECKER/ClassInit.vb

@@ -74,6 +74,9 @@ Public Class ClassInit
             Else
                 USER_GUID = USER_DT.Rows(0).Item("GUID")
                 USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
+                If USER_LANGUAGE <> "de-DE" Then
+                    CAPTION_CONFIRMATION = "Confirmation"
+                End If
                 sql = String.Format("SELECT UPDATE_PATH FROM TBDD_VERSION_USER_UPDATE_PATH WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
                 Dim USER_UPDATE_PATH = clsDatabase.Execute_Scalar(sql)
                 If Not IsNothing(USER_UPDATE_PATH) Then

app/VERSION_CHECKER/ModuleMySettings.vb

@@ -25,6 +25,7 @@ Module ModuleMySettings
     Public DT_UPDATE_ITEMS As DataTable
     Public ERROR_WHILE_UPDATING As Boolean = False
 
+
     Public Function LoadFileExclusion()
         Dim rowresult As String = ""
         Try