merge

2023-10-27 08:51:29 +02:00
parent 98798c427c cb395acdec
commit 1d4b53bce6
19 changed files with 2854 additions and 181 deletions
--- a/VERAGAddIn.sln
+++ b/VERAGAddIn.sln
@@ -1,15 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.2.32314.265
+VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj", "{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Parkzeit", "..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj", "{E4190547-B222-4AE3-A0BE-A44EAEE70335}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Aviso", "..\..\AVISO\Aviso\Aviso\Aviso.vbproj", "{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "..\SDL\SDL\SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Aviso", "..\Aviso\AVISO\Aviso\Aviso.vbproj", "{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj", "{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,38 +43,54 @@ Global
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.ActiveCfg = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.Build.0 = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x86.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.Build.0 = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.Build.0 = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.Build.0 = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.Build.0 = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.ActiveCfg = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.Build.0 = Debug|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.ActiveCfg = Debug|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.Build.0 = Debug|x86
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.Build.0 = Debug|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Any CPU.ActiveCfg = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.Build.0 = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Any CPU.Build.0 = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Mixed Platforms.ActiveCfg = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Mixed Platforms.Build.0 = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.ActiveCfg = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x64.ActiveCfg = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.Build.0 = Release|x64
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x64.Build.0 = Release|x64
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x86.ActiveCfg = Release|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86
+		{E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x86.Build.0 = Release|x86
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x64.Build.0 = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x86.Build.0 = Debug|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Any CPU.Build.0 = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.ActiveCfg = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.Build.0 = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.ActiveCfg = Release|Any CPU
 		{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.Build.0 = Release|Any CPU
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
@@ -85,6 +107,38 @@ Global
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.Build.0 = Release|x64
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.Build.0 = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.Build.0 = Debug|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.Build.0 = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.ActiveCfg = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.Build.0 = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -110,6 +110,16 @@ Namespace My.Resources
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
        Friend ReadOnly Property pdf_gray() As System.Drawing.Bitmap
            Get
                Dim obj As Object = ResourceManager.GetObject("pdf_gray", resourceCulture)
                Return CType(obj,System.Drawing.Bitmap)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -118,25 +118,28 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Aviso1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pdf_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\pdf_gray.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
@@ -14,7 +14,7 @@ Option Explicit On
 <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),  _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
 Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
 Partial Friend NotInheritable Class MySettings
    Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Project/app.manifest
+++ b/Project/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/VERAGAddIn/Resources/pdf_gray.png
+++ b/VERAGAddIn/Resources/pdf_gray.png
--- a/VERAGAddIn/ThisAddIn.Designer.vb
+++ b/VERAGAddIn/ThisAddIn.Designer.vb
@@ -21,7 +21,7 @@ Partial Public NotInheritable Class ThisAddIn
    Friend WithEvents CustomTaskPanes As Microsoft.Office.Tools.CustomTaskPaneCollection
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0")>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0")>  _
    Friend WithEvents Application As Microsoft.Office.Interop.Outlook.Application
    '''
@@ -34,7 +34,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Protected Overrides Sub Initialize()
        MyBase.Initialize
@@ -49,7 +49,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Protected Overrides Sub FinishInitialization()
        Me.OnStartup
@@ -57,7 +57,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Protected Overrides Sub InitializeDataBindings()
        Me.BeginInitialization
@@ -67,7 +67,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub InitializeCachedData()
        If (Me.DataHost Is Nothing) Then
@@ -80,14 +80,14 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub InitializeData()
    End Sub
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub BindToData()
    End Sub
@@ -115,7 +115,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub BeginInitialization()
        Me.BeginInit
@@ -124,7 +124,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub EndInitialization()
        Me.CustomTaskPanes.EndInit
@@ -133,7 +133,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub InitializeControls()
        Me.CustomTaskPanes = Globals.Factory.CreateCustomTaskPaneCollection(Nothing, Nothing, "CustomTaskPanes", "CustomTaskPanes", Me)
@@ -141,7 +141,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Private Sub InitializeComponents()
    End Sub
@@ -155,7 +155,7 @@ Partial Public NotInheritable Class ThisAddIn
    '''
    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Never)>  _
    Protected Overrides Sub OnShutdown()
        Me.CustomTaskPanes.Dispose
@@ -165,7 +165,7 @@ End Class
 '''
 <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0")>  _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0")>  _
 Partial Friend NotInheritable Class Globals
    '''
@@ -228,7 +228,7 @@ End Class
 '''
 <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "15.0.0.0")>  _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Tools.Office.ProgrammingModel.dll", "17.0.0.0")>  _
 Partial Friend NotInheritable Class ThisRibbonCollection
    Inherits Microsoft.Office.Tools.Ribbon.RibbonCollectionBase
--- a/VERAGAddIn/ThisAddIn.vb
+++ b/VERAGAddIn/ThisAddIn.vb
@@ -5,6 +5,7 @@ Imports System.Reflection
 Imports System.Windows.Forms
 Imports Microsoft.Office.Core
 Imports System.Dynamic
 Imports SDL
 'Option Private Module
 'Imports Microsoft.Office.Core
@@ -27,6 +28,7 @@ Public Class ThisAddIn
        inspectors = Me.Application.Inspectors
        currentExplorer = Me.Application.ActiveExplorer
        SharedExplorer = currentExplorer
        checkConnection()
        AddHandler VERAGRibbon.bla, Sub()
                                        '  MsgBox("JOAS")
@@ -173,6 +175,27 @@ Public Class ThisAddIn
        ' wdDoc.Close(False)
        ' wdApp.Quit()
    End Sub
    Private Sub checkConnection()
        Dim con = New VERAG_PROG_ALLGEMEIN.SQL
        For Each COMAddIn As COMAddIn In Me.Application.COMAddIns
            If COMAddIn.ProgId.Contains("VERAGAddIn") Then
                If con.getValueTxtBySql("SELECT 1", "AVISO") <> 1 Then
                    MsgBox("ACHTUNG: Server nicht erreichbar!" & vbCrLf & "VERAG ADD In wird beendet")
                    COMAddIn.Connect = False
                End If
            End If
        Next
    End Sub
 End Class
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -36,7 +36,7 @@
    <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
    <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
    <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.90</ApplicationVersion>
+    <ApplicationVersion>1.0.1.108</ApplicationVersion>
    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    <UpdateEnabled>true</UpdateEnabled>
    <UpdateInterval>0</UpdateInterval>
@@ -163,11 +163,15 @@
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="VERAG_PROG_ALLGEMEIN">
      <HintPath>..\..\SDL\SDL\SDL\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -223,6 +227,12 @@
    <Compile Include="frmAvisoAnfügen.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="frmAvisoFormularAnfügen.Designer.vb">
      <DependentUpon>frmAvisoFormularAnfügen.vb</DependentUpon>
    </Compile>
    <Compile Include="frmAvisoFormularAnfügen.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="rbnMailItem.Designer.vb">
      <DependentUpon>rbnMailItem.vb</DependentUpon>
    </Compile>
@@ -241,6 +251,9 @@
    <EmbeddedResource Include="frmAvisoAnfügen.resx">
      <DependentUpon>frmAvisoAnfügen.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmAvisoFormularAnfügen.resx">
      <DependentUpon>frmAvisoFormularAnfügen.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="rbnMailItem.resx">
      <DependentUpon>rbnMailItem.vb</DependentUpon>
    </EmbeddedResource>
@@ -249,6 +262,7 @@
    </EmbeddedResource>
    <None Include="AL20210908.pfx" />
    <None Include="app.config" />
    <None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
    <None Include="Resources\GS\gsdll32.lib">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
@@ -280,18 +294,10 @@
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
    <None Include="VERAGAddIn_1_TemporaryKey.pfx" />
    <None Include="VeragAddIn_tempKey.pfx" />
    <None Include="VERAGAddIn_TemporaryKey.pfx" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Microsoft.Vbe.Interop.Forms">
      <Guid>{AC2DE821-36A2-11CF-8053-00AA006009FA}</Guid>
      <VersionMajor>2</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </COMReference>
    <COMReference Include="stdole1">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>
@@ -311,21 +317,6 @@
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </COMReference>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\AVISO\Aviso\Aviso\Aviso.vbproj">
      <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
      <Name>Aviso</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
      <Name>Gemeinsames</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>
    <None Include="Resources\Aviso.png" />
  </ItemGroup>
@@ -336,6 +327,7 @@
    <None Include="Resources\pdf.png" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\pdf_gray.png" />
    <None Include="Resources\665209_email_512x512.png" />
    <None Include="Resources\email_big1.png" />
    <Content Include="Resources\GS\gsdll32.dll">
@@ -350,6 +342,24 @@
    <None Include="Resources\wheel.png" />
    <None Include="Resources\pdfprint.png" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
      <Name>TELOTEC_Worker_lib</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\Aviso\AVISO\Aviso\Aviso.vbproj">
      <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
      <Name>Aviso</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
      <Name>Gemeinsames</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\SDL\SDL\SDL\SDL.vbproj">
      <Project>{289BCD77-BC00-4BA1-95ED-A79176D99525}</Project>
      <Name>SDL</Name>
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -370,7 +380,7 @@
    <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint>
  </PropertyGroup>
  <PropertyGroup>
    <SignAssembly>false</SignAssembly>
@@ -381,6 +391,9 @@
  <PropertyGroup>
    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <PropertyGroup>
    <AssemblyOriginatorKeyFile>VeragAddIn_tempKey.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <!-- Include the build rules for a Visual Basic project. -->
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <!-- Include additional build rules for an Office application add-in. -->
--- a/VERAGAddIn/app.config
+++ b/VERAGAddIn/app.config
@@ -12,7 +12,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
@@ -42,6 +42,10 @@
        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -28,8 +28,6 @@ Partial Class frmAvisoAnfuegen
        Me.Label14 = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.bttnSaveMail = New System.Windows.Forms.Button()
        Me.btnSaveAttachments = New System.Windows.Forms.Button()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.lblErr_Bezeichnung = New System.Windows.Forms.Label()
        Me.lblErr_Aviso = New System.Windows.Forms.Label()
@@ -47,6 +45,9 @@ Partial Class frmAvisoAnfuegen
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtLKWNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.bttnSaveMail = New System.Windows.Forms.Button()
        Me.btnSaveAttachments = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvAviso, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -93,34 +94,6 @@ Partial Class frmAvisoAnfuegen
        Me.Button1.Text = "Suche"
        Me.Button1.UseVisualStyleBackColor = True
        '
        'bttnSaveMail
        '
        Me.bttnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.bttnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.bttnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
        Me.bttnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.bttnSaveMail.Location = New System.Drawing.Point(451, 590)
        Me.bttnSaveMail.Name = "bttnSaveMail"
        Me.bttnSaveMail.Size = New System.Drawing.Size(179, 53)
        Me.bttnSaveMail.TabIndex = 11
        Me.bttnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
        Me.bttnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.bttnSaveMail.UseVisualStyleBackColor = True
        '
        'btnSaveAttachments
        '
        Me.btnSaveAttachments.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnSaveAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSaveAttachments.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
        Me.btnSaveAttachments.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnSaveAttachments.Location = New System.Drawing.Point(239, 591)
        Me.btnSaveAttachments.Name = "btnSaveAttachments"
        Me.btnSaveAttachments.Size = New System.Drawing.Size(206, 69)
        Me.btnSaveAttachments.TabIndex = 9
        Me.btnSaveAttachments.Text = "Nur Anhänge speichern"
        Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnSaveAttachments.UseVisualStyleBackColor = True
        '
        'Label2
        '
        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -252,10 +225,12 @@ Partial Class frmAvisoAnfuegen
        Me.txtSrchDat._DateTimeOnly = False
        Me.txtSrchDat._numbersOnly = False
        Me.txtSrchDat._numbersOnlyKommastellen = ""
        Me.txtSrchDat._numbersOnlyTrennzeichen = True
        Me.txtSrchDat._Prozent = False
        Me.txtSrchDat._ShortDateNew = True
        Me.txtSrchDat._ShortDateOnly = False
        Me.txtSrchDat._TimeOnly = False
        Me.txtSrchDat._TimeOnly_Seconds = False
        Me.txtSrchDat._value = ""
        Me.txtSrchDat._Waehrung = False
        Me.txtSrchDat._WaehrungZeichen = True
@@ -295,10 +270,12 @@ Partial Class frmAvisoAnfuegen
        Me.txtBezeichnung._DateTimeOnly = False
        Me.txtBezeichnung._numbersOnly = False
        Me.txtBezeichnung._numbersOnlyKommastellen = ""
        Me.txtBezeichnung._numbersOnlyTrennzeichen = True
        Me.txtBezeichnung._Prozent = False
        Me.txtBezeichnung._ShortDateNew = False
        Me.txtBezeichnung._ShortDateOnly = False
        Me.txtBezeichnung._TimeOnly = False
        Me.txtBezeichnung._TimeOnly_Seconds = False
        Me.txtBezeichnung._value = ""
        Me.txtBezeichnung._Waehrung = False
        Me.txtBezeichnung._WaehrungZeichen = True
@@ -318,10 +295,12 @@ Partial Class frmAvisoAnfuegen
        Me.txtAbfertigungsnummer._DateTimeOnly = False
        Me.txtAbfertigungsnummer._numbersOnly = False
        Me.txtAbfertigungsnummer._numbersOnlyKommastellen = ""
        Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True
        Me.txtAbfertigungsnummer._Prozent = False
        Me.txtAbfertigungsnummer._ShortDateNew = False
        Me.txtAbfertigungsnummer._ShortDateOnly = False
        Me.txtAbfertigungsnummer._TimeOnly = False
        Me.txtAbfertigungsnummer._TimeOnly_Seconds = False
        Me.txtAbfertigungsnummer._value = Nothing
        Me.txtAbfertigungsnummer._Waehrung = False
        Me.txtAbfertigungsnummer._WaehrungZeichen = True
@@ -352,10 +331,12 @@ Partial Class frmAvisoAnfuegen
        Me.txtLKWNr._DateTimeOnly = False
        Me.txtLKWNr._numbersOnly = False
        Me.txtLKWNr._numbersOnlyKommastellen = ""
        Me.txtLKWNr._numbersOnlyTrennzeichen = True
        Me.txtLKWNr._Prozent = False
        Me.txtLKWNr._ShortDateNew = False
        Me.txtLKWNr._ShortDateOnly = False
        Me.txtLKWNr._TimeOnly = False
        Me.txtLKWNr._TimeOnly_Seconds = False
        Me.txtLKWNr._value = ""
        Me.txtLKWNr._Waehrung = False
        Me.txtLKWNr._WaehrungZeichen = True
@@ -389,12 +370,52 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAviso.Size = New System.Drawing.Size(615, 369)
        Me.dgvAviso.TabIndex = 6
        '
        'bttnSaveMail
        '
        Me.bttnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.bttnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.bttnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
        Me.bttnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.bttnSaveMail.Location = New System.Drawing.Point(451, 590)
        Me.bttnSaveMail.Name = "bttnSaveMail"
        Me.bttnSaveMail.Size = New System.Drawing.Size(179, 53)
        Me.bttnSaveMail.TabIndex = 11
        Me.bttnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
        Me.bttnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.bttnSaveMail.UseVisualStyleBackColor = True
        '
        'btnSaveAttachments
        '
        Me.btnSaveAttachments.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnSaveAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSaveAttachments.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
        Me.btnSaveAttachments.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnSaveAttachments.Location = New System.Drawing.Point(239, 591)
        Me.btnSaveAttachments.Name = "btnSaveAttachments"
        Me.btnSaveAttachments.Size = New System.Drawing.Size(206, 69)
        Me.btnSaveAttachments.TabIndex = 9
        Me.btnSaveAttachments.Text = "Nur Anhänge speichern"
        Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnSaveAttachments.UseVisualStyleBackColor = True
        '
        'Label4
        '
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label4.ForeColor = System.Drawing.Color.Red
        Me.Label4.Location = New System.Drawing.Point(530, 4)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(100, 20)
        Me.Label4.TabIndex = 39
        Me.Label4.Text = "Testsystem"
        '
        'frmAvisoAnfuegen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(642, 797)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.dgvAnhaenge)
        Me.Controls.Add(Me.cboArt)
        Me.Controls.Add(Me.Label3)
@@ -453,4 +474,5 @@ Partial Class frmAvisoAnfuegen
    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents cbx As Windows.Forms.CheckBox
    Friend WithEvents CheckBox1 As Windows.Forms.CheckBox
    Friend WithEvents Label4 As Windows.Forms.Label
 End Class
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -1,4 +1,5 @@
-Imports System.Windows.Forms
+Imports System.Diagnostics
 Imports System.Windows.Forms
 Public Class frmAvisoAnfuegen
@@ -6,20 +7,23 @@ Public Class frmAvisoAnfuegen
    Public SendungsId = -1
    Public Bezeichnung = ""
    Public PDF_MAIL = ""
    Public Art = ""
    Public ATT As List(Of String)
-    Sub New(Bezeichnung)
+    Sub New(Bezeichnung, Art)
        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
        Me.Bezeichnung = Bezeichnung
        Me.Art = Art
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
    End Sub
    Private Sub frmAvisoAnfügen_Load(sender As Object, e As EventArgs) Handles Me.Load
        txtBezeichnung.Text = Bezeichnung
        txtSrchDat.Text = Now.AddMonths(-1).ToShortDateString
        Label4.Visible = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
        cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A'  ORDER BY FilialenNr ", True, "FMZOLL", True)
        txtLKWNr.Focus()
@@ -40,7 +44,9 @@ Public Class frmAvisoAnfuegen
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Bordro", "Bordro"))
        If Art <> "" Then cboArt.changeItem(Art)
        initAttachment()
    End Sub
@@ -231,4 +237,21 @@ Public Class frmAvisoAnfuegen
            btnSaveAttachments.Enabled = False
        End If
    End Sub
    Private Sub dgvAnhaenge_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellContentDoubleClick, dgvAnhaenge.CellDoubleClick
        Try
            If dgvAnhaenge.SelectedRows.Count > 0 Then
                If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
                    Dim strTmpPath As String = System.IO.Path.GetTempPath()
                    Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
                End If
            End If
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub
 End Class
--- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
@@ -0,0 +1,294 @@
 Imports VERAG_PROG_ALLGEMEIN
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmAvisoFormularAnfuegen
    Inherits System.Windows.Forms.Form
    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
                components.Dispose()
            End If
        Finally
            MyBase.Dispose(disposing)
        End Try
    End Sub
    'Wird vom Windows Form-Designer benötigt.
    Private components As System.ComponentModel.IContainer
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAvisoFormularAnfuegen))
        Me.lblVMId = New System.Windows.Forms.Label()
        Me.cbVMTypen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.panelKunden = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.Label1 = New System.Windows.Forms.Label()
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.lblKunden = New System.Windows.Forms.Label()
        Me.KdSearchBox = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.pnlDetails = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.pnlBottom = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.pbAnhaenge = New System.Windows.Forms.PictureBox()
        Me.lblMultiAttachements = New System.Windows.Forms.Label()
        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.btnOK = New System.Windows.Forms.Button()
        Me.btnCancel = New System.Windows.Forms.Button()
        Me.panelKunden.SuspendLayout()
        Me.pnlBottom.SuspendLayout()
        CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.MyPanel1.SuspendLayout()
        Me.SuspendLayout()
        '
        'lblVMId
        '
        Me.lblVMId.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.lblVMId.AutoSize = True
        Me.lblVMId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblVMId.Location = New System.Drawing.Point(12, 53)
        Me.lblVMId.Name = "lblVMId"
        Me.lblVMId.Size = New System.Drawing.Size(69, 13)
        Me.lblVMId.TabIndex = 36
        Me.lblVMId.Text = "Vollmacht-Art"
        '
        'cbVMTypen
        '
        Me.cbVMTypen._allowedValuesFreiText = Nothing
        Me.cbVMTypen._allowFreiText = False
        Me.cbVMTypen._value = ""
        Me.cbVMTypen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbVMTypen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cbVMTypen.FormattingEnabled = True
        Me.cbVMTypen.Location = New System.Drawing.Point(12, 73)
        Me.cbVMTypen.Name = "cbVMTypen"
        Me.cbVMTypen.Size = New System.Drawing.Size(492, 24)
        Me.cbVMTypen.TabIndex = 35
        '
        'panelKunden
        '
        Me.panelKunden.Controls.Add(Me.lblVMId)
        Me.panelKunden.Controls.Add(Me.cbVMTypen)
        Me.panelKunden.Controls.Add(Me.Label1)
        Me.panelKunden.Controls.Add(Me.lblWarning)
        Me.panelKunden.Controls.Add(Me.lblKunden)
        Me.panelKunden.Controls.Add(Me.KdSearchBox)
        Me.panelKunden.Dock = System.Windows.Forms.DockStyle.Top
        Me.panelKunden.Location = New System.Drawing.Point(0, 0)
        Me.panelKunden.Name = "panelKunden"
        Me.panelKunden.Size = New System.Drawing.Size(519, 105)
        Me.panelKunden.TabIndex = 37
        '
        'Label1
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label1.ForeColor = System.Drawing.Color.Red
        Me.Label1.Location = New System.Drawing.Point(407, 4)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(100, 20)
        Me.Label1.TabIndex = 38
        Me.Label1.Text = "Testsystem"
        '
        'lblWarning
        '
        Me.lblWarning.AutoSize = True
        Me.lblWarning.ForeColor = System.Drawing.Color.Red
        Me.lblWarning.Location = New System.Drawing.Point(80, 9)
        Me.lblWarning.Name = "lblWarning"
        Me.lblWarning.Size = New System.Drawing.Size(0, 13)
        Me.lblWarning.TabIndex = 37
        '
        'lblKunden
        '
        Me.lblKunden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.lblKunden.AutoSize = True
        Me.lblKunden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblKunden.Location = New System.Drawing.Point(12, 4)
        Me.lblKunden.Name = "lblKunden"
        Me.lblKunden.Size = New System.Drawing.Size(44, 13)
        Me.lblKunden.TabIndex = 2
        Me.lblKunden.Text = "Kunden"
        '
        'KdSearchBox
        '
        Me.KdSearchBox._AlleFirmenCLUSTER = False
        Me.KdSearchBox._AllowSetValue = True
        Me.KdSearchBox._autoSizeGross = False
        Me.KdSearchBox._display_Name1 = False
        Me.KdSearchBox._displayAVISO_Email = False
        Me.KdSearchBox._displayFullName = False
        Me.KdSearchBox._displayWoelflKd = False
        Me.KdSearchBox._hideIfListEmpty = True
        Me.KdSearchBox._loadKdData = True
        Me.KdSearchBox._searchName1 = True
        Me.KdSearchBox._UseFIRMA = ""
        Me.KdSearchBox._ValueKdAndName = True
        Me.KdSearchBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.KdSearchBox.dgvpos = "LEFT"
        Me.KdSearchBox.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.KdSearchBox.HideSelection = False
        Me.KdSearchBox.KdName = ""
        Me.KdSearchBox.KdNr = "-1"
        Me.KdSearchBox.kdNrField = Nothing
        Me.KdSearchBox.KdNrNullInt = Nothing
        Me.KdSearchBox.Location = New System.Drawing.Point(12, 27)
        Me.KdSearchBox.Name = "KdSearchBox"
        Me.KdSearchBox.nurAktive = True
        Me.KdSearchBox.searchActive = True
        Me.KdSearchBox.Size = New System.Drawing.Size(495, 23)
        Me.KdSearchBox.TabIndex = 4
        Me.KdSearchBox.TIMER_SEARCH = True
        Me.KdSearchBox.usrcntl = Nothing
        '
        'pnlDetails
        '
        Me.pnlDetails.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
        Me.pnlDetails.Location = New System.Drawing.Point(0, 103)
        Me.pnlDetails.Name = "pnlDetails"
        Me.pnlDetails.Size = New System.Drawing.Size(518, 426)
        Me.pnlDetails.TabIndex = 38
        '
        'pnlBottom
        '
        Me.pnlBottom.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.pnlBottom.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
        Me.pnlBottom.Controls.Add(Me.pbAnhaenge)
        Me.pnlBottom.Controls.Add(Me.lblMultiAttachements)
        Me.pnlBottom.Controls.Add(Me.dgvAnhaenge)
        Me.pnlBottom.Location = New System.Drawing.Point(0, 530)
        Me.pnlBottom.Name = "pnlBottom"
        Me.pnlBottom.Size = New System.Drawing.Size(519, 158)
        Me.pnlBottom.TabIndex = 39
        '
        'pbAnhaenge
        '
        Me.pbAnhaenge.Anchor = System.Windows.Forms.AnchorStyles.Bottom
        Me.pbAnhaenge.Enabled = False
        Me.pbAnhaenge.Image = Global.VERAGAddIn.My.Resources.Resources.pdf_gray
        Me.pbAnhaenge.Location = New System.Drawing.Point(12, 106)
        Me.pbAnhaenge.Name = "pbAnhaenge"
        Me.pbAnhaenge.Size = New System.Drawing.Size(63, 52)
        Me.pbAnhaenge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.pbAnhaenge.TabIndex = 32
        Me.pbAnhaenge.TabStop = False
        '
        'lblMultiAttachements
        '
        Me.lblMultiAttachements.AutoSize = True
        Me.lblMultiAttachements.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblMultiAttachements.ForeColor = System.Drawing.Color.Red
        Me.lblMultiAttachements.Location = New System.Drawing.Point(15, 2)
        Me.lblMultiAttachements.Name = "lblMultiAttachements"
        Me.lblMultiAttachements.Size = New System.Drawing.Size(342, 13)
        Me.lblMultiAttachements.TabIndex = 38
        Me.lblMultiAttachements.Text = "Anhang markieren, der explizit als PDF-Anhang gespeichert werden soll"
        '
        'dgvAnhaenge
        '
        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
        Me.dgvAnhaenge.AllowUserToAddRows = False
        Me.dgvAnhaenge.AllowUserToDeleteRows = False
        Me.dgvAnhaenge.AllowUserToResizeColumns = False
        Me.dgvAnhaenge.AllowUserToResizeRows = False
        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvAnhaenge.ColumnHeadersVisible = False
        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
        Me.dgvAnhaenge.Location = New System.Drawing.Point(12, 19)
        Me.dgvAnhaenge.Name = "dgvAnhaenge"
        Me.dgvAnhaenge.ReadOnly = True
        Me.dgvAnhaenge.RowHeadersVisible = False
        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvAnhaenge.Size = New System.Drawing.Size(492, 30)
        Me.dgvAnhaenge.TabIndex = 39
        Me.dgvAnhaenge.Visible = False
        '
        'columnName
        '
        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
        Me.columnName.HeaderText = "Name"
        Me.columnName.Name = "columnName"
        Me.columnName.ReadOnly = True
        '
        'MyPanel1
        '
        Me.MyPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.MyPanel1.Controls.Add(Me.btnOK)
        Me.MyPanel1.Controls.Add(Me.btnCancel)
        Me.MyPanel1.Location = New System.Drawing.Point(0, 689)
        Me.MyPanel1.Name = "MyPanel1"
        Me.MyPanel1.Size = New System.Drawing.Size(518, 50)
        Me.MyPanel1.TabIndex = 40
        '
        'btnOK
        '
        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
        Me.btnOK.Location = New System.Drawing.Point(409, 7)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(105, 40)
        Me.btnOK.TabIndex = 3
        Me.btnOK.Text = "Ok"
        Me.btnOK.UseVisualStyleBackColor = True
        '
        'btnCancel
        '
        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
        Me.btnCancel.Location = New System.Drawing.Point(3, 9)
        Me.btnCancel.Name = "btnCancel"
        Me.btnCancel.Size = New System.Drawing.Size(116, 40)
        Me.btnCancel.TabIndex = 31
        Me.btnCancel.Text = "Abbrechen"
        Me.btnCancel.UseVisualStyleBackColor = True
        '
        'frmAvisoFormularAnfuegen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(519, 741)
        Me.Controls.Add(Me.MyPanel1)
        Me.Controls.Add(Me.pnlBottom)
        Me.Controls.Add(Me.pnlDetails)
        Me.Controls.Add(Me.panelKunden)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmAvisoFormularAnfuegen"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Vollmacht anfügen"
        Me.panelKunden.ResumeLayout(False)
        Me.panelKunden.PerformLayout()
        Me.pnlBottom.ResumeLayout(False)
        Me.pnlBottom.PerformLayout()
        CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
        Me.MyPanel1.ResumeLayout(False)
        Me.ResumeLayout(False)
    End Sub
    Friend WithEvents lblKunden As Windows.Forms.Label
    Friend WithEvents KdSearchBox As VERAG_PROG_ALLGEMEIN.KdSearchBox
    Friend WithEvents cbVMTypen As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents panelKunden As VERAG_PROG_ALLGEMEIN.MyPanel
    Friend WithEvents lblVMId As Windows.Forms.Label
    Friend WithEvents lblWarning As Windows.Forms.Label
    Friend WithEvents Label1 As Windows.Forms.Label
    Friend WithEvents pnlDetails As MyPanel
    Friend WithEvents pnlBottom As MyPanel
    Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox
    Friend WithEvents lblMultiAttachements As Windows.Forms.Label
    Friend WithEvents dgvAnhaenge As MyDatagridview
    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents MyPanel1 As MyPanel
    Friend WithEvents btnOK As Windows.Forms.Button
    Friend WithEvents btnCancel As Windows.Forms.Button
 End Class
--- a/VERAGAddIn/frmAvisoFormularAnfügen.resx
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.resx
--- a/VERAGAddIn/frmAvisoFormularAnfügen.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb
@@ -0,0 +1,485 @@
 Imports System.Collections
 Imports System.Data
 Imports System.Diagnostics
 Imports System.Diagnostics.Tracing
 Imports System.Drawing
 Imports System.Net
 Imports System.Windows.Forms
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Button
 Imports Microsoft.Office.Tools.Ribbon
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
 Public Class frmAvisoFormularAnfuegen
    Public KdNr As Integer = -1
    Public AvisoId As Integer = -1
    Dim vollmachtartId As Integer = -1
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
    Public SendungsId = -1
    Public Bezeichnung = ""
    Public PDF_MAIL = ""
    Public enableOverwritting As Boolean = False
    Public ATTTemp As List(Of String)
    Public ATT As List(Of String)
    Public hasAnhaenge As Boolean = False
    Public button As RibbonButton
    Dim UsrCntlKundenZollVollmachten1 As usrCntlKundenZollVollmachten
    Dim UsrCntlVertraege1 As usrcntlVertraege
    Dim UsrCntlGestellungsgarantien1 As usrcntlGestellungsgarantien
    Dim frmDefaultSize As Size = New Size(535, 750)
    Dim dgvAnhaengeSize As Size = New Size(495, 30)
    Dim avisoIdSet As Boolean = False
    Sub New()
        InitializeComponent()
    End Sub
    Sub New(Bezeichnung, sender)
        InitializeComponent()
        Me.Bezeichnung = Bezeichnung
        button = sender
        initForm()
    End Sub
    Sub initForm()
        Me.pnlDetails.AutoSizeMode = AutoSizeMode.GrowAndShrink
        Me.pnlDetails.AutoSize = True
        Select Case button.Name
            Case "btnVollmachten"
                UsrCntlKundenZollVollmachten1 = New usrCntlKundenZollVollmachten()
                UsrCntlKundenZollVollmachten1.AutoSize = False
                Me.pnlDetails.Controls.Add(UsrCntlKundenZollVollmachten1)
                Me.Text = "Vollmachten einfügen"
            Case "btnVertraege"
                UsrCntlVertraege1 = New usrcntlVertraege()
                AddHandler UsrCntlVertraege1.clickOK, AddressOf btnOK_Click
                Me.pnlDetails.Controls.Add(UsrCntlVertraege1)
                Me.Text = "Verträge einfügen"
            Case "btnGestellungsgarantien"
                UsrCntlGestellungsgarantien1 = New usrcntlGestellungsgarantien()
                AddHandler UsrCntlGestellungsgarantien1.clickOK, AddressOf btnOK_Click
                Me.Text = "Gestellungsgarantien einfügen"
                Me.pnlDetails.Controls.Add(UsrCntlGestellungsgarantien1)
            Case Else
                MsgBox("Funktion nicht unterstützt!")
                Me.DialogResult = DialogResult.Cancel
                Me.Close()
        End Select
    End Sub
    Private Sub frmAvisoFormularAnfuegen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        initAttachment()
        KdSearchBox.initKdBox(Me)
        If hasAnhaenge Then pbAnhaenge.Image = My.Resources.pdf
    End Sub
    Private Sub KdSearchBox_TextChanged(sender As Object, e As EventArgs) Handles KdSearchBox.TextChanged
        If KdSearchBox.KdNr_value > 0 AndAlso KdSearchBox.KdNr IsNot Nothing Then
            KdNr = KdSearchBox.KdNr_value
            Dim AD = KdSearchBox.KdData_ADRESSEN
            Dim KD = KdSearchBox.KdData_KUNDE
            init()
        End If
    End Sub
    Sub init()
        If KdNr > 0 Then
            Select Case button.Name
                Case "btnVollmachten"
                    initVollmachtarten(KdNr)
                Case "btnVertraege"
                    UsrCntlVertraege1.initDGVVertraege(KdNr)
                Case "btnGestellungsgarantien"
                    UsrCntlGestellungsgarantien1.initDGVGestGarantie(KdNr)
            End Select
            Show()
        End If
    End Sub
    Sub initVollmachtarten(kdNr As Integer)
        cbVMTypen.fillWithSQL("SELECT DISTINCT(art.kdvma_Id), art.kdvma_Bezeichnung FROM [tblKundenVollmachtenArt] as art LEFT JOIN (select * from [tblKundenVollmachten] where [kdvm_KundenNr]='" & kdNr & "' ) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible=1 AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "FMZOLL", True)
    End Sub
    Sub initUsrCntrlKundenvollmachten(vollmachtartId)
        UsrCntlKundenZollVollmachten1.init(KdNr, vollmachtartId)
    End Sub
    Private Sub KdSearchBox_PropertyChanged(sender As Object, e As System.ComponentModel.PropertyChangedEventArgs) Handles KdSearchBox.PropertyChanged
        If KdSearchBox.KdNr_value > 0 AndAlso KdSearchBox.KdData_KUNDE IsNot Nothing AndAlso KdSearchBox.KdData_ADRESSEN IsNot Nothing Then
            KdNr = KdSearchBox.KdNr
            Dim AD = KdSearchBox.KdData_ADRESSEN
            Dim KD = KdSearchBox.KdData_KUNDE
            init()
        End If
    End Sub
    Private Sub cbVMTypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbVMTypen.SelectedValueChanged
        If cbVMTypen._value <> "" Then
            vollmachtartId = cbVMTypen._value
            initUsrCntrlKundenvollmachten(vollmachtartId)
        End If
    End Sub
    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
        If Not checkMandatoryFields() Then
            DialogResult = DialogResult.None
            Exit Sub
        End If
        If avisoIdSet And Not button.Name = "btnVollmachten" Then
            DialogResult = DialogResult.OK
            Exit Sub
        End If
        Select Case button.Name
            Case "btnVertraege"
                UsrCntlVertraege1.initDGVVertraege(KdNr)
                If UsrCntlVertraege1.dgvVertraege.SelectedRows.Count < 1 Then
                    MsgBox("Bitte einen Vertrag markieren")
                End If
            Case "btnGestellungsgarantien"
                UsrCntlGestellungsgarantien1.initDGVGestGarantie(KdNr)
                If UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count < 1 Then
                    MsgBox("Bitte eine Gestellung markieren")
                End If
        End Select
        If Not hasAnhaenge Then
            If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email als Anhang gespeichert werden?", vbYesNoCancel) Then
                Close()
                DialogResult = DialogResult.None
                Exit Sub
            End If
        End If
        If ATT IsNot Nothing Then
            If ATT.Count > 1 Then
                ATT = ATTTemp
                If dgvAnhaenge.SelectedCells.Count = 0 Then
                    MsgBox("Bitte Anhang markieren!")
                    DialogResult = DialogResult.None
                    Exit Sub
                Else
                    RemoveNotUsedAttachmentOnList(ATT, dgvAnhaenge.SelectedCells.Item(0).RowIndex)
                End If
            End If
        End If
        Select Case button.Name
            Case "btnVollmachten"
                UsrCntlKundenZollVollmachten1.btnNeu_Click(sender, e)
                AvisoId = UsrCntlKundenZollVollmachten1.vmId
                Close()
            Case "btnVertraege"
                If sender.Text = "Hinzufügen" Then
                    setAvisoIdForVertrage()
                ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then
                    For Each row As DataGridViewRow In UsrCntlVertraege1.dgvVertraege.SelectedRows
                        If row.Cells("kv_datenarchivId").Value Is DBNull.Value Or row.Cells("kv_datenarchivId").Value Is Nothing Then
                            setAvisoIdForVertrage()
                        Else
                            Dim response = MsgBox("Der markierte Vertrag besitzt bereit einen Anhang!" & vbCrLf & "Soll der Anhang ersetzt werden?", vbYesNoCancel)
                            If response = vbYes Then
                                setAvisoIdForVertrage()
                                enableOverwritting = True
                            ElseIf response = vbCancel Then
                                DialogResult = DialogResult.None
                                Exit Sub
                            Else
                                Close()
                            End If
                        End If
                    Next
                    Me.DialogResult = DialogResult.OK
                    Close()
                Else
                    Close()
                End If
                Close()
            Case "btnGestellungsgarantien"
                If sender.Text = "Hinzufügen" Then
                    setAvisoIdForGestellungen()
                    Me.DialogResult = DialogResult.OK
                ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then
                    For Each row As DataGridViewRow In UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows
                        If row.Cells("kv_datenarchivId").Value Is DBNull.Value Or row.Cells("kv_datenarchivId").Value Is Nothing Then
                            setAvisoIdForGestellungen()
                        Else
                            Dim response = MsgBox("Die markierte Gestellungsgarantie besitzt bereit einen Anhang!" & vbCrLf & "Soll der Anhang ersetzt werden?", vbYesNoCancel)
                            If response = vbYes Then
                                setAvisoIdForVertrage()
                                enableOverwritting = True
                            ElseIf response = vbCancel Then
                                DialogResult = DialogResult.None
                                Exit Sub
                            Else
                                Close()
                            End If
                        End If
                    Next
                    Me.DialogResult = DialogResult.OK
                    Close()
                Else
                    Close()
                End If
        End Select
    End Sub
    Private Sub setAvisoIdForGestellungen()
        If UsrCntlGestellungsgarantien1.Gid > 0 Then
            AvisoId = UsrCntlGestellungsgarantien1.Gid
        ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then
            AvisoId = UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value
        End If
    End Sub
    Private Sub setAvisoIdForVertrage()
        If UsrCntlVertraege1.Vid > 0 Then
            AvisoId = UsrCntlVertraege1.Vid
        ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then
            AvisoId = UsrCntlVertraege1.dgvVertraege.SelectedRows(0).Cells("kv_id").Value
        End If
        If AvisoId > 0 Then
            avisoIdSet = True
        End If
    End Sub
    Private Sub RemoveNotUsedAttachmentOnList(ByRef a As List(Of String), tmpIndex As Integer)
        If (a IsNot Nothing) AndAlso (a.Count > 1) Then
            Dim list As New List(Of String)
            Dim selectedItem As Object = a.Item(tmpIndex)
            list.Add(selectedItem)
            a = list
        End If
    End Sub
    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
        Close()
    End Sub
    Sub initAttachment()
        dgvAnhaenge.Rows.Clear()
        If ATT Is Nothing Then
            Exit Sub
        End If
        If ATT.Count = 0 Then
            hasAnhaenge = False
            PDF_MAIL = "ONLYMAIL_DATENSERVER"
        Else
            hasAnhaenge = True
            If button.Name = "btnVollmachten" Then
                PDF_MAIL = "PDF_DATENSERVER"
            Else
                PDF_MAIL = "ONLYPDF_DATENSERVER"
            End If
            For Each a In ATT
                Dim display = a
                If a.Contains("\") Then
                    Dim sp = a.Split("\")
                    display = sp(sp.Count - 1)
                End If
                dgvAnhaenge.Rows.Add({display})
            Next
            ATTTemp = ATT
        End If
        Dim addHeightfrm = 180
        Dim addHeightdgv = 50
        If dgvAnhaenge.Rows.Count > 1 Then
            dgvAnhaenge.Visible = True
            lblMultiAttachements.Visible = True
            Select Case button.Name
                Case "btnVollmachten"
                    Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height + addHeightdgv)
                    pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height + addHeightdgv)
                    dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv)
                Case "btnVertraege"
                    Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm)
                    pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm)
                    dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv)
                Case "btnGestellungsgarantien"
                    Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm)
                    pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm)
                    dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv)
            End Select
        Else
            dgvAnhaenge.Visible = False
            lblMultiAttachements.Visible = False
            Select Case button.Name
                Case "btnVollmachten"
                    Me.Size = frmDefaultSize
                    dgvAnhaenge.Size = dgvAnhaengeSize
                Case "btnVertraege"
                    pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm - addHeightdgv)
                    Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm)
                    dgvAnhaenge.Size = dgvAnhaengeSize
                Case "btnGestellungsgarantien"
                    pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm - addHeightdgv)
                    Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm)
                    dgvAnhaenge.Size = dgvAnhaengeSize
            End Select
        End If
        dgvAnhaenge.ClearSelection()
    End Sub
    Private Function checkMandatoryFields() As Boolean
        Dim valid = False
        If KdSearchBox.KdNr_value = -1 Then
            lblWarning.Text = "Kunde auswählen!"
            Return valid
        End If
        Select Case button.Name
            Case "btnVollmachten"
                If cbVMTypen._value = "" Then
                    lblWarning.Text = "Vollmachttyp auswählen"
                    Return valid
                End If
                If UsrCntlKundenZollVollmachten1.txtGueltigVon.Text = "" Then
                    lblWarning.Text = "Gültig von-Datum hinterlegen!"
                    Return valid
                End If
            Case Else
        End Select
        lblWarning.Text = ""
        valid = True
        Return valid
    End Function
    Private Sub frmAvisoFormularAnfuegen_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        KdSearchBox.Focus()
        Label1.Visible = cAllgemein.TESTSYSTEM
        If button.Name = "btnVollmachten" Then
            lblVMId.Visible = True
            cbVMTypen.Visible = True
        Else
            lblVMId.Visible = False
            cbVMTypen.Visible = False
        End If
    End Sub
    Private Sub pnlDetails_ControlAdded(sender As Object, e As ControlEventArgs)
        For Each control As Control In Controls
            pnlDetails.Size = control.Size
        Next
    End Sub
    Private Sub dgvAnhaenge_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick, dgvAnhaenge.CellContentDoubleClick
        Try
            If dgvAnhaenge.SelectedRows.Count > 0 Then
                If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
                    Dim strTmpPath As String = System.IO.Path.GetTempPath()
                    Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
                End If
            End If
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub
 End Class
--- a/VERAGAddIn/rbnMailItem.Designer.vb
+++ b/VERAGAddIn/rbnMailItem.Designer.vb
@@ -1,7 +1,7 @@
 Partial Class rbnMailItem
    Inherits Microsoft.Office.Tools.Ribbon.RibbonBase
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Public Sub New(ByVal container As System.ComponentModel.IContainer)
        MyClass.New()
@@ -12,7 +12,7 @@
    End Sub
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Public Sub New()
        MyBase.New(Globals.Factory.GetRibbonFactory())
@@ -22,7 +22,7 @@
    End Sub
    'Die Komponente überschreibt den Löschvorgang zum Bereinigen der Komponentenliste.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -39,13 +39,17 @@
    'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich.
    'Das Bearbeiten ist mit dem Komponenten-Designer möglich.
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.Tab1 = Me.Factory.CreateRibbonTab
        Me.Group1 = Me.Factory.CreateRibbonGroup
        Me.Button1 = Me.Factory.CreateRibbonButton
-        Me.Button2 = Me.Factory.CreateRibbonButton
+        Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton
        Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
        Me.btnVollmachten = Me.Factory.CreateRibbonButton
        Me.btnVertraege = Me.Factory.CreateRibbonButton
        Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
        Me.btnInfo = Me.Factory.CreateRibbonButton
        Me.btnUnsichtbar = Me.Factory.CreateRibbonButton
        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
@@ -63,7 +67,8 @@
        'Group1
        '
        Me.Group1.Items.Add(Me.Button1)
-        Me.Group1.Items.Add(Me.Button2)
+        Me.Group1.Items.Add(Me.btnAvisoMail2)
        Me.Group1.Items.Add(Me.SplitButton1)
        Me.Group1.Items.Add(Me.btnInfo)
        Me.Group1.Items.Add(Me.btnUnsichtbar)
        Me.Group1.Label = "AVISO"
@@ -77,13 +82,41 @@
        Me.Button1.Name = "Button1"
        Me.Button1.ShowImage = True
        '
-        'Button2
+        'btnAvisoMail2
        '
-        Me.Button2.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
+        Me.btnAvisoMail2.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
-        Me.Button2.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512
+        Me.btnAvisoMail2.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512
-        Me.Button2.Label = "Mail an Aviso anfügen"
+        Me.btnAvisoMail2.Label = "Mail an Aviso anfügen"
-        Me.Button2.Name = "Button2"
+        Me.btnAvisoMail2.Name = "btnAvisoMail2"
-        Me.Button2.ShowImage = True
+        Me.btnAvisoMail2.ShowImage = True
        '
        'SplitButton1
        '
        Me.SplitButton1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
        Me.SplitButton1.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
        Me.SplitButton1.Items.Add(Me.btnVollmachten)
        Me.SplitButton1.Items.Add(Me.btnVertraege)
        Me.SplitButton1.Items.Add(Me.btnGestellungsgarantien)
        Me.SplitButton1.Label = "Formulare anhängen"
        Me.SplitButton1.Name = "SplitButton1"
        '
        'btnVollmachten
        '
        Me.btnVollmachten.Label = "Vollmachten"
        Me.btnVollmachten.Name = "btnVollmachten"
        Me.btnVollmachten.ShowImage = True
        '
        'btnVertraege
        '
        Me.btnVertraege.Label = "Verträge/Unterlagen"
        Me.btnVertraege.Name = "btnVertraege"
        Me.btnVertraege.ShowImage = True
        '
        'btnGestellungsgarantien
        '
        Me.btnGestellungsgarantien.Label = "Gestellungsgarantien"
        Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien"
        Me.btnGestellungsgarantien.ShowImage = True
        '
        'btnInfo
        '
@@ -119,10 +152,14 @@
    Friend WithEvents Tab1 As Microsoft.Office.Tools.Ribbon.RibbonTab
    Friend WithEvents Group1 As Microsoft.Office.Tools.Ribbon.RibbonGroup
    Friend WithEvents Button1 As Microsoft.Office.Tools.Ribbon.RibbonButton
-    Friend WithEvents Button2 As Microsoft.Office.Tools.Ribbon.RibbonButton
+    Friend WithEvents btnAvisoMail2 As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnInfo As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents NotifyIcon1 As Windows.Forms.NotifyIcon
    Friend WithEvents btnUnsichtbar As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents SplitButton1 As Microsoft.Office.Tools.Ribbon.RibbonSplitButton
    Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnVertraege As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton
 End Class
 Partial Class ThisRibbonCollection
--- a/VERAGAddIn/rbnMailItem.vb
+++ b/VERAGAddIn/rbnMailItem.vb
@@ -14,6 +14,7 @@ Public Class rbnMailItem
    Private Sub rbnMailItem_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
        'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
        LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
        currentexplorer = ThisAddIn.SharedExplorer
@@ -41,11 +42,11 @@ Public Class rbnMailItem
        End If
    End Sub
-    Private Sub Button2_Click(sender As Object, e As RibbonControlEventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As RibbonControlEventArgs) Handles btnAvisoMail2.Click
        If LOGIN_OK Then
            Try
                Dim INSPECTOR As Outlook.Inspector = e.Control.Context
-                AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem)
+                AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem, sender)
                'Me.Context
            Catch ex As Exception
                MsgBox(ex.Message & ex.StackTrace)
@@ -76,4 +77,17 @@ Public Class rbnMailItem
            ThisAddIn.MailChanged(sender, ThisMail)
        End If
    End Sub
    Private Sub Button3_Click(sender As Object, e As RibbonControlEventArgs) Handles btnVollmachten.Click, btnGestellungsgarantien.Click, btnVertraege.Click
        If LOGIN_OK Then
            Try
                Dim INSPECTOR As Outlook.Inspector = e.Control.Context
                AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem, sender)
                'Me.Context
            Catch ex As Exception
                MsgBox(ex.Message & ex.StackTrace)
            End Try
        End If
    End Sub
 End Class
--- a/VERAGAddIn/rbnVERAG.Designer.vb
+++ b/VERAGAddIn/rbnVERAG.Designer.vb
@@ -45,9 +45,14 @@
        Me.VERAG = Me.Factory.CreateRibbonGroup
        Me.Button2 = Me.Factory.CreateRibbonButton
        Me.btnPdfPrint = Me.Factory.CreateRibbonButton
-        Me.Button3 = Me.Factory.CreateRibbonButton
+        Me.btnAvisoMail = Me.Factory.CreateRibbonButton
        Me.btnAttachFormular = Me.Factory.CreateRibbonSplitButton
        Me.btnVollmachten = Me.Factory.CreateRibbonButton
        Me.btnVertraege = Me.Factory.CreateRibbonButton
        Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
        Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
        Me.Button1 = Me.Factory.CreateRibbonButton
        Me.Button3 = Me.Factory.CreateRibbonButton
        Me.Button4 = Me.Factory.CreateRibbonButton
        Me.Tab1.SuspendLayout()
        Me.VERAG.SuspendLayout()
@@ -64,7 +69,8 @@
        '
        Me.VERAG.Items.Add(Me.Button2)
        Me.VERAG.Items.Add(Me.btnPdfPrint)
-        Me.VERAG.Items.Add(Me.Button3)
+        Me.VERAG.Items.Add(Me.btnAvisoMail)
        Me.VERAG.Items.Add(Me.btnAttachFormular)
        Me.VERAG.Items.Add(Me.SplitButton1)
        Me.VERAG.Label = "AVISO"
        Me.VERAG.Name = "VERAG"
@@ -85,19 +91,48 @@
        Me.btnPdfPrint.Name = "btnPdfPrint"
        Me.btnPdfPrint.ShowImage = True
        '
-        'Button3
+        'btnAvisoMail
        '
-        Me.Button3.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
+        Me.btnAvisoMail.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
-        Me.Button3.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512
+        Me.btnAvisoMail.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512
-        Me.Button3.Label = "Mail an Aviso anfügen"
+        Me.btnAvisoMail.Label = "Mail an Aviso anfügen"
-        Me.Button3.Name = "Button3"
+        Me.btnAvisoMail.Name = "btnAvisoMail"
-        Me.Button3.ShowImage = True
+        Me.btnAvisoMail.ShowImage = True
        '
        'btnAttachFormular
        '
        Me.btnAttachFormular.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
        Me.btnAttachFormular.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
        Me.btnAttachFormular.Items.Add(Me.btnVollmachten)
        Me.btnAttachFormular.Items.Add(Me.btnVertraege)
        Me.btnAttachFormular.Items.Add(Me.btnGestellungsgarantien)
        Me.btnAttachFormular.Label = "Formulare anhängen"
        Me.btnAttachFormular.Name = "btnAttachFormular"
        '
        'btnVollmachten
        '
        Me.btnVollmachten.Label = "Vollmachten"
        Me.btnVollmachten.Name = "btnVollmachten"
        Me.btnVollmachten.ShowImage = True
        '
        'btnVertraege
        '
        Me.btnVertraege.Label = "Verträge/Unterlagen"
        Me.btnVertraege.Name = "btnVertraege"
        Me.btnVertraege.ShowImage = True
        '
        'btnGestellungsgarantien
        '
        Me.btnGestellungsgarantien.Label = "Gestellungsgarantien"
        Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien"
        Me.btnGestellungsgarantien.ShowImage = True
        '
        'SplitButton1
        '
        Me.SplitButton1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
        Me.SplitButton1.Image = Global.VERAGAddIn.My.Resources.Resources.wheel
        Me.SplitButton1.Items.Add(Me.Button1)
        Me.SplitButton1.Items.Add(Me.Button3)
        Me.SplitButton1.Items.Add(Me.Button4)
        Me.SplitButton1.Label = "Spezielle Optionen"
        Me.SplitButton1.Name = "SplitButton1"
@@ -109,6 +144,14 @@
        Me.Button1.Name = "Button1"
        Me.Button1.ShowImage = True
        '
        'Button3
        '
        Me.Button3.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
        Me.Button3.Label = "Barsan PDFs auslesen"
        Me.Button3.Name = "Button3"
        Me.Button3.ShowImage = True
        Me.Button3.Visible = False
        '
        'Button4
        '
        Me.Button4.Label = "Info"
@@ -134,8 +177,13 @@
    Friend WithEvents btnPdfPrint As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents SplitButton1 As Microsoft.Office.Tools.Ribbon.RibbonSplitButton
    Friend WithEvents Button1 As Microsoft.Office.Tools.Ribbon.RibbonButton
-    Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton
+    Friend WithEvents btnAvisoMail As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents Button4 As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnAttachFormular As Microsoft.Office.Tools.Ribbon.RibbonSplitButton
    Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnVertraege As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton
    Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton
 End Class
 Partial Class ThisRibbonCollection
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -8,13 +8,24 @@ Imports VERAGAddIn.ThisAddIn
 Imports System.Runtime.InteropServices
 Imports System.Text.RegularExpressions
 Imports System.IO
 Imports SDL
 Imports System.Net
 Imports System.Security.Policy
 Imports System.Diagnostics.Eventing.Reader
 Imports System.Runtime.InteropServices.ComTypes
 Imports System.Drawing
 Imports System.Threading.Tasks
 Imports System.Net.Http
 Imports System.Diagnostics
 Imports VERAG_PROG_ALLGEMEIN.Kleinma.Controls
 Imports System.Data.Odbc
 Imports System.Reflection
 Public Class VERAGRibbon
    Dim LOGIN_OK = False
    Public Shared Event bla()
    Private Sub CustomerRibbon_Load(ByVal sender As System.Object, ByVal e As Microsoft.Office.Tools.Ribbon.RibbonUIEventArgs) Handles MyBase.Load
    End Sub
    Private Function CreateRibbonDropDownItem() As RibbonDropDownItem
        Return Me.Factory.CreateRibbonDropDownItem()
@@ -32,8 +43,10 @@ Public Class VERAGRibbon
    Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+        cAllgemein.TESTSYSTEM = False
        'cAllgemein.TESTSYSTEM = True
        LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
    End Sub
@@ -45,7 +58,7 @@ Public Class VERAGRibbon
    Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click
        Try
-            MsgBox(System.Security.Principal.WindowsIdentity.GetCurrent().Name)
+            MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString)
        Catch ex As Exception
        End Try
    End Sub
@@ -70,26 +83,50 @@ Public Class VERAGRibbon
    End Sub
-    Sub Button3_Click(sender As Object, e As RibbonControlEventArgs) Handles Button3.Click
+    Sub Button3_Click(sender As Object, e As RibbonControlEventArgs) Handles btnAvisoMail.Click, btnVollmachten.Click, btnGestellungsgarantien.Click, btnVertraege.Click
-        If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Hauptfenster()
+        If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Hauptfenster(sender)
    End Sub
    Public Function testConnection() As Boolean
        Dim connection = New VERAG_PROG_ALLGEMEIN.SQL
        If connection.getValueTxtBySql("SELECT 1", "FMZOLL") = 1 Then
            Return True
        Else
            MsgBox("ACHTUNG: Server nicht erreichbar!" & vbCrLf & "VERAG Addin wird beendet")
            Return False
        End If
    End Function
    Private Sub Button3_Click_1(sender As Object, e As RibbonControlEventArgs) Handles Button3.Click
        If LOGIN_OK Then AVISO_Mail_Functions.newBarsanMAIL()
    End Sub
 End Class
 Public Class AVISO_Mail_Functions
-    Shared Sub addMailToAviso_Hauptfenster()
+    Shared Sub addMailToAviso_Hauptfenster(sender As Object)
        Try
            Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
            Dim selection As Outlook.Selection = explorer.Selection
            If selection.Count > 0 Then
-                Dim selectedItem = selection(1)
+                Dim selectedItem As Object = selection(1)
                Dim result = TryCast(selectedItem, Outlook.MailItem)
                If result IsNot Nothing Then
                    Dim mailItem As Outlook.MailItem = selectedItem
                    mailItem = DirectCast(mailItem, Outlook.MailItem)
-                addMailToAviso(mailItem)
+                    addMailToAviso(mailItem, sender)
                Else
                    MsgBox("Die markierte Email kann nicht verarbeitet werden!" & vbNewLine & "Bitte andere Email verwenden.")
                End If
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
@@ -105,7 +142,7 @@ Public Class AVISO_Mail_Functions
        Return att
    End Function
-    Shared Sub addMailToAviso(mailItem As Outlook.MailItem)
+    Shared Sub addMailToAviso(mailItem As Outlook.MailItem, sender As Object)
        Try
            If mailItem IsNot Nothing Then
                ' Remove special characters from the file name and make sure it is not longer than 100 characters
@@ -113,21 +150,30 @@ Public Class AVISO_Mail_Functions
                Dim strFileName As String = "E-Mail"
                If mailItem.Subject IsNot Nothing AndAlso mailItem.Subject <> "" Then
                    strFileName = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
                    strFileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(strFileName)
                End If
                'Dim strFileName As String = "Mail.msg"
                Dim pdf_mail = ""
                Dim SendungsId = -1
                Dim Art = ""
                Dim kdNr = -1
                Dim enableOverwritting = False
                Dim ATTACHMENTS_LIST As New List(Of String)
                loadAttachment(mailItem, ATTACHMENTS_LIST)
                If isMail_EKOL(mailItem) Then
-                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then
+                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                        getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                End If
                If isMail_Barsan(mailItem) Then
                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then getATT_Barsan(mailItem, ATTACHMENTS_LIST, Art)
                End If
                Dim Bezeichnung = strFileName
-                Dim AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST) ')getAttachmentStringList(mailItem))
+                Dim AvisoId = Nothing
                AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender, enableOverwritting) '
                If AvisoId < 0 Then Exit Sub
                Dim BezAnhang = If(Bezeichnung <> strFileName, Bezeichnung, "") 'Wenn die Bezeichnung geändert wurde --> und wenn nur 1 Anhang, dann wird die Bezeichnung für den Anhang verwendet.
@@ -137,6 +183,13 @@ Public Class AVISO_Mail_Functions
                ElseIf pdf_mail = "PDFMAIL" Then
                    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
                    saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
                ElseIf pdf_mail = "PDF_DATENSERVER" Then
                    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender,, kdNr)
                    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
                ElseIf pdf_mail = "ONLYPDF_DATENSERVER" Then
                    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr, enableOverwritting)
                ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then
                    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr)
                Else 'ONLYMAIL
                    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
                End If
@@ -200,6 +253,29 @@ Public Class AVISO_Mail_Functions
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
    Shared Sub newBarsanMAIL()
        Try
            Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
            Dim selection As Outlook.Selection = explorer.Selection
            If selection.Count > 0 Then
                Dim selectedItem = selection(1)
                Dim mailItem As Outlook.MailItem = selectedItem
                If mailItem IsNot Nothing Then
                    If AVISO_Mail_Functions.isMail_Barsan(mailItem) Then
                        Dim att = getATT_Barsan(mailItem)
                        'Dim result As MsgBoxResult = MsgBox("Wollen Sie die " & att.Count & " Barsan - PDF's ausdrucken?", vbYesNoCancel)
                        'If result = vbYes Then
                        '    VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF(att)
                        'End If
                    End If
                End If
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
    Shared Function initFirmaUser() As Boolean
        Dim LOGIN_OK = False
        VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'DEFAULT
@@ -294,6 +370,7 @@ Public Class AVISO_Mail_Functions
                'MsgBox(mailItem.To)
                'MsgBox(mailItem.)
                'MsgBox(getFirmaFromToMail(mailItem.To))
                Dim art = ""
                EingangsDatum = mailItem.ReceivedTime
                Dim senderMail = ""
@@ -307,12 +384,14 @@ Public Class AVISO_Mail_Functions
                KundenNr = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getKdNrFromMailAdress(senderMail, False) ' false, wenn mehrere Niederlassungen von Frimen im KdStamm vorhanden... falsche KdNr...
                If isMail_EKOL(mailItem) Then
-                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then
+                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                        getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                    End If
                End If
                'End If
                If isMail_Barsan(mailItem) Then
                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then getATT_Barsan(mailItem, ATTACHMENTS_LIST, art)
                End If
                loadAttachment(mailItem, ATTACHMENTS_LIST)
@@ -335,7 +414,7 @@ Public Class AVISO_Mail_Functions
                If VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID > 0 Then
-                    saveAttachment(ATTACHMENTS_LIST, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, -1, "", "")
+                    saveAttachment(ATTACHMENTS_LIST, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, -1, art, "")
                    saveMail(mailItem, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID,, False)
                End If
@@ -382,6 +461,25 @@ Public Class AVISO_Mail_Functions
        End Try
    End Sub
    Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, BezeichnungAnh As String, Optional sender As Object = Nothing, Optional kdNr As Integer = -1, Optional enableOverwritting As Boolean = False)
        Try
            If AvisoId > 0 Then
                If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" ' nur wenn 1 Anhang wird die Bezeichnung übernommen.
                For Each ATT In ATTACHMENTS_LIST
                    Dim fi As New IO.FileInfo(ATT)
                    Dim Bezeichnung = BezeichnungAnh
                    If Bezeichnung = "" Then Bezeichnung = fi.Name
                    uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting)
                Next
            End If
        Catch ex As Exception
            MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ex.Message & ex.StackTrace)
        End Try
    End Sub
    Shared Sub loadAttachment(ByRef mail As Outlook.MailItem, ByRef ATTACHMENTS_LIST As List(Of String))
@@ -476,7 +574,19 @@ Public Class AVISO_Mail_Functions
    Shared Function isMail_EKOL(mailItem As Outlook.MailItem) As Boolean
        Try
            If mailItem IsNot Nothing Then
-                Dim srch As String = "<a href=""http://web01.ekol.com/documentservice/download/"
+                Dim srch As String = "<a href=""https://web01.ekol.com/documentservice/download/"
                Return mailItem.HTMLBody.ToString.Contains(srch)
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
        Return False
    End Function
    Shared Function isMail_Barsan(mailItem As Outlook.MailItem) As Boolean
        Try
            If mailItem IsNot Nothing Then
                Dim srch As String = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
                Return mailItem.HTMLBody.ToString.Contains(srch)
            End If
        Catch ex As Exception
@@ -492,7 +602,7 @@ Public Class AVISO_Mail_Functions
            If mailItem Is Nothing Then Return ATT
            Dim html = mailItem.HTMLBody
-            Dim srch As String = "<a href=""http://web01.ekol.com/documentservice/download/"
+            Dim srch As String = "<a href=""https://web01.ekol.com/documentservice/download/"
            If html.ToString.Contains(srch) Then
                Dim myDelims As String() = New String() {srch}
@@ -502,11 +612,16 @@ Public Class AVISO_Mail_Functions
                Dim cnt = 0
                For Each l In sp
                    If cnt > 0 AndAlso l.Contains(""">") Then ' ENDE
-                        Dim link = ("http://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">")))
+                        Dim link = ("https://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">") - 1))
                        'Ansonten stüzt der Webservice-Aufruf ab! ABER -> For .NET 4.7 or later, the System.Net.ServicePointManager.SecurityProtocol should not be set manualy!
                        System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
                        Dim TMP_PATH = GetTempFilePathWithExtension(".pdf")
                        My.Computer.Network.DownloadFile(link, TMP_PATH)
                        If IO.File.Exists(TMP_PATH) Then
                            ATT.Add(TMP_PATH)
                        End If
@@ -525,6 +640,93 @@ Public Class AVISO_Mail_Functions
        Return ATT
    End Function
    Shared Function getATT_Barsan(mailItem As Outlook.MailItem, Optional ByRef ATT As List(Of String) = Nothing, Optional ByRef art As String = "") As List(Of String)
        If ATT Is Nothing Then ATT = New List(Of String)
        Try
            If mailItem Is Nothing Then Return ATT
            Dim html = mailItem.HTMLBody
            html = html.Replace("<b>•</B>", "<b>•</b>")
            html = html.Replace("<B>•</B>", "<b>•</b>")
            html = html.Replace("<B>•</b>", "<b>•</b>")
            Dim srch As String = "<b>•</b>"
            If html.ToString.Contains(srch) Then
                Dim myDelims As String() = New String() {srch}
                Dim sp = html.Split(myDelims, StringSplitOptions.None)
                ' Dim sp = html.ToString.Split(srch.ToString)
                Dim cnt = 0
                Dim pdfNameWithCounter As String = ""
                Dim counter As Integer = 1
                Dim lastPdfName As String = ""
                Dim linkinHTML = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
                For Each l In sp
                    If cnt > 0 AndAlso l.Contains(""">") Then ' ENDE
                        Dim lastIndexLink = l.ToString.IndexOf(linkinHTML) + linkinHTML.Length
                        Dim link = ("https://portal.barsan.com/Dokuman/DokumanGoster.aspx" & l.ToString.Substring(lastIndexLink, l.ToString.IndexOf(""">") - lastIndexLink))
                        'Ansonten stüzt der Webservice-Aufruf ab! ABER -> For .NET 4.7 or later, the System.Net.ServicePointManager.SecurityProtocol should not be set manualy!
                        System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
                        If l.ToString.ToLower().Contains(".pdf") Then
                            Dim pdfNameOrigin As String = ""
                            Dim pdfStringName = l.ToString.ToLower().Substring(0, l.ToString.IndexOf(linkinHTML) - 1).Trim()
                            Dim pdfNamefromFile = l.ToString.ToLower().Substring(l.ToString.IndexOf(""">") + 2, l.ToString.IndexOf(".pdf") - l.ToString.IndexOf(""">") + 2).Trim()
                            pdfNamefromFile = pdfNamefromFile.Replace(".pdf", "")
                            Dim numName As Boolean = False
                            For Each x As Char In pdfStringName
                                If Char.IsDigit(x) Then
                                    pdfNameOrigin &= x
                                    numName = True
                                Else
                                    Exit For
                                End If
                            Next
                            If lastPdfName <> "" AndAlso lastPdfName = pdfNameOrigin Then
                                pdfNameWithCounter = pdfNameOrigin & "_" & counter
                                counter = counter + 1
                            Else
                                If pdfNameWithCounter <> "" Then
                                    counter = 1
                                    pdfNameWithCounter = ""
                                End If
                            End If
                            Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(link, IIf(pdfNameWithCounter <> "", pdfNameWithCounter, IIf(numName = False, pdfNamefromFile, pdfNameOrigin)),, False)
                            If pdfNameOrigin <> "" Then lastPdfName = pdfNameOrigin
                            If IO.File.Exists(pdf) Then
                                ATT.Add(pdf)
                            End If
                            If pdfNamefromFile.ToLower.Contains("bordro") Then art = "Bordro"
                        End If
                    End If
                    cnt += 1
                Next
            End If
            'LKW_Nr = getEKOL_Var(html, "Position :")
            'RefNr = getEKOL_Var(html, "Truck :")
            'INFO = getEKOL_Var(html, "Route :")
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
        Return ATT
    End Function
    Shared Function getEKOL_Var(html, varName, Optional splitTo = "<br>")
        If html.contains(varName) Then
            Dim split = html.split(varName)
@@ -541,10 +743,10 @@ Public Class AVISO_Mail_Functions
        Try
            If AvisoId > 0 Then
                ' The full path will place the email in the user's temporary folder 
-                If bezeichnung <> "" Then
+                If bezeichnung = "" Then bezeichnung = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
-                    bezeichnung = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
+
                bezeichnung = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(bezeichnung)
-                End If
+
                Dim strTmpPath As String = System.IO.Path.GetTempPath() & bezeichnung & If(bezeichnung.EndsWith(".msg"), "", ".msg")
                ' Save the email to the user's temp folder and convert it to a .MSG
                'Dim cnt = 0
@@ -564,6 +766,36 @@ Public Class AVISO_Mail_Functions
                ' Clean up the temporary .MSG file from the user's temporary folder
                System.IO.File.Delete(strTmpPath)
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        Finally
            If mailItem IsNot Nothing Then
                Marshal.ReleaseComObject(mailItem)
            End If
        End Try
    End Sub
    Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional sender As Object = Nothing, Optional saveAttachments As Boolean = True, Optional kdNr As Integer = -1, Optional enableOverwritting As Boolean = False)
        Try
            If AvisoId > 0 Then
                If bezeichnung = "" Then
                    bezeichnung = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
                End If
                bezeichnung = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(bezeichnung)
                Dim strTmpPath As String = System.IO.Path.GetTempPath() & bezeichnung & If(bezeichnung.EndsWith(".msg"), "", ".msg")
                mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG)
                uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting)
                ' Clean up the temporary .MSG file from the user's temporary folder
                System.IO.File.Delete(strTmpPath)
            End If
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        Finally
@@ -574,8 +806,12 @@ Public Class AVISO_Mail_Functions
    End Sub
-    Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att) As Integer
+    Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByRef kdNr, ByVal sender, ByRef enableOverwritting) As Integer
-        Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung)
+
        Select Case sender.name
            Case "btnAvisoMail", "btnAvisoMail2"
                Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung, Art)
                frmAvisoAnfügen.ATT = Att
                If frmAvisoAnfügen.ShowDialog = DialogResult.OK Then
                    Dim AvisoId = frmAvisoAnfügen.AvisoId
@@ -585,11 +821,83 @@ Public Class AVISO_Mail_Functions
                    Art = frmAvisoAnfügen.cboArt._value
                    Att = frmAvisoAnfügen.ATT
                    Return AvisoId
                End If
                Return -1
            Case Else
                Dim frmAvisoFormularAnfuegen As New frmAvisoFormularAnfuegen(Bezeichnung, sender)
                frmAvisoFormularAnfuegen.ATT = Att
                If frmAvisoFormularAnfuegen.ShowDialog = DialogResult.OK Then
                    Dim AvisoId = frmAvisoFormularAnfuegen.AvisoId
                    kdNr = frmAvisoFormularAnfuegen.KdNr
                    Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung
                    pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL
                    Att = frmAvisoFormularAnfuegen.ATT
                    enableOverwritting = frmAvisoFormularAnfuegen.enableOverwritting
                    Return AvisoId
                End If
                Return -1
        End Select
    End Function
    Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1, Optional enableOverweriting As Boolean = False)
        If sender Is Nothing Then
            Exit Sub
        End If
        Dim button = sender
        Select Case button.Name
            Case "btnVollmachten"
                Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr)
                Dim path = DS.uploadDataToDATENSERVER(strTmpPath)
                If path Then
                    Dim c As New cKundenVollmachten(AvisoId)
                    If bezeichnung.EndsWith(".pdf") Then
                        c.kdvm_datenarchivId = DS.da_id
                    Else
                        c.kdvm_emailId = DS.da_id
                    End If
                    c.SAVE()
                End If
            Case "btnVertraege"
                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr)
                Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
                If path Then
                    Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
                    KV.kv_datenarchivId = DS.da_id
                    KV.SAVE()
                End If
            Case "btnGestellungsgarantien"
                Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(AvisoId)
                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr)
                Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
                If path Then
                    gg.gg_datenarchivId = DS.da_id
                    gg.SAVE()
                End If
        End Select
    End Sub
 End Class