MS

app/DD-Record-Organiser/ClassControlLoader.vb

@@ -21,9 +21,6 @@
                 Dim CONNID = ClassDatabase.Execute_Scalar(String.Format("SELECT CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE GUID = {0}", ControlId))
                 Dim SQL As String = ClassDatabase.Execute_Scalar(String.Format("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = {0}", ControlId))
                 SQL = ClassControlValues.ReplaceSqlCommandPlaceholders(SQL, RecordId, ParentRecordId, entity_ID)
-                If ControlId = 272 Then
-                    Console.WriteLine("272")
-                End If
 
                 If SQL = "" Or IsDBNull(SQL) Then
                     Return Nothing
@@ -454,7 +451,7 @@
                     End If
                 End While
             Next
-            If CtrlCommandUI.IsEdit Then
+            If CtrlCommandUI.IsEdit Or CtrlCommandUI.IsInsert Then
                 CURRENT_RECORD_ENABLED = True
             End If
 

app/DD-Record-Organiser/ClassControlValues.vb

@@ -132,9 +132,6 @@ Public Class ClassControlValues
             If IsNothing(metadata.Required) OrElse metadata.Required = False Then
                 Continue For
             End If
-            If Control.Name = "Jährllicher Betrag" Then
-                Console.WriteLine("Obacht")
-            End If
             If Not ControlHasValue(Control) And Control.Enabled = True Then
                 missingValues.Add(Control.Name)
             End If

app/DD-Record-Organiser/ClassDOC_SEARCH.vb

@@ -66,7 +66,12 @@ Public Class ClassDOC_SEARCH
                  ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX2')) AS DOCIDX2 " & _
                  ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX3')) AS DOCIDX3 " & _
                  ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX4')) AS DOCIDX4 " & _
-             "FROM VWPMO_WD_DOC_SEARCH WHERE ENTITY_ID = {1} AND DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6})", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM)
+                 ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN1')) AS DROPDOWN1 " & _
+                 ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN2')) AS DROPDOWN2 " & _
+                 ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN3')) AS DROPDOWN3 " & _
+                 ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN4')) AS DROPDOWN4 " & _
+             "FROM VWPMO_WD_DOC_SEARCH WHERE ENTITY_ID = {1} AND DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM)
+
                 If CURRENT_ENTITYSQL.ToUpper.Contains("WHERE") Then
                     Dim where = CURRENT_ENTITYSQL.ToUpper.Replace("SELECT T.*", "SELECT '#' + CONVERT(VARCHAR(10),T.[Record-ID]) + '#'")
                     SQL_DOC_SEARCH = SQL_DOC_SEARCH & String.Format(" AND RECORD_ID IN ({0})", where)
@@ -93,7 +98,11 @@ Public Class ClassDOC_SEARCH
                 ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX2')) AS DOCIDX2 " & _
                 ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX3')) AS DOCIDX3 " & _
                 ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX4')) AS DOCIDX4 " & _
-            "FROM VWPMO_WD_DOC_SEARCH WHERE RECORD_ID = {0} AND ENTITY_ID = {1} AND DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6})", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM)
+                ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN1')) AS DROPDOWN1 " & _
+                ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN2')) AS DROPDOWN2 " & _
+                ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN3')) AS DROPDOWN3 " & _
+                ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN4')) AS DROPDOWN4 " & _
+            "FROM VWPMO_WD_DOC_SEARCH WHERE RECORD_ID = {0} AND ENTITY_ID = {1} AND DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM)
             End If
 
             Return ClassDatabase.Return_Datatable_Connection(SQL_DOC_SEARCH, 1)
@@ -223,9 +232,8 @@ Public Class ClassDOC_SEARCH
                 For Each Colname As String In ColArrayDEFINITION
                     Dim rowvalue
                     Try
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> now rowvalue for Colname '" & Colname & "'", False)
                         rowvalue = FILE_ROW.Item(Colname)
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue : '" & rowvalue.ToString & "'", False)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False)
                     Catch ex As Exception
                         ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
                         If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then
@@ -276,10 +284,14 @@ Public Class ClassDOC_SEARCH
     End Function
     Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH, ByVal ENTITY_ID)
         Try
+            If CURRENT_RECORD_ID = 0 Then
+                MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
+                Return False
+            End If
             DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName)
             If DD_Rights.clsDatabase.Init(MyConnectionString) = True Then
                 If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then
-                    If DD_Rights.ClassRights.Collect_Users(RECORD_ID, ENTITY_ID) = True Then
+                    If DD_Rights.ClassRights.Collect_Users(CURRENT_RECORD_ID, ENTITY_ID) = True Then
                         If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then
                             If DD_Rights.ClassRights.MSG_RESULT <> "" Then
                                 Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT

app/DD-Record-Organiser/ClassFileResult.vb

@@ -59,18 +59,11 @@
     End Function
     Public Shared Function Delete_ResultFile(RESULT_DOC_ID)
         Try
-            Dim del = "DELETE FROM TBPMO_DOC_INDICES WHERE DocID = " & RESULT_DOC_ID
-            If ClassDatabase.Execute_non_Query(del) = True Then
-                del = "DELETE FROM TBPMO_DOC_RECORD_LINK WHERE DocID = " & RESULT_DOC_ID
-                If ClassDatabase.Execute_non_Query(del) = True Then
-                    del = "DELETE FROM TBPMO_DOCRESULT_LIST WHERE DocID = " & RESULT_DOC_ID
-                    If ClassDatabase.Execute_non_Query(del) = True Then
-                        Return True
-                    Else
-                        MsgBox("Could not delete file from Search-table - Check logfile", MsgBoxStyle.Exclamation)
-                        Return False
-                    End If
-                End If
+            Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0}", RESULT_DOC_ID)
+            If ClassDatabase.Execute_non_Query_withConn(proc, 1) = True Then
+                Return True
+            Else
+                Return False
             End If
         Catch ex As Exception
             ClassLogger.Add("Unexpected Error in Delete ResultFile: " & ex.Message, True)

app/DD-Record-Organiser/ClassInit.vb

@@ -112,18 +112,21 @@ Public Class ClassInit
                 USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
                 USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
                 'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
-                Dim DT_CLIENT_USER As DataTable = ClassDatabase.Return_Datatable("SELECT CLIENT_ID FROM TBDD_CLIENT_USER WHERE USER_ID = " & USER_GUID)
-                'Dim i As Integer = 0
-                'For Each row As DataRow In DT_CLIENT_USER.Rows
-                '    If i = 0 Then
-                '        USER_CLIENTS_COMMA_SEPERATED = row.Item(0).ToString
-                '    Else
-                '        USER_CLIENTS_COMMA_SEPERATED = USER_CLIENTS_COMMA_SEPERATED & "," & row.Item(0).ToString
-                '    End If
-                '    i += 1
-
-                'Next
+                DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID)
+                If DT_CLIENT_USER.Rows.Count > 1 Then
+                    frmClientLogin.ShowDialog()
+                ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
+                    CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
+                End If
+                If CLIENT_SELECTED = 99 Then
+                    Dim msg = String.Format("Die Mandantenanmeldung war nicht möglich." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
 
+                    If USER_LANGUAGE <> "de-DE" Then
+                        msg = String.Format("The client-login was not possible." & vbNewLine & "Please contact the admin.")
+                    End If
+                    MsgBox(msg, MsgBoxStyle.Exclamation)
+                    Return False
+                End If
                 Dim Right_RO As Boolean = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
                 If Right_RO = False Then
                     ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False)
@@ -138,29 +141,25 @@ Public Class ClassInit
                     'Me.Close()
                 Else
                     'Am System anmelden
-                    ClassLicence.Refresh_Licence()
+                    ClassLicence.Refresh_Licence(CLIENT_SELECTED)
                     'Am System anmelden
-                    sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))"
-                    sql = sql.Replace("@LogInOut", 1)
-                    sql = sql.Replace("@ANGEMELDETWO", Environment.MachineName)
-                    sql = sql.Replace("@user", Environment.UserName)
+                    sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_GUID)
                     ClassDatabase.Execute_non_Query(sql)
                     sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
                     If ClassDatabase.Execute_non_Query(sql, True) = True Then
 
                     End If
 
-                    sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & USER_GUID & ",'RECORD_ORGANIZER')"
+                    sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE) VALUES ({0},{1},'RECORD_ORGANIZER')", USER_GUID, CLIENT_SELECTED)
                     ClassDatabase.Execute_non_Query(sql)
-                    sql = "SELECT RECORD_ADMIN FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))"
-                    sql = sql.Replace("@user", Environment.UserName)
-                    USER_IS_ADMIN = ClassDatabase.Execute_Scalar(sql)
+
+                    USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN")
                     'If USER_IS_ADMIN = True Then
                     '    'Admin
                     '    pageAdmin.Visible = True
                     'End If
 
-                    sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('RECORD_ORGANIZER')"
+                    sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('RECORD_ORGANIZER') AND CLIENT_ID = {0}", CLIENT_SELECTED)
                     Dim anzahl = ClassDatabase.Execute_Scalar(sql)
                     USERS_LOGGED_IN = CInt(anzahl)
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> User# logged in: " & anzahl.ToString, False)

app/DD-Record-Organiser/ClassLicence.vb

@@ -1,13 +1,19 @@
 Imports DLLLicenseManager
 Public Class ClassLicence
-    Public Shared License_Date As Date
+
     Private Shared _lizenzManager As ClassLicenseManager
-    Public Shared Sub Refresh_Licence()
+    Public Shared Sub Refresh_Licence(CLIENT_ID As Integer)
         Try
             _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
-            Dim sql As String = "SELECT LICENSE FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')"
+            Dim sql As String = String.Format("SELECT LICENSE_PMO FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID)
 
             Dim lic As String = ClassDatabase.Execute_Scalar(sql, True)
+            If lic = "" Then
+                LICENSE_COUNT = 0
+                LICENSE_DATE = "1900-01-01"
+                LICENSE_DOSSIER_COUNT = 0
+                Exit Sub
+            End If
             Dim licString = _lizenzManager.DecodeLicenseKey(lic)
             Dim split() = licString.ToString.Split("#")
 
@@ -16,7 +22,7 @@ Public Class ClassLicence
             Else
                 LICENSE_COUNT = 0
             End If
-            License_Date = CDate(split(1))
+            LICENSE_DATE = CDate(split(1))
             If CDate(split(1)) < CDate(Now.ToShortDateString) Then
                 MsgBox("Your license evaluated!" & vbNewLine & "Last valid date: " & split(1) & vbNewLine & "Please contact Digital Data.", MsgBoxStyle.Exclamation)
                 LICENSE_EXPIRED = True

app/DD-Record-Organiser/ClassWindream.vb

@@ -1476,12 +1476,13 @@ Public Class ClassWindream
     End Function
     Public Shared Function REMOVE_VEKTOR_LINK(ByVal FILEPATH As String, vktIndexName As String, deleteValue As String)
         Try
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> Removing Value '" & deleteValue & "' of Index '" & vktIndexName & "' " & FILEPATH, False)
             Dim WMObject As WINDREAMLib.WMObject
             Dim containsvalue As Boolean = False
             Try
                 ' ein windream-Objekt der Datei erzeugen
                 WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, FILEPATH.Substring(2))
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> wibdreamObject created", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> windreamObject created", False)
             Catch ex As Exception
                 ClassLogger.Add("Unexpected Error in Initializing windream file: " & ex.Message, False)
                 Return False
@@ -1502,6 +1503,7 @@ Public Class ClassWindream
                         If WDValue Is Nothing = False Then
                             If WDValue = deleteValue Then
                                 containsvalue = True
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> The Index contains the value to be deleted!", False)
                             End If
                             If WDValue <> deleteValue Then
                                 'Erst die ALten Werte schreiben
@@ -1512,8 +1514,15 @@ Public Class ClassWindream
                             End If
                         End If
                     Next
+                Else
+                    ClassLogger.Add(" >> Index is not a vector", False)
+                    Return False
                 End If
+            Else
+                ClassLogger.Add(" >> wertWD is nothing", False)
+                Return True
             End If
+
             If containsvalue = True Then 'And Not IsNothing(ValueArray)
                 Try
                     ' die Datei sperren
@@ -1538,10 +1547,10 @@ Public Class ClassWindream
                     ' nichts tun (Datei war nicht gesperrt)
                 End Try
 
-                ' die Indexierungsinformationen für den TreeView-Log zurückgeben
+                'urückgeben
                 Return True
             Else
-                MsgBox("Could not remove the linked value!", MsgBoxStyle.Information)
+                ClassLogger.Add(" >> containsvalue is not true!", False)
                 Return False
             End If
 

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

@@ -271,6 +271,12 @@
     <Compile Include="frmChooseParentRecord.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmClientLogin.Designer.vb">
+      <DependentUpon>frmClientLogin.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmClientLogin.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmFileInWork.Designer.vb">
       <DependentUpon>frmFileInWork.vb</DependentUpon>
     </Compile>
@@ -382,10 +388,10 @@
     <Compile Include="frmCockpit.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmConfiguration_Basic.Designer.vb">
-      <DependentUpon>frmConfiguration_Basic.vb</DependentUpon>
+    <Compile Include="frmRecOrgConfig_Basic.Designer.vb">
+      <DependentUpon>frmRecOrgConfig_Basic.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmConfiguration_Basic.vb">
+    <Compile Include="frmRecOrgConfig_Basic.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmConnections.Designer.vb">
@@ -642,6 +648,12 @@
     <EmbeddedResource Include="frmChooseParentRecord.resx">
       <DependentUpon>frmChooseParentRecord.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmClientLogin.en.resx">
+      <DependentUpon>frmClientLogin.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmClientLogin.resx">
+      <DependentUpon>frmClientLogin.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmConstructorDesigner.en-IE.resx">
       <DependentUpon>frmConstructorDesigner.vb</DependentUpon>
     </EmbeddedResource>
@@ -654,6 +666,9 @@
     <EmbeddedResource Include="frmFileInWork.resx">
       <DependentUpon>frmFileInWork.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmLicense.en-US.resx">
+      <DependentUpon>frmLicense.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmMass_Change.en-US.resx">
       <DependentUpon>frmMass_Change.vb</DependentUpon>
     </EmbeddedResource>
@@ -711,11 +726,11 @@
     <EmbeddedResource Include="frmCockpit.resx">
       <DependentUpon>frmCockpit.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmConfiguration_Basic.en-US.resx">
-      <DependentUpon>frmConfiguration_Basic.vb</DependentUpon>
+    <EmbeddedResource Include="frmRecOrgConfig_Basic.en-US.resx">
+      <DependentUpon>frmRecOrgConfig_Basic.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmConfiguration_Basic.resx">
-      <DependentUpon>frmConfiguration_Basic.vb</DependentUpon>
+    <EmbeddedResource Include="frmRecOrgConfig_Basic.resx">
+      <DependentUpon>frmRecOrgConfig_Basic.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmConfig_Basic.de.resx">
       <DependentUpon>frmConfig_Basic.vb</DependentUpon>
@@ -1234,6 +1249,8 @@
     <None Include="Resources\brick.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\RemoveLink_9938.png" />
+    <None Include="Resources\Login_6031_32x.png" />
     <None Include="Resources\RightFileOnly.png" />
     <None Include="Resources\TableView_nameonly_263.png" />
     <None Include="Resources\InsertColumn_5626.png" />

app/DD-Record-Organiser/ModuleMySettings.vb

@@ -34,9 +34,13 @@ Module ModuleMySettings
     Public USER_DATE_FORMAT As String
     Public USER_GENERAL_VIEWER As String
     Public USER_WAN As Boolean = False
+
+    Public DT_CLIENT_USER As DataTable
+    Public CLIENT_SELECTED As Integer = 99
     'Public USER_CLIENTS_COMMA_SEPERATED As String
     Public FWSCAN_started As Boolean = False
 
+
     Dim rowresult As String = ""
     Public Function LoadFileExclusion()
         Dim rowresult As String = ""

app/DD-Record-Organiser/ModuleRuntimeVariables.vb

@@ -57,6 +57,7 @@
     Public LICENSE_COUNT As Integer = 0
     Public LICENSE_DOSSIER_COUNT As Integer = 0
     Public LICENSE_SAP_Connect As Boolean = False
+    Public LICENSE_DATE As Date
 
     Public CONNECTION_CHANGED As Boolean = False
 

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

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

app/DD-Record-Organiser/My Project/Resources.Designer.vb

@@ -1290,6 +1290,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Login_6031_32x() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Login_6031_32x", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1550,6 +1560,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property RemoveLink_9938() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("RemoveLink_9938", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

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

@@ -175,6 +175,9 @@
   <data name="Arrow_RedoRetry_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Login_6031_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -223,14 +226,17 @@
   <data name="module_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\module_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="arrow_Next_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_Next_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Men2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_Down_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_Down_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_Next_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_Next_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="eye" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\eye.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="table_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -367,6 +373,9 @@
   <data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="RightFileOnly" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RightFileOnly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Close_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -487,9 +496,6 @@
   <data name="user_suit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="eye" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\eye.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="windream_Logo_transparent_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -652,7 +658,7 @@
   <data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RightFileOnly" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\RightFileOnly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="RemoveLink_9938" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RemoveLink_9938.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

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

@@ -69,13 +69,14 @@ Partial Class frmConstructor_Main
         Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
         Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripTextBox2 = New System.Windows.Forms.ToolStripTextBox()
+        Me.tsTextBoxRenameFile = New System.Windows.Forms.ToolStripTextBox()
         Me.TSMIDisplayname = New System.Windows.Forms.ToolStripMenuItem()
         Me.tstbDisplayname = New System.Windows.Forms.ToolStripTextBox()
         Me.TSMI_inWork = New System.Windows.Forms.ToolStripMenuItem()
         Me.TSMI_linkRecord = New System.Windows.Forms.ToolStripMenuItem()
         Me.tsmiRights = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
         Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -476,7 +477,7 @@ Partial Class frmConstructor_Main
         '
         'ContextMenuStripResultFiles
         '
-        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator10, Me.UmbenennenToolStripMenuItem, Me.TSMIDisplayname, Me.TSMI_inWork, Me.TSMI_linkRecord, Me.tsmiRights, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem, Me.AnsichtZurücksetzenToolStripMenuItem})
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator10, Me.UmbenennenToolStripMenuItem, Me.TSMIDisplayname, Me.TSMI_inWork, Me.TSMI_linkRecord, Me.tsmiRights, Me.ToolStripSeparator8, Me.ToolStripMenuItem1, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem, Me.AnsichtZurücksetzenToolStripMenuItem})
         Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
         resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles")
         '
@@ -503,16 +504,16 @@ Partial Class frmConstructor_Main
         '
         'UmbenennenToolStripMenuItem
         '
-        Me.UmbenennenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripTextBox2})
+        Me.UmbenennenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsTextBoxRenameFile})
         Me.UmbenennenToolStripMenuItem.Name = "UmbenennenToolStripMenuItem"
         resources.ApplyResources(Me.UmbenennenToolStripMenuItem, "UmbenennenToolStripMenuItem")
         '
-        'ToolStripTextBox2
+        'tsTextBoxRenameFile
         '
-        Me.ToolStripTextBox2.BackColor = System.Drawing.Color.Khaki
-        Me.ToolStripTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.ToolStripTextBox2.Name = "ToolStripTextBox2"
-        resources.ApplyResources(Me.ToolStripTextBox2, "ToolStripTextBox2")
+        Me.tsTextBoxRenameFile.BackColor = System.Drawing.Color.Khaki
+        Me.tsTextBoxRenameFile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tsTextBoxRenameFile.Name = "tsTextBoxRenameFile"
+        resources.ApplyResources(Me.tsTextBoxRenameFile, "tsTextBoxRenameFile")
         '
         'TSMIDisplayname
         '
@@ -550,9 +551,15 @@ Partial Class frmConstructor_Main
         Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
         resources.ApplyResources(Me.ToolStripSeparator8, "ToolStripSeparator8")
         '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        resources.ApplyResources(Me.ToolStripMenuItem1, "ToolStripMenuItem1")
+        '
         'DeleteToolStripMenuItem
         '
-        Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.RemoveLink_9938
         Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
         resources.ApplyResources(Me.DeleteToolStripMenuItem, "DeleteToolStripMenuItem")
         '
@@ -1134,57 +1141,57 @@ Partial Class frmConstructor_Main
         Me.Controls.Add(Me.StatusStrip_Main)
         Me.Controls.Add(Me.NavPane)
         Me.Name = "frmConstructor_Main"
-        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerMain.ResumeLayout(False)
-        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerTop.ResumeLayout(False)
-        Me.CMSEntity.ResumeLayout(False)
-        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ContextMenuGrid.ResumeLayout(False)
-        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.TCDetails.ResumeLayout(False)
-        Me.TabDetails.ResumeLayout(False)
-        Me.TabWindream.ResumeLayout(False)
-        Me.TabWindream.PerformLayout()
-        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ContextMenuStripResultFiles.ResumeLayout(False)
-        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ToolStripDokumente.ResumeLayout(False)
-        Me.ToolStripDokumente.PerformLayout()
-        Me.TabFollowUp.ResumeLayout(False)
-        Me.TabFollowUp.PerformLayout()
-        Me.grpbxFU_Profile.ResumeLayout(False)
-        Me.grpbxFU_Profile.PerformLayout()
-        Me.GroupBox4.ResumeLayout(False)
-        Me.GroupBox4.PerformLayout()
-        Me.TabPos.ResumeLayout(False)
-        Me.TabPos.PerformLayout()
-        Me.Panel1.ResumeLayout(False)
-        CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.BindingNavigatorPOS.ResumeLayout(False)
-        Me.BindingNavigatorPOS.PerformLayout()
-        Me.ToolStripEdit.ResumeLayout(False)
-        Me.ToolStripEdit.PerformLayout()
-        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainer1.ResumeLayout(False)
-        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.StatusStrip_Main.ResumeLayout(False)
-        Me.StatusStrip_Main.PerformLayout()
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+        CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).EndInit
+        Me.SplitContainerMain.ResumeLayout(false)
+        CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).EndInit
+        Me.SplitContainerTop.ResumeLayout(false)
+        Me.CMSEntity.ResumeLayout(false)
+        CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).EndInit
+        Me.ContextMenuGrid.ResumeLayout(false)
+        CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).EndInit
+        Me.TCDetails.ResumeLayout(false)
+        Me.TabDetails.ResumeLayout(false)
+        Me.TabWindream.ResumeLayout(false)
+        Me.TabWindream.PerformLayout
+        CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).EndInit
+        Me.ContextMenuStripResultFiles.ResumeLayout(false)
+        CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).EndInit
+        Me.ToolStripDokumente.ResumeLayout(false)
+        Me.ToolStripDokumente.PerformLayout
+        Me.TabFollowUp.ResumeLayout(false)
+        Me.TabFollowUp.PerformLayout
+        Me.grpbxFU_Profile.ResumeLayout(false)
+        Me.grpbxFU_Profile.PerformLayout
+        Me.GroupBox4.ResumeLayout(false)
+        Me.GroupBox4.PerformLayout
+        Me.TabPos.ResumeLayout(false)
+        Me.TabPos.PerformLayout
+        Me.Panel1.ResumeLayout(false)
+        CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).EndInit
+        Me.BindingNavigatorPOS.ResumeLayout(false)
+        Me.BindingNavigatorPOS.PerformLayout
+        Me.ToolStripEdit.ResumeLayout(false)
+        Me.ToolStripEdit.PerformLayout
+        CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
+        Me.SplitContainer1.ResumeLayout(false)
+        CType(Me.BindingSource_Entity,System.ComponentModel.ISupportInitialize).EndInit
+        Me.StatusStrip_Main.ResumeLayout(false)
+        Me.StatusStrip_Main.PerformLayout
+        CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit
+        CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).EndInit
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents NavPane As DevExpress.XtraBars.Navigation.TileNavPane
     Friend WithEvents NavButtonHome As DevExpress.XtraBars.Navigation.NavButton
     Friend WithEvents StatusStrip_Main As System.Windows.Forms.StatusStrip
@@ -1308,7 +1315,7 @@ Partial Class frmConstructor_Main
     Friend WithEvents MassenänderungToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripSeparator10 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents UmbenennenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripTextBox2 As System.Windows.Forms.ToolStripTextBox
+    Friend WithEvents tsTextBoxRenameFile As System.Windows.Forms.ToolStripTextBox
     Friend WithEvents TSMI_linkRecord As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents SplitContainer1 As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents ToolStripSeparator11 As System.Windows.Forms.ToolStripSeparator
@@ -1321,4 +1328,5 @@ Partial Class frmConstructor_Main
     Friend WithEvents tsmiRights As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents progressLoadEntity As System.Windows.Forms.ToolStripProgressBar
     Friend WithEvents labelLoadEntity As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
 End Class

app/DD-Record-Organiser/frmConstructor_Main.resx

@@ -456,10 +456,10 @@
   <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 6</value>
   </data>
-  <data name="ToolStripTextBox2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tsTextBoxRenameFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>350, 23</value>
   </data>
-  <data name="ToolStripTextBox2.ToolTipText" xml:space="preserve">
+  <data name="tsTextBoxRenameFile.ToolTipText" xml:space="preserve">
     <value>HIt Return to change name</value>
   </data>
   <data name="UmbenennenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@@ -504,11 +504,17 @@
   <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 6</value>
   </data>
+  <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>239, 22</value>
+  </data>
+  <data name="ToolStripMenuItem1.Text" xml:space="preserve">
+    <value>Datei löschen</value>
+  </data>
   <data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>239, 22</value>
   </data>
   <data name="DeleteToolStripMenuItem.Text" xml:space="preserve">
-    <value>Löschen</value>
+    <value>Entferne Datei Link</value>
   </data>
   <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 6</value>
@@ -526,7 +532,7 @@
     <value>Ansicht zurücksetzen</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 248</value>
+    <value>240, 270</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>
@@ -2415,10 +2421,10 @@
   <data name="&gt;&gt;UmbenennenToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ToolStripTextBox2.Name" xml:space="preserve">
-    <value>ToolStripTextBox2</value>
+  <data name="&gt;&gt;tsTextBoxRenameFile.Name" xml:space="preserve">
+    <value>tsTextBoxRenameFile</value>
   </data>
-  <data name="&gt;&gt;ToolStripTextBox2.Type" xml:space="preserve">
+  <data name="&gt;&gt;tsTextBoxRenameFile.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;TSMIDisplayname.Name" xml:space="preserve">
@@ -2457,6 +2463,12 @@
   <data name="&gt;&gt;ToolStripSeparator8.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ToolStripMenuItem1.Name" xml:space="preserve">
+    <value>ToolStripMenuItem1</value>
+  </data>
+  <data name="&gt;&gt;ToolStripMenuItem1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;DeleteToolStripMenuItem.Name" xml:space="preserve">
     <value>DeleteToolStripMenuItem</value>
   </data>

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -896,6 +896,7 @@ Public Class frmConstructor_Main
                 End If
             End If
         End If
+        CURRENT_RECORD_ID = RECORD_ID
         If RECID = RECORD_ID And ENTITY_RECORD_COUNT > 1 And _refresh = False Then
             Exit Sub
         End If
@@ -998,6 +999,8 @@ Public Class frmConstructor_Main
             TabWindream.PageEnabled = True
             WindreamsucheNeuLadenToolStripMenuItem.Enabled = True
             EntitätssucheStartenToolStripMenuItem.Enabled = True
+            DateiÖffnenToolStripMenuItem.Enabled = True
+            TSMI_inWork.Enabled = True
 
             VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True
             Dim tempsql
@@ -1093,9 +1096,11 @@ Public Class frmConstructor_Main
                     If RIGHT_WINDREAM_FORBIDDEN = True Then
                         ' Hinzufügen sollte auch bei RIGHT_ONLY_READ verfügbar sein
                         tslblFileslocked.Visible = True
-                        TabWindream.PageEnabled = False
+                        'TabWindream.PageEnabled = False
                         WindreamsucheNeuLadenToolStripMenuItem.Enabled = False
                         EntitätssucheStartenToolStripMenuItem.Enabled = False
+                        DateiÖffnenToolStripMenuItem.Enabled = False
+                        TSMI_inWork.Enabled = False
                     End If
 
                 Catch ex As Exception
@@ -1222,7 +1227,7 @@ Public Class frmConstructor_Main
                     expression = "TYPE_NODE = 0"
                     Dim foundRowsLevel0() As DataRow
                     ' Use the Select method to find all rows matching the filter.
-                    foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression)
+                    foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression, "NODE_CAPTION")
                     Dim i As Integer
                     Dim NODE_CONFIG_ID
                     Dim LEVEL0_NODE As TreeNode
@@ -1258,7 +1263,7 @@ Public Class frmConstructor_Main
                         Dim expressionLevel1 As String
                         expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND  Einschränkung auf Type 2 und Parent_Guid
                         Dim foundRowsLevel1() As DataRow
-                        foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1)
+                        foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1, "NODE_CAPTION")
                         Dim j As Integer
                         For j = 0 To foundRowsLevel1.GetUpperBound(0)
                             Dim ID1 = foundRowsLevel1(j)("GUID")
@@ -1292,7 +1297,7 @@ Public Class frmConstructor_Main
                             Dim expressionLevel2 As String
                             expressionLevel2 = "PARENT_GUID = " & ID1 'TYPE_NODE = 2 AND Einschränkung auf Type  und Parent_Guid
                             Dim foundRowsLevel2() As DataRow
-                            foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2)
+                            foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2, "NODE_CAPTION")
                             Dim k As Integer
                             For k = 0 To foundRowsLevel2.GetUpperBound(0)
                                 Dim ID2 = foundRowsLevel2(k)("GUID")
@@ -1325,7 +1330,7 @@ Public Class frmConstructor_Main
                                 Dim expressionLevel3 As String
                                 expressionLevel3 = "PARENT_GUID = " & ID2 'TYPE_NODE = 3 AND  Einschränkung auf Type  und Parent_Guid
                                 Dim foundRowsLevel3() As DataRow
-                                foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3)
+                                foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3, "NODE_CAPTION")
                                 Dim l As Integer
                                 For l = 0 To foundRowsLevel3.GetUpperBound(0)
                                     Dim ID3 = foundRowsLevel3(l)("GUID")
@@ -1358,7 +1363,7 @@ Public Class frmConstructor_Main
                                     Dim expressionLevel4 As String
                                     expressionLevel4 = "PARENT_GUID = " & ID3 'TYPE_NODE = 4 AND Einschränkung auf Type  und Parent_Guid
                                     Dim foundRowsLevel4() As DataRow
-                                    foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4)
+                                    foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4, "NODE_CAPTION")
                                     Dim m As Integer
                                     For m = 0 To foundRowsLevel4.GetUpperBound(0)
                                         Dim ID5 = foundRowsLevel4(m)("GUID")
@@ -1428,7 +1433,7 @@ Public Class frmConstructor_Main
                                             Dim expressionLevel6 As String
                                             expressionLevel6 = "PARENT_GUID = " & ID6 'TYPE_NODE = 6 AND  Einschränkung auf Type  und Parent_Guid
                                             Dim foundRowsLevel6() As DataRow
-                                            foundRowsLevel6 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel6)
+                                            foundRowsLevel6 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel6, sortExp)
                                             If ID6 = 1146 Then
                                                 Console.WriteLine("Aha")
                                             End If
@@ -1464,7 +1469,7 @@ Public Class frmConstructor_Main
                                                 Dim expressionLevel7 As String
                                                 expressionLevel7 = "PARENT_GUID = " & ID7 'TYPE_NODE = 7 AND Einschränkung auf Type  und Parent_Guid
                                                 Dim foundRowsLevel7() As DataRow
-                                                foundRowsLevel7 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel7)
+                                                foundRowsLevel7 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel7, sortExp)
                                                 Dim p As Integer
                                                 For p = 0 To foundRowsLevel7.GetUpperBound(0)
                                                     Dim ID8 = foundRowsLevel7(p)("GUID")
@@ -1497,7 +1502,7 @@ Public Class frmConstructor_Main
                                                     Dim expressionLevel8 As String
                                                     expressionLevel8 = "PARENT_GUID = " & ID8 'TYPE_NODE = 7 AND  Einschränkung auf Type  und Parent_Guid
                                                     Dim foundRowsLevel8() As DataRow
-                                                    foundRowsLevel8 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel8)
+                                                    foundRowsLevel8 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel8, sortExp)
                                                     Dim q As Integer
                                                     For q = 0 To foundRowsLevel8.GetUpperBound(0)
                                                         Dim ID9 = foundRowsLevel8(q)("GUID")
@@ -1690,6 +1695,10 @@ Public Class frmConstructor_Main
                                  Select form
                                  Where form.Item("FORM_ID") = ENTITY_ID).Single()
                 CONSTRUCTOR_DETAIL_ID = result.Item("GUID")
+                Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT")
+                If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then
+                    CURRENT_DATE_FORMAT = FORM_DATE_FORMAT
+                End If
 
                 If NODE_NAVIGATION = True Then
                     If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then
@@ -2079,6 +2088,9 @@ Public Class frmConstructor_Main
                 NEW_RECORD_ID = 0
                 If Not RECORD_CHANGED Then
                     Update_Status_Label(True, "NO CHANGES in Record.")
+                    ActivateAllTabs()
+                    DisableEditMode()
+                    EDIT_STATE = EditState.None
                     Me.Cursor = Cursors.Default
                     Return True
                 End If
@@ -2096,6 +2108,7 @@ Public Class frmConstructor_Main
                     ActivateAllTabs()
                     DisableEditMode()
                 End If
+
             End If
 
             Dim recid As Integer
@@ -2176,7 +2189,7 @@ Public Class frmConstructor_Main
 
             ' Dim FORM_TYPE = DT_FORM.Rows(0).Item("FORM_TYPE_ID") 'ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
             
-            CURRENT_DATE_FORMAT = USER_DATE_FORMAT
+            'CURRENT_DATE_FORMAT = USER_DATE_FORMAT
 
             If IS_SINGLE_RECORD = False Then
                 If FORM_TYPE <> 5 Then
@@ -2205,7 +2218,7 @@ Public Class frmConstructor_Main
         End Try
 
         tsButtonAdd.Enabled = True
-
+        tsButtonCancel.Visible = False
         If CtrlCommandUI.IsInsert Then
             tsButtonSave.Enabled = False
             tsButtonCancel.Visible = False
@@ -2278,7 +2291,6 @@ Public Class frmConstructor_Main
             'End If
             If TrySave_Automatic() = True Then
                 DisableEditMode()
-
             End If
         End If
     End Sub
@@ -3240,13 +3252,14 @@ Public Class frmConstructor_Main
                 For Each col As String In listdate
                     Dim colDate = grvwGrid.Columns(col)
                     colDate.DisplayFormat.FormatType = FormatType.DateTime
-                    colDate.DisplayFormat.FormatString = USER_DATE_FORMAT
+                    colDate.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+
                 Next
                 Try
                     grvwGrid.Columns("AddedWhen").DisplayFormat.FormatType = FormatType.DateTime
-                    grvwGrid.Columns("AddedWhen").DisplayFormat.FormatString = USER_DATE_FORMAT & " HH:MM:ss"
+                    grvwGrid.Columns("AddedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
                     grvwGrid.Columns("ChangedWhen").DisplayFormat.FormatType = FormatType.DateTime
-                    grvwGrid.Columns("ChangedWhen").DisplayFormat.FormatString = USER_DATE_FORMAT & " HH:MM:ss"
+                    grvwGrid.Columns("ChangedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
                 Catch ex As Exception
 
                 End Try
@@ -3538,7 +3551,6 @@ Public Class frmConstructor_Main
 
 
             For Each col As DataRow In ComboColumns.Rows
-
                 Dim colName As String = col.Item(0)
 
                 Dim hasSqlCommand = col.Item(1).ToString() <> ""
@@ -4155,7 +4167,13 @@ Public Class frmConstructor_Main
                             Dim path = row.Item("FULLPATH")
                             If Not IsNothing(path) Then
                                 If ClassWindream.Delete_WDFile(path) Then
-                                    ClassFileResult.Delete_ResultFile(DOC_ID)
+                                    If ClassFileResult.Delete_ResultFile(DOC_ID) = False Then
+                                        msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", path)
+                                        If USER_LANGUAGE <> "de-DE" Then
+                                            msg = String.Format("The file {0} could not be deleted! Check the logfile!", path)
+                                        End If
+                                        MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
+                                    End If
                                 End If
                             End If
                         Next
@@ -4433,8 +4451,10 @@ Public Class frmConstructor_Main
                     For Each col As String In listdate
                         Dim colDate = GridViewDoc_Search.Columns(col)
                         colDate.DisplayFormat.FormatType = FormatType.DateTime
-                        colDate.DisplayFormat.FormatString = USER_DATE_FORMAT
+                        colDate.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
                     Next
+
+
                     ' Alle Date Spalten durchgehen 
                     For Each dropdownrow As DataRow In DROPDOWN_TABLE.Rows
                         Dim RepositoryItemComboBox = New RepositoryItemComboBox()
@@ -4450,11 +4470,12 @@ Public Class frmConstructor_Main
                         For i = 0 To foundRows.GetUpperBound(0)
                             RepositoryItemComboBox.Items.Add(foundRows(i)("VALUE"))
                         Next
-                        Dim docresult_dd_Column = GridViewDoc_Search.Columns(colstring)
                         GridViewDoc_Search.GridControl.RepositoryItems.Add(RepositoryItemComboBox)
                         If Not IsNothing(GridViewDoc_Search.Columns(colstring)) Then
                             GridViewDoc_Search.Columns(colstring).ColumnEdit = RepositoryItemComboBox
                         End If
+                        AddHandler RepositoryItemComboBox.SelectedValueChanged, AddressOf OnCBSelectedValueChanged
+
                     Next
                     'Jetzt die Spaltenbreiten anpassen
                     For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows
@@ -4484,13 +4505,26 @@ Public Class frmConstructor_Main
                     End If
                     Try
                         GridViewDoc_Search.Columns(created).DisplayFormat.FormatType = FormatType.DateTime
-                        GridViewDoc_Search.Columns(created).DisplayFormat.FormatString = USER_DATE_FORMAT & " HH:MM:ss"
+                        GridViewDoc_Search.Columns(created).DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
                         GridViewDoc_Search.Columns(changed).DisplayFormat.FormatType = FormatType.DateTime
-                        GridViewDoc_Search.Columns(changed).DisplayFormat.FormatString = USER_DATE_FORMAT & " HH:MM:ss"
+                        GridViewDoc_Search.Columns(changed).DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
                     Catch ex As Exception
                         ClassLogger.Add(">> Attention: Could not change datetime formats Change/Create: " & ex.Message, False)
                     End Try
 
+                    For Each col As DevExpress.XtraGrid.Columns.GridColumn In GridViewDoc_Search.Columns
+                        Dim colu = col
+                        Console.Write(colu.Name & " - " & colu.FieldName)
+                        Dim _AllowEdit As Boolean = False
+                        For Each dropdownrow As DataRow In DROPDOWN_TABLE.Rows
+                            Dim colstring = dropdownrow.Item(1)
+                            If colstring = colu.FieldName Then
+                                _AllowEdit = True
+                                Exit For
+                            End If
+                        Next
+                        col.OptionsColumn.AllowEdit = _AllowEdit
+                    Next
 
 
 
@@ -4547,6 +4581,20 @@ Public Class frmConstructor_Main
         End Try
         Cursor = Cursors.Default
     End Sub
+    Private Sub OnCBSelectedValueChanged(sender As Object, e As EventArgs)
+        Try
+            Dim ItemComboBox As RepositoryItemComboBox
+            ItemComboBox = sender
+
+        Catch ex As Exception
+
+        End Try
+        'Perform your actions
+    End Sub
+
+    Private Sub GridViewDropDown_ValueChanged(sender As Object, e As DragEventArgs) Handles TCDetails.DragDrop
+        Drag_Drop(e)
+    End Sub
     Private Function Return_SearchPattern(ByVal content As String)
         Select Case content.ToUpper
             Case "@Record-ID".ToUpper
@@ -4692,6 +4740,7 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub TCDetails_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles TCDetails.SelectedPageChanged
+    
         Update_Status_Label(False, "")
         'tsButtonEdit.Enabled = True
         If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("pos") Then
@@ -4700,26 +4749,26 @@ Public Class frmConstructor_Main
             Load_POSGrid_Layout()
         End If
         If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then
-            If RIGHT_WINDREAM_FORBIDDEN = False Then
-                'tsButtonEdit.Enabled = False
-                If RECORD_ID = 0 Then
-                    Dim result As MsgBoxResult
-                    Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?")
+            ' If RIGHT_WINDREAM_FORBIDDEN = False Then
+            'tsButtonEdit.Enabled = False
+            If RECORD_ID = 0 Then
+                Dim result As MsgBoxResult
+                Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?")
 
-                    If USER_LANGUAGE <> "de-DE" Then
-                        msg = String.Format("Would You like to run a entity-wide docsearch?")
-                    End If
-                    result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                    If result = MsgBoxResult.Yes Then
-                        RUN_WDSEARCH_GRID("ENTITY")
-                    End If
-
-                Else
-                    ' RUN_WD_SEARCH(WD_Suche, "RECORD")
-                    RUN_WDSEARCH_GRID("RECORD")
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("Would You like to run a entity-wide docsearch?")
                 End If
-                Load_DocGrid_Layout()
+                result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = MsgBoxResult.Yes Then
+                    RUN_WDSEARCH_GRID("ENTITY")
+                End If
+
+            Else
+                ' RUN_WD_SEARCH(WD_Suche, "RECORD")
+                RUN_WDSEARCH_GRID("RECORD")
             End If
+            Load_DocGrid_Layout()
+            'End If
         End If
         If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Or TCDetails.SelectedTabPage.Text.ToLower.StartsWith("follo") Then
             'tsButtonEdit.Enabled = False
@@ -5750,8 +5799,12 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeleteToolStripMenuItem.Click
+        If RECORD_ID = 0 Then
+            MsgBox("Please select a record!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
         If RESULT_DOC_PATH <> Nothing Then
-            Dim msg = "Wollen Sie nur die Verknüpfung der Datei entfernen?" & vbNewLine & "Datei bleibt im DMS/Archiv/Explorer erhalten!"
+            Dim msg = "Wollen Sie die Verknüpfung der Datei wirklich entfernen?" & vbNewLine & "Datei bleibt im DMS/Archiv/Explorer erhalten!"
             If USER_LANGUAGE <> "de-DE" Then
                 msg = "Would You like to delete only the references?" & vbNewLine & "File will stay in ECM/Archive/Explorer!"
             End If
@@ -5766,46 +5819,23 @@ Public Class frmConstructor_Main
                             If ClassWindream.REMOVE_VEKTOR_LINK(RESULT_DOC_PATH, DT_INDICES.Rows(0).Item("IDXNAME_RECORDID"), RECORD_ID) = True Then
                                 'ENTITY-Links entfernen
                                 If ClassWindream.REMOVE_VEKTOR_LINK(RESULT_DOC_PATH, DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) = True Then
-                                    Dim del = "DELETE FROM TBPMO_DOC_RECORD_LINK WHERE DocID = " & RESULT_DOC_ID
-                                    If ClassDatabase.Execute_non_Query(del) = True Then
-                                        del = "DELETE FROM TBPMO_DOCRESULT_LIST WHERE DocID = " & RESULT_DOC_ID
-                                        If ClassDatabase.Execute_non_Query(del) = True Then
-                                            ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
-                                            RUN_WDSEARCH_GRID("RECORD")
-                                        End If
+                                    If ClassFileResult.Delete_ResultFile(RESULT_DOC_ID) = True Then
+                                        ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
+                                        RUN_WDSEARCH_GRID("RECORD")
                                     End If
+                                Else
+                                    MsgBox("Could not remove Vektor-Link ENTITY! Check logfile.", MsgBoxStyle.Exclamation)
                                 End If
+                            Else
+                                MsgBox("Could not remove Vektor-Link RECORD! Check logfile.", MsgBoxStyle.Exclamation)
                             End If
                         End If
                     End If
                 Catch ex As Exception
                     MsgBox("Unexpected Error in Removing links from file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                 End Try
-            Else
-                msg = "Sind Sie sicher, dass Sie die Datei " & vbNewLine & RESULT_DOC_PATH & vbNewLine & "endgültig löschen wollen?"
-                If USER_LANGUAGE <> "de-DE" Then
-                    msg = "Are You sure You want to permanently delete this file?" & vbNewLine & RESULT_DOC_PATH
-                End If
-                Dim result1 As MsgBoxResult
-                result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                If result1 = MsgBoxResult.Yes Then
-                    Try
-                        If Not IsNothing(RESULT_DOC_ID) Then
-                            If ClassWindream.Delete_WDFile(RESULT_DOC_PATH) = True Then
-                                If ClassFileResult.Delete_ResultFile(RESULT_DOC_ID) = True Then
-                                    ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "FILE DELETED BY USER")
-                                    RUN_WDSEARCH_GRID("RECORD")
-                                End If
-                            End If
-                        End If
-                    Catch ex As Exception
-                        MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                    End Try
-                End If
             End If
-
         End If
-
     End Sub
 
     Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PropertiesToolStripMenuItem.Click
@@ -5830,7 +5860,9 @@ Public Class frmConstructor_Main
     End Sub
     Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
         Get_Doc_Items()
-        ClassHelper.File_open(RESULT_DOC_PATH, RESULT_DOC_ID)
+        If RIGHT_WINDREAM_FORBIDDEN = False Then
+            ClassHelper.File_open(RESULT_DOC_PATH, RESULT_DOC_ID)
+        End If
     End Sub
 
     Private Sub TabWindream_Leave(sender As Object, e As EventArgs) Handles TabWindream.Leave
@@ -6091,14 +6123,14 @@ Public Class frmConstructor_Main
 
     End Sub
 
-    Private Sub ToolStripTextBox2_KeyUp(sender As Object, e As KeyEventArgs) Handles ToolStripTextBox2.KeyUp
+    Private Sub ToolStripTextBox2_KeyUp(sender As Object, e As KeyEventArgs) Handles tsTextBoxRenameFile.KeyUp
         If e.KeyCode = Keys.Return Then
             Try
-                If ToolStripTextBox2.Text <> "" Then
+                If tsTextBoxRenameFile.Text <> "" Then
                     Dim OldName, NewName As String
                     OldName = RESULT_DOC_PATH
                     ' Define file names.
-                    NewName = ToolStripTextBox2.Text
+                    NewName = tsTextBoxRenameFile.Text
                     Dim name1 = Path.Combine(Path.GetDirectoryName(RESULT_DOC_PATH), NewName)
                     NewName = NewName & Path.GetExtension(RESULT_DOC_PATH)
                     ' Rename file.
@@ -6123,10 +6155,10 @@ Public Class frmConstructor_Main
             If RESULT_DOC_PATH <> "" Then
                 Dim FileToRename As String
                 FileToRename = Path.GetFileNameWithoutExtension(RESULT_DOC_PATH)
-                ToolStripTextBox2.Text = FileToRename
-                ToolStripTextBox2.Enabled = True
+                tsTextBoxRenameFile.Text = FileToRename
+                tsTextBoxRenameFile.Enabled = True
             Else
-                ToolStripTextBox2.Enabled = False
+                tsTextBoxRenameFile.Enabled = False
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in getting the filename: " & ex.Message, MsgBoxStyle.Critical)
@@ -6315,6 +6347,7 @@ Public Class frmConstructor_Main
 
     Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiRights.Click
         Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!"
+        CURRENT_RECORD_ID = RECORD_ID
         If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH, ENTITY_ID) = True Then
             If USER_LANGUAGE <> "de-DE" Then
                 msg = "The rights were successfully renewed!"
@@ -6349,4 +6382,49 @@ Public Class frmConstructor_Main
             End If
         Next
     End Sub
+
+    Private Sub TCDetails_SelectedPageChanging(sender As Object, e As DevExpress.XtraTab.TabPageChangingEventArgs) Handles TCDetails.SelectedPageChanging
+        If EDIT_STATE = EditState.Insert Or EDIT_STATE = EditState.Update Then
+            If Save_Record() = False Then
+                e.Cancel = True
+            End If
+        End If
+
+    End Sub
+
+    Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
+        If RECORD_ID = 0 Then
+            MsgBox("Please select a record!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        If RESULT_DOC_PATH <> Nothing Then
+            Dim msg = "Sind Sie sicher, dass Sie die Datei " & vbNewLine & RESULT_DOC_PATH & vbNewLine & "endgültig löschen wollen?"
+            If USER_LANGUAGE <> "de-DE" Then
+                msg = "Are You sure You want to permanently delete this file?" & vbNewLine & RESULT_DOC_PATH
+            End If
+                Dim result1 As MsgBoxResult
+                result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result1 = MsgBoxResult.Yes Then
+                    Try
+                        If Not IsNothing(RESULT_DOC_ID) Then
+                            If ClassWindream.Delete_WDFile(RESULT_DOC_PATH) = True Then
+                                If ClassFileResult.Delete_ResultFile(RESULT_DOC_ID) = True Then
+                                    ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "FILE DELETED BY USER")
+                                    RUN_WDSEARCH_GRID("RECORD")
+                                Else
+                                    msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", RESULT_DOC_PATH)
+                                    If USER_LANGUAGE <> "de-DE" Then
+                                        msg = String.Format("The file {0} could not be deleted! Check the logfile!", RESULT_DOC_PATH)
+                                    End If
+                                    MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
+                            End If
+                        End If
+                        End If
+                    Catch ex As Exception
+                        MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                    End Try
+                End If
+            End If
+
+    End Sub
 End Class

app/DD-Record-Organiser/frmLicense.designer.vb

@@ -27,17 +27,16 @@ Partial Class frmLicense
         Me.txtPW = New System.Windows.Forms.TextBox()
         Me.lblPW = New System.Windows.Forms.Label()
         Me.grbBoxlicense = New System.Windows.Forms.GroupBox()
+        Me.lblClient = New System.Windows.Forms.Label()
+        Me.cmbClients = New System.Windows.Forms.ComboBox()
+        Me.chkSAPConnect = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.dtpGueltig_GI = New System.Windows.Forms.DateTimePicker()
         Me.txtDossierCount = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.txtlicensekey = New System.Windows.Forms.TextBox()
-        Me.lblReadKey = New System.Windows.Forms.Label()
         Me.btnnewLicenses = New System.Windows.Forms.Button()
         Me.txtNewlicences = New System.Windows.Forms.TextBox()
         Me.lblnewlicenses = New System.Windows.Forms.Label()
-        Me.lblAktuelleLizenzen = New System.Windows.Forms.Label()
-        Me.chkSAPConnect = New System.Windows.Forms.CheckBox()
         Me.grbBoxlicense.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -60,21 +59,37 @@ Partial Class frmLicense
         '
         'grbBoxlicense
         '
+        Me.grbBoxlicense.Controls.Add(Me.lblClient)
+        Me.grbBoxlicense.Controls.Add(Me.cmbClients)
         Me.grbBoxlicense.Controls.Add(Me.chkSAPConnect)
         Me.grbBoxlicense.Controls.Add(Me.Label5)
         Me.grbBoxlicense.Controls.Add(Me.dtpGueltig_GI)
         Me.grbBoxlicense.Controls.Add(Me.txtDossierCount)
         Me.grbBoxlicense.Controls.Add(Me.Label2)
-        Me.grbBoxlicense.Controls.Add(Me.txtlicensekey)
-        Me.grbBoxlicense.Controls.Add(Me.lblReadKey)
         Me.grbBoxlicense.Controls.Add(Me.btnnewLicenses)
         Me.grbBoxlicense.Controls.Add(Me.txtNewlicences)
         Me.grbBoxlicense.Controls.Add(Me.lblnewlicenses)
-        Me.grbBoxlicense.Controls.Add(Me.lblAktuelleLizenzen)
         resources.ApplyResources(Me.grbBoxlicense, "grbBoxlicense")
         Me.grbBoxlicense.Name = "grbBoxlicense"
         Me.grbBoxlicense.TabStop = False
         '
+        'lblClient
+        '
+        resources.ApplyResources(Me.lblClient, "lblClient")
+        Me.lblClient.Name = "lblClient"
+        '
+        'cmbClients
+        '
+        resources.ApplyResources(Me.cmbClients, "cmbClients")
+        Me.cmbClients.FormattingEnabled = True
+        Me.cmbClients.Name = "cmbClients"
+        '
+        'chkSAPConnect
+        '
+        resources.ApplyResources(Me.chkSAPConnect, "chkSAPConnect")
+        Me.chkSAPConnect.Name = "chkSAPConnect"
+        Me.chkSAPConnect.UseVisualStyleBackColor = True
+        '
         'Label5
         '
         resources.ApplyResources(Me.Label5, "Label5")
@@ -97,16 +112,6 @@ Partial Class frmLicense
         resources.ApplyResources(Me.Label2, "Label2")
         Me.Label2.Name = "Label2"
         '
-        'txtlicensekey
-        '
-        resources.ApplyResources(Me.txtlicensekey, "txtlicensekey")
-        Me.txtlicensekey.Name = "txtlicensekey"
-        '
-        'lblReadKey
-        '
-        resources.ApplyResources(Me.lblReadKey, "lblReadKey")
-        Me.lblReadKey.Name = "lblReadKey"
-        '
         'btnnewLicenses
         '
         Me.btnnewLicenses.Image = Global.DD_Record_Organiser.My.Resources.Resources.key_go1
@@ -124,17 +129,6 @@ Partial Class frmLicense
         resources.ApplyResources(Me.lblnewlicenses, "lblnewlicenses")
         Me.lblnewlicenses.Name = "lblnewlicenses"
         '
-        'lblAktuelleLizenzen
-        '
-        resources.ApplyResources(Me.lblAktuelleLizenzen, "lblAktuelleLizenzen")
-        Me.lblAktuelleLizenzen.Name = "lblAktuelleLizenzen"
-        '
-        'chkSAPConnect
-        '
-        resources.ApplyResources(Me.chkSAPConnect, "chkSAPConnect")
-        Me.chkSAPConnect.Name = "chkSAPConnect"
-        Me.chkSAPConnect.UseVisualStyleBackColor = True
-        '
         'frmLicense
         '
         resources.ApplyResources(Me, "$this")
@@ -147,25 +141,24 @@ Partial Class frmLicense
         Me.KeyPreview = True
         Me.Name = "frmLicense"
         Me.grbBoxlicense.ResumeLayout(False)
-        Me.grbBoxlicense.PerformLayout
-        Me.ResumeLayout(false)
-        Me.PerformLayout
+        Me.grbBoxlicense.PerformLayout()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
 
-End Sub
+    End Sub
     Friend WithEvents btnPW_check As System.Windows.Forms.Button
     Friend WithEvents txtPW As System.Windows.Forms.TextBox
     Friend WithEvents lblPW As System.Windows.Forms.Label
     Friend WithEvents grbBoxlicense As System.Windows.Forms.GroupBox
-    Friend WithEvents txtlicensekey As System.Windows.Forms.TextBox
-    Friend WithEvents lblReadKey As System.Windows.Forms.Label
     Friend WithEvents btnnewLicenses As System.Windows.Forms.Button
     Friend WithEvents txtNewlicences As System.Windows.Forms.TextBox
     Friend WithEvents lblnewlicenses As System.Windows.Forms.Label
-    Friend WithEvents lblAktuelleLizenzen As System.Windows.Forms.Label
 
     Friend WithEvents txtDossierCount As System.Windows.Forms.TextBox
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents dtpGueltig_GI As System.Windows.Forms.DateTimePicker
     Friend WithEvents chkSAPConnect As System.Windows.Forms.CheckBox
+    Friend WithEvents lblClient As System.Windows.Forms.Label
+    Friend WithEvents cmbClients As System.Windows.Forms.ComboBox
 End Class

app/DD-Record-Organiser/frmLicense.resx

@@ -198,11 +198,68 @@
   <data name="&gt;&gt;lblPW.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="lblClient.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblClient.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 9.75pt</value>
+  </data>
+  <data name="lblClient.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="lblClient.Location" type="System.Drawing.Point, System.Drawing">
+    <value>7, 20</value>
+  </data>
+  <data name="lblClient.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 16</value>
+  </data>
+  <data name="lblClient.TabIndex" type="System.Int32, mscorlib">
+    <value>19</value>
+  </data>
+  <data name="lblClient.Text" xml:space="preserve">
+    <value>Mandantenauswahl:</value>
+  </data>
+  <data name="&gt;&gt;lblClient.Name" xml:space="preserve">
+    <value>lblClient</value>
+  </data>
+  <data name="&gt;&gt;lblClient.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;lblClient.Parent" xml:space="preserve">
+    <value>grbBoxlicense</value>
+  </data>
+  <data name="&gt;&gt;lblClient.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="cmbClients.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 9.75pt</value>
+  </data>
+  <data name="cmbClients.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 39</value>
+  </data>
+  <data name="cmbClients.Size" type="System.Drawing.Size, System.Drawing">
+    <value>243, 24</value>
+  </data>
+  <data name="cmbClients.TabIndex" type="System.Int32, mscorlib">
+    <value>18</value>
+  </data>
+  <data name="&gt;&gt;cmbClients.Name" xml:space="preserve">
+    <value>cmbClients</value>
+  </data>
+  <data name="&gt;&gt;cmbClients.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbClients.Parent" xml:space="preserve">
+    <value>grbBoxlicense</value>
+  </data>
+  <data name="&gt;&gt;cmbClients.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="chkSAPConnect.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="chkSAPConnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 126</value>
+    <value>10, 144</value>
   </data>
   <data name="chkSAPConnect.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
     <value>Yes</value>
@@ -226,13 +283,13 @@
     <value>grbBoxlicense</value>
   </data>
   <data name="&gt;&gt;chkSAPConnect.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>325, 65</value>
+    <value>304, 77</value>
   </data>
   <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 16</value>
@@ -256,10 +313,10 @@
     <value>grbBoxlicense</value>
   </data>
   <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="dtpGueltig_GI.Location" type="System.Drawing.Point, System.Drawing">
-    <value>396, 62</value>
+    <value>396, 72</value>
   </data>
   <data name="dtpGueltig_GI.Size" type="System.Drawing.Size, System.Drawing">
     <value>104, 23</value>
@@ -277,10 +334,10 @@
     <value>grbBoxlicense</value>
   </data>
   <data name="&gt;&gt;dtpGueltig_GI.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="txtDossierCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>222, 91</value>
+    <value>222, 109</value>
   </data>
   <data name="txtDossierCount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 4, 3, 4</value>
@@ -304,13 +361,13 @@
     <value>grbBoxlicense</value>
   </data>
   <data name="&gt;&gt;txtDossierCount.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 94</value>
+    <value>7, 112</value>
   </data>
   <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
     <value>127, 16</value>
@@ -331,79 +388,25 @@
     <value>grbBoxlicense</value>
   </data>
   <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtlicensekey.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 221</value>
-  </data>
-  <data name="txtlicensekey.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 4, 3, 4</value>
-  </data>
-  <data name="txtlicensekey.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtlicensekey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 67</value>
-  </data>
-  <data name="txtlicensekey.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;txtlicensekey.Name" xml:space="preserve">
-    <value>txtlicensekey</value>
-  </data>
-  <data name="&gt;&gt;txtlicensekey.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;txtlicensekey.Parent" xml:space="preserve">
-    <value>grbBoxlicense</value>
-  </data>
-  <data name="&gt;&gt;txtlicensekey.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="lblReadKey.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="lblReadKey.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 201</value>
-  </data>
-  <data name="lblReadKey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>105, 16</value>
-  </data>
-  <data name="lblReadKey.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="lblReadKey.Text" xml:space="preserve">
-    <value>Neuer Lizenzkey:</value>
-  </data>
-  <data name="&gt;&gt;lblReadKey.Name" xml:space="preserve">
-    <value>lblReadKey</value>
-  </data>
-  <data name="&gt;&gt;lblReadKey.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;lblReadKey.Parent" xml:space="preserve">
-    <value>grbBoxlicense</value>
-  </data>
-  <data name="&gt;&gt;lblReadKey.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
   <data name="btnnewLicenses.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
   <data name="btnnewLicenses.Location" type="System.Drawing.Point, System.Drawing">
-    <value>359, 175</value>
+    <value>307, 126</value>
   </data>
   <data name="btnnewLicenses.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 4, 3, 4</value>
   </data>
   <data name="btnnewLicenses.Size" type="System.Drawing.Size, System.Drawing">
-    <value>141, 38</value>
+    <value>193, 38</value>
   </data>
   <data name="btnnewLicenses.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
   <data name="btnnewLicenses.Text" xml:space="preserve">
-    <value>Erzeuge Key</value>
+    <value>Erneuere Lizenz</value>
   </data>
   <data name="btnnewLicenses.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleRight</value>
@@ -421,7 +424,7 @@
     <value>7</value>
   </data>
   <data name="txtNewlicences.Location" type="System.Drawing.Point, System.Drawing">
-    <value>222, 62</value>
+    <value>222, 74</value>
   </data>
   <data name="txtNewlicences.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 4, 3, 4</value>
@@ -451,7 +454,7 @@
     <value>True</value>
   </data>
   <data name="lblnewlicenses.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 65</value>
+    <value>7, 77</value>
   </data>
   <data name="lblnewlicenses.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 16</value>
@@ -474,36 +477,6 @@
   <data name="&gt;&gt;lblnewlicenses.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="lblAktuelleLizenzen.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="lblAktuelleLizenzen.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 9.75pt, style=Bold</value>
-  </data>
-  <data name="lblAktuelleLizenzen.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 31</value>
-  </data>
-  <data name="lblAktuelleLizenzen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 16</value>
-  </data>
-  <data name="lblAktuelleLizenzen.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="lblAktuelleLizenzen.Text" xml:space="preserve">
-    <value>Label13</value>
-  </data>
-  <data name="&gt;&gt;lblAktuelleLizenzen.Name" xml:space="preserve">
-    <value>lblAktuelleLizenzen</value>
-  </data>
-  <data name="&gt;&gt;lblAktuelleLizenzen.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;lblAktuelleLizenzen.Parent" xml:space="preserve">
-    <value>grbBoxlicense</value>
-  </data>
-  <data name="&gt;&gt;lblAktuelleLizenzen.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
   <data name="grbBoxlicense.Location" type="System.Drawing.Point, System.Drawing">
     <value>11, 42</value>
   </data>
@@ -514,13 +487,13 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="grbBoxlicense.Size" type="System.Drawing.Size, System.Drawing">
-    <value>520, 308</value>
+    <value>519, 182</value>
   </data>
   <data name="grbBoxlicense.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
   </data>
   <data name="grbBoxlicense.Text" xml:space="preserve">
-    <value>Lizenzanzahl ändern (nur Administrator):</value>
+    <value>Lizenzanzahl ändern:</value>
   </data>
   <data name="grbBoxlicense.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -544,7 +517,7 @@
     <value>7, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>542, 363</value>
+    <value>542, 233</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 9.75pt</value>

app/DD-Record-Organiser/frmLicense.vb

@@ -1,5 +1,6 @@
 Imports DLLLicenseManager
 Public Class frmLicense
+    Dim CLIENT_ID As Integer
     Public _lizenzManager As ClassLicenseManager
     Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click
         OpenLicenseManager()
@@ -12,6 +13,23 @@ Public Class frmLicense
                 Me.lblPW.Visible = False
                 Me.txtPW.Visible = False
                 Me.btnPW_check.Visible = False
+                If DT_CLIENT_USER.Rows.Count > 1 Then
+                    lblClient.Visible = True
+                    cmbClients.Visible = True
+                    Try
+                        cmbClients.DataSource = DT_CLIENT_USER
+                        cmbClients.DisplayMember = DT_CLIENT_USER.Columns("CLIENT_NAME").ColumnName
+                        cmbClients.ValueMember = DT_CLIENT_USER.Columns("CLIENT_ID").ColumnName
+                    Catch ex As Exception
+                        MsgBox("Unexpected Error in Loading Clients: " & ex.Message, MsgBoxStyle.Critical)
+                    End Try
+                ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
+                    lblClient.Visible = False
+                    cmbClients.Visible = False
+                    CLIENT_ID = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
+                End If
+
+
             Else
                 Me.grbBoxlicense.Visible = False
                 MsgBox("Das eingegebene Passwort stimmt nicht überein!", MsgBoxStyle.Critical, "Falsche Eingabe:")
@@ -23,13 +41,13 @@ Public Class frmLicense
 
     Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click
         Try
+            _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
             If Me.txtNewlicences.Text <> "" And txtDossierCount.Text <> "" Then
                 'Encode the license
                 Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtDossierCount.Text & "#" & chkSAPConnect.Checked, "#DigitalData35452!#")
 
-                Dim sql As String = "UPDATE TBDD_MODULES SET LICENSE = '" & result & "'  WHERE UPPER(NAME) = UPPER('Record-Organizer')"
+                Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_PMO = '" & result & "' WHERE GUID = {0}", CLIENT_ID)
                 If ClassDatabase.Execute_non_Query(sql, True) = True Then
-                    txtlicensekey.Text = result
                     Refresh_Licence(True)
                 End If
 
@@ -40,52 +58,31 @@ Public Class frmLicense
         End Try
     End Sub
     Sub Refresh_Licence(Neu As Boolean)
-        Dim lizenzzahl As Integer
         Try
-            Me._lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
-            Dim sql As String = "SELECT LICENSE FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')"
+            ClassLicence.Refresh_Licence(CLIENT_ID)
 
-            Dim lic As String = ClassDatabase.Execute_Scalar(sql, True)
-            Dim licString = Me._lizenzManager.DecodeLicenseKey(lic)
-
-            Dim split() = licString.ToString.Split("#")
-
-            If lic <> "" Then
-                lizenzzahl = split(0)
-                LICENSE_COUNT = lizenzzahl
-            Else
-                lizenzzahl = "0"
-            End If
-            txtNewlicences.Text = lizenzzahl
-            dtpGueltig_GI.Value = split(1)
-            If CDate(split(1)) < CDate(Now.ToShortDateString) Then
-                License_Expired = True
-            Else
-                License_Expired = False
-            End If
-
-            txtDossierCount.Text = split(2)
-            LICENSE_COUNT = CInt(txtNewlicences.Text)
-
-            LICENSE_DOSSIER_COUNT = split(2)
-            txtDossierCount.Text = split(2)
+            txtNewlicences.Text = LICENSE_COUNT
+            dtpGueltig_GI.Value = LICENSE_DATE
+            txtDossierCount.Text = LICENSE_DOSSIER_COUNT
             Try
-                LICENSE_SAP_Connect = CBool(split(3))
+
                 chkSAPConnect.Checked = LICENSE_SAP_Connect
             Catch ex As Exception
                 ClassLogger.Add(">> Could not read License for SAP-Connect: " & ex.Message, False)
                 LICENSE_SAP_Connect = False
                 chkSAPConnect.Checked = False
             End Try
-
-            Me.lblAktuelleLizenzen.Text = "Aktuelle Anzahl Lizenzen: " & lizenzzahl
             If Neu = True Then
-                If CInt(lizenzzahl) > 0 Then
-                    MsgBox("Die Lizenz wurde aktualisiert!", MsgBoxStyle.Information, "Erfolgsmeldung:")
+                If CInt(LICENSE_COUNT) > 0 Then
+                    Dim msg As String = "Die Lizenz wurde aktualisiert!" & vbNewLine & Now
+                    If USER_LANGUAGE <> "de-DE" Then
+                        msg = "The license was renewed!" & vbNewLine & Now
+                    End If
+                    MsgBox(msg, MsgBoxStyle.Information, "License renewed:")
                 End If
             End If
         Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei Licensemanager:")
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in licensemanager:")
         End Try
     End Sub
 
@@ -108,4 +105,16 @@ Public Class frmLicense
             End If
         End If
     End Sub
+
+    Private Sub cmbClients_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbClients.SelectedIndexChanged
+        If cmbClients.SelectedIndex <> -1 Then
+            Try
+                CLIENT_ID = cmbClients.SelectedValue
+                Refresh_Licence(False)
+            Catch ex As Exception
+                CLIENT_ID = 99
+            End Try
+
+        End If
+    End Sub
 End Class

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

@@ -1861,42 +1861,42 @@
   </data>
   <data name="BarButtonItem8.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
   <data name="BarSubItem1.MenuAppearance.HeaderItemAppearance.FontSizeDelta" type="System.Int32, mscorlib">

app/DD-Record-Organiser/frmMain.resx

@@ -188,7 +188,7 @@
     <value>LabelVersion</value>
   </data>
   <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1634, 150</value>
+    <value>1642, 150</value>
   </data>
   <data name="pageForms.Appearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
     <value>Regular</value>
@@ -332,7 +332,7 @@
     <value>NotifyIcon</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1634, 23</value>
+    <value>1642, 23</value>
   </data>
   <data name="pageHome.Text" xml:space="preserve">
     <value>Home</value>
@@ -1633,7 +1633,7 @@
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 723</value>
+    <value>0, 727</value>
   </data>
   <data name="itemExit.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -3203,7 +3203,7 @@ Konfiguration</value>
     <value>StatusMachine</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1634, 746</value>
+    <value>1642, 750</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroupTask.Name" xml:space="preserve">
     <value>RibbonPageGroupTask</value>

app/DD-Record-Organiser/frmMain.vb

@@ -569,7 +569,7 @@ Public Class frmMain
     End Sub
 
     Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs)
-        frmConfiguration_Basic.ShowDialog()
+        frmRecOrgConfig_Basic.ShowDialog()
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@@ -629,7 +629,7 @@ Public Class frmMain
         OpenImageManager()
     End Sub
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem2.ItemClick
-        frmConfiguration_Basic.ShowDialog()
+        frmRecOrgConfig_Basic.ShowDialog()
     End Sub
 
     Private Sub BarButtonItem10_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem10.ItemClick

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

@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmConfiguration_Basic
+Partial Class frmRecOrgConfig_Basic
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class frmConfiguration_Basic
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfiguration_Basic))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRecOrgConfig_Basic))
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()

app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb

@@ -1,11 +1,11 @@
 Imports DD_Rights
-Public Class frmConfiguration_Basic
+Public Class frmRecOrgConfig_Basic
     Dim loaded As Boolean = False
     Dim changes_ModuleKonfig As Boolean = False
     Dim changes_Konfig As Boolean = False
     Private Sub frmConfiguration_Basic_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            Dim sql As String = "select * from TBDD_MODULES where NAME = 'Record-Organizer'"
+            Dim sql As String = "select * from TBDD_MODULES where UPPER(NAME) = UPPER('Record-Organizer')"
             Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
             If Not dt Is Nothing Then
                 If dt.Rows.Count = 1 Then
@@ -22,11 +22,10 @@ Public Class frmConfiguration_Basic
                     End If
                 End If
             End If
-            sql = "select * from TBPMO_KONFIGURATION where GUID = 1"
+            sql = "select * from TBPMO_SERVICE_RIGHT_CONFIG where GUID = 1"
             dt = ClassDatabase.Return_Datatable(sql)
             If Not dt Is Nothing Then
                 If dt.Rows.Count = 1 Then
-                    Me.chkUnicode.Checked = dt.Rows(0).Item("WD_UNICODE")
                     Me.txtDomäne.Text = dt.Rows(0).Item("AD_DOMAIN")
                     Me.txtUser.Text = dt.Rows(0).Item("AD_USER")
                     Dim PWplainText As String
@@ -42,6 +41,13 @@ Public Class frmConfiguration_Basic
                     Me.txtServername.Text = dt.Rows(0).Item("AD_SERVER")
                 End If
             End If
+            sql = "select * from TBPMO_KONFIGURATION where GUID = 1"
+            dt = ClassDatabase.Return_Datatable(sql)
+            If Not dt Is Nothing Then
+                If dt.Rows.Count = 1 Then
+                    Me.chkUnicode.Checked = dt.Rows(0).Item("WD_UNICODE")
+                End If
+            End If
         Catch ex As Exception
             MsgBox("Error in Form Load: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -151,7 +157,7 @@ Public Class frmConfiguration_Basic
                 Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text)
                 Dim pw As String = cipherText
 
-                Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName)
+                Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName)
                 ClassDatabase.Execute_non_Query(upd)
                 btnsave.Enabled = False
             Else
@@ -160,7 +166,7 @@ Public Class frmConfiguration_Basic
         Catch ex As Exception
             MsgBox("Error in Check windream login: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
-      
+
     End Sub
 
     Private Sub txtDomäne_TextChanged(sender As Object, e As EventArgs) Handles txtDomäne.TextChanged