MERGE

2024-02-26 12:43:42 +01:00
parent a08b48ca78 beaf4e7ade
commit d611bb02c5
12 changed files with 489 additions and 391 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -47,7 +47,8 @@
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>AVISO.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
+    <NoWarn>
+    </NoWarn>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -58,7 +59,8 @@
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>AVISO.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
+    <NoWarn>
+    </NoWarn>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
@@ -76,9 +78,7 @@
  <PropertyGroup>
    <ApplicationIcon>aviso.ico</ApplicationIcon>
  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
  <PropertyGroup>
    <ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint>
  </PropertyGroup>
@@ -87,7 +87,7 @@
    </ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
  </PropertyGroup>
  <PropertyGroup>
    <TargetZone>LocalIntranet</TargetZone>
@@ -107,11 +107,11 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Aviso_1_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <OutputPath>bin\Release\</OutputPath>
@@ -126,14 +126,17 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
-    <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
+    <Reference Include="ChilkatDotNet47">
+      <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
    </Reference>
    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
    </Reference>
+    <Reference Include="cNCTSPartnerWorker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\ADMIN\ADMIN\cNCTSPartnerWorker\bin\Debug\cNCTSPartnerWorker.dll</HintPath>
+    </Reference>
    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
      <HintPath>..\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
    </Reference>
@@ -337,10 +340,6 @@
    <Reference Include="ThoughtWorks.QRCode">
      <HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
    </Reference>
-    <Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
-    </Reference>
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
@@ -1329,7 +1328,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\licenses.licx" />
    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <Generator>PublicVbMyResourcesResXFileCodeGenerator</Generator>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
@@ -1399,16 +1398,13 @@
    <None Include="AL20210908.pfx" />
    <None Include="AL20231110.pfx" />
    <None Include="App.config" />
-    <None Include="Aviso_1_TemporaryKey.pfx" />
-    <None Include="Aviso_TemporaryKey.pfx" />
+    <None Include="app.manifest" />
    <None Include="Dokumentenbeschriftung\PageReport1.rdlx">
      <SubType>Component</SubType>
    </None>
    <None Include="GenerelleGestellungenVorlagen\GenerelleGestellung_DE.pdf">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="LME.pfx" />
-    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -1419,6 +1415,7 @@
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="PrivateCodeSignaturDaniel20240131.pfx" />
    <None Include="Resources\Flender_Bocholt.xlsx" />
    <None Include="Resources\ATANAK_Instructions_Export.xlsx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -1459,10 +1456,6 @@
    <None Include="Resources\Versionsinfo.txt" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj">
-      <Project>{2bbd7643-82a1-481f-a014-eb7fcdeed3b5}</Project>
-      <Name>NCTSPartnerWorker</Name>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
      <Name>TELOTEC_Worker_lib</Name>
@@ -1471,6 +1464,11 @@
      <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
      <Name>SDL</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
+      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
+      <Name>VERAG_PROG_ALLGEMEIN</Name>
+      <Private>True</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@@ -1502,6 +1500,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="aviso.ico" />
+    <None Include="bin\Debug\Resources\ambar_boarder.png" />
    <Content Include="My Project\aktAlt.jpg" />
    <None Include="Resources\ZwAbEinfuegen.png" />
    <None Include="Resources\unisped_aeo_DE.jpg" />
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -667,4 +667,7 @@
  <data name="wiki" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wiki.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Aviso/app.manifest
+++ b/Aviso/app.manifest
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+	<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC-Manifestoptionen
+             Wenn Sie die Ebene der Benutzerkontensteuerung für Windows ändern möchten, ersetzen Sie den 
+             Knoten "requestedExecutionLevel" wie folgt.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Durch Angabe des Elements "requestedExecutionLevel" wird die Datei- und Registrierungsvirtualisierung deaktiviert. 
+            Entfernen Sie dieses Element, wenn diese Virtualisierung aus Gründen der Abwärtskompatibilität
+            für die Anwendung erforderlich ist.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Eine Liste der Windows-Versionen, unter denen diese Anwendung getestet
+           und für die sie entwickelt wurde. Wenn Sie die Auskommentierung der entsprechenden Elemente aufheben,
+           wird von Windows automatisch die kompatibelste Umgebung ausgewählt. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Gibt an, dass die Anwendung mit DPI-Werten kompatibel ist und von Windows nicht automatisch auf höhere
+       DPI-Werte skaliert wird. WPF-Anwendungen (Windows Presentation Foundation) sind automatisch mit DPI-Werten kompatibel, eine Aktivierung 
+       ist nicht erforderlich. Für Windows Forms-Anwendungen für .NET Framework 4.6, die diese Einstellung aktivieren, muss 
+       auch die Einstellung "'EnableWindowsFormsHighDpiAutoResizing" in der Datei "app.config" auf TRUE festgelegt werden. 
+       
+       Hierdurch können für die Anwendung lange Pfade verwendet werden. Weitere Informationen finden Sie unter https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation.-->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Designs für allgemeine Windows-Steuerelemente und -Dialogfelder (Windows XP und höher) aktivieren -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -11,6 +11,15 @@ Public Class frmGesamtsicherheitenMenuNEU
    Public firmaId As Integer


+    Public Sub New()
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
    Private Sub frmGesamtsicherheitenNEU_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load


@@ -19,13 +28,14 @@ Public Class frmGesamtsicherheitenMenuNEU
            Case "VERAG AG" : firmaId = 1 : chkOffen.Checked = False
            Case "IMEX" : firmaId = 20 : chkOffen.Checked = False
            Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False
+            Case "Unisped GmbH" : firmaId = 21 : chkOffen.Checked = False
        End Select


        cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-        'cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
        cbxWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
        cbxWarenort.DropDownWidth = 150
+
        Me.Text = "Gesamtsicherheiten " & Standort
        frmHauptfenster.EnableDoubleBuffered(dgvListe)

--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
        Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -117,10 +117,12 @@ Partial Class frmHauptfenster
        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
        Me.BürgschaftenExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.GesamtsicherheitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATVeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATImexCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATVeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DEVeragGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
        Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
@@ -863,7 +865,7 @@ Partial Class frmHauptfenster
        '
        'FunktionenToolStripMenuItem
        '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.ToolStripMenuItem3, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.ToolStripMenuItem3, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem})
        Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
        Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21)
        Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -871,26 +873,26 @@ Partial Class frmHauptfenster
        'GenerelleGestellungenDurchsuchenToolStripMenuItem
        '
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
        '
        'KundenVonFremdenSpeditionenToolStripMenuItem
        '
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
        '
        'KundenverwaltungToolStripMenuItem
        '
        Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
        '
        'MDMParkplatzkartenToolStripMenuItem
        '
        Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
        '
        'SMSSendenToolStripMenuItem
@@ -898,7 +900,7 @@ Partial Class frmHauptfenster
        Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
        Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
        Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.SMSSendenToolStripMenuItem.Text = "SMS"
        '
        'NeueSMSSendenToolStripMenuItem
@@ -916,104 +918,114 @@ Partial Class frmHauptfenster
        'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
        '
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
        'MRNBarcodedruckToolStripMenuItem
        '
        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
        '
        'tool_BRGXLS
        '
        Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
        Me.tool_BRGXLS.Text = "Bürgschaften Excel"
        '
        'ToolStripMenuItem4
        '
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
        Me.ToolStripMenuItem4.Visible = False
        '
        'ToolStripMenuItem5
        '
        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
        Me.ToolStripMenuItem5.Visible = False
        '
        'BürgschaftenExcelToolStripMenuItem
        '
        Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
        Me.BürgschaftenExcelToolStripMenuItem.Visible = False
        '
        'ToolStripMenuItem6
        '
        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
        Me.ToolStripMenuItem6.Visible = False
        '
-        'DEGesamtsicherheitVeragGmbHToolStripMenuItem
+        'GesamtsicherheitenToolStripMenuItem
        '
-        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Name = "DEGesamtsicherheitVeragGmbHToolStripMenuItem"
-        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Text = "DE | Gesamtsicherheit Verag GmbH"
-        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = False
+        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem})
+        Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
+        Me.GesamtsicherheitenToolStripMenuItem.Visible = False
        '
-        'ATGesamtsicherheitVeragAGToolStripMenuItem
+        'ATVeragAGToolStripMenuItem
        '
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Name = "ATGesamtsicherheitVeragAGToolStripMenuItem"
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag AG"
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = False
+        Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem"
+        Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG"
        '
-        'ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem
+        'ATImexCSToolStripMenuItem
        '
-        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Name = "ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem"
-        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Text = "AT | Gesamtsicherheit IMEX CS GmbH"
-        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = False
+        Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem"
+        Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH"
        '
-        'ATGesamtsicherheitVeragCSToolStripMenuItem
+        'ATVeragCSToolStripMenuItem
        '
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Name = "ATGesamtsicherheitVeragCSToolStripMenuItem"
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag CS"
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = False
+        Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem"
+        Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS"
+        '
+        'DEVeragGmbHToolStripMenuItem
+        '
+        Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem"
+        Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH"
+        '
+        'ATUnispedGmbHToolStripMenuItem
+        '
+        Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem"
+        Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH"
        '
        'ToolStripMenuItem10
        '
        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
        '
        'TICKETWaidhausToolStripMenuItem
        '
        Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
        '
        'ToolStripSeparator10
        '
        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
        '
        'DAKOSYToolStripMenuItem
        '
        Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
        Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
        '
        'StammreferenzenVerwaltenToolStripMenuItem
@@ -1025,75 +1037,75 @@ Partial Class frmHauptfenster
        'ToolStripSeparator23
        '
        Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
        '
        'ToolStripMenuItem3
        '
        Me.ToolStripMenuItem3.Image = Global.AVISO.My.Resources.Resources.atr
        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem3.Text = "Original-ATR"
        '
        'SDLAbholaufträgeToolStripMenuItem
        '
        Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
        'ToolStripMenuItem13
        '
        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
        '
        'ToolStripSeparator11
        '
        Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
        '
        'EssensbestellungenToolStripMenuItem
        '
        Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
        Me.EssensbestellungenToolStripMenuItem.Visible = False
        '
        'AdministrationEssensbestellungenToolStripMenuItem
        '
        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
        Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
        '
        'ToolStripSeparator24
        '
        Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
        '
        'WarenorteToolStripMenuItem
        '
        Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.WarenorteToolStripMenuItem.Text = "Warenorte"
        '
        'DatevBuchungsexportToolStripMenuItem
        '
        Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
        Me.DatevBuchungsexportToolStripMenuItem.Visible = False
        '
        'APIToolStripMenuItem
        '
        Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.APIToolStripMenuItem.Text = "API"
        '
        'StatistikToolStripMenuItem
@@ -1608,7 +1620,7 @@ Partial Class frmHauptfenster
        '
        Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
        Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
-        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(201, 30)
+        Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(193, 22)
        Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
        '
        'btnWoche
@@ -2469,38 +2481,38 @@ Partial Class frmHauptfenster
        Me.gridMyAviso.AllowUserToDeleteRows = False
        Me.gridMyAviso.AllowUserToOrderColumns = True
        Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20
        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle21
        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
        Me.gridMyAviso.Name = "gridMyAviso"
        Me.gridMyAviso.ReadOnly = True
-        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle22
        Me.gridMyAviso.RowHeadersVisible = False
        Me.gridMyAviso.RowHeadersWidth = 62
        Me.gridMyAviso.Size = New System.Drawing.Size(488, 279)
@@ -2913,47 +2925,47 @@ Partial Class frmHauptfenster
        Me.gridAviso.AllowUserToAddRows = False
        Me.gridAviso.AllowUserToDeleteRows = False
        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle24.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24
        Me.gridAviso.ColumnHeadersHeight = 25
        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle25
        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridAviso.Location = New System.Drawing.Point(0, 248)
        Me.gridAviso.MultiSelect = False
        Me.gridAviso.Name = "gridAviso"
        Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle26
        Me.gridAviso.RowHeadersVisible = False
        Me.gridAviso.RowHeadersWidth = 62
        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle27
        Me.gridAviso.RowTemplate.ReadOnly = True
        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -4085,10 +4097,6 @@ Partial Class frmHauptfenster
    Friend WithEvents ToolStripSeparator19 As ToolStripSeparator
    Friend WithEvents PBNIrelandFähreToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ToolStripSeparator20 As ToolStripSeparator
-    Friend WithEvents ATGesamtsicherheitVeragAGToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents DEGesamtsicherheitVeragGmbHToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents ATGesamtsicherheitVeragCSToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerfahrenshandbücherToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ChecklistenToolStripMenuItem As ToolStripMenuItem
@@ -4154,4 +4162,10 @@ Partial Class frmHauptfenster
    Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
    Friend WithEvents ToolStripSeparator24 As ToolStripSeparator
    Friend WithEvents VERAGWIKIToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents GesamtsicherheitenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ATVeragAGToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ATImexCSToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ATVeragCSToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents DEVeragGmbHToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ATUnispedGmbHToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -308,13 +308,7 @@ Public Class frmHauptfenster
            End If
        End If

-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("GESAMTSICHERHEIT", "AVISO") Then
-            DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = True
-            ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = True
-            ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = True
-            ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = True
-        End If
-
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("GESAMTSICHERHEIT", "AVISO") Then GesamtsicherheitenToolStripMenuItem.Visible = True

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "ATILLA" ' Case "VERAG", "IMEX"
@@ -1335,15 +1329,11 @@ Public Class frmHauptfenster
                '    End Select
                'End If

-                '''sqlStr &= " AND (Grenzstelle ='???' OR  Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
-                ''' Funktioniert nciht, wg. WO
+                'sqlStr &= " AND (Grenzstelle ='???' OR  Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
+                ' Funktioniert nciht, wg. WO

+                sqlStr &= " ORDER BY case	 " & " when [Status] =3 then 0 " & " when [Status] =1 then 5 " & " else 1 " & " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")

-                sqlStr &= " ORDER BY case	 " &
-                                                     " when [Status] =3 then 0 " &
-                                                     " when [Status] =1 then 5 " &
-                                                     " else 1 " &
-                                             " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            End If
            '   MsgBox(sqlStr)
            'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END  as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
@@ -2751,30 +2741,30 @@ Public Class frmHauptfenster
            ' Label4.Visible = False '- -> NICHT MEHR
            ' cboGrenzstelle.Visible = Falsee '- -> NICHT MEHR
            'BürgschaftenExcelToolStripMenuItem.Visible = True
-            ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = True
+            ATVeragCSToolStripMenuItem.Visible = True
            'ToolStripMenuItem4.Visible = True
-            DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = True
+            DEVeragGmbHToolStripMenuItem.Visible = True
            'ToolStripMenuItem5.Visible = True
-            ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = True
+            ATVeragAGToolStripMenuItem.Visible = True
        ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
            'nix
        ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
            'btnGenerelleGestellungen.Visible = False
            'ToolStripMenuItem4.Visible = True
-            DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = True
+            DEVeragGmbHToolStripMenuItem.Visible = True
            'ToolStripMenuItem5.Visible = True
-            ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = True
+            ATVeragAGToolStripMenuItem.Visible = True
            'ToolStripMenuItem6.Visible = True
-            ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = True
+            ATImexCSToolStripMenuItem.Visible = True
        Else 'VERAG
            'BürgschaftenExcelToolStripMenuItem.Visible = True
-            ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = True
+            ATVeragCSToolStripMenuItem.Visible = True
            'ToolStripMenuItem4.Visible = True
-            DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = True
+            DEVeragGmbHToolStripMenuItem.Visible = True
            'ToolStripMenuItem5.Visible = True
-            ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = True
+            ATVeragAGToolStripMenuItem.Visible = True
            'ToolStripMenuItem6.Visible = True
-            ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = True
+            ATImexCSToolStripMenuItem.Visible = True
            If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then
                Button5.Visible = True
            End If
@@ -4290,29 +4280,22 @@ Public Class frmHauptfenster
        Process.Start("https://www.ros.ie/customs-roro-control-web/ros/pbn/create")
    End Sub

-    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragAGToolStripMenuItem.Click
-        Dim frm As New frmGesamtsicherheitenMenuNEU
-        frm.Standort = "VERAG AG"
+    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click
+
+        Dim frm As New frmGesamtsicherheitenMenuNEU()
+        Select Case sender.name
+            Case "ATVeragAGToolStripMenuItem" : frm.Standort = "VERAG AG"
+            Case "DEVeragGmbHToolStripMenuItem" : frm.Standort = "Verag GmbH"
+            Case "ATImexCSToolStripMenuItem" : frm.Standort = "IMEX"
+            Case "ATVeragCSToolStripMenuItem" : frm.Standort = "Verag CS"
+            Case "ATUnispedGmbHToolStripMenuItem" : frm.Standort = "Unisped GmbH"
+        End Select
+
        frm.Show()
+
    End Sub

-    Private Sub DEGesamtsicherheitVeragGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHToolStripMenuItem.Click
-        Dim frm As New frmGesamtsicherheitenMenuNEU
-        frm.Standort = "Verag GmbH"
-        frm.Show()
-    End Sub

-    Private Sub ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Click
-        Dim frm As New frmGesamtsicherheitenMenuNEU
-        frm.Standort = "IMEX"
-        frm.Show()
-    End Sub
-
-    Private Sub ATGesamtsicherheitVeragCSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragCSToolStripMenuItem.Click
-        Dim frm As New frmGesamtsicherheitenMenuNEU
-        frm.Standort = "Verag CS"
-        frm.Show()
-    End Sub

    Private Sub gridAviso_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles gridAviso.CellPainting
        If e.RowIndex <> -1 AndAlso gridAviso.Columns(e.ColumnIndex).Name = "Status" Then
@@ -4556,6 +4539,8 @@ Public Class frmHauptfenster
    Private Sub VERAGWIKIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGWIKIToolStripMenuItem.Click

    End Sub
+
+
 End Class

 Public Class AvisoStatusFunctions
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -1,10 +1,6 @@
 Imports System.IO
-Imports System.Windows.Forms
 Imports VERAG_PROG_ALLGEMEIN

-Imports System.Reflection
-Imports System.DirectoryServices
-Imports Therefore.API

 Public Class frmLogin

@@ -15,7 +11,7 @@ Public Class frmLogin
    Private ADMIN As New cADMIN
    Public firma As String = "VERAG"

-    Dim SECRET = False
+    Dim SECRET As Boolean = False
    Public Sub New()
        InitializeComponent()
        Icon = cMeineFunktionenAVISO.GetProgrammIcon
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -4112,7 +4112,7 @@ Public Class frmSendungsdetailsNEU

                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An Fremdspediteur avisiert (Warenort)", 98)

-                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
+                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE",,,,,, False) & "</div>"

                    End If

@@ -5212,6 +5212,7 @@ Public Class frmSendungsdetailsNEU
        Try
            Printername = oPS.PrinterName
        Catch ex As System.Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try


--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -1318,6 +1318,7 @@ Partial Class usrcntlAktDetails
        'Panel8
        '
        Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel8.Controls.Add(Me.lblAktUebernommen)
        Me.Panel8.Controls.Add(Me.lblLKWChat_MsgCnt)
        Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme)
        Me.Panel8.Controls.Add(Me.picAVISOMessenger)
@@ -1339,7 +1340,6 @@ Partial Class usrcntlAktDetails
        Me.Panel8.Controls.Add(Me.pnlAbgeschlossen)
        Me.Panel8.Controls.Add(Me.lklAuswahlAufheben)
        Me.Panel8.Controls.Add(Me.txtLKWID)
-        Me.Panel8.Controls.Add(Me.lblAktUebernommen)
        Me.Panel8.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel8.Location = New System.Drawing.Point(0, 0)
        Me.Panel8.Name = "Panel8"
@@ -1609,8 +1609,8 @@ Partial Class usrcntlAktDetails
        'pnlAbgeschlossen
        '
        Me.pnlAbgeschlossen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.pnlAbgeschlossen.Controls.Add(Me.Label2)
        Me.pnlAbgeschlossen.Controls.Add(Me.pic)
+        Me.pnlAbgeschlossen.Controls.Add(Me.Label2)
        Me.pnlAbgeschlossen.Location = New System.Drawing.Point(413, 75)
        Me.pnlAbgeschlossen.Name = "pnlAbgeschlossen"
        Me.pnlAbgeschlossen.Size = New System.Drawing.Size(157, 44)