merge MS

Multiselect
MS
2023-08-02 08:14:51 +02:00 · 2023-08-02 08:11:40 +02:00 · 2023-07-27 14:30:57 +02:00 · 2023-07-24 16:00:32 +02:00 · 2023-07-20 14:12:24 +02:00 · 2023-05-22 16:55:44 +02:00
321 changed files with 115569 additions and 219666 deletions
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
--- a/Kopie/DD-Record-Organizer.vbproj
+++ b/Kopie/DD-Record-Organizer.vbproj
@@ -79,97 +79,104 @@
    <Reference Include="DD_Rights">
      <HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
    </Reference>
-    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Map.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Map.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.Pdf.v19.2.Drawing, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v21.2.Drawing, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v19.2.Wizard, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="DevExpress.XtraMap.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraCharts.v21.2.Wizard, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      
    </Reference>
-    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      
+    </Reference>
+    <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v19.2.Reporting.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v21.2.Core.Desktop, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraScheduler.v21.2.Extensions, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraScheduler.v21.2.Reporting.Extensions, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraWizard.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
    <Reference Include="DLLLicenseManager">
--- a/Kopie/DD-Record-Organizer.vbproj.bak
+++ b/Kopie/DD-Record-Organizer.vbproj.bak
@@ -79,94 +79,97 @@
    <Reference Include="DD_Rights">
      <HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
    </Reference>
-    <Reference Include="DevExpress.Charts.v15.2.Core, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll</HintPath>
+      
    </Reference>
-    <Reference Include="DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Map.v15.2.Core, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Map.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Map.v15.2.Core.dll</HintPath>
+      
    </Reference>
-    <Reference Include="DevExpress.Office.v15.2.Core, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Pdf.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll</HintPath>
+      
    </Reference>
-    <Reference Include="DevExpress.Pdf.v15.2.Drawing, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v19.2.Drawing, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.RichEdit.v15.2.Core, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Sparkline.v15.2.Core, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll</HintPath>
+      
    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v15.2.UI, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.UI.dll</HintPath>
+      
    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v15.2.Wizard, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.Wizard.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v19.2.Wizard, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      
+    </Reference>
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraMap.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraMap.v15.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraNavBar.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraMap.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      
+    </Reference>
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v15.2.Core, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v15.2.Extensions, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraScheduler.v15.2.Reporting.Extensions, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraTreeList.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraScheduler.v19.2.Reporting.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraWizard.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
    <Reference Include="DLLLicenseManager">
--- a/Kopie/frmChooseParentRecord.resx
+++ b/Kopie/frmChooseParentRecord.resx
@@ -183,8 +183,8 @@
  <data name="btnAddLink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Bottom, Right</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="GridView.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
@@ -233,7 +233,7 @@
    <value>Top, Left</value>
  </data>
  <data name="&gt;&gt;GridView.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -247,8 +247,8 @@
  <data name="&gt;&gt;btnAddLink.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="btncancel.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
@@ -725,7 +725,7 @@
    <value>1</value>
  </data>
  <data name="&gt;&gt;GridControl.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
    <value>0</value>
@@ -739,8 +739,8 @@
  <data name="GridControl.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="GridControl.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
--- a/Kopie/frmConstructorDesigner.en-US.resx
+++ b/Kopie/frmConstructorDesigner.en-US.resx
@@ -599,8 +599,8 @@ selected clients</value>
  <data name="lblSave.Text" xml:space="preserve">
    <value>Record saved!</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        OS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
--- a/Kopie/frmConstructorDesigner.en.resx
+++ b/Kopie/frmConstructorDesigner.en.resx
@@ -296,8 +296,8 @@
        lQAAAABJRU5ErkJggg==
 </value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu
        Ny4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
--- a/Kopie/frmConstructorDesigner.resx
+++ b/Kopie/frmConstructorDesigner.resx
@@ -1724,7 +1724,7 @@
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -2193,7 +2193,7 @@
    <value>XtraTabPage5</value>
  </data>
  <data name="&gt;&gt;XtraTabPage5.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage5.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -2364,7 +2364,7 @@
    <value>GridControl2</value>
  </data>
  <data name="&gt;&gt;GridControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl2.Parent" xml:space="preserve">
    <value>XtraTabPage7</value>
@@ -2562,7 +2562,7 @@
    <value>GridControlSupervisorAdd</value>
  </data>
  <data name="&gt;&gt;GridControlSupervisorAdd.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlSupervisorAdd.Parent" xml:space="preserve">
    <value>XtraTabPage7</value>
@@ -2678,7 +2678,7 @@
    <value>XtraTabPage7</value>
  </data>
  <data name="&gt;&gt;XtraTabPage7.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage7.Parent" xml:space="preserve">
    <value>XtraTabControlSV</value>
@@ -2930,7 +2930,7 @@
    <value>XtraTabPage8</value>
  </data>
  <data name="&gt;&gt;XtraTabPage8.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage8.Parent" xml:space="preserve">
    <value>XtraTabControlSV</value>
@@ -2942,7 +2942,7 @@
    <value>XtraTabControlSV</value>
  </data>
  <data name="&gt;&gt;XtraTabControlSV.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControlSV.Parent" xml:space="preserve">
    <value>XtraTabPage4</value>
@@ -3023,7 +3023,7 @@
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3086,7 +3086,7 @@
    <value>GridControlUserSQL</value>
  </data>
  <data name="&gt;&gt;GridControlUserSQL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUserSQL.Parent" xml:space="preserve">
    <value>TabPage1</value>
@@ -3602,7 +3602,7 @@
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3795,7 +3795,7 @@ Mandanten hinzu</value>
    <value>XtraTabPage6</value>
  </data>
  <data name="&gt;&gt;XtraTabPage6.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage6.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3807,7 +3807,7 @@ Mandanten hinzu</value>
    <value>XtraTabControl2</value>
  </data>
  <data name="&gt;&gt;XtraTabControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl2.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -3905,7 +3905,7 @@ Mandanten hinzu</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3923,7 +3923,7 @@ Mandanten hinzu</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -4042,8 +4042,8 @@ Mandanten hinzu</value>
  <data name="ImageCollection1.ImageSize" type="System.Drawing.Size, System.Drawing">
    <value>320, 240</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhDAMAAABR
@@ -9408,7 +9408,7 @@ Home Tab</value>
    <value>GridControlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Parent" xml:space="preserve">
    <value>$this</value>
@@ -9477,7 +9477,7 @@ Home Tab</value>
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -9716,37 +9716,37 @@ Home Tab</value>
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Name" xml:space="preserve">
    <value>GridColumn14</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname3.Name" xml:space="preserve">
    <value>colSurname3</value>
  </data>
  <data name="&gt;&gt;colSurname3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Name" xml:space="preserve">
    <value>GridColumn15</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Name" xml:space="preserve">
    <value>GridColumn16</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Name" xml:space="preserve">
    <value>GridColumn17</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
    <value>TBAD_UsersBindingSource</value>
@@ -9758,37 +9758,37 @@ Home Tab</value>
    <value>GridViewSupervisorsAdd</value>
  </data>
  <data name="&gt;&gt;GridViewSupervisorsAdd.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Name" xml:space="preserve">
    <value>GridColumn10</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname2.Name" xml:space="preserve">
    <value>colSurname2</value>
  </data>
  <data name="&gt;&gt;colSurname2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Name" xml:space="preserve">
    <value>GridColumn11</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Name" xml:space="preserve">
    <value>GridColumn12</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Name" xml:space="preserve">
    <value>GridColumn13</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_Users1BindingSource.Name" xml:space="preserve">
    <value>TBWH_Users1BindingSource</value>
@@ -9800,37 +9800,37 @@ Home Tab</value>
    <value>GridViewUserSQL</value>
  </data>
  <data name="&gt;&gt;GridViewUserSQL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname4.Name" xml:space="preserve">
    <value>colSurname4</value>
  </data>
  <data name="&gt;&gt;colSurname4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
    <value>GridColumn4</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
    <value>GridColumn5</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
    <value>GridColumn6</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID1.Name" xml:space="preserve">
    <value>colID1</value>
  </data>
  <data name="&gt;&gt;colID1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPlaceholder.Name" xml:space="preserve">
    <value>colPlaceholder</value>
@@ -9914,7 +9914,7 @@ Home Tab</value>
    <value>ImageCollection1</value>
  </data>
  <data name="&gt;&gt;ImageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager3.Name" xml:space="preserve">
    <value>TableAdapterManager3</value>
@@ -9932,73 +9932,73 @@ Home Tab</value>
    <value>GridViewlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname.Name" xml:space="preserve">
    <value>colSurname</value>
  </data>
  <data name="&gt;&gt;colSurname.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname1.Name" xml:space="preserve">
    <value>colSurname1</value>
  </data>
  <data name="&gt;&gt;colSurname1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Name" xml:space="preserve">
    <value>GridColumn7</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Name" xml:space="preserve">
    <value>GridColumn8</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Name" xml:space="preserve">
    <value>GridColumn9</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmConstructorDesigner</value>
--- a/Kopie/frmConstructorDesigner.resx.bak
+++ b/Kopie/frmConstructorDesigner.resx.bak
@@ -1724,7 +1724,7 @@
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -2193,7 +2193,7 @@
    <value>XtraTabPage5</value>
  </data>
  <data name="&gt;&gt;XtraTabPage5.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage5.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -2364,7 +2364,7 @@
    <value>GridControl2</value>
  </data>
  <data name="&gt;&gt;GridControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl2.Parent" xml:space="preserve">
    <value>XtraTabPage7</value>
@@ -2562,7 +2562,7 @@
    <value>GridControlSupervisorAdd</value>
  </data>
  <data name="&gt;&gt;GridControlSupervisorAdd.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlSupervisorAdd.Parent" xml:space="preserve">
    <value>XtraTabPage7</value>
@@ -2678,7 +2678,7 @@
    <value>XtraTabPage7</value>
  </data>
  <data name="&gt;&gt;XtraTabPage7.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage7.Parent" xml:space="preserve">
    <value>XtraTabControlSV</value>
@@ -2930,7 +2930,7 @@
    <value>XtraTabPage8</value>
  </data>
  <data name="&gt;&gt;XtraTabPage8.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage8.Parent" xml:space="preserve">
    <value>XtraTabControlSV</value>
@@ -2942,7 +2942,7 @@
    <value>XtraTabControlSV</value>
  </data>
  <data name="&gt;&gt;XtraTabControlSV.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControlSV.Parent" xml:space="preserve">
    <value>XtraTabPage4</value>
@@ -3023,7 +3023,7 @@
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3086,7 +3086,7 @@
    <value>GridControlUserSQL</value>
  </data>
  <data name="&gt;&gt;GridControlUserSQL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUserSQL.Parent" xml:space="preserve">
    <value>TabPage1</value>
@@ -3602,7 +3602,7 @@
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3795,7 +3795,7 @@ Mandanten hinzu</value>
    <value>XtraTabPage6</value>
  </data>
  <data name="&gt;&gt;XtraTabPage6.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage6.Parent" xml:space="preserve">
    <value>XtraTabControl2</value>
@@ -3807,7 +3807,7 @@ Mandanten hinzu</value>
    <value>XtraTabControl2</value>
  </data>
  <data name="&gt;&gt;XtraTabControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl2.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -3905,7 +3905,7 @@ Mandanten hinzu</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3923,7 +3923,7 @@ Mandanten hinzu</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -4042,8 +4042,8 @@ Mandanten hinzu</value>
  <data name="ImageCollection1.ImageSize" type="System.Drawing.Size, System.Drawing">
    <value>320, 240</value>
  </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhDAMAAABR
@@ -9408,7 +9408,7 @@ Home Tab</value>
    <value>GridControlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Parent" xml:space="preserve">
    <value>$this</value>
@@ -9477,7 +9477,7 @@ Home Tab</value>
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -9716,37 +9716,37 @@ Home Tab</value>
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Name" xml:space="preserve">
    <value>GridColumn14</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname3.Name" xml:space="preserve">
    <value>colSurname3</value>
  </data>
  <data name="&gt;&gt;colSurname3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Name" xml:space="preserve">
    <value>GridColumn15</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Name" xml:space="preserve">
    <value>GridColumn16</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Name" xml:space="preserve">
    <value>GridColumn17</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
    <value>TBAD_UsersBindingSource</value>
@@ -9758,37 +9758,37 @@ Home Tab</value>
    <value>GridViewSupervisorsAdd</value>
  </data>
  <data name="&gt;&gt;GridViewSupervisorsAdd.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Name" xml:space="preserve">
    <value>GridColumn10</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname2.Name" xml:space="preserve">
    <value>colSurname2</value>
  </data>
  <data name="&gt;&gt;colSurname2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Name" xml:space="preserve">
    <value>GridColumn11</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Name" xml:space="preserve">
    <value>GridColumn12</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Name" xml:space="preserve">
    <value>GridColumn13</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_Users1BindingSource.Name" xml:space="preserve">
    <value>TBWH_Users1BindingSource</value>
@@ -9800,37 +9800,37 @@ Home Tab</value>
    <value>GridViewUserSQL</value>
  </data>
  <data name="&gt;&gt;GridViewUserSQL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname4.Name" xml:space="preserve">
    <value>colSurname4</value>
  </data>
  <data name="&gt;&gt;colSurname4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
    <value>GridColumn4</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
    <value>GridColumn5</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
    <value>GridColumn6</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID1.Name" xml:space="preserve">
    <value>colID1</value>
  </data>
  <data name="&gt;&gt;colID1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPlaceholder.Name" xml:space="preserve">
    <value>colPlaceholder</value>
@@ -9914,7 +9914,7 @@ Home Tab</value>
    <value>ImageCollection1</value>
  </data>
  <data name="&gt;&gt;ImageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager3.Name" xml:space="preserve">
    <value>TableAdapterManager3</value>
@@ -9932,73 +9932,73 @@ Home Tab</value>
    <value>GridViewlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname.Name" xml:space="preserve">
    <value>colSurname</value>
  </data>
  <data name="&gt;&gt;colSurname.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname1.Name" xml:space="preserve">
    <value>colSurname1</value>
  </data>
  <data name="&gt;&gt;colSurname1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Name" xml:space="preserve">
    <value>GridColumn7</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Name" xml:space="preserve">
    <value>GridColumn8</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Name" xml:space="preserve">
    <value>GridColumn9</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmConstructorDesigner</value>
--- a/Kopie/frmConstructor_Main.aa.resx
+++ b/Kopie/frmConstructor_Main.aa.resx
@@ -525,8 +525,8 @@
        YeeS+f8oAthliF3DJcuXHIj5HF3s+vh/ffhfEpBNq5cTs/GzXUDUB9hlsqaYQE4mAAAAAElFTkSuQmCC
 </value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
--- a/Kopie/frmConstructor_Main.aa.resx.bak
+++ b/Kopie/frmConstructor_Main.aa.resx.bak
@@ -525,8 +525,8 @@
        YeeS+f8oAthliF3DJcuXHIj5HF3s+vh/ffhfEpBNq5cTs/GzXUDUB9hlsqaYQE4mAAAAAElFTkSuQmCC
 </value>
  </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
--- a/Kopie/frmConstructor_Main.en-US.resx
+++ b/Kopie/frmConstructor_Main.en-US.resx
@@ -1093,8 +1093,8 @@
  <data name="StatusStrip_Main.Size" type="System.Drawing.Size, System.Drawing">
    <value>1269, 32</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
--- a/Kopie/frmConstructor_Main.en-US.resx.bak
+++ b/Kopie/frmConstructor_Main.en-US.resx.bak
@@ -1093,8 +1093,8 @@
  <data name="StatusStrip_Main.Size" type="System.Drawing.Size, System.Drawing">
    <value>1269, 32</value>
  </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
--- a/Kopie/frmConstructor_Main.resx
+++ b/Kopie/frmConstructor_Main.resx
@@ -559,7 +559,7 @@
    <value>GridControlMain</value>
  </data>
  <data name="&gt;&gt;GridControlMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlMain.Parent" xml:space="preserve">
    <value>SplitContainerTop.Panel2</value>
@@ -729,7 +729,7 @@
    <value>SplitContainerTop</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -917,7 +917,7 @@
    <value>SplitContainerDetails</value>
  </data>
  <data name="&gt;&gt;SplitContainerDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerDetails.Parent" xml:space="preserve">
    <value>TabDetails</value>
@@ -1090,7 +1090,7 @@
    <value>TabDetails</value>
  </data>
  <data name="&gt;&gt;TabDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabDetails.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1126,7 +1126,7 @@
    <value>GridControlPos</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Parent" xml:space="preserve">
    <value>TabPos</value>
@@ -1380,7 +1380,7 @@
    <value>TabPos</value>
  </data>
  <data name="&gt;&gt;TabPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPos.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1439,7 +1439,7 @@
    <value>GridControlDocSearch</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Parent" xml:space="preserve">
    <value>TabWindream</value>
@@ -1541,7 +1541,7 @@
    <value>TabWindream</value>
  </data>
  <data name="&gt;&gt;TabWindream.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabWindream.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1972,7 +1972,7 @@
    <value>TabFollowUp</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2083,7 +2083,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>TabPageVariant</value>
@@ -2155,7 +2155,7 @@
    <value>TabPageVariant</value>
  </data>
  <data name="&gt;&gt;TabPageVariant.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPageVariant.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2181,8 +2181,8 @@
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>444, 17</value>
  </metadata>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
@@ -2196,7 +2196,7 @@
    <value>TreeList1</value>
  </data>
  <data name="&gt;&gt;TreeList1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TreeList1.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -2214,7 +2214,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2226,7 +2226,7 @@
    <value>TCDetails</value>
  </data>
  <data name="&gt;&gt;TCDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TCDetails.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -2250,7 +2250,7 @@
    <value>SplitContainerMain</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
    <value>SplitContainerFORM.Panel2</value>
@@ -2283,7 +2283,7 @@
    <value>SplitContainerFORM</value>
  </data>
  <data name="&gt;&gt;SplitContainerFORM.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerFORM.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3373,19 +3373,19 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grvwCarousel.Name" xml:space="preserve">
    <value>grvwCarousel</value>
  </data>
  <data name="&gt;&gt;grvwCarousel.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grvwTiles.Name" xml:space="preserve">
    <value>grvwTiles</value>
  </data>
  <data name="&gt;&gt;grvwTiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslbldisplayRecords.Name" xml:space="preserve">
    <value>tslbldisplayRecords</value>
@@ -3553,7 +3553,7 @@
    <value>grvwGridPos</value>
  </data>
  <data name="&gt;&gt;grvwGridPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
    <value>BindingNavigatorAddNewItem</value>
@@ -3655,7 +3655,7 @@
    <value>GridViewDoc_Search</value>
  </data>
  <data name="&gt;&gt;GridViewDoc_Search.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblWindreamView.Name" xml:space="preserve">
    <value>tslblWindreamView</value>
@@ -3721,43 +3721,43 @@
    <value>GridViewVariants</value>
  </data>
  <data name="&gt;&gt;GridViewVariants.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colREASON_CODE.Name" xml:space="preserve">
    <value>colREASON_CODE</value>
  </data>
  <data name="&gt;&gt;colREASON_CODE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Name" xml:space="preserve">
    <value>colCOMMENT</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colRECORD_ID.Name" xml:space="preserve">
    <value>colRECORD_ID</value>
  </data>
  <data name="&gt;&gt;colRECORD_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblVariantsCount.Name" xml:space="preserve">
    <value>tslblVariantsCount</value>
@@ -3787,7 +3787,7 @@
    <value>ImageCollection1</value>
  </data>
  <data name="&gt;&gt;ImageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;docCM_Open.Name" xml:space="preserve">
    <value>docCM_Open</value>
@@ -4045,7 +4045,7 @@
    <value>ToolTipController</value>
  </data>
  <data name="&gt;&gt;ToolTipController.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_RECORD_VARIANTTableAdapter.Name" xml:space="preserve">
    <value>TBPMO_RECORD_VARIANTTableAdapter</value>
--- a/Kopie/frmConstructor_Main.resx.bak
+++ b/Kopie/frmConstructor_Main.resx.bak
@@ -559,7 +559,7 @@
    <value>GridControlMain</value>
  </data>
  <data name="&gt;&gt;GridControlMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlMain.Parent" xml:space="preserve">
    <value>SplitContainerTop.Panel2</value>
@@ -729,7 +729,7 @@
    <value>SplitContainerTop</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -917,7 +917,7 @@
    <value>SplitContainerDetails</value>
  </data>
  <data name="&gt;&gt;SplitContainerDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerDetails.Parent" xml:space="preserve">
    <value>TabDetails</value>
@@ -1090,7 +1090,7 @@
    <value>TabDetails</value>
  </data>
  <data name="&gt;&gt;TabDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabDetails.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1126,7 +1126,7 @@
    <value>GridControlPos</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Parent" xml:space="preserve">
    <value>TabPos</value>
@@ -1380,7 +1380,7 @@
    <value>TabPos</value>
  </data>
  <data name="&gt;&gt;TabPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPos.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1439,7 +1439,7 @@
    <value>GridControlDocSearch</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Parent" xml:space="preserve">
    <value>TabWindream</value>
@@ -1541,7 +1541,7 @@
    <value>TabWindream</value>
  </data>
  <data name="&gt;&gt;TabWindream.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabWindream.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1972,7 +1972,7 @@
    <value>TabFollowUp</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2083,7 +2083,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>TabPageVariant</value>
@@ -2155,7 +2155,7 @@
    <value>TabPageVariant</value>
  </data>
  <data name="&gt;&gt;TabPageVariant.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPageVariant.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2181,8 +2181,8 @@
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>444, 17</value>
  </metadata>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
@@ -2196,7 +2196,7 @@
    <value>TreeList1</value>
  </data>
  <data name="&gt;&gt;TreeList1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TreeList1.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -2214,7 +2214,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -2226,7 +2226,7 @@
    <value>TCDetails</value>
  </data>
  <data name="&gt;&gt;TCDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TCDetails.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -2250,7 +2250,7 @@
    <value>SplitContainerMain</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
    <value>SplitContainerFORM.Panel2</value>
@@ -2283,7 +2283,7 @@
    <value>SplitContainerFORM</value>
  </data>
  <data name="&gt;&gt;SplitContainerFORM.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerFORM.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3373,19 +3373,19 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grvwCarousel.Name" xml:space="preserve">
    <value>grvwCarousel</value>
  </data>
  <data name="&gt;&gt;grvwCarousel.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grvwTiles.Name" xml:space="preserve">
    <value>grvwTiles</value>
  </data>
  <data name="&gt;&gt;grvwTiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslbldisplayRecords.Name" xml:space="preserve">
    <value>tslbldisplayRecords</value>
@@ -3553,7 +3553,7 @@
    <value>grvwGridPos</value>
  </data>
  <data name="&gt;&gt;grvwGridPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
    <value>BindingNavigatorAddNewItem</value>
@@ -3655,7 +3655,7 @@
    <value>GridViewDoc_Search</value>
  </data>
  <data name="&gt;&gt;GridViewDoc_Search.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblWindreamView.Name" xml:space="preserve">
    <value>tslblWindreamView</value>
@@ -3721,43 +3721,43 @@
    <value>GridViewVariants</value>
  </data>
  <data name="&gt;&gt;GridViewVariants.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colREASON_CODE.Name" xml:space="preserve">
    <value>colREASON_CODE</value>
  </data>
  <data name="&gt;&gt;colREASON_CODE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Name" xml:space="preserve">
    <value>colCOMMENT</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colRECORD_ID.Name" xml:space="preserve">
    <value>colRECORD_ID</value>
  </data>
  <data name="&gt;&gt;colRECORD_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblVariantsCount.Name" xml:space="preserve">
    <value>tslblVariantsCount</value>
@@ -3787,7 +3787,7 @@
    <value>ImageCollection1</value>
  </data>
  <data name="&gt;&gt;ImageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;docCM_Open.Name" xml:space="preserve">
    <value>docCM_Open</value>
@@ -4045,7 +4045,7 @@
    <value>ToolTipController</value>
  </data>
  <data name="&gt;&gt;ToolTipController.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_RECORD_VARIANTTableAdapter.Name" xml:space="preserve">
    <value>TBPMO_RECORD_VARIANTTableAdapter</value>
--- a/Kopie/frmCustomAppointment.resx
+++ b/Kopie/frmCustomAppointment.resx
@@ -121,8 +121,8 @@
  <data name="chkReminder.Properties.AutoHeight" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtStartTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtStartTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="&gt;&gt;cbReminder.ZOrder" xml:space="preserve">
@@ -138,7 +138,7 @@
    <value>23</value>
  </data>
  <data name="&gt;&gt;edtLabel.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentLabelEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentLabelEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="edtStartDate.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
@@ -160,7 +160,7 @@
    <value>True</value>
  </data>
  <data name="&gt;&gt;lblLocation.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;edtResource.ZOrder" xml:space="preserve">
    <value>0</value>
@@ -180,8 +180,8 @@
  <data name="edtStartDate.Properties.Mask.IgnoreMaskBlank" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtResources.ResourcesCheckedListBoxControl.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtResources.ResourcesCheckedListBoxControl.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
@@ -297,7 +297,7 @@
    <value>False</value>
  </data>
  <data name="&gt;&gt;edtResources.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentResourcesEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentResourcesEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;edtEndDate.Name" xml:space="preserve">
    <value>edtEndDate</value>
@@ -329,7 +329,7 @@
  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.EditMask" xml:space="preserve">
    <value>T</value>
  </data>
-  <data name="tbLocation.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="tbLocation.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="edtResources.ResourcesCheckedListBoxControl.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
@@ -348,12 +348,12 @@
    <value>True</value>
  </data>
  <data name="&gt;&gt;edtShowTimeAs.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentStatusEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentStatusEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbReminder.Parent" xml:space="preserve">
    <value>panel1</value>
  </data>
-  <data name="tbSubject.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="tbSubject.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>None</value>
  </data>
  <data name="&gt;&gt;edtStartTime.Name" xml:space="preserve">
@@ -392,7 +392,7 @@
  <data name="tbLocation.Properties.Mask.PlaceHolder" type="System.Char, mscorlib" xml:space="preserve">
    <value>_</value>
  </data>
-  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="txtControlID.Size" type="System.Drawing.Size, System.Drawing">
@@ -422,7 +422,7 @@
  <data name="&gt;&gt;tbDescription.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="edtStartTime.Properties.Mask.IgnoreMaskBlank" type="System.Boolean, mscorlib">
@@ -432,13 +432,13 @@
    <value>Horizontal</value>
  </data>
  <data name="&gt;&gt;chkReminder.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblPercentCompleteValue.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tbDescription.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="btnJumpToRecord.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
@@ -450,7 +450,7 @@
    <value>4</value>
  </data>
  <data name="&gt;&gt;tbProgress.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TrackBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TrackBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edtStartDate.Properties.Mask.PlaceHolder" type="System.Char, mscorlib" xml:space="preserve">
    <value>_</value>
@@ -459,7 +459,7 @@
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentForm, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentForm, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbReminder.Name" xml:space="preserve">
    <value>cbReminder</value>
@@ -488,7 +488,7 @@
  <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipTitle" xml:space="preserve">
    <value />
  </data>
-  <data name="edtEndDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
@@ -521,10 +521,10 @@
  <data name="&gt;&gt;txtControlID.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="edtShowTimeAs.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
+  <data name="edtShowTimeAs.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v21.2">
    <value>Near</value>
  </data>
-  <data name="edtResources.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtResources.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>None</value>
  </data>
  <data name="edtResources.Properties.Mask.SaveLiteral" type="System.Boolean, mscorlib">
@@ -543,9 +543,9 @@
    <value>panel1</value>
  </data>
  <data name="&gt;&gt;lblResource.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="edtEndDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="edtEndDate.Properties.CalendarTimeProperties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
@@ -554,7 +554,7 @@
  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.EditMask" xml:space="preserve">
    <value>T</value>
  </data>
-  <data name="edtStartDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtStartDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="edtShowTimeAs.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
@@ -576,10 +576,10 @@
    <value>True</value>
  </data>
  <data name="&gt;&gt;lblStartTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;edtEndTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edtResources.ResourcesCheckedListBoxControl.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
@@ -597,10 +597,10 @@
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblPercentComplete.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="chkAllDay.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
@@ -650,7 +650,7 @@
  <data name="edtResource.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <data name="tbLocation.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="tbLocation.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>None</value>
  </data>
  <data name="btnJumpToRecord.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -660,7 +660,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;edtStartTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblLocation.Name" xml:space="preserve">
    <value>lblLocation</value>
@@ -686,26 +686,26 @@
  <data name="&gt;&gt;edtEndTime.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="edtEndTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="&gt;&gt;chkAllDay.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edtResources.Properties.Mask.BeepOnError" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="edtStartTime.Properties.AutoHeight" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="&gt;&gt;btnDelete.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="edtStartDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtStartDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="chkReminder.Properties.DisplayValueChecked" xml:space="preserve">
@@ -718,7 +718,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;lblLabel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="txtRecordID.TabIndex" type="System.Int32, mscorlib">
    <value>30</value>
@@ -871,7 +871,7 @@
    <value />
  </data>
  <data name="&gt;&gt;btnRecurrence.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tbLocation.ZOrder" xml:space="preserve">
    <value>15</value>
@@ -912,7 +912,7 @@
  <data name="&gt;&gt;txtControlID.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
-  <data name="edtEndTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="cbReminder.Properties.NullValuePrompt" xml:space="preserve">
@@ -940,7 +940,7 @@
    <value>True</value>
  </data>
  <data name="&gt;&gt;cbReminder.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.DurationEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.DurationEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblLabel.Parent" xml:space="preserve">
    <value>panel1</value>
@@ -961,13 +961,13 @@
    <value>edtStartDate</value>
  </data>
  <data name="&gt;&gt;lblShowTimeAs.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;progressPanel.Name" xml:space="preserve">
    <value>progressPanel</value>
  </data>
  <data name="&gt;&gt;edtEndDate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="lblPercentComplete.Appearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
    <value>Regular</value>
@@ -984,7 +984,7 @@
  <data name="edtEndDate.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="edtResources.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtResources.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="tbLocation.Properties.NullValuePrompt" xml:space="preserve">
@@ -1018,9 +1018,9 @@
    <value>lblEndTime</value>
  </data>
  <data name="&gt;&gt;tbLocation.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="edtResource.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
+  <data name="edtResource.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v21.2">
    <value>Near</value>
  </data>
  <data name="&gt;&gt;tbDescription.Name" xml:space="preserve">
@@ -1039,7 +1039,7 @@
    <value>False</value>
  </data>
  <data name="&gt;&gt;lblSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1057,7 +1057,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="tbSubject.Properties.Mask.SaveLiteral" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1096,7 +1096,7 @@
    <value />
  </data>
  <data name="&gt;&gt;lblEndTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="tbSubject.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
@@ -1123,7 +1123,7 @@
    <value>9</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edtResources.ResourcesCheckedListBoxControl.MaximumSize" type="System.Drawing.Size, System.Drawing">
    <value>0, 0</value>
@@ -1155,7 +1155,7 @@
  <data name="&gt;&gt;tbDescription.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
-  <data name="edtStartTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtStartTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;edtEndDate.ZOrder" xml:space="preserve">
@@ -1165,7 +1165,7 @@
    <value>412, 316</value>
  </data>
  <data name="&gt;&gt;edtResource.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentResourceEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentResourceEdit, DevExpress.XtraScheduler.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;txtControlID.Parent" xml:space="preserve">
    <value>$this</value>
@@ -1188,13 +1188,13 @@
  <data name="&gt;&gt;lblLocation.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="edtLabel.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
+  <data name="edtLabel.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v21.2">
    <value>Near</value>
  </data>
  <data name="tbLocation.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
+  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v21.2">
    <value>DateTime</value>
  </data>
  <data name="edtResources.Properties.AutoHeight" type="System.Boolean, mscorlib">
@@ -1215,14 +1215,14 @@
  <data name="edtEndTime.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;tbSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;edtStartDate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;chkReminder.ZOrder" xml:space="preserve">
    <value>7</value>
@@ -1230,7 +1230,7 @@
  <data name="cbReminder.Properties.AutoHeight" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="tbSubject.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
+  <data name="tbSubject.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v21.2">
    <value>Default</value>
  </data>
  <data name="lblPercentCompleteValue.Appearance.FontSizeDelta" type="System.Int32, mscorlib">
--- a/app/DD-Record-Organizer
+++ b/app/DD-Record-Organizer
@@ -157,7 +157,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;ChartTopRight.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="ChartBottomLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -420,7 +420,7 @@
    <value>SplitContainerMain.Panel1</value>
  </data>
  <data name="&gt;&gt;ChartTopLeft.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Panel1.Name" xml:space="preserve">
    <value>SplitContainerTop.Panel1</value>
@@ -480,7 +480,7 @@
    <value>101, 22</value>
  </data>
  <data name="&gt;&gt;ChartBottomRight.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ToolStripBottomLeft.Name" xml:space="preserve">
    <value>ToolStripBottomLeft</value>
@@ -675,7 +675,7 @@
    <value>770, 25</value>
  </data>
  <data name="&gt;&gt;ChartBottomLeft.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>1160, 671</value>
--- a/Kopie/frmDiagrams.resx.bak
+++ b/Kopie/frmDiagrams.resx.bak
@@ -157,7 +157,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;ChartTopRight.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="ChartBottomLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -420,7 +420,7 @@
    <value>SplitContainerMain.Panel1</value>
  </data>
  <data name="&gt;&gt;ChartTopLeft.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerTop.Panel1.Name" xml:space="preserve">
    <value>SplitContainerTop.Panel1</value>
@@ -480,7 +480,7 @@
    <value>101, 22</value>
  </data>
  <data name="&gt;&gt;ChartBottomRight.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ToolStripBottomLeft.Name" xml:space="preserve">
    <value>ToolStripBottomLeft</value>
@@ -675,7 +675,7 @@
    <value>770, 25</value>
  </data>
  <data name="&gt;&gt;ChartBottomLeft.Type" xml:space="preserve">
-    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>1160, 671</value>
--- a/Kopie/frmDocLink_Record_Entities.resx
+++ b/Kopie/frmDocLink_Record_Entities.resx
@@ -181,7 +181,7 @@
    <value>dgEntityRecords</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Parent" xml:space="preserve">
    <value>SplitContainerControl1.Panel2</value>
@@ -205,7 +205,7 @@
    <value>SplitContainerControl1</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -921,7 +921,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDocLink_to_Record</value>
--- a/Kopie/frmDocLink_Record_Entities.resx.bak
+++ b/Kopie/frmDocLink_Record_Entities.resx.bak
@@ -181,7 +181,7 @@
    <value>dgEntityRecords</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Parent" xml:space="preserve">
    <value>SplitContainerControl1.Panel2</value>
@@ -205,7 +205,7 @@
    <value>SplitContainerControl1</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -921,7 +921,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDocLink_to_Record</value>
--- a/Kopie/frmDocRecordLink.resx
+++ b/Kopie/frmDocRecordLink.resx
@@ -244,7 +244,7 @@
    <value>dgEntityRecords</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Parent" xml:space="preserve">
    <value>$this</value>
@@ -1685,7 +1685,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tsslbl.Name" xml:space="preserve">
    <value>tsslbl</value>
--- a/Kopie/frmDocRecordLink.resx.bak
+++ b/Kopie/frmDocRecordLink.resx.bak
@@ -244,7 +244,7 @@
    <value>dgEntityRecords</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgEntityRecords.Parent" xml:space="preserve">
    <value>$this</value>
@@ -1685,7 +1685,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tsslbl.Name" xml:space="preserve">
    <value>tsslbl</value>
--- a/Kopie/frmDoc_Links.resx
+++ b/Kopie/frmDoc_Links.resx
@@ -217,7 +217,7 @@
    <value>dgRecords</value>
  </data>
  <data name="&gt;&gt;dgRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgRecords.Parent" xml:space="preserve">
    <value>$this</value>
@@ -429,7 +429,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDoc_Links</value>
--- a/Kopie/frmDoc_Links.resx.bak
+++ b/Kopie/frmDoc_Links.resx.bak
@@ -217,7 +217,7 @@
    <value>dgRecords</value>
  </data>
  <data name="&gt;&gt;dgRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;dgRecords.Parent" xml:space="preserve">
    <value>$this</value>
@@ -429,7 +429,7 @@
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDoc_Links</value>
--- a/Kopie/frmDoctype_NameConvention.resx
+++ b/Kopie/frmDoctype_NameConvention.resx
@@ -144,8 +144,8 @@
  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
    <value>80, 17</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="btnOK.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
@@ -155,7 +155,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="cmbDate.Items7" xml:space="preserve">
    <value>YYYYMMDD</value>
@@ -173,7 +173,7 @@
    <value>2</value>
  </data>
  <data name="&gt;&gt;colFORMAT_RULE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Label20.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 63</value>
@@ -269,7 +269,7 @@
    <value>GroupBox3</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="BindingNavigatorCountItem.ToolTipText" xml:space="preserve">
    <value>Die Gesamtanzahl der Elemente.</value>
@@ -335,7 +335,7 @@
    <value>90</value>
  </data>
  <data name="&gt;&gt;colPATTERN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;Label4.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -714,7 +714,7 @@
    <value>12, 93</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cmbEntity.Parent" xml:space="preserve">
    <value>GroupBox3</value>
@@ -922,8 +922,8 @@ genutzt werden.</value>
  <data name="GroupBox2.Text" xml:space="preserve">
    <value>Variablen einfügen:</value>
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;btnAddDivers.Name" xml:space="preserve">
@@ -1011,7 +1011,7 @@ genutzt werden.</value>
    <value>37</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnAddIndexA.Name" xml:space="preserve">
    <value>btnAddIndexA</value>
@@ -1193,7 +1193,7 @@ Indizes und Textbausteinen zusammenzustellen.</value>
    <value>203, 23</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="GroupBox3.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9.75pt, style=Bold</value>
@@ -1262,7 +1262,7 @@ Indizes und Textbausteinen zusammenzustellen.</value>
    <value>$this</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
    <value>141, 26</value>
@@ -1324,8 +1324,8 @@ Indizes und Textbausteinen zusammenzustellen.</value>
  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
    <value>448, 13</value>
  </data>
-  <assembly alias="DevExpress.XtraGrid.v19.2" name="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="colGUID.Fixed" type="DevExpress.XtraGrid.Columns.FixedStyle, DevExpress.XtraGrid.v19.2">
+  <assembly alias="DevExpress.XtraGrid.v21.2" name="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="colGUID.Fixed" type="DevExpress.XtraGrid.Columns.FixedStyle, DevExpress.XtraGrid.v21.2">
    <value>Left</value>
  </data>
  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
@@ -1388,8 +1388,8 @@ Indizes und Textbausteinen zusammenzustellen.</value>
  <data name="&gt;&gt;txtnamenKonv.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="colCHANGED_WHEN.Visible" type="System.Boolean, mscorlib">
--- a/app/DD-Record-Organizer
+++ b/app/DD-Record-Organizer
@@ -1332,7 +1332,7 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
    <value>ProgressPanel1</value>
  </data>
  <data name="&gt;&gt;ProgressPanel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ProgressPanel1.Parent" xml:space="preserve">
    <value>GroupBox1</value>
--- a/Kopie/frmEntities.resx.bak
+++ b/Kopie/frmEntities.resx.bak
@@ -1332,7 +1332,7 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
    <value>ProgressPanel1</value>
  </data>
  <data name="&gt;&gt;ProgressPanel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ProgressPanel1.Parent" xml:space="preserve">
    <value>GroupBox1</value>
--- a/app/DD-Record-Organizer
+++ b/app/DD-Record-Organizer
@@ -1051,7 +1051,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>GroupBox3</value>
@@ -1114,7 +1114,7 @@
    <value>GridControlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
    <value>GroupBox3</value>
@@ -2304,7 +2304,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2463,7 +2463,7 @@
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2490,7 +2490,7 @@
    <value>GridResult</value>
  </data>
  <data name="&gt;&gt;GridResult.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridResult.Parent" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -2508,7 +2508,7 @@
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2520,7 +2520,7 @@
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3035,31 +3035,31 @@
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
    <value>GridColumn4</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
    <value>GridColumn5</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
    <value>GridColumn6</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
    <value>TBAD_UsersBindingSource</value>
@@ -3071,31 +3071,31 @@
    <value>GridViewlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
    <value>BindingNavigatorAddNewItem</value>
@@ -3173,7 +3173,7 @@
    <value>grvwResult</value>
  </data>
  <data name="&gt;&gt;grvwResult.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_FOLLOW_UP_EMAILTableAdapter.Name" xml:space="preserve">
    <value>TBPMO_FOLLOW_UP_EMAILTableAdapter</value>
--- a/Kopie/frmGlobalSearch.resx
+++ b/Kopie/frmGlobalSearch.resx
@@ -169,7 +169,7 @@
    <value>GridControlRecords</value>
  </data>
  <data name="&gt;&gt;GridControlRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlRecords.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -253,7 +253,7 @@
    <value>GridControlFiles</value>
  </data>
  <data name="&gt;&gt;GridControlFiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlFiles.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -325,7 +325,7 @@
    <value>SplitContainerMain</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
    <value>$this</value>
@@ -689,7 +689,7 @@
    <value>GridViewRecords</value>
  </data>
  <data name="&gt;&gt;GridViewRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblRecordsResult.Name" xml:space="preserve">
    <value>tslblRecordsResult</value>
@@ -719,7 +719,7 @@
    <value>GridViewFiles</value>
  </data>
  <data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblDocView.Name" xml:space="preserve">
    <value>tslblDocView</value>
--- a/Kopie/frmGlobalSearch.resx.bak
+++ b/Kopie/frmGlobalSearch.resx.bak
@@ -169,7 +169,7 @@
    <value>GridControlRecords</value>
  </data>
  <data name="&gt;&gt;GridControlRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlRecords.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -253,7 +253,7 @@
    <value>GridControlFiles</value>
  </data>
  <data name="&gt;&gt;GridControlFiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlFiles.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -325,7 +325,7 @@
    <value>SplitContainerMain</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
    <value>$this</value>
@@ -689,7 +689,7 @@
    <value>GridViewRecords</value>
  </data>
  <data name="&gt;&gt;GridViewRecords.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblRecordsResult.Name" xml:space="preserve">
    <value>tslblRecordsResult</value>
@@ -719,7 +719,7 @@
    <value>GridViewFiles</value>
  </data>
  <data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblDocView.Name" xml:space="preserve">
    <value>tslblDocView</value>
--- a/Kopie/frmLanguage_Translator.resx
+++ b/Kopie/frmLanguage_Translator.resx
@@ -587,7 +587,7 @@
    <value>GridControlObjects</value>
  </data>
  <data name="&gt;&gt;GridControlObjects.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlObjects.Parent" xml:space="preserve">
    <value>Panel1</value>
@@ -1216,67 +1216,67 @@
    <value>grvwGridObjects</value>
  </data>
  <data name="&gt;&gt;grvwGridObjects.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colLANGUAGE_TYPE.Name" xml:space="preserve">
    <value>colLANGUAGE_TYPE</value>
  </data>
  <data name="&gt;&gt;colLANGUAGE_TYPE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSCREEN_ID.Name" xml:space="preserve">
    <value>colSCREEN_ID</value>
  </data>
  <data name="&gt;&gt;colSCREEN_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPMO_OBJECT_NAME.Name" xml:space="preserve">
    <value>colPMO_OBJECT_NAME</value>
  </data>
  <data name="&gt;&gt;colPMO_OBJECT_NAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCAPTION.Name" xml:space="preserve">
    <value>colCAPTION</value>
  </data>
  <data name="&gt;&gt;colCAPTION.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colHINT.Name" xml:space="preserve">
    <value>colHINT</value>
  </data>
  <data name="&gt;&gt;colHINT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO.Name" xml:space="preserve">
    <value>colCHANGED_WHO</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Name" xml:space="preserve">
    <value>colCHANGED_WHEN</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_LANGUAGE_OBJECTBindingSource.Name" xml:space="preserve">
    <value>TBPMO_LANGUAGE_OBJECTBindingSource</value>
--- a/Kopie/frmLogRecord.resx
+++ b/Kopie/frmLogRecord.resx
@@ -799,7 +799,7 @@ D.h. der alte und der Neue Wert werden gespeichert und können nachverfolgt werd
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -817,7 +817,7 @@ D.h. der alte und der Neue Wert werden gespeichert und können nachverfolgt werd
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
--- a/app/DD-Record-Organizer
+++ b/app/DD-Record-Organizer
@@ -2740,7 +2740,7 @@
    <value>RibbonStatusBar1</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -2752,7 +2752,7 @@
    <value>ribbonMain</value>
  </data>
  <data name="&gt;&gt;ribbonMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ribbonMain.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3758,361 +3758,361 @@
    <value>MainMenu</value>
  </data>
  <data name="&gt;&gt;MainMenu.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemSettings.Name" xml:space="preserve">
    <value>itemSettings</value>
  </data>
  <data name="&gt;&gt;itemSettings.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemScanInbox.Name" xml:space="preserve">
    <value>itemScanInbox</value>
  </data>
  <data name="&gt;&gt;itemScanInbox.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem19.Name" xml:space="preserve">
    <value>BarButtonItem19</value>
  </data>
  <data name="&gt;&gt;BarButtonItem19.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemInfo.Name" xml:space="preserve">
    <value>itemInfo</value>
  </data>
  <data name="&gt;&gt;itemInfo.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemAbout.Name" xml:space="preserve">
    <value>itemAbout</value>
  </data>
  <data name="&gt;&gt;itemAbout.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemExit.Name" xml:space="preserve">
    <value>itemExit</value>
  </data>
  <data name="&gt;&gt;itemExit.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelMachine.Name" xml:space="preserve">
    <value>LabelMachine</value>
  </data>
  <data name="&gt;&gt;LabelMachine.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelLoggedIn.Name" xml:space="preserve">
    <value>LabelLoggedIn</value>
  </data>
  <data name="&gt;&gt;LabelLoggedIn.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelVersion.Name" xml:space="preserve">
    <value>LabelVersion</value>
  </data>
  <data name="&gt;&gt;LabelVersion.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
    <value>BarButtonItem1</value>
  </data>
  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
    <value>BarButtonItem3</value>
  </data>
  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem4.Name" xml:space="preserve">
    <value>BarButtonItem4</value>
  </data>
  <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem5.Name" xml:space="preserve">
    <value>BarButtonItem5</value>
  </data>
  <data name="&gt;&gt;BarButtonItem5.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
    <value>BarButtonItem6</value>
  </data>
  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem7.Name" xml:space="preserve">
    <value>BarButtonItem7</value>
  </data>
  <data name="&gt;&gt;BarButtonItem7.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
    <value>BarButtonItem2</value>
  </data>
  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem10.Name" xml:space="preserve">
    <value>BarButtonItem10</value>
  </data>
  <data name="&gt;&gt;BarButtonItem10.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem12.Name" xml:space="preserve">
    <value>BarButtonItem12</value>
  </data>
  <data name="&gt;&gt;BarButtonItem12.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemConnections.Name" xml:space="preserve">
    <value>BarButtonItemConnections</value>
  </data>
  <data name="&gt;&gt;BarButtonItemConnections.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem15.Name" xml:space="preserve">
    <value>BarButtonItem15</value>
  </data>
  <data name="&gt;&gt;BarButtonItem15.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem16.Name" xml:space="preserve">
    <value>BarButtonItem16</value>
  </data>
  <data name="&gt;&gt;BarButtonItem16.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem17.Name" xml:space="preserve">
    <value>BarButtonItem17</value>
  </data>
  <data name="&gt;&gt;BarButtonItem17.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem18.Name" xml:space="preserve">
    <value>BarButtonItem18</value>
  </data>
  <data name="&gt;&gt;BarButtonItem18.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelLanguage.Name" xml:space="preserve">
    <value>LabelLanguage</value>
  </data>
  <data name="&gt;&gt;LabelLanguage.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem20.Name" xml:space="preserve">
    <value>BarButtonItem20</value>
  </data>
  <data name="&gt;&gt;BarButtonItem20.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSAPConnect.Name" xml:space="preserve">
    <value>BarButtonItemSAPConnect</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSAPConnect.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemStructureNOdes.Name" xml:space="preserve">
    <value>BarButtonItemStructureNOdes</value>
  </data>
  <data name="&gt;&gt;BarButtonItemStructureNOdes.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarSubItem1.Name" xml:space="preserve">
    <value>BarSubItem1</value>
  </data>
  <data name="&gt;&gt;BarSubItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem14.Name" xml:space="preserve">
    <value>BarButtonItem14</value>
  </data>
  <data name="&gt;&gt;BarButtonItem14.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem21.Name" xml:space="preserve">
    <value>BarButtonItem21</value>
  </data>
  <data name="&gt;&gt;BarButtonItem21.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem22.Name" xml:space="preserve">
    <value>BarButtonItem22</value>
  </data>
  <data name="&gt;&gt;BarButtonItem22.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem8.Name" xml:space="preserve">
    <value>BarButtonItem8</value>
  </data>
  <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem9.Name" xml:space="preserve">
    <value>BarButtonItem9</value>
  </data>
  <data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem23.Name" xml:space="preserve">
    <value>BarButtonItem23</value>
  </data>
  <data name="&gt;&gt;BarButtonItem23.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnGlobalSearch.Name" xml:space="preserve">
    <value>btnGlobalSearch</value>
  </data>
  <data name="&gt;&gt;btnGlobalSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelUser.Name" xml:space="preserve">
    <value>LabelUser</value>
  </data>
  <data name="&gt;&gt;LabelUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;bbtnItemViewsUser.Name" xml:space="preserve">
    <value>bbtnItemViewsUser</value>
  </data>
  <data name="&gt;&gt;bbtnItemViewsUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelProxyServer.Name" xml:space="preserve">
    <value>LabelProxyServer</value>
  </data>
  <data name="&gt;&gt;LabelProxyServer.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarSubItem2.Name" xml:space="preserve">
    <value>BarSubItem2</value>
  </data>
  <data name="&gt;&gt;BarSubItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem25.Name" xml:space="preserve">
    <value>BarButtonItem25</value>
  </data>
  <data name="&gt;&gt;BarButtonItem25.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;StatusPersonifiedLogin.Name" xml:space="preserve">
    <value>StatusPersonifiedLogin</value>
  </data>
  <data name="&gt;&gt;StatusPersonifiedLogin.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem13.Name" xml:space="preserve">
    <value>BarButtonItem13</value>
  </data>
  <data name="&gt;&gt;BarButtonItem13.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSwitchCon.Name" xml:space="preserve">
    <value>BarButtonItemSwitchCon</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSwitchCon.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelConString.Name" xml:space="preserve">
    <value>LabelConString</value>
  </data>
  <data name="&gt;&gt;LabelConString.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;StatusVersionDB.Name" xml:space="preserve">
    <value>StatusVersionDB</value>
  </data>
  <data name="&gt;&gt;StatusVersionDB.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageHome.Name" xml:space="preserve">
    <value>pageHome</value>
  </data>
  <data name="&gt;&gt;pageHome.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
    <value>RibbonPageGroup2</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm.Name" xml:space="preserve">
    <value>groupQuickAccessForm</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupSearchAllOver.Name" xml:space="preserve">
    <value>groupSearchAllOver</value>
  </data>
  <data name="&gt;&gt;groupSearchAllOver.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupConnManager.Name" xml:space="preserve">
    <value>RibbonPageGroupConnManager</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupConnManager.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageForms.Name" xml:space="preserve">
    <value>pageForms</value>
  </data>
  <data name="&gt;&gt;pageForms.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm2.Name" xml:space="preserve">
    <value>groupQuickAccessForm2</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageAdmin.Name" xml:space="preserve">
    <value>pageAdmin</value>
  </data>
  <data name="&gt;&gt;pageAdmin.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupProgram.Name" xml:space="preserve">
    <value>RibbonPageGroupProgram</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupProgram.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupTask.Name" xml:space="preserve">
    <value>RibbonPageGroupTask</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupTask.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupMenue.Name" xml:space="preserve">
    <value>RibbonPageGroupMenue</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupMenue.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
    <value>RibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;DefaultLookAndFeel1.Name" xml:space="preserve">
    <value>DefaultLookAndFeel1</value>
  </data>
  <data name="&gt;&gt;DefaultLookAndFeel1.Type" xml:space="preserve">
-    <value>DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem11.Name" xml:space="preserve">
    <value>BarButtonItem11</value>
  </data>
  <data name="&gt;&gt;BarButtonItem11.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TimerClose3Minutes.Name" xml:space="preserve">
    <value>TimerClose3Minutes</value>
@@ -4124,13 +4124,13 @@
    <value>RibbonPageGroup3</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarStaticItem1.Name" xml:space="preserve">
    <value>BarStaticItem1</value>
  </data>
  <data name="&gt;&gt;BarStaticItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TimerInformation.Name" xml:space="preserve">
    <value>TimerInformation</value>
@@ -4148,6 +4148,6 @@
    <value>frmMain</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/app/DD-Record-Organizer
+++ b/app/DD-Record-Organizer
@@ -2740,7 +2740,7 @@
    <value>RibbonStatusBar1</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -2752,7 +2752,7 @@
    <value>ribbonMain</value>
  </data>
  <data name="&gt;&gt;ribbonMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ribbonMain.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3758,361 +3758,361 @@
    <value>MainMenu</value>
  </data>
  <data name="&gt;&gt;MainMenu.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemSettings.Name" xml:space="preserve">
    <value>itemSettings</value>
  </data>
  <data name="&gt;&gt;itemSettings.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemScanInbox.Name" xml:space="preserve">
    <value>itemScanInbox</value>
  </data>
  <data name="&gt;&gt;itemScanInbox.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem19.Name" xml:space="preserve">
    <value>BarButtonItem19</value>
  </data>
  <data name="&gt;&gt;BarButtonItem19.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemInfo.Name" xml:space="preserve">
    <value>itemInfo</value>
  </data>
  <data name="&gt;&gt;itemInfo.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemAbout.Name" xml:space="preserve">
    <value>itemAbout</value>
  </data>
  <data name="&gt;&gt;itemAbout.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;itemExit.Name" xml:space="preserve">
    <value>itemExit</value>
  </data>
  <data name="&gt;&gt;itemExit.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelMachine.Name" xml:space="preserve">
    <value>LabelMachine</value>
  </data>
  <data name="&gt;&gt;LabelMachine.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelLoggedIn.Name" xml:space="preserve">
    <value>LabelLoggedIn</value>
  </data>
  <data name="&gt;&gt;LabelLoggedIn.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelVersion.Name" xml:space="preserve">
    <value>LabelVersion</value>
  </data>
  <data name="&gt;&gt;LabelVersion.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
    <value>BarButtonItem1</value>
  </data>
  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
    <value>BarButtonItem3</value>
  </data>
  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem4.Name" xml:space="preserve">
    <value>BarButtonItem4</value>
  </data>
  <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem5.Name" xml:space="preserve">
    <value>BarButtonItem5</value>
  </data>
  <data name="&gt;&gt;BarButtonItem5.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
    <value>BarButtonItem6</value>
  </data>
  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem7.Name" xml:space="preserve">
    <value>BarButtonItem7</value>
  </data>
  <data name="&gt;&gt;BarButtonItem7.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
    <value>BarButtonItem2</value>
  </data>
  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem10.Name" xml:space="preserve">
    <value>BarButtonItem10</value>
  </data>
  <data name="&gt;&gt;BarButtonItem10.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem12.Name" xml:space="preserve">
    <value>BarButtonItem12</value>
  </data>
  <data name="&gt;&gt;BarButtonItem12.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemConnections.Name" xml:space="preserve">
    <value>BarButtonItemConnections</value>
  </data>
  <data name="&gt;&gt;BarButtonItemConnections.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem15.Name" xml:space="preserve">
    <value>BarButtonItem15</value>
  </data>
  <data name="&gt;&gt;BarButtonItem15.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem16.Name" xml:space="preserve">
    <value>BarButtonItem16</value>
  </data>
  <data name="&gt;&gt;BarButtonItem16.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem17.Name" xml:space="preserve">
    <value>BarButtonItem17</value>
  </data>
  <data name="&gt;&gt;BarButtonItem17.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem18.Name" xml:space="preserve">
    <value>BarButtonItem18</value>
  </data>
  <data name="&gt;&gt;BarButtonItem18.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelLanguage.Name" xml:space="preserve">
    <value>LabelLanguage</value>
  </data>
  <data name="&gt;&gt;LabelLanguage.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem20.Name" xml:space="preserve">
    <value>BarButtonItem20</value>
  </data>
  <data name="&gt;&gt;BarButtonItem20.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSAPConnect.Name" xml:space="preserve">
    <value>BarButtonItemSAPConnect</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSAPConnect.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemStructureNOdes.Name" xml:space="preserve">
    <value>BarButtonItemStructureNOdes</value>
  </data>
  <data name="&gt;&gt;BarButtonItemStructureNOdes.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarSubItem1.Name" xml:space="preserve">
    <value>BarSubItem1</value>
  </data>
  <data name="&gt;&gt;BarSubItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem14.Name" xml:space="preserve">
    <value>BarButtonItem14</value>
  </data>
  <data name="&gt;&gt;BarButtonItem14.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem21.Name" xml:space="preserve">
    <value>BarButtonItem21</value>
  </data>
  <data name="&gt;&gt;BarButtonItem21.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem22.Name" xml:space="preserve">
    <value>BarButtonItem22</value>
  </data>
  <data name="&gt;&gt;BarButtonItem22.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem8.Name" xml:space="preserve">
    <value>BarButtonItem8</value>
  </data>
  <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem9.Name" xml:space="preserve">
    <value>BarButtonItem9</value>
  </data>
  <data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem23.Name" xml:space="preserve">
    <value>BarButtonItem23</value>
  </data>
  <data name="&gt;&gt;BarButtonItem23.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnGlobalSearch.Name" xml:space="preserve">
    <value>btnGlobalSearch</value>
  </data>
  <data name="&gt;&gt;btnGlobalSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelUser.Name" xml:space="preserve">
    <value>LabelUser</value>
  </data>
  <data name="&gt;&gt;LabelUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;bbtnItemViewsUser.Name" xml:space="preserve">
    <value>bbtnItemViewsUser</value>
  </data>
  <data name="&gt;&gt;bbtnItemViewsUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelProxyServer.Name" xml:space="preserve">
    <value>LabelProxyServer</value>
  </data>
  <data name="&gt;&gt;LabelProxyServer.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarSubItem2.Name" xml:space="preserve">
    <value>BarSubItem2</value>
  </data>
  <data name="&gt;&gt;BarSubItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem25.Name" xml:space="preserve">
    <value>BarButtonItem25</value>
  </data>
  <data name="&gt;&gt;BarButtonItem25.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;StatusPersonifiedLogin.Name" xml:space="preserve">
    <value>StatusPersonifiedLogin</value>
  </data>
  <data name="&gt;&gt;StatusPersonifiedLogin.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem13.Name" xml:space="preserve">
    <value>BarButtonItem13</value>
  </data>
  <data name="&gt;&gt;BarButtonItem13.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSwitchCon.Name" xml:space="preserve">
    <value>BarButtonItemSwitchCon</value>
  </data>
  <data name="&gt;&gt;BarButtonItemSwitchCon.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;LabelConString.Name" xml:space="preserve">
    <value>LabelConString</value>
  </data>
  <data name="&gt;&gt;LabelConString.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;StatusVersionDB.Name" xml:space="preserve">
    <value>StatusVersionDB</value>
  </data>
  <data name="&gt;&gt;StatusVersionDB.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageHome.Name" xml:space="preserve">
    <value>pageHome</value>
  </data>
  <data name="&gt;&gt;pageHome.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
    <value>RibbonPageGroup2</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm.Name" xml:space="preserve">
    <value>groupQuickAccessForm</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupSearchAllOver.Name" xml:space="preserve">
    <value>groupSearchAllOver</value>
  </data>
  <data name="&gt;&gt;groupSearchAllOver.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupConnManager.Name" xml:space="preserve">
    <value>RibbonPageGroupConnManager</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupConnManager.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageForms.Name" xml:space="preserve">
    <value>pageForms</value>
  </data>
  <data name="&gt;&gt;pageForms.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm2.Name" xml:space="preserve">
    <value>groupQuickAccessForm2</value>
  </data>
  <data name="&gt;&gt;groupQuickAccessForm2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pageAdmin.Name" xml:space="preserve">
    <value>pageAdmin</value>
  </data>
  <data name="&gt;&gt;pageAdmin.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupProgram.Name" xml:space="preserve">
    <value>RibbonPageGroupProgram</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupProgram.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupTask.Name" xml:space="preserve">
    <value>RibbonPageGroupTask</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupTask.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupMenue.Name" xml:space="preserve">
    <value>RibbonPageGroupMenue</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupMenue.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
    <value>RibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;DefaultLookAndFeel1.Name" xml:space="preserve">
    <value>DefaultLookAndFeel1</value>
  </data>
  <data name="&gt;&gt;DefaultLookAndFeel1.Type" xml:space="preserve">
-    <value>DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem11.Name" xml:space="preserve">
    <value>BarButtonItem11</value>
  </data>
  <data name="&gt;&gt;BarButtonItem11.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TimerClose3Minutes.Name" xml:space="preserve">
    <value>TimerClose3Minutes</value>
@@ -4124,13 +4124,13 @@
    <value>RibbonPageGroup3</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarStaticItem1.Name" xml:space="preserve">
    <value>BarStaticItem1</value>
  </data>
  <data name="&gt;&gt;BarStaticItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TimerInformation.Name" xml:space="preserve">
    <value>TimerInformation</value>
@@ -4148,6 +4148,6 @@
    <value>frmMain</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/Kopie/frmQuickStart_Images.resx
+++ b/Kopie/frmQuickStart_Images.resx
@@ -125,7 +125,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="btnSaveImage.TabIndex" type="System.Int32, mscorlib">
@@ -138,7 +138,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;colMENU_IMG.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;pbCurrent.Type" xml:space="preserve">
    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -219,8 +219,8 @@
  <data name="btnSaveImage.Enabled" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;ImageTableAdapter.Name" xml:space="preserve">
@@ -305,7 +305,7 @@
    <value>MiddleLeft</value>
  </data>
  <data name="&gt;&gt;colSEQUENCE_MENU.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>55, 13</value>
@@ -331,8 +331,8 @@
  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
    <value>13</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
@@ -344,8 +344,8 @@
  <data name="&gt;&gt;ImageBindingSource.Name" xml:space="preserve">
    <value>ImageBindingSource</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="colSEQUENCE_MENU.Visible" type="System.Boolean, mscorlib">
@@ -376,7 +376,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;colSHORT_TITLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;StatusStrip1.Type" xml:space="preserve">
    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -388,7 +388,7 @@
    <value>colFORM_TITLE</value>
  </data>
  <data name="&gt;&gt;gvMainView.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnSelectImage.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -433,7 +433,7 @@
    <value>77, 13</value>
  </data>
  <data name="&gt;&gt;colFORM_TITLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnDeleteImage.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -529,7 +529,7 @@
    <value>2</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
--- a/Kopie/frmRecordView.resx
+++ b/Kopie/frmRecordView.resx
@@ -520,7 +520,7 @@
    <value>TabDetails</value>
  </data>
  <data name="&gt;&gt;TabDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabDetails.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -981,7 +981,7 @@
    <value>TabFollowUp</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1008,7 +1008,7 @@
    <value>GridControlPos</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Parent" xml:space="preserve">
    <value>Panel1</value>
@@ -1236,7 +1236,7 @@
    <value>TabPos</value>
  </data>
  <data name="&gt;&gt;TabPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPos.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1248,7 +1248,7 @@
    <value>TCDetails</value>
  </data>
  <data name="&gt;&gt;TCDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TCDetails.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -1323,7 +1323,7 @@
    <value>GridControlDocSearch</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Parent" xml:space="preserve">
    <value>TabPageDoc</value>
@@ -1377,7 +1377,7 @@
    <value>TabPageDoc</value>
  </data>
  <data name="&gt;&gt;TabPageDoc.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPageDoc.Parent" xml:space="preserve">
    <value>TabControlBottom</value>
@@ -1485,7 +1485,7 @@
    <value>GridControlUsersSelection</value>
  </data>
  <data name="&gt;&gt;GridControlUsersSelection.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsersSelection.Parent" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -1672,7 +1672,7 @@ zuordnen</value>
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1768,7 +1768,7 @@ zuordnen</value>
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>XtraTabPage4</value>
@@ -1786,7 +1786,7 @@ zuordnen</value>
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1798,7 +1798,7 @@ zuordnen</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -2131,7 +2131,7 @@ zuordnen</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>TabControlBottom</value>
@@ -2143,7 +2143,7 @@ zuordnen</value>
    <value>TabControlBottom</value>
  </data>
  <data name="&gt;&gt;TabControlBottom.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabControlBottom.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -2421,7 +2421,7 @@ zuordnen</value>
    <value>grvwGridPos</value>
  </data>
  <data name="&gt;&gt;grvwGridPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
    <value>BindingNavigatorAddNewItem</value>
@@ -2505,7 +2505,7 @@ zuordnen</value>
    <value>GridViewDoc_Search</value>
  </data>
  <data name="&gt;&gt;GridViewDoc_Search.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblWindreamView.Name" xml:space="preserve">
    <value>tslblWindreamView</value>
@@ -2529,31 +2529,31 @@ zuordnen</value>
    <value>GridViewlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ColumnHeader3.Name" xml:space="preserve">
    <value>ColumnHeader3</value>
@@ -2583,43 +2583,43 @@ zuordnen</value>
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSTATE_DESC.Name" xml:space="preserve">
    <value>colSTATE_DESC</value>
  </data>
  <data name="&gt;&gt;colSTATE_DESC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Name" xml:space="preserve">
    <value>colCOMMENT</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
    <value>TableAdapterManager</value>
--- a/Kopie/frmRecordView.resx.bak
+++ b/Kopie/frmRecordView.resx.bak
@@ -520,7 +520,7 @@
    <value>TabDetails</value>
  </data>
  <data name="&gt;&gt;TabDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabDetails.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -981,7 +981,7 @@
    <value>TabFollowUp</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabFollowUp.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1008,7 +1008,7 @@
    <value>GridControlPos</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlPos.Parent" xml:space="preserve">
    <value>Panel1</value>
@@ -1236,7 +1236,7 @@
    <value>TabPos</value>
  </data>
  <data name="&gt;&gt;TabPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPos.Parent" xml:space="preserve">
    <value>TCDetails</value>
@@ -1248,7 +1248,7 @@
    <value>TCDetails</value>
  </data>
  <data name="&gt;&gt;TCDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TCDetails.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel1</value>
@@ -1323,7 +1323,7 @@
    <value>GridControlDocSearch</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlDocSearch.Parent" xml:space="preserve">
    <value>TabPageDoc</value>
@@ -1377,7 +1377,7 @@
    <value>TabPageDoc</value>
  </data>
  <data name="&gt;&gt;TabPageDoc.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabPageDoc.Parent" xml:space="preserve">
    <value>TabControlBottom</value>
@@ -1485,7 +1485,7 @@
    <value>GridControlUsersSelection</value>
  </data>
  <data name="&gt;&gt;GridControlUsersSelection.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsersSelection.Parent" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -1672,7 +1672,7 @@ zuordnen</value>
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1768,7 +1768,7 @@ zuordnen</value>
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>XtraTabPage4</value>
@@ -1786,7 +1786,7 @@ zuordnen</value>
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1798,7 +1798,7 @@ zuordnen</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>XtraTabPage1</value>
@@ -2131,7 +2131,7 @@ zuordnen</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>TabControlBottom</value>
@@ -2143,7 +2143,7 @@ zuordnen</value>
    <value>TabControlBottom</value>
  </data>
  <data name="&gt;&gt;TabControlBottom.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabControlBottom.Parent" xml:space="preserve">
    <value>SplitContainerMain.Panel2</value>
@@ -2421,7 +2421,7 @@ zuordnen</value>
    <value>grvwGridPos</value>
  </data>
  <data name="&gt;&gt;grvwGridPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
    <value>BindingNavigatorAddNewItem</value>
@@ -2505,7 +2505,7 @@ zuordnen</value>
    <value>GridViewDoc_Search</value>
  </data>
  <data name="&gt;&gt;GridViewDoc_Search.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;tslblWindreamView.Name" xml:space="preserve">
    <value>tslblWindreamView</value>
@@ -2529,31 +2529,31 @@ zuordnen</value>
    <value>GridViewlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ColumnHeader3.Name" xml:space="preserve">
    <value>ColumnHeader3</value>
@@ -2583,43 +2583,43 @@ zuordnen</value>
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSTATE_DESC.Name" xml:space="preserve">
    <value>colSTATE_DESC</value>
  </data>
  <data name="&gt;&gt;colSTATE_DESC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Name" xml:space="preserve">
    <value>colCOMMENT</value>
  </data>
  <data name="&gt;&gt;colCOMMENT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
    <value>TableAdapterManager</value>
--- a/Kopie/frmRecord_Changes.resx
+++ b/Kopie/frmRecord_Changes.resx
@@ -147,7 +147,7 @@
    <value>Horizontal</value>
  </data>
  <data name="&gt;&gt;colAddedWhen.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="BindingNavigatorMovePreviousItem.Text" xml:space="preserve">
    <value>Vorherige verschieben</value>
@@ -157,13 +157,13 @@
    <value />
  </data>
  <data name="&gt;&gt;grvwCarousel.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="GridControlSelection.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
    <value />
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="GridColumn2.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -236,7 +236,7 @@
    <value>BindingSource1</value>
  </data>
  <data name="&gt;&gt;GridControlSelection.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="colID.Width" type="System.Int32, mscorlib">
    <value>60</value>
@@ -254,7 +254,7 @@
    <value>CenterScreen</value>
  </data>
  <data name="&gt;&gt;colAddedwho.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grvwSelection.Name" xml:space="preserve">
    <value>grvwSelection</value>
@@ -271,8 +271,8 @@
  <data name="&gt;&gt;BindingSource1.Type" xml:space="preserve">
    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlSelection.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlSelection.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib">
@@ -389,8 +389,8 @@
  <data name="&gt;&gt;BindingNavigatorCountItem.Name" xml:space="preserve">
    <value>BindingNavigatorCountItem</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlSelection.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlSelection.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
@@ -424,7 +424,7 @@
    <value>23, 22</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="BindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -469,7 +469,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;grvwSelection.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="GridColumn2.Width" type="System.Int32, mscorlib">
    <value>400</value>
@@ -504,8 +504,8 @@
  <data name="BindingNavigatorMoveLastItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>23, 22</value>
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlSelection.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControlSelection.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorMovePreviousItem.Name" xml:space="preserve">
@@ -542,7 +542,7 @@
    <value>True</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 23</value>
--- a/Kopie/frmRight_Management.resx
+++ b/Kopie/frmRight_Management.resx
@@ -729,7 +729,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridControlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -957,7 +957,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -1381,127 +1381,127 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridViewlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname.Name" xml:space="preserve">
    <value>colSurname</value>
  </data>
  <data name="&gt;&gt;colSurname.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colFORM_TITLE.Name" xml:space="preserve">
    <value>colFORM_TITLE</value>
  </data>
  <data name="&gt;&gt;colFORM_TITLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Name" xml:space="preserve">
    <value>colUSERNAME</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME.Name" xml:space="preserve">
    <value>colNAME</value>
  </data>
  <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPRENAME.Name" xml:space="preserve">
    <value>colPRENAME</value>
  </data>
  <data name="&gt;&gt;colPRENAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEDIT_REC.Name" xml:space="preserve">
    <value>colEDIT_REC</value>
  </data>
  <data name="&gt;&gt;colEDIT_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADD_REC.Name" xml:space="preserve">
    <value>colADD_REC</value>
  </data>
  <data name="&gt;&gt;colADD_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDELETE_REC.Name" xml:space="preserve">
    <value>colDELETE_REC</value>
  </data>
  <data name="&gt;&gt;colDELETE_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADD_DOC.Name" xml:space="preserve">
    <value>colADD_DOC</value>
  </data>
  <data name="&gt;&gt;colADD_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colREAD_ONLY_DOC.Name" xml:space="preserve">
    <value>colREAD_ONLY_DOC</value>
  </data>
  <data name="&gt;&gt;colREAD_ONLY_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDELETE_DOC.Name" xml:space="preserve">
    <value>colDELETE_DOC</value>
  </data>
  <data name="&gt;&gt;colDELETE_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Name" xml:space="preserve">
    <value>colCHANGED_WHEN</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;USER_RIGHTSBindingSource.Name" xml:space="preserve">
    <value>USER_RIGHTSBindingSource</value>
--- a/Kopie/frmRight_Management.resx.bak
+++ b/Kopie/frmRight_Management.resx.bak
@@ -729,7 +729,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridControlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Menue.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -957,7 +957,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -1381,127 +1381,127 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende
    <value>GridViewlUsers2Menue</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Menue.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname.Name" xml:space="preserve">
    <value>colSurname</value>
  </data>
  <data name="&gt;&gt;colSurname.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colFORM_TITLE.Name" xml:space="preserve">
    <value>colFORM_TITLE</value>
  </data>
  <data name="&gt;&gt;colFORM_TITLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Name" xml:space="preserve">
    <value>colUSERNAME</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME.Name" xml:space="preserve">
    <value>colNAME</value>
  </data>
  <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPRENAME.Name" xml:space="preserve">
    <value>colPRENAME</value>
  </data>
  <data name="&gt;&gt;colPRENAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEDIT_REC.Name" xml:space="preserve">
    <value>colEDIT_REC</value>
  </data>
  <data name="&gt;&gt;colEDIT_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADD_REC.Name" xml:space="preserve">
    <value>colADD_REC</value>
  </data>
  <data name="&gt;&gt;colADD_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDELETE_REC.Name" xml:space="preserve">
    <value>colDELETE_REC</value>
  </data>
  <data name="&gt;&gt;colDELETE_REC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADD_DOC.Name" xml:space="preserve">
    <value>colADD_DOC</value>
  </data>
  <data name="&gt;&gt;colADD_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colREAD_ONLY_DOC.Name" xml:space="preserve">
    <value>colREAD_ONLY_DOC</value>
  </data>
  <data name="&gt;&gt;colREAD_ONLY_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDELETE_DOC.Name" xml:space="preserve">
    <value>colDELETE_DOC</value>
  </data>
  <data name="&gt;&gt;colDELETE_DOC.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Name" xml:space="preserve">
    <value>colCHANGED_WHEN</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;USER_RIGHTSBindingSource.Name" xml:space="preserve">
    <value>USER_RIGHTSBindingSource</value>
--- a/Kopie/frmScanFiles.resx
+++ b/Kopie/frmScanFiles.resx
@@ -213,7 +213,7 @@
    <value>PdfViewer1</value>
  </data>
  <data name="&gt;&gt;PdfViewer1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfViewer1.Parent" xml:space="preserve">
    <value>Panel1</value>
@@ -276,7 +276,7 @@
    <value>RibbonControl1</value>
  </data>
  <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
    <value>Panel1</value>
@@ -938,199 +938,199 @@
    <value>PdfFileOpenBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfFileOpenBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFileSaveAsBarItem1.Name" xml:space="preserve">
    <value>PdfFileSaveAsBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfFileSaveAsBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFilePrintBarItem1.Name" xml:space="preserve">
    <value>PdfFilePrintBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfFilePrintBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfPreviousPageBarItem1.Name" xml:space="preserve">
    <value>PdfPreviousPageBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfPreviousPageBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfNextPageBarItem1.Name" xml:space="preserve">
    <value>PdfNextPageBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfNextPageBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFindTextBarItem1.Name" xml:space="preserve">
    <value>PdfFindTextBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfFindTextBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoomOutBarItem1.Name" xml:space="preserve">
    <value>PdfZoomOutBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoomOutBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoomInBarItem1.Name" xml:space="preserve">
    <value>PdfZoomInBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoomInBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfExactZoomListBarSubItem1.Name" xml:space="preserve">
    <value>PdfExactZoomListBarSubItem1</value>
  </data>
  <data name="&gt;&gt;PdfExactZoomListBarSubItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom10CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom10CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom10CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom25CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom25CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom25CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom50CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom50CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom50CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom75CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom75CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom75CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom100CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom100CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom100CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom125CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom125CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom125CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom150CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom150CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom150CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom200CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom200CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom200CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom400CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom400CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom400CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoom500CheckItem1.Name" xml:space="preserve">
    <value>PdfZoom500CheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfZoom500CheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfSetActualSizeZoomModeCheckItem1.Name" xml:space="preserve">
    <value>PdfSetActualSizeZoomModeCheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfSetActualSizeZoomModeCheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfSetPageLevelZoomModeCheckItem1.Name" xml:space="preserve">
    <value>PdfSetPageLevelZoomModeCheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfSetPageLevelZoomModeCheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfSetFitWidthZoomModeCheckItem1.Name" xml:space="preserve">
    <value>PdfSetFitWidthZoomModeCheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfSetFitWidthZoomModeCheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfSetFitVisibleZoomModeCheckItem1.Name" xml:space="preserve">
    <value>PdfSetFitVisibleZoomModeCheckItem1</value>
  </data>
  <data name="&gt;&gt;PdfSetFitVisibleZoomModeCheckItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfExportFormDataBarItem1.Name" xml:space="preserve">
    <value>PdfExportFormDataBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfExportFormDataBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfExportFormDataBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfExportFormDataBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfImportFormDataBarItem1.Name" xml:space="preserve">
    <value>PdfImportFormDataBarItem1</value>
  </data>
  <data name="&gt;&gt;PdfImportFormDataBarItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfImportFormDataBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfImportFormDataBarItem, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfRibbonPage1.Name" xml:space="preserve">
    <value>PdfRibbonPage1</value>
  </data>
  <data name="&gt;&gt;PdfRibbonPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFileRibbonPageGroup1.Name" xml:space="preserve">
    <value>PdfFileRibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;PdfFileRibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfNavigationRibbonPageGroup1.Name" xml:space="preserve">
    <value>PdfNavigationRibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;PdfNavigationRibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfZoomRibbonPageGroup1.Name" xml:space="preserve">
    <value>PdfZoomRibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;PdfZoomRibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFormDataRibbonPage1.Name" xml:space="preserve">
    <value>PdfFormDataRibbonPage1</value>
  </data>
  <data name="&gt;&gt;PdfFormDataRibbonPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFormDataRibbonPage, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFormDataRibbonPage, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfFormDataBarPageGroup1.Name" xml:space="preserve">
    <value>PdfFormDataBarPageGroup1</value>
  </data>
  <data name="&gt;&gt;PdfFormDataBarPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfFormDataBarPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfFormDataBarPageGroup, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfBarController1.Name" xml:space="preserve">
    <value>PdfBarController1</value>
  </data>
  <data name="&gt;&gt;PdfBarController1.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;PdfBarController2.Name" xml:space="preserve">
    <value>PdfBarController2</value>
  </data>
  <data name="&gt;&gt;PdfBarController2.Type" xml:space="preserve">
-    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TimerCheckScanFiles.Name" xml:space="preserve">
    <value>TimerCheckScanFiles</value>
--- a/Kopie/frmTask_Management.resx
+++ b/Kopie/frmTask_Management.resx
@@ -1912,8 +1912,8 @@
  <data name="XtraTabPage1.Tooltip" xml:space="preserve">
    <value>Ordnen Sie in diesem Bereich die Workflows zu den Entitäten zu</value>
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="XtraTabPage1.TooltipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="XtraTabPage1.TooltipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>Information</value>
  </data>
  <data name="XtraTabPage1.TooltipTitle" xml:space="preserve">
@@ -1923,7 +1923,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1941,7 +1941,7 @@
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
--- a/Kopie/frmTask_Management.resx.bak
+++ b/Kopie/frmTask_Management.resx.bak
@@ -1912,8 +1912,8 @@
  <data name="XtraTabPage1.Tooltip" xml:space="preserve">
    <value>Ordnen Sie in diesem Bereich die Workflows zu den Entitäten zu</value>
  </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="XtraTabPage1.TooltipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="XtraTabPage1.TooltipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
    <value>Information</value>
  </data>
  <data name="XtraTabPage1.TooltipTitle" xml:space="preserve">
@@ -1923,7 +1923,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -1941,7 +1941,7 @@
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
--- a/Kopie/frmUserKonfig.resx
+++ b/Kopie/frmUserKonfig.resx
@@ -1881,7 +1881,7 @@
    <value>GridControlWH_Users1</value>
  </data>
  <data name="&gt;&gt;GridControlWH_Users1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlWH_Users1.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -1944,7 +1944,7 @@
    <value>GridControlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -2191,7 +2191,7 @@ matchen</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2239,7 +2239,7 @@ matchen</value>
    <value>GridControl2</value>
  </data>
  <data name="&gt;&gt;GridControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl2.Parent" xml:space="preserve">
    <value>TabGruppendefinition</value>
@@ -2607,7 +2607,7 @@ matchen</value>
    <value>TabGruppendefinition</value>
  </data>
  <data name="&gt;&gt;TabGruppendefinition.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabGruppendefinition.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2673,7 +2673,7 @@ matchen</value>
    <value>GridControlUsersinClient</value>
  </data>
  <data name="&gt;&gt;GridControlUsersinClient.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsersinClient.Parent" xml:space="preserve">
    <value>TabPage6</value>
@@ -2736,7 +2736,7 @@ matchen</value>
    <value>GridControlUser2Mandanten</value>
  </data>
  <data name="&gt;&gt;GridControlUser2Mandanten.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUser2Mandanten.Parent" xml:space="preserve">
    <value>TabPage6</value>
@@ -3453,7 +3453,7 @@ Mandant hinzufügen</value>
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3684,7 +3684,7 @@ Mandant hinzufügen</value>
    <value>GridControl3</value>
  </data>
  <data name="&gt;&gt;GridControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl3.Parent" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -3702,7 +3702,7 @@ Mandant hinzufügen</value>
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3714,7 +3714,7 @@ Mandant hinzufügen</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3906,7 +3906,7 @@ Mandant hinzufügen</value>
    <value>GridControlUser</value>
  </data>
  <data name="&gt;&gt;GridControlUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUser.Parent" xml:space="preserve">
    <value>$this</value>
@@ -4625,31 +4625,31 @@ Mandant hinzufügen</value>
    <value>GridViewWH_Users1</value>
  </data>
  <data name="&gt;&gt;GridViewWH_Users1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
    <value>GridColumn4</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
    <value>GridColumn5</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
    <value>GridColumn6</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
    <value>TBAD_UsersBindingSource</value>
@@ -4661,43 +4661,43 @@ Mandant hinzufügen</value>
    <value>GridViewlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView2.Name" xml:space="preserve">
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME1.Name" xml:space="preserve">
    <value>colNAME1</value>
  </data>
  <data name="&gt;&gt;colNAME1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ToolStripButton1.Name" xml:space="preserve">
    <value>ToolStripButton1</value>
@@ -4781,31 +4781,31 @@ Mandant hinzufügen</value>
    <value>GridViewUsersinClient</value>
  </data>
  <data name="&gt;&gt;GridViewUsersinClient.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Name" xml:space="preserve">
    <value>GridColumn11</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Name" xml:space="preserve">
    <value>GridColumn12</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Name" xml:space="preserve">
    <value>GridColumn13</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Name" xml:space="preserve">
    <value>GridColumn14</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_Users2BindingSource.Name" xml:space="preserve">
    <value>TBWH_Users2BindingSource</value>
@@ -4817,31 +4817,31 @@ Mandant hinzufügen</value>
    <value>GridViewUser2Mandanten</value>
  </data>
  <data name="&gt;&gt;GridViewUser2Mandanten.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Name" xml:space="preserve">
    <value>GridColumn7</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Name" xml:space="preserve">
    <value>GridColumn8</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Name" xml:space="preserve">
    <value>GridColumn9</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Name" xml:space="preserve">
    <value>GridColumn10</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBDD_CLIENTBindingSource.Name" xml:space="preserve">
    <value>TBDD_CLIENTBindingSource</value>
@@ -4943,31 +4943,31 @@ Mandant hinzufügen</value>
    <value>GridView3</value>
  </data>
  <data name="&gt;&gt;GridView3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Name" xml:space="preserve">
    <value>GridColumn15</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Name" xml:space="preserve">
    <value>GridColumn16</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Name" xml:space="preserve">
    <value>GridColumn17</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn18.Name" xml:space="preserve">
    <value>GridColumn18</value>
  </data>
  <data name="&gt;&gt;GridColumn18.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;VWPMO_USERS_GROUPSBindingSource.Name" xml:space="preserve">
    <value>VWPMO_USERS_GROUPSBindingSource</value>
@@ -5003,25 +5003,25 @@ Mandant hinzufügen</value>
    <value>GridViewUser</value>
  </data>
  <data name="&gt;&gt;GridViewUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Name" xml:space="preserve">
    <value>colUSERNAME</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME.Name" xml:space="preserve">
    <value>colNAME</value>
  </data>
  <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEMAIL.Name" xml:space="preserve">
    <value>colEMAIL</value>
  </data>
  <data name="&gt;&gt;colEMAIL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmUserKonfig</value>
--- a/Kopie/frmUserKonfig.resx.bak
+++ b/Kopie/frmUserKonfig.resx.bak
@@ -1881,7 +1881,7 @@
    <value>GridControlWH_Users1</value>
  </data>
  <data name="&gt;&gt;GridControlWH_Users1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlWH_Users1.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -1944,7 +1944,7 @@
    <value>GridControlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
    <value>TabPage2</value>
@@ -2191,7 +2191,7 @@ matchen</value>
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2239,7 +2239,7 @@ matchen</value>
    <value>GridControl2</value>
  </data>
  <data name="&gt;&gt;GridControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl2.Parent" xml:space="preserve">
    <value>TabGruppendefinition</value>
@@ -2607,7 +2607,7 @@ matchen</value>
    <value>TabGruppendefinition</value>
  </data>
  <data name="&gt;&gt;TabGruppendefinition.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TabGruppendefinition.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2673,7 +2673,7 @@ matchen</value>
    <value>GridControlUsersinClient</value>
  </data>
  <data name="&gt;&gt;GridControlUsersinClient.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsersinClient.Parent" xml:space="preserve">
    <value>TabPage6</value>
@@ -2736,7 +2736,7 @@ matchen</value>
    <value>GridControlUser2Mandanten</value>
  </data>
  <data name="&gt;&gt;GridControlUser2Mandanten.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUser2Mandanten.Parent" xml:space="preserve">
    <value>TabPage6</value>
@@ -3453,7 +3453,7 @@ Mandant hinzufügen</value>
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3684,7 +3684,7 @@ Mandant hinzufügen</value>
    <value>GridControl3</value>
  </data>
  <data name="&gt;&gt;GridControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl3.Parent" xml:space="preserve">
    <value>XtraTabPage3</value>
@@ -3702,7 +3702,7 @@ Mandant hinzufügen</value>
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3714,7 +3714,7 @@ Mandant hinzufügen</value>
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3906,7 +3906,7 @@ Mandant hinzufügen</value>
    <value>GridControlUser</value>
  </data>
  <data name="&gt;&gt;GridControlUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUser.Parent" xml:space="preserve">
    <value>$this</value>
@@ -4625,31 +4625,31 @@ Mandant hinzufügen</value>
    <value>GridViewWH_Users1</value>
  </data>
  <data name="&gt;&gt;GridViewWH_Users1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
    <value>GridColumn3</value>
  </data>
  <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
    <value>GridColumn4</value>
  </data>
  <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
    <value>GridColumn5</value>
  </data>
  <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
    <value>GridColumn6</value>
  </data>
  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
    <value>TBAD_UsersBindingSource</value>
@@ -4661,43 +4661,43 @@ Mandant hinzufügen</value>
    <value>GridViewlUsers2Group</value>
  </data>
  <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
    <value>GridColumn1</value>
  </data>
  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
    <value>GridColumn2</value>
  </data>
  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colID.Name" xml:space="preserve">
    <value>colID</value>
  </data>
  <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridView2.Name" xml:space="preserve">
    <value>GridView2</value>
  </data>
  <data name="&gt;&gt;GridView2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME1.Name" xml:space="preserve">
    <value>colNAME1</value>
  </data>
  <data name="&gt;&gt;colNAME1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ToolStripButton1.Name" xml:space="preserve">
    <value>ToolStripButton1</value>
@@ -4781,31 +4781,31 @@ Mandant hinzufügen</value>
    <value>GridViewUsersinClient</value>
  </data>
  <data name="&gt;&gt;GridViewUsersinClient.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Name" xml:space="preserve">
    <value>GridColumn11</value>
  </data>
  <data name="&gt;&gt;GridColumn11.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Name" xml:space="preserve">
    <value>GridColumn12</value>
  </data>
  <data name="&gt;&gt;GridColumn12.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Name" xml:space="preserve">
    <value>GridColumn13</value>
  </data>
  <data name="&gt;&gt;GridColumn13.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Name" xml:space="preserve">
    <value>GridColumn14</value>
  </data>
  <data name="&gt;&gt;GridColumn14.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_Users2BindingSource.Name" xml:space="preserve">
    <value>TBWH_Users2BindingSource</value>
@@ -4817,31 +4817,31 @@ Mandant hinzufügen</value>
    <value>GridViewUser2Mandanten</value>
  </data>
  <data name="&gt;&gt;GridViewUser2Mandanten.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Name" xml:space="preserve">
    <value>GridColumn7</value>
  </data>
  <data name="&gt;&gt;GridColumn7.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Name" xml:space="preserve">
    <value>GridColumn8</value>
  </data>
  <data name="&gt;&gt;GridColumn8.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Name" xml:space="preserve">
    <value>GridColumn9</value>
  </data>
  <data name="&gt;&gt;GridColumn9.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Name" xml:space="preserve">
    <value>GridColumn10</value>
  </data>
  <data name="&gt;&gt;GridColumn10.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBDD_CLIENTBindingSource.Name" xml:space="preserve">
    <value>TBDD_CLIENTBindingSource</value>
@@ -4943,31 +4943,31 @@ Mandant hinzufügen</value>
    <value>GridView3</value>
  </data>
  <data name="&gt;&gt;GridView3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Name" xml:space="preserve">
    <value>GridColumn15</value>
  </data>
  <data name="&gt;&gt;GridColumn15.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Name" xml:space="preserve">
    <value>GridColumn16</value>
  </data>
  <data name="&gt;&gt;GridColumn16.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Name" xml:space="preserve">
    <value>GridColumn17</value>
  </data>
  <data name="&gt;&gt;GridColumn17.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridColumn18.Name" xml:space="preserve">
    <value>GridColumn18</value>
  </data>
  <data name="&gt;&gt;GridColumn18.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;VWPMO_USERS_GROUPSBindingSource.Name" xml:space="preserve">
    <value>VWPMO_USERS_GROUPSBindingSource</value>
@@ -5003,25 +5003,25 @@ Mandant hinzufügen</value>
    <value>GridViewUser</value>
  </data>
  <data name="&gt;&gt;GridViewUser.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Name" xml:space="preserve">
    <value>colUSERNAME</value>
  </data>
  <data name="&gt;&gt;colUSERNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME.Name" xml:space="preserve">
    <value>colNAME</value>
  </data>
  <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEMAIL.Name" xml:space="preserve">
    <value>colEMAIL</value>
  </data>
  <data name="&gt;&gt;colEMAIL.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmUserKonfig</value>
--- a/Kopie/frmUserKonfig_AddUsers.resx
+++ b/Kopie/frmUserKonfig_AddUsers.resx
@@ -295,7 +295,7 @@
    <value>GridControlUsers</value>
  </data>
  <data name="&gt;&gt;GridControlUsers.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControlUsers.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
@@ -989,37 +989,37 @@
    <value>GridViewUsers</value>
  </data>
  <data name="&gt;&gt;GridViewUsers.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
    <value>colSelect</value>
  </data>
  <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colUsername.Name" xml:space="preserve">
    <value>colUsername</value>
  </data>
  <data name="&gt;&gt;colUsername.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPrename.Name" xml:space="preserve">
    <value>colPrename</value>
  </data>
  <data name="&gt;&gt;colPrename.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSurname.Name" xml:space="preserve">
    <value>colSurname</value>
  </data>
  <data name="&gt;&gt;colSurname.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEmail.Name" xml:space="preserve">
    <value>colEmail</value>
  </data>
  <data name="&gt;&gt;colEmail.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;ToolStripLabel2.Name" xml:space="preserve">
    <value>ToolStripLabel2</value>
@@ -1043,7 +1043,7 @@
    <value>ToolTipController1</value>
  </data>
  <data name="&gt;&gt;ToolTipController1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmUserKonfig_AddUsers</value>
--- a/Kopie/frmWM_DoctypeConfig.resx
+++ b/Kopie/frmWM_DoctypeConfig.resx
@@ -956,7 +956,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>GroupBox1</value>
@@ -2243,7 +2243,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2488,7 +2488,7 @@
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2847,7 +2847,7 @@
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3282,7 +3282,7 @@
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3294,7 +3294,7 @@
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3460,25 +3460,25 @@
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colBEZEICHNUNG.Name" xml:space="preserve">
    <value>colBEZEICHNUNG</value>
  </data>
  <data name="&gt;&gt;colBEZEICHNUNG.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colOBJEKTTYP.Name" xml:space="preserve">
    <value>colOBJEKTTYP</value>
  </data>
  <data name="&gt;&gt;colOBJEKTTYP.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colBESCHREIBUNG.Name" xml:space="preserve">
    <value>colBESCHREIBUNG</value>
  </data>
  <data name="&gt;&gt;colBESCHREIBUNG.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_DOKART_MODULEBindingSource.Name" xml:space="preserve">
    <value>TBWH_DOKART_MODULEBindingSource</value>
@@ -3826,7 +3826,7 @@
    <value>ToolTipController1</value>
  </data>
  <data name="&gt;&gt;ToolTipController1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmWM_DoctypeConfig</value>
--- a/Kopie/frmWM_DoctypeConfig.resx.bak
+++ b/Kopie/frmWM_DoctypeConfig.resx.bak
@@ -956,7 +956,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>GroupBox1</value>
@@ -2243,7 +2243,7 @@
    <value>XtraTabPage1</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2488,7 +2488,7 @@
    <value>XtraTabPage3</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -2847,7 +2847,7 @@
    <value>XtraTabPage2</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3282,7 +3282,7 @@
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Parent" xml:space="preserve">
    <value>XtraTabControl1</value>
@@ -3294,7 +3294,7 @@
    <value>XtraTabControl1</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -3460,25 +3460,25 @@
    <value>GridView1</value>
  </data>
  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colBEZEICHNUNG.Name" xml:space="preserve">
    <value>colBEZEICHNUNG</value>
  </data>
  <data name="&gt;&gt;colBEZEICHNUNG.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colOBJEKTTYP.Name" xml:space="preserve">
    <value>colOBJEKTTYP</value>
  </data>
  <data name="&gt;&gt;colOBJEKTTYP.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colBESCHREIBUNG.Name" xml:space="preserve">
    <value>colBESCHREIBUNG</value>
  </data>
  <data name="&gt;&gt;colBESCHREIBUNG.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBWH_DOKART_MODULEBindingSource.Name" xml:space="preserve">
    <value>TBWH_DOKART_MODULEBindingSource</value>
@@ -3826,7 +3826,7 @@
    <value>ToolTipController1</value>
  </data>
  <data name="&gt;&gt;ToolTipController1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmWM_DoctypeConfig</value>
--- a/Kopie/frmWM_Resultlist_Config.en-US.resx
+++ b/Kopie/frmWM_Resultlist_Config.en-US.resx
@@ -124,8 +124,8 @@
  <data name="GridMain.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridMain.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridMain.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="GridMain.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -144,15 +144,15 @@
  <data name="GridMain.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
    <value>0, 0</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridMain.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridMain.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="GridMain.EmbeddedNavigator.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridMain.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridMain.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="GridMain.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
--- a/Kopie/frmWM_Resultlist_Config.resx
+++ b/Kopie/frmWM_Resultlist_Config.resx
@@ -238,7 +238,7 @@
    <value>GridMain</value>
  </data>
  <data name="&gt;&gt;GridMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridMain.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel1</value>
@@ -1039,7 +1039,7 @@
    <value>GridControl1</value>
  </data>
  <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
    <value>SplitContainerControl1.Panel2</value>
@@ -1063,7 +1063,7 @@
    <value>SplitContainerControl1</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;SplitContainerControl1.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
@@ -1344,91 +1344,91 @@
    <value>grvwMain</value>
  </data>
  <data name="&gt;&gt;grvwMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
    <value>colGUID</value>
  </data>
  <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colENTITY_ID.Name" xml:space="preserve">
    <value>colENTITY_ID</value>
  </data>
  <data name="&gt;&gt;colENTITY_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colLANGUAGE.Name" xml:space="preserve">
    <value>colLANGUAGE</value>
  </data>
  <data name="&gt;&gt;colLANGUAGE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOLUMN_VIEW.Name" xml:space="preserve">
    <value>colCOLUMN_VIEW</value>
  </data>
  <data name="&gt;&gt;colCOLUMN_VIEW.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colHEADER_CAPTION.Name" xml:space="preserve">
    <value>colHEADER_CAPTION</value>
  </data>
  <data name="&gt;&gt;colHEADER_CAPTION.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colWIDTH.Name" xml:space="preserve">
    <value>colWIDTH</value>
  </data>
  <data name="&gt;&gt;colWIDTH.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colTYPE_ID.Name" xml:space="preserve">
    <value>colTYPE_ID</value>
  </data>
  <data name="&gt;&gt;colTYPE_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
    <value>colADDED_WHO</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
    <value>colADDED_WHEN</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO.Name" xml:space="preserve">
    <value>colCHANGED_WHO</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Name" xml:space="preserve">
    <value>colCHANGED_WHEN</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colVISIBLE.Name" xml:space="preserve">
    <value>colVISIBLE</value>
  </data>
  <data name="&gt;&gt;colVISIBLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colEDITABLE.Name" xml:space="preserve">
    <value>colEDITABLE</value>
  </data>
  <data name="&gt;&gt;colEDITABLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colNAME.Name" xml:space="preserve">
    <value>colNAME</value>
  </data>
  <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDBindingSource.Name" xml:space="preserve">
    <value>TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDBindingSource</value>
@@ -1458,67 +1458,67 @@
    <value>grvwCombobox</value>
  </data>
  <data name="&gt;&gt;grvwCombobox.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colGUID1.Name" xml:space="preserve">
    <value>colGUID1</value>
  </data>
  <data name="&gt;&gt;colGUID1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCONFIG_ID.Name" xml:space="preserve">
    <value>colCONFIG_ID</value>
  </data>
  <data name="&gt;&gt;colCONFIG_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colVALUE.Name" xml:space="preserve">
    <value>colVALUE</value>
  </data>
  <data name="&gt;&gt;colVALUE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colSEQUENCE.Name" xml:space="preserve">
    <value>colSEQUENCE</value>
  </data>
  <data name="&gt;&gt;colSEQUENCE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDEFAULT.Name" xml:space="preserve">
    <value>colDEFAULT</value>
  </data>
  <data name="&gt;&gt;colDEFAULT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCOLOR.Name" xml:space="preserve">
    <value>colCOLOR</value>
  </data>
  <data name="&gt;&gt;colCOLOR.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO1.Name" xml:space="preserve">
    <value>colADDED_WHO1</value>
  </data>
  <data name="&gt;&gt;colADDED_WHO1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN1.Name" xml:space="preserve">
    <value>colADDED_WHEN1</value>
  </data>
  <data name="&gt;&gt;colADDED_WHEN1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO1.Name" xml:space="preserve">
    <value>colCHANGED_WHO1</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHO1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN1.Name" xml:space="preserve">
    <value>colCHANGED_WHEN1</value>
  </data>
  <data name="&gt;&gt;colCHANGED_WHEN1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter.Name" xml:space="preserve">
    <value>TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter</value>
--- a/app/DD-Record-Organizer.sln
+++ b/app/DD-Record-Organizer.sln
@@ -1,9 +1,9 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD-Record-Organizer", "DD-Record-Organizer\DD-Record-Organizer.vbproj", "{BDCC148B-4C84-4A48-80CF-4C56057294E0}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OrgFlow", "DD-Record-Organizer\OrgFlow.vbproj", "{BDCC148B-4C84-4A48-80CF-4C56057294E0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RecordOrganizer_RightManager", "RecordOrganizer_RightManager\RecordOrganizer_RightManager.vbproj", "{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}"
 EndProject
--- a/app/DD-Record-Organizer/App.config
+++ b/app/DD-Record-Organizer/App.config
@@ -1,76 +1,128 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <connectionStrings>
-        <add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=ddd" providerName="System.Data.SqlClient"/>
-    </connectionStrings>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
-    </startup>
-    <userSettings>
-        <DD_Record_Organizer.My.MySettings>
-            <setting name="WD_ENTITYIMP_EXCLUDE" serializeAs="String">
-                <value>*.db</value>
-            </setting>
-            <setting name="WD_ENTITYIMP_FILTER" serializeAs="String">
-                <value>*.*</value>
-            </setting>
-            <setting name="WD_ENTITYIMP_IMPPATH" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="WD_ENTITYIMP_TARGETPATH" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="WD_ENTITYIMP_SAFETYPATH" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="WD_ENTITYIMP_OBJECTTYPE" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="WD_INDEXDOKART_SAVE" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="User_Calendar_isChild" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="User_DesignPanels_areChild" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="Constructor_DetailsSplitter" serializeAs="String">
-                <value>665</value>
-            </setting>
-            <setting name="User_InBoxScan_NotinFront" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="TBPMO_RIGHT_GROUPDataGridView" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="frmRecordViewSplitter" serializeAs="String">
-                <value>332</value>
-            </setting>
-            <setting name="TBPMO_RIGHT_USERDataGridView" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="UserDocIDIndexname" serializeAs="String">
-                <value>Dokument-ID</value>
-            </setting>
-            <setting name="SaveDocGridlayout" serializeAs="String">
-                <value>False</value>
-            </setting>
-        </DD_Record_Organizer.My.MySettings>
-    </userSettings>
-    <applicationSettings>
-        <DD_Record_Organizer.My.MySettings>
-            <setting name="windreamGruppe" serializeAs="String">
-                <value>sDigital Data - windream-Benutzer</value>
-            </setting>
-        </DD_Record_Organizer.My.MySettings>
-    </applicationSettings>
-</configuration>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <connectionStrings>
+    <add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString"
+      connectionString="Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
+      providerName="System.Data.SqlClient" />
+  </connectionStrings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+  </startup>
+  <userSettings>
+    <DD_Record_Organizer.My.MySettings>
+      <setting name="WD_ENTITYIMP_EXCLUDE" serializeAs="String">
+        <value>*.db</value>
+      </setting>
+      <setting name="WD_ENTITYIMP_FILTER" serializeAs="String">
+        <value>*.*</value>
+      </setting>
+      <setting name="WD_ENTITYIMP_IMPPATH" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="WD_ENTITYIMP_TARGETPATH" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="WD_ENTITYIMP_SAFETYPATH" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="WD_ENTITYIMP_OBJECTTYPE" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="WD_INDEXDOKART_SAVE" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="User_Calendar_isChild" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="User_DesignPanels_areChild" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="Constructor_DetailsSplitter" serializeAs="String">
+        <value>665</value>
+      </setting>
+      <setting name="User_InBoxScan_NotinFront" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="TBPMO_RIGHT_GROUPDataGridView" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="frmRecordViewSplitter" serializeAs="String">
+        <value>332</value>
+      </setting>
+      <setting name="TBPMO_RIGHT_USERDataGridView" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="UserDocIDIndexname" serializeAs="String">
+        <value>Dokument-ID</value>
+      </setting>
+      <setting name="UseAppConfigConString" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="EntFormsChild" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </DD_Record_Organizer.My.MySettings>
+  </userSettings>
+  <applicationSettings>
+    <DD_Record_Organizer.My.MySettings>
+      <setting name="windreamGruppe" serializeAs="String">
+        <value>sDigital Data - windream-Benutzer</value>
+      </setting>
+    </DD_Record_Organizer.My.MySettings>
+    <DevExpress.LookAndFeel.Design.AppSettings>
+      <setting name="DefaultAppSkin" serializeAs="String">
+        <value>Skin/Office 2019 White</value>
+      </setting>
+      <setting name="DefaultPalette" serializeAs="String">
+        <value>Yale</value>
+      </setting>
+      <setting name="TouchUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="CompactUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="TouchScaleFactor" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DirectX" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterUserSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterBonusSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="FontBehavior" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DefaultAppFont" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DPIAwarenessMode" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="CustomPaletteCollection" serializeAs="Xml">
+        <value />
+      </setting>
+    </DevExpress.LookAndFeel.Design.AppSettings>
+  </applicationSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/app/DD-Record-Organizer/ClassDatabase.vb
+++ b/app/DD-Record-Organizer/ClassDatabase.vb
@@ -1,493 +0,0 @@
-Imports Oracle.ManagedDataAccess.Client
-Imports System.Data.Odbc
-Imports System.Data.SqlClient
-
-Public Class ClassDatabase
-    Private Shared connectionString As String
-
-    Public Shared Function Init()
-        Try
-            connectionString = MyConnectionString
-            Dim SQLconnect As New SqlClient.SqlConnection
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn("Error in DatabaseInit: " & ex.Message)
-            Return False
-        End Try
-    End Function
-
-
-
-    Public Shared Function GetConnectionString(id As Integer)
-        Dim connectionString As String = ""
-        Try
-            'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id)
-            Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id, True)
-            If DTConnection.Rows.Count = 1 Then
-                Select Case DTConnection.Rows(0).Item("SQL_PROVIDER")
-                    Case "MS-SQL"
-                        If DTConnection.Rows(0).Item("USERNAME") = "WINAUTH" Then
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
-                        Else
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        End If
-                        ' connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                    Case "MS-SQLServer"
-                        If DTConnection.Rows(0).Item("USERNAME") = "WINAUTH" Then
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
-                        Else
-                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        End If
-                    Case "Oracle"
-                        If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then
-                            connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                               DTConnection.Rows(0).Item("DATENBANK") & ")));User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Persist Security Info=True;User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";Unicode=True"
-                        End If
-                    Case "ODBC"
-                        Dim conn As New OdbcConnection("dsn=" & DTConnection.Rows(0).Item("SERVER") & ";uid=" & DTConnection.Rows(0).Item("USERNAME") & ";pwd=" + DTConnection.Rows(0).Item("PASSWORD"))
-                        connectionString = conn.ConnectionString
-                    Case Else
-                        LOGGER.Warn("ConnectionType nicht integriert")
-                        MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
-                End Select
-            Else
-                LOGGER.Warn(" No entry for Connection-ID: " & id.ToString)
-            End If
-
-        Catch ex As Exception
-            LOGGER.Warn(" - Error in bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetConnectionString:")
-        End Try
-        Return connectionString
-    End Function
-    Public Shared Function Return_Datatable(Select_anweisung As String, Optional USE_PROXY As Boolean = False)
-        Try
-            Dim sw As New SW("Return_Datatable: " & Select_anweisung)
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-
-            If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
-            Else
-                SQLconnect.ConnectionString = connectionString
-            End If
-
-            If USE_PROXY = False Then
-                Console.WriteLine(Select_anweisung)
-            End If
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-            SQLcommand.CommandTimeout = 360
-            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-
-            sw.Done()
-
-            Return dt
-        Catch ex As Exception
-            MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            ' ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung)
-            LOGGER.Warn("Error in Return_Datatable: " & ex.Message)
-            LOGGER.Warn("SQL: " & Select_anweisung)
-            If (ex.Message.Contains("Ungültiger Objektname") Or ex.Message.Contains("Invalid Object Name")) And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                MsgBox("A database-object could not be found but synchronization of Proxyserver might be in action! So please try again in a few seconds/minutes!", MsgBoxStyle.Exclamation)
-            End If
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function MSSQL_ReturnDTWithConnection(connectionId As Integer, sql As String)
-        Try
-            Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
-            Dim match As System.Text.RegularExpressions.Match = regex.Match(sql)
-
-            If match.Success Then
-                'Return Nothing
-            End If
-
-            Dim connectionString As String
-            connectionString = ClassDatabase.GetConnectionString(connectionId)
-            If connectionString <> "" Then
-
-                Dim SQLconnect As New SqlClient.SqlConnection
-                Dim SQLcommand As SqlClient.SqlCommand
-                SQLconnect.ConnectionString = connectionString
-                SQLconnect.Open()
-                SQLcommand = SQLconnect.CreateCommand
-                SQLcommand.CommandText = sql
-
-                Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-                Dim dt As DataTable = New DataTable()
-                adapter1.Fill(dt)
-                SQLconnect.Close()
-                Return dt
-            Else
-                MsgBox("No Connection received for ID: " & connectionId.ToString, MsgBoxStyle.Exclamation)
-                Return Nothing
-            End If
-
-        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & sql)
-            MsgBox("Unexpected Error in MSSQL_ReturnDTWithConnection:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & sql, MsgBoxStyle.Critical)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Return_Datatable_CS(Select_anweisung As String, ConString As String, Optional userInput As Boolean = False)
-        Try
-            Dim sw As New SW("Return_Datatable_CS: " & Select_anweisung)
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = ConString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-
-            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-
-            sw.Done()
-
-            Return dt
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Warn("Error in Return_Datatable_CS: " & ex.Message)
-            LOGGER.Warn("#SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Return_Datatable_Connection(Select_anweisung As String, connectionId As Integer, Optional userInput As Boolean = False)
-        Try
-            Dim sw As New SW("Return_Datatable_Connection: " & Select_anweisung)
-            Dim connectionString As String
-            connectionString = ClassDatabase.GetConnectionString(connectionId)
-            If connectionString <> "" Then
-
-
-                Dim SQLconnect As New SqlClient.SqlConnection
-                Dim SQLcommand As SqlClient.SqlCommand
-                SQLconnect.ConnectionString = connectionString
-                SQLconnect.Open()
-                SQLcommand = SQLconnect.CreateCommand
-                SQLcommand.CommandText = Select_anweisung
-
-                Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-                Dim dt As DataTable = New DataTable()
-                adapter1.Fill(dt)
-                SQLconnect.Close()
-                sw.Done()
-
-                Return dt
-            Else
-                Return Nothing
-            End If
-
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Return_Datatable_Connection - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Warn("Error in Return_Datatable_Connection: " & ex.Message)
-            LOGGER.Warn("#SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Execute_non_Query(ExecuteCMD As String, Optional USE_PROXY As Boolean = False)
-        Try
-            Dim sw As New SW("Execute_non_Query: " & ExecuteCMD)
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
-            Else
-                SQLconnect.ConnectionString = connectionString
-            End If
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.CommandTimeout = 120
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-
-            sw.Done()
-
-            Return True
-        Catch ex As Exception
-            'If Userinput = True Then
-            '    MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
-            'End If
-            LOGGER.Warn("Error in Execute_non_Query: " & ex.Message)
-            LOGGER.Warn("SQL: " & ExecuteCMD)
-
-            Return False
-        End Try
-    End Function
-
-    Public Shared Function Execute_non_Query_withConn(ExecuteCMD As String, ConnID As Integer)
-        Try
-            Dim sw As New SW("Execute_non_Query_withConn: " & ExecuteCMD)
-
-            Dim connectionString As String
-            connectionString = ClassDatabase.GetConnectionString(ConnID)
-            If connectionString <> "" Then
-                Dim SQLconnect As New SqlClient.SqlConnection
-                Dim SQLcommand As SqlClient.SqlCommand
-                SQLconnect.ConnectionString = connectionString
-                SQLconnect.Open()
-                SQLcommand = SQLconnect.CreateCommand
-                'Update Last Created Record in Foo
-                SQLcommand.CommandText = ExecuteCMD
-                SQLcommand.CommandTimeout = 120
-                SQLcommand.ExecuteNonQuery()
-                SQLcommand.Dispose()
-                SQLconnect.Close()
-
-                sw.Done()
-
-                Return True
-            Else
-                MsgBox("No ConnectionID for Conn-ID: " & ConnID.ToString, MsgBoxStyle.Exclamation)
-                Return Nothing
-            End If
-
-        Catch ex As Exception
-            LOGGER.Warn("Error in Execute_non_Query_withConn: " & ex.Message)
-            LOGGER.Warn("SQL: " & ExecuteCMD)
-            Return False
-        End Try
-    End Function
-    Public Shared Function Execute_non_Query_withConnString(ExecuteCMD As String, theconnstring As String)
-        Try
-            Dim sw As New SW("Execute_non_Query_withConnString: " & ExecuteCMD)
-
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = theconnstring
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.CommandTimeout = 120
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-
-            sw.Done()
-
-            Return True
-
-
-        Catch ex As Exception
-            LOGGER.Warn("Error in Execute_non_Query_withConnString: " & ex.Message)
-            LOGGER.Warn("SQL: " & ExecuteCMD)
-            Return False
-        End Try
-    End Function
-    'TODO: Asynchrone Abfrage möglich machen
-    Public Shared Sub Execute_non_Query_Async(ExecuteCMD As String, Optional Userinput As Boolean = False)
-        Dim SQLconnect As New SqlClient.SqlConnection
-        Dim SQLcommand As SqlClient.SqlCommand
-        Dim callback As New AsyncCallback(AddressOf Execute_non_Query_Async_Callback)
-
-        Try
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand()
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.CommandTimeout = 120
-
-            SQLcommand.BeginExecuteNonQuery(callback, SQLcommand)
-        Catch ex As Exception
-            If Userinput = True Then
-                MsgBox("Error in Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Warn("Error in Execute_non_Query_Async: " & ex.Message)
-            LOGGER.Warn("SQL: " & ExecuteCMD)
-        Finally
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-        End Try
-    End Sub
-
-    Private Shared Sub Execute_non_Query_Async_Callback(ByVal result As IAsyncResult)
-        Dim command As SqlClient.SqlCommand = CType(result.AsyncState, SqlClient.SqlCommand)
-        Dim res = command.EndExecuteNonQuery(result)
-
-        LOGGER.Warn(String.Format("Finished executing Async database operation: {0}", command.CommandText))
-    End Sub
-
-    Public Shared Function Execute_Scalar(cmdscalar As String, Optional USE_PROXY As Boolean = False)
-        Dim result
-        Try
-            Dim sw As New SW("Execute_Scalar: " & cmdscalar)
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
-            Else
-                SQLconnect.ConnectionString = connectionString
-            End If
-            If USE_PROXY = False Then
-                Console.WriteLine(cmdscalar)
-            End If
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = cmdscalar
-            SQLcommand.CommandTimeout = 120
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-
-            sw.Done()
-
-            Return result
-        Catch ex As Exception
-            'If Userinput = True Then
-            '    MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
-            'End If
-            LOGGER.Warn("Error in Execute_Scalar: " & ex.Message)
-            LOGGER.Warn("SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-
-    Public Shared Function Execute_ScalarWithConnection(connectionId As Integer, cmdscalar As String)
-        Dim result
-        Try
-            Dim connectionString As String
-            connectionString = ClassDatabase.GetConnectionString(connectionId)
-            If connectionString <> "" Then
-                Dim SQLconnect As New SqlClient.SqlConnection
-                Dim SQLcommand As SqlClient.SqlCommand
-                SQLconnect.ConnectionString = connectionString
-                SQLconnect.Open()
-                SQLcommand = SQLconnect.CreateCommand
-                'Update Last Created Record in Foo
-                SQLcommand.CommandText = cmdscalar
-                SQLcommand.CommandTimeout = 120
-                result = SQLcommand.ExecuteScalar()
-                SQLcommand.Dispose()
-                SQLconnect.Close()
-                Return result
-            Else
-                MsgBox("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar, MsgBoxStyle.Exclamation)
-                LOGGER.Warn("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar)
-                Return Nothing
-            End If
-
-        Catch ex As Exception
-            LOGGER.Warn("Error in Execute_ScalarWithConnection: " & ex.Message)
-            LOGGER.Warn("SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function Execute_ScalarWithConnectionString(connectionString As String, cmdscalar As String)
-        Dim result
-        Try
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = cmdscalar
-            SQLcommand.CommandTimeout = 120
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return result
-        Catch ex As Exception
-            LOGGER.Warn("Error in Execute_ScalarWithConnectionString: " & ex.Message)
-            LOGGER.Warn("SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-
-    Public Shared Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
-        Dim result
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As New OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = cmdscalar
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return result
-        Catch ex As Exception
-            LOGGER.Warn("Error in OracleExecute_Scalar: " & ex.Message)
-            LOGGER.Warn("#SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False)
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Warn("Error in OracleExecute_non_Query: " & ex.Message)
-            LOGGER.Warn("#SQL: " & ExecuteCMD)
-
-            Return False
-        End Try
-    End Function
-
-    Public Shared Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False)
-        Try
-            Dim SQLconnect As New OracleConnection
-            Dim SQLcommand As OracleCommand
-            SQLconnect.ConnectionString = OracleConnection
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-
-            Dim adapter1 As OracleDataAdapter = New OracleDataAdapter(SQLcommand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-            Return dt
-        Catch ex As Exception
-            If userInput = True Then
-                MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            End If
-            LOGGER.Warn("Error in Oracle_Return_Datatable: " & ex.Message)
-            LOGGER.Warn("#SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-End Class
--- a/app/DD-Record-Organizer/Classes/ClassAsyncReturnDT.vb
+++ b/app/DD-Record-Organizer/Classes/ClassAsyncReturnDT.vb
@@ -10,6 +10,6 @@ Public Class ClassAsyncReturnDT
        Me.sql = sqlCommand
    End Sub
    Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork
-        Me.dt = ClassDatabase.Return_Datatable(Me.sql)
+        Me.dt = MYDB_ECM.GetDatatable(Me.sql)
    End Sub
 End Class
--- a/app/DD-Record-Organizer/Classes/ClassAsyncSQL.vb
+++ b/app/DD-Record-Organizer/Classes/ClassAsyncSQL.vb
@@ -13,6 +13,6 @@ Public Class ClassAsyncSQL
    End Sub

    Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork
-        Me.dt = ClassDatabase.Return_Datatable(Me.sql, True)
+        Me.dt = MYDB_ECM.GetDatatable(Me.sql)
    End Sub
 End Class
--- a/app/DD-Record-Organizer/Classes/ClassBackgroundHelper.vb
+++ b/app/DD-Record-Organizer/Classes/ClassBackgroundHelper.vb
--- a/app/DD-Record-Organizer/Classes/ClassConfig.vb
+++ b/app/DD-Record-Organizer/Classes/ClassConfig.vb
@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Config.ConfigAttributes
+Imports DigitalData.Modules.Logging
+
+Public Class ClassConfig
+    ' Global Settings (from computerconfig, overridable by userconfig)
+    <ConnectionString>
+    Public Property ConnectionString As String = ""
+    ' Misc Settings
+    Public Property DEBUG As Boolean = False
+
+End Class
--- a/app/DD-Record-Organizer/Classes/ClassConstructors.vb
+++ b/app/DD-Record-Organizer/Classes/ClassConstructors.vb
@@ -6,14 +6,14 @@
        Dim sql = String.Format("Select DISTINCT T.GUID, T2.ENTITY_ID FROM TBPMO_FORM_CONSTRUCTOR T, TBPMO_FORM_CONSTRUCTOR_DETAIL T1, " &
                                "TBPMO_STRUCTURE_NODES_CONFIGURATION T2 WHERE T.GUID = T1.CONSTRUCT_ID And T1.FORM_ID = T2.ENTITY_ID " &
                                "And T.GUID In (Select CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE USER_ID = {0})", USER_GUID)
-        Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+        Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
        For Each rowconstruct As DataRow In DT.Rows
            Try
                Dim sqlnodes = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", rowconstruct.Item(0))
-                Dim DTNODES As DataTable = ClassDatabase.Return_Datatable(sqlnodes, True)
+                Dim DTNODES As DataTable = MYDB_ECM.GetDatatable(sqlnodes)

                Dim sqlimage = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", rowconstruct.Item(0))
-                Dim DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(sql)
+                Dim DT_TREEVIEW_CONFIGURATION = MYDB_ECM.GetDatatable(sql)
                Dim TREEVIEW_IMAGELIST = New ImageList

                For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows
--- a/app/DD-Record-Organizer/Classes/ClassConverter.vb
+++ b/app/DD-Record-Organizer/Classes/ClassConverter.vb
@@ -84,11 +84,5 @@

    ' ------------- TYPE TO STRING -------------

-    Public Shared Function SQLValueToString(value As SQLValue) As String
-        Dim cmd As String = value.Value
-        If cmd.Contains("'") Then
-            cmd = cmd.Replace("'", "''")
-        End If
-        Return cmd
-    End Function
+
 End Class
--- a/app/DD-Record-Organizer/Classes/ClassCustomComboBox.vb
+++ b/app/DD-Record-Organizer/Classes/ClassCustomComboBox.vb
--- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
@@ -13,11 +13,12 @@ Public Class ClassDOC_SEARCH
            Dim OPTION3
            Dim OPTION4
            Dim OPTION5
-            Dim VALUE_CONF1
-            Dim VALUE_CONF2
-            Dim VALUE_CONF3
-            Dim VALUE_CONF4
-
+            Dim VALUE_CONF1 = 0
+            Dim VALUE_CONF2 = 0
+            Dim VALUE_CONF3 = 0
+            Dim VALUE_CONF4 = 0
+            Dim VALUE_CONF5 = 0
+            Dim VALUE_CONF6 = 0
            If DT_RESULTLIST_OPTIONS.Rows.Count = 0 Then
                OPTION1 = 0
                OPTION2 = 0
@@ -31,32 +32,23 @@ Public Class ClassDOC_SEARCH
                OPTION4 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION4_CTRL")
                OPTION5 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION5_CTRL")
            End If
-            LOGGER.Debug("DT_RESULTLIST_SEL_VALUES.Rows.Count: " & DT_RESULTLIST_SEL_VALUES.Rows.Count, False)
-            If DT_RESULTLIST_SEL_VALUES.Rows.Count = 0 Then
-                VALUE_CONF1 = 0
-                VALUE_CONF2 = 0
-                VALUE_CONF3 = 0
-                VALUE_CONF4 = 0
+            LOGGER.Info("DT_RESULTLIST_SEL_VALUES.Rows.Count: " & DT_RESULTLIST_SEL_VALUES.Rows.Count)

-            Else
-                VALUE_CONF1 = DT_RESULTLIST_SEL_VALUES.Rows(0).Item("GUID")
-                Try
-                    VALUE_CONF2 = DT_RESULTLIST_SEL_VALUES.Rows(1).Item("GUID")
-                Catch ex As Exception
-                    VALUE_CONF2 = 0
-                End Try
-                Try
-                    VALUE_CONF3 = DT_RESULTLIST_SEL_VALUES.Rows(2).Item("GUID")
-                Catch ex As Exception
-                    VALUE_CONF3 = 0
-                End Try
-                Try
-                    VALUE_CONF4 = DT_RESULTLIST_SEL_VALUES.Rows(3).Item("GUID")
-                Catch ex As Exception
-                    VALUE_CONF4 = 0
-                End Try
-
-            End If
+            For Each oRow As DataRow In DT_RESULTLIST_SEL_VALUES.Rows
+                If oRow.Item("COLUMN_VIEW").ToString = "VALUE1" Then
+                    VALUE_CONF1 = oRow.Item("GUID")
+                ElseIf oRow.Item("COLUMN_VIEW").ToString = "VALUE2" Then
+                    VALUE_CONF2 = oRow.Item("GUID")
+                ElseIf oRow.Item("COLUMN_VIEW").ToString = "VALUE3" Then
+                    VALUE_CONF3 = oRow.Item("GUID")
+                ElseIf oRow.Item("COLUMN_VIEW").ToString = "VALUE4" Then
+                    VALUE_CONF4 = oRow.Item("GUID")
+                ElseIf oRow.Item("COLUMN_VIEW").ToString = "VALUE5" Then
+                    VALUE_CONF5 = oRow.Item("GUID")
+                ElseIf oRow.Item("COLUMN_VIEW").ToString = "VALUE6" Then
+                    VALUE_CONF6 = oRow.Item("GUID")
+                End If
+            Next

            Dim SQL_DOC_SEARCH
            If CURRENT_SEARCH_TYPE = "ENTITY" Then
@@ -97,38 +89,59 @@ Public Class ClassDOC_SEARCH
                End If

            ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
-                SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.* ," & vbNewLine &
-               "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine &
-               "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine &
-               "ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine &
-               "ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID) AS VALUE1," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID) AS VALUE2," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID) AS VALUE3," & vbNewLine &
-               "[dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID) AS VALUE4," & vbNewLine &
-               "dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
-               "FROM " & vbNewLine &
-               "VWPMO_DOC_SEARCH T " & vbNewLine &
-               "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
-               "INNER JOIN TBPMO_RECORD TR	ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
-               "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine &
-                "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID  = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine &
-                "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID  = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine &
-                "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID  = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine &
-                "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID  = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine &
-               "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine &
-               "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine &
-               "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine &
-               "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine &
-               "WHERE TRL.RECORD_ID = {0} AND TR.FORM_ID  = {1} AND TRIGHTS.dwUserOrGroupID = {6}", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4)
+                SQL_DOC_SEARCH = SQL_DOC_RESULT_RECORD
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@ENTITY_ID", ENTITY_ID)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@USER_LANGUAGE", USER_LANGUAGE)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF1", VALUE_CONF1)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF2", VALUE_CONF2)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF3", VALUE_CONF3)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF4", VALUE_CONF4)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF5", VALUE_CONF5)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF6", VALUE_CONF6)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION1", OPTION1)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION2", OPTION2)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION3", OPTION3)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION4", OPTION4)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@RECORD_ID", RECORD_ID)
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@USERID_FK_INT_ECM", USERID_FK_INT_ECM)
+
+                '  SQL_DOC_SEARCH = $"SELECT T.* ," & vbNewLine &
+                ' $"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine &
+                ' $"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine &
+                ' $"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine &
+                ' $"ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID),'') AS VALUE1," & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID),'') AS VALUE2," & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID),'') AS VALUE3," & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID),'') AS VALUE4," & vbNewLine &
+                '$"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC4.GUID),'') AS VALUE5," & vbNewLine &
+                '$"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC5.GUID),'') AS VALUE6," & vbNewLine &
+                '$"dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
+                '$"FROM " & vbNewLine &
+                '$"VWPMO_DOC_SEARCH T " & vbNewLine &
+                '$"INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
+                '$"INNER JOIN TBPMO_RECORD TR	ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
+                ' $"INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine &
+                ' $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID  = TRC.ENTITY_ID AND TRC.LANGUAGE = '{USER_LANGUAGE}' AND TRC.GUID = {VALUE_CONF1}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID  = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{USER_LANGUAGE}' AND TRC1.GUID = {VALUE_CONF2}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID  = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{USER_LANGUAGE}' AND TRC2.GUID = {VALUE_CONF3}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID  = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{USER_LANGUAGE}' AND TRC3.GUID = {VALUE_CONF4}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC4 ON TR.FORM_ID  = TRC4.ENTITY_ID AND TRC4.LANGUAGE = '{USER_LANGUAGE}' AND TRC4.GUID = {VALUE_CONF5}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC5 ON TR.FORM_ID  = TRC5.ENTITY_ID AND TRC5.LANGUAGE = '{USER_LANGUAGE}' AND TRC5.GUID = {VALUE_CONF6}" & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {OPTION1} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {OPTION2} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {OPTION3} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {OPTION4} " & vbNewLine &
+                ' $"WHERE TRL.RECORD_ID = {RECORD_ID} AND TR.FORM_ID  = {ENTITY_ID} AND TRIGHTS.dwUserOrGroupID = {USERID_FK_INT_ECM}"
            ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT" Then
                Dim sqlft = SQL_FULLTEXT
                sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN)
@@ -209,7 +222,7 @@ Public Class ClassDOC_SEARCH
                  "WHERE TR.FORM_ID  = {1} AND TTEMP.USER_ID = {2} AND TRIGHTS.dwUserOrGroupID = {3}" & vbNewLine &
                  "AND T.DocID IN ({6})", USER_LANGUAGE, ENTITY_ID, USER_GUID, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft)
            End If
-            LOGGER.Debug("SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False)
+            LOGGER.Debug("SQL_DOC_SEARCH: " & SQL_DOC_SEARCH)
            If BG = True And CURRENT_SEARCH_TYPE = "ENTITY" Then
                If Not IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then
                    Return CURRENT_DT_DOC_ENTITY_SEARCH
@@ -228,9 +241,9 @@ Public Class ClassDOC_SEARCH
                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Async DTFILE_RESULT_ASYNC", ex.Message, ex.StackTrace)
            End Try

-            Return DTFILE_RESULT_ASYNC 'ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
+            Return DTFILE_RESULT_ASYNC
        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message)
+            LOGGER.Error("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message)
            Return Nothing
        End Try
    End Function
@@ -253,7 +266,8 @@ Public Class ClassDOC_SEARCH
            Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(BG)
            CURRENT_DOC_RESULTS = DT_FILE_RESULT
            If IsNothing(DT_FILE_RESULT) Then
-                LOGGER.Warn("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!", False)
+                '  MsgBox("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING" & vbNewLine & "Please inform Your Sysadmin", MsgBoxStyle.Exclamation, "Attention")
+                LOGGER.Warn("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!")
                Return Nothing
            End If
            sw.Done()
@@ -264,16 +278,16 @@ Public Class ClassDOC_SEARCH
            sw = New SW("Get_DOC_RESULTTABLE DTGrid-Definition")
            Dim oDTGrid As New DataTable
            Dim ColArrayDEFINITION As New List(Of String)
-            Dim listcheck As New List(Of String)
+            Dim oListBoolean As New List(Of String)
            For Each row As DataRow In DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows
-                Dim type = row.Item("TYPE_ID")
+                Dim oType = row.Item("TYPE_ID")
                Dim COLNAME = row.Item("HEADER_CAPTION")
-                If type = 2 Then
-                    listcheck.Add(COLNAME)
+                If oType = 2 Then
+                    oListBoolean.Add(COLNAME)
                End If
            Next
            _step = "2"
-            For Each col1 As String In listcheck
+            For Each col1 As String In oListBoolean
                Dim collist As DataColumn = DT_FILE_RESULT.Columns(col1)
                If Not IsNothing(collist) Then
                    collist.DataType = GetType(Boolean)
@@ -326,10 +340,27 @@ Public Class ClassDOC_SEARCH
                                .ColumnName = ColumnName
                            }

-                            If oColumnType = 4 Then
+                            If oColumnType = 3 Then
                                oColumn.DataType = GetType(DateTime)
+                            ElseIf oColumnType = 2 Then
+                                oColumn.DataType = GetType(Boolean)
+                            ElseIf oColumnType = 4 Then
+                                oColumn.DataType = GetType(Int32)
                            End If
-
+                            ''1  String
+                            ''2  Integer
+                            ''3  DateTime
+                            ''4  Integer
+                            'Dim oColumn As New DataColumn() With {
+                            '    .ColumnName = ColumnName
+                            '}
+                            'If oColumnType = 2 Then
+                            '    oColumn.DataType = GetType(Int16)
+                            'ElseIf oColumnType = 3 Then
+                            '    oColumn.DataType = GetType(DateTime)
+                            'ElseIf oColumnType = 4 Then
+                            '    oColumn.DataType = GetType(Boolean)
+                            'End If
                            oDTGrid.Columns.Add(oColumn)
                            ColCount += 1
                        Catch ex As Exception
@@ -347,7 +378,7 @@ Public Class ClassDOC_SEARCH
            sw = New SW("Run Get_DOC_RESULTTABLE")
            COL_ARRAY_RESULTLIST = ColArrayDEFINITION
            _step = "8"
-            For Each col1 As String In listcheck
+            For Each col1 As String In oListBoolean
                Dim collist As DataColumn = oDTGrid.Columns(col1)
                If Not IsNothing(collist) Then
                    collist.DataType = GetType(Boolean)
@@ -361,6 +392,7 @@ Public Class ClassDOC_SEARCH
                Dim fullpath = FILE_ROW.Item("FULL_FILENAME")
                Dim objecttype = FILE_ROW.Item("OBJECTTYPE")
                Dim DocID = FILE_ROW.Item("DocID")
+                LOGGER.Debug($"Creating Row for DocID [{DocID}]")
                'Dim Folderpath = Path.GetDirectoryName(fullpath)
                Dim filename = Path.GetFileName(fullpath)
                Dim extension = Path.GetExtension(fullpath)
@@ -410,39 +442,57 @@ Public Class ClassDOC_SEARCH
                    Dim rowvalue
                    Try
                        rowvalue = FILE_ROW.Item(Colname)
+                        If IsDBNull(rowvalue) Then
+                            rowvalue = ""
+                        End If
                        _step = "9.1  rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]"
-                        LOGGER.Debug("rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]", False)
+                        LOGGER.Debug("rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]")
                    Catch ex As Exception
-                        If CURRENT_SEARCH_TYPE = "RECORD" Then LOGGER.Warn("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
+                        If CURRENT_SEARCH_TYPE = "RECORD" Then
+                            LOGGER.Warn("Unexpected Error in GetVariableValue for Column [" & Colname & "] - Error: " & ex.Message)
+                        End If
                        If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then
                            rowvalue = ""
                        Else
                            If CURRENT_SEARCH_TYPE <> "RECORD" Then
                                rowvalue = "Not displayable in Group-Search"
                            Else
-                                rowvalue = "Error getting rowvalue"
+                                rowvalue = "#"
                            End If

                        End If
                    End Try
                    _step = "9.2 now: NewRow.Item(i) = rowvalue.ToString..."
-                    LOGGER.Debug("9.2 now: NewRow.Item(i) = rowvalue.ToString...", False)
+                    'LOGGER.Debug("9.2 now: NewRow.Item(i) = rowvalue.ToString...")
                    Try
+                        Dim oType = oDTGrid.Columns(i).DataType.ToString
+                        If oType = "System.DateTime" And Len(rowvalue) = 0 Then
+                            LOGGER.Debug("rowvalue Is empty and Column is Datetime...")
+
+                            rowvalue = "2099-12-31"
+                        ElseIf oType = "System.Boolean" Then
+                            Try
+                                Dim otest = CBool(rowvalue)
+                            Catch ex As Exception
+                                rowvalue = False
+                            End Try
+
+
+                            oNewRow.Item(i) = CBool(rowvalue)
+                        ElseIf oType = "System.Int32" Then
+                            If Len(rowvalue) = 0 Then
+                                oNewRow.Item(i) = 0
+                            Else
+                                oNewRow.Item(i) = CInt(rowvalue)
+                            End If
+                        Else
+                                oNewRow.Item(i) = rowvalue.ToString
+                        End If

                    Catch ex As Exception
-
-                    End Try
-
-                    Try
-                        'If oDTGrid.Columns(i).DataType.ToString = "System.DateTime" And rowvalue = String.Empty Then
-                        '    LOGGER.Debug("rowvalue Is empty and Column is Datetime...", False)
-                        'Else
-                        oNewRow.Item(i) = rowvalue.ToString
-                        'End If
-
-                    Catch ex As Exception
-                        LOGGER.Warn("Error in advising value to rowitem (oNewRow.Item(i) = rowvalue.ToString): " + ex.Message, False)
-                        LOGGER.Warn("Type of column: " + oDTGrid.Columns(i).DataType.ToString(), False)
+                        LOGGER.Warn("Error in advising rowvalue to rowitem: " + ex.Message)
+                        LOGGER.Error("Error in advising rowvalue to rowitem: " + ex.Message)
+                        LOGGER.Warn("Type of column: " + oDTGrid.Columns(i).DataType.ToString())
                    End Try

                    i += 1
@@ -464,22 +514,13 @@ Public Class ClassDOC_SEARCH
        End Try
    End Function

-    Public Shared Function REFRESH_DOC_TABLE_RESULTS()
-        Try
-            Dim execute = "EXEC[dbo].[PRPMO_DOCRESULT_CHANGE]"
-            Return ClassDatabase.Execute_non_Query_withConn(execute, 1)
-        Catch ex As Exception
-            MsgBox("Unexpected Error in REFRESH_TABLE_RESULTS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            Return False
-        End Try
-    End Function
    Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer)
        Try
            Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
-            If ClassDatabase.Execute_non_Query(execute) = True Then
+            If MYDB_ECM.ExecuteNonQuery(execute) = True Then
                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
                    execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
-                    ClassDatabase.Execute_non_Query(execute, True)
+                    MYDB_ECM.ExecuteNonQuery(execute)
                End If
                Return True
            Else
@@ -490,15 +531,15 @@ Public Class ClassDOC_SEARCH
            Return False
        End Try
    End Function
-    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH)
+    Public Shared Function SET_WD_RIGHTS(RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
        Try
            If CURRENT_RECORD_ID = 0 Then
                MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
                Return False
            End If
-            LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######", False)
+            LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######")
            If ClassWDRights.Init = True Then
-                If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, True) Then
+                If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
                    If ClassWDRights.MSG_RESULT <> "" Then
                        Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT
                        If USER_LANGUAGE <> "de-DE" Then
@@ -514,33 +555,7 @@ Public Class ClassDOC_SEARCH
                MsgBox("Could not initialize right-module - Check the log!", MsgBoxStyle.Exclamation)
                Return False
            End If
-            'DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", USER_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(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
-            '                    If USER_LANGUAGE <> "de-DE" Then
-            '                        msg = "Attention: some rights could not be set: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT
-            '                    End If
-            '                    MsgBox(msg, MsgBoxStyle.Exclamation)
-            '                    Return True
-            '                Else
-            '                    Return True
-            '                End If
-            '            Else
-            '                Return False
-            '            End If
-            '        Else
-            '            Return False
-            '        End If
-            '    Else
-            '        Return False
-            '    End If
-            'Else
-            '    Return False
-            'End If
+
        Catch ex As Exception
            MsgBox("Unexpected Error in SET_WD_RIGHTS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            Return False
@@ -554,14 +569,24 @@ Public Class ClassDOC_SEARCH
    ''' <remarks></remarks>
    Public Shared Function Get_File_Rights(DOC_ID As Integer)
        Try
+            If DOC_ID = 0 Then
+                Return "R"
+            End If
            Dim sql = String.Format("SELECT dwAccessRight FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwObjectID = {0} and dwUserOrGroupID = {1}", DOC_ID, USERID_FK_INT_ECM)
-            Dim result = clsDatabase.Execute_Scalar(sql, True)
+            Dim result = MYDB_ECM.GetScalarValue(sql)
            If IsNothing(result) Or IsDBNull(result) Then
                Return Nothing
            End If
+            LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is {result}")
            Select Case result
                Case 1
-                    Return "R"
+                    If USER_IS_ADMIN = False Then
+                        Return "R"
+                    Else
+                        LOGGER.Warn("FileRight is R but User is Admin!! - Check the UserKonfig!")
+                        Return "RWA"
+                    End If
+
                Case 3
                    Return "RW"
                Case 7
--- a/app/DD-Record-Organizer/Classes/ClassDragDrop.vb
+++ b/app/DD-Record-Organizer/Classes/ClassDragDrop.vb
@@ -9,7 +9,7 @@ Public Class ClassDragDrop
            files_dropped = Nothing

            Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')"
-            ClassDatabase.Execute_non_Query(sql, True)
+            MYDB_ECM.ExecuteNonQuery(sql)


            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
--- a/app/DD-Record-Organizer/Classes/ClassEmail.vb
+++ b/app/DD-Record-Organizer/Classes/ClassEmail.vb
@@ -87,7 +87,7 @@ Public Class ClassEmail
                '*Send the message */
                emailClient.Send(message)

-                'Logger.Warn("Support/Log Email erfolgreich an " & _mailempfaenger & " versendet!", False)
+                'Logger.Warn("Support/Log Email erfolgreich an " & _mailempfaenger & " versendet!")
            Next
            Return True
        Catch ex As Exception
--- a/app/DD-Record-Organizer/Classes/ClassEncryption.vb
+++ b/app/DD-Record-Organizer/Classes/ClassEncryption.vb
--- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb
@@ -6,13 +6,13 @@
            Dim upd As String
            InWork = False
            If comment = "" Then
-                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0} WHERE DocID = {1}", state, DocID)
+                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK_USER = NULL, IN_WORK = {0} WHERE DocID = {1}", state, DocID)
            Else
                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID)
            End If
-            If ClassDatabase.Execute_non_Query(upd) = True Then
+            If MYDB_ECM.ExecuteNonQuery(upd) = True Then
                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    ClassDatabase.Execute_non_Query(upd, True)
+                    MYDB_ECM.ExecuteNonQuery(upd)
                End If
                InWork = True
                Return True
@@ -28,9 +28,9 @@
        Try
            Dim upd As String
            upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}',Change_DateTime = GETDATE() WHERE DocID = {1}", Displayname, DocID)
-            If ClassDatabase.Execute_non_Query(upd) = True Then
+            If MYDB_ECM.ExecuteNonQuery(upd) = True Then
                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    ClassDatabase.Execute_non_Query(upd, True)
+                    MYDB_ECM.ExecuteNonQuery(upd)
                End If
                Return True
            Else
@@ -44,8 +44,8 @@
    Public Shared Function GET_DATATABLE_INDICES_PMO()
        Try
            Dim sql = String.Format("SELECT * FROM TBPMO_INDEX_MAN WHERE ACTIVE = 1 AND ENTITY_ID = (SELECT CASE REDUNDANT_ENTITY WHEN 0 THEN GUID ELSE REDUNDANT_ENTITY END AS ENTITY_ID  FROM TBPMO_FORM WHERE GUID = {0}) AND DOCTYPE_ID = {1}", CURRENT_ENTITY_ID, CURRENT_DOKARTID)
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
-            LOGGER.Debug("GET_DATATABLE_INDICES_PMO: " & sql, False)
+            Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
+            LOGGER.Debug("GET_DATATABLE_INDICES_PMO: " & sql)
            CURRENT_TBPMO_INDEX_MAN = DT
            Return True
        Catch ex As Exception
@@ -61,7 +61,7 @@
                    If row.Item("MAN_VALUE") <> String.Empty Then
                        Dim MAN_INDEX_ID = row.Item("GUID")
                        Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, MAN_INDEX_ID, row.Item("MAN_VALUE"), USER_USERNAME)
-                        ClassDatabase.Execute_non_Query(insert)
+                        MYDB_ECM.ExecuteNonQuery(insert)
                    End If
                 
                Next
@@ -75,7 +75,7 @@
    Public Shared Function Delete_Doc_Indices()
        Try
            Dim delete As String = String.Format("DELETE FROM TBPMO_DOC_INDICES WHERE DocID = {0}", DocID)
-            Return ClassDatabase.Execute_non_Query(delete)
+            Return MYDB_ECM.ExecuteNonQuery(delete)
        Catch ex As Exception
            LOGGER.Warn("Unexpected Error in Update_Doc_Indices: " & ex.Message)
            Return False
@@ -84,10 +84,10 @@
    Public Shared Function Delete_ResultFile(RESULT_DOC_ID, RECORD_ID, DELETE_FILE)
        Try
            Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE)
-            If ClassDatabase.Execute_non_Query(proc) = True Then
+            If MYDB_ECM.ExecuteNonQuery(proc) = True Then
                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
                    proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID)
-                    ClassDatabase.Execute_non_Query(proc, True)
+                    MYDB_ECM.ExecuteNonQuery(proc)
                End If
                Return True
            Else
@@ -102,14 +102,14 @@
    Public Shared Function CheckWrite_IndexeMan(grbxControls As GroupBox)
        '#### Zuerst manuelle Werte indexieren ####
        Try
-            LOGGER.Debug(" >>In CheckWrite_IndexeMan", False)
+            LOGGER.Debug(" >>In CheckWrite_IndexeMan")
            Dim result As Boolean = False
            For Each ctrl As Control In grbxControls.Controls
                '            ' MsgBox(ctrl.Name)
                If ctrl.Name.StartsWith("txt") Then
                    Dim box As TextBox = ctrl
                    If box.Text = "" Then
-                        Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "OPTIONAL") 'ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBPMO_INDEX_MAN WHERE GUID = " & box.Tag, True)
+                        Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "OPTIONAL")
                        If Not IsNothing(optional_index) Then
                            If CBool(optional_index) = False Then
                                MsgBox("Please insert a value!", MsgBoxStyle.Exclamation, "Missing input:")
@@ -125,7 +125,7 @@
                        End If
                    Else
                        'If Indexwert_checkValueDB(Replace(box.Name, "txt", ""), box.Text) = False Then
-                        '    Logger.Warn(" - Der eingegebene Wert wurde nicht in der Datenbank gefunden", False)
+                        '    Logger.Warn(" - Der eingegebene Wert wurde nicht in der Datenbank gefunden")
                        '    MsgBox("Der eingegebene Wert wurde nicht in der Datenbank gefunden!", MsgBoxStyle.Exclamation, "Fehlerhafte Indexierung:")
                        '    box.Focus()
                        '    Return False
@@ -145,10 +145,10 @@
                            For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows
                                If row.Item("GUID") = btn.Tag Then
                                    If Not IsDBNull(row.Item("MAN_VALUE")) Then
-                                        LOGGER.Debug("we got a value for folder...", False)
+                                        LOGGER.Debug("we got a value for folder...")
                                        result = True
                                    Else
-                                        LOGGER.Debug("value for folder is missing...", False)
+                                        LOGGER.Debug("value for folder is missing...")
                                        MsgBox("Please choose a folder!", MsgBoxStyle.Exclamation, "Missing input:")
                                        Return False
                                    End If
@@ -157,7 +157,7 @@

                            Next
                        Else
-                            LOGGER.Debug("value for folder is OPTIONAL...", False)
+                            LOGGER.Debug("value for folder is OPTIONAL...")
                            SET_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, "")
                            result = True
                        End If
@@ -167,7 +167,7 @@
                If ctrl.Name.StartsWith("cmb") Then
                    Dim cmb As ComboBox = ctrl
                    If cmb.Text = "" Then
-                        Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(cmb.Tag, "OPTIONAL") 'ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBPMO_INDEX_MAN WHERE GUID = " & box.Tag, True)
+                        Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(cmb.Tag, "OPTIONAL")
                        If Not IsNothing(optional_index) Then
                            If CBool(optional_index) = False Then
                                MsgBox("Please choose a value!", MsgBoxStyle.Exclamation, "Missing input:")
--- a/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb
@@ -1,7 +1,7 @@
 Imports System.IO
 Imports Independentsoft
 Imports System.Threading
-Imports DD_LIB_Standards
+

 Public Class ClassFolderWatcher
    Public Shared FolderWatcher_SCAN As FileSystemWatcher
@@ -103,7 +103,7 @@ Public Class ClassFolderWatcher
        Dim check As String
        Try
            check = "SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE UPPER(FILENAME2WORK) = UPPER('" & Filename & "') AND WORKED = 0"
-            Dim result = ClassDatabase.Execute_Scalar(check, True)
+            Dim result = MYDB_ECM.GetScalarValue(check)
            Return result
        Catch ex As Exception
            MsgBox("Error in FileExistsinDropTable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & check, MsgBoxStyle.Critical)
@@ -115,7 +115,7 @@ Public Class ClassFolderWatcher
        Try
            Dim filename_only As String = Path.GetFileName(filename)
            Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, USER_USERNAME, handleType, filename_only)
-            Return ClassDatabase.Execute_non_Query(ins, True)
+            Return MYDB_ECM.ExecuteNonQuery(ins)
        Catch ex As Exception
            MsgBox("Unexpected Error in Insert Scan-File: " & ex.Message, MsgBoxStyle.Critical)
            Return False
@@ -125,7 +125,7 @@ Public Class ClassFolderWatcher
        Try
            Dim filename_only As String = Path.GetFileName(filename)
            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(FILENAME2WORK) = UPPER('{0}')", filename)
-            Return ClassDatabase.Execute_non_Query(del, True)
+            Return MYDB_ECM.ExecuteNonQuery(del)
        Catch ex As Exception
            MsgBox("Unexpected Error in DELETE_SCAN_File: " & ex.Message, MsgBoxStyle.Critical)
            Return False
@@ -134,7 +134,7 @@ Public Class ClassFolderWatcher
    Public Shared Function DELETE_SCAN_File_User()
        Try
            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(USER_WORK) = UPPER('{0}') AND HANDLE_TYPE = 'SCAN'", USER_USERNAME)
-            Return ClassDatabase.Execute_non_Query(del, True)
+            Return MYDB_ECM.ExecuteNonQuery(del)
        Catch ex As Exception
            MsgBox("Unexpected Error in DELETE_SCAN_File_User: " & ex.Message, MsgBoxStyle.Critical)
            Return False
@@ -144,13 +144,13 @@ Public Class ClassFolderWatcher
    Public Shared Function Check_Scan_Files()
        Try
            Dim sql As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", USER_USERNAME)
-            Dim DT As DataTable = clsDatabase.Return_Datatable(sql, True)
+            Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
            For Each row As DataRow In DT.Rows
                If System.IO.File.Exists(row.Item("FILENAME2WORK")) = False Then
                    DELETE_SCAN_File(row.Item("FILENAME2WORK"))
                End If
            Next
-            CURRENT_SCAN_TABLE = clsDatabase.Return_Datatable(sql, True)
+            CURRENT_SCAN_TABLE = MYDB_ECM.GetDatatable(sql)
        Catch ex As Exception
            MsgBox("Unexpected Error in DELETE_SCAN_File_User: " & ex.Message, MsgBoxStyle.Critical)
            Return Nothing
--- a/app/DD-Record-Organizer/Classes/ClassFormCommands.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFormCommands.vb
@@ -3,7 +3,7 @@
    Public Shared Function LoadForm(guid) As DataTable
        Try
            Dim SQL As String = "SELECT NAME, LEVEL FROM TBPMO_FORM WHERE GUID = " & guid
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
+            Dim DT As DataTable = MYDB_ECM.GetDatatable(SQL)

            If DT.Rows.Count = 1 Then
                Return DT
@@ -19,7 +19,7 @@
    Public Shared Function LoadFormView(guid) As DataTable
        Try
            Dim SQL As String = "SELECT FORM_TITLE FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
+            Dim DT As DataTable = MYDB_ECM.GetDatatable(SQL)

            If DT.Rows.Count = 1 Then
                Return DT
@@ -40,7 +40,7 @@

            SQL = "UPDATE TBPMO_FORM SET NAME = '" & NAME & "', LEVEL = " & LEVEL & "WHERE GUID = " & guid

-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
                Return SaveFormView(guid, form_title, doc_view)
            Else
                Throw New Exception()
@@ -60,7 +60,7 @@

            SQL = "UPDATE TBPMO_FORM_VIEW SET FORM_TITLE = '" & TITLE & "', DOCUMENT_VIEW = " & DOCUMENT_VIEW & " WHERE FORM_ID = " & guid

-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
                Return True
            Else
                Throw New Exception()
@@ -75,10 +75,10 @@
    Public Shared Function DeleteFormView(guid)
        Try
            Dim SQL As String = "DELETE FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID in (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid & ")"
-            If ClassDatabase.Execute_non_Query(SQL) = False Then Return False
+            If MYDB_ECM.ExecuteNonQuery(Sql) = False Then Return False

            SQL = "DELETE FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid
-            If ClassDatabase.Execute_non_Query(SQL) = False Then
+            If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                Return False
            Else
                Return True
@@ -93,7 +93,7 @@
        Try
            Dim SQL As String = "SELECT GUID FROM TBPMO_CONTROL WHERE FORM_ID = " & guid

-            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+            Dim dt As DataTable = MYDB_ECM.GetDatatable(SQL)
            If dt.Rows.Count > 0 Then
                For Each row As DataRow In dt.Rows
                    Dim controlid As Integer = row.Item(0)
--- a/app/DD-Record-Organizer/Classes/ClassFunctionCommands.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFunctionCommands.vb
@@ -2,7 +2,7 @@
    'Public Shared Function InsertFunction(ControlId As Integer)
    '    Try
    '        Dim SQL As String = "INSERT INTO TBPMO_FUNCTION_ADD_APPOINTMENT(CONTROL_ID) VALUES (" & ControlId & ")"
-    '        ClassDatabase.Execute_non_Query(SQL)
+    '        MYDB_ECM.ExecuteNonQuery(Sql)
    '        Return True
    '    Catch ex As Exception
    '        MsgBox("Fehler beim Anlegen der KalenderFunktion:" & vbNewLine & ex.Message)
@@ -13,7 +13,7 @@
    Public Shared Function InsertFunction(ControlId As Integer, Method As String)
        Try
            Dim SQL As String = "INSERT INTO TBPMO_FUNCTION_GENERAL (CONTROL_ID, METHOD) VALUES (" & ControlId & ", '" & Method & "')"
-            ClassDatabase.Execute_non_Query(SQL)
+            MYDB_ECM.ExecuteNonQuery(Sql)
            Return True
        Catch ex As Exception
            MsgBox("Fehler beim Anlegen der Funktion " & Method & ":" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -23,7 +23,7 @@
    Public Shared Function UpdateAddAppointmentFunction(ControlId As Integer, FromDateId As Integer, ToDateId As Integer, SubjectString As String, Subject2String As String, PlaceString As String, DescriptionString As String)
        Try
            Dim SQL As String = "UPDATE TBPMO_FUNCTION_GENERAL SET INTEGER1 = " & FromDateId & ", INTEGER2 = " & ToDateId & ", STRING1 = '" & SubjectString & "', STRING2 = '" & Subject2String & "', STRING3 = '" & PlaceString & "', STRING4 = '" & DescriptionString & "' WHERE CONTROL_ID = " & ControlId
-            If ClassDatabase.Execute_non_Query(SQL) = False Then
+            If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                Throw New Exception("Datenbankfehler.")
            End If
            Return True
@@ -36,7 +36,7 @@
    Public Shared Function UpdateAddFormDataFunction(ControlId As Integer, FormId As Integer, ScreenId As Integer)
        Try
            Dim SQL As String = "UPDATE TBPMO_FUNCTION_GENERAL SET INTEGER1 = " & FormId & ", INTEGER2 = " & ScreenId & " WHERE CONTROL_ID = " & ControlId
-            If ClassDatabase.Execute_non_Query(SQL) = False Then
+            If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                Throw New Exception("Datenbankfehler.")
            End If
            Return True
@@ -49,7 +49,7 @@
    Public Shared Function LoadFunction(ControlId As Integer) As DataRow
        Try
            Dim SQL As String = "SELECT * FROM TBPMO_FUNCTION_GENERAL WHERE CONTROL_ID = " & ControlId
-            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+            Dim dt As DataTable = MYDB_ECM.GetDatatable(SQL)

            If dt.Rows.Count = 1 Then
                Return dt.Rows.Item(0)
@@ -65,7 +65,7 @@
    Public Shared Function GETCONTROL_ID_FOR_COL_NAME(FORM_ID As Integer, Column_Name As String)
        Try
            Dim SQL As String = "SELECT GUID FROM TBPMO_CONTROL WHERE FORM_ID = " & FORM_ID & " AND COL_NAME = '" & Column_Name & "'"
-            Dim result = ClassDatabase.Execute_Scalar(SQL, True)
+            Dim result = MYDB_ECM.GetScalarValue(SQL)
            Return result
        Catch ex As Exception
            MsgBox("Error in GETCONTROL_ID_FOR_COL_NAME:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
--- a/app/DD-Record-Organizer/Classes/ClassFunctionCommandsUI.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFunctionCommandsUI.vb
@@ -9,7 +9,7 @@ Public Class ClassFunctionCommandsUI
            reminder.AlertTime = DueDateTime
            apt.Reminders.Add(reminder)

-            Dim Value = ClassDatabase.Execute_Scalar(SQL, True)
+            Dim Value = MYDB_ECM.GetScalarValue(SQL)
            If Value Is Nothing Then
                apt.Subject = Subject & " - " & Value.ToString()
            Else
@@ -37,7 +37,7 @@ Public Class ClassFunctionCommandsUI
        reminder.AlertTime = DueDateTime
        apt.Reminders.Add(reminder)

-        Dim Value = ClassDatabase.Execute_Scalar(SQL, True)
+        Dim Value = MYDB_ECM.GetScalarValue(SQL)

        apt.Subject = Subject & " - " & Value.ToString()
        apt.Description = Description
@@ -55,7 +55,7 @@ Public Class ClassFunctionCommandsUI
            Dim controlID = GetControlID_for_Name(ControlName, FormID)

            Dim SQL = "SELECT UniqueID FROM TBPMO_APPOINTMENTS WHERE CustomField1 = " & RecordID & " AND CustomField2 = " & controlID
-            Dim result = ClassDatabase.Execute_Scalar(SQL)
+            Dim result = MYDB_ECM.GetScalarValue(SQL)

            If result Is Nothing Then
                NewAppointment(ControlName, FormID, RecordID, PanelControls)
@@ -192,8 +192,8 @@ Public Class ClassFunctionCommandsUI
            Dim controlID = GetControlID_for_Name(ControlName, FormID)

            ' Load All appointments first
-            frmCalendar.TBPMO_RESOURCESTableAdapter.Connection.ConnectionString = MyConnectionString
-            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Connection.ConnectionString = MyConnectionString
+            frmCalendar.TBPMO_RESOURCESTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
+            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
            frmCalendar.TBPMO_RESOURCESTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_RESOURCES)
            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_APPOINTMENTS)

--- a/app/DD-Record-Organizer/Classes/ClassGridFormatter.vb
+++ b/app/DD-Record-Organizer/Classes/ClassGridFormatter.vb
@@ -89,44 +89,49 @@ Public Class ClassGridFormatter
        End Function

        Public Sub FormatGridView(gridView As GridView)
-            If IsNothing(gridView.GridControl.DataSource) Then
-                Throw New Exception("Error in FormatGridView: DataSource is Empty!")
-            End If
-
-            ' Editoren zum Grid hinzufügen
-            gridView.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})
-
-            For Each columnName As String In Me.dateColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
-
-                If Not IsNothing(column) Then
-                    column.DisplayFormat.FormatType = FormatType.DateTime
-                    column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
-                    column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
-                    column.FilterMode = ColumnFilterMode.Value ' was DisplayText
-                    column.ColumnEdit = dateEdit
+            Try
+                If IsNothing(gridView.GridControl.DataSource) Then
+                    Throw New Exception("Error in FormatGridView: DataSource is Empty!")
                End If
-            Next

-            For Each columnName As String In Me.checkboxColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
+                ' Editoren zum Grid hinzufügen
+                gridView.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})

-                If Not IsNothing(column) Then
-                    column.ColumnEdit = checkboxEdit
-                End If
-            Next
+                For Each columnName As String In Me.dateColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)

-            currencyColumns = GetCurrencyColumns()
+                    If Not IsNothing(column) Then
+                        column.DisplayFormat.FormatType = FormatType.DateTime
+                        column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+                        column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
+                        column.FilterMode = ColumnFilterMode.Value ' was DisplayText
+                        column.ColumnEdit = dateEdit
+                    End If
+                Next

-            For Each columnName As String In currencyColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
+                For Each columnName As String In Me.checkboxColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)
+
+                    If Not IsNothing(column) Then
+                        column.ColumnEdit = checkboxEdit
+                    End If
+                Next
+
+                currencyColumns = GetCurrencyColumns()
+
+                For Each columnName As String In currencyColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)
+
+                    If Not IsNothing(column) Then
+                        column.DisplayFormat.FormatType = FormatType.Numeric
+                        column.DisplayFormat.FormatString = "C"
+                        column.DisplayFormat.Format = New CurrencyFormatter()
+                    End If
+                Next
+            Catch ex As Exception
+                LOGGER.Warn("Unexpected Error in FormatGridView: " & ex.Message)
+            End Try

-                If Not IsNothing(column) Then
-                    column.DisplayFormat.FormatType = FormatType.Numeric
-                    column.DisplayFormat.FormatString = "C"
-                    column.DisplayFormat.Format = New CurrencyFormatter()
-                End If
-            Next

        End Sub

@@ -214,52 +219,3 @@ Public Class ClassGridFormatter
    End Class

 End Class
-
-' FOR REFERENCE IN CASE SOMETHING BREAKS :)
-'Public Shared Function Format_GridColumns(Primary_DT As DataTable, _ENTITYSQL As String, listcheck As List(Of String), listdate As List(Of String))
-'    Try
-'        Dim tbltemp As DataTable = Primary_DT.Clone()
-'        ' Nicht benötigt? Datumsspalten werden im Grid formatiert
-'        For Each col As String In listdate
-'            Dim colDate As DataColumn = tbltemp.Columns(col)
-'            If Not IsNothing(colDate) Then
-'                Try
-'                    colDate.DataType = GetType(Date)
-'                Catch ex As Exception
-'                    MsgBox("Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-'                End Try
-'            End If
-'        Next
-'        For Each col1 As String In listcheck
-'            Dim collist As DataColumn = tbltemp.Columns(col1)
-'            If Not IsNothing(collist) Then
-'                collist.DataType = GetType(Boolean)
-'            End If
-'        Next
-'        Try
-'            Dim collist As DataColumn = tbltemp.Columns("files?")
-'            If Not IsNothing(collist) Then
-'                collist.DataType = GetType(Boolean)
-'            End If
-'        Catch ex As Exception
-
-'        End Try
-'        Try
-'            tbltemp.Load(Primary_DT.CreateDataReader)
-'            Return tbltemp
-'        Catch ex As Exception
-'            Logger.Warn("Attention: Format_GridColumns - Could not load converted datatable: " & ex.Message)
-'            'Tabelle wird ohne Datekonvertierung geladen
-'            Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "Load_Entity_Data_Only")
-'            Dim primaryKey(1) As DataColumn
-'            primaryKey(0) = DTEntity.Columns("Record-ID")
-'            DTEntity.PrimaryKey = primaryKey
-'            Return DTEntity
-'        End Try
-'    Catch ex As Exception
-'        MsgBox("Unexpected Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-'        Logger.Warn("Error in Format_GridColumns: " & ex.Message)
-'        Return Nothing
-'    End Try
-
-'End Function
--- a/app/DD-Record-Organizer/Classes/ClassHelper.vb
+++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb
@@ -1,6 +1,5 @@
 Imports System.IO
 Imports System.Globalization
-Imports DD_LIB_Standards
 Imports System.ComponentModel

 Public Class ClassHelper
@@ -10,11 +9,11 @@ Public Class ClassHelper
        Try
            Dim ochanged As Boolean = False
            If WMpath.StartsWith("W:") Then
-                WMpath = WMpath.Replace("W:", "\\windream\Objects")
+                WMpath = WMpath.Replace("W:", WMPATH_PREFIX)
                ochanged = True
            ElseIf WMpath.StartsWith("\") Then
-                If WMpath.StartsWith("\\windream\Objects") = False Then
-                    WMpath = "\\windream\Objects" & WMpath
+                If WMpath.StartsWith(WMPATH_PREFIX) = False Then
+                    WMpath = WMPATH_PREFIX & WMpath
                    ochanged = True
                End If
            End If
@@ -24,6 +23,23 @@ Public Class ClassHelper
            Return WMpath
        End Try

+    End Function
+    Public Shared Function GetRelPath(WMpath As String)
+        Try
+            If WMpath.StartsWith("W:") Then
+                WMpath = WMpath.Replace("W:", "")
+
+            ElseIf WMpath.StartsWith("\") Then
+                If WMpath.StartsWith(WMPATH_PREFIX) = False Then
+                    WMpath = WMpath.Replace("WMPATH_PREFIX:", "")
+                End If
+            End If
+            LOGGER.Debug("WMpath is: " & WMpath)
+            Return WMpath
+        Catch ex As Exception
+            Return WMpath
+        End Try
+
    End Function
    Public Shared Function Format_Currency(value As String, language As String)
        Try
@@ -161,8 +177,8 @@ Public Class ClassHelper
                If USER_GENERAL_VIEWER = "NONE" Then
                    Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
                    EXT = EXT.Replace(".", "")
-                    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND UPPER(FILE_EXTENSION) = UPPER('{1}')", USER_GUID, EXT)
-                    Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+                    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
+                    Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
                    If DT.Rows.Count = 1 Then
                        Select Case DT.Rows(0).Item("VIEWER")
                            Case "DOC_VIEW"
@@ -192,6 +208,7 @@ Public Class ClassHelper
    Public Shared Sub Open_Folder(RESULT_DOC_PATH As Object, DocID As String)
        Try
            If RESULT_DOC_PATH <> Nothing Then
+                RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
                Dim _path = Path.GetDirectoryName(RESULT_DOC_PATH)
                FOLDER_OPEN(_path, DocID)
            Else
@@ -253,10 +270,10 @@ Public Class ClassHelper
                LOGGER.Debug($"Checking oExtension [{oExtension}]...")
                If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
                    oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}"
-                    Dim odwVersionId = clsDatabase.Execute_Scalar(oSql, False)
+                    Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql)

                    Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,DOC_PATH) VALUES ({USER_GUID},'{ProcID.ToString}',{odwVersionId},{BW_DocID},'{BW_DocPath}')"
-                    clsDatabase.Execute_non_Query(oInsert, False)
+                    MYDB_ECM.ExecuteNonQuery(oInsert)
                End If

                'oMyProcess.WaitForExit()
@@ -298,7 +315,7 @@ Public Class ClassHelper
            COMMENT = COMMENT.Replace("'", "")
            Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, USER_USERNAME)

-            Dim result = clsDatabase.Execute_non_Query(insert, False)
+            Dim result = MYDB_ECM.ExecuteNonQuery(insert)
            Return result
        Catch ex As Exception
            LOGGER.Warn("Unexpected Error in InsertEssential_Log: " & ex.Message)
@@ -308,7 +325,7 @@ Public Class ClassHelper
    Public Shared Function DeleteRecord(SELECTED_RECORD_ID As Integer, Optional Comment As String = "")
        Try
            Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}','{2}'", SELECTED_RECORD_ID, USER_USERNAME, Comment)
-            Dim result As Boolean = ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
+            Dim result As Boolean = MYDB_ECM.ExecuteNonQuery(DeleteRecordSQL)
            If result = False Then
                Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log"
                If USER_LANGUAGE <> "de-DE" Then
@@ -349,7 +366,7 @@ Public Class ClassHelper
            sql = sql.Replace("@USERNAME", USER_USERNAME)
            sql = sql.Replace("@USER_NAME", USER_USERNAME)
            LOGGER.Debug("RIGHT_ONLY_READ_RECORD_DOC SQL: (When true then disable) '" & sql & "'")
-            Return CBool(ClassDatabase.Execute_Scalar(sql, True))
+            Return CBool(MYDB_ECM.GetScalarValue(sql))
        Catch ex As Exception
            LOGGER.Warn("SQL_RIGHT_READ_AND_VIEW_ONLY: " & sql)
            Return False
@@ -368,7 +385,7 @@ Public Class ClassHelper
            sql = sql.Replace("@USERNAME", USER_USERNAME)
            sql = sql.Replace("@USER_NAME", USER_USERNAME)
            LOGGER.Debug("RIGHT_ONLY_READ_COC SQL: (When true then disable) '" & sql & "'")
-            Return CBool(ClassDatabase.Execute_Scalar(sql, True))
+            Return CBool(MYDB_ECM.GetScalarValue(sql))
        Catch ex As Exception
            LOGGER.Warn("RIGHT_WINDREAM_FORBIDDEN: " & sql)
            Return False
@@ -377,7 +394,7 @@ Public Class ClassHelper
    Public Shared Sub Create_USER_FILE_TABLE()
        Try
            Dim sql = String.Format("SELECT *, CONVERT(BIT,0) AS DELETE_FILE FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
-            CURRENT_TBPMO_FILES_USER = ClassDatabase.Return_Datatable(sql, True)
+            CURRENT_TBPMO_FILES_USER = MYDB_ECM.GetDatatable(sql)
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error while creating User_File_Table")
        End Try
@@ -385,7 +402,7 @@ Public Class ClassHelper
    Public Shared Function DELETE_PMO_FILE_USER(GUID As Integer)
        Try
            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE GUID = {0}", GUID)
-            Return ClassDatabase.Execute_non_Query(del, True)
+            Return MYDB_ECM.ExecuteNonQuery(del)
        Catch ex As Exception
            MsgBox("Unexpected Error in DELETE_PMO_FILE_USER: " & ex.Message, MsgBoxStyle.Critical)
            Return False
@@ -418,4 +435,13 @@ Public Class ClassHelper
        End Try

    End Function
+    Public Shared Function GetDocrecordLinks(pRECORDID As Integer)
+        Try
+            Dim oSQL = $"SELECT * FROM TBPMO_DOC_RECORD_LINK WHERE RECORD_ID = {pRECORDID}"
+            CURRENT_DT_TBPMO_DOC_RECORD_LINK = MYDB_ECM.GetDatatable(oSQL)
+        Catch ex As Exception
+            LOGGER.Warn("Unexpected Error in GetDocrecordLinks: " & ex.Message)
+            Return False
+        End Try
+    End Function
 End Class
--- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
+++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
@@ -8,7 +8,7 @@ Public Class ClassImport_Windream
        Try
            Dim err As Boolean = False
            CURRENT_FILENAME = QuellDatei_Path
-            Dim DT_DOCTYPE As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DOCTYPE_ID, True)
+            Dim DT_DOCTYPE As DataTable = MYDB_ECM.GetDatatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DOCTYPE_ID)
            If Not IsNothing(DT_DOCTYPE) Then
                Dim Targetpath As String = DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD")
                Dim Dokart As String = DT_DOCTYPE.Rows(0).Item("BEZEICHNUNG")
@@ -24,9 +24,9 @@ Public Class ClassImport_Windream
                Dim streamresult = clsWD_SET.Stream_File(QuellDatei_Path, Targetpath)
                If streamresult = True Then
                    Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
-                    CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
+                    CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(SQL)
                    sql = $"SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = {DOCTYPE_ID} AND ENTITY_ID = {CURRENT_ENTITY_ID}"
-                    Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
+                    Dim dt As DataTable = MYDB_ECM.GetDatatable(sql)
                    Dim indexierung_erfolgreich As Boolean = False
                    If dt Is Nothing = False Then
                        If dt.Rows.Count > 0 Then
@@ -57,7 +57,7 @@ Public Class ClassImport_Windream
                            End If
                            ''den Entity-Key auslesen
                            'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')"
-                            'dt = ClassDatabase.Return_Datatable(sql, True)
+                            'dt = MYDB_ECM.GetDatatable(sql)
                            'If Not dt Is Nothing Then
                            '    If dt.Rows.Count = 1 Then
                            '        Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
@@ -108,14 +108,14 @@ Public Class ClassImport_Windream
        Try
            Dim FILE_DELIMITER, VERSION_DELIMITER, _WDOBJECTTYPE, _NewFileString As String
            Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where UPPER(NAME) = UPPER('Global-Indexer')"
-            Dim DT1 As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim DT1 As DataTable = MYDB_ECM.GetDatatable(sql)
            FILE_DELIMITER = DT1.Rows(0).Item("FILE_DELIMITER")
            VERSION_DELIMITER = DT1.Rows(0).Item("VERSION_DELIMITER")

            Dim err As Boolean = False
            Dim oWMTARGET_FOLDER As String
            Dim oExtension As String = Path.GetExtension(CURRENT_FILENAME)
-            Dim oDT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID, True)
+            Dim oDT As DataTable = MYDB_ECM.GetDatatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID)
            'sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW"
            'sql_history_Index_Values = ""
            Dim AnzahlIndexe As Integer = 1
@@ -125,7 +125,7 @@ Public Class ClassImport_Windream
            oWMTARGET_FOLDER = oDT.Rows(0).Item("ZIEL_PFAD")

            sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}"
-            Dim oDTFW_DOCTYPES As DataTable = ClassDatabase.Return_Datatable(sql)
+            Dim oDTFW_DOCTYPES As DataTable = MYDB_ECM.GetDatatable(sql)
            Dim oDYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER")
            Dim oNAME_CONVENTION = oDTFW_DOCTYPES.Rows(0).Item("NAME_CONVENTION")
            Dim oROOTWM_FOLDER
@@ -135,11 +135,12 @@ Public Class ClassImport_Windream
                oROOTWM_FOLDER = ""
            End Try
            If oROOTWM_FOLDER <> String.Empty Then
+                oROOTWM_FOLDER = ClassHelper.FORMAT_WM_PATH(oROOTWM_FOLDER)
                LOGGER.Debug($"oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used")
                oWMTARGET_FOLDER = oROOTWM_FOLDER
            End If

-            'ClassDatabase.Execute_Scalar(sql)
+            'MYDB_ECM.GetScalarValue(SQL)
            If Not IsDBNull(oDYNAMIC_FOLDER) Then
                If oDYNAMIC_FOLDER <> String.Empty Then
                    If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
@@ -225,7 +226,6 @@ Public Class ClassImport_Windream
            ' Regulären Ausdruck zum Auslesen der Indexe definieren
            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
            'Namenkonvention laden
-            'Dim NameConv = ClassDatabase.Execute_Scalar("SELECT TOP 1 NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID, True)
            If IsDBNull(oNAME_CONVENTION) Then
                LOGGER.Warn("Achtung: Namenskonvention is DBNull")
                oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
@@ -267,7 +267,7 @@ Public Class ClassImport_Windream
                                        'Die GUID des AutoIndex auslesen
                                        Dim INDEX_ID = split(1)
                                        If IsNumeric(INDEX_ID) Then
-                                            Dim sql_AUTOindexresult = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID, True)
+                                            Dim sql_AUTOindexresult = MYDB_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID)
                                            If IsNothing(sql_AUTOindexresult) Then
                                                LOGGER.Debug("unexpected: sql_AUTOindexresult is nothing!!")
                                                value = ""
@@ -276,7 +276,7 @@ Public Class ClassImport_Windream
                                                    value = ""
                                                Else
                                                    sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
-                                                    Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_AUTOindexresult, True)
+                                                    Dim AUTOindexresult = MYDB_ECM.GetScalarValue(sql_AUTOindexresult)
                                                    If IsNothing(AUTOindexresult) Then
                                                        LOGGER.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!")
                                                        LOGGER.Warn("" & sql_AUTOindexresult)
@@ -309,7 +309,7 @@ Public Class ClassImport_Windream
                                            Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID)
                                            If IsNothing(CONTROLVALUE) Then
                                                Dim checktype = "SELECT CONTROL_TYPE_ID,SQL_COMMAND_1,CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID
-                                                Dim DTtype As DataTable = ClassDatabase.Return_Datatable(checktype)
+                                                Dim DTtype As DataTable = MYDB_ECM.GetDatatable(checktype)
                                                If DTtype.Rows.Count = 1 Then
                                                    Dim lblsql = DTtype.Rows(0).Item(1)
                                                    lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
@@ -317,7 +317,7 @@ Public Class ClassImport_Windream
                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                                    LOGGER.Debug("variable sql will be used for convention")
-                                                    Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
+                                                    Dim result = MYDB_ECM.GetScalarValue(DTtype.Rows(0).Item(2))
                                                    If Not IsNothing(result) Then
                                                        value = result.ToString
                                                    Else
@@ -325,7 +325,7 @@ Public Class ClassImport_Windream
                                                        value = ""
                                                    End If
                                                Else
-                                                    LOGGER.Warn("NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.")
+                                                    LOGGER.Warn("!!ATTENTION: NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.")
                                                    LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                                    value = ""
                                                End If
@@ -337,7 +337,7 @@ Public Class ClassImport_Windream
                                                    value = ""
                                                Else
                                                    Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
-                                                    Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1, True)
+                                                    Dim DT_FORMAT As DataTable = MYDB_ECM.GetDatatable(sql1)
                                                    If Not IsNothing(DT_FORMAT) Then
                                                        If DT_FORMAT.Rows.Count > 0 Then
                                                            Dim result
@@ -509,7 +509,7 @@ Public Class ClassImport_Windream
                            Dim INDEX_ID = split(1)
                            If IsNumeric(INDEX_ID) Then
                                Dim sql = "SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID
-                                Dim sql_command = ClassDatabase.Execute_Scalar(sql)
+                                Dim sql_command = MYDB_ECM.GetScalarValue(SQL)
                                If IsNothing(sql_command) Then
                                    LOGGER.Warn("unexpected: SQL_RESULT is nothing!!")
                                    LOGGER.Warn("" & sql)
@@ -521,7 +521,7 @@ Public Class ClassImport_Windream
                                        sql_command = sql_command.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
                                        sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
-                                        Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_command, True)
+                                        Dim AUTOindexresult = MYDB_ECM.GetScalarValue(sql_command)
                                        If IsNothing(AUTOindexresult) Then
                                            LOGGER.Warn("unexpected: AUTOindexresult is nothing!!")
                                            LOGGER.Warn("" & sql_command)
@@ -639,7 +639,7 @@ Public Class ClassImport_Windream
                                Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID)
                                If IsNothing(CONTROLVALUE) Then
                                    Dim checktype = "SELECT CONTROL_TYPE_ID,SQL_COMMAND_1,CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 is not null and SQL_COMMAND_1 <> '' AND GUID = " & CONTROL_ID
-                                    Dim DTtype As DataTable = ClassDatabase.Return_Datatable(checktype)
+                                    Dim DTtype As DataTable = MYDB_ECM.GetDatatable(checktype)
                                    If DTtype.Rows.Count = 1 Then
                                        Dim lblsql = DTtype.Rows(0).Item(1)
                                        lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
@@ -647,7 +647,7 @@ Public Class ClassImport_Windream
                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
                                        lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                        LOGGER.Debug("variable sql will be used for convention")
-                                        Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
+                                        Dim result = MYDB_ECM.GetScalarValue(DTtype.Rows(0).Item(2))
                                        If Not IsNothing(result) Then
                                            FolderConvention = FolderConvention.Replace(element.ToString, result.ToString)
                                        Else
@@ -664,7 +664,7 @@ Public Class ClassImport_Windream
                                        LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                    Else
                                        Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
-                                        Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1, True)
+                                        Dim DT_FORMAT As DataTable = MYDB_ECM.GetDatatable(sql1)
                                        If Not IsNothing(DT_FORMAT) Then
                                            If DT_FORMAT.Rows.Count > 0 Then
                                                Dim result
--- a/app/DD-Record-Organizer/Classes/ClassInactivity.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInactivity.vb
--- a/app/DD-Record-Organizer/Classes/ClassInactivityFilter.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInactivityFilter.vb
--- a/app/DD-Record-Organizer/Classes/ClassInit.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInit.vb
@@ -1,39 +1,91 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports DD_LIB_Standards
+Imports DevExpress.DataAccess.Native
+Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging

 Public Class ClassInit
    Public Sub New()
    End Sub

-    Public Sub InitLogger()
-        LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
-                                        My.Application.Info.CompanyName,
-                                        "ADDI")
-        LOGGER = LOGCONFIG.GetLogger()
-
-        LOGGER.Info("## ADDI started - {0}", Now)
+    Public Sub InitLoggerANDConfig()
        Try
-            Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
+            LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
+                                        My.Application.Info.CompanyName,
+                                        "OrgFlow")
+            LOGGER = LOGCONFIG.GetLogger()

-            For Each file As IO.FileInfo In directory.GetFiles
-                If (Now - file.CreationTime).Days > 29 Then
-                    file.Delete()
-                Else
-                    Exit For
+            LOGGER.Info("## OrgFlow started - {0}", Now)
+            Try
+                Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
+
+                For Each file As IO.FileInfo In directory.GetFiles
+                    If (Now - file.CreationTime).Days > 29 Then
+                        file.Delete()
+                    Else
+                        Exit For
+                    End If
+
+
+                Next
+            Catch ex As Exception
+
+            End Try
+
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
+            Dim oLegacyAppDataPath As String = Application.UserAppDataPath
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
+            Dim oStartupPath = Application.StartupPath
+            ' If AppConfig from Startup Path should be forced, rewrite the common app data path
+            If My.Settings.UseAppConfigConString = True Then
+                ' UserAppDataPath = StartupPath
+                oCommonAppDataPath = oStartupPath
+            End If
+
+            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
+            LOGGER.Info("Config loaded")
+            Try
+                If CONFIG.Config.ConnectionString <> String.Empty Then
+                    LOGGER.Debug("Connection String loaded")
+                    MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
                End If
+            Catch ex As Exception
+                LOGGER.Error(ex, "Unexpected Error Getting CONFIG.TestMode or CONFIG.ConnectionStringTest")
+            End Try
+


-            Next
        Catch ex As Exception

        End Try
-    End Sub

+    End Sub
+    Private Shared Function DecryptConnectionString(EncryptedConnectionString As String) As String
+        Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
+            .ConnectionString = EncryptedConnectionString
+        }
+
+        If oBuilder.ConnectionString.Contains("Password=") Then
+            Dim oPlaintextPassword As String
+            Dim oDecryptor As New ClassEncryption("!35452didalog=")
+
+            Try
+                oPlaintextPassword = oDecryptor.DecryptData(oBuilder.Password)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+                LOGGER.Debug("Password {0} could not be decrypted. Assuming plaintext password.")
+                oPlaintextPassword = oBuilder.Password
+            End Try
+            Return EncryptedConnectionString.Replace(oBuilder.Password, oPlaintextPassword)
+        Else
+            Return EncryptedConnectionString
+        End If
+    End Function
    Public Shared Function InitDatabase()
        Try
-            Dim dbResult As Boolean
+            'Dim dbResult As Boolean

            MySettings_Load()

@@ -41,11 +93,19 @@ Public Class ClassInit
                MsgBox("The Exclude File Structure for files in Folderwatch could not be initialized!", MsgBoxStyle.Information)
            End If
            clsDatabase.GUI = True
+            If CONFIG.Config.ConnectionString <> String.Empty Then
+                LOGGER.Debug("Connection String from CONFIG")
+                MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
+            End If
            If MyConnectionString <> String.Empty Then
-                dbResult = clsDatabase.Init(MyConnectionString)
+                MYDB_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString)
+                If MYDB_ECM.DBInitialized = False Then
+                    frmConfig_Basic.ShowDialog()
+                End If
+                ' dbResult = clsDatabase.Init(MyConnectionString)
            Else
                frmConfig_Basic.ShowDialog()
-                dbResult = clsDatabase.Init(MyConnectionString)
+                ' dbResult = clsDatabase.Init(MyConnectionString)
            End If
            If ClassProxy.MyPROXYConnectionString <> String.Empty Then
                If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then
@@ -56,15 +116,19 @@ Public Class ClassInit
                    ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Proxy-Server {0} - Database {1} is used", csb.DataSource, csb.InitialCatalog))
                End If
            End If
-            ClassDatabase.Init()
-            If dbResult = False Then
-                If clsLogger.LOGG_MSG <> String.Empty Then
-                    Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG)
-                Else
-                    Throw New Exception("Find more information in the logfile.")
-                End If
+            If Not IsNothing(MYDB_ECM) Then
+                If MYDB_ECM.DBInitialized = False Then
+                    If clsLogger.LOGG_MSG <> String.Empty Then
+                        Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG)
+                    Else
+                        Throw New Exception("Find more information in the logfile.")
+                    End If

+                End If
+            Else
+                Return False
            End If
+
            Return True
        Catch ex As Exception
            MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -76,8 +140,8 @@ Public Class ClassInit
    Public Sub InitAddons()
        Try
            Dim CurrentDir As String = My.Application.Info.DirectoryPath
-            ' Dim Sql As String = "SELECT PATH_ADDONS from TBPMO_KONFIGURATION WHERE GUID = 1"
-            Dim AddonPath As String = MY_ADDON_PATH ' ClassDatabase.Execute_Scalar(Sql)
+
+            Dim AddonPath As String = MY_ADDON_PATH ' MYDB_ECM.GetScalarValue(SQL)
            Dim Dev_AddonPath As String = System.IO.Path.GetFullPath(System.IO.Path.Combine(CurrentDir, "..\..\..\..\app"))

            If AddonPath Is Nothing OrElse AddonPath = "" Then
@@ -123,7 +187,7 @@ Public Class ClassInit
            End If

            Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1")
-            Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql, False)
+            Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql)
            If KONFIG_DT.Rows.Count = 1 Then
                Try
                    MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING")
@@ -133,22 +197,36 @@ Public Class ClassInit
                End Try
                WD_UNICODE = KONFIG_DT.Rows(0).Item("WD_UNICODE")
                SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT")
+                WMDriveLetter = KONFIG_DT.Rows(0).Item("WM_LAUFWERKBUCHSTABE")
+                WMPATH_PREFIX = KONFIG_DT.Rows(0).Item("WMPATH_PREFIX")
+                If Not WMPATH_PREFIX.ToUpper.StartsWith("\\WINDREAM\OBJECTS") Then
+                    SHARE_DRIVE_ACTIVE = True
+                    LOGGER.Info("WM SHARE_DRIVE via TBPMO_KONFIGURATION is active")
+                End If
            End If

+            sql = "SELECT * FROM TBDD_SQL_COMMANDS"
+            Dim oDTSQL_COMMANDS As DataTable = MYDB_ECM.GetDatatable(sql)
+            For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
+                If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
+                    SQL_DOC_RESULT_RECORD = oRow.Item("SQL_COMMAND")
+                    LOGGER.Debug("SQL_DOC_RESULT_RECORD = " + SQL_DOC_RESULT_RECORD)
+                End If
+            Next
            sql = "SELECT * FROM TBPMO_CONTROL"
-            CURRENT_TBPMO_CONTROL = ClassDatabase.Return_Datatable(sql, True)
+            CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(sql)
            sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1")
-            CURRENT_RESULTLIST_CONFIG = ClassDatabase.Return_Datatable(sql, True)
+            DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(sql)
            sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS")
-            CURRENT_VARIABLE_CONTROLS = ClassDatabase.Return_Datatable(sql, True)
+            CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(sql)
            sql = String.Format("SELECT * FROM TBPMO_FORM_VIEW")
-            CURRENT_TBPMO_FORM_VIEW = ClassDatabase.Return_Datatable(sql, True)
+            CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(sql)
            sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID")
-            CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
+            CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(sql)
            clsCURRENT.LOG_ERRORS_ONLY = DEBUG

            sql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE")
-            Dim oDTFF_CHANGE As DataTable = ClassDatabase.Return_Datatable(sql, True)
+            Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(sql)
            For Each oRow As DataRow In oDTFF_CHANGE.Rows
                FILE_FORMATS_CHANGE_DURING_EDIT.Add(oRow.Item("FILE_EXT"))
            Next
@@ -164,7 +242,7 @@ Public Class ClassInit
            Dim sql = String.Format("SELECT T1.GUID, T.DESCRIPTION, T.SQL_CONNECTION, T.SQL_CONNECTION_PROXY, T.WM_ALIAS,T1.ACTIVE FROM " &
                                    "TBPMO_CLIENT_CONNECTION_SWITCH T, TBPMO_CLIENT_CONN_SWITCH_USER T1 WHERE T.GUID = T1.CONN_SWITCH_ID " &
                                    "And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
-            CURRENT_TBPMO_CONN_SWITCH = ClassDatabase.Return_Datatable(sql)
+            CURRENT_TBPMO_CONN_SWITCH = MYDB_ECM.GetDatatable(sql)
        Catch ex As Exception
            LOGGER.Warn("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
        End Try
@@ -180,14 +258,13 @@ Public Class ClassInit
            End If

            Dim sql = String.Format("SELECT T.*, T1.IS_ADMIN FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID  
-WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
+WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
            LOGGER.Info("Login at: " & Now.ToString)
            LOGGER.Info("Username: " & USER_USERNAME)
-            Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+            Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(sql)
            If USER_DT.Rows.Count = 0 Then
-                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!")
-                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                'Me.Close()
+                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
+
                Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
                MsgBox(msg, MsgBoxStyle.Exclamation)
                ClassHelper.InsertEssential_Log(0, "USER-ID", String.Format("User '{0}' not listed in Userconfiguration", USER_USERNAME))
@@ -196,16 +273,25 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                Dim Right_RO As Boolean = False
                USER_GUID = USER_DT.Rows(0).Item("GUID")
                USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
-                USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'ClassDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
+                USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT")
                USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
                clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
                USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
                USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
                Right_RO = True

+                Try
+                    If CBool(USER_DT.Rows(0).Item("PMO_READ_ONLY")) = True Then
+                        WM_READ_ONLY = True
+                        LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY!!")
+                    End If
+                Catch ex As Exception
+
+                End Try
+

                If Right_RO = False Then
-                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
+                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using OrgFlow!")
                    'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                    Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")

@@ -217,12 +303,11 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                    'Me.Close()
                Else
                    sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = " & USER_GUID)
-                    CURRENT_TBPMO_RIGHT_USER = ClassDatabase.Return_Datatable(sql, True)
+                    CURRENT_TBPMO_RIGHT_USER = MYDB_ECM.GetDatatable(sql)


                    Init_CONN_SWITCH()
-                    'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
-                    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, False)
+                    DT_CLIENT_USER = MYDB_ECM.GetDatatable("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
@@ -242,9 +327,9 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                    ClassLicence.Refresh_Licence(CLIENT_SELECTED)
                    'Am System anmelden
                    '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)
+                    MYDB_ECM.ExecuteNonQuery(sql)
                    sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND UPPER(MODULE)= UPPER('Record-Organizer')"
-                    If ClassDatabase.Execute_non_Query(sql) = True Then
+                    If MYDB_ECM.ExecuteNonQuery(sql) = True Then

                    End If
                    Dim ConStringMain As String
@@ -254,7 +339,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                        ConStringMain = "Main: " & MyConnectionString
                    End If
                    sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
-                    ClassDatabase.Execute_non_Query(sql)
+                    MYDB_ECM.ExecuteNonQuery(sql)

                    USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
                    If USER_IS_ADMIN = True Then
@@ -269,22 +354,41 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM

                    End If
                    Try
-                        If clsWindream.Create_Session = False Then
-                            LOGGER.Warn("Could not create the login for windream - No session created!")
-                            ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
+                        If WM_READ_ONLY = True Then
+                            If SHARE_DRIVE_ACTIVE = True Then
+                                LOGGER.Info($"SHAREDRIVE IS ACTIVE = {SHARE_DRIVE_ACTIVE.ToString}")
+                            End If
+
+                        Else
+                            Try
+                                WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
+                                If IsNothing(WMMOD) Then
+                                    MsgBox("No windream connectable", MsgBoxStyle.Exclamation)
+                                End If
+                            Catch ex As Exception
+                                LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream!")
+                            End Try
+
+                            If clsWindream.Create_Session = False Then
+                                LOGGER.Warn("Could not create the login for windream - No session created!")
+                                ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "OrgFlow will start anyway but be aware that searching and importing won't be possible!")
+                            End If
                        End If
+
+
                    Catch ex As Exception
                        LOGGER.Warn("Unexpected Error in clswindream.Init: " & ex.Message)
                        MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)
                    End Try

                    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, False)
+                    Dim anzahl = MYDB_ECM.GetScalarValue(sql)
                    USERS_LOGGED_IN = CInt(anzahl)
-                    LOGGER.Debug("User# logged in: " & anzahl.ToString)
+                    LOGGER.Info("User# logged in: " & anzahl.ToString)
+                    LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString)
                    '####

-                    If LICENSE_COUNT < USERS_LOGGED_IN And LICENSE_EXPIRED = False Then
+                    If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) And LICENSE_EXPIRED = False Then
                        Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")

                        If USER_LANGUAGE <> "de-DE" Then
@@ -296,7 +400,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                        If USER_IS_ADMIN = False Then
                            'Anmeldung wieder herausnehmen
                            sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
-                            ClassDatabase.Execute_non_Query(sql)
+                            MYDB_ECM.ExecuteNonQuery(sql)
                            LOGGER.Warn(" - logged out the user")
                            Return False
                        End If
@@ -304,7 +408,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                        Try
                            'Die FolderWatch starten
                            Dim sql1 = "SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID
-                            Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, False)
+                            Dim folderwatch_SCAN = MYDB_ECM.GetScalarValue(sql1)

                            If Not folderwatch_SCAN Is Nothing Then
                                CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
@@ -321,6 +425,8 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                    If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
                        SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') "
                    End If
+                    Dim oSQL = $"SELECT COUNT(GU.GUID) FROM	TBDD_GROUPS_USER GU INNER JOIN TBDD_GROUPS G ON GU.GROUP_ID = G.GUID WHERE G.NAME = 'ORGFLOW-Supervisor' AND GU.USER_ID = {USER_GUID}"
+                    USER_IS_SUPERVISOR = MYDB_ECM.GetScalarValue(oSQL)
                    Return True
                    'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
                End If
--- a/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb
+++ b/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb
@@ -45,8 +45,7 @@ Public Class ClassJumpRecord

    Public Shared Sub JumpToRecord(STATE_ID As Integer, recordId As Integer)
        Try
-            'Dim constructorIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT CONSTRUCT_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0}", constructorId))
-            Dim recordIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_RECORD WHERE GUID = {0}", recordId), True)
+            Dim recordIdExists As Boolean = MYDB_ECM.GetScalarValue(String.Format("SELECT GUID FROM TBPMO_RECORD WHERE GUID = {0}", recordId))

            'If constructorIdExists = False Or recordIdExists = False Then
            '    MsgBox("Das angegebene Formular konnte nicht geöffnet werden. Grund: Die ConstructorID oder die RecordID wurde nicht gefunden." & vbNewLine & "constructorId: " & constructorId & ", recordId: " & recordId, MsgBoxStyle.Exclamation, "URL Handler")
--- a/app/DD-Record-Organizer/Classes/ClassLayout.vb
+++ b/app/DD-Record-Organizer/Classes/ClassLayout.vb
--- a/app/DD-Record-Organizer/Classes/ClassLicence.vb
+++ b/app/DD-Record-Organizer/Classes/ClassLicence.vb
@@ -11,7 +11,7 @@ Public Class ClassLicence
            _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
            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, False)
+            Dim lic As String = MYDB_ECM.GetScalarValue(sql)
            If lic = "" Then
                LICENSE_COUNT = 0
                LICENSE_DATE = "1900-01-01"
@@ -56,7 +56,7 @@ Public Class ClassLicence
            End If

            sql = String.Format("SELECT NAME, VALID_DATE, '' AS State FROM TBDD_LICENSE_ADD_ON WHERE CLIENT_ID = {0} AND MODULE = 'Record-Organizer'", CLIENT_ID)
-            DT_LICENSE_ADDONS = ClassDatabase.Return_Datatable(sql)
+            DT_LICENSE_ADDONS = MYDB_ECM.GetDatatable(sql)
            For Each license_Row As DataRow In DT_LICENSE_ADDONS.Rows
                Dim expired As Boolean = False
                LOGGER.Debug("AddOnName: " & license_Row.Item("NAME"))
--- a/app/DD-Record-Organizer/Classes/ClassMoreMetadata.vb
+++ b/app/DD-Record-Organizer/Classes/ClassMoreMetadata.vb
--- a/app/DD-Record-Organizer/Classes/ClassNodeNavigation.vb
+++ b/app/DD-Record-Organizer/Classes/ClassNodeNavigation.vb
@@ -9,7 +9,7 @@ Public Class ClassNodeNavigation
    Public Shared Function CreateNodeProcedure(RECORD_ID As Integer, NODE_CONFIG_ID As Integer, NODE_CAPTION As String, NODE_ID1 As String, NODE_PARENT_ID As String, ADDED_WHO As String)
        Try
            Dim connection As New SqlConnection
-            connection.ConnectionString = MyConnectionString
+            connection.ConnectionString = MYDB_ECM.CurrentConnectionString

            Using cmd As New SqlCommand("PRPMO_CREATE_NODE", connection)
                cmd.CommandType = CommandType.StoredProcedure
@@ -96,14 +96,14 @@ Public Class ClassNodeNavigation
            Dim NODE_ID
            Dim NODE_CONFIG_ID
            Dim staticListItems = myTreeNode.Tag.Split("#")
-            LOGGER.Debug($"SUB CNCID.myTreeNode.Tag  [{myTreeNode.Tag.ToString}]", False)
+
            If staticListItems(0).Contains("NODE-TYPE") Or staticListItems(0).Contains("CONFIG_NODE") Then
                ' NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "")
                NODE_ID = Return_NODEID_forTag(myTreeNode.Tag)
                NODE_CONFIG_ID = Return_NODE_CONFIG_ID_forTag(myTreeNode.Tag)
-                LOGGER.Debug($"SUB CNCID.Checking nodeconfig on NODE_ID [{NODE_ID.ToString}] and NODE_CONFIG_ID [{NODE_CONFIG_ID.ToString}]", False)
+
            Else
-                LOGGER.Debug($"Attention no NODE-TYPE in staticListItems(0)  [{staticListItems(0).ToString}]", False)
+                LOGGER.Debug($"Attention no NODE-TYPE in staticListItems(0)  [{staticListItems(0).ToString}]")
            End If
            If NODE_CONFIGURABLE_NODES_DT.Rows.Count > 0 And IsNumeric(NODE_ID) Then
                'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt
@@ -127,25 +127,19 @@ Public Class ClassNodeNavigation


                If Not IsNothing(ID) Then
-                    LOGGER.Debug($"SUB CNCID.We have a NODE_CONFIGURABLE_ID [{ID.ToString}]!!", False)
+
                    ClassNodeNavigation.NODE_CONFIGURABLE_ID = ID
                    CURRENT_NODE_CONFIGURABLE_ID = ID
                Else
-                    LOGGER.Debug($"SUB CNCID.NODE_CONFIGURABLE_ID is nothing!!", False)
-                    ' LOGGER.Debug("CURRENT_NODE_CONFIGURABLE_ID would be nothing...", False)
                    CURRENT_NODE_CONFIGURABLE_ID = 0
                End If
            Else
-                If IsNumeric(NODE_ID) = False Then
-                    LOGGER.Debug("SUB CNCID.NODE_ID is not numeric", False)
-                Else
-                    LOGGER.Debug("SUB CNCID.NO NODE_CONFIGURABLE_NODES_DT", False)
-                End If
+

                CURRENT_NODE_CONFIGURABLE_ID = 0
            End If
        Catch ex As Exception
-            LOGGER.Debug("SUB CNCID.CURRENT_NODE_CONFIGURABLE_ID would be nothing(1)...", False)
+            LOGGER.Debug("SUB CNCID.CURRENT_NODE_CONFIGURABLE_ID would be nothing(1)...")
            ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0
            CURRENT_NODE_CONFIGURABLE_ID = 0
        End Try
@@ -174,6 +168,7 @@ Public Class ClassNodeNavigation
    End Function
    Public Shared Function CreateTreeViewNodes(DT_TREEVIEW_NODES As DataTable, TREEVIEW_IMAGELIST As ImageList)
        Try
+            LOGGER.Debug($"NODES: DT_TREEVIEW_NODES-Count: {DT_TREEVIEW_NODES.Rows.Count}")
            Dim sw As New SW("CreateTreeViewNodes")
            Dim mytrv As New TreeView
            Dim ENTITY_ID As Integer
--- a/app/DD-Record-Organizer/Classes/ClassOfficeTemplate.vb
+++ b/app/DD-Record-Organizer/Classes/ClassOfficeTemplate.vb
@@ -3,9 +3,9 @@ Public Class ClassOfficeTemplate
    Public Shared Function Open_Word_Template(Template_ID As Integer, Record_ID As Integer)
        Try
            Dim sql_Template As String = "SELECT * FROM VWPMO_TEMPLATE_ENTITY WHERE TEMPLATE_ID = " & Template_ID
-            Dim DT_TEMPLATE As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_Template)
+            Dim DT_TEMPLATE As System.Data.DataTable = MYDB_ECM.GetDatatable(sql_Template)
            Dim sql_patterns As String = String.Format("select * from TBPMO_TEMPLATE_PATTERN where TEMPLATE_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = {0}  AND TEMPLATE_ID = {1})", CURRENT_ENTITY_ID, Template_ID)
-            Dim DT_PATTERNS As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_patterns)
+            Dim DT_PATTERNS As System.Data.DataTable = MYDB_ECM.GetDatatable(sql_patterns)

            If IsNothing(DT_PATTERNS) Then
                MsgBox("Keine Patterns für diese Vorlage definiert. Bitte prüfen Sie die Konfiguration!", MsgBoxStyle.Critical)
@@ -13,7 +13,7 @@ Public Class ClassOfficeTemplate
            End If

            Dim Original_Vorlage As String = DT_TEMPLATE.Rows(0).Item("TEMPLATE_PATH")
-            Dim DOCTYPE_ID As Integer = ClassDatabase.Execute_Scalar("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE WHERE GUID = " & Template_ID, True)
+            Dim DOCTYPE_ID As Integer = MYDB_ECM.GetScalarValue("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE WHERE GUID = " & Template_ID)

            If System.IO.File.Exists(Original_Vorlage) = False Then
                MsgBox("Achtung: die Vorlage " & vbNewLine & Original_Vorlage & vbNewLine & "existiert nicht!", MsgBoxStyle.Critical)
@@ -41,7 +41,7 @@ Public Class ClassOfficeTemplate
            ' word.Visible = (True) 'Word sichtbar

            For Each cc In doc.ContentControls
-                LOGGER.Debug("Office-Pattern: " & cc.Tag, False)
+                LOGGER.Debug("Office-Pattern: " & cc.Tag)
                For Each patternrow As System.Data.DataRow In DT_PATTERNS.Rows
                    If patternrow.Item("NAME_PATTERN").ToString.ToUpper = cc.Tag.ToString.ToUpper Then
                        If Not IsDBNull(patternrow.Item("FIXED_VALUE")) Then
@@ -53,8 +53,8 @@ Public Class ClassOfficeTemplate
                                Dim Control_ID = fvalue '.Replace("@CONTROLID:", "")
                                Try
                                    If CInt(Control_ID) Then
-                                        LOGGER.Debug("Get Value for Control-ID: " & Control_ID.ToString, False)
-                                        Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID)
+                                        LOGGER.Debug("Get Value for Control-ID: " & Control_ID.ToString)
+                                        Dim value_akt = MYDB_ECM.GetScalarValue("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID)
                                        If Not IsNothing(value_akt) Then
                                            cc.Range.Text = value_akt.ToString
                                        Else
@@ -64,11 +64,7 @@ Public Class ClassOfficeTemplate
                                Catch ex As Exception
                                    LOGGER.Warn("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message)
                                End Try
-                                'End If
-                                'Else
-                                '    LOGGER.Debug("Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False)
-                                '    cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString
-                                'End If
+
                            End If
                        Else 'Kein Fixed Value, also wohl eher sql-result
                            If Not IsDBNull(patternrow.Item("CONNECTION_ID")) Then
--- a/app/DD-Record-Organizer/Classes/ClassPosGrid.vb
+++ b/app/DD-Record-Organizer/Classes/ClassPosGrid.vb
@@ -31,7 +31,7 @@ Public Class ClassPosGrid
            Dim DT As DataTable

            Try
-                DT = ClassDatabase.Return_Datatable(sqlCommand)
+                DT = MYDB_ECM.GetDatatable(sqlCommand)
            Catch ex As Exception
                LOGGER.Warn("Error in FormatComboColumn: " & ex.Message)
                Exit Sub
@@ -52,7 +52,7 @@ Public Class ClassPosGrid
    End Sub

    Private Shared Sub FormatTextColumn(grid As GridView, column As GridColumn, controlId As Integer)
-        Dim format As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & controlId)
+        Dim format As String = MYDB_ECM.GetScalarValue("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & controlId)

        If IsNothing(format) Then
            Exit Sub
@@ -69,7 +69,7 @@ Public Class ClassPosGrid
    Shared Sub FormatColumns(grid As GridView, formId As Integer)
        ' Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_COL_NAME, CTRLTYPE_ID, CONTROL_SQLCOMMAND_1 AS CONTROL_SQL, CONTROL_STATIC_LIST, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CTRLTYPE_ID IN (3,4,10,11) AND FORM_ID = {0}", formId)
        Dim Expression As String = String.Format("CTRLTYPE_ID IN (3,4,10,11) AND FORM_ID = {0}", formId)
-        Dim DT As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, Expression, "") 'ClassDatabase.Return_Datatable(SQL)
+        Dim DT As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, Expression, "")

        Dim dateEdit As New RepositoryItemDateEdit()
        Dim comboEdit As New RepositoryItemComboBox()
--- a/app/DD-Record-Organizer/Classes/ClassProxy.vb
+++ b/app/DD-Record-Organizer/Classes/ClassProxy.vb
@@ -9,7 +9,7 @@ Public Class ClassProxy
        Dim sel = "DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_SYNC_OBJECTS]" & vbNewLine &
        "SELECT	'Return Value' = @return_value"
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -27,7 +27,7 @@ Public Class ClassProxy
        Dim sel = "DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine &
        "SELECT	'Return Value' = @return_value"
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -45,7 +45,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine &
        "SELECT	'Return Value' = @return_value", RECID, ENTITY_ID)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -63,7 +63,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_RECORD_UPD_INS] {0},{1} " & vbNewLine &
        "SELECT	'Return Value' = @return_value", ENT_ID, RECID)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -81,7 +81,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_RECORD_CONNECT] {0},{1} " & vbNewLine &
        "SELECT	'Return Value' = @return_value", PARENT_RECID, RECID)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -99,7 +99,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_CONTROL_DEL] {0},{1},{2}" & vbNewLine &
        "SELECT	'Return Value' = @return_value", REC_ID, ENT_ID, CONTROL_ID)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -117,7 +117,7 @@ Public Class ClassProxy
        Dim sel = "DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_SYNC_WORKFLOWS]" & vbNewLine &
        "SELECT	'Return Value' = @return_value"
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -135,7 +135,7 @@ Public Class ClassProxy
        Dim sel = "DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_SYNC_DETAIL_OBJECT] '" & Objectname & "'" & vbNewLine &
        "SELECT	'Return Value' = @return_value"
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -153,7 +153,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_CONTROL_VALUE_UPD_INS] {0},{1},{2},'{3}','{4}'" & vbNewLine &
        "SELECT	'Return Value' = @return_value", EntityID, ControlID, RecordID, Value, USER_USERNAME)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -171,7 +171,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE	@return_value int" & vbNewLine &
        "EXEC @return_value = [dbo].[PRPROXY_CONTROL_VALUE_RENEW] {0}" & vbNewLine &
        "SELECT	'Return Value' = @return_value", RecordID)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
@@ -188,7 +188,7 @@ Public Class ClassProxy
        End If
        Dim sql = "SELECT SYNC_RUNNING FROM TBPROXY_CONFIG WHERE GUID = 1"
        Dim BUSY
-        BUSY = clsDatabase.Execute_Scalar(sql, True)
+        BUSY = MYDB_ECM.GetScalarValue(sql)
        If IsNothing(BUSY) Then
            Return True
        Else
@@ -202,7 +202,7 @@ Public Class ClassProxy
        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
      "EXEC @return_value = [dbo].[PRPROXY_DOC_VALUES_UPD] {0}, {1} " & vbNewLine &
      "SELECT	'Return Value' = @return_value", DocID, RecId)
-        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
        If Not IsNothing(Result) Then
            If Result.Rows(0).Item(0) = 0 Then
                Return True
--- a/app/DD-Record-Organizer/Classes/ClassRecordCommands.vb
+++ b/app/DD-Record-Organizer/Classes/ClassRecordCommands.vb
@@ -6,7 +6,7 @@ Public Class ClassRecordCommands
        Try
            Dim connection As New SqlConnection

-            connection.ConnectionString = MyConnectionString
+            connection.ConnectionString = MYDB_ECM.CurrentConnectionString

            Using cmd As New SqlCommand("PRPMO_CREATE_RECORD", connection)

@@ -39,22 +39,22 @@ Public Class ClassRecordCommands

    Public Shared Function CreateRecord(EntityID)
        Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & USER_USERNAME & "', " & EntityID & ",4711)"
-        Return ClassDatabase.Execute_non_Query(SQL)
+        Return MYDB_ECM.ExecuteNonQuery(Sql)
    End Function
    Public Shared Function GetLastRecord()
        Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
-        Return ClassDatabase.Execute_Scalar(SQL)
+        Return MYDB_ECM.GetScalarValue(SQL)
    End Function

    Public Shared Function ConnectRecord(PARENT_RECORD As Integer, LINK_RECORD As Integer, Optional Comment As String = "")
        Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & PARENT_RECORD & "," & LINK_RECORD & ",'" & Comment & "','" & USER_USERNAME & "')"
-        LOGGER.Debug("ConnectRecord SQL:  " & SQL, False)
-        Return ClassDatabase.Execute_non_Query(SQL)
+        LOGGER.Debug("ConnectRecord SQL:  " & SQL)
+        Return MYDB_ECM.ExecuteNonQuery(Sql)
    End Function
    Public Shared Function CHECK_RECORD_FINAL(RecordId As Integer, IsInsert As Boolean)
        If RecordId = 0 Then Return True
        Dim SQL = String.Format("EXEC PRPMO_RECORD_CHECK_INTEGRITY {0},'{1}',{2}", RecordId, Environment.UserName, IsInsert)
-        Return ClassDatabase.Execute_non_Query(SQL)
+        Return MYDB_ECM.ExecuteNonQuery(Sql)
    End Function

 End Class
--- a/app/DD-Record-Organizer/Classes/ClassRecordState.vb
+++ b/app/DD-Record-Organizer/Classes/ClassRecordState.vb
@@ -7,9 +7,9 @@
            End If
            Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", USER_USERNAME, RecordId)
            If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                ClassDatabase.Execute_non_Query(SQL, True)
+                MYDB_ECM.ExecuteNonQuery(SQL)
            End If
-            ClassDatabase.Execute_non_Query(SQL)
+            MYDB_ECM.ExecuteNonQuery(Sql)
        Catch ex As Exception
            MsgBox("Error in LockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -26,9 +26,9 @@
            End If
            Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 0, IN_WORK_WHO = NULL WHERE GUID = {0}", RecordId)
            If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                ClassDatabase.Execute_non_Query(SQL, True)
+                MYDB_ECM.ExecuteNonQuery(SQL)
            End If
-            ClassDatabase.Execute_non_Query(SQL)
+            MYDB_ECM.ExecuteNonQuery(Sql)
        Catch ex As Exception
            MsgBox("Error in UnlockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -37,7 +37,7 @@
    Public Shared Function IsRecordLocked(RecordId As Integer) As String
        Try
            Dim SQL As String = String.Format("SELECT IN_WORK, IN_WORK_WHO FROM TBPMO_RECORD WHERE GUID = {0}", RecordId)
-            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
+            Dim dt As DataTable = MYDB_ECM.GetDatatable(sql)

            If dt.Rows.Count = 1 Then

--- a/app/DD-Record-Organizer/Classes/ClassRecordView.vb
+++ b/app/DD-Record-Organizer/Classes/ClassRecordView.vb
@@ -42,7 +42,7 @@ Public Class ClassRecordView

    Private Function GetEntityId() As Integer
        Dim SQL = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", RecordId)
-        Me.Entity_ID = ClassDatabase.Execute_Scalar(SQL, True)
+        Me.Entity_ID = MYDB_ECM.GetScalarValue(SQL)
        Return Me.Entity_ID
    End Function

@@ -151,14 +151,14 @@ Public Class ClassRecordView
            Dim match As String = ControlIdRegex.Match(sqlcommand).Value 'Get Full Match to replace later
            Dim controlId As Integer = Integer.Parse(match.Replace("@", "")) 'Get Value after removing @-chars
            Dim controlSQL = String.Format("SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", controlId, Me.RecordId)
-            Dim controlValue = ClassDatabase.Execute_Scalar(controlSQL, True) 'Get the actual value
+            Dim controlValue = MYDB_ECM.GetScalarValue(controlSQL) 'Get the actual value
            sqlcommand = sqlcommand.Replace(match, controlValue.ToString()) 'Replace the actual value with the placeholder string/match
        End If

        ' Replace Static Placeholders like @RECORD_ID@
        sqlcommand = ReplaceStaticPlaceholders(sqlcommand)

-        sqllist = ClassDatabase.Return_Datatable(sqlcommand)
+        sqllist = MYDB_ECM.GetDatatable(sqlcommand)

        Return sqllist
    End Function
@@ -190,7 +190,7 @@ Public Class ClassRecordView
    Private Sub LoadControls()
        Try
            Dim controls As New List(Of Control)
-            DTControls = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0}", GetEntityId()), True)
+            DTControls = MYDB_ECM.GetDatatable(String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0}", GetEntityId()))

            For Each row As DataRow In DTControls.Rows
                Dim props As ControlProps = MapRowToProps(row)
@@ -255,7 +255,7 @@ Public Class ClassRecordView
    Private Sub LoadValues(controlCollection As Control.ControlCollection)
        Try
            Dim controls As New List(Of Control)
-            DTValues = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM  VWPMO_VALUES WHERE RECORD_ID = {0}", Me.RecordId), True)
+            DTValues = MYDB_ECM.GetDatatable(String.Format("SELECT * FROM  VWPMO_VALUES WHERE RECORD_ID = {0}", Me.RecordId), True)

            ' ControlCollection in eine List<Of Control> konvertieren
            controls = controlCollection.Cast(Of Control)().ToList()
@@ -363,7 +363,7 @@ Public Class ClassRecordView
                        Dim pb As PictureBox = DirectCast(control, PictureBox)
                        Dim controlId As Integer = DirectCast(control.Tag, ControlProps).Id
                        Dim sql = String.Format("SELECT IMG FROM TBPMO_CONTROL_IMAGE WHERE RECORD_ID = {0} AND CONTROL_ID = {1}", Me.RecordId, controlId)
-                        Dim bimg() As Byte = ClassDatabase.Execute_Scalar(sql)
+                        Dim bimg() As Byte = MYDB_ECM.GetScalarValue(SQL)

                        If Not IsNothing(bimg) Then
                            Dim img As Bitmap = ByteArrayToBitmap(bimg)
--- a/app/DD-Record-Organizer/Classes/ClassRightManagement.vb
+++ b/app/DD-Record-Organizer/Classes/ClassRightManagement.vb
@@ -35,9 +35,9 @@
                If DT_RIGHTS_USER Is Nothing Or DT_RIGHTS_GROUP Is Nothing Then
                    Dim Sql As String
                    Sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = {0} AND ENTITY_ID = {1}", USER_GUID, ENTITY_ID)
-                    DT_RIGHTS_USER = ClassDatabase.Return_Datatable(Sql, True)
+                    DT_RIGHTS_USER = MYDB_ECM.GetDatatable(sql)
                    Sql = String.Format("SELECT DISTINCT EDIT_REC,ADD_REC,DELETE_REC,ADD_DOC,VIEW_DOC,DELETE_DOC FROM TBPMO_RIGHT_GROUP WHERE ENTITY_ID = {0} AND GROUP_ID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {1})", ENTITY_ID, USER_GUID)
-                    DT_RIGHTS_GROUP = ClassDatabase.Return_Datatable(Sql, True)
+                    DT_RIGHTS_GROUP = MYDB_ECM.GetDatatable(sql)
                End If

                'Definition der Rechte erfolgt über UserGroupstable......wenn gefüllt
--- a/app/DD-Record-Organizer/Classes/ClassSAP.vb
+++ b/app/DD-Record-Organizer/Classes/ClassSAP.vb
@@ -1,19 +1,23 @@
 Imports ERPConnect
+Imports ERPConnect.Utils
+
 Public Class ClassSAP
    Public Shared SAPConnectionString
    Public Shared SAP_CONNECTION As New R3Connection()
+
+    Private Shared NewDatatable As DataTable
    Public Shared Function ConnectionInit(Host As String, SysNumber As String, Username As String, PW As String, Client As String, Lang As String)
        Try
-            LOGGER.Debug("", False)
-            LOGGER.Debug("SAP Connect started:", False)
+            LOGGER.Debug("")
+            LOGGER.Debug("SAP Connect started:")
            SAPConnectionString = String.Format("USER={0} LANG={1} CLIENT={2} SYSNR={3} ASHOST={4} PASSWD={5}", Username, Lang, Client, SysNumber, Host, PW)
            Dim con As New R3Connection()
            ERPConnect.LIC.SetLic("W86DWC992C")
-            LOGGER.Debug("SAP Connectionstring: " & SAPConnectionString, False)
+            LOGGER.Debug("SAP Connectionstring: " & SAPConnectionString)
            con.Open(SAPConnectionString)
            SAP_CONNECTION.Open(SAPConnectionString)
-            LOGGER.Debug("SAP-Connection created!", False)
-            LOGGER.Debug("", False)
+            LOGGER.Debug("SAP-Connection created!")
+            LOGGER.Debug("")
            Return True
        Catch ex As Exception
            MsgBox("Error in SAP ConnectionInit: " & ex.Message, MsgBoxStyle.Critical)
@@ -25,29 +29,29 @@ Public Class ClassSAP
        Try
            Dim RESULT_TABLE As DataTable = New DataTable

-            LOGGER.Debug("Get data from FuBa-Function", False)
+            LOGGER.Debug("Get data from FuBa-Function")
            Dim func As RFCFunction
            Try
                func = SAP_CONNECTION.CreateFunction(FuBaName)
-                LOGGER.Debug("func.Execute", False)
+                LOGGER.Debug("func.Execute")
                func.Execute()
-                LOGGER.Debug("function was executed", False)
+                LOGGER.Debug("function was executed")
            Catch ex As Exception
-                LOGGER.Warn("Unexpected Error in Create SAP Function: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in Create SAP Function: " & ex.Message)
                MsgBox("Error in Create SAP Function: " & ex.Message, MsgBoxStyle.Critical)
                Return Nothing
            End Try
            Dim FUNCT_ROW_COUNT As Integer = 1
            Dim RowMaskresult As String = ""
            Try
-                LOGGER.Debug("Checking FunctionExecute", False)
+                LOGGER.Debug("Checking FunctionExecute")
                'Den ersten Wert ausgeben lassen um die Spalten zu splitten

                For Each row As RFCStructure In func.Tables("T_INDEX").Rows
                    Try
                        If row.Item(1).ToString.Contains(SplitCharacter) Then
                            RowMaskresult = row.Item(1).ToString
-                            LOGGER.Debug("RowMask result: " & RowMaskresult, False)
+                            LOGGER.Debug("RowMask result: " & RowMaskresult)
                            FUNCT_ROW_COUNT = 2
                        End If
                    Catch ex As Exception
@@ -56,7 +60,7 @@ Public Class ClassSAP
                    If FUNCT_ROW_COUNT = 2 Then Exit For
                Next
            Catch ex As Exception
-                LOGGER.Warn("Unexpected Error in Checking FunctionExecute: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in Checking FunctionExecute: " & ex.Message)
                MsgBox("Error in Checking FunctionExecute: " & ex.Message, MsgBoxStyle.Critical)
                SAP_CONNECTION.Close()
                Return Nothing
@@ -65,17 +69,17 @@ Public Class ClassSAP
            Dim ColCount As Integer
            If SplitCharacter <> "" And RowMaskresult.Contains(SplitCharacter) Then
                Try
-                    LOGGER.Debug("Define Datatable with SplitCharacter method", False)
+                    LOGGER.Debug("Define Datatable with SplitCharacter method")
                    Dim split() = RowMaskresult.Split(SplitCharacter)
                    If split.Length > 0 Then
                        ColCount = split.Length - 1
                        CURRENT_COL_COUNT = ColCount

-                        LOGGER.Debug("ColCount: " & ColCount.ToString, False)
-                            LOGGER.Debug("Split-Results: ", False)
-                            For Each s As String In split
-                                LOGGER.Debug("  # " & s, False)
-                            Next
+                        LOGGER.Debug("ColCount: " & ColCount.ToString)
+                        LOGGER.Debug("Split-Results: ")
+                        For Each s As String In split
+                            LOGGER.Debug("  # " & s)
+                        Next

                        For x = 0 To ColCount
                            ' Declare DataColumn and DataRow variables.
@@ -86,14 +90,14 @@ Public Class ClassSAP
                            column.ColumnName = "Column " & x.ToString
                            RESULT_TABLE.Columns.Add(column)
                        Next
-                        LOGGER.Debug("Datatable Columns after Split created", False)
+                        LOGGER.Debug("Datatable Columns after Split created")
                        ' Create new DataRow objects and add to DataTable.   
                        'Jetzt die Zeilen der Function durchlaufen
                        For Each row As RFCStructure In func.Tables("T_INDEX").Rows
                            Dim new_row As DataRow
                            If RowLimit <> 0 Then
                                If RowLimit = FUNCT_ROW_COUNT Then
-                                    LOGGER.Debug("RowCount limited to" & RowLimit.ToString & " rows. Exit SAP Function", False)
+                                    LOGGER.Debug("RowCount limited to" & RowLimit.ToString & " rows. Exit SAP Function")
                                    Exit For
                                End If
                            End If
@@ -110,13 +114,13 @@ Public Class ClassSAP
                                RESULT_TABLE.Rows.Add(new_row)
                            End If
                        Next
-                        LOGGER.Debug("RowCount FuBa: " & RESULT_TABLE.Rows.Count.ToString, False)
+                        LOGGER.Debug("RowCount FuBa: " & RESULT_TABLE.Rows.Count.ToString)
                        Return RESULT_TABLE
                    Else
                        Return Nothing
                    End If
                Catch ex As Exception
-                    LOGGER.Warn("Unexpected Error in Create Datatable with split-method: " & ex.Message, False)
+                    LOGGER.Warn("Unexpected Error in Create Datatable with split-method: " & ex.Message)
                    MsgBox("Unexpected Error in Create Datatable with split-method: " & ex.Message, MsgBoxStyle.Critical)
                    SAP_CONNECTION.Close()
                    Return Nothing
@@ -125,42 +129,66 @@ Public Class ClassSAP
                Return Nothing
            End If
        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message)
            MsgBox("Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message, MsgBoxStyle.Critical)
            Return Nothing
        End Try
    End Function
+    Private Shared WithEvents oReadTbl As New ReadTable(SAPConnectionString)
+    Private Shared Sub OnIncomingPackage(ByVal Sender As ReadTable, ByVal PackageResult As DataTable) Handles oReadTbl.IncomingPackage
+        Try
+            LOGGER.Debug("Processing data package with " +
+                  PackageResult.Rows.Count.ToString() + " rows")
+            If NewDatatable Is Nothing Then
+                NewDatatable = PackageResult.Clone
+                LOGGER.Debug("...NewDatatable initialized!")
+            End If
+            NewDatatable.Merge(PackageResult, False)
+            LOGGER.Debug("...Datatable merged with PackageResult!")
+        Catch ex As Exception
+            MsgBox(ex.Message)
+            LOGGER.Error(ex)
+        End Try
+    End Sub
    Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0)
        Try
            Dim RESULT_TABLE As DataTable = New DataTable
            LOGGER.Debug("Get data from SAP Table", False)
-            Dim table As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
-            'Dim cWhereClause = "SAP_OBJECT EQ '<ObjectType>' AND AR_DATE GE '<AR_DATE>'"
-            'Dim sSearchDate1 = "20160101"
-            'cWhereClause = Replace(cWhereClause, "<ObjectType>", Objekttyp.Text)
-            'cWhereClause = Replace(cWhereClause, "<AR_DATE>", sSearchDate1)
+            Dim oReadTable As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
+            oReadTable.PackageSize = 10000
+            oReadTable.RaiseIncomingPackageEvent = True
+            NewDatatable = Nothing
            If where_clause <> "" Then
-                table.AddCriteria(where_clause)
+                oReadTable.WhereClause = where_clause
            End If
-            table.TableName = tablename
+            oReadTable.TableName = tablename
            If RowLimit <> 0 Then
-                table.RowCount = RowLimit
+                oReadTable.RowCount = RowLimit
            End If
-            LOGGER.Debug(" >>Table.Run executing.....", False)
-            table.Run()
-            LOGGER.Debug(" >>Table.Run executed", False)
-            RESULT_TABLE = table.Result
+            LOGGER.Debug("Table.Run executing.....")
+            oReadTbl = oReadTable
+            oReadTbl.Run()
+
+            LOGGER.Debug("Table.Run executed")
+            RESULT_TABLE = oReadTbl.Result
+            If Not IsNothing(NewDatatable) Then
+                LOGGER.Debug($"Got [{NewDatatable.Rows.Count}] rows")
+            End If
+
            SAP_CONNECTION.Close()
-            Return RESULT_TABLE
+            Return NewDatatable
        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message, False)
+            LOGGER.Error(ex)
+            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message)
            MsgBox("Unexpected Error in SAP Table Result: " & ex.Message, MsgBoxStyle.Critical)
            Return Nothing
        End Try
    End Function
+
+
    Public Shared Function LINK_ARC_OBJECT(table As String, barcode As String, contrep As String, docid As String, ardate As String, doctype As String)
        Try
-            LOGGER.Debug("CREATE_ARC_OBJECT", False)
+            LOGGER.Debug("CREATE_ARC_OBJECT")
            Dim sapfunc As RFCFunction = SAP_CONNECTION.CreateFunction("BAPI_BARCODE_SENDLIST")

            'Create and fill the frist row
@@ -185,14 +213,14 @@ Public Class ClassSAP
            End If

        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message)
            MsgBox("Unexpected Error in CREATE_ARC_OBJECT: " & ex.Message, MsgBoxStyle.Critical)
            Return ex.Message
        End Try
    End Function
    Public Shared Function INSERT_ARCHIVE_OBJECT(ARCHIV_ID As String, ARC_DOC_ID As String, AR_OBJECT As String, OBJECT_ID As String, SAP_OBJECT As String, DOC_TYPE As String, table As String)
        Try
-            LOGGER.Debug("INSERT_ARCHIVE_OBJECT", False)
+            LOGGER.Debug("INSERT_ARCHIVE_OBJECT")
            Dim sapfunc As RFCFunction = SAP_CONNECTION.CreateFunction("ARCHIV_CONNECTION_INSERT")

            'Create and fill the frist row
@@ -222,7 +250,7 @@ Public Class ClassSAP
            Return ""

        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message)
            MsgBox("Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message, MsgBoxStyle.Critical)
            Return ex.Message
        End Try
--- a/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb
+++ b/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb
@@ -16,17 +16,17 @@ Public Class ClassSQLEditor
        Dim svc As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
        Dim SQLSTring As String = DirectCast(value, SQLValue).Value

-        If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then
-            Using Form As New frmSQLEditor()
-                Form.Value = SQLSTring
-                If svc.ShowDialog(Form) = DialogResult.OK Then
-                    Dim sql As New SQLValue(Form.Value)
-                    value = sql
-                End If
-            End Using
-        End If
+        'If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then
+        '    Using Form As New frmSQLEditor()
+        '        Form.Value = SQLSTring
+        '        If svc.ShowDialog(Form) = DialogResult.OK Then
+        '            Dim sql As New SQLValue(Form.Value)
+        '            value = sql
+        '        End If
+        '    End Using
+        'End If

-        Return value
+        Return ""
    End Function
 End Class

--- a/app/DD-Record-Organizer/Classes/ClassSnapPanel.Designer.vb
+++ b/app/DD-Record-Organizer/Classes/ClassSnapPanel.Designer.vb
--- a/app/DD-Record-Organizer/Classes/ClassSnapPanel.vb
+++ b/app/DD-Record-Organizer/Classes/ClassSnapPanel.vb
--- a/app/DD-Record-Organizer/Classes/ClassStaticListEditor.vb
+++ b/app/DD-Record-Organizer/Classes/ClassStaticListEditor.vb
--- a/app/DD-Record-Organizer/Classes/ClassTreeListViewState.vb
+++ b/app/DD-Record-Organizer/Classes/ClassTreeListViewState.vb
@@ -0,0 +1,103 @@
+Imports DevExpress.XtraTreeList
+Imports DevExpress.XtraTreeList.Nodes
+Imports DevExpress.XtraTreeList.Nodes.Operations
+
+Public Class ClassTreeListViewState
+    Private expanded As ArrayList
+    Private selected As ArrayList
+    Private focused As Object
+    Private topNode As Object
+
+    Public Sub New()
+        Me.New(Nothing)
+    End Sub
+    Public Sub New(ByVal treeList As TreeList)
+        Me.treeList_Renamed = treeList
+        expanded = New ArrayList()
+        selected = New ArrayList()
+    End Sub
+
+    Public Sub Clear()
+        expanded.Clear()
+        selected.Clear()
+        focused = Nothing
+        topNode = Nothing
+    End Sub
+    Private Function GetExpanded() As ArrayList
+        Dim op As New OperationSaveExpanded()
+        TreeList.NodesIterator.DoOperation(op)
+        Return op.Nodes
+    End Function
+    Private Function GetSelected() As ArrayList
+        Dim al As New ArrayList()
+        For Each node As TreeListNode In TreeList.Selection
+            al.Add(node.GetValue(TreeList.KeyFieldName))
+        Next node
+        Return al
+    End Function
+
+    Public Sub LoadState()
+        TreeList.BeginUpdate()
+        Try
+            TreeList.CollapseAll()
+            Dim node As TreeListNode
+            For Each key As Object In expanded
+                node = TreeList.FindNodeByKeyID(key)
+                If node IsNot Nothing Then
+                    node.Expanded = True
+                End If
+            Next key
+            TreeList.FocusedNode = TreeList.FindNodeByKeyID(focused)
+            For Each key As Object In selected
+                node = TreeList.FindNodeByKeyID(key)
+                If node IsNot Nothing Then
+                    TreeList.Selection.Add(node)
+                End If
+            Next key
+
+        Finally
+            TreeList.EndUpdate()
+            Dim topVisibleNode As TreeListNode = TreeList.FindNodeByKeyID(topNode)
+            If topVisibleNode Is Nothing Then
+                topVisibleNode = TreeList.FocusedNode
+            End If
+            TreeList.TopVisibleNodeIndex = TreeList.GetVisibleIndexByNode(topVisibleNode)
+        End Try
+    End Sub
+    Public Sub SaveState()
+        If TreeList.FocusedNode IsNot Nothing Then
+            expanded = GetExpanded()
+            selected = GetSelected()
+            focused = TreeList.FocusedNode(TreeList.KeyFieldName)
+            topNode = TreeList.GetNodeByVisibleIndex(TreeList.TopVisibleNodeIndex)(TreeList.KeyFieldName)
+        Else
+            Clear()
+        End If
+    End Sub
+
+    Private treeList_Renamed As TreeList
+    Public Property TreeList() As TreeList
+        Get
+            Return treeList_Renamed
+        End Get
+        Set(ByVal value As TreeList)
+            treeList_Renamed = value
+            Clear()
+        End Set
+    End Property
+
+    Private Class OperationSaveExpanded
+        Inherits TreeListOperation
+        Private al As New ArrayList()
+        Public Overrides Sub Execute(ByVal node As TreeListNode)
+            If node.HasChildren AndAlso node.Expanded Then
+                al.Add(node.GetValue(node.TreeList.KeyFieldName))
+            End If
+        End Sub
+        Public ReadOnly Property Nodes() As ArrayList
+            Get
+                Return al
+            End Get
+        End Property
+    End Class
+End Class
--- a/app/DD-Record-Organizer/Classes/ClassUpdate.vb
+++ b/app/DD-Record-Organizer/Classes/ClassUpdate.vb
@@ -1,5 +1,4 @@
 Imports System.IO
-Imports DD_LIB_Standards
 Public Class ClassUpdate
    Public Shared MyServer_UpdatePath As String

@@ -26,7 +25,7 @@ Public Class ClassUpdate
    Public Shared Function Init()
        Try
            Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
-            Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
+            Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql)
            If KONFIG_DT.Rows.Count = 1 Then
                MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH")
                MIN_REQUIRED_VERSION = KONFIG_DT.Rows(0).Item("MIN_REQUIRED_VERSION")
@@ -37,7 +36,7 @@ Public Class ClassUpdate
                End Try
            End If
            sql = String.Format("Select * FROM TBDD_VERSION_UPDATE WHERE GUID = (Select MAX(GUID) FROM TBDD_VERSION_UPDATE WHERE UPPER(MODULE_NAME) = UPPER('{0}'))", "Record-Organizer")
-            DT_UPDATE = clsDatabase.Return_Datatable(sql)
+            DT_UPDATE = MYDB_ECM.GetDatatable(sql)
            If Not IsNothing(DT_UPDATE) Then
                If DT_UPDATE.Rows.Count = 1 Then
                    UPDATE_ID = DT_UPDATE.Rows(0).Item("GUID")
@@ -46,7 +45,7 @@ Public Class ClassUpdate
                    VERSIONS_FOR_FORCE_UPDATE = DT_UPDATE.Rows(0).Item("VERSION_FORCE_UPD")
                    ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS")
                    sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} AND [INFO1] IS NOT NULL ORDER BY GUID", UPDATE_ID)
-                    DT_UPDATE_ITEMS = clsDatabase.Return_Datatable(sql)
+                    DT_UPDATE_ITEMS = MYDB_ECM.GetDatatable(sql)
                    LOGGER.Info(String.Format("{0} items need to be updated!", DT_UPDATE_ITEMS.Rows.Count.ToString))
                Else
                    LOGGER.Info("No Updates Configured!")
@@ -89,7 +88,7 @@ Public Class ClassUpdate
            For Each d In Directory.GetDirectories(sDir)
                If d.Contains("$Recycle") = False Or d.Contains("System Volume") = False Then
                    If RecExe_found = False Then
-                        For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe")
+                        For Each f In Directory.GetFiles(d, "DD-OrgFlow.exe")
                            RecExe_found = True
                            MY_INSTALL_PATH = Path.GetDirectoryName(f)
                            Exit Sub
@@ -110,7 +109,7 @@ Public Class ClassUpdate
            Dim sql = ""
            USER_USERNAME = Environment.UserName
            sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
-            Dim USER_DT As DataTable = clsDatabase.Return_Datatable(sql, True)
+            Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(sql)
            If USER_DT.Rows.Count = 0 Then
                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
@@ -122,14 +121,14 @@ Public Class ClassUpdate
                USER_GUID = USER_DT.Rows(0).Item("GUID")
                USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
                sql = String.Format("SELECT UPDATE_PATH,TEMPPATH,INFO1,INFO2,INFO3 FROM TBDD_VERSION_USER_UPDATE_PATH WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
-                DT_USER_DATA = clsDatabase.Return_Datatable(sql)
+                DT_USER_DATA = MYDB_ECM.GetDatatable(sql)
                MyServer_UpdatePath = DT_USER_DATA.Rows(0).Item("UPDATE_PATH")

                sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{3}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MACHINE_NAME) = UPPER('{1}') AND UPPER(MODULE) = UPPER('{2}'))", USER_GUID, Environment.MachineName, "Record-Organizer", VERSION_SERVER)
-                    VERSION_USER = clsDatabase.Execute_Scalar(sql)
+                VERSION_USER = MYDB_ECM.GetScalarValue(sql)
                If IsNothing(VERSION_USER) Then
                    sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{2}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MODULE) = UPPER('{1}'))", USER_GUID, "Record-Organizer", VERSION_SERVER)
-                    VERSION_USER = clsDatabase.Execute_Scalar(sql)
+                    VERSION_USER = MYDB_ECM.GetScalarValue(sql)
                    If IsNothing(VERSION_USER) Then
                        VERSION_USER = "1.0.0.0"
                    End If
@@ -182,35 +181,17 @@ Public Class ClassUpdate
        If UPDATE_NECESSARY = False Then
            Exit Sub
        End If
-        'If FORCE_UPDATE = False Then

-        '    If VERSIONS_FOR_FORCE_UPDATE.Contains(VERSION_USER) Then
-        '        Logger.Warn(String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER), False)
-        '        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER))
-        '        FORCE_UPDATE = True
-        '    End If
-        'End If
-        'If FORCE_UPDATE = False Then
-
-        '    If ALL_USERS = False Then
-        '        sql = String.Format("SELECT COUNT(GUID) FROM TBDD_VERSION_USER_UPDATE WHERE USER_ID = {0} AND UPDATE_ID = {1}", USER_GUID, UPDATE_ID)
-        '        If clsDatabase.Execute_Scalar(sql) = 0 Then
-        '            Logger.Warn(String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID), False)
-        '            ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID))
-        '            Exit Sub
-        '        End If
-        '    End If
-
-        Dim msg = "Auf dem Server liegt ein Update für ein ADDI-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
+        Dim msg = "Auf dem Server liegt ein Update für ein OrgFlow-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
        If USER_LANGUAGE <> "de-DE" Then
-            msg = "There is a new release available for an ADDI-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
+            msg = "There is a new release available for an OrgFlow-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
        End If
        Dim result As MsgBoxResult
-            result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-            If result = MsgBoxResult.No Then
-                UPDATE_CANCELLED = True
-                Exit Sub
-            End If
+        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        If result = MsgBoxResult.No Then
+            UPDATE_CANCELLED = True
+            Exit Sub
+        End If
        'End If

        If FOLDER_TEMP <> String.Empty Then
@@ -243,22 +224,22 @@ Public Class ClassUpdate
                                targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
                            Else
                                If Upd_item.Item("INFO1") <> String.Empty Then
-                                        targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("INFO1"), Upd_item.Item("ITEM_INFO"))
-                                    Else
-                                        targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
-                                    End If
+                                    targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("INFO1"), Upd_item.Item("ITEM_INFO"))
+                                Else
+                                    targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
                                End If
-                                targetfile = targetfile.ToString.Replace("//", "/")
+                            End If
+                            targetfile = targetfile.ToString.Replace("//", "/")
                            LOGGER.Info(String.Format("...replacing targetfile '{0}': ", targetfile))
                            Try
-                                    ' Replace the file.
-                                    If File.Exists(targetfile) Then
-                                        If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
+                                ' Replace the file.
+                                If File.Exists(targetfile) Then
+                                    If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
                                        If File.Exists(BackUpOfFileToReplace) Then
                                            If KEEP_TEMPPATH Then
                                                If CopyFile(sourcefile, targetfile) = True Then
                                                    File_Delete(BackUpOfFileToReplace)
-                                                    LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile), False)
+                                                    LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile))
                                                    Dim updinfo
                                                    If USER_INFO1 <> "" Then
                                                        updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
@@ -266,7 +247,7 @@ Public Class ClassUpdate
                                                        updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
                                                    End If
                                                    Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
-                                                    clsDatabase.Execute_non_Query(_Sql)
+                                                    MYDB_ECM.ExecuteNonQuery(_Sql)
                                                End If
                                            Else
                                                If MoveFile(sourcefile, targetfile) = True Then
@@ -279,7 +260,7 @@ Public Class ClassUpdate
                                                        updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
                                                    End If
                                                    Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
-                                                    clsDatabase.Execute_non_Query(_Sql)
+                                                    MYDB_ECM.ExecuteNonQuery(_Sql)
                                                Else
                                                    LOGGER.Warn(String.Format("MoveFile was not successfull! BackupFile will be activated!"))
                                                    'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
@@ -290,16 +271,16 @@ Public Class ClassUpdate
                                        End If

                                    End If
-                                    Else
+                                Else

                                End If


-                                Catch ex As Exception
+                            Catch ex As Exception
                                LOGGER.Warn(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile))
                                error_while_replacing = True
-                                    UPDATE_ERROR = True
-                                End Try
+                                UPDATE_ERROR = True
+                            End Try



@@ -312,13 +293,13 @@ Public Class ClassUpdate
                Next

                Dim upd = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET TEMPPATH = '' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
-                clsDatabase.Execute_non_Query(upd)
+                MYDB_ECM.ExecuteNonQuery(upd)
                Try
                    If KEEP_TEMPPATH = False Then
                        'Delete the tempfolder and all data
                        System.IO.Directory.Delete(FOLDER_TEMP, True)
                    Else
-                        LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."), False)
+                        LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."))
                    End If

                Catch ex As Exception
--- a/app/DD-Record-Organizer/Classes/ClassUser.vb
+++ b/app/DD-Record-Organizer/Classes/ClassUser.vb
@@ -4,7 +4,7 @@
        Try
            Dim SQL
            SQL = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_GUID} AND MODULE = 'Record-Organizer'"
-            ClassDatabase.Execute_non_Query(sql)
+            MYDB_ECM.ExecuteNonQuery(SQL)
        Catch ex As Exception
            LOGGER.Warn("Error while logging out user: " & ex.Message)
        End Try
--- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb
+++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb
@@ -38,7 +38,7 @@ Public Class ClassWDRights
        Try
            MSG_RESULT = ""
            LOGGER.Debug(String.Format("Init ClassWDRights started - " & Now & " ..."))
-            Dim DT_KONFIG As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1")
+            Dim DT_KONFIG As DataTable = MYDB_ECM.GetDatatable("SELECT * FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1")
            AD_DOMAIN = DT_KONFIG.Rows(0).Item("AD_DOMAIN")
            AD_USER = DT_KONFIG.Rows(0).Item("AD_USER")
            WD_RIGHT_ADMIN = DT_KONFIG.Rows(0).Item("WD_RIGHT")
@@ -67,9 +67,9 @@ Public Class ClassWDRights
            Return False
        End Try
    End Function
-    Public Shared Function Doc_Renew_Rights(doc_id As Integer, docpath As String, deleterights As Boolean) As Boolean
+    Public Shared Function Doc_Renew_Rights(doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
        Try
-            LOGGER.Debug(String.Format("Working on rights for file: {0}", docpath))
+            LOGGER.Debug(String.Format("Working on rights for file: {0}", reldocpath))
            Dim DT_USER_RIGHT As DataTable
            Dim DT_GROUP_RIGHT As DataTable
            Dim oSession
@@ -77,6 +77,8 @@ Public Class ClassWDRights
            Dim UserGroupRelation
            Dim UserOrGroup
            Dim oUSer
+            reldocpath = ClassHelper.GetRelPath(reldocpath)
+
            Try
                'Dedizierte Session herstellen
                oSession = GetWMSessionAsUser(AD_DOMAIN, AD_SERVER, AD_USER, AD_USER_PW)
@@ -89,9 +91,9 @@ Public Class ClassWDRights
            If Not IsNothing(oSession) Then
                LOGGER.Debug("Session created.")
                Dim sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'USER'", doc_id)
-                DT_USER_RIGHT = clsDatabase.Return_Datatable(sql)
+                DT_USER_RIGHT = MYDB_ECM.GetDatatable(sql)
                sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'GROUP'", doc_id)
-                DT_GROUP_RIGHT = clsDatabase.Return_Datatable(sql)
+                DT_GROUP_RIGHT = MYDB_ECM.GetDatatable(sql)
                If IsNothing(DT_USER_RIGHT) Then
                    Dim msg = "Error while receiving rights for DocID"
                    clsLogger.Add(msg)
@@ -102,10 +104,10 @@ Public Class ClassWDRights
                LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count))
                Try
                    'Object definieren
-                    oWMObject = oSession.GetWMObjectByPath(0, docpath.Substring(2))
+                    oWMObject = oSession.GetWMObjectByPath(1, reldocpath)
                    LOGGER.Debug("Object created.")
                Catch ex As Exception
-                    Dim msg = "Error GetWMObjectByPath: (FDSR) " & docpath.Substring(2) & vbNewLine & Err.Description
+                    Dim msg = "Error GetWMObjectByPath: (FDSR) " & reldocpath & vbNewLine & Err.Description
                    LOGGER.Warn(msg)
                    Return False
                End Try
@@ -188,7 +190,7 @@ Public Class ClassWDRights
                Err.Clear()
                ' Wenn ALLE Rechteträger entfernt werden (FOR EACH), 
                ' dann muss mindestens EIN Rechteträger mit dem Recht zur Rechteänderung 
-                ' wieder zugefügt werden!!!!! Dies ist der ADDI-Right User!
+                ' wieder zugefügt werden!!!!! Dies ist der OrgFlow-Right User!
                'Für jeden User das Recht einzeln hinzufügen
                For Each User_Row As DataRow In DT_USER_RIGHT.Rows
                    Dim fileright 'Recht als Integer
@@ -232,7 +234,7 @@ Public Class ClassWDRights
                            Case WMAccessRightReadWrite
                                _right = "READ WRITE"
                        End Select
-                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, docpath) & vbNewLine
+                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, reldocpath) & vbNewLine
                        LOGGER.Warn(ex.Message)
                    End Try
                Next
@@ -283,7 +285,7 @@ Public Class ClassWDRights
                            Case WMAccessRightReadWrite
                                _right = "READ WRITE"
                        End Select
-                        MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, docpath) & vbNewLine
+                        MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, reldocpath) & vbNewLine
                        clsLogger.Add(ex.Message)
                    End Try
                Next
--- a/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb
@@ -8,6 +8,35 @@ Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraEditors.Controls

 Public Class ClassWindreamDocGrid
+    ' === BEGIN CLASS PART ===
+
+    Public Class WindreamDoc
+        Public Property DocId As Integer
+        Public Property DocPath As String
+        Public Property DisplayName As String
+        Public Property DocType As String
+    End Class
+
+    Private ReadOnly GridView As GridView
+
+    Public ReadOnly Property SelectedDocuments As List(Of WindreamDoc)
+        Get
+            Return GetSelectedDocuments(GridView)
+        End Get
+    End Property
+
+    Public ReadOnly Property HasSelectedDocuments As Boolean
+        Get
+            Return HasNoSelectedDocuments(GridView)
+        End Get
+    End Property
+
+    Public Sub New(pGridView As GridView)
+        GridView = pGridView
+    End Sub
+
+    ' === END CLASS PART ===
+
    Private Shared _Helper As ClassHelper
    Public Shared SELECTED_DOC_PATH As String
    'Public Shared RESULT_OBJECTTYPE As String
@@ -16,8 +45,12 @@ Public Class ClassWindreamDocGrid
    Public Shared SELECTED_DOC_RIGHT As Integer
    'Public Shared RESULT_DISPLAYNAME As String
    Public Shared RESULT_CONFIG_IDS As Hashtable
-    Private Shared DATE_COLUMNS As New List(Of String)
-    Private Shared DATE_COLUMNS_CONFIG As New List(Of String)
+    Private Shared ReadOnly DATE_COLUMNS As New List(Of String)
+    Private Shared ReadOnly DATE_COLUMNS_CONFIG As New List(Of String)
+
+    ' This should replace DT_RESULTFILES and also
+    ' SELECTED_INWORK, SELECTED_DOC_ID, SELECTED_DOC_RIGHT, SELECTED_DOC_PATH
+    Public Shared SELECTED_DOCUMENTS As New List(Of WindreamDoc)

    Public Shared DT_RESULTFILES As DataTable
    Private Shared DT_DROPDOWN_ITEMS As DataTable
@@ -29,8 +62,10 @@ Public Class ClassWindreamDocGrid

    Private Shared Function Init_Table()
        Try
-            Dim table As New DataTable
-            table.TableName = "TBSELECTED_FILES"
+            Dim table As New DataTable With {
+                .TableName = "TBSELECTED_FILES"
+            }
+
            ' Create two columns, ID and Name.
            table.Columns.Add("DOC_ID", GetType(Integer))
            table.Columns.Add("DOC_PATH", GetType(System.String))
@@ -47,6 +82,33 @@ Public Class ClassWindreamDocGrid
        End Try

    End Function
+
+    Public Shared Function HasNoSelectedDocuments(pGridView As GridView) As Boolean
+        Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList()
+        Return oSelectedRows.Count = 0
+    End Function
+
+    Public Shared Function GetSelectedDocuments(pGridView As GridView) As List(Of WindreamDoc)
+        Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList()
+        Dim oDocuments As New List(Of WindreamDoc)
+
+        For Each oRowHandle In oSelectedRows
+            Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID")
+            Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname")
+            Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH")
+            Dim oDocType = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE")
+
+            oDocuments.Add(New WindreamDoc With {
+                .DocId = oDocId,
+                .DocPath = oDocPath,
+                .DocType = oDocType,
+                .DisplayName = oDisplayName
+            })
+        Next
+
+        Return oDocuments
+    End Function
+
    Public Shared Sub GetDocItems(gridView As GridView)
        _Helper = New ClassHelper
        SELECTED_DOC_ID = 0
@@ -60,8 +122,14 @@ Public Class ClassWindreamDocGrid
                    Dim newRow As DataRow = DT_RESULTFILES.NewRow()
                    Try
                        Dim DOC_ID = gridView.GetRowCellValue(row, "DocID")
-                        SELECTED_DOC_ID = DOC_ID
-                        newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
+                        Dim CHeckDT As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_DT_TBPMO_DOC_RECORD_LINK, "DOC_ID = " + DOC_ID.ToString, "")
+                        If CHeckDT.Rows.Count = 1 Then
+                            SELECTED_DOC_ID = DOC_ID
+                            newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
+                        Else
+                            Continue For
+                        End If
+
                    Catch ex As Exception
                        newRow("DOC_ID") = 0
                        SELECTED_DOC_ID = 0
@@ -71,7 +139,7 @@ Public Class ClassWindreamDocGrid
                        newRow("INWORK") = False
                        SELECTED_INWORK = False
                        Dim oSQL = "Select IN_WORK,IN_WORK_USER FROM TBPMO_DOCRESULT_LIST  where DocID = " + SELECTED_DOC_ID
-                        Dim oDT As DataTable = ClassDatabase.Return_Datatable(oSQL)
+                        Dim oDT As DataTable = MYDB_ECM.GetDatatable(oSQL)
                        If Not IsNothing(oDT) Then
                            If oDT.Rows.Count = 1 Then
                                newRow("INWORK") = CBool(oDT.Rows(0).Item("IN_WORK"))
@@ -186,9 +254,9 @@ Public Class ClassWindreamDocGrid
            Dim type As Integer = row.Item("TYPE_ID")


-            If type = 4 And isConfig = False Then
+            If type = 3 And isConfig = False Then
                DATE_COLUMNS.Add(columnTitle)
-            ElseIf type = 4 And isConfig = True Then
+            ElseIf type = 3 And isConfig = True Then
                DATE_COLUMNS_CONFIG.Add(columnTitle)
            End If

@@ -218,21 +286,23 @@ Public Class ClassWindreamDocGrid
            End Select
            '"FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND T1.LANGUAGE = '{1}' AND T.RECORD_ID = {2} ORDER BY T.DocID, T1.SEQUENCE", CURRENT_ENTITY_ID, USER_LANGUAGE, RECORD_ID)

-            Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
-
+            Dim DT_DETAILS As DataTable = MYDB_ECM.GetDatatable(DT_DETAILS_SQL)
+            Dim docId As Integer
+            Dim configId As Integer
+            Dim recordId As Integer
            Try
                ' Werte für Konfigurierte Spalten aus TBPMO_DOC_VALUES auslesen und Zellenweise einfügen
                For Each row As DataRow In DT_RESULT.Rows
                    For Each col As DataColumn In DT_RESULT.Columns
                        Dim colName As String = col.ColumnName
-                        Dim docId As Integer = row.Item("DocID")
-                        Dim configId As Integer = RESULT_CONFIG_IDS.Item(col.ColumnName)
+                        docId = row.Item("DocID")
+                        configId = RESULT_CONFIG_IDS.Item(col.ColumnName)

                        If configId <> 0 Then
                            Dim value As String = ""

                            Try
-                                value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", configId, docId, RECORD_ID))
+                                value = MYDB_ECM.GetScalarValue(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", configId, docId, RECORD_ID))
                            Catch ex As Exception
                                LOGGER.Warn(String.Format("Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message)
                            End Try
@@ -242,7 +312,7 @@ Public Class ClassWindreamDocGrid
                    Next
                Next
            Catch ex As Exception
-                LOGGER.Warn("Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message)
+                LOGGER.Warn($"Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message & vbNewLine & $"SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {configId} AND DocID = {docId} AND RECORD_ID = {RECORD_ID}")
            End Try
            LOGGER.Debug("Values loaded...")
            Try
@@ -305,10 +375,12 @@ Public Class ClassWindreamDocGrid

        For Each row As DataRow In DT_WINDREAM_RESULTLIST.Rows
            Dim col As GridColumn = gridView.Columns(row.Item("HEADER_CAPTION"))
+            Dim colCaption = row.Item("HEADER_CAPTION")
            Dim type As Integer = row.Item("TYPE_ID")
            Dim isConfig As Boolean = row.Item("CONFIG_COLUMNS")

-            If Not IsNothing(col) And type = 4 And isConfig Then
+            If Not IsNothing(col) And type = 3 And isConfig Then
+                LOGGER.Debug($"Adapting DisplayFormat (DATETIME for Column {colCaption}")
                col.DisplayFormat.FormatType = FormatType.DateTime
                col.DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
            End If
@@ -369,9 +441,7 @@ Public Class ClassWindreamDocGrid
                    AddHandler textedit.Leave, _textValueChangedHandler

                    e.RepositoryItem = textedit
-                End If
-
-                If typeId = 2 Then
+                ElseIf typeId = 2 Then
                    Dim checkEdit As New RepositoryItemCheckEdit()
                    checkEdit.ValueChecked = "True"
                    checkEdit.ValueUnchecked = "False"
@@ -381,9 +451,7 @@ Public Class ClassWindreamDocGrid
                    AddHandler checkEdit.CheckedChanged, _checkValueChangedHandler

                    e.RepositoryItem = checkEdit
-                End If
-
-                If typeId = 4 Then
+                ElseIf typeId = 3 Then
                    Dim dateedit As New RepositoryItemDateEdit()

                    dateedit.DisplayFormat.FormatType = FormatType.DateTime
@@ -411,9 +479,7 @@ Public Class ClassWindreamDocGrid

                    AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                    e.RepositoryItem = dateedit
-                End If
-
-                If typeId = 3 Then
+                ElseIf typeId = 10 And editable = True Then
                    Dim dropdown As New RepositoryItemComboBox()
                    Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")

@@ -428,6 +494,14 @@ Public Class ClassWindreamDocGrid

                    e.RepositoryItem = dropdown

+
+                ElseIf typeId = 4 And editable Then
+                    Dim textedit As New RepositoryItemTextEdit()
+
+                    AddHandler textedit.Leave, _textValueChangedHandler
+
+                    e.RepositoryItem = textedit
+
                End If
            ElseIf (e.Column.Name <> "colVALUE") Then
                ' Erlaube Editieren nur für VALUE Spalte
@@ -445,7 +519,7 @@ Public Class ClassWindreamDocGrid
            Dim parsedDate As DateTime
            If Not IsNothing(DATE_COLUMNS) Then
                If DATE_COLUMNS.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then
-
+                    LOGGER.Debug($"gridView_CustomColumnDisplayText1 [{e.Column.FieldName}] ")
                    If e.Value.ToString() = String.Empty Then
                        e.DisplayText = ""
                        Exit Sub
@@ -465,7 +539,7 @@ Public Class ClassWindreamDocGrid
                        e.DisplayText = ""
                        Exit Sub
                    End If
-
+                    LOGGER.Debug($"gridView_CustomColumnDisplayText2 [{e.Column.FieldName}] ")
                    If Not DateTime.TryParse(e.Value, parsedDate) Then
                        parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo)
                    End If
--- a/app/DD-Record-Organizer/Classes/ClassWorkflow.vb
+++ b/app/DD-Record-Organizer/Classes/ClassWorkflow.vb
@@ -5,7 +5,7 @@
                         "dbo.FNPMO_GETOBJECTCAPTION('{0}', 'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), 1) AS 'ENTITY_TITLE', COMMENT, DUE_DATE, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TASK_DATE, FINAL, COLOR, " & _
                         "'{1}' AS USERNAME, dbo.FNPMO_GET_ENTITY_COLUMN_CONTENT(RECORD_ID) AS RECORD_DESCRIPTION, DESCRIPTION, RECORD_DESCRIPTION AS Expr1, FINISHED, MANUALLY, " & _
                            "CREATE_ON_REC_CREATE, CREATE_ON_FOLL_UP FROM VWPMO_WF_ACTIVE AS T", USER_LANGUAGE, USER_USERNAME)
-        CURRENT_VWPMO_WF_ACTIVE = ClassDatabase.Return_Datatable(sql, True)
+        CURRENT_VWPMO_WF_ACTIVE = MYDB_ECM.GetDatatable(sql)
    End Sub
 
 End Class
--- a/app/DD-Record-Organizer/Classes/Controls/ClassControlBuilder.vb
+++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlBuilder.vb
@@ -283,7 +283,7 @@ Public Class ClassControlBuilder
            For Each row As DataRow In TableResult.Rows
                Dim sqlcommand As String = row.Item("SQL_COMMAND_2")
                Dim msg = String.Format("Working on enabling control {0} - SQL: {1}", CONTROL_ID.ToString, sqlcommand)
-                LOGGER.Debug(msg, False)
+                LOGGER.Debug(msg)
                If IsNothing(sqlcommand) Then
                    Continue For
                End If
@@ -291,7 +291,7 @@ Public Class ClassControlBuilder
                ' Versuchen, die RecordId zu ersetzen, falls eine existiert
                sqlcommand = sqlcommand.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                msg = String.Format("sqlcommand-replaced1: {0}", sqlcommand)
-                LOGGER.Debug(msg, False)
+                LOGGER.Debug(msg)
                ' ControlId Platzhalter suchen und ersetzen
                Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
                Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
@@ -306,11 +306,11 @@ Public Class ClassControlBuilder
                                                                                                End Function).SingleOrDefault()
                    ' Wir ersetzen den platzhalter im sql command mit dem übergebenen wert
                    sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
-                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: {0} for controlID {1}", sqlcommand, dependingControlId), False)
+                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: {0} for controlID {1}", sqlcommand, dependingControlId))

                    ' Jetzt wird das SQL Command ausgeführt, es MUSS einen Boolschen Wert zurückgeben, True, False, 0, 1
                    Dim dt_result As DataTable = Nothing
-                    dt_result = ClassDatabase.Return_Datatable(sqlcommand)
+                    dt_result = MYDB_ECM.GetDatatable(sqlcommand)

                    If dt_result.Rows.Count = 1 Then
                        Dim enabled As Boolean = True
@@ -324,14 +324,14 @@ Public Class ClassControlBuilder

                        If enabled = False Then
                            msg = String.Format("Control {0} will be disabled." & vbNewLine, dependingControlId.ToString)
-                            LOGGER.Debug(msg, False)
+                            LOGGER.Debug(msg)
                        Else
                            msg = String.Format("Control {0} will be enabled." & vbNewLine, dependingControlId.ToString)
-                            LOGGER.Debug(msg, False)
+                            LOGGER.Debug(msg)
                        End If
                        dependingControl.Enabled = enabled
                    Else
-                        LOGGER.Warn("Attention: RowCount for enabling control (" & dependingControlId.ToString & ") was '" & dt_result.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'", False)
+                        LOGGER.Warn("Attention: RowCount for enabling control (" & dependingControlId.ToString & ") was '" & dt_result.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
                    End If

                End If
@@ -381,7 +381,7 @@ Public Class ClassControlBuilder


            End If
-            LOGGER.Debug("DependingControls -  For Each row As DataRow In TableResult.Rows", False, False)
+            LOGGER.Debug("DependingControls -  For Each row As DataRow In TableResult.Rows")
            For Each row As DataRow In TableResult.Rows
                Dim sqlcommand As String = row.Item("SQL_COMMAND_1")

@@ -394,7 +394,7 @@ Public Class ClassControlBuilder
                Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
                If match.Success Then
                    Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
-                    Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid, True)
+                    Dim ctrlvalID = MYDB_ECM.ExecuteNonQuery(sqlguid)

                    ' Diese Abfrage verhindert, dass Werte, die aus z.B. CheckedListBoxen kommen,
                    ' nicht überschrieben werden. Diese Werte werden bereits mit UpdateMultipleValues gespeichert
@@ -402,15 +402,15 @@ Public Class ClassControlBuilder
                        If Not IsNothing(ctrlvalID) Then

                            If ClassControlCommandsUI.UpdateControlValue(CONTROL_ID, CURRENT_RECORD_ID, value.ToString, CURRENT_ENTITY_ID) = False Then
-                                LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
+                                LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value))
                            Else
                                ControlsChanged.Remove(CONTROL_ID)
                            End If
                        Else
-                            LOGGER.Debug("ctrlvalID is Nothing - Attention.....", False, False)
+                            LOGGER.Debug("ctrlvalID is Nothing - Attention.....")
                            If CURRENT_RECORD_ID <> 0 Then
                                If ClassControlCommandsUI.CreateControlProcedure(CONTROL_ID, CURRENT_RECORD_ID, value, CURRENT_ENTITY_ID) = 0 Then
-                                    LOGGER.Warn(String.Format("ClassControlCommandsUI.CreateControlProcedure (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
+                                    LOGGER.Warn(String.Format("ClassControlCommandsUI.CreateControlProcedure (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value))
                                Else
                                    ControlsChanged.Remove(CONTROL_ID)
                                End If
@@ -421,7 +421,7 @@ Public Class ClassControlBuilder
                    ' DependingControlId bezeichnet das Control, das die Abhängigkeit enthält
                    Dim dependingControlId As Integer = row.Item("GUID")
                    If dependingControlId > 0 Then
-                        LOGGER.Debug("dependingControlId: " + dependingControlId.ToString, False, False)
+                        LOGGER.Debug("dependingControlId: " + dependingControlId.ToString)
                    End If
                    Dim panel As Panel = Me.MasterPanel
                    'Dim panel As Panel = DirectCast(control.Parent, Panel)
@@ -435,9 +435,9 @@ Public Class ClassControlBuilder
                    End If

                    sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
-                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId), False)
+                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId))

-                    Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand, True)
+                    Dim dt As DataTable = MYDB_ECM.GetDatatable(sqlcommand)
                    Dim type = dependingControl.GetType().Name

                    Select Case type
@@ -457,23 +457,23 @@ Public Class ClassControlBuilder

                                    ControlLoader.DateTimePicker.LoadValue(dependingControl, dateValue)
                                    Dim sql1 = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", dependingControlId, CURRENT_RECORD_ID)
-                                    Dim id = ClassDatabase.Execute_Scalar(sql1, True)
+                                    Dim id = MYDB_ECM.ExecuteNonQuery(sql1)

                                    If Not IsNothing(id) Then
                                        'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
                                        If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = True Then
                                            ControlsChanged.Remove(dependingControlId)
-                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'", False) '" & upd)
+                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'") '" & upd)
                                        Else
-                                            LOGGER.Warn("Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
+                                            LOGGER.Warn("Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '") ' & upd & "'")
                                        End If

                                    Else
                                        If ClassControlCommandsUI.CreateControlProcedure(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = 1 Then
                                            ControlsChanged.Remove(dependingControlId)
-                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (DateEdit)!", False)
+                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (DateEdit)!")
                                        Else
-                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue))

                                        End If

@@ -488,10 +488,10 @@ Public Class ClassControlBuilder
                        Case "CustomComboBox"
                            ControlLoader.Combobox.SetDataSource(DirectCast(dependingControl, CustomComboBox), dt)
                        Case "CheckedListBoxControl"
-                            LOGGER.Debug("DependingControls - CheckedListBoxControl", False, False)
+                            LOGGER.Debug("DependingControls - CheckedListBoxControl")
                            Dim checkedlistbox = DirectCast(dependingControl, DevExpress.XtraEditors.CheckedListBoxControl)
                            If IsNothing(checkedlistbox) Then
-                                LOGGER.Debug("checkedlistbox is Nothing - Attention.....", False, False)
+                                LOGGER.Debug("checkedlistbox is Nothing - Attention.....")
                            End If
                            ControlLoader.CheckedListBox.SetDataSource(checkedlistbox, dt)

@@ -520,17 +520,17 @@ Public Class ClassControlBuilder
                                    Dim value1 As String = dt.Rows(0).Item(0)
                                    ControlLoader.TextBox.LoadValue(DirectCast(dependingControl, TextBox), 9999, 9999, value1, 999, True)
                                    Dim sqltextbox = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", dependingControlId, CURRENT_RECORD_ID)
-                                    Dim id = ClassDatabase.Execute_Scalar(sqltextbox, True)
+                                    Dim id = MYDB_ECM.ExecuteNonQuery(sqltextbox)

                                    If Not IsNothing(id) Then
                                        If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then
-                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'", False) '" & upd)
+                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'") '" & upd)
                                            ControlsChanged.Remove(dependingControlId)
                                        Else
-                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1))
                                        End If
                                        'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, USER_USERNAME, id)
-                                        'If ClassDatabase.Execute_non_Query(upd) = True Then
+                                        'If MYDB_ECM.ExecuteNonQuery(upd) = True Then
                                        '    LOGGER.Debug("Value was not nothing - Updated the ControlValue '" & upd)
                                        'Else
                                        '   Logger.Warn("Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
@@ -539,9 +539,9 @@ Public Class ClassControlBuilder
                                    Else
                                        If ClassControlCommandsUI.CreateControlProcedure(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = 1 Then
                                            ControlsChanged.Remove(dependingControlId)
-                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (TextBox)!", False)
+                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (TextBox)!")
                                        Else
-                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1))
                                        End If


@@ -593,8 +593,8 @@ Public Class ClassControlBuilder
                Exit Sub
            End If

-            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Dim datatable As DataTable = MYDB_ECM.GetDatatable(SQL)
+            Dim datatable1 As DataTable = MYDB_ECM.GetDatatable(SQLenable)
            Depending_Controls(control, datatable, value)
            Enable_Controls(control, datatable1, value)

@@ -702,8 +702,8 @@ Public Class ClassControlBuilder
                Exit Sub
            End If

-            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Dim datatable As DataTable = MYDB_ECM.GetDatatable(SQL)
+            Dim datatable1 As DataTable = MYDB_ECM.GetDatatable(SQLenable)
            Depending_Controls(control, datatable, value)
            Enable_Controls(control, datatable1, value)

@@ -785,11 +785,11 @@ Public Class ClassControlBuilder
            'End If

            Dim SQL1 As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", CURRENT_RECORD_ID)
-            Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, True)
+            Dim DT_ControlValues As DataTable = MYDB_ECM.GetDatatable(SQL1)
            CURRENT_CONTROL_VALUES = DT_ControlValues

-            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL, True)
-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable, True)
+            Dim datatable As DataTable = MYDB_ECM.GetDatatable(SQL)
+            Dim datatable1 As DataTable = MYDB_ECM.GetDatatable(SQLenable)
            Depending_Controls(control, datatable, CONTROL_VALUE)
            If IsNothing(CONTROL_VALUE) Then
                Exit Sub
@@ -874,11 +874,11 @@ Public Class ClassControlBuilder
            'End If

            Dim SQL1 As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", CURRENT_RECORD_ID)
-            Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, True)
+            Dim DT_ControlValues As DataTable = MYDB_ECM.GetDatatable(SQL1)
            CURRENT_CONTROL_VALUES = DT_ControlValues

-            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Dim datatable As DataTable = MYDB_ECM.GetDatatable(SQL)
+            Dim datatable1 As DataTable = MYDB_ECM.GetDatatable(SQLenable)
            Depending_Controls(control, datatable, CONTROL_VALUE)
            If IsNothing(CONTROL_VALUE) Then
                Exit Sub
@@ -907,7 +907,7 @@ Public Class ClassControlBuilder
        If filter.IsEmpty Then
            Try
                Dim sql As String = $"SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {controlId} AND RECORD_ID = {recordId}"
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
+                Dim dt As DataTable = MYDB_ECM.GetDatatable(sql)
                Dim values As New List(Of Object)

                For Each row As DataRow In dt.Rows
@@ -952,39 +952,10 @@ Public Class ClassControlBuilder
            'End If


-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Dim datatable1 As DataTable = MYDB_ECM.GetDatatable(SQLenable)
            Enable_Controls(control, datatable1, checkstate)


-            'Dim sqlcommand As String = datatable.Rows(0).Item("SQL_COMMAND_1")
-
-            'If IsNothing(sqlcommand) Then
-            '    Exit Sub
-            'End If
-
-            'If String.IsNullOrEmpty(value) Then
-            '    Exit Sub
-            'End If
-
-
-
-            'Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
-            'Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
-
-            'If match.Success Then
-            '    ' DependingControlId bezeichnet das Control, das die Abhängigkeit enthält
-            '    Dim dependingControlId As Integer = datatable.Rows(0).Item("GUID")
-            '    Dim panel As Panel = DirectCast(control.Parent, Panel)
-            '    ' Über die Id das Control finden
-            '    Dim dependingControl As CustomComboBox = panel.Controls.OfType(Of CustomComboBox)().Where(Function(c As CustomComboBox)
-            '                                                                                      Return DirectCast(c.Tag, ClassControlMetadata).Id = dependingControlId
-            '                                                                                  End Function).SingleOrDefault()
-
-            '    sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
-            '    Console.WriteLine("Executing SQL_COMMAND: {0}", sqlcommand)
-            '    Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
-            '    ControlLoader.Combobox.SetDataSource(dependingControl, dt)
-            'End If

            Console.WriteLine("value changed")
        Catch ex As Exception
@@ -1503,7 +1474,7 @@ Public Class ClassControlBuilder
                If sqlcommand.Contains("@RECORD_ID") Or sqlcommand.Contains("@RECORDID") Or sqlcommand.Contains("@ENTITY_ID") Or sqlcommand.Contains("@PARENTRECORD_ID") Or sqlcommand.Contains("@PARENTRECORDID") Then
                    result = Nothing
                Else
-                    result = ClassDatabase.Execute_Scalar(sqlcommand, True)
+                    result = MYDB_ECM.ExecuteNonQuery(sqlcommand)
                End If
                If Not IsNothing(result) Then
                    If Not IsDBNull(result) Then
@@ -1622,7 +1593,7 @@ Public Class ClassControlBuilder
                control.AutoCompleteSource = AutoCompleteSource.CustomSource

                Dim suggestSource As New AutoCompleteStringCollection()
-                Dim dt As DataTable = ClassDatabase.Return_Datatable($"SELECT DISTINCT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {id}")
+                Dim dt As DataTable = MYDB_ECM.GetDatatable($"SELECT DISTINCT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {id}")

                For Each row As DataRow In dt.Rows
                    suggestSource.Add(row.Item("VALUE"))
@@ -2528,7 +2499,7 @@ Public Class ClassControlBuilder
                'Ja also überprüfen ob parametrisiert??
                If Not sqlcommand.ToString.Contains("@") Then
                    'SQL-Command vorhanden also Ausführen des SQL
-                    Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
+                    Dim DT_ListBox As DataTable = MYDB_ECM.GetDatatable(sqlcommand)
                    If DT_ListBox Is Nothing = False Then
                        If DT_ListBox.Rows.Count > 0 Then
                            control.DataSource = DT_ListBox
@@ -2638,7 +2609,7 @@ Public Class ClassControlBuilder
            If sqlcommand.Length > 1 Then
                If Not sqlcommand.ToString.Contains("@") Then
                    'SQL-Command vorhanden also Ausführen des SQL
-                    Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
+                    Dim DT_ListBox As DataTable = MYDB_ECM.GetDatatable(sqlcommand)
                    If DT_ListBox Is Nothing = False Then
                        If DT_ListBox.Rows.Count > 0 Then
                            control.DataSource = DT_ListBox
--- a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommands.vb
+++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommands.vb
@@ -54,7 +54,7 @@

    Public Shared Function GetParentRecordId(RecordId As Integer) As Integer
        Try
-            Dim parentId = ClassDatabase.Execute_Scalar("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId, True)
+            Dim parentId = MYDB_ECM.ExecuteNonQuery("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId)
            If IsNothing(parentId) Then
                Return 0
            Else
@@ -67,7 +67,7 @@

    Public Shared Function GetFormId(RecordId As Integer) As Integer
        Try
-            Dim FormId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId, True)
+            Dim FormId = MYDB_ECM.ExecuteNonQuery("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId)
            Return FormId
        Catch ex As Exception
            MsgBox("Error in GetFormId:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -77,7 +77,7 @@
    Public Shared Function GetControlGuid(name As String)
        Try
            Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE UPPER(NAME) = UPPER('" & name & "')"
-            Return ClassDatabase.Execute_Scalar(sql, True)
+            Return MYDB_ECM.ExecuteNonQuery(sql)
        Catch ex As Exception
            Return -1
        End Try
@@ -107,9 +107,9 @@
            SQL = $"INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES ({CURRENT_ENTITY_ID}, {CONTROL_TYPE_ID}, '', '{NAME}', '{NAME}', {PARENT_CONTROL_ID}, '')"

            'LOGGER.Debug(SQL)
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
-                Dim GUID = ClassDatabase.Execute_Scalar(SQL)
+                Dim GUID = MYDB_ECM.GetScalarValue(SQL)

                Return InsertControlScreen(GUID, control, CURRENT_ENTITY_ID)
            Else
@@ -138,7 +138,7 @@

            'Dim TAB_INDEX
            'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE CURRENT_ENTITY_ID = " & CURRENT_ENTITY_ID & ")"
-            'TAB_INDEX = ClassDatabase.Execute_Scalar(SQL)
+            'TAB_INDEX = MYDB_ECM.GetScalarValue(SQL)
            'If Not TAB_INDEX Is Nothing Then
            '    If IsDBNull(TAB_INDEX) Then
            '         TAB_INDEX = 1
@@ -152,16 +152,16 @@

            SQL = "INSERT TBPMO_CONTROL_SCREEN (CONTROL_ID, SCREEN_ID, CONTROL_TEXT, X_LOC, Y_LOC, HEIGHT, WIDTH) VALUES (" & guid & ", 1, '" & CONTROL_TEXT & "', " & X_LOC & ", " & Y_LOC & ", " & HEIGHT & ", " & WIDTH & ")"

-            If ClassDatabase.Execute_non_Query(SQL) Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) Then
                ' Die Guid in die Metadaten des Controls zurückschreiben
                Dim metadata = DirectCast(control.Tag, ClassControlMetadata)
                metadata.Id = guid
                control.Tag = metadata

                SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & guid & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
-                Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL)
+                Dim ctrl_screen_Id = MYDB_ECM.GetScalarValue(SQL)
                SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, USER_USERNAME)
-                ClassDatabase.Execute_non_Query(SQL)
+                MYDB_ECM.ExecuteNonQuery(SQL)
                Return True
            Else
                Throw New Exception()
@@ -187,7 +187,7 @@

            Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE CONTROL_ID = " & CONTROL_ID

-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                Return True
            Else
                Throw New Exception()
@@ -365,7 +365,7 @@
                    AUTO_SUGGEST = {AUTO_SUGGEST} 
                    WHERE GUID = {CURRENT_CONTROL_ID}"

-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                Return UpdateControlScreen(control, properties)
            Else
                Throw New Exception()
@@ -444,11 +444,11 @@
            End If

            SQL = "UPDATE TBPMO_CONTROL_SCREEN SET TAB_INDEX = " & TAB_INDEX & ", TAB_STOP = " & TAB_STOP & ", X_LOC = " & X_LOC & ", Y_LOC = " & Y_LOC & ", HEIGHT = " & HEIGHT & ", WIDTH = " & WIDTH & ", CONTROL_TEXT = '" & CONTROL_TEXT & "', CHANGED_WHO = '" & CHANGED_WHO & "', FONT_COLOR = " & FONT_COLOR & ", FONT_SIZE = " & FONT_SIZE & ", FONT_STYLE = " & FONT_STYLE & ", FONT_FAMILY = '" & FONT_FAMILY & "' , BACK_COLOR = " & BACK_COLOR & " WHERE CONTROL_ID = " & CURRENT_CONTROL_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
-                Dim upd = String.Format("UPDATE TBPMO_CONTROL_LANGUAGE SET CAPTION = '{0}', HINT = '{1}' WHERE LANGUAGE_TYPE = '{2}' AND " & _
-                                        "CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & _
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
+                Dim upd = String.Format("UPDATE TBPMO_CONTROL_LANGUAGE SET CAPTION = '{0}', HINT = '{1}' WHERE LANGUAGE_TYPE = '{2}' AND " &
+                                        "CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " &
                                        CURRENT_CONTROL_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID & ")", CONTROL_TEXT, HINT, USER_LANGUAGE)
-                ClassDatabase.Execute_non_Query(upd)
+                MYDB_ECM.ExecuteNonQuery(upd)
                If CurrentType.Contains("Button") Then
                    'If control.Tag = "ADDAPPOINTMENT" Then
                    If control.Name.Contains("f_addappointment") Then
@@ -528,7 +528,7 @@
    Public Shared Function DeleteControl(ID As Integer)
        Try
            Dim del = "EXEC [dbo].[PRPMO_DELETE_CONTROL] " & ID.ToString
-            If ClassDatabase.Execute_non_Query(del) = True Then
+            If MYDB_ECM.ExecuteNonQuery(del) = True Then
                Return True
            Else
                Return False
@@ -542,9 +542,9 @@
    Public Shared Function DeleteControlScreen(id As Integer)
        Try
            Dim SQL = "DELETE FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID IN (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & id & ")"
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                SQL = "DELETE FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & id
-                If ClassDatabase.Execute_non_Query(SQL) = True Then
+                If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                    Return True
                Else
                    Throw New Exception()
@@ -564,7 +564,7 @@
        Try
            Dim SQL = "DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & id

-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                Return True
            Else
                Throw New Exception()
--- a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb
@@ -1,4 +1,4 @@
-Imports DD_Record_Organizer.ClassDatabase
+
 Imports DD_Record_Organizer.ClassControlBuilder
 Imports DD_LIB_Standards
 Imports System.Data.SqlClient
@@ -53,7 +53,7 @@ Public Class ClassControlCommandsUI
        'Dim SQL As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{2}', {3},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T WHERE T.SCREEN_ID = {0} AND T.FORM_ID = {1} AND T.CONTROL_VISIBLE = 1", CURRENT_SCREEN_ID, FormId, USER_LANGUAGE, CURRENT_SCREEN_ID)
        Dim expression As String = String.Format("SCREEN_ID = {0} AND FORM_ID = {1} AND CONTROL_VISIBLE = 1", CURRENT_SCREEN_ID, FormId)

-        Dim DT As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, expression, "") ' ClassDatabase.Return_Datatable(Sql, True)
+        Dim DT As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, expression, "")

        For Each dr As DataRow In DT.Rows
            Dim parent As GroupBox = Nothing
@@ -343,10 +343,10 @@ Public Class ClassControlCommandsUI
    End Function


-    Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
+    Function SaveRecord(RecordID As Integer, FormID As Integer) As String
        Try
            Dim ADDED_WHO As String = USER_USERNAME
-            LOGGER.Debug("(SaveRecord) Update RecordID: " & RecordID, False)
+            LOGGER.Debug("(SaveRecord) Update RecordID: " & RecordID)
            If UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls) = True Then
                Return "Datensatz aktualisiert - " & Now
            Else
@@ -394,7 +394,7 @@ Public Class ClassControlCommandsUI

    Private Sub UpsertImage(ControlID As Integer, RecordID As Integer, image As Bitmap)
        Dim existsSQL As String = "SELECT GUID FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID
-        Dim exists = ClassDatabase.Execute_Scalar(existsSQL)
+        Dim exists = MYDB_ECM.ExecuteNonQuery(existsSQL)

        If IsNothing(exists) Then
            InsertImage(ControlID, RecordID, image)
@@ -436,10 +436,10 @@ Public Class ClassControlCommandsUI
    Private Sub LinkImage(ControlID As Integer, RecordID As Integer)
        Try
            Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlID, RecordID)
-            Dim ImageID As Integer = ClassDatabase.Execute_Scalar(SQL)
+            Dim ImageID As Integer = MYDB_ECM.GetScalarValue(SQL)

            SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlID, RecordID)
-            Dim valueExists = ClassDatabase.Execute_Scalar(SQL)
+            Dim valueExists = MYDB_ECM.GetScalarValue(SQL)

            Dim VALUE = "%%" & ImageID.ToString & "%%"

@@ -448,7 +448,7 @@ Public Class ClassControlCommandsUI
            Else
                SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (RECORD_ID, CONTROL_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", RecordID, ControlID, VALUE, USER_USERNAME)
            End If
-            ClassDatabase.Execute_non_Query(SQL)
+            MYDB_ECM.ExecuteNonQuery(SQL)
        Catch ex As Exception
            MsgBox("Error in LinkImage: " & vbNewLine & ex.Message)
        End Try
@@ -489,11 +489,11 @@ Public Class ClassControlCommandsUI
        Try
            ' Delete Image
            Dim SQL = String.Format("DELETE FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlID, RecordID)
-            Dim result = ClassDatabase.Execute_non_Query(SQL)
+            Dim result = MYDB_ECM.ExecuteNonQuery(SQL)

            ' Delete Value
            SQL = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlID, RecordID)
-            result = ClassDatabase.Execute_non_Query(SQL)
+            result = MYDB_ECM.ExecuteNonQuery(SQL)
        Catch ex As Exception
            MsgBox("Fehler beim löschen des Bildes:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -504,16 +504,16 @@ Public Class ClassControlCommandsUI
            Dim _error As Boolean = False
            Dim sw As New SW("UpdateAllControls")
            Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
-            ClassDatabase.Execute_non_Query(del)
+            MYDB_ECM.ExecuteNonQuery(del)
            CURRENT_CHANGE_STEP += 1
            Dim sel = String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID)
-            Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(sel, True)
+            Dim VALUE_EXISTS_DT As DataTable = MYDB_ECM.GetDatatable(sel)

            For Each ctrl As Control In controls
                Console.WriteLine("Updating Control " + ctrl.Name)

                Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id 'GetControlID_for_RecordID(ctrl.Name, RecordID)
-                LOGGER.Debug("CONTROL_ID: " & CONTROL_ID, False)
+                LOGGER.Debug("CONTROL_ID: " & CONTROL_ID)
                Dim CONTROL_VALUE As String = GetControlValue(ctrl)
                Dim controltype = ctrl.GetType.ToString
                If TypeOf ctrl Is PictureBox Then
@@ -542,7 +542,7 @@ Public Class ClassControlCommandsUI
                    Continue For
                End If

-                'Dim ValueExists = ClassDatabase.Execute_Scalar(String.Format("SELECT RECORD_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0} AND CONTROL_ID = {1}", RecordID, CONTROL_ID))
+
                Dim ValueExists = VALUE_EXISTS_DT.Select(String.Format("CONTROL_ID = {0}", CONTROL_ID))
                Dim ValueChanged As Boolean = _CtrlBuilder.ControlsChanged.Contains(CONTROL_ID)

@@ -554,7 +554,7 @@ Public Class ClassControlCommandsUI
                    'If CONTROL_ID = 995 Or CONTROL_ID = 996 Or CONTROL_ID = 997 Or CONTROL_ID = 810 Then
                    '    Console.WriteLine("sdasd")
                    'End If
-                    LOGGER.Debug("InsertControlValue: " & CONTROL_ID & "|" & RecordID & "|" & CONTROL_VALUE, False)
+                    LOGGER.Debug("InsertControlValue: " & CONTROL_ID & "|" & RecordID & "|" & CONTROL_VALUE)
                    If Not IsNothing(CONTROL_VALUE) Then
                        If TypeOf ctrl Is CustomComboBox And CONTROL_VALUE = "" Then
                            'Exit Sub - Zuviel des guten
@@ -577,9 +577,9 @@ Public Class ClassControlCommandsUI
                    If (isDateEdit Or isTextBox Or isComboBox) And isEmptyValue Then

                        Dim sql As String = $"DELETE FROM TBPMO_CONTROL_VALUE WHERE RECORD_ID = {RecordID} AND CONTROL_ID = {CONTROL_ID}"
-                        If ClassDatabase.Execute_non_Query(sql) = True Then
+                        If MYDB_ECM.ExecuteNonQuery(sql) = True Then
                            If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                                ClassDatabase.Execute_non_Query(sql, True)
+                                MYDB_ECM.ExecuteNonQuery(sql, True)
                            End If
                        End If

@@ -612,7 +612,7 @@ Public Class ClassControlCommandsUI
    Public Shared Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String)
        Try
            Dim val = String.Format("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlId, RecordId)
-            Dim dt As DataTable = ClassDatabase.Return_Datatable(val, True)
+            Dim dt As DataTable = MYDB_ECM.GetDatatable(val)
            If IsNothing(dt) Then
                Exit Sub
            End If
@@ -644,7 +644,7 @@ Public Class ClassControlCommandsUI
                End If
            Next
            For Each v As String In RemoveValues
-                ClassDatabase.Execute_non_Query(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v))
+                MYDB_ECM.ExecuteNonQuery(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v))
                ' ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId)
            Next
            ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "")
@@ -657,14 +657,14 @@ Public Class ClassControlCommandsUI

        Dim type = ctrl.GetType().Name
        Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id ' GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID)
-        LOGGER.Debug("GetControlValue CONTROL_ID: " & CONTROL_ID, False)
+        LOGGER.Debug("GetControlValue CONTROL_ID: " & CONTROL_ID)
        Dim CONTROL_VALUE As String = Nothing
-        LOGGER.Debug("type = " & type.ToString, False)
+        LOGGER.Debug("type = " & type.ToString)
        Select Case type
            Case "TextBox"
                Return DirectCast(ctrl, TextBox).Text
            Case "CustomComboBox"
-                LOGGER.Debug("Return Value: " & DirectCast(ctrl, CustomComboBox).Text, False)
+                LOGGER.Debug("Return Value: " & DirectCast(ctrl, CustomComboBox).Text)
                Return DirectCast(ctrl, CustomComboBox).Text
            Case "CheckBox"
                Return DirectCast(ctrl, CheckBox).Checked.ToString()
@@ -689,7 +689,7 @@ Public Class ClassControlCommandsUI
            Case "CheckedListBoxControl"
                Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl
                chklbx = DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl)
-                Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID, True)
+                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)

                'TODO: Wenn keine Datasource vorhanden, angecheckte einträge als string speichern
                If IsNothing(chklbx.DataSource) Then
@@ -718,10 +718,10 @@ Public Class ClassControlCommandsUI
                            If CInt(row(0)) > 0 Then
                                'Überprüfen ob es den Record gibt
                                Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
-                                If ClassDatabase.Execute_Scalar(SQL, True) = 1 Then
+                                If MYDB_ECM.ExecuteNonQuery(SQL) = 1 Then
                                    SQL = "DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
-                                    If ClassDatabase.Execute_non_Query(SQL) = True Then
-                                        LOGGER.Debug("TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted", False)
+                                    If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
+                                        LOGGER.Debug("TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted")
                                    End If
                                End If
                            End If
@@ -744,12 +744,12 @@ Public Class ClassControlCommandsUI
                                checked_result.Add(checked_value)
                                checked_result_string = String.Join(";", checked_result)
                                Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
-                                If ClassDatabase.Execute_Scalar(SQL, True) = 0 Then
+                                If MYDB_ECM.ExecuteNonQuery(SQL, True) = 0 Then
                                    If CURRENT_RECORD_ID = 0 Then
                                        MsgBox("Attention: no current record Selected!", MsgBoxStyle.Exclamation)
                                    Else
                                        If ClassRecordCommands.ConnectRecord(CURRENT_RECORD_ID, CInt(row(0)), "CheckedListBox;" & ctrl.Name) = True Then
-                                            LOGGER.Debug("Checked ListBox record  '" & rid.ToString & "' was linked successfully.", False)
+                                            LOGGER.Debug("Checked ListBox record  '" & rid.ToString & "' was linked successfully.")
                                        End If
                                    End If

@@ -779,7 +779,7 @@ Public Class ClassControlCommandsUI
                ' Überspringt den Rest der funktion
                If Not IsNothing(checked_result_string) Then
                    'Dim sql = String.Format("select count(*) from TBPMO_CONTROL_VALUE where CONTROL_ID = {0} and RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
-                    'If ClassDatabase.Execute_Scalar(sql) = 0 Then
+                    'If MYDB_ECM.GetScalarValue(SQL) = 0 Then
                    '    InsertControlValue(CONTROL_ID, CURRENT_RECORD_ID, "")
                    'End If
                    Return checked_result_string
@@ -792,7 +792,7 @@ Public Class ClassControlCommandsUI
                Dim chk_grid As DevExpress.XtraGrid.GridControl
                chk_grid = DirectCast(ctrl, DevExpress.XtraGrid.GridControl)
                Dim gridview As DevExpress.XtraGrid.Views.Grid.GridView = chk_grid.MainView
-                Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID, True)
+                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)

                Dim result As New List(Of String)
                Dim result_string As String
@@ -891,7 +891,7 @@ Public Class ClassControlCommandsUI
            Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value)
            If Not IsNothing(converted_value) Then
                Dim connection As New SqlConnection
-                connection.ConnectionString = MyConnectionString
+                connection.ConnectionString = MYDB_ECM.CurrentConnectionString
                Using cmd As New SqlCommand("PRPMO_CREATE_CONTROL_VALUE", connection)
                    cmd.CommandType = CommandType.StoredProcedure
                    cmd.Parameters.AddWithValue("@pRECORD_ID", RecordID)
@@ -913,7 +913,7 @@ Public Class ClassControlCommandsUI
                _result = 0
            End If
        Catch ex As Exception
-            Dim name = clsDatabase.Execute_Scalar("SELECT NAME FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True)
+            Dim name = MYDB_ECM.GetScalarValue("SELECT NAME FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateControlProcedure für Control: " & name)
            LOGGER.Warn("Error in CreateControlProcedure: " & ex.Message, True)
            Return 0
@@ -927,13 +927,13 @@ Public Class ClassControlCommandsUI
                converted_value = converted_value.Replace("'", "´")
                Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho)
                If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                    If ClassDatabase.Execute_non_Query(ins) = True Then
+                    If MYDB_ECM.ExecuteNonQuery(ins) = True Then
                        Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
                    Else
                        Return False
                    End If
                Else
-                    Return ClassDatabase.Execute_non_Query(ins)
+                    Return MYDB_ECM.ExecuteNonQuery(ins)
                End If
            Else
                Return False
@@ -957,13 +957,13 @@ Public Class ClassControlCommandsUI
                LOGGER.Warn(upd)
            End If
            If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                If ClassDatabase.Execute_non_Query(upd) = True Then
+                If MYDB_ECM.ExecuteNonQuery(upd) = True Then
                    Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
                Else
                    Return False
                End If
            Else
-                Return ClassDatabase.Execute_non_Query(upd)
+                Return MYDB_ECM.ExecuteNonQuery(upd)
            End If
        Catch ex As Exception
            LOGGER.Warn("Unerwarteter Fehler in UpdateControlValue: " & ex.Message)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Jenne	5196bcda8e	merge MS	2023-08-02 08:14:51 +02:00
Jonathan Jenne	080a711067	Multiselect	2023-08-02 08:11:40 +02:00
SchreiberM	fed1280f48	MS	2023-07-27 14:30:57 +02:00
Jonathan Jenne	5cb526e7a4	Fix NodeId display, prepare multiselect, select active ribbon page on ribbon merging	2023-07-24 16:00:32 +02:00
SchreiberM	ea5ea5f205	MS	2023-07-20 14:12:24 +02:00
SchreiberM	c2deb54f11	DAtabase integriert	2023-05-22 16:55:44 +02:00
SchreiberM	2db575d944	MS	2023-04-13 17:11:20 +02:00
SchreiberM	aa7c68a4ce	MS	2023-04-06 16:50:34 +02:00
SchreiberM	9a9fe72b4f	MS	2023-03-22 15:46:32 +01:00
Digital Data - Marlon Schreiber	60c739833f	MS	2023-01-23 16:21:42 +01:00
Digital Data - Marlon Schreiber	01b066e4e3	MS WMsharedrive Integration	2022-11-11 14:37:36 +01:00
Digital Data - Marlon Schreiber	f01ffe312d	MS	2022-08-30 15:08:07 +02:00
Digital Data - Marlon Schreiber	3795c8fd74	MS	2022-07-28 16:08:48 +02:00
Digital Data - Marlon Schreiber	28254c99f7	MS SAP	2022-07-07 13:20:13 +02:00
Digital Data - Marlon Schreiber	331611c9e8	MS Anpassungen	2022-02-22 17:24:49 +01:00
Jonathan Jenne	5186aed523	add error logging for config loader	2022-02-01 11:07:34 +01:00
Jonathan Jenne	9e4ffc94ac	Version 2.7.5.1	2022-01-31 13:10:04 +01:00
Jonathan Jenne	d44c4aff72	Add missing dlls from update to DevExpress 21.2	2022-01-31 13:09:53 +01:00
Jonathan Jenne	301a8d5ac0	Update Installer for Devexpress 21.2, remove changelog	2022-01-19 12:03:28 +01:00
Digital Data - Marlon Schreiber	fcdeeb12ae	MS Push	2022-01-19 11:40:31 +01:00
Digital Data - Marlon Schreiber	9287630dfb	MS	2021-08-27 14:23:01 +02:00
Digital Data - Marlon Schreiber	54d57761ea	MS	2021-07-28 11:47:36 +02:00
Digital Data - Marlon Schreiber	3feb7ebf4d	MS 2.7	2021-06-28 16:02:25 +02:00
Digital Data - Marlon Schreiber	e9fb65eddf	MS DocResult ENtitySearch	2021-06-28 10:32:13 +02:00
Jonathan Jenne	136c4dec6e	Update Installer	2021-06-28 10:25:26 +02:00