Berechtigung für Essensbestellung

Essensbestellungen GUIVerbesserungen
Gesamtsicherheiten und Essensbestellungen
2022-11-30 16:09:47 +01:00 · 2022-11-30 14:34:57 +01:00 · 2022-11-30 14:10:00 +01:00 · 2022-11-30 10:24:58 +01:00 · 2022-11-29 17:25:00 +01:00 · 2022-11-29 15:19:34 +01:00
72 changed files with 26058 additions and 1985 deletions
--- a/AVISO_CHECKIN/AVISO_CHECKIN.vbproj
+++ b/AVISO_CHECKIN/AVISO_CHECKIN.vbproj
@@ -247,14 +247,6 @@
    <None Include="Resources\searchGG.png" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\SDL\SDL\SDL\SDL.vbproj">
-      <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
-      <Name>SDL</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
-      <Project>{A3B497BD-842C-4A2B-B398-ED1976849DF1}</Project>
-      <Name>VERAG_PROG_ALLGEMEIN</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Aviso\Aviso.vbproj">
      <Project>{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}</Project>
      <Name>Aviso</Name>
--- a/AVISO_CHECKIN/App.config
+++ b/AVISO_CHECKIN/App.config
@@ -7,7 +7,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="GrapeCity.Documents.Common" publicKeyToken="d55d733d2bfd5065" culture="neutral" />
@@ -29,10 +29,6 @@
        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.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>
 </configuration>
--- a/AVISO_INFO/AVISO_INFO.vbproj
+++ b/AVISO_INFO/AVISO_INFO.vbproj
@@ -208,10 +208,6 @@
    </BootstrapperPackage>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
-      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
-      <Name>VERAG_PROG_ALLGEMEIN</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
      <Name>Gemeinsames</Name>
--- a/Aviso.sln
+++ b/Aviso.sln
@@ -11,16 +11,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "Gemeinsames\
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISOUPDATER", "AVISOUPDATER\AVISOUPDATER.vbproj", "{D8EDB976-2F90-46C1-9642-63BE8C4F5F1F}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "..\..\SDL\SDL\SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}"
-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
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "..\..\OutlookAddIN\VERAGAddIn\VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DAKOSY_Worker_lib", "..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj", "{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}"
 EndProject
-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}") = "AVISO_INFO", "AVISO_INFO\AVISO_INFO.vbproj", "{A734141E-2C4E-4D70-81E8-A88184282AF5}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NCTSPartnerWorker", "..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj", "{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}"
@@ -35,6 +29,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sipdotnet", "..\..\dll\Linp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bria_API_CSharp_SampleApp_3.0", "..\..\dll\BRIA\Bria_API_CSharp_SampleApp_3-main\Bria_API_CSharp_SampleApp_3-main\Bria_API_SampleApp_Phone\Bria_API_CSharp_SampleApp_3.0.csproj", "{1F68E194-88A8-47F2-B9F9-20E092EFA30A}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "..\..\SDL\SDL\SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}"
+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
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -76,7 +76,6 @@ Global
 		{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.ActiveCfg = Release|x86
 		{3B5EAEB2-0477-4899-A893-3049DD458B9B}.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|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64
@@ -104,34 +103,6 @@ Global
 		{D8EDB976-2F90-46C1-9642-63BE8C4F5F1F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D8EDB976-2F90-46C1-9642-63BE8C4F5F1F}.Release|x64.Build.0 = Release|Any CPU
 		{D8EDB976-2F90-46C1-9642-63BE8C4F5F1F}.Release|x86.ActiveCfg = Release|Any CPU
-		{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}.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
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|x64
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{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}.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|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -160,22 +131,6 @@ Global
 		{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.ActiveCfg = Release|Any CPU
 		{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.Build.0 = Release|Any CPU
 		{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x86.ActiveCfg = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.Build.0 = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.ActiveCfg = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.Build.0 = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU
-		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -288,6 +243,54 @@ Global
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x64.Build.0 = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F68E194-88A8-47F2-B9F9-20E092EFA30A}.Release|x86.Build.0 = Release|Any CPU
+		{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
+		{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
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.Build.0 = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
@@ -26,6 +26,8 @@ Partial Class frmSendungAnhangImport
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport))
        Me.lbl = New System.Windows.Forms.Label()
        Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel()
+        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
+        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel()
        Me.lblSendungen = New System.Windows.Forms.Label()
        Me.lblImport = New System.Windows.Forms.Label()
@@ -69,8 +71,6 @@ Partial Class frmSendungAnhangImport
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Button17 = New System.Windows.Forms.Button()
        Me.lblRgPreis = New System.Windows.Forms.Label()
-        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
-        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlAviso.SuspendLayout()
        Me.pnlAnfuegen.SuspendLayout()
        Me.cntxt.SuspendLayout()
@@ -101,6 +101,36 @@ Partial Class frmSendungAnhangImport
        Me.flpnlAviso.Size = New System.Drawing.Size(200, 825)
        Me.flpnlAviso.TabIndex = 7
        '
+        'UsrCntlSendungAnhangElement1
+        '
+        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
+        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
+        '
+        'UsrCntlSendungAnhangElement2
+        '
+        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
+        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
+        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
+        '
        'flpnlSendungen
        '
        Me.flpnlSendungen.AllowDrop = True
@@ -187,6 +217,7 @@ Partial Class frmSendungAnhangImport
        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
@@ -242,6 +273,7 @@ Partial Class frmSendungAnhangImport
        Me.txtDateiname._DateTimeOnly = False
        Me.txtDateiname._numbersOnly = False
        Me.txtDateiname._numbersOnlyKommastellen = ""
+        Me.txtDateiname._numbersOnlyTrennzeichen = True
        Me.txtDateiname._Prozent = False
        Me.txtDateiname._ShortDateNew = False
        Me.txtDateiname._ShortDateOnly = False
@@ -274,6 +306,7 @@ Partial Class frmSendungAnhangImport
        Me.MyTextBox2._DateTimeOnly = False
        Me.MyTextBox2._numbersOnly = False
        Me.MyTextBox2._numbersOnlyKommastellen = ""
+        Me.MyTextBox2._numbersOnlyTrennzeichen = True
        Me.MyTextBox2._Prozent = False
        Me.MyTextBox2._ShortDateNew = False
        Me.MyTextBox2._ShortDateOnly = False
@@ -340,6 +373,7 @@ Partial Class frmSendungAnhangImport
        Me.txtSeiten._DateTimeOnly = False
        Me.txtSeiten._numbersOnly = False
        Me.txtSeiten._numbersOnlyKommastellen = ""
+        Me.txtSeiten._numbersOnlyTrennzeichen = True
        Me.txtSeiten._Prozent = False
        Me.txtSeiten._ShortDateNew = False
        Me.txtSeiten._ShortDateOnly = False
@@ -613,38 +647,9 @@ Partial Class frmSendungAnhangImport
        Me.lblRgPreis.Text = "-"
        Me.lblRgPreis.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'UsrCntlSendungAnhangElement1
-        '
-        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
-        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
-        '
-        'UsrCntlSendungAnhangElement2
-        '
-        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
-        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
-        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
-        '
        'frmSendungAnhangImport
        '
+        Me.AllowDrop = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
--- a/Aviso/App.config
+++ b/Aviso/App.config
@@ -65,7 +65,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -83,8 +83,7 @@
    <ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestKeyFile>
-    </ManifestKeyFile>
+    <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
    <GenerateManifests>true</GenerateManifests>
@@ -118,6 +117,10 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
    </Reference>
+    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
+    </Reference>
    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
      <HintPath>..\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
    </Reference>
@@ -127,11 +130,12 @@
    <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
      <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
    </Reference>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.16.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\packages\DocumentFormat.OpenXml.2.16.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    <Reference Include="DAKOSY_Worker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll</HintPath>
    </Reference>
-    <Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.7.2.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
    </Reference>
    <Reference Include="GrapeCity.ActiveReports">
      <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll</HintPath>
@@ -317,9 +321,14 @@
    <Reference Include="ThoughtWorks.QRCode">
      <HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
    </Reference>
+    <Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
+    </Reference>
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
+    <Import Include="AVISO.Kleinma.Controls" />
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
    <Import Include="System.Collections" />
@@ -528,12 +537,48 @@
    <Compile Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmEssensbestellungen.Designer.vb">
+      <DependentUpon>frmEssensbestellungen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmEssensbestellungen.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmFrachtkostenBerechnen.Designer.vb">
+      <DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFrachtkostenBerechnen.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmFreigabeSetzenAnhaenge.Designer.vb">
      <DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon>
    </Compile>
    <Compile Include="frmFreigabeSetzenAnhaenge.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmGesamtsicherheitenMenuNEU.Designer.vb">
+      <DependentUpon>frmGesamtsicherheitenMenuNEU.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmGesamtsicherheitenMenuNEU.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmGesamtsicherheitenNEU.Designer.vb">
+      <DependentUpon>frmGesamtsicherheitenNEU.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmGesamtsicherheitenNEU.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmNCTSRouten.Designer.vb">
+      <DependentUpon>frmNCTSRouten.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmNCTSRouten.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmRoutendauerBerechnen.Designer.vb">
+      <DependentUpon>frmRoutendauerBerechnen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmRoutendauerBerechnen.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmSndVorgeschriebenSetzen.Designer.vb">
      <DependentUpon>frmSndVorgeschriebenSetzen.vb</DependentUpon>
    </Compile>
@@ -588,16 +633,16 @@
    <Compile Include="frmGelangensbestaetigung.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="frmGesSich.Designer.vb">
-      <DependentUpon>frmGesSich.vb</DependentUpon>
+    <Compile Include="frmGesamtsicherheiten.Designer.vb">
+      <DependentUpon>frmGesamtsicherheiten.vb</DependentUpon>
    </Compile>
-    <Compile Include="frmGesSich.vb">
+    <Compile Include="frmGesamtsicherheiten.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="frmGesSichMenu.Designer.vb">
-      <DependentUpon>frmGesSichMenu.vb</DependentUpon>
+    <Compile Include="frmGesamtsicherheitenMenu.Designer.vb">
+      <DependentUpon>frmGesamtsicherheitenMenu.vb</DependentUpon>
    </Compile>
-    <Compile Include="frmGesSichMenu.vb">
+    <Compile Include="frmGesamtsicherheitenMenu.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="frmHauptfenster.Designer.vb">
@@ -804,6 +849,12 @@
    <Compile Include="frmWarenbezeichnungBegriffeEdit.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmWechselStandarddrucker.Designer.vb">
+      <DependentUpon>frmWechselStandarddrucker.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmWechselStandarddrucker.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmZoll.Designer.vb">
      <DependentUpon>frmZoll.vb</DependentUpon>
    </Compile>
@@ -935,6 +986,12 @@
    <Compile Include="usrCntlSND_ATBGestellung.vb">
      <SubType>UserControl</SubType>
    </Compile>
+    <Compile Include="usrCntlSND_Ausfuhr.Designer.vb">
+      <DependentUpon>usrCntlSND_Ausfuhr.vb</DependentUpon>
+    </Compile>
+    <Compile Include="usrCntlSND_Ausfuhr.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="usrCntlSND_NCTSGestellungsadresse.Designer.vb">
      <DependentUpon>usrCntlSND_NCTSGestellungsadresse.vb</DependentUpon>
    </Compile>
@@ -1038,9 +1095,27 @@
    <EmbeddedResource Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.resx">
      <DependentUpon>frmAvisoBenachrichtigungReminderBestaetigen.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmEssensbestellungen.resx">
+      <DependentUpon>frmEssensbestellungen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmFrachtkostenBerechnen.resx">
+      <DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmFreigabeSetzenAnhaenge.resx">
      <DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmGesamtsicherheitenMenuNEU.resx">
+      <DependentUpon>frmGesamtsicherheitenMenuNEU.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGesamtsicherheitenNEU.resx">
+      <DependentUpon>frmGesamtsicherheitenNEU.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmNCTSRouten.resx">
+      <DependentUpon>frmNCTSRouten.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmRoutendauerBerechnen.resx">
+      <DependentUpon>frmRoutendauerBerechnen.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmSndVorgeschriebenSetzen.resx">
      <DependentUpon>frmSndVorgeschriebenSetzen.vb</DependentUpon>
    </EmbeddedResource>
@@ -1068,11 +1143,12 @@
    <EmbeddedResource Include="frmGelangensbestaetigung.resx">
      <DependentUpon>frmGelangensbestaetigung.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmGesSich.resx">
-      <DependentUpon>frmGesSich.vb</DependentUpon>
+    <EmbeddedResource Include="frmGesamtsicherheiten.resx">
+      <DependentUpon>frmGesamtsicherheiten.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmGesSichMenu.resx">
-      <DependentUpon>frmGesSichMenu.vb</DependentUpon>
+    <EmbeddedResource Include="frmGesamtsicherheitenMenu.resx">
+      <DependentUpon>frmGesamtsicherheitenMenu.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmHauptfenster.resx">
      <DependentUpon>frmHauptfenster.vb</DependentUpon>
@@ -1177,6 +1253,9 @@
    <EmbeddedResource Include="frmWarenbezeichnungBegriffeEdit.resx">
      <DependentUpon>frmWarenbezeichnungBegriffeEdit.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmWechselStandarddrucker.resx">
+      <DependentUpon>frmWechselStandarddrucker.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmZoll.resx">
      <DependentUpon>frmZoll.vb</DependentUpon>
    </EmbeddedResource>
@@ -1241,6 +1320,9 @@
    <EmbeddedResource Include="usrCntlSND_ATBGestellung.resx">
      <DependentUpon>usrCntlSND_ATBGestellung.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="usrCntlSND_Ausfuhr.resx">
+      <DependentUpon>usrCntlSND_Ausfuhr.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="usrCntlSND_NCTSGestellungsadresse.resx">
      <DependentUpon>usrCntlSND_NCTSGestellungsadresse.vb</DependentUpon>
    </EmbeddedResource>
@@ -1315,10 +1397,6 @@
      <Project>{2bbd7643-82a1-481f-a014-eb7fcdeed3b5}</Project>
      <Name>NCTSPartnerWorker</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
-      <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
-      <Name>DAKOSY_Worker_lib</Name>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
      <Name>TELOTEC_Worker_lib</Name>
@@ -1327,10 +1405,6 @@
      <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
      <Name>SDL</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
-      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
-      <Name>VERAG_PROG_ALLGEMEIN</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
      <Name>Gemeinsames</Name>
@@ -1367,6 +1441,7 @@
  <ItemGroup>
    <Content Include="aviso.ico" />
    <Content Include="My Project\aktAlt.jpg" />
+    <None Include="Resources\ZwAbEinfuegen.png" />
    <None Include="Resources\unisped_aeo_DE.jpg" />
    <None Include="Resources\Unisped_DE_logo.jpg" />
    <None Include="Resources\weiterleiten_small.png" />
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
@@ -223,6 +223,7 @@ Public Class frmAvisoWeiterleiten
            addBtn(flpFirma, "N", "WAI", "VERAG Waidhaus")
            addBtn(flpFirma, "N", "NKD", "VERAG Nickelsdorf")
            addBtn(flpFirma, "N", "NEU", "VERAG Neuhaus")
+            addBtn(flpFirma, "N", "DTB", "VERAG Dettelbach")

            addBtn(flpFirma, "A", "FISK", "VERAG Fiskal")

--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
@@ -23,17 +23,18 @@ Partial Class usrCntlBenachrichtigungen
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxCluster = New System.Windows.Forms.CheckBox()
        Me.cbxTeams = New System.Windows.Forms.CheckBox()
        Me.Label22 = New System.Windows.Forms.Label()
        Me.Label25 = New System.Windows.Forms.Label()
-        Me.cbxCluster = New System.Windows.Forms.CheckBox()
+        Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
        Me.Panel2.SuspendLayout()
        CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel4.SuspendLayout()
@@ -49,9 +50,26 @@ Partial Class usrCntlBenachrichtigungen
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel2.Location = New System.Drawing.Point(0, 0)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(236, 203)
+        Me.Panel2.Size = New System.Drawing.Size(284, 203)
        Me.Panel2.TabIndex = 2
        '
+        'MyComboBox2
+        '
+        Me.MyComboBox2._allowedValuesFreiText = Nothing
+        Me.MyComboBox2._allowFreiText = False
+        Me.MyComboBox2._value = ""
+        Me.MyComboBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.MyComboBox2.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.MyComboBox2.FormattingEnabled = True
+        Me.MyComboBox2.Location = New System.Drawing.Point(160, 86)
+        Me.MyComboBox2.Name = "MyComboBox2"
+        Me.MyComboBox2.Size = New System.Drawing.Size(71, 21)
+        Me.MyComboBox2.TabIndex = 27
+        Me.MyComboBox2.Visible = False
+        '
        'gridAvisoBenachrichtigungen
        '
        Me.gridAvisoBenachrichtigungen.AKTUALISIERUNGS_INTERVALL = -1
@@ -59,8 +77,8 @@ Partial Class usrCntlBenachrichtigungen
        Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
        Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
        Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
        Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -68,17 +86,18 @@ Partial Class usrCntlBenachrichtigungen
        Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen"
        Me.gridAvisoBenachrichtigungen.ReadOnly = True
        Me.gridAvisoBenachrichtigungen.RowHeadersVisible = False
-        Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(236, 144)
+        Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(284, 144)
        Me.gridAvisoBenachrichtigungen.TabIndex = 2
        '
        'Panel4
        '
        Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel4.Controls.Add(Me.cbxNeukunden)
        Me.Panel4.Controls.Add(Me.Button10)
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.Panel4.Location = New System.Drawing.Point(0, 165)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(236, 38)
+        Me.Panel4.Size = New System.Drawing.Size(284, 38)
        Me.Panel4.TabIndex = 5
        '
        'Button10
@@ -89,7 +108,7 @@ Partial Class usrCntlBenachrichtigungen
        Me.Button10.ForeColor = System.Drawing.Color.Black
        Me.Button10.Image = Global.AVISO.My.Resources.Resources.ok
        Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button10.Location = New System.Drawing.Point(111, 3)
+        Me.Button10.Location = New System.Drawing.Point(159, 3)
        Me.Button10.Name = "Button10"
        Me.Button10.Size = New System.Drawing.Size(121, 30)
        Me.Button10.TabIndex = 3
@@ -108,25 +127,20 @@ Partial Class usrCntlBenachrichtigungen
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel3.Location = New System.Drawing.Point(0, 0)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(236, 21)
+        Me.Panel3.Size = New System.Drawing.Size(284, 21)
        Me.Panel3.TabIndex = 3
        '
-        'MyComboBox2
+        'cbxCluster
        '
-        Me.MyComboBox2._allowedValuesFreiText = Nothing
-        Me.MyComboBox2._allowFreiText = False
-        Me.MyComboBox2._value = ""
-        Me.MyComboBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.MyComboBox2.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.MyComboBox2.FormattingEnabled = True
-        Me.MyComboBox2.Location = New System.Drawing.Point(112, 86)
-        Me.MyComboBox2.Name = "MyComboBox2"
-        Me.MyComboBox2.Size = New System.Drawing.Size(71, 21)
-        Me.MyComboBox2.TabIndex = 27
-        Me.MyComboBox2.Visible = False
+        Me.cbxCluster.AutoSize = True
+        Me.cbxCluster.ForeColor = System.Drawing.Color.White
+        Me.cbxCluster.Location = New System.Drawing.Point(219, 4)
+        Me.cbxCluster.Name = "cbxCluster"
+        Me.cbxCluster.Size = New System.Drawing.Size(58, 17)
+        Me.cbxCluster.TabIndex = 29
+        Me.cbxCluster.Text = "Cluster"
+        Me.cbxCluster.UseVisualStyleBackColor = True
+        Me.cbxCluster.Visible = False
        '
        'cbxTeams
        '
@@ -154,24 +168,24 @@ Partial Class usrCntlBenachrichtigungen
        '
        Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label25.ForeColor = System.Drawing.Color.White
-        Me.Label25.Location = New System.Drawing.Point(579, 6)
+        Me.Label25.Location = New System.Drawing.Point(627, 6)
        Me.Label25.Name = "Label25"
        Me.Label25.Size = New System.Drawing.Size(207, 19)
        Me.Label25.TabIndex = 1
        Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen"
        Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'cbxCluster
+        'cbxNeukunden
        '
-        Me.cbxCluster.AutoSize = True
-        Me.cbxCluster.ForeColor = System.Drawing.Color.White
-        Me.cbxCluster.Location = New System.Drawing.Point(219, 4)
-        Me.cbxCluster.Name = "cbxCluster"
-        Me.cbxCluster.Size = New System.Drawing.Size(58, 17)
-        Me.cbxCluster.TabIndex = 29
-        Me.cbxCluster.Text = "Cluster"
-        Me.cbxCluster.UseVisualStyleBackColor = True
-        Me.cbxCluster.Visible = False
+        Me.cbxNeukunden.AutoSize = True
+        Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
+        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 3)
+        Me.cbxNeukunden.Name = "cbxNeukunden"
+        Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
+        Me.cbxNeukunden.TabIndex = 30
+        Me.cbxNeukunden.Text = "Neukunden"
+        Me.cbxNeukunden.UseVisualStyleBackColor = True
+        Me.cbxNeukunden.Visible = False
        '
        'usrCntlBenachrichtigungen
        '
@@ -179,10 +193,11 @@ Partial Class usrCntlBenachrichtigungen
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.Panel2)
        Me.Name = "usrCntlBenachrichtigungen"
-        Me.Size = New System.Drawing.Size(236, 203)
+        Me.Size = New System.Drawing.Size(284, 203)
        Me.Panel2.ResumeLayout(False)
        CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel4.ResumeLayout(False)
+        Me.Panel4.PerformLayout()
        Me.Panel3.ResumeLayout(False)
        Me.Panel3.PerformLayout()
        Me.ResumeLayout(False)
@@ -199,4 +214,5 @@ Partial Class usrCntlBenachrichtigungen
    Public WithEvents gridAvisoBenachrichtigungen As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents cbxTeams As CheckBox
    Friend WithEvents cbxCluster As CheckBox
+    Friend WithEvents cbxNeukunden As CheckBox
 End Class
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -31,20 +31,32 @@

                Dim whereMA = " AND  ( 1<>1 "

-                If cbxCluster.Checked Then
-                    whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') "
+
+                If cbxNeukunden.Checked Then
+                    Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                        Case "VERAG"
+                            whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='13') " 'TEAM_NEUKUNDEN --> VERAG
+                    End Select
                Else
-                    whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') "
-                    whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') "
-                    whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') "
-                    whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') "
-                End If
+
+                    If cbxCluster.Checked Then
+                        whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') "
+                    Else
+                        whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') "
+                        whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') "
+                        whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') "
+                        whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') "
+                    End If


-                If cbxTeams.Checked Then
-                    whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
-                Else
-                    whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId & "') "
+                    If cbxTeams.Checked Then
+                        whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
+                    Else
+                        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then
+                            whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId & "') "
+                        End If
+                    End If
+
                End If

                whereMA &= " ) "
@@ -174,7 +186,6 @@
        MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
-
        MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)


@@ -184,6 +195,10 @@
                cbxCluster.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
            End If
        End If
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeNeukunden", "AVISO") Then
+            cbxNeukunden.Visible = True
+            'cbxNeukunden.Checked = True
+        End If



@@ -286,4 +301,8 @@
    Private Sub cbxCluster_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCluster.CheckedChanged
        initDgvAvisoBenachrichtigungen(True, Me.Font)
    End Sub
+
+    Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged
+        initDgvAvisoBenachrichtigungen(True, Me.Font)
+    End Sub
 End Class
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -171,7 +171,9 @@ Public Class SendungOptions

        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_Grenzstelle") Then
            If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle <> "" Then
-                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                '                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
            Else
                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                    VALUES.Grenze = ""
@@ -671,7 +673,9 @@ Public Class SendungOptions

    Shared Function getZSTBezeichnung(SQL As VERAG_PROG_ALLGEMEIN.SQL, o As Object) As String
        If o Is Nothing Then Return ""
-        Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
+        '        Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
+        Dim tmp = SQL.getValueTxtBySql("select isnull([Description],'') as Dienststelle FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE [Code]='" & o & "'  AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
        Return If(tmp <> "", tmp, o)
    End Function

--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -32,7 +32,7 @@ Namespace My
        
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.AVISO.frmLogin
+            Me.MainForm = AVISO.frmLogin
        End Sub
    End Class
 End Namespace
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.8.0.5")>
-<Assembly: AssemblyFileVersion("3.8.0.5")>
+<Assembly: AssemblyVersion("3.8.2.6")>
+<Assembly: AssemblyFileVersion("3.8.2.6")>
--- 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", "16.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()>  _
--- a/Aviso/Resources/ZwAbEinfuegen.png
+++ b/Aviso/Resources/ZwAbEinfuegen.png
--- a/Aviso/frmAnkunftAendern.vb
+++ b/Aviso/frmAnkunftAendern.vb
@@ -25,7 +25,8 @@
        If AVISO Is Nothing Then Exit Sub
        If AVISO.Grenzstelle.Replace("???", "") = "" Then
            If AVISO.Zollstelle IsNot Nothing Then
-                btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                ' btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                btnAktGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
            Else
                btnAktGrenze.Text = AVISO.Grenzstelle
            End If
--- a/Aviso/frmAviso_Vorpapiere.Designer.vb
+++ b/Aviso/frmAviso_Vorpapiere.Designer.vb
@@ -32,13 +32,13 @@ Partial Class frmAviso_Vorpapiere
        Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
        Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(0, 0)
        Me.UsrCntlAviso_Vorpapiere1.Name = "UsrCntlAviso_Vorpapiere1"
-        Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 157)
+        Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 164)
        Me.UsrCntlAviso_Vorpapiere1.TabIndex = 64
        '
        'btn
        '
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(289, 163)
+        Me.btn.Location = New System.Drawing.Point(289, 170)
        Me.btn.Name = "btn"
        Me.btn.Size = New System.Drawing.Size(109, 33)
        Me.btn.TabIndex = 65
@@ -55,7 +55,8 @@ Partial Class frmAviso_Vorpapiere
        Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmAviso_Vorpapiere"
-        Me.Text = "frmAviso_Vorpapiere"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Vorpapiere"
        Me.ResumeLayout(False)

    End Sub
--- a/Aviso/frmEintragAviso.designer.vb
+++ b/Aviso/frmEintragAviso.designer.vb
@@ -75,6 +75,7 @@ Partial Class frmEintragAviso
        Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblAktenuebersicht = New System.Windows.Forms.Label()
        Me.grpAviso = New System.Windows.Forms.GroupBox()
+        Me.cbxEintreffenAus = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblTeamFraechter = New System.Windows.Forms.Label()
        Me.lblTeamAvisierer = New System.Windows.Forms.Label()
        Me.cboTransportmittelart = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -82,7 +83,7 @@ Partial Class frmEintragAviso
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.lblErr_KdNr = New System.Windows.Forms.Label()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.btnStreckendauerBerechnen = New System.Windows.Forms.Button()
        Me.lblErrVorraussuchtlEintreffen = New System.Windows.Forms.Label()
        Me.txtAvisiererAuftragsNr = New System.Windows.Forms.TextBox()
        Me.lblAvisiererAtrNr = New System.Windows.Forms.Label()
@@ -728,6 +729,7 @@ Partial Class frmEintragAviso
        '
        'grpAviso
        '
+        Me.grpAviso.Controls.Add(Me.cbxEintreffenAus)
        Me.grpAviso.Controls.Add(Me.lblTeamFraechter)
        Me.grpAviso.Controls.Add(Me.lblTeamAvisierer)
        Me.grpAviso.Controls.Add(Me.cboTransportmittelart)
@@ -735,7 +737,7 @@ Partial Class frmEintragAviso
        Me.grpAviso.Controls.Add(Me.PictureBox1)
        Me.grpAviso.Controls.Add(Me.Button1)
        Me.grpAviso.Controls.Add(Me.lblErr_KdNr)
-        Me.grpAviso.Controls.Add(Me.Button5)
+        Me.grpAviso.Controls.Add(Me.btnStreckendauerBerechnen)
        Me.grpAviso.Controls.Add(Me.lblErrVorraussuchtlEintreffen)
        Me.grpAviso.Controls.Add(Me.txtAvisiererAuftragsNr)
        Me.grpAviso.Controls.Add(Me.lblAvisiererAtrNr)
@@ -788,6 +790,17 @@ Partial Class frmEintragAviso
        Me.grpAviso.TabStop = False
        Me.grpAviso.Text = "Aviso"
        '
+        'cbxEintreffenAus
+        '
+        Me.cbxEintreffenAus._allowedValuesFreiText = Nothing
+        Me.cbxEintreffenAus._allowFreiText = True
+        Me.cbxEintreffenAus._value = ""
+        Me.cbxEintreffenAus.FormattingEnabled = True
+        Me.cbxEintreffenAus.Location = New System.Drawing.Point(218, 99)
+        Me.cbxEintreffenAus.Name = "cbxEintreffenAus"
+        Me.cbxEintreffenAus.Size = New System.Drawing.Size(81, 21)
+        Me.cbxEintreffenAus.TabIndex = 51
+        '
        'lblTeamFraechter
        '
        Me.lblTeamFraechter.BackColor = System.Drawing.Color.Transparent
@@ -878,17 +891,16 @@ Partial Class frmEintragAviso
        Me.lblErr_KdNr.Text = "Kunden-Nummer eingeben!"
        Me.lblErr_KdNr.Visible = False
        '
-        'Button5
+        'btnStreckendauerBerechnen
        '
-        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Button5.Location = New System.Drawing.Point(272, 48)
-        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(119, 21)
-        Me.Button5.TabIndex = 7
-        Me.Button5.Text = "Berechnen"
-        Me.Button5.UseVisualStyleBackColor = True
-        Me.Button5.Visible = False
+        Me.btnStreckendauerBerechnen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnStreckendauerBerechnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnStreckendauerBerechnen.Location = New System.Drawing.Point(279, 45)
+        Me.btnStreckendauerBerechnen.Name = "btnStreckendauerBerechnen"
+        Me.btnStreckendauerBerechnen.Size = New System.Drawing.Size(118, 21)
+        Me.btnStreckendauerBerechnen.TabIndex = 7
+        Me.btnStreckendauerBerechnen.Text = "Berechnen"
+        Me.btnStreckendauerBerechnen.UseVisualStyleBackColor = True
        '
        'lblErrVorraussuchtlEintreffen
        '
@@ -896,9 +908,9 @@ Partial Class frmEintragAviso
        Me.lblErrVorraussuchtlEintreffen.ForeColor = System.Drawing.Color.Red
        Me.lblErrVorraussuchtlEintreffen.Location = New System.Drawing.Point(147, 69)
        Me.lblErrVorraussuchtlEintreffen.Name = "lblErrVorraussuchtlEintreffen"
-        Me.lblErrVorraussuchtlEintreffen.Size = New System.Drawing.Size(244, 13)
+        Me.lblErrVorraussuchtlEintreffen.Size = New System.Drawing.Size(250, 13)
        Me.lblErrVorraussuchtlEintreffen.TabIndex = 8
-        Me.lblErrVorraussuchtlEintreffen.Text = "Datum kann icht kleiner als Erfassungsdatum sein!"
+        Me.lblErrVorraussuchtlEintreffen.Text = "Datum kann nicht kleiner als Erfassungsdatum sein!"
        Me.lblErrVorraussuchtlEintreffen.Visible = False
        '
        'txtAvisiererAuftragsNr
@@ -1323,9 +1335,9 @@ Partial Class frmEintragAviso
        '
        Me.datVoraussichtlichesEintreffen.CustomFormat = "dd.MM.yyyy"
        Me.datVoraussichtlichesEintreffen.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.datVoraussichtlichesEintreffen.Location = New System.Drawing.Point(177, 48)
+        Me.datVoraussichtlichesEintreffen.Location = New System.Drawing.Point(171, 47)
        Me.datVoraussichtlichesEintreffen.Name = "datVoraussichtlichesEintreffen"
-        Me.datVoraussichtlichesEintreffen.Size = New System.Drawing.Size(89, 20)
+        Me.datVoraussichtlichesEintreffen.Size = New System.Drawing.Size(96, 20)
        Me.datVoraussichtlichesEintreffen.TabIndex = 6
        Me.datVoraussichtlichesEintreffen.Value = New Date(2020, 1, 23, 0, 0, 0, 0)
        Me.datVoraussichtlichesEintreffen.Visible = False
@@ -1521,6 +1533,7 @@ Partial Class frmEintragAviso
        Me.txtSendungen._DateTimeOnly = False
        Me.txtSendungen._numbersOnly = True
        Me.txtSendungen._numbersOnlyKommastellen = ""
+        Me.txtSendungen._numbersOnlyTrennzeichen = True
        Me.txtSendungen._Prozent = False
        Me.txtSendungen._ShortDateNew = False
        Me.txtSendungen._ShortDateOnly = False
@@ -1572,6 +1585,7 @@ Partial Class frmEintragAviso
        Me.txtSndFremd._DateTimeOnly = False
        Me.txtSndFremd._numbersOnly = True
        Me.txtSndFremd._numbersOnlyKommastellen = ""
+        Me.txtSndFremd._numbersOnlyTrennzeichen = True
        Me.txtSndFremd._Prozent = False
        Me.txtSndFremd._ShortDateNew = False
        Me.txtSndFremd._ShortDateOnly = False
@@ -1635,6 +1649,7 @@ Partial Class frmEintragAviso
        Me.txtSndFiskalDE._DateTimeOnly = False
        Me.txtSndFiskalDE._numbersOnly = True
        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
+        Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True
        Me.txtSndFiskalDE._Prozent = False
        Me.txtSndFiskalDE._ShortDateNew = False
        Me.txtSndFiskalDE._ShortDateOnly = False
@@ -1669,6 +1684,7 @@ Partial Class frmEintragAviso
        Me.txtSndFiskalAT._DateTimeOnly = False
        Me.txtSndFiskalAT._numbersOnly = True
        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
+        Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True
        Me.txtSndFiskalAT._Prozent = False
        Me.txtSndFiskalAT._ShortDateNew = False
        Me.txtSndFiskalAT._ShortDateOnly = False
@@ -2005,7 +2021,7 @@ Partial Class frmEintragAviso
    Friend WithEvents txtAvisiererAuftragsNr As TextBox
    Friend WithEvents lblAvisiererAtrNr As Label
    Friend WithEvents lblErrVorraussuchtlEintreffen As Label
-    Friend WithEvents Button5 As Button
+    Friend WithEvents btnStreckendauerBerechnen As Button
    Friend WithEvents lblVoraussEintreff As Label
    Friend WithEvents datVoraussichtlichesEintreffen As DateTimePicker
    Friend WithEvents columnName As DataGridViewTextBoxColumn
@@ -2021,4 +2037,5 @@ Partial Class frmEintragAviso
    Friend WithEvents Label4 As Label
    Friend WithEvents lblTeamFraechter As Label
    Friend WithEvents lblTeamAvisierer As Label
+    Friend WithEvents cbxEintreffenAus As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/Aviso/frmEintragAviso.resx
+++ b/Aviso/frmEintragAviso.resx
@@ -216,6 +216,12 @@
  <metadata name="clmnPfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnPfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -2,7 +2,8 @@
 Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 Imports System.Data.OleDb
 Imports System.Data.SqlClient
-Imports System.Drawing.Printing 
+Imports System.Drawing.Printing
+Imports System.Linq.Expressions

 Public Class frmEintragAviso
    '   Public frmHilf As frmMain
@@ -141,7 +142,8 @@ Public Class frmEintragAviso
                Label1.Visible = True
                cboImEx.Visible = True

-                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
                'txtBestimmungszollstelle.Visible = True
                'lblZA.Visible = True
                pnl.Visible = True
@@ -156,7 +158,8 @@ Public Class frmEintragAviso
                Label1.Visible = True
                cboImEx.Visible = True

-                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                '   txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})

                pnl.Visible = True
            Case "VERAG"
@@ -165,6 +168,7 @@ Public Class frmEintragAviso
                cboImEx.Text = "IMPORT"
            Case "VERIMEX"
                cboFirma.Enabled = True
+
        End Select

        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
@@ -197,6 +201,12 @@ Public Class frmEintragAviso
                lblSndFremd.Visible = True
                cboImEx.Visible = True
                Label1.Visible = True
+
+            Case "DTB"
+                cboImEx.Visible = True
+                Label1.Visible = True
+                lblFiskAT.Visible = False
+                txtSndFiskalAT.Visible = False
        End Select
        Select Case FIRMA_TMP
            Case "FRONTOFFICE"
@@ -257,30 +267,32 @@ Public Class frmEintragAviso

        btnOK.Enabled = True

+
+
        If FIRMA_TMP = "ATILLA" Then
-            cbxFrächterUnbekannt.Visible = True
-            cboGrenzstelle.Visible = False
-            lblGrenze.Visible = False
-            grpAktVerzollung.Visible = False
-            cbxSendungsvorlagen.Visible = False
-            Button3.Visible = False
-            cboGrenzstelle.changeItem("SUB")
-            cbxAuftraggeberfurAlleSendungen.Visible = False
-            If ATILLA_NEUERAKTENDECKEL Then
-                UsrCntlEintragAvisoAtilla.Visible = True
-                lblAenderungen.Visible = False
-                txtÄnderungen.Visible = False
-                cbxAktenzettelDrucken.Visible = True ': cbxAktenzettelDrucken.Checked = True --> checked, wenn ohne AVISO
+                cbxFrächterUnbekannt.Visible = True
+                cboGrenzstelle.Visible = False
+                lblGrenze.Visible = False
+                grpAktVerzollung.Visible = False
+                cbxSendungsvorlagen.Visible = False
+                Button3.Visible = False
+                cboGrenzstelle.changeItem("SUB")
+                cbxAuftraggeberfurAlleSendungen.Visible = False
+                If ATILLA_NEUERAKTENDECKEL Then
+                    UsrCntlEintragAvisoAtilla.Visible = True
+                    lblAenderungen.Visible = False
+                    txtÄnderungen.Visible = False
+                    cbxAktenzettelDrucken.Visible = True ': cbxAktenzettelDrucken.Checked = True --> checked, wenn ohne AVISO
+
+                End If
+
+                lblAtr.Visible = True
+                kdAuftraggeber.Visible = True
+                btnAuftraggeber.Visible = True
+                lblAtrAvis.Visible = True
+
            End If
-
-
-            lblAtr.Visible = True
-            kdAuftraggeber.Visible = True
-            btnAuftraggeber.Visible = True
-            lblAtrAvis.Visible = True
-
-        End If
-        Dim bearb As Boolean = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me.FindForm)
+            Dim bearb As Boolean = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me.FindForm)

        If cGlobal.Aktive_ID = 0 Then
            'es erfolgt eine Neuanlage
@@ -303,6 +315,9 @@ Public Class frmEintragAviso
                    cboGrenzstelle.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG)
                End If
            End If
+            If FIRMA_TMP = "ATILLA" Then
+                cboGrenzstelle.changeItem("AMB")
+            End If
        Else
            Me.Text = "Änderung LKW-Aviso"
            'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False
@@ -519,6 +534,7 @@ Public Class frmEintragAviso
            dtpAvisoEingangZeit.Enabled = bearb
        End If

+        'cbxEintreffenAus.fillWithSQL("SELECT [nctsr_dauer_in_tagen], [nctsr_von] FROM [tblNTCSRouten] ", False, "FMZOLL", False)

        initAttachment()

@@ -860,9 +876,9 @@ Public Class frmEintragAviso
            myAviso.Transportmittelart = cboTransportmittelart._value


-            If FIRMA_TMP = "AMBAR" Then
-                myAviso.Grenzstelle = "AMB"
-            End If
+            'If FIRMA_TMP = "AMBAR" Then
+            '    myAviso.Grenzstelle = "AMB"
+            'End If


            '  myAviso.Buero = cboGrenzstelle.Text
@@ -1691,13 +1707,14 @@ Public Class frmEintragAviso

        pnl.Visible = False
        ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED")
-        Label1.Visible = (cboGrenzstelle._value = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED")
+        Label1.Visible = (cboGrenzstelle._value = "WAI" Or cboGrenzstelle._value = "DTB" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED")

        Select Case FIRMA_TMP
-            Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR"
+            Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR", "VERIMEX"

                If cboGrenzstelle._value = "???" Then
-                    txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                    'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                    txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
                    'txtBestimmungszollstelle.Visible = True
                    'lblZA.Visible = True
                    pnl.Visible = True
@@ -1825,4 +1842,30 @@ Public Class frmEintragAviso
            lblAtrAvis_Click(lblAtrAvis, New EventArgs)
        End If
    End Sub
+
+
+
+
+
+    Private Sub Button5_Click_1(sender As Object, e As EventArgs) Handles btnStreckendauerBerechnen.Click
+
+        Dim destination As String = ""
+
+        If cboGrenzstelle._value = "???" AndAlso txtBestimmungszollstelle._value IsNot "" Then
+            destination = txtBestimmungszollstelle._value
+        Else
+            destination = cboGrenzstelle._value
+        End If
+
+        If destination Is "" Or destination Is Nothing Then
+            MsgBox("Zur Berechnung muss vorher eine Grenzstelle/Zollstelle ausgewählt werden!")
+        Else
+            Dim frmRouteBerechnen = New frmRoutendauerBerechnen(destination)
+
+            If frmRouteBerechnen.ShowDialog() = DialogResult.OK Then
+                datVoraussichtlichesEintreffen.Value = frmRouteBerechnen.calculatedDate
+            End If
+
+        End If
+    End Sub
 End Class
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -0,0 +1,837 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEssensbestellungen
+    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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Me.lblWochenkarte = New System.Windows.Forms.Label()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.lblDatum = New System.Windows.Forms.Label()
+        Me.ToolTipInfoMo = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTipInfoDi = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTipInfoMi = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTipInfoDo = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTipInfoFr = New System.Windows.Forms.ToolTip(Me.components)
+        Me.lblAbteilung = New System.Windows.Forms.Label()
+        Me.lblGebaeude = New System.Windows.Forms.Label()
+        Me.lblBestellungen = New System.Windows.Forms.Label()
+        Me.lblBestellungBis = New System.Windows.Forms.Label()
+        Me.cbxGebauede = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.txtPreis = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Dienstag = New System.Windows.Forms.GroupBox()
+        Me.pbDienstag = New System.Windows.Forms.PictureBox()
+        Me.cbDienstag = New System.Windows.Forms.CheckBox()
+        Me.txtAltDi = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.rbMenuAlt_Di = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.rbMenu_Di = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.lbl1 = New System.Windows.Forms.Label()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.pbMontag = New System.Windows.Forms.PictureBox()
+        Me.cbMontag = New System.Windows.Forms.CheckBox()
+        Me.txtAltMo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.rbMenoAlt_Mo = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.rbMenu_Mo = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.pbFreitag = New System.Windows.Forms.PictureBox()
+        Me.cbFreitag = New System.Windows.Forms.CheckBox()
+        Me.txtAltFr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.rbMenuAlt_Fr = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.rbMenu_Fr = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.txtAnzahlLaCart = New System.Windows.Forms.Label()
+        Me.lbl2 = New System.Windows.Forms.Label()
+        Me.Mittwoch = New System.Windows.Forms.GroupBox()
+        Me.pbMittwoch = New System.Windows.Forms.PictureBox()
+        Me.cbMittwoch = New System.Windows.Forms.CheckBox()
+        Me.txtAltMi = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.rbMenuAlt_Mi = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.rbMenu_Mi = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+        Me.pbDonnerstag = New System.Windows.Forms.PictureBox()
+        Me.cbDonnerstag = New System.Windows.Forms.CheckBox()
+        Me.txtAltDo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.rbMenuAlt_Do = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.rbMenu_Do = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components)
+        Me.txtAnzahlMenu = New System.Windows.Forms.Label()
+        Me.dgvBestellungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.cbxMenu = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtAbteilung = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.MyPanel1.SuspendLayout()
+        Me.Dienstag.SuspendLayout()
+        CType(Me.pbDienstag, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox1.SuspendLayout()
+        CType(Me.pbMontag, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox5.SuspendLayout()
+        CType(Me.pbFreitag, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Mittwoch.SuspendLayout()
+        CType(Me.pbMittwoch, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox4.SuspendLayout()
+        CType(Me.pbDonnerstag, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvBestellungen, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'lblWochenkarte
+        '
+        Me.lblWochenkarte.AutoSize = True
+        Me.lblWochenkarte.Location = New System.Drawing.Point(18, 14)
+        Me.lblWochenkarte.Name = "lblWochenkarte"
+        Me.lblWochenkarte.Size = New System.Drawing.Size(34, 13)
+        Me.lblWochenkarte.TabIndex = 1
+        Me.lblWochenkarte.Text = "Menü"
+        '
+        'btnSave
+        '
+        Me.btnSave.Anchor = System.Windows.Forms.AnchorStyles.Bottom
+        Me.btnSave.Location = New System.Drawing.Point(305, 484)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 10
+        Me.btnSave.Text = "OK"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
+        'lblDatum
+        '
+        Me.lblDatum.AutoSize = True
+        Me.lblDatum.Location = New System.Drawing.Point(167, 14)
+        Me.lblDatum.Name = "lblDatum"
+        Me.lblDatum.Size = New System.Drawing.Size(41, 13)
+        Me.lblDatum.TabIndex = 11
+        Me.lblDatum.Text = "Datum:"
+        '
+        'lblAbteilung
+        '
+        Me.lblAbteilung.AutoSize = True
+        Me.lblAbteilung.Location = New System.Drawing.Point(511, 9)
+        Me.lblAbteilung.Name = "lblAbteilung"
+        Me.lblAbteilung.Size = New System.Drawing.Size(54, 13)
+        Me.lblAbteilung.TabIndex = 18
+        Me.lblAbteilung.Text = "Abteilung:"
+        '
+        'lblGebaeude
+        '
+        Me.lblGebaeude.AutoSize = True
+        Me.lblGebaeude.Location = New System.Drawing.Point(511, 27)
+        Me.lblGebaeude.Name = "lblGebaeude"
+        Me.lblGebaeude.Size = New System.Drawing.Size(54, 13)
+        Me.lblGebaeude.TabIndex = 19
+        Me.lblGebaeude.Text = "Gebäude:"
+        '
+        'lblBestellungen
+        '
+        Me.lblBestellungen.AutoSize = True
+        Me.lblBestellungen.Location = New System.Drawing.Point(15, 335)
+        Me.lblBestellungen.Name = "lblBestellungen"
+        Me.lblBestellungen.Size = New System.Drawing.Size(100, 13)
+        Me.lblBestellungen.TabIndex = 20
+        Me.lblBestellungen.Text = "Meine Bestellungen"
+        '
+        'lblBestellungBis
+        '
+        Me.lblBestellungBis.AutoSize = True
+        Me.lblBestellungBis.Location = New System.Drawing.Point(167, 38)
+        Me.lblBestellungBis.Name = "lblBestellungBis"
+        Me.lblBestellungBis.Size = New System.Drawing.Size(114, 13)
+        Me.lblBestellungBis.TabIndex = 22
+        Me.lblBestellungBis.Text = "Bestellung möglich bis:"
+        '
+        'cbxGebauede
+        '
+        Me.cbxGebauede._allowedValuesFreiText = Nothing
+        Me.cbxGebauede._allowFreiText = True
+        Me.cbxGebauede._value = ""
+        Me.cbxGebauede.DropDownWidth = 150
+        Me.cbxGebauede.FormattingEnabled = True
+        Me.cbxGebauede.Location = New System.Drawing.Point(584, 24)
+        Me.cbxGebauede.Name = "cbxGebauede"
+        Me.cbxGebauede.Size = New System.Drawing.Size(95, 21)
+        Me.cbxGebauede.TabIndex = 21
+        '
+        'MyPanel1
+        '
+        Me.MyPanel1.Controls.Add(Me.Button1)
+        Me.MyPanel1.Controls.Add(Me.txtPreis)
+        Me.MyPanel1.Controls.Add(Me.Label2)
+        Me.MyPanel1.Controls.Add(Me.Dienstag)
+        Me.MyPanel1.Controls.Add(Me.lbl1)
+        Me.MyPanel1.Controls.Add(Me.GroupBox1)
+        Me.MyPanel1.Controls.Add(Me.GroupBox5)
+        Me.MyPanel1.Controls.Add(Me.txtAnzahlLaCart)
+        Me.MyPanel1.Controls.Add(Me.lbl2)
+        Me.MyPanel1.Controls.Add(Me.Mittwoch)
+        Me.MyPanel1.Controls.Add(Me.GroupBox4)
+        Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu)
+        Me.MyPanel1.Location = New System.Drawing.Point(12, 67)
+        Me.MyPanel1.Name = "MyPanel1"
+        Me.MyPanel1.Size = New System.Drawing.Size(667, 240)
+        Me.MyPanel1.TabIndex = 18
+        '
+        'Button1
+        '
+        Me.Button1.Image = Global.AVISO.My.Resources.Resources.pdf1
+        Me.Button1.Location = New System.Drawing.Point(590, 147)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(61, 57)
+        Me.Button1.TabIndex = 20
+        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button1.Visible = False
+        '
+        'txtPreis
+        '
+        Me.txtPreis.AutoSize = True
+        Me.txtPreis.Location = New System.Drawing.Point(553, 181)
+        Me.txtPreis.Name = "txtPreis"
+        Me.txtPreis.Size = New System.Drawing.Size(13, 13)
+        Me.txtPreis.TabIndex = 19
+        Me.txtPreis.Text = "0"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(463, 181)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(68, 13)
+        Me.Label2.TabIndex = 18
+        Me.Label2.Text = "Gesamtpreis:"
+        '
+        'Dienstag
+        '
+        Me.Dienstag.Controls.Add(Me.pbDienstag)
+        Me.Dienstag.Controls.Add(Me.cbDienstag)
+        Me.Dienstag.Controls.Add(Me.txtAltDi)
+        Me.Dienstag.Controls.Add(Me.rbMenuAlt_Di)
+        Me.Dienstag.Controls.Add(Me.rbMenu_Di)
+        Me.Dienstag.Location = New System.Drawing.Point(225, 8)
+        Me.Dienstag.Name = "Dienstag"
+        Me.Dienstag.Size = New System.Drawing.Size(200, 95)
+        Me.Dienstag.TabIndex = 13
+        Me.Dienstag.TabStop = False
+        Me.Dienstag.Text = "Dienstag"
+        '
+        'pbDienstag
+        '
+        Me.pbDienstag.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.pbDienstag.Location = New System.Drawing.Point(61, 23)
+        Me.pbDienstag.Name = "pbDienstag"
+        Me.pbDienstag.Size = New System.Drawing.Size(17, 13)
+        Me.pbDienstag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.pbDienstag.TabIndex = 5
+        Me.pbDienstag.TabStop = False
+        '
+        'cbDienstag
+        '
+        Me.cbDienstag.AutoSize = True
+        Me.cbDienstag.Location = New System.Drawing.Point(0, 0)
+        Me.cbDienstag.Name = "cbDienstag"
+        Me.cbDienstag.Size = New System.Drawing.Size(68, 17)
+        Me.cbDienstag.TabIndex = 4
+        Me.cbDienstag.Text = "Dienstag"
+        Me.cbDienstag.UseVisualStyleBackColor = True
+        '
+        'txtAltDi
+        '
+        Me.txtAltDi._DateTimeOnly = False
+        Me.txtAltDi._numbersOnly = False
+        Me.txtAltDi._numbersOnlyKommastellen = ""
+        Me.txtAltDi._numbersOnlyTrennzeichen = True
+        Me.txtAltDi._Prozent = False
+        Me.txtAltDi._ShortDateNew = False
+        Me.txtAltDi._ShortDateOnly = False
+        Me.txtAltDi._TimeOnly = False
+        Me.txtAltDi._TimeOnly_Seconds = False
+        Me.txtAltDi._value = ""
+        Me.txtAltDi._Waehrung = False
+        Me.txtAltDi._WaehrungZeichen = True
+        Me.txtAltDi.ForeColor = System.Drawing.Color.Black
+        Me.txtAltDi.Location = New System.Drawing.Point(0, 65)
+        Me.txtAltDi.MaxLineLength = -1
+        Me.txtAltDi.MaxLines_Warning = ""
+        Me.txtAltDi.MaxLines_Warning_Label = Nothing
+        Me.txtAltDi.Name = "txtAltDi"
+        Me.txtAltDi.Size = New System.Drawing.Size(177, 20)
+        Me.txtAltDi.TabIndex = 2
+        Me.txtAltDi.Visible = False
+        '
+        'rbMenuAlt_Di
+        '
+        Me.rbMenuAlt_Di.AutoSize = True
+        Me.rbMenuAlt_Di.GroupName = "Dienstag"
+        Me.rbMenuAlt_Di.Location = New System.Drawing.Point(3, 42)
+        Me.rbMenuAlt_Di.Name = "rbMenuAlt_Di"
+        Me.rbMenuAlt_Di.Size = New System.Drawing.Size(70, 17)
+        Me.rbMenuAlt_Di.TabIndex = 1
+        Me.rbMenuAlt_Di.TabStop = True
+        Me.rbMenuAlt_Di.Text = "A la carte"
+        Me.rbMenuAlt_Di.UseVisualStyleBackColor = True
+        '
+        'rbMenu_Di
+        '
+        Me.rbMenu_Di.AutoSize = True
+        Me.rbMenu_Di.GroupName = "Dienstag"
+        Me.rbMenu_Di.Location = New System.Drawing.Point(3, 19)
+        Me.rbMenu_Di.Name = "rbMenu_Di"
+        Me.rbMenu_Di.Size = New System.Drawing.Size(52, 17)
+        Me.rbMenu_Di.TabIndex = 0
+        Me.rbMenu_Di.TabStop = True
+        Me.rbMenu_Di.Text = "Menü"
+        Me.rbMenu_Di.UseVisualStyleBackColor = True
+        '
+        'lbl1
+        '
+        Me.lbl1.AutoSize = True
+        Me.lbl1.Location = New System.Drawing.Point(463, 128)
+        Me.lbl1.Name = "lbl1"
+        Me.lbl1.Size = New System.Drawing.Size(72, 13)
+        Me.lbl1.TabIndex = 14
+        Me.lbl1.Text = "Anzahl Menü:"
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.pbMontag)
+        Me.GroupBox1.Controls.Add(Me.cbMontag)
+        Me.GroupBox1.Controls.Add(Me.txtAltMo)
+        Me.GroupBox1.Controls.Add(Me.rbMenoAlt_Mo)
+        Me.GroupBox1.Controls.Add(Me.rbMenu_Mo)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 8)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(200, 95)
+        Me.GroupBox1.TabIndex = 12
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Montag"
+        '
+        'pbMontag
+        '
+        Me.pbMontag.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.pbMontag.Location = New System.Drawing.Point(61, 23)
+        Me.pbMontag.Name = "pbMontag"
+        Me.pbMontag.Size = New System.Drawing.Size(17, 13)
+        Me.pbMontag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.pbMontag.TabIndex = 4
+        Me.pbMontag.TabStop = False
+        '
+        'cbMontag
+        '
+        Me.cbMontag.AutoSize = True
+        Me.cbMontag.Location = New System.Drawing.Point(3, 0)
+        Me.cbMontag.Name = "cbMontag"
+        Me.cbMontag.Size = New System.Drawing.Size(62, 17)
+        Me.cbMontag.TabIndex = 3
+        Me.cbMontag.Text = "Montag"
+        Me.cbMontag.UseVisualStyleBackColor = True
+        '
+        'txtAltMo
+        '
+        Me.txtAltMo._DateTimeOnly = False
+        Me.txtAltMo._numbersOnly = False
+        Me.txtAltMo._numbersOnlyKommastellen = ""
+        Me.txtAltMo._numbersOnlyTrennzeichen = True
+        Me.txtAltMo._Prozent = False
+        Me.txtAltMo._ShortDateNew = False
+        Me.txtAltMo._ShortDateOnly = False
+        Me.txtAltMo._TimeOnly = False
+        Me.txtAltMo._TimeOnly_Seconds = False
+        Me.txtAltMo._value = ""
+        Me.txtAltMo._Waehrung = False
+        Me.txtAltMo._WaehrungZeichen = True
+        Me.txtAltMo.ForeColor = System.Drawing.Color.Black
+        Me.txtAltMo.Location = New System.Drawing.Point(0, 65)
+        Me.txtAltMo.MaxLineLength = -1
+        Me.txtAltMo.MaxLines_Warning = ""
+        Me.txtAltMo.MaxLines_Warning_Label = Nothing
+        Me.txtAltMo.Name = "txtAltMo"
+        Me.txtAltMo.Size = New System.Drawing.Size(177, 20)
+        Me.txtAltMo.TabIndex = 2
+        Me.txtAltMo.Visible = False
+        '
+        'rbMenoAlt_Mo
+        '
+        Me.rbMenoAlt_Mo.AutoSize = True
+        Me.rbMenoAlt_Mo.GroupName = "GroupBox1"
+        Me.rbMenoAlt_Mo.Location = New System.Drawing.Point(3, 42)
+        Me.rbMenoAlt_Mo.Name = "rbMenoAlt_Mo"
+        Me.rbMenoAlt_Mo.Size = New System.Drawing.Size(70, 17)
+        Me.rbMenoAlt_Mo.TabIndex = 1
+        Me.rbMenoAlt_Mo.TabStop = True
+        Me.rbMenoAlt_Mo.Text = "A la carte"
+        Me.rbMenoAlt_Mo.UseVisualStyleBackColor = True
+        '
+        'rbMenu_Mo
+        '
+        Me.rbMenu_Mo.AutoSize = True
+        Me.rbMenu_Mo.GroupName = "GroupBox1"
+        Me.rbMenu_Mo.Location = New System.Drawing.Point(3, 19)
+        Me.rbMenu_Mo.Name = "rbMenu_Mo"
+        Me.rbMenu_Mo.Size = New System.Drawing.Size(52, 17)
+        Me.rbMenu_Mo.TabIndex = 0
+        Me.rbMenu_Mo.TabStop = True
+        Me.rbMenu_Mo.Text = "Menü"
+        Me.rbMenu_Mo.UseVisualStyleBackColor = True
+        '
+        'GroupBox5
+        '
+        Me.GroupBox5.Controls.Add(Me.pbFreitag)
+        Me.GroupBox5.Controls.Add(Me.cbFreitag)
+        Me.GroupBox5.Controls.Add(Me.txtAltFr)
+        Me.GroupBox5.Controls.Add(Me.rbMenuAlt_Fr)
+        Me.GroupBox5.Controls.Add(Me.rbMenu_Fr)
+        Me.GroupBox5.Location = New System.Drawing.Point(225, 109)
+        Me.GroupBox5.Name = "GroupBox5"
+        Me.GroupBox5.Size = New System.Drawing.Size(200, 95)
+        Me.GroupBox5.TabIndex = 13
+        Me.GroupBox5.TabStop = False
+        Me.GroupBox5.Text = "Freitag"
+        '
+        'pbFreitag
+        '
+        Me.pbFreitag.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.pbFreitag.Location = New System.Drawing.Point(61, 23)
+        Me.pbFreitag.Name = "pbFreitag"
+        Me.pbFreitag.Size = New System.Drawing.Size(17, 13)
+        Me.pbFreitag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.pbFreitag.TabIndex = 8
+        Me.pbFreitag.TabStop = False
+        '
+        'cbFreitag
+        '
+        Me.cbFreitag.AutoSize = True
+        Me.cbFreitag.Location = New System.Drawing.Point(3, 0)
+        Me.cbFreitag.Name = "cbFreitag"
+        Me.cbFreitag.Size = New System.Drawing.Size(58, 17)
+        Me.cbFreitag.TabIndex = 6
+        Me.cbFreitag.Text = "Freitag"
+        Me.cbFreitag.UseVisualStyleBackColor = True
+        '
+        'txtAltFr
+        '
+        Me.txtAltFr._DateTimeOnly = False
+        Me.txtAltFr._numbersOnly = False
+        Me.txtAltFr._numbersOnlyKommastellen = ""
+        Me.txtAltFr._numbersOnlyTrennzeichen = True
+        Me.txtAltFr._Prozent = False
+        Me.txtAltFr._ShortDateNew = False
+        Me.txtAltFr._ShortDateOnly = False
+        Me.txtAltFr._TimeOnly = False
+        Me.txtAltFr._TimeOnly_Seconds = False
+        Me.txtAltFr._value = ""
+        Me.txtAltFr._Waehrung = False
+        Me.txtAltFr._WaehrungZeichen = True
+        Me.txtAltFr.ForeColor = System.Drawing.Color.Black
+        Me.txtAltFr.Location = New System.Drawing.Point(0, 65)
+        Me.txtAltFr.MaxLineLength = -1
+        Me.txtAltFr.MaxLines_Warning = ""
+        Me.txtAltFr.MaxLines_Warning_Label = Nothing
+        Me.txtAltFr.Name = "txtAltFr"
+        Me.txtAltFr.Size = New System.Drawing.Size(177, 20)
+        Me.txtAltFr.TabIndex = 2
+        Me.txtAltFr.Visible = False
+        '
+        'rbMenuAlt_Fr
+        '
+        Me.rbMenuAlt_Fr.AutoSize = True
+        Me.rbMenuAlt_Fr.GroupName = "Freitag"
+        Me.rbMenuAlt_Fr.Location = New System.Drawing.Point(3, 42)
+        Me.rbMenuAlt_Fr.Name = "rbMenuAlt_Fr"
+        Me.rbMenuAlt_Fr.Size = New System.Drawing.Size(70, 17)
+        Me.rbMenuAlt_Fr.TabIndex = 1
+        Me.rbMenuAlt_Fr.TabStop = True
+        Me.rbMenuAlt_Fr.Text = "A la carte"
+        Me.rbMenuAlt_Fr.UseVisualStyleBackColor = True
+        '
+        'rbMenu_Fr
+        '
+        Me.rbMenu_Fr.AutoSize = True
+        Me.rbMenu_Fr.GroupName = "Freitag"
+        Me.rbMenu_Fr.Location = New System.Drawing.Point(3, 19)
+        Me.rbMenu_Fr.Name = "rbMenu_Fr"
+        Me.rbMenu_Fr.Size = New System.Drawing.Size(52, 17)
+        Me.rbMenu_Fr.TabIndex = 0
+        Me.rbMenu_Fr.TabStop = True
+        Me.rbMenu_Fr.Text = "Menü"
+        Me.rbMenu_Fr.UseVisualStyleBackColor = True
+        '
+        'txtAnzahlLaCart
+        '
+        Me.txtAnzahlLaCart.AutoSize = True
+        Me.txtAnzahlLaCart.Location = New System.Drawing.Point(553, 155)
+        Me.txtAnzahlLaCart.Name = "txtAnzahlLaCart"
+        Me.txtAnzahlLaCart.Size = New System.Drawing.Size(13, 13)
+        Me.txtAnzahlLaCart.TabIndex = 17
+        Me.txtAnzahlLaCart.Text = "0"
+        '
+        'lbl2
+        '
+        Me.lbl2.AutoSize = True
+        Me.lbl2.Location = New System.Drawing.Point(463, 155)
+        Me.lbl2.Name = "lbl2"
+        Me.lbl2.Size = New System.Drawing.Size(90, 13)
+        Me.lbl2.TabIndex = 15
+        Me.lbl2.Text = "Anzahl a la Carte:"
+        '
+        'Mittwoch
+        '
+        Me.Mittwoch.Controls.Add(Me.pbMittwoch)
+        Me.Mittwoch.Controls.Add(Me.cbMittwoch)
+        Me.Mittwoch.Controls.Add(Me.txtAltMi)
+        Me.Mittwoch.Controls.Add(Me.rbMenuAlt_Mi)
+        Me.Mittwoch.Controls.Add(Me.rbMenu_Mi)
+        Me.Mittwoch.Location = New System.Drawing.Point(431, 8)
+        Me.Mittwoch.Name = "Mittwoch"
+        Me.Mittwoch.Size = New System.Drawing.Size(200, 95)
+        Me.Mittwoch.TabIndex = 13
+        Me.Mittwoch.TabStop = False
+        Me.Mittwoch.Text = "Mittwoch"
+        '
+        'pbMittwoch
+        '
+        Me.pbMittwoch.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.pbMittwoch.Location = New System.Drawing.Point(56, 23)
+        Me.pbMittwoch.Name = "pbMittwoch"
+        Me.pbMittwoch.Size = New System.Drawing.Size(17, 13)
+        Me.pbMittwoch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.pbMittwoch.TabIndex = 6
+        Me.pbMittwoch.TabStop = False
+        '
+        'cbMittwoch
+        '
+        Me.cbMittwoch.AutoSize = True
+        Me.cbMittwoch.Location = New System.Drawing.Point(0, 0)
+        Me.cbMittwoch.Name = "cbMittwoch"
+        Me.cbMittwoch.Size = New System.Drawing.Size(69, 17)
+        Me.cbMittwoch.TabIndex = 5
+        Me.cbMittwoch.Text = "Mittwoch"
+        Me.cbMittwoch.UseVisualStyleBackColor = True
+        '
+        'txtAltMi
+        '
+        Me.txtAltMi._DateTimeOnly = False
+        Me.txtAltMi._numbersOnly = False
+        Me.txtAltMi._numbersOnlyKommastellen = ""
+        Me.txtAltMi._numbersOnlyTrennzeichen = True
+        Me.txtAltMi._Prozent = False
+        Me.txtAltMi._ShortDateNew = False
+        Me.txtAltMi._ShortDateOnly = False
+        Me.txtAltMi._TimeOnly = False
+        Me.txtAltMi._TimeOnly_Seconds = False
+        Me.txtAltMi._value = ""
+        Me.txtAltMi._Waehrung = False
+        Me.txtAltMi._WaehrungZeichen = True
+        Me.txtAltMi.ForeColor = System.Drawing.Color.Black
+        Me.txtAltMi.Location = New System.Drawing.Point(0, 65)
+        Me.txtAltMi.MaxLineLength = -1
+        Me.txtAltMi.MaxLines_Warning = ""
+        Me.txtAltMi.MaxLines_Warning_Label = Nothing
+        Me.txtAltMi.Name = "txtAltMi"
+        Me.txtAltMi.Size = New System.Drawing.Size(177, 20)
+        Me.txtAltMi.TabIndex = 2
+        Me.txtAltMi.Visible = False
+        '
+        'rbMenuAlt_Mi
+        '
+        Me.rbMenuAlt_Mi.AutoSize = True
+        Me.rbMenuAlt_Mi.GroupName = "Mittwoch"
+        Me.rbMenuAlt_Mi.Location = New System.Drawing.Point(3, 42)
+        Me.rbMenuAlt_Mi.Name = "rbMenuAlt_Mi"
+        Me.rbMenuAlt_Mi.Size = New System.Drawing.Size(70, 17)
+        Me.rbMenuAlt_Mi.TabIndex = 1
+        Me.rbMenuAlt_Mi.TabStop = True
+        Me.rbMenuAlt_Mi.Text = "A la carte"
+        Me.rbMenuAlt_Mi.UseVisualStyleBackColor = True
+        '
+        'rbMenu_Mi
+        '
+        Me.rbMenu_Mi.AutoSize = True
+        Me.rbMenu_Mi.GroupName = "Mittwoch"
+        Me.rbMenu_Mi.Location = New System.Drawing.Point(3, 19)
+        Me.rbMenu_Mi.Name = "rbMenu_Mi"
+        Me.rbMenu_Mi.Size = New System.Drawing.Size(52, 17)
+        Me.rbMenu_Mi.TabIndex = 0
+        Me.rbMenu_Mi.TabStop = True
+        Me.rbMenu_Mi.Text = "Menü"
+        Me.rbMenu_Mi.UseVisualStyleBackColor = True
+        '
+        'GroupBox4
+        '
+        Me.GroupBox4.Controls.Add(Me.pbDonnerstag)
+        Me.GroupBox4.Controls.Add(Me.cbDonnerstag)
+        Me.GroupBox4.Controls.Add(Me.txtAltDo)
+        Me.GroupBox4.Controls.Add(Me.rbMenuAlt_Do)
+        Me.GroupBox4.Controls.Add(Me.rbMenu_Do)
+        Me.GroupBox4.Location = New System.Drawing.Point(3, 109)
+        Me.GroupBox4.Name = "GroupBox4"
+        Me.GroupBox4.Size = New System.Drawing.Size(200, 95)
+        Me.GroupBox4.TabIndex = 13
+        Me.GroupBox4.TabStop = False
+        Me.GroupBox4.Text = "Donnerstag"
+        '
+        'pbDonnerstag
+        '
+        Me.pbDonnerstag.Image = Global.AVISO.My.Resources.Resources.documents
+        Me.pbDonnerstag.Location = New System.Drawing.Point(56, 21)
+        Me.pbDonnerstag.Name = "pbDonnerstag"
+        Me.pbDonnerstag.Size = New System.Drawing.Size(17, 13)
+        Me.pbDonnerstag.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.pbDonnerstag.TabIndex = 7
+        Me.pbDonnerstag.TabStop = False
+        '
+        'cbDonnerstag
+        '
+        Me.cbDonnerstag.AutoSize = True
+        Me.cbDonnerstag.Location = New System.Drawing.Point(3, 0)
+        Me.cbDonnerstag.Name = "cbDonnerstag"
+        Me.cbDonnerstag.Size = New System.Drawing.Size(81, 17)
+        Me.cbDonnerstag.TabIndex = 7
+        Me.cbDonnerstag.Text = "Donnerstag"
+        Me.cbDonnerstag.UseVisualStyleBackColor = True
+        '
+        'txtAltDo
+        '
+        Me.txtAltDo._DateTimeOnly = False
+        Me.txtAltDo._numbersOnly = False
+        Me.txtAltDo._numbersOnlyKommastellen = ""
+        Me.txtAltDo._numbersOnlyTrennzeichen = True
+        Me.txtAltDo._Prozent = False
+        Me.txtAltDo._ShortDateNew = False
+        Me.txtAltDo._ShortDateOnly = False
+        Me.txtAltDo._TimeOnly = False
+        Me.txtAltDo._TimeOnly_Seconds = False
+        Me.txtAltDo._value = ""
+        Me.txtAltDo._Waehrung = False
+        Me.txtAltDo._WaehrungZeichen = True
+        Me.txtAltDo.ForeColor = System.Drawing.Color.Black
+        Me.txtAltDo.Location = New System.Drawing.Point(0, 65)
+        Me.txtAltDo.MaxLineLength = -1
+        Me.txtAltDo.MaxLines_Warning = ""
+        Me.txtAltDo.MaxLines_Warning_Label = Nothing
+        Me.txtAltDo.Name = "txtAltDo"
+        Me.txtAltDo.Size = New System.Drawing.Size(177, 20)
+        Me.txtAltDo.TabIndex = 2
+        Me.txtAltDo.Visible = False
+        '
+        'rbMenuAlt_Do
+        '
+        Me.rbMenuAlt_Do.AutoSize = True
+        Me.rbMenuAlt_Do.GroupName = "Donnerstag"
+        Me.rbMenuAlt_Do.Location = New System.Drawing.Point(3, 42)
+        Me.rbMenuAlt_Do.Name = "rbMenuAlt_Do"
+        Me.rbMenuAlt_Do.Size = New System.Drawing.Size(70, 17)
+        Me.rbMenuAlt_Do.TabIndex = 1
+        Me.rbMenuAlt_Do.TabStop = True
+        Me.rbMenuAlt_Do.Text = "A la carte"
+        Me.rbMenuAlt_Do.UseVisualStyleBackColor = True
+        '
+        'rbMenu_Do
+        '
+        Me.rbMenu_Do.AutoSize = True
+        Me.rbMenu_Do.GroupName = "Donnerstag"
+        Me.rbMenu_Do.Location = New System.Drawing.Point(3, 19)
+        Me.rbMenu_Do.Name = "rbMenu_Do"
+        Me.rbMenu_Do.Size = New System.Drawing.Size(52, 17)
+        Me.rbMenu_Do.TabIndex = 0
+        Me.rbMenu_Do.TabStop = True
+        Me.rbMenu_Do.Text = "Menü"
+        Me.rbMenu_Do.UseVisualStyleBackColor = True
+        '
+        'txtAnzahlMenu
+        '
+        Me.txtAnzahlMenu.AutoSize = True
+        Me.txtAnzahlMenu.Location = New System.Drawing.Point(553, 130)
+        Me.txtAnzahlMenu.Name = "txtAnzahlMenu"
+        Me.txtAnzahlMenu.Size = New System.Drawing.Size(13, 13)
+        Me.txtAnzahlMenu.TabIndex = 16
+        Me.txtAnzahlMenu.Text = "0"
+        '
+        'dgvBestellungen
+        '
+        Me.dgvBestellungen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvBestellungen.AllowUserToAddRows = False
+        Me.dgvBestellungen.AllowUserToDeleteRows = False
+        Me.dgvBestellungen.AllowUserToOrderColumns = True
+        Me.dgvBestellungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgvBestellungen.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvBestellungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvBestellungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvBestellungen.Location = New System.Drawing.Point(16, 351)
+        Me.dgvBestellungen.Name = "dgvBestellungen"
+        Me.dgvBestellungen.ReadOnly = True
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvBestellungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvBestellungen.ShowEditingIcon = False
+        Me.dgvBestellungen.Size = New System.Drawing.Size(663, 127)
+        Me.dgvBestellungen.TabIndex = 2
+        '
+        'cbxMenu
+        '
+        Me.cbxMenu._allowedValuesFreiText = Nothing
+        Me.cbxMenu._allowFreiText = False
+        Me.cbxMenu._value = ""
+        Me.cbxMenu.DropDownWidth = 200
+        Me.cbxMenu.FormattingEnabled = True
+        Me.cbxMenu.Location = New System.Drawing.Point(15, 30)
+        Me.cbxMenu.Name = "cbxMenu"
+        Me.cbxMenu.Size = New System.Drawing.Size(136, 21)
+        Me.cbxMenu.TabIndex = 0
+        '
+        'txtAbteilung
+        '
+        Me.txtAbteilung.AutoSize = True
+        Me.txtAbteilung.Location = New System.Drawing.Point(581, 9)
+        Me.txtAbteilung.Name = "txtAbteilung"
+        Me.txtAbteilung.Size = New System.Drawing.Size(29, 13)
+        Me.txtAbteilung.TabIndex = 23
+        Me.txtAbteilung.Text = "EDV"
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(499, 324)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(180, 21)
+        Me.Button2.TabIndex = 25
+        Me.Button2.Text = "alle Bestellungen anzeigen"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'frmEssensbestellungen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(687, 518)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.txtAbteilung)
+        Me.Controls.Add(Me.lblBestellungBis)
+        Me.Controls.Add(Me.cbxGebauede)
+        Me.Controls.Add(Me.lblBestellungen)
+        Me.Controls.Add(Me.MyPanel1)
+        Me.Controls.Add(Me.btnSave)
+        Me.Controls.Add(Me.lblGebaeude)
+        Me.Controls.Add(Me.lblAbteilung)
+        Me.Controls.Add(Me.lblDatum)
+        Me.Controls.Add(Me.dgvBestellungen)
+        Me.Controls.Add(Me.lblWochenkarte)
+        Me.Controls.Add(Me.cbxMenu)
+        Me.Name = "frmEssensbestellungen"
+        Me.Text = "Essensbestellung"
+        Me.MyPanel1.ResumeLayout(False)
+        Me.MyPanel1.PerformLayout()
+        Me.Dienstag.ResumeLayout(False)
+        Me.Dienstag.PerformLayout()
+        CType(Me.pbDienstag, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
+        CType(Me.pbMontag, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox5.ResumeLayout(False)
+        Me.GroupBox5.PerformLayout()
+        CType(Me.pbFreitag, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Mittwoch.ResumeLayout(False)
+        Me.Mittwoch.PerformLayout()
+        CType(Me.pbMittwoch, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox4.ResumeLayout(False)
+        Me.GroupBox4.PerformLayout()
+        CType(Me.pbDonnerstag, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvBestellungen, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents cbxMenu As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblWochenkarte As Label
+    Friend WithEvents dgvBestellungen As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents btnSave As Button
+    Friend WithEvents lblDatum As Label
+    Friend WithEvents GroupBox1 As GroupBox
+    Friend WithEvents txtAltMo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents rbMenoAlt_Mo As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents rbMenu_Mo As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents Dienstag As GroupBox
+    Friend WithEvents txtAltDi As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents rbMenuAlt_Di As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents rbMenu_Di As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents Mittwoch As GroupBox
+    Friend WithEvents txtAltMi As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents rbMenuAlt_Mi As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents rbMenu_Mi As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents GroupBox4 As GroupBox
+    Friend WithEvents txtAltDo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents rbMenuAlt_Do As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents rbMenu_Do As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents GroupBox5 As GroupBox
+    Friend WithEvents txtAltFr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents rbMenuAlt_Fr As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents rbMenu_Fr As VERAG_PROG_ALLGEMEIN.MyRadioButton
+    Friend WithEvents lbl1 As Label
+    Friend WithEvents lbl2 As Label
+    Friend WithEvents txtAnzahlMenu As Label
+    Friend WithEvents txtAnzahlLaCart As Label
+    Friend WithEvents ToolTipInfoMo As ToolTip
+    Friend WithEvents ToolTipInfoDi As ToolTip
+    Friend WithEvents ToolTipInfoMi As ToolTip
+    Friend WithEvents ToolTipInfoDo As ToolTip
+    Friend WithEvents ToolTipInfoFr As ToolTip
+    Friend WithEvents cbMontag As CheckBox
+    Friend WithEvents cbDienstag As CheckBox
+    Friend WithEvents cbMittwoch As CheckBox
+    Friend WithEvents cbDonnerstag As CheckBox
+    Friend WithEvents cbFreitag As CheckBox
+    Friend WithEvents lblAbteilung As Label
+    Friend WithEvents lblGebaeude As Label
+    Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel
+    Friend WithEvents lblBestellungen As Label
+    Friend WithEvents pbMontag As PictureBox
+    Friend WithEvents pbDienstag As PictureBox
+    Friend WithEvents pbMittwoch As PictureBox
+    Friend WithEvents pbDonnerstag As PictureBox
+    Friend WithEvents pbFreitag As PictureBox
+    Friend WithEvents txtPreis As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents cbxGebauede As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblBestellungBis As Label
+    Friend WithEvents Button1 As Button
+    Friend WithEvents txtAbteilung As Label
+    Friend WithEvents Button2 As Button
+End Class
--- a/Aviso/frmEssensbestellungen.resx
+++ b/Aviso/frmEssensbestellungen.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ToolTipInfoMo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ToolTipInfoDi.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>116, 17</value>
+  </metadata>
+  <metadata name="ToolTipInfoMi.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>215, 17</value>
+  </metadata>
+  <metadata name="ToolTipInfoDo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>314, 17</value>
+  </metadata>
+  <metadata name="ToolTipInfoFr.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>413, 17</value>
+  </metadata>
+</root>
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -0,0 +1,472 @@
+
+Imports Therefore.API
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmEssensbestellungen
+
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim essen As New cEssensbestellung()
+    Dim dt As New DataTable
+
+
+
+    Private Sub frmEssensbestellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        cbxMenu.fillWithSQL("SELECT Distinct Top 10 (MenuTitel), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 
+
+        txtAbteilung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG
+        loadDGVBestellungen()
+
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Asfinag", "Asfinag"))
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag Verrechnung", "Verag Verrechnung"))
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cbxGebauede.changeItem("")
+        btnSave.Enabled = False
+
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+
+        If cbxGebauede._value = "" Then
+            MsgBox("Bitte Gebäude für die Essensbestellung angeben!")
+            Exit Sub
+        End If
+
+        essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG)
+
+        If cbMontag.Checked Then
+            If rbMenu_Mo.Checked Then
+                essen.eb_montag = "Menu"
+            Else
+                essen.eb_montag = txtAltMo.Text.ToString
+            End If
+
+        Else
+            essen.eb_montag = Nothing
+        End If
+
+
+        If cbDienstag.Checked Then
+            If rbMenu_Di.Checked Then
+                essen.eb_dienstag = "Menu"
+            Else
+                essen.eb_dienstag = txtAltDi.Text.ToString
+            End If
+
+        Else
+            essen.eb_dienstag = Nothing
+        End If
+
+        If cbMittwoch.Checked Then
+            If rbMenu_Mi.Checked Then
+                essen.eb_mittwoch = "Menu"
+            Else
+                essen.eb_mittwoch = txtAltMi.Text.ToString
+            End If
+
+        Else
+            essen.eb_mittwoch = Nothing
+        End If
+
+        If cbDonnerstag.Checked Then
+            If rbMenu_Do.Checked Then
+                essen.eb_donnerstag = "Menu"
+            Else
+                essen.eb_donnerstag = txtAltDo.Text.ToString
+            End If
+
+        Else
+            essen.eb_donnerstag = Nothing
+        End If
+
+        If cbFreitag.Checked Then
+            If rbMenu_Fr.Checked Then
+                essen.eb_freitag = "Menu"
+            Else
+                essen.eb_freitag = txtAltFr.Text.ToString
+            End If
+
+        Else
+            essen.eb_freitag = Nothing
+        End If
+
+        If txtPreis.Text IsNot "" Then
+            essen.eb_preis = CDbl(txtPreis.Text)
+        End If
+
+        essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon"))
+
+        essen.SAVE()
+        loadDGVBestellungen()
+
+    End Sub
+
+
+    Private Sub cbxMenu_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxMenu.SelectedValueChanged
+
+        If cbxMenu._value Is Nothing Or cbxMenu._value = "" Then
+            Button1.Visible = False
+            lblDatum.Text = "Datum: "
+            lblBestellungBis.Text = ""
+            loadDGVBestellungen()
+            btnSave.Enabled = False
+            Exit Sub
+        End If
+
+        btnSave.Enabled = True
+        'Button1.Visible = True
+        dt.Clear()
+        dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & cbxMenu._value & "' order by MenuDateVon desc", "AVISO", 100, True)
+
+        If dt.Rows.Count > 0 Then
+            If checkIfOrderIsPossible() Then
+                MyPanel1.Enabled = True
+            Else
+                MyPanel1.Enabled = False
+            End If
+            lblDatum.Text = "Datum: " & CDate(dt.Rows(0).Item("MenuDateVon")).ToString("dd.MM.yyyy") & " - " & CDate(dt.Rows(0).Item("MenuDateBis")).ToString("dd.MM.yyyy")
+            loadMenuInfo(dt)
+
+            btnSave.Enabled = True
+        Else
+            btnSave.Enabled = False
+        End If
+
+        uncheckGroupBoxes(sender, e)
+        loadDGVBestellungen()
+
+    End Sub
+
+    Private Sub rbaLaCarte_CheckedChanged(sender As Object, e As EventArgs) Handles rbMenoAlt_Mo.CheckedChanged, rbMenuAlt_Di.CheckedChanged, rbMenuAlt_Do.CheckedChanged, rbMenuAlt_Mi.CheckedChanged, rbMenuAlt_Fr.CheckedChanged
+
+        If rbMenoAlt_Mo.Checked Then
+            txtAltMo.Visible = True
+        Else
+            txtAltMo.Visible = False
+        End If
+
+        If rbMenuAlt_Di.Checked Then
+            txtAltDi.Visible = True
+        Else
+
+            txtAltDi.Visible = False
+        End If
+
+        If rbMenuAlt_Mi.Checked Then
+            txtAltMi.Visible = True
+        Else
+            txtAltMi.Visible = False
+        End If
+
+
+        If rbMenuAlt_Do.Checked Then
+            txtAltDo.Visible = True
+        Else
+            txtAltDo.Visible = False
+        End If
+
+        If rbMenuAlt_Fr.Checked Then
+            txtAltFr.Visible = True
+        Else
+            txtAltFr.Visible = False
+        End If
+        countChecks()
+    End Sub
+
+    Private Sub cbFields_CheckedChanged(sender As Object, e As EventArgs) Handles cbMontag.CheckedChanged, cbDienstag.CheckedChanged, cbMittwoch.CheckedChanged, cbDonnerstag.CheckedChanged, cbFreitag.CheckedChanged
+        If cbMontag.Checked Then
+            rbMenoAlt_Mo.Enabled = True
+            rbMenu_Mo.Enabled = True
+        Else
+            rbMenoAlt_Mo.Enabled = False
+            rbMenu_Mo.Enabled = False
+            txtAltMo.Text = ""
+        End If
+
+        If cbDienstag.Checked Then
+            rbMenuAlt_Di.Enabled = True
+            rbMenu_Di.Enabled = True
+        Else
+            rbMenu_Di.Enabled = False
+            rbMenuAlt_Di.Enabled = False
+            txtAltDi.Text = ""
+        End If
+
+        If cbMittwoch.Checked Then
+            rbMenuAlt_Mi.Enabled = True
+            rbMenu_Mi.Enabled = True
+        Else
+            rbMenu_Mi.Enabled = False
+            rbMenuAlt_Mi.Enabled = False
+            txtAltMi.Text = ""
+        End If
+
+
+        If cbDonnerstag.Checked Then
+            rbMenuAlt_Do.Enabled = True
+            rbMenu_Do.Enabled = True
+        Else
+            rbMenu_Do.Enabled = False
+            rbMenuAlt_Do.Enabled = False
+            txtAltDo.Text = ""
+        End If
+
+        If cbFreitag.Checked Then
+            rbMenuAlt_Fr.Enabled = True
+            rbMenu_Fr.Enabled = True
+        Else
+            rbMenu_Fr.Enabled = False
+            rbMenuAlt_Fr.Enabled = False
+            txtAltFr.Text = ""
+        End If
+        countChecks()
+    End Sub
+
+
+    Private Sub loadDGVBestellungen()
+
+        Dim SQLWhere As String = ""
+        If cbxMenu._value IsNot "" Then SQLWhere = " AND [eb_kw] = '" & cbxMenu._value.ToString & "'"
+
+        Dim SQLString As String = "SELECT [eb_kw], [eb_mitid] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],[eb_donnerstag] ,[eb_freitag],[eb_preis]  FROM [tblEssensbestellungen] where [eb_mitid] = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'" & SQLWhere & " order by [eb_kw]"
+
+        dgvBestellungen.SET_SQL(SQLString, "AVISO", ,)
+        dgvBestellungen.LOAD()
+
+
+        If dgvBestellungen.Columns.Count < 1 Then Exit Sub
+
+        With dgvBestellungen
+            .RowHeadersWidth = 10
+            .Columns("eb_kw").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("eb_kw").HeaderText = "KW"
+            .Columns("eb_mitid").Visible = False
+
+            .Columns("eb_abteilung").Visible = False
+            .Columns("eb_montag").Width = 80
+            .Columns("eb_montag").HeaderText = "Montag"
+            .Columns("eb_montag").Width = 80
+            .Columns("eb_dienstag").HeaderText = "Dienstag"
+            .Columns("eb_dienstag").Width = 80
+            .Columns("eb_mittwoch").HeaderText = "Mittwoch"
+            .Columns("eb_mittwoch").Width = 80
+            .Columns("eb_donnerstag").HeaderText = "Donnerstag"
+            .Columns("eb_donnerstag").Width = 80
+            .Columns("eb_freitag").HeaderText = "Freitag"
+            .Columns("eb_freitag").Width = 80
+            .Columns("eb_gebaeude").HeaderText = "Gebäude"
+            .Columns("eb_gebaeude").Width = 80
+            .Columns("eb_preis").HeaderText = "Preis"
+            .Columns("eb_preis").Width = 40
+            .Columns("eb_preis").DefaultCellStyle.Format = "N"
+        End With
+
+    End Sub
+
+    Private Sub uncheckGroupBoxes(sender, e)
+        For Each gb As Control In MyPanel1.Controls
+            If TypeOf gb Is GroupBox Then
+                For Each c As Control In gb.Controls
+                    If TypeOf c Is CheckBox Then
+                        Dim checkbox As CheckBox = c
+                        checkbox.Checked = False
+                    End If
+                Next
+            End If
+        Next
+        cbFields_CheckedChanged(sender, e)
+    End Sub
+
+    Private Sub countChecks()
+
+        Dim countMenus As Integer
+        Dim countlaCarte As Integer
+        countMenus = 0
+        countlaCarte = 0
+        For Each gb As Control In MyPanel1.Controls
+            If TypeOf gb Is GroupBox Then
+                For Each c As Control In gb.Controls
+
+                    If c.Text.ToLower.StartsWith("menü") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
+                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
+                        If rb.Checked Then countMenus = countMenus + 1
+                    End If
+
+                    If c.Text.ToLower.StartsWith("a la carte") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
+                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
+                        If rb.Checked Then countlaCarte = countlaCarte + 1
+                    End If
+                Next
+            End If
+        Next
+
+        txtAnzahlMenu.Text = countMenus.ToString()
+        txtAnzahlLaCart.Text = countlaCarte.ToString
+        txtPreis.Text = (CDbl(countlaCarte) + CDbl(countMenus)) * 3
+
+
+    End Sub
+
+    Private Sub loadMenuInfo(dt As DataTable)
+
+        If dt.Rows(0).Item("MenuEssenMo") IsNot Nothing Then
+            pbMontag.Visible = True
+            Dim ttMontag As New ToolTip()
+            ttMontag.SetToolTip(pbMontag, dt.Rows(0).Item("MenuEssenMo").ToString)
+        Else
+            pbMontag.Visible = False
+        End If
+
+
+        If dt.Rows(0).Item("MenuEssenDi") IsNot Nothing Then
+            pbDienstag.Visible = True
+            Dim ttDienstag As New ToolTip()
+            ttDienstag.SetToolTip(pbDienstag, dt.Rows(0).Item("MenuEssenDi").ToString)
+        Else
+            pbDienstag.Visible = False
+        End If
+
+
+        If dt.Rows(0).Item("MenuEssenMi") IsNot Nothing Then
+            pbMittwoch.Visible = True
+            Dim ttMittwoch As New ToolTip()
+            ttMittwoch.SetToolTip(pbMittwoch, dt.Rows(0).Item("MenuEssenMi").ToString)
+        Else
+            pbMittwoch.Visible = False
+        End If
+
+        If dt.Rows(0).Item("MenuEssenDo") IsNot Nothing Then
+            pbDonnerstag.Visible = True
+            Dim ttDonnerstag As New ToolTip()
+            ttDonnerstag.SetToolTip(pbDonnerstag, dt.Rows(0).Item("MenuEssenDo").ToString)
+        Else
+            pbDonnerstag.Visible = False
+        End If
+
+        If dt.Rows(0).Item("MenuEssenFr") IsNot Nothing Then
+            pbFreitag.Visible = True
+            Dim ttFreitag As New ToolTip()
+            ttFreitag.SetToolTip(pbFreitag, dt.Rows(0).Item("MenuEssenFr").ToString)
+        Else
+            pbFreitag.Visible = False
+        End If
+
+    End Sub
+
+    Private Sub dgvBestellungen_Click(sender As Object, e As EventArgs) Handles dgvBestellungen.Click
+
+        If dgvBestellungen.Rows.Count = 0 Then Exit Sub
+
+        Dim currentEssen As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value, dgvBestellungen.CurrentRow.Cells("eb_gebaeude").Value, dgvBestellungen.CurrentRow.Cells("eb_abteilung").Value)
+
+        If currentEssen.eb_montag IsNot Nothing Then
+            cbMontag.Checked = True
+            If currentEssen.eb_montag.ToString = "Menu" Then
+                rbMenu_Mo.Checked = True
+            Else
+                rbMenoAlt_Mo.Checked = True
+                If currentEssen.eb_montag IsNot Nothing Then txtAltMo.Text = currentEssen.eb_montag.ToString
+            End If
+        Else
+            cbMontag.Checked = False
+        End If
+
+        If currentEssen.eb_dienstag IsNot Nothing Then
+            cbDienstag.Checked = True
+            If currentEssen.eb_dienstag.ToString = "Menu" Then
+                rbMenu_Di.Checked = True
+            Else
+                rbMenuAlt_Di.Checked = True
+                If currentEssen.eb_dienstag IsNot Nothing Then txtAltDi.Text = currentEssen.eb_dienstag.ToString
+            End If
+        Else
+            cbDienstag.Checked = False
+        End If
+
+
+        If currentEssen.eb_mittwoch IsNot Nothing Then
+            cbMittwoch.Checked = True
+            If currentEssen.eb_mittwoch.ToString = "Menu" Then
+                rbMenu_Mi.Checked = True
+            Else
+                rbMenuAlt_Mi.Checked = True
+                If currentEssen.eb_mittwoch IsNot Nothing Then txtAltMi.Text = currentEssen.eb_mittwoch.ToString
+            End If
+        Else
+            cbMittwoch.Checked = False
+        End If
+
+        If currentEssen.eb_donnerstag IsNot Nothing Then
+            cbDonnerstag.Checked = True
+            If currentEssen.eb_donnerstag.ToString = "Menu" Then
+                rbMenu_Do.Checked = True
+            Else
+                rbMenuAlt_Do.Checked = True
+                If currentEssen.eb_donnerstag IsNot Nothing Then txtAltDo.Text = currentEssen.eb_donnerstag.ToString
+            End If
+        Else
+            cbMittwoch.Checked = False
+        End If
+
+
+        If currentEssen.eb_freitag IsNot Nothing Then
+            cbFreitag.Checked = True
+            If currentEssen.eb_freitag.ToString = "Menu" Then
+                rbMenu_Fr.Checked = True
+            Else
+                rbMenuAlt_Fr.Checked = True
+                If currentEssen.eb_freitag IsNot Nothing Then txtAltDo.Text = currentEssen.eb_freitag.ToString
+            End If
+        Else
+            cbFreitag.Checked = False
+        End If
+
+
+        cbxGebauede._value = currentEssen.eb_gebaeude
+
+
+    End Sub
+
+    Private Function checkIfOrderIsPossible() As Boolean
+
+        Dim isPossible As Boolean = False
+
+        If dt.Rows.Count = 0 Then Return False
+
+        Try
+            Dim startMenu = Date.Parse(dt.Rows(0).Item("MenuDateVon"))
+
+
+            Dim newTime As New TimeSpan(14, 30, 0)
+            Dim timeToOrderLimit = startMenu.AddDays(-5) + newTime
+            lblBestellungBis.Text = "Bestellung möglich bis: " & timeToOrderLimit.ToShortDateString & " - " & timeToOrderLimit.ToShortTimeString
+
+            If Now >= timeToOrderLimit Then
+                lblBestellungBis.ForeColor = Color.Red
+                Return True 'zu testzwecken -> muss dann wieder auf false gesetzt werden!!!!
+            Else
+                lblBestellungBis.ForeColor = Color.Black
+                Return True
+            End If
+        Catch ex As Exception
+            MessageBox.Show(ex.Message)
+        End Try
+
+
+    End Function
+
+    Private Sub rbMenu_Mo_Click(sender As Object, e As EventArgs) Handles rbMenu_Mo.Click, rbMenu_Di.Click, rbMenu_Mi.Click, rbMenu_Do.Click, rbMenu_Fr.Click
+        countChecks()
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        'Process.Start("\\YM5T001348\Gastro\FTPUpload\Menues\" & cbxMenu._value & ".pdf")
+    End Sub
+
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        cbxMenu.changeItem("")
+    End Sub
+End Class
--- a/Aviso/frmFrachtkostenBerechnen.Designer.vb
+++ b/Aviso/frmFrachtkostenBerechnen.Designer.vb
@@ -0,0 +1,703 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmFrachtkostenBerechnen
+    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(frmFrachtkostenBerechnen))
+        Me.lblVon = New System.Windows.Forms.Label()
+        Me.lblNach = New System.Windows.Forms.Label()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.lblEUAnteil = New System.Windows.Forms.Label()
+        Me.lblNichtEUAnteil = New System.Windows.Forms.Label()
+        Me.lblDistanzEU = New System.Windows.Forms.Label()
+        Me.lblGewicht = New System.Windows.Forms.Label()
+        Me.btnCalculate = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.lblGesamtfrachkosten = New System.Windows.Forms.Label()
+        Me.lblFaktor = New System.Windows.Forms.Label()
+        Me.lblWarningEUAnteil = New System.Windows.Forms.Label()
+        Me.lblWarningNichtEUAnteil = New System.Windows.Forms.Label()
+        Me.lblWarningAbgangort = New System.Windows.Forms.Label()
+        Me.lblWarningBestimmungsort = New System.Windows.Forms.Label()
+        Me.lblWarningFaktor = New System.Windows.Forms.Label()
+        Me.lblDistanzNichtEU = New System.Windows.Forms.Label()
+        Me.ckbManAnteilsermittlung = New System.Windows.Forms.CheckBox()
+        Me.ToolTipAutomatischErmitteln = New System.Windows.Forms.ToolTip(Me.components)
+        Me.cbxLandNach = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxLandVon = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txbCalcDistanceNichtEU = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbNichtEUAnteilberechnet = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbEUAnteilberechnet = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbFactor = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbxGesamtfrachtkosten = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbGewicht = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbCalcDistanceEU = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbNachOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbVonOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbNachPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbVonPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbNichtEUAnteil = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbEUAnteil = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.SuspendLayout()
+        '
+        'lblVon
+        '
+        Me.lblVon.AutoSize = True
+        Me.lblVon.Location = New System.Drawing.Point(5, 9)
+        Me.lblVon.Name = "lblVon"
+        Me.lblVon.Size = New System.Drawing.Size(64, 13)
+        Me.lblVon.TabIndex = 0
+        Me.lblVon.Text = "Abgangsort:"
+        '
+        'lblNach
+        '
+        Me.lblNach.AutoSize = True
+        Me.lblNach.Location = New System.Drawing.Point(205, 9)
+        Me.lblNach.Name = "lblNach"
+        Me.lblNach.Size = New System.Drawing.Size(84, 13)
+        Me.lblNach.TabIndex = 1
+        Me.lblNach.Text = "Bestimmungsort:"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(5, 270)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 35
+        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'btnOK
+        '
+        Me.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.Cursor
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(286, 270)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(75, 23)
+        Me.btnOK.TabIndex = 36
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'lblEUAnteil
+        '
+        Me.lblEUAnteil.AutoSize = True
+        Me.lblEUAnteil.Location = New System.Drawing.Point(5, 195)
+        Me.lblEUAnteil.Name = "lblEUAnteil"
+        Me.lblEUAnteil.Size = New System.Drawing.Size(51, 13)
+        Me.lblEUAnteil.TabIndex = 23
+        Me.lblEUAnteil.Text = "EU Anteil"
+        '
+        'lblNichtEUAnteil
+        '
+        Me.lblNichtEUAnteil.AutoSize = True
+        Me.lblNichtEUAnteil.Location = New System.Drawing.Point(5, 230)
+        Me.lblNichtEUAnteil.Name = "lblNichtEUAnteil"
+        Me.lblNichtEUAnteil.Size = New System.Drawing.Size(79, 13)
+        Me.lblNichtEUAnteil.TabIndex = 29
+        Me.lblNichtEUAnteil.Text = "Nicht EU Anteil"
+        '
+        'lblDistanzEU
+        '
+        Me.lblDistanzEU.AutoSize = True
+        Me.lblDistanzEU.Location = New System.Drawing.Point(210, 195)
+        Me.lblDistanzEU.Name = "lblDistanzEU"
+        Me.lblDistanzEU.Size = New System.Drawing.Size(42, 13)
+        Me.lblDistanzEU.TabIndex = 26
+        Me.lblDistanzEU.Text = "Distanz"
+        '
+        'lblGewicht
+        '
+        Me.lblGewicht.AutoSize = True
+        Me.lblGewicht.Location = New System.Drawing.Point(5, 99)
+        Me.lblGewicht.Name = "lblGewicht"
+        Me.lblGewicht.Size = New System.Drawing.Size(46, 13)
+        Me.lblGewicht.TabIndex = 14
+        Me.lblGewicht.Text = "Gewicht"
+        '
+        'btnCalculate
+        '
+        Me.btnCalculate.AccessibleRole = System.Windows.Forms.AccessibleRole.ComboBox
+        Me.btnCalculate.Location = New System.Drawing.Point(5, 160)
+        Me.btnCalculate.Name = "btnCalculate"
+        Me.btnCalculate.Size = New System.Drawing.Size(75, 23)
+        Me.btnCalculate.TabIndex = 21
+        Me.btnCalculate.Text = "Berechnen"
+        Me.btnCalculate.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(5, 30)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(27, 13)
+        Me.Label1.TabIndex = 2
+        Me.Label1.Text = "PLZ"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(5, 52)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(21, 13)
+        Me.Label2.TabIndex = 8
+        Me.Label2.Text = "Ort"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(205, 56)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(21, 13)
+        Me.Label3.TabIndex = 10
+        Me.Label3.Text = "Ort"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(205, 30)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(27, 13)
+        Me.Label4.TabIndex = 5
+        Me.Label4.Text = "PLZ"
+        '
+        'lblGesamtfrachkosten
+        '
+        Me.lblGesamtfrachkosten.AutoSize = True
+        Me.lblGesamtfrachkosten.Location = New System.Drawing.Point(205, 125)
+        Me.lblGesamtfrachkosten.Name = "lblGesamtfrachkosten"
+        Me.lblGesamtfrachkosten.Size = New System.Drawing.Size(92, 13)
+        Me.lblGesamtfrachkosten.TabIndex = 18
+        Me.lblGesamtfrachkosten.Text = "Frachtkosten ges."
+        '
+        'lblFaktor
+        '
+        Me.lblFaktor.AutoSize = True
+        Me.lblFaktor.Location = New System.Drawing.Point(5, 125)
+        Me.lblFaktor.Name = "lblFaktor"
+        Me.lblFaktor.Size = New System.Drawing.Size(37, 13)
+        Me.lblFaktor.TabIndex = 16
+        Me.lblFaktor.Text = "Faktor"
+        '
+        'lblWarningEUAnteil
+        '
+        Me.lblWarningEUAnteil.AutoSize = True
+        Me.lblWarningEUAnteil.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningEUAnteil.Location = New System.Drawing.Point(5, 211)
+        Me.lblWarningEUAnteil.Name = "lblWarningEUAnteil"
+        Me.lblWarningEUAnteil.Size = New System.Drawing.Size(162, 13)
+        Me.lblWarningEUAnteil.TabIndex = 28
+        Me.lblWarningEUAnteil.Text = "EU Anteil hinterlegen (in Prozent)"
+        Me.lblWarningEUAnteil.Visible = False
+        '
+        'lblWarningNichtEUAnteil
+        '
+        Me.lblWarningNichtEUAnteil.AutoSize = True
+        Me.lblWarningNichtEUAnteil.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningNichtEUAnteil.Location = New System.Drawing.Point(5, 249)
+        Me.lblWarningNichtEUAnteil.Name = "lblWarningNichtEUAnteil"
+        Me.lblWarningNichtEUAnteil.Size = New System.Drawing.Size(190, 13)
+        Me.lblWarningNichtEUAnteil.TabIndex = 34
+        Me.lblWarningNichtEUAnteil.Text = "Nicht EU Anteil hinterlegen (in Prozent)"
+        Me.lblWarningNichtEUAnteil.Visible = False
+        '
+        'lblWarningAbgangort
+        '
+        Me.lblWarningAbgangort.AutoSize = True
+        Me.lblWarningAbgangort.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningAbgangort.Location = New System.Drawing.Point(5, 72)
+        Me.lblWarningAbgangort.Name = "lblWarningAbgangort"
+        Me.lblWarningAbgangort.Size = New System.Drawing.Size(147, 13)
+        Me.lblWarningAbgangort.TabIndex = 12
+        Me.lblWarningAbgangort.Text = "PLZ/Ort von Abgangsort fehlt"
+        Me.lblWarningAbgangort.Visible = False
+        '
+        'lblWarningBestimmungsort
+        '
+        Me.lblWarningBestimmungsort.AutoSize = True
+        Me.lblWarningBestimmungsort.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningBestimmungsort.Location = New System.Drawing.Point(180, 72)
+        Me.lblWarningBestimmungsort.Name = "lblWarningBestimmungsort"
+        Me.lblWarningBestimmungsort.Size = New System.Drawing.Size(167, 13)
+        Me.lblWarningBestimmungsort.TabIndex = 13
+        Me.lblWarningBestimmungsort.Text = "PLZ/Ort von Bestimmungsort fehlt"
+        Me.lblWarningBestimmungsort.Visible = False
+        '
+        'lblWarningFaktor
+        '
+        Me.lblWarningFaktor.AutoSize = True
+        Me.lblWarningFaktor.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningFaktor.Location = New System.Drawing.Point(5, 144)
+        Me.lblWarningFaktor.Name = "lblWarningFaktor"
+        Me.lblWarningFaktor.Size = New System.Drawing.Size(82, 13)
+        Me.lblWarningFaktor.TabIndex = 20
+        Me.lblWarningFaktor.Text = "Faktor angeben"
+        Me.lblWarningFaktor.Visible = False
+        '
+        'lblDistanzNichtEU
+        '
+        Me.lblDistanzNichtEU.AutoSize = True
+        Me.lblDistanzNichtEU.Location = New System.Drawing.Point(215, 237)
+        Me.lblDistanzNichtEU.Name = "lblDistanzNichtEU"
+        Me.lblDistanzNichtEU.Size = New System.Drawing.Size(42, 13)
+        Me.lblDistanzNichtEU.TabIndex = 33
+        Me.lblDistanzNichtEU.Text = "Distanz"
+        Me.lblDistanzNichtEU.Visible = False
+        '
+        'ckbManAnteilsermittlung
+        '
+        Me.ckbManAnteilsermittlung.AutoSize = True
+        Me.ckbManAnteilsermittlung.Location = New System.Drawing.Point(92, 160)
+        Me.ckbManAnteilsermittlung.Name = "ckbManAnteilsermittlung"
+        Me.ckbManAnteilsermittlung.Size = New System.Drawing.Size(160, 17)
+        Me.ckbManAnteilsermittlung.TabIndex = 22
+        Me.ckbManAnteilsermittlung.Text = "Anteile automatisch ermitteln"
+        Me.ToolTipAutomatischErmitteln.SetToolTip(Me.ckbManAnteilsermittlung, "" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Anteile werden automatisch ermittelt." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Für TR (=Türkei) und SRB (=Serbien) wird" &
+        " der EU-Anteil des Streckenverlaufs ermittelt, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle weiteren werden mit 60% EU" &
+        " und 40% nicht EU berechnet." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10))
+        Me.ckbManAnteilsermittlung.UseVisualStyleBackColor = True
+        '
+        'cbxLandNach
+        '
+        Me.cbxLandNach._allowedValuesFreiText = Nothing
+        Me.cbxLandNach._allowFreiText = False
+        Me.cbxLandNach._value = ""
+        Me.cbxLandNach.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
+        Me.cbxLandNach.DropDownWidth = 250
+        Me.cbxLandNach.FormattingEnabled = True
+        Me.cbxLandNach.Location = New System.Drawing.Point(255, 23)
+        Me.cbxLandNach.Name = "cbxLandNach"
+        Me.cbxLandNach.Size = New System.Drawing.Size(45, 21)
+        Me.cbxLandNach.TabIndex = 6
+        '
+        'cbxLandVon
+        '
+        Me.cbxLandVon._allowedValuesFreiText = Nothing
+        Me.cbxLandVon._allowFreiText = False
+        Me.cbxLandVon._value = ""
+        Me.cbxLandVon.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest
+        Me.cbxLandVon.DropDownWidth = 250
+        Me.cbxLandVon.FormattingEnabled = True
+        Me.cbxLandVon.Location = New System.Drawing.Point(75, 22)
+        Me.cbxLandVon.Name = "cbxLandVon"
+        Me.cbxLandVon.Size = New System.Drawing.Size(45, 21)
+        Me.cbxLandVon.TabIndex = 3
+        '
+        'txbCalcDistanceNichtEU
+        '
+        Me.txbCalcDistanceNichtEU._DateTimeOnly = False
+        Me.txbCalcDistanceNichtEU._numbersOnly = False
+        Me.txbCalcDistanceNichtEU._numbersOnlyKommastellen = ""
+        Me.txbCalcDistanceNichtEU._numbersOnlyTrennzeichen = True
+        Me.txbCalcDistanceNichtEU._Prozent = False
+        Me.txbCalcDistanceNichtEU._ShortDateNew = False
+        Me.txbCalcDistanceNichtEU._ShortDateOnly = False
+        Me.txbCalcDistanceNichtEU._TimeOnly = False
+        Me.txbCalcDistanceNichtEU._TimeOnly_Seconds = False
+        Me.txbCalcDistanceNichtEU._value = ""
+        Me.txbCalcDistanceNichtEU._Waehrung = False
+        Me.txbCalcDistanceNichtEU._WaehrungZeichen = True
+        Me.txbCalcDistanceNichtEU.ForeColor = System.Drawing.Color.Black
+        Me.txbCalcDistanceNichtEU.Location = New System.Drawing.Point(277, 227)
+        Me.txbCalcDistanceNichtEU.MaxLineLength = -1
+        Me.txbCalcDistanceNichtEU.MaxLines_Warning = ""
+        Me.txbCalcDistanceNichtEU.MaxLines_Warning_Label = Nothing
+        Me.txbCalcDistanceNichtEU.Name = "txbCalcDistanceNichtEU"
+        Me.txbCalcDistanceNichtEU.Size = New System.Drawing.Size(84, 20)
+        Me.txbCalcDistanceNichtEU.TabIndex = 32
+        Me.txbCalcDistanceNichtEU.Visible = False
+        '
+        'tbNichtEUAnteilberechnet
+        '
+        Me.tbNichtEUAnteilberechnet._DateTimeOnly = False
+        Me.tbNichtEUAnteilberechnet._numbersOnly = False
+        Me.tbNichtEUAnteilberechnet._numbersOnlyKommastellen = ""
+        Me.tbNichtEUAnteilberechnet._numbersOnlyTrennzeichen = True
+        Me.tbNichtEUAnteilberechnet._Prozent = False
+        Me.tbNichtEUAnteilberechnet._ShortDateNew = False
+        Me.tbNichtEUAnteilberechnet._ShortDateOnly = False
+        Me.tbNichtEUAnteilberechnet._TimeOnly = False
+        Me.tbNichtEUAnteilberechnet._TimeOnly_Seconds = False
+        Me.tbNichtEUAnteilberechnet._value = ""
+        Me.tbNichtEUAnteilberechnet._Waehrung = True
+        Me.tbNichtEUAnteilberechnet._WaehrungZeichen = True
+        Me.tbNichtEUAnteilberechnet.ForeColor = System.Drawing.Color.Black
+        Me.tbNichtEUAnteilberechnet.Location = New System.Drawing.Point(141, 227)
+        Me.tbNichtEUAnteilberechnet.MaxLineLength = -1
+        Me.tbNichtEUAnteilberechnet.MaxLines_Warning = ""
+        Me.tbNichtEUAnteilberechnet.MaxLines_Warning_Label = Nothing
+        Me.tbNichtEUAnteilberechnet.Name = "tbNichtEUAnteilberechnet"
+        Me.tbNichtEUAnteilberechnet.ReadOnly = True
+        Me.tbNichtEUAnteilberechnet.Size = New System.Drawing.Size(60, 20)
+        Me.tbNichtEUAnteilberechnet.TabIndex = 31
+        '
+        'tbEUAnteilberechnet
+        '
+        Me.tbEUAnteilberechnet._DateTimeOnly = False
+        Me.tbEUAnteilberechnet._numbersOnly = False
+        Me.tbEUAnteilberechnet._numbersOnlyKommastellen = ""
+        Me.tbEUAnteilberechnet._numbersOnlyTrennzeichen = True
+        Me.tbEUAnteilberechnet._Prozent = False
+        Me.tbEUAnteilberechnet._ShortDateNew = False
+        Me.tbEUAnteilberechnet._ShortDateOnly = False
+        Me.tbEUAnteilberechnet._TimeOnly = False
+        Me.tbEUAnteilberechnet._TimeOnly_Seconds = False
+        Me.tbEUAnteilberechnet._value = ""
+        Me.tbEUAnteilberechnet._Waehrung = True
+        Me.tbEUAnteilberechnet._WaehrungZeichen = True
+        Me.tbEUAnteilberechnet.ForeColor = System.Drawing.Color.Black
+        Me.tbEUAnteilberechnet.Location = New System.Drawing.Point(141, 188)
+        Me.tbEUAnteilberechnet.MaxLineLength = -1
+        Me.tbEUAnteilberechnet.MaxLines_Warning = ""
+        Me.tbEUAnteilberechnet.MaxLines_Warning_Label = Nothing
+        Me.tbEUAnteilberechnet.Name = "tbEUAnteilberechnet"
+        Me.tbEUAnteilberechnet.ReadOnly = True
+        Me.tbEUAnteilberechnet.Size = New System.Drawing.Size(60, 20)
+        Me.tbEUAnteilberechnet.TabIndex = 25
+        '
+        'txbFactor
+        '
+        Me.txbFactor._DateTimeOnly = False
+        Me.txbFactor._numbersOnly = True
+        Me.txbFactor._numbersOnlyKommastellen = ""
+        Me.txbFactor._numbersOnlyTrennzeichen = True
+        Me.txbFactor._Prozent = False
+        Me.txbFactor._ShortDateNew = False
+        Me.txbFactor._ShortDateOnly = False
+        Me.txbFactor._TimeOnly = False
+        Me.txbFactor._TimeOnly_Seconds = False
+        Me.txbFactor._value = ""
+        Me.txbFactor._Waehrung = True
+        Me.txbFactor._WaehrungZeichen = True
+        Me.txbFactor.ForeColor = System.Drawing.Color.Black
+        Me.txbFactor.Location = New System.Drawing.Point(75, 122)
+        Me.txbFactor.MaxLineLength = -1
+        Me.txbFactor.MaxLines_Warning = ""
+        Me.txbFactor.MaxLines_Warning_Label = Nothing
+        Me.txbFactor.Name = "txbFactor"
+        Me.txbFactor.Size = New System.Drawing.Size(60, 20)
+        Me.txbFactor.TabIndex = 17
+        '
+        'tbxGesamtfrachtkosten
+        '
+        Me.tbxGesamtfrachtkosten._DateTimeOnly = False
+        Me.tbxGesamtfrachtkosten._numbersOnly = False
+        Me.tbxGesamtfrachtkosten._numbersOnlyKommastellen = ""
+        Me.tbxGesamtfrachtkosten._numbersOnlyTrennzeichen = True
+        Me.tbxGesamtfrachtkosten._Prozent = False
+        Me.tbxGesamtfrachtkosten._ShortDateNew = False
+        Me.tbxGesamtfrachtkosten._ShortDateOnly = False
+        Me.tbxGesamtfrachtkosten._TimeOnly = False
+        Me.tbxGesamtfrachtkosten._TimeOnly_Seconds = False
+        Me.tbxGesamtfrachtkosten._value = ""
+        Me.tbxGesamtfrachtkosten._Waehrung = True
+        Me.tbxGesamtfrachtkosten._WaehrungZeichen = True
+        Me.tbxGesamtfrachtkosten.ForeColor = System.Drawing.Color.Black
+        Me.tbxGesamtfrachtkosten.Location = New System.Drawing.Point(301, 122)
+        Me.tbxGesamtfrachtkosten.MaxLineLength = -1
+        Me.tbxGesamtfrachtkosten.MaxLines_Warning = ""
+        Me.tbxGesamtfrachtkosten.MaxLines_Warning_Label = Nothing
+        Me.tbxGesamtfrachtkosten.Name = "tbxGesamtfrachtkosten"
+        Me.tbxGesamtfrachtkosten.ReadOnly = True
+        Me.tbxGesamtfrachtkosten.Size = New System.Drawing.Size(60, 20)
+        Me.tbxGesamtfrachtkosten.TabIndex = 19
+        '
+        'txbGewicht
+        '
+        Me.txbGewicht._DateTimeOnly = False
+        Me.txbGewicht._numbersOnly = False
+        Me.txbGewicht._numbersOnlyKommastellen = ""
+        Me.txbGewicht._numbersOnlyTrennzeichen = True
+        Me.txbGewicht._Prozent = False
+        Me.txbGewicht._ShortDateNew = False
+        Me.txbGewicht._ShortDateOnly = False
+        Me.txbGewicht._TimeOnly = False
+        Me.txbGewicht._TimeOnly_Seconds = False
+        Me.txbGewicht._value = ""
+        Me.txbGewicht._Waehrung = False
+        Me.txbGewicht._WaehrungZeichen = True
+        Me.txbGewicht.ForeColor = System.Drawing.Color.Black
+        Me.txbGewicht.Location = New System.Drawing.Point(75, 96)
+        Me.txbGewicht.MaxLineLength = -1
+        Me.txbGewicht.MaxLines_Warning = ""
+        Me.txbGewicht.MaxLines_Warning_Label = Nothing
+        Me.txbGewicht.Name = "txbGewicht"
+        Me.txbGewicht.ReadOnly = True
+        Me.txbGewicht.Size = New System.Drawing.Size(84, 20)
+        Me.txbGewicht.TabIndex = 15
+        '
+        'txbCalcDistanceEU
+        '
+        Me.txbCalcDistanceEU._DateTimeOnly = False
+        Me.txbCalcDistanceEU._numbersOnly = False
+        Me.txbCalcDistanceEU._numbersOnlyKommastellen = ""
+        Me.txbCalcDistanceEU._numbersOnlyTrennzeichen = True
+        Me.txbCalcDistanceEU._Prozent = False
+        Me.txbCalcDistanceEU._ShortDateNew = False
+        Me.txbCalcDistanceEU._ShortDateOnly = False
+        Me.txbCalcDistanceEU._TimeOnly = False
+        Me.txbCalcDistanceEU._TimeOnly_Seconds = False
+        Me.txbCalcDistanceEU._value = ""
+        Me.txbCalcDistanceEU._Waehrung = False
+        Me.txbCalcDistanceEU._WaehrungZeichen = True
+        Me.txbCalcDistanceEU.ForeColor = System.Drawing.Color.Black
+        Me.txbCalcDistanceEU.Location = New System.Drawing.Point(277, 188)
+        Me.txbCalcDistanceEU.MaxLineLength = -1
+        Me.txbCalcDistanceEU.MaxLines_Warning = ""
+        Me.txbCalcDistanceEU.MaxLines_Warning_Label = Nothing
+        Me.txbCalcDistanceEU.Name = "txbCalcDistanceEU"
+        Me.txbCalcDistanceEU.Size = New System.Drawing.Size(84, 20)
+        Me.txbCalcDistanceEU.TabIndex = 27
+        '
+        'txbNachOrt
+        '
+        Me.txbNachOrt._DateTimeOnly = False
+        Me.txbNachOrt._numbersOnly = False
+        Me.txbNachOrt._numbersOnlyKommastellen = ""
+        Me.txbNachOrt._numbersOnlyTrennzeichen = True
+        Me.txbNachOrt._Prozent = False
+        Me.txbNachOrt._ShortDateNew = False
+        Me.txbNachOrt._ShortDateOnly = False
+        Me.txbNachOrt._TimeOnly = False
+        Me.txbNachOrt._TimeOnly_Seconds = False
+        Me.txbNachOrt._value = ""
+        Me.txbNachOrt._Waehrung = False
+        Me.txbNachOrt._WaehrungZeichen = True
+        Me.txbNachOrt.ForeColor = System.Drawing.Color.Black
+        Me.txbNachOrt.Location = New System.Drawing.Point(255, 49)
+        Me.txbNachOrt.MaxLineLength = -1
+        Me.txbNachOrt.MaxLines_Warning = ""
+        Me.txbNachOrt.MaxLines_Warning_Label = Nothing
+        Me.txbNachOrt.Name = "txbNachOrt"
+        Me.txbNachOrt.Size = New System.Drawing.Size(106, 20)
+        Me.txbNachOrt.TabIndex = 11
+        '
+        'txbVonOrt
+        '
+        Me.txbVonOrt._DateTimeOnly = False
+        Me.txbVonOrt._numbersOnly = False
+        Me.txbVonOrt._numbersOnlyKommastellen = ""
+        Me.txbVonOrt._numbersOnlyTrennzeichen = True
+        Me.txbVonOrt._Prozent = False
+        Me.txbVonOrt._ShortDateNew = False
+        Me.txbVonOrt._ShortDateOnly = False
+        Me.txbVonOrt._TimeOnly = False
+        Me.txbVonOrt._TimeOnly_Seconds = False
+        Me.txbVonOrt._value = ""
+        Me.txbVonOrt._Waehrung = False
+        Me.txbVonOrt._WaehrungZeichen = True
+        Me.txbVonOrt.ForeColor = System.Drawing.Color.Black
+        Me.txbVonOrt.Location = New System.Drawing.Point(75, 49)
+        Me.txbVonOrt.MaxLineLength = -1
+        Me.txbVonOrt.MaxLines_Warning = ""
+        Me.txbVonOrt.MaxLines_Warning_Label = Nothing
+        Me.txbVonOrt.Name = "txbVonOrt"
+        Me.txbVonOrt.Size = New System.Drawing.Size(106, 20)
+        Me.txbVonOrt.TabIndex = 9
+        '
+        'txbNachPLZ
+        '
+        Me.txbNachPLZ._DateTimeOnly = False
+        Me.txbNachPLZ._numbersOnly = False
+        Me.txbNachPLZ._numbersOnlyKommastellen = ""
+        Me.txbNachPLZ._numbersOnlyTrennzeichen = True
+        Me.txbNachPLZ._Prozent = False
+        Me.txbNachPLZ._ShortDateNew = False
+        Me.txbNachPLZ._ShortDateOnly = False
+        Me.txbNachPLZ._TimeOnly = False
+        Me.txbNachPLZ._TimeOnly_Seconds = False
+        Me.txbNachPLZ._value = ""
+        Me.txbNachPLZ._Waehrung = False
+        Me.txbNachPLZ._WaehrungZeichen = True
+        Me.txbNachPLZ.ForeColor = System.Drawing.Color.Black
+        Me.txbNachPLZ.Location = New System.Drawing.Point(301, 23)
+        Me.txbNachPLZ.MaxLineLength = -1
+        Me.txbNachPLZ.MaxLines_Warning = ""
+        Me.txbNachPLZ.MaxLines_Warning_Label = Nothing
+        Me.txbNachPLZ.Name = "txbNachPLZ"
+        Me.txbNachPLZ.Size = New System.Drawing.Size(60, 20)
+        Me.txbNachPLZ.TabIndex = 7
+        '
+        'txbVonPLZ
+        '
+        Me.txbVonPLZ._DateTimeOnly = False
+        Me.txbVonPLZ._numbersOnly = False
+        Me.txbVonPLZ._numbersOnlyKommastellen = ""
+        Me.txbVonPLZ._numbersOnlyTrennzeichen = True
+        Me.txbVonPLZ._Prozent = False
+        Me.txbVonPLZ._ShortDateNew = False
+        Me.txbVonPLZ._ShortDateOnly = False
+        Me.txbVonPLZ._TimeOnly = False
+        Me.txbVonPLZ._TimeOnly_Seconds = False
+        Me.txbVonPLZ._value = ""
+        Me.txbVonPLZ._Waehrung = False
+        Me.txbVonPLZ._WaehrungZeichen = True
+        Me.txbVonPLZ.ForeColor = System.Drawing.Color.Black
+        Me.txbVonPLZ.Location = New System.Drawing.Point(121, 23)
+        Me.txbVonPLZ.MaxLineLength = -1
+        Me.txbVonPLZ.MaxLines_Warning = ""
+        Me.txbVonPLZ.MaxLines_Warning_Label = Nothing
+        Me.txbVonPLZ.Name = "txbVonPLZ"
+        Me.txbVonPLZ.Size = New System.Drawing.Size(60, 20)
+        Me.txbVonPLZ.TabIndex = 4
+        '
+        'tbNichtEUAnteil
+        '
+        Me.tbNichtEUAnteil._DateTimeOnly = False
+        Me.tbNichtEUAnteil._numbersOnly = False
+        Me.tbNichtEUAnteil._numbersOnlyKommastellen = ""
+        Me.tbNichtEUAnteil._numbersOnlyTrennzeichen = True
+        Me.tbNichtEUAnteil._Prozent = True
+        Me.tbNichtEUAnteil._ShortDateNew = False
+        Me.tbNichtEUAnteil._ShortDateOnly = False
+        Me.tbNichtEUAnteil._TimeOnly = False
+        Me.tbNichtEUAnteil._TimeOnly_Seconds = False
+        Me.tbNichtEUAnteil._value = Nothing
+        Me.tbNichtEUAnteil._Waehrung = False
+        Me.tbNichtEUAnteil._WaehrungZeichen = False
+        Me.tbNichtEUAnteil.ForeColor = System.Drawing.Color.Black
+        Me.tbNichtEUAnteil.Location = New System.Drawing.Point(86, 227)
+        Me.tbNichtEUAnteil.MaxLineLength = -1
+        Me.tbNichtEUAnteil.MaxLines_Warning = ""
+        Me.tbNichtEUAnteil.MaxLines_Warning_Label = Nothing
+        Me.tbNichtEUAnteil.Name = "tbNichtEUAnteil"
+        Me.tbNichtEUAnteil.Size = New System.Drawing.Size(49, 20)
+        Me.tbNichtEUAnteil.TabIndex = 30
+        '
+        'tbEUAnteil
+        '
+        Me.tbEUAnteil._DateTimeOnly = False
+        Me.tbEUAnteil._numbersOnly = False
+        Me.tbEUAnteil._numbersOnlyKommastellen = ""
+        Me.tbEUAnteil._numbersOnlyTrennzeichen = False
+        Me.tbEUAnteil._Prozent = True
+        Me.tbEUAnteil._ShortDateNew = False
+        Me.tbEUAnteil._ShortDateOnly = False
+        Me.tbEUAnteil._TimeOnly = False
+        Me.tbEUAnteil._TimeOnly_Seconds = False
+        Me.tbEUAnteil._value = Nothing
+        Me.tbEUAnteil._Waehrung = False
+        Me.tbEUAnteil._WaehrungZeichen = False
+        Me.tbEUAnteil.ForeColor = System.Drawing.Color.Black
+        Me.tbEUAnteil.Location = New System.Drawing.Point(84, 188)
+        Me.tbEUAnteil.MaxLineLength = -1
+        Me.tbEUAnteil.MaxLines_Warning = ""
+        Me.tbEUAnteil.MaxLines_Warning_Label = Nothing
+        Me.tbEUAnteil.Name = "tbEUAnteil"
+        Me.tbEUAnteil.Size = New System.Drawing.Size(51, 20)
+        Me.tbEUAnteil.TabIndex = 24
+        '
+        'frmFrachtkostenBerechnen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(381, 305)
+        Me.Controls.Add(Me.cbxLandNach)
+        Me.Controls.Add(Me.cbxLandVon)
+        Me.Controls.Add(Me.ckbManAnteilsermittlung)
+        Me.Controls.Add(Me.txbCalcDistanceNichtEU)
+        Me.Controls.Add(Me.lblDistanzNichtEU)
+        Me.Controls.Add(Me.tbNichtEUAnteilberechnet)
+        Me.Controls.Add(Me.tbEUAnteilberechnet)
+        Me.Controls.Add(Me.lblWarningFaktor)
+        Me.Controls.Add(Me.lblWarningBestimmungsort)
+        Me.Controls.Add(Me.lblWarningAbgangort)
+        Me.Controls.Add(Me.lblWarningNichtEUAnteil)
+        Me.Controls.Add(Me.lblWarningEUAnteil)
+        Me.Controls.Add(Me.txbFactor)
+        Me.Controls.Add(Me.lblFaktor)
+        Me.Controls.Add(Me.tbxGesamtfrachtkosten)
+        Me.Controls.Add(Me.txbGewicht)
+        Me.Controls.Add(Me.txbCalcDistanceEU)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txbNachOrt)
+        Me.Controls.Add(Me.txbVonOrt)
+        Me.Controls.Add(Me.btnCalculate)
+        Me.Controls.Add(Me.lblGesamtfrachkosten)
+        Me.Controls.Add(Me.lblGewicht)
+        Me.Controls.Add(Me.lblDistanzEU)
+        Me.Controls.Add(Me.txbNachPLZ)
+        Me.Controls.Add(Me.txbVonPLZ)
+        Me.Controls.Add(Me.lblNichtEUAnteil)
+        Me.Controls.Add(Me.lblEUAnteil)
+        Me.Controls.Add(Me.tbNichtEUAnteil)
+        Me.Controls.Add(Me.tbEUAnteil)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.lblNach)
+        Me.Controls.Add(Me.lblVon)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmFrachtkostenBerechnen"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Frachtkosten berechnen"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents lblVon As Label
+    Friend WithEvents lblNach As Label
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents btnOK As Button
+    Friend WithEvents tbEUAnteil As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents tbNichtEUAnteil As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblEUAnteil As Label
+    Friend WithEvents lblNichtEUAnteil As Label
+    Friend WithEvents txbVonPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbNachPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblDistanzEU As Label
+    Friend WithEvents lblGewicht As Label
+    Friend WithEvents btnCalculate As Button
+    Friend WithEvents txbVonOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbNachOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents txbCalcDistanceEU As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbGewicht As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblGesamtfrachkosten As Label
+    Friend WithEvents tbxGesamtfrachtkosten As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbFactor As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblFaktor As Label
+    Friend WithEvents lblWarningEUAnteil As Label
+    Friend WithEvents lblWarningNichtEUAnteil As Label
+    Friend WithEvents lblWarningAbgangort As Label
+    Friend WithEvents lblWarningBestimmungsort As Label
+    Friend WithEvents lblWarningFaktor As Label
+    Friend WithEvents tbEUAnteilberechnet As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents tbNichtEUAnteilberechnet As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbCalcDistanceNichtEU As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblDistanzNichtEU As Label
+    Friend WithEvents ckbManAnteilsermittlung As CheckBox
+    Friend WithEvents ToolTipAutomatischErmitteln As ToolTip
+    Friend WithEvents cbxLandVon As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxLandNach As VERAG_PROG_ALLGEMEIN.MyComboBox
+End Class
--- a/Aviso/frmFrachtkostenBerechnen.resx
+++ b/Aviso/frmFrachtkostenBerechnen.resx
--- a/Aviso/frmFrachtkostenBerechnen.vb
+++ b/Aviso/frmFrachtkostenBerechnen.vb
@@ -0,0 +1,304 @@
+Imports System.Linq.Expressions
+Imports System.Security.Cryptography
+Imports DocumentFormat.OpenXml.Drawing
+Imports DocumentFormat.OpenXml.Office.MetaAttributes
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmFrachtkostenBerechnen
+
+    Dim absenderID As Integer = -1
+    Dim empfaengerID As Integer = -1
+    Dim origin As String
+    Dim destination As String
+    Public EUAnteil As Double
+    Public nichtEUAnteil As Double
+    Dim gewicht As Double
+    Dim gesamtFrachtkosten As Double
+    Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+
+
+    Sub New(absID As String, empfID As String, gewichtInput As String, gesamtfrachtkostenInput As String)
+
+        InitializeComponent()
+        Try
+
+
+            If gesamtfrachtkostenInput IsNot Nothing AndAlso gesamtfrachtkostenInput.ToString <> "" AndAlso IsNumeric(gesamtfrachtkostenInput) Then
+                gesamtFrachtkosten = CDbl(gesamtfrachtkostenInput)
+                tbxGesamtfrachtkosten._value = gesamtFrachtkosten
+            Else
+                gesamtFrachtkosten = 0
+            End If
+
+
+            If gewichtInput IsNot Nothing AndAlso gewichtInput.ToString <> "" AndAlso IsNumeric(gewichtInput) Then
+                gewicht = CDbl(gewichtInput)
+            Else
+                gewicht = 0
+            End If
+
+
+            If absID IsNot Nothing AndAlso absID.ToString <> "" AndAlso IsNumeric(absID) Then
+                absenderID = CInt(absID)
+            Else
+                absenderID = -1
+            End If
+
+
+            If empfID IsNot Nothing AndAlso empfID.ToString <> "" AndAlso IsNumeric(empfID) Then
+
+                empfaengerID = Int(empfID)
+            Else
+                empfaengerID = -1
+            End If
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+    End Sub
+
+
+    Private Sub frmFrachtkotenBerechnen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+
+
+        'cbxLandVon.fillWithSQL("SELECT Distinct(ISNULL([LandKz],'')) as LandKZ FROM [Adressen] order by LandKz asc", False, "FMZOLL", True, True)
+        cbxLandVon.fillWithSQL(" select distinct landkz, Währungstabelle.Land  from   Währungstabelle  where landkz is not null  order by LandKz", True, "FMZOLL", True)
+
+        cbxLandVon.changeItem(sql.DLookup("[LandKz]", "[Adressen]", "[AdressenNr]='" & absenderID & "'", "FMZOLL", ""))
+        txbVonPLZ.fillWithSQL("SELECT ISNULL([PLZ],'')  FROM [Adressen] where AdressenNr = '" & absenderID & "'", "FMZOLL")
+        txbVonOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [Adressen] where AdressenNr = '" & absenderID & "'", "FMZOLL")
+
+        cbxLandNach.Items.AddRange(cbxLandVon.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+        cbxLandNach.changeItem(sql.DLookup("[LandKz]", "[Adressen]", "[AdressenNr]='" & empfaengerID & "'", "FMZOLL", ""))
+        txbNachPLZ.fillWithSQL("SELECT ISNULL([PLZ],'-') FROM [Adressen] where AdressenNr = '" & empfaengerID & "'", "FMZOLL")
+        txbNachOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [Adressen] where AdressenNr = '" & empfaengerID & "'", "FMZOLL")
+
+        ckbManAnteilsermittlung.Checked = True
+
+        tbEUAnteil._value = 0
+        tbNichtEUAnteil._value = 0
+        txbGewicht._value = gewicht.ToString
+        txbFactor._value = 0.15
+        checkInputFields()
+
+
+    End Sub
+
+    Sub calculateFreight()
+
+        'resetInputFields()
+        setControlEUAnteile()
+
+        origin = IIf(cbxLandVon._value <> "", cbxLandVon._value, "") & " " & IIf(txbVonPLZ._value <> "", txbVonPLZ._value, "") & " " & IIf(txbVonOrt._value <> "", txbVonOrt._value, "")
+        destination = IIf(cbxLandNach._value <> "", cbxLandNach._value, "") & " " & IIf(txbNachPLZ._value <> "", txbNachPLZ._value, "") & " " & IIf(txbNachOrt._value <> "", txbNachOrt._value, "")
+
+        Dim getValues = True
+        Dim twoRouteRequest As Boolean = False
+        Dim duration = ""
+        Dim distance = ""
+        Dim durationEU = ""
+        Dim distanceEU = ""
+
+
+        If cbxLandVon._value = "TR" AndAlso ckbManAnteilsermittlung.Checked Then
+
+            twoRouteRequest = True
+            'Kapitan Andreevo ist EU Grenze für Lieferungen aus der Türkei
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, "Kapitan Andreevo", duration, distance,, getValues)
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance("Kapitan Andreevo", destination, durationEU, distanceEU,, getValues)
+
+        ElseIf cbxLandVon._value = "SRB" AndAlso ckbManAnteilsermittlung.Checked Then
+            twoRouteRequest = True
+            'Horgoš ist EU Grenze für Lieferungen aus Serbien
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, "Horgoš", duration, distance,, getValues)
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance("Horgoš", destination, durationEU, distanceEU,, getValues)
+
+        ElseIf cbxLandNach._value = "GB" AndAlso ckbManAnteilsermittlung.Checked Then
+            twoRouteRequest = True
+            'Dover ist EU Grenze für Lieferungen nach England
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, "Dover", durationEU, distanceEU,, getValues)
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance("Dover", destination, duration, distance,, getValues)
+
+        ElseIf cbxLandVon._value = "GB" AndAlso ckbManAnteilsermittlung.Checked Then
+            twoRouteRequest = True
+            'Dover ist EU Grenze für Lieferungen aus England
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, "Dover", duration, distance,, getValues)
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance("Dover", destination, durationEU, distanceEU,, getValues)
+
+        End If
+
+        If twoRouteRequest = True AndAlso ckbManAnteilsermittlung.Checked Then
+
+            lblDistanzEU.Text = "EU-Distanz"
+            lblDistanzNichtEU.Visible = True
+            txbCalcDistanceNichtEU.Visible = True
+
+            Try
+
+                If (IsNumeric(distanceEU)) Then
+                    IIf(distanceEU > 1000, Math.Round(distanceEU / 1000, 0), distanceEU)
+                    txbCalcDistanceEU._value = IIf(distanceEU > 1000, Math.Round(distanceEU / 1000, 0), distanceEU)
+                Else
+                    distanceEU = "0"
+
+                    MsgBox("Standort vom Bestimmungsort kann nicht ermittelt werden!" & vbCr & "Bitte Eingabe " & txbNachPLZ._value & " " & txbNachOrt._value & " prüfen")
+                    Exit Sub
+
+                End If
+
+                If (IsNumeric(distance)) Then
+                    txbCalcDistanceNichtEU._value = IIf(CInt(distance) > 1000, Math.Round(CInt(distance) / 1000, 0), CInt(distance))
+                Else
+                    distance = "0"
+                    MsgBox("Standort vom Abgangsort kann nicht ermittelt werden!" & vbCr & "Bitte Eingabe " & txbVonPLZ._value & " " & txbVonOrt._value & " prüfen")
+                    Exit Sub
+                End If
+
+                Dim totalDistance = CDbl(distance) + CDbl(distanceEU)
+
+                Dim distanceNotEUpercent = CDbl(distance) * 100 / totalDistance
+                Dim distanceEUpercent = CDbl(distanceEU) * 100 / totalDistance
+
+                Math.Round(distanceNotEUpercent, 2)
+                Math.Round(distanceEUpercent, 2)
+
+                tbEUAnteil._value = CDbl(distanceEUpercent) / 100
+                tbNichtEUAnteil._value = CDbl(distanceNotEUpercent) / 100
+
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            End Try
+
+
+        ElseIf ckbManAnteilsermittlung.Checked Then
+
+            VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, destination, duration, distance)
+
+            tbEUAnteil._value = 0.6
+            tbNichtEUAnteil._value = 0.4
+            If distance = "0" Or distance = "" Then
+                MsgBox("Standort vom Abgangsort/Bestimmungsort kann nicht ermittelt werden!" & vbCr & "Bitte Eingabe prüfen")
+            End If
+            lblDistanzEU.Text = "Distanz"
+                txbCalcDistanceEU._value = distance
+                lblDistanzNichtEU.Visible = False
+                txbCalcDistanceNichtEU.Visible = False
+
+            Else
+
+                lblDistanzEU.Text = "Distanz"
+            txbCalcDistanceEU._value = distance
+            lblDistanzNichtEU.Visible = False
+            txbCalcDistanceNichtEU.Visible = False
+
+        End If
+
+
+    End Sub
+
+    Sub calculateFreightCosts()
+
+        Try
+
+            If gesamtFrachtkosten = 0 Then
+
+                gesamtFrachtkosten = gewicht * CDbl(txbFactor._value)
+                tbxGesamtfrachtkosten._value = gesamtFrachtkosten
+
+            End If
+
+
+            tbxGesamtfrachtkosten._value = gesamtFrachtkosten
+            EUAnteil = gesamtFrachtkosten * tbEUAnteil._value
+            nichtEUAnteil = gesamtFrachtkosten * CDbl(tbNichtEUAnteil._value)
+            tbEUAnteilberechnet._value = CStr(EUAnteil)
+            tbNichtEUAnteilberechnet._value = CStr(nichtEUAnteil)
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+    End Sub
+
+    Function checkInputFields() As Boolean
+
+        Dim isFilled As Boolean = True
+
+        lblWarningAbgangort.Visible = False
+        lblWarningBestimmungsort.Visible = False
+        lblWarningEUAnteil.Visible = False
+        lblWarningNichtEUAnteil.Visible = False
+        btnOK.DialogResult = DialogResult.OK
+
+        If (tbEUAnteil._value = "" Or Not IsNumeric(tbEUAnteil._value)) Then
+            lblWarningEUAnteil.Visible = True
+            btnOK.DialogResult = DialogResult.OK
+            isFilled = False
+        End If
+
+        If (tbNichtEUAnteil._value = "" Or Not IsNumeric(tbNichtEUAnteil._value)) Then
+            lblWarningNichtEUAnteil.Visible = True
+            btnOK.DialogResult = DialogResult.OK
+            isFilled = False
+        End If
+
+        If (txbFactor._value = "" Or Not IsNumeric(txbFactor._value)) Then
+            'Hinweis INPUT false
+        End If
+
+        If (txbVonOrt._value = "" Or txbVonPLZ._value = "") Then
+            lblWarningAbgangort.Visible = True
+            btnOK.DialogResult = DialogResult.OK
+            isFilled = False
+        End If
+
+        If (txbNachOrt._value = "" Or txbNachPLZ._value = "") Then
+            lblWarningBestimmungsort.Visible = True
+            btnOK.DialogResult = DialogResult.OK
+            isFilled = False
+        End If
+
+        Return isFilled
+
+    End Function
+
+
+    Private Sub btnCalculate_Click(sender As Object, e As EventArgs) Handles btnCalculate.Click
+
+        If (checkInputFields() = False) Then Exit Sub
+        calculateFreight()
+        If (checkInputFields() = False) Then Exit Sub
+        calculateFreightCosts()
+
+    End Sub
+
+
+
+    Private Sub resetInputFields()
+        txbCalcDistanceEU.Clear()
+        txbCalcDistanceNichtEU.Clear()
+        tbEUAnteilberechnet.Clear()
+        tbNichtEUAnteilberechnet.Clear()
+        If tbEUAnteil._value = "" Then tbEUAnteil._value = 0
+        If tbNichtEUAnteil._value = "" Then tbNichtEUAnteil._value = 0
+
+    End Sub
+
+    Private Sub setControlEUAnteile()
+        If ckbManAnteilsermittlung.Checked Then
+            tbEUAnteil.Enabled = False
+            tbNichtEUAnteil.Enabled = False
+        Else
+            tbEUAnteil.Enabled = True
+            tbNichtEUAnteil.Enabled = True
+            resetInputFields()
+        End If
+    End Sub
+
+    Private Sub ckbManAnteilsermittlung_CheckStateChanged(sender As Object, e As EventArgs) Handles ckbManAnteilsermittlung.CheckStateChanged
+        setControlEUAnteile()
+    End Sub
+End Class
--- a/Aviso/frmGesSich.vb
+++ b/Aviso/frmGesSich.vb
@@ -1,632 +0,0 @@
-Imports System.Reflection
-
-Public Class frmGesSich
-
-    Public Property GesamtsichNr As Integer
-    Public Property MakeDate As DateTime = Nothing
-    Property GesSichRef As cGesamtSicherheitsReferenz
-    Property Standort As String = ""
-    Public ZollsatzMulti As Double = 0
-    Public Saldo As Integer = 0
-    Public Neu As Boolean = False
-    Public FilialNummer As Integer
-    Public Abfertigungsnummer As String
-    Public LKWID As String
-
-    Dim openopened As cSicherheit
-    dim closedopened as cSicherheit
-
-
-    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
-
-    Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
-
-        Dim dgv As String = ""
-        For Each c As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns
-            dgv &= c.Width & c.HeaderText & vbCrLf
-        Next
-        '  MsgBox(dgv)
-        LoadDGV()
-        GesSichRef.LoadStandort(Standort)
-        LoadStandort()
-    End Sub
-
-    Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        If nixzunull(GesamtsichNr) = 0 Or Neu = True Then
-            panOben.Enabled = False : panOben.Enabled = False
-            panOverlay.Visible = True
-            cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-            If MakeDate = Nothing Then MakeDate = Date.Now
-        Else
-            LoadDGV()
-        End If
-        LoadStandort()
-        cboATR.Enabled = GesSichRef.ATR
-
-        Me.Text = "Gesamtsicherheit " & Standort
-        frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitCRN)
-    End Sub
-
-
-    Public Sub LoadDGV()
-        lblSaldo.Text = "Saldo: € " & GesSichRef.Saldo.ToString("N")
-        lblGestellungNr.Text = ""
-        Dim sqladd1 As String = ""
-        If GesSichRef.UstEnabled Then sqladd1 &= ", FORMAT(((Warenwert + Sicherheitsbetrag) * " & GesSichRef.Ust & "/100), 'C', 'de-DE') as Ust"
-        If GesSichRef.ATR Then sqladd1 &= ", ATRJN"
-
-
-        Dim addtosqlstring As String = ""
-        Dim SQLStringMRN As String = "select GesamtSichID, Kennnummer, PosNr, DateTime, Warenwert, Sicherheitsbetrag, Saldo " & sqladd1 & " , Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "' and Art = 'Open' order by DateTime"
-        dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,)
-        dgvGesamtsicherheitMRN.LOAD()
-
-        Dim SQLStringCRN As String = "select GesamtSichID, Kennnummer, DateTime, Warenwert, Sicherheitsbetrag, Saldo, Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "' and Art = 'Close' order by DateTime"
-        dgvGesamtsicherheitCRN.SET_SQL(SQLStringCRN, "AVISO", ,)
-        dgvGesamtsicherheitCRN.LOAD()
-
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
-
-        If dt.Rows.Count > 0 Then
-            'Me.GesamtsichNr = dt.Rows(0).Item("GesamtsichNr")
-            Me.FilialNummer = dt.Rows(0).Item("FilialNummer")
-            Me.Abfertigungsnummer = dt.Rows(0).Item("Abfertigungsnummer")
-
-            If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer
-            If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "Abfertigungsnummer: " & Me.Abfertigungsnummer
-        End If
-
-
-        If dgvGesamtsicherheitMRN.Columns.Count > 0 Then
-            With dgvGesamtsicherheitMRN
-                .RowHeadersWidth = 10
-                .Columns("GesamtSichID").Visible = False
-                .Columns("Warenwert").DefaultCellStyle.Format = "c"
-                .Columns("Sicherheitsbetrag").DefaultCellStyle.Format = "c"
-                .Columns("Saldo").DefaultCellStyle.Format = "c"
-                .Columns("Saldo").Visible = False
-                Select Case GesSichRef.ATR
-                    Case True
-                        .Columns("Kennnummer").HeaderText = "ATB"
-                        .Columns("AtrJN").HeaderText = "ATR"
-                        .Columns("AtrJN").Width = 33
-                        .Columns("Ust").Width = 69
-                    Case Else
-                        .Columns("Kennnummer").HeaderText = "CRN"
-                End Select
-                .Columns("Kennnummer").Width = 146
-
-                .Columns("PosNr").Width = 20
-                .Columns("DateTime").Width = 95
-                .Columns("Warenwert").Width = 100
-                .Columns("Saldo").Width = 100
-
-                .Columns("Sicherheitsbetrag").Width = 100
-                .Columns("Freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-            End With
-            ' For Each col As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns
-            'col.Width = 120
-            'Next
-        End If
-
-        If dgvGesamtsicherheitCRN.Columns.Count > 0 Then
-            With dgvGesamtsicherheitCRN
-                .RowHeadersWidth = 10
-                .Columns("GesamtSichID").Visible = False
-                .Columns("Warenwert").DefaultCellStyle.Format = "c"
-                .Columns("Sicherheitsbetrag").DefaultCellStyle.Format = "c"
-                .Columns("Saldo").DefaultCellStyle.Format = "c"
-                .Columns("Saldo").Visible = False
-                Select Case GesSichRef.ATR
-                    Case True
-                        .Columns("Kennnummer").HeaderText = "ATC / MRN"
-                    Case Else
-                        .Columns("Kennnummer").HeaderText = "CRN"
-                End Select
-                .Columns("Kennnummer").Width = 120
-                .Columns("DateTime").Width = 140
-                .Columns("Warenwert").Width = 100
-                .Columns("Sicherheitsbetrag").Width = 100
-                .Columns("Freitext").Width = 220
-            End With
-            'For Each col As DataGridViewColumn In dgvGesamtsicherheitCRN.Columns
-            '    col.Width = 120
-            'Next
-        End If
-
-
-    End Sub
-
-
-    Public Sub LoadStandort()
-        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & Standort & "'"
-        'Dim dt As New DataTable
-        'dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
-        'Zollsatz = dt.Rows(0).Item("Zollsatz")
-        'Referenzwert = dt.Rows(0).Item("Referenzwert")
-
-        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.Referenzwert.ToString("N")
-        lblZollsatz.Text = "Zollsatz: " & GesSichRef.Zollsatz & "%"
-        ZollsatzMulti = GesSichRef.Zollsatz / 100
-    End Sub
-
-
-
-    'Private Sub CalcSaldo()
-    '    Dim SaldoString As String = "select SUM([MRN_Sicherheitsbetrag]) as sumone, SUM([CRN_Sicherheitsbetrag]) As sumtwo from [tblGesamtsicherheit]"
-    '    Dim dt As New DataTable
-    '    dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
-    '    Dim mrn As Integer = dt.Rows(0).Item(0)
-    '    Dim crn As Integer = dt.Rows(0).Item(1)
-
-    '    Saldo = Referenzwert - mrn + crn
-
-    '    lblSaldo.Text = "Saldo: €" & Saldo.ToString("N")
-    'End Sub
-
-
-    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtCRNWarenwert.TextChanged
-        Try
-            Select Case sender.name
-                Case "txtMRNWarenwert"
-                    txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N")
-                    If GesSichRef.UstEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.Ust / 100)
-                Case "txtCRNWarenwert"
-                    txtCRNSicherheitsbetrag.Text = (txtCRNWarenwert.Text * ZollsatzMulti).ToString("N")
-            End Select
-        Catch
-        End Try
-    End Sub
-
-    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtCRNWarenwert.KeyPress, txtPos.KeyPress
-        Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 44
-                ' Zahlen, Backspace und , zulassen
-
-            Case Else
-                ' alle anderen Eingaben unterdrücken
-                e.Handled = True
-        End Select
-    End Sub
-
-    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtCRNDate.KeyPress, txtCRNTime.KeyPress, txtMRNDate.KeyPress, txtMRNTime.KeyPress
-        Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 46, 58
-                ' Zahlen, Backspace, . und : zulassen
-
-            Case Else
-                ' alle anderen Eingaben unterdrücken
-                e.Handled = True
-        End Select
-    End Sub
-
-
-    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
-        Try
-            Dim a As Date = Date.ParseExact(txtMRNDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
-            Dim b As Date = Date.ParseExact(txtMRNTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
-
-            Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
-            MsgBox(ab.ToString)
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
-
-    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtMRNDate.GotFocus, txtCRNDate.GotFocus, txtMRNTime.GotFocus, txtCRNTime.GotFocus
-        Select Case sender.name
-            Case "txtMRNDate"
-                If txtMRNDate.Text.Length < 1 Then txtMRNDate.Text = Date.Today.ToString("dd.MM.yyyy")
-            Case "txtCRNDate"
-                If txtCRNDate.Text.Length < 1 Then txtCRNDate.Text = Date.Today.ToString("dd.MM.yyyy")
-            Case "txtMRNTime"
-                If txtMRNTime.Text.Length < 1 Then txtMRNTime.Text = Date.Now.ToString("HH:mm")
-            Case "txtCRNTime"
-                If txtCRNTime.Text.Length < 1 Then txtCRNTime.Text = Date.Now.ToString("HH:mm")
-        End Select
-    End Sub
-
-    Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click
-        Try
-
-            Dim OPEN As New cSicherheit(Me)
-            With OPEN
-                .Kennnummer = txtMRN.Text
-                .PosNr = Double.Parse(nixzunull(txtPos.Text))
-                .DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
-                .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-                .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-                .standort = Me.Standort
-                .Art = "OPEN"
-                .GesamtsichNr = Me.GesamtsichNr
-                .MakeDate = Me.MakeDate
-                .Freitext = Me.txtFreitextOpen.Text
-                .saldo = GesSichRef.Saldo
-                .ATRJN = nixzunull(cboATR.SelectedItem)
-            End With
-
-            If Neu = True Then OPEN.GesamtsichNr = AddNewGesamtSichNr()
-
-            Select Case TestIfExist(OPEN.Kennnummer, GesamtsichNr)
-                Case "Neu"
-                    OPEN.Save()
-                Case Else
-                    MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & TestIfExist(OPEN.Kennnummer, GesamtsichNr) & "eingetragen") : OPEN.Save()
-            End Select
-
-            AfterButton()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
-
-    Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click
-        Try
-            Dim Close As New cSicherheit(Me)
-            With Close
-                .Kennnummer = txtCRN.Text
-                .DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
-                .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-                .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-                .standort = Me.Standort
-                .Art = "Close"
-                .GesamtsichNr = Me.GesamtsichNr
-                .MakeDate = Me.MakeDate
-                .Freitext = Me.txtFreitextClose.Text
-                .saldo = GesSichRef.Saldo
-            End With
-
-            If Neu = True Then Close.GesamtsichNr = AddNewGesamtSichNr()
-
-            Select Case TestIfExist(Close.Kennnummer, GesamtsichNr)
-                Case "Neu"
-                    Close.Save()
-                Case Else
-                    MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & TestIfExist(Close.Kennnummer, GesamtsichNr) & "eingetragen") : Exit Sub
-            End Select
-
-            AfterButton()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
-
-    Function nixzunull(s As String, Optional type As String = "")
-
-        If s = "" Then
-            Dim O As Double = 0
-
-            Return O
-        Else
-            Return s
-        End If
-    End Function
-    Function AfterButton()
-        GesSichRef.CalcSaldo()
-        LoadDGV()
-        EmptyTXT()
-    End Function
-
-    Public Function AddNewGesamtSichNr() As Integer
-        Dim sqlq As String = "select MAX([GesamtsichNr]) as MaxGesSich from tblGesamtsicherheit"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-        Dim LetzteGesSichNum As Integer = dt.Rows(0).Item(0)
-        Me.GesamtsichNr = LetzteGesSichNum + 1
-        Me.Neu = False
-        Return Me.GesamtsichNr
-    End Function
-
-    Public Sub EmptyTXT()
-        Dim a As New List(Of Control)
-        For Each contr As Control In panOben.Controls
-            If contr.GetType.FullName = "System.Windows.Forms.TextBox" Then contr.Text = ""
-        Next
-        cboATR.SelectedItem = Nothing
-    End Sub
-
-    Public Function TestIfExist(KennnummerStr As String, Optional ByVal lkw As String = "")
-        If lkw = "" And Me.GesamtsichNr > 0 Then lkw = GesamtsichNr
-
-        Dim SQLString As String = "Select * from [tblGesamtsicherheit] where Kennnummer = '" & KennnummerStr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True)
-        If dt.Rows.Count > 0 Then
-            Return dt.Rows(0).Item("GesamtsichNr").ToString
-        Else
-            Return "Neu"
-        End If
-    End Function
-
-    Public Function DateTimeString2DateTimeKonvertinator(datum As String, uhrzeit As String) As DateTime
-        Try
-            Dim a As Date = Date.ParseExact(datum, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
-            Dim b As Date = Date.ParseExact(uhrzeit, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
-
-            Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
-            Return ab
-        Catch ex As Exception
-            MsgBox(ex.Message)
-            Return Date.Now
-        End Try
-    End Function
-
-
-
-    Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click
-        Try
-            Me.FilialNummer = returnnothingehschonwissen(cboFiliale.SelectedItem, "Integer")
-        Catch
-            Me.FilialNummer = "0"
-        End Try
-
-        Me.Abfertigungsnummer = txtAbfertNum.Text
-        Me.LKWID = txtLKWID.Text
-
-        If nixzunull(Me.GesamtsichNr) > 0 Then
-            Dim sqlstring = "Update [tblGesamtsicherheit] set FilialNummer = '" & Me.FilialNummer & "', Abfertigungsnummer = '" & Me.Abfertigungsnummer & "', LKWID = '" & Me.LKWID & "' WHERE GesamtSichNr = '" & Me.GesamtsichNr & "' "
-            SQL.doSQL(sqlstring, "AVISO")
-            LoadDGV()
-        End If
-
-        panOben.Enabled = True : panOben.Enabled = True
-        panOverlay.Visible = False
-    End Sub
-
-    Private Function returnnothingehschonwissen(obj As Object, Optional type As String = "String")
-        Select Case type
-            Case "String"
-                If obj Is Nothing Then
-                    Return ""
-                Else
-                    Return obj.value.ToString
-                End If
-            Case "Integer"
-                If obj Is Nothing Then
-                    Return Nothing
-                Else
-                    Return Integer.Parse(obj.value)
-                End If
-        End Select
-
-
-    End Function
-
-    Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick
-
-        Dim Sicherh As New cSicherheit
-        Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value)
-
-        txtMRN.Text = Sicherh.Kennnummer
-        txtPos.Text = Sicherh.PosNr
-        txtMRNWarenwert.Text = Sicherh.Warenwert
-        txtFreitextOpen.Text = Sicherh.Freitext
-        cboATR.SelectedItem = Sicherh.ATRJN
-        txtMRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy")
-        txtMRNTime.Text = Sicherh.DateTime.ToString("HH:mm")
-
-        openopened = Sicherh
-
-        btnAddOpen.Visible = False
-        btnUpdateOpen.Visible = True
-        btnDeleteOpen.Visible = True
-    End Sub
-
-    Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click
-        With openopened
-            .Kennnummer = txtMRN.Text
-            .PosNr = Double.Parse(nixzunull(txtPos.Text))
-            .DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
-            .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-            .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-            .standort = Me.Standort
-            .Art = "OPEN"
-            .GesamtsichNr = Me.GesamtsichNr
-            '.MakeDate = Me.MakeDate
-            .Freitext = Me.txtFreitextOpen.Text
-            '.saldo = GesSichRef.Saldo
-            .ATRJN = nixzunull(cboATR.SelectedItem)
-        End With
-        openopened.Save()
-        btnUpdateOpen.Visible = False
-        btnAddOpen.Visible = True
-        btnDeleteOpen.Visible = False
-        AfterButton()
-    End Sub
-
-    Private Sub FlatButton4_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click
-        With closedopened
-            .Kennnummer = txtCRN.Text
-            .DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
-            .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-            .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-            .standort = Me.Standort
-            .Art = "Close"
-            .Freitext = Me.txtFreitextClose.Text
-        End With
-        closedopened.Save()
-        btnAddClose.Visible = True
-        btnUpdateClose.Visible = False
-        btnDeleteClose.Visible = False
-        AfterButton()
-    End Sub
-
-    Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick
-
-        Dim Sicherh As New cSicherheit
-        Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value)
-
-        txtCRN.Text = Sicherh.Kennnummer
-        txtCRNWarenwert.Text = Sicherh.Warenwert
-        txtFreitextClose.Text = Sicherh.Freitext
-        txtCRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy")
-        txtCRNTime.Text = Sicherh.DateTime.ToString("HH:mm")
-
-        closedopened = Sicherh
-
-        btnDeleteClose.Visible = True
-        btnAddClose.Visible = False
-        btnUpdateClose.Visible = True
-    End Sub
-
-    Private Sub btnDeleteOpen_Click(sender As Object, e As EventArgs) Handles btnDeleteOpen.Click
-        Try
-            openopened.Delete()
-            btnUpdateOpen.Visible = False
-            btnAddOpen.Visible = True
-            btnDeleteOpen.Visible = False
-            AfterButton()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
-
-    Private Sub FlatButton4_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click
-        Try
-            closedopened.Delete()
-            btnUpdateClose.Visible = False
-            btnAddClose.Visible = True
-            btnDeleteClose.Visible = False
-            AfterButton()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
-
-    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles lblGestellungNr.DoubleClick
-        panOverlay.Visible = True
-        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-        cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
-        txtAbfertNum.Text = Me.Abfertigungsnummer
-        txtLKWID.Text = Me.LKWID
-        panOben.Enabled = False
-    End Sub
-End Class
-
-Public Class cSicherheit
-    Property GesamtSichID
-    Property Kennnummer As String
-    Property PosNr As Integer
-    Property DateTime As DateTime
-    Property MakeDate As DateTime
-    Property Warenwert As Double
-    Property Sicherheitsbetrag As Double
-    Property saldo As Double
-    Property standort As String
-    Property Art As String
-    Property GesamtsichNr As Integer
-    Property Ust As Integer
-    Property Freitext As String
-    Property FilialNummer As Integer
-    Property Abfertigungsnummer As String
-    Property LKWID As String
-    Property ATRJN As String = ""
-
-    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
-
-    Public Sub New(Optional ByVal gessich As frmGesSich = Nothing)
-        If gessich IsNot Nothing Then
-            Me.FilialNummer = gessich.FilialNummer
-            Me.Abfertigungsnummer = gessich.Abfertigungsnummer
-            Me.LKWID = gessich.LKWID
-            Me.GesamtSichID = GenerateID()
-        End If
-    End Sub
-
-    Public Function Load(GsID As String)
-        Me.GesamtSichID = GsID
-        Load()
-    End Function
-
-    Public Function Load()
-        Dim dt As New DataTable
-        Dim sqlstring As String = "SELECT  *  FROM [AVISO].[dbo].[tblGesamtsicherheit] where GesamtsichID = '" & Me.GesamtSichID & "'"
-        dt = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
-        Dim test As cSicherheit = SQLEintraege.Loadinator(Me, dt)
-        '    MsgBox("")
-    End Function
-
-    Public Function GenerateID() As String
-        Return Date.Now.ToString.Replace(".", "").Replace("-", "").Replace(",", "").Replace(" ", "").Replace(":", "")
-    End Function
-
-    Public Function Save()
-        'MakeDate = frmGesSich.MakeDate
-        Dim ding As New List(Of SQLEintraege)
-        For Each prop As PropertyInfo In Me.GetType().GetProperties()
-            If prop.GetValue(Me, Nothing).GetType = GetType(Double) Then
-                '        MsgBox(prop.Name)
-                ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing).ToString.Replace(",", ".")))
-            Else
-                ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing)))
-            End If
-            '  ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing)))
-        Next
-
-        '''
-        Dim dt As DataTable = SQL.loadDgvBySql("Select * from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
-        If dt.Rows.Count > 0 Then
-            Dim UpdateString As String = ""
-            For Each i In ding
-                If Not i.Spalte = "GesamtSichID" Then
-                    UpdateString &= "[" & i.Spalte & "]='" & i.Wert & "',"
-                End If
-            Next
-            UpdateString = UpdateString.Substring(0, UpdateString.Length - 1)
-
-            Dim sqlquery As String
-            sqlquery = "update [tblGesamtsicherheit] set " & UpdateString & " where GesamtSichID = '" & Me.GesamtSichID & "'"
-            SQL.doSQL(sqlquery, "AVISO")
-        Else
-
-            Dim text, value, insert As String
-            For Each i In ding
-                text &= i.Spalte & ", "
-                value &= "'" & i.Wert & "', "
-            Next
-            text = text.Substring(0, text.Length - 2)
-            value = value.Substring(0, value.Length - 2)
-
-            insert = "(" & text & ") VALUES (" & value & ")"
-
-            Dim sqlquery As String
-            sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")"
-            SQL.doSQL(sqlquery, "AVISO")
-        End If
-
-    End Function
-
-    Public Function Delete()
-        SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
-    End Function
-
-End Class
-
-Public Class SQLEintraege
-    Property Spalte As String
-    Property Wert As String
-    Public Sub New(_Spalte As String, _Wert As String)
-        Spalte = _Spalte
-        Wert = _Wert
-    End Sub
-
-    Public Shared Function Loadinator(Obj As Object, dt As DataTable) As Object
-        Try
-            For Each prop As PropertyInfo In Obj.GetType().GetProperties()
-                If dt.Rows(0).Item(prop.Name) IsNot Nothing And dt.Rows(0).Item(prop.Name) IsNot DBNull.Value Then
-                    If dt.Rows(0).Item(prop.Name).GetType Is GetType(Decimal) Then
-                        prop.SetValue(Obj, Double.Parse(dt.Rows(0).Item(prop.Name)))
-                    Else
-                        prop.SetValue(Obj, dt.Rows(0).Item(prop.Name))
-                    End If
-
-                End If
-            Next
-            Return Obj
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Function
-End Class
--- a/Aviso/frmGesamtsicherheiten.Designer.vb
+++ b/Aviso/frmGesamtsicherheiten.Designer.vb
@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class frmGesSich
+Partial Class frmGesamtsicherheiten
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -28,12 +28,14 @@ Partial Class frmGesSich
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesSich))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheiten))
        Me.dgvGesamtsicherheitMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.panOverlay = New System.Windows.Forms.Panel()
+        Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblWarenort = New System.Windows.Forms.Label()
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtLKWID = New System.Windows.Forms.TextBox()
        Me.txtAbfertNum = New System.Windows.Forms.TextBox()
        Me.Label18 = New System.Windows.Forms.Label()
@@ -48,7 +50,7 @@ Partial Class frmGesSich
        Me.txtCRNDate = New System.Windows.Forms.TextBox()
        Me.txtMRNTime = New System.Windows.Forms.TextBox()
        Me.txtMRNDate = New System.Windows.Forms.TextBox()
-        Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.btnSaveOben = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtCRNSicherheitsbetrag = New System.Windows.Forms.TextBox()
        Me.txtCRNWarenwert = New System.Windows.Forms.TextBox()
        Me.txtCRN = New System.Windows.Forms.TextBox()
@@ -84,11 +86,14 @@ Partial Class frmGesSich
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtFreitextClose = New System.Windows.Forms.TextBox()
        Me.txtFreitextOpen = New System.Windows.Forms.TextBox()
+        Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel2.SuspendLayout()
        Me.panOverlay.SuspendLayout()
        CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.panOben.SuspendLayout()
+        Me.ContextMenuStrip1.SuspendLayout()
        Me.SuspendLayout()
        '
        'dgvGesamtsicherheitMRN
@@ -105,6 +110,7 @@ Partial Class frmGesSich
        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvGesamtsicherheitMRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvGesamtsicherheitMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvGesamtsicherheitMRN.ContextMenuStrip = Me.ContextMenuStrip1
        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -143,8 +149,10 @@ Partial Class frmGesSich
        'panOverlay
        '
        Me.panOverlay.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.panOverlay.Controls.Add(Me.cboWarenort)
+        Me.panOverlay.Controls.Add(Me.lblWarenort)
        Me.panOverlay.Controls.Add(Me.cboFiliale)
-        Me.panOverlay.Controls.Add(Me.FlatButton2)
+        Me.panOverlay.Controls.Add(Me.btnSave)
        Me.panOverlay.Controls.Add(Me.txtLKWID)
        Me.panOverlay.Controls.Add(Me.txtAbfertNum)
        Me.panOverlay.Controls.Add(Me.Label18)
@@ -157,6 +165,30 @@ Partial Class frmGesSich
        Me.panOverlay.TabIndex = 2
        Me.panOverlay.Visible = False
        '
+        'cboWarenort
+        '
+        Me.cboWarenort._allowedValuesFreiText = Nothing
+        Me.cboWarenort._allowFreiText = False
+        Me.cboWarenort._value = ""
+        Me.cboWarenort.DropDownWidth = 300
+        Me.cboWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboWarenort.FormattingEnabled = True
+        Me.cboWarenort.Location = New System.Drawing.Point(278, 64)
+        Me.cboWarenort.MaxLength = 4
+        Me.cboWarenort.Name = "cboWarenort"
+        Me.cboWarenort.Size = New System.Drawing.Size(186, 24)
+        Me.cboWarenort.TabIndex = 9
+        '
+        'lblWarenort
+        '
+        Me.lblWarenort.AutoSize = True
+        Me.lblWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarenort.Location = New System.Drawing.Point(125, 68)
+        Me.lblWarenort.Name = "lblWarenort"
+        Me.lblWarenort.Size = New System.Drawing.Size(88, 20)
+        Me.lblWarenort.TabIndex = 8
+        Me.lblWarenort.Text = "Warenort:"
+        '
        'cboFiliale
        '
        Me.cboFiliale._allowedValuesFreiText = Nothing
@@ -165,25 +197,25 @@ Partial Class frmGesSich
        Me.cboFiliale.DropDownWidth = 300
        Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboFiliale.FormattingEnabled = True
-        Me.cboFiliale.Location = New System.Drawing.Point(279, 76)
+        Me.cboFiliale.Location = New System.Drawing.Point(279, 103)
        Me.cboFiliale.MaxLength = 4
        Me.cboFiliale.Name = "cboFiliale"
        Me.cboFiliale.Size = New System.Drawing.Size(186, 24)
        Me.cboFiliale.TabIndex = 2
        '
-        'FlatButton2
+        'btnSave
        '
-        Me.FlatButton2.allowBorder = False
-        Me.FlatButton2.BackColor = System.Drawing.Color.Gainsboro
-        Me.FlatButton2.FlatAppearance.BorderSize = 0
-        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton2.Location = New System.Drawing.Point(424, 232)
-        Me.FlatButton2.Name = "FlatButton2"
-        Me.FlatButton2.Size = New System.Drawing.Size(75, 23)
-        Me.FlatButton2.TabIndex = 7
-        Me.FlatButton2.Text = "Speichern"
-        Me.FlatButton2.UseVisualStyleBackColor = False
+        Me.btnSave.allowBorder = False
+        Me.btnSave.BackColor = System.Drawing.Color.Gainsboro
+        Me.btnSave.FlatAppearance.BorderSize = 0
+        Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSave.ForeColor = System.Drawing.Color.Black
+        Me.btnSave.Location = New System.Drawing.Point(424, 232)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 7
+        Me.btnSave.Text = "Speichern"
+        Me.btnSave.UseVisualStyleBackColor = False
        '
        'txtLKWID
        '
@@ -197,7 +229,7 @@ Partial Class frmGesSich
        'txtAbfertNum
        '
        Me.txtAbfertNum.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtAbfertNum.Location = New System.Drawing.Point(279, 128)
+        Me.txtAbfertNum.Location = New System.Drawing.Point(279, 140)
        Me.txtAbfertNum.Margin = New System.Windows.Forms.Padding(0)
        Me.txtAbfertNum.Name = "txtAbfertNum"
        Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24)
@@ -217,7 +249,7 @@ Partial Class frmGesSich
        '
        Me.Label17.AutoSize = True
        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label17.Location = New System.Drawing.Point(68, 130)
+        Me.Label17.Location = New System.Drawing.Point(68, 142)
        Me.Label17.Name = "Label17"
        Me.Label17.Size = New System.Drawing.Size(181, 20)
        Me.Label17.TabIndex = 3
@@ -227,7 +259,7 @@ Partial Class frmGesSich
        '
        Me.Label16.AutoSize = True
        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label16.Location = New System.Drawing.Point(126, 80)
+        Me.Label16.Location = New System.Drawing.Point(126, 107)
        Me.Label16.Name = "Label16"
        Me.Label16.Size = New System.Drawing.Size(123, 20)
        Me.Label16.TabIndex = 1
@@ -239,6 +271,7 @@ Partial Class frmGesSich
        Me.btnClosePanOverlay.BackColor = System.Drawing.Color.White
        Me.btnClosePanOverlay.BackgroundImage = Global.AVISO.My.Resources.Resources.del2
        Me.btnClosePanOverlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.btnClosePanOverlay.DialogResult = System.Windows.Forms.DialogResult.Cancel
        Me.btnClosePanOverlay.FlatAppearance.BorderSize = 0
        Me.btnClosePanOverlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnClosePanOverlay.ForeColor = System.Drawing.Color.Black
@@ -358,19 +391,19 @@ Partial Class frmGesSich
        Me.txtMRNDate.Size = New System.Drawing.Size(85, 24)
        Me.txtMRNDate.TabIndex = 21
        '
-        'btnSave
+        'btnSaveOben
        '
-        Me.btnSave.allowBorder = False
-        Me.btnSave.BackColor = System.Drawing.Color.White
-        Me.btnSave.FlatAppearance.BorderSize = 0
-        Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSave.ForeColor = System.Drawing.Color.Black
-        Me.btnSave.Location = New System.Drawing.Point(12, 12)
-        Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(75, 23)
-        Me.btnSave.TabIndex = 0
-        Me.btnSave.Text = "Speichern"
-        Me.btnSave.UseVisualStyleBackColor = False
+        Me.btnSaveOben.allowBorder = False
+        Me.btnSaveOben.BackColor = System.Drawing.Color.White
+        Me.btnSaveOben.FlatAppearance.BorderSize = 0
+        Me.btnSaveOben.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSaveOben.ForeColor = System.Drawing.Color.Black
+        Me.btnSaveOben.Location = New System.Drawing.Point(12, 12)
+        Me.btnSaveOben.Name = "btnSaveOben"
+        Me.btnSaveOben.Size = New System.Drawing.Size(75, 23)
+        Me.btnSaveOben.TabIndex = 0
+        Me.btnSaveOben.Text = "Speichern"
+        Me.btnSaveOben.UseVisualStyleBackColor = False
        '
        'txtCRNSicherheitsbetrag
        '
@@ -450,7 +483,7 @@ Partial Class frmGesSich
        Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
        Me.lblZollsatz.Location = New System.Drawing.Point(1010, 37)
        Me.lblZollsatz.Name = "lblZollsatz"
-        Me.lblZollsatz.Size = New System.Drawing.Size(86, 16)
+        Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
        Me.lblZollsatz.TabIndex = 4
        Me.lblZollsatz.Text = "Zollsatz: 12%"
        '
@@ -462,7 +495,7 @@ Partial Class frmGesSich
        Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
        Me.lblReferenzwert.Location = New System.Drawing.Point(1010, 15)
        Me.lblReferenzwert.Name = "lblReferenzwert"
-        Me.lblReferenzwert.Size = New System.Drawing.Size(137, 16)
+        Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
        Me.lblReferenzwert.TabIndex = 1
        Me.lblReferenzwert.Text = "Referenzwert: €80.000"
        '
@@ -512,7 +545,7 @@ Partial Class frmGesSich
        Me.panOben.Controls.Add(Me.txtCRNDate)
        Me.panOben.Controls.Add(Me.txtMRNTime)
        Me.panOben.Controls.Add(Me.txtMRNDate)
-        Me.panOben.Controls.Add(Me.btnSave)
+        Me.panOben.Controls.Add(Me.btnSaveOben)
        Me.panOben.Controls.Add(Me.txtCRNSicherheitsbetrag)
        Me.panOben.Controls.Add(Me.txtCRNWarenwert)
        Me.panOben.Controls.Add(Me.txtCRN)
@@ -794,7 +827,19 @@ Partial Class frmGesSich
        Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24)
        Me.txtFreitextOpen.TabIndex = 40
        '
-        'frmGesSich
+        'ClosedErzeugenToolStripMenuItem
+        '
+        Me.ClosedErzeugenToolStripMenuItem.Name = "ClosedErzeugenToolStripMenuItem"
+        Me.ClosedErzeugenToolStripMenuItem.Size = New System.Drawing.Size(161, 22)
+        Me.ClosedErzeugenToolStripMenuItem.Text = "Closed erzeugen"
+        '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ClosedErzeugenToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(162, 26)
+        '
+        'frmGesamtsicherheiten
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -804,7 +849,8 @@ Partial Class frmGesSich
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximumSize = New System.Drawing.Size(1400, 815)
        Me.MinimumSize = New System.Drawing.Size(1400, 815)
-        Me.Name = "frmGesSich"
+        Me.Name = "frmGesamtsicherheiten"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "frmGesSich"
        CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel2.ResumeLayout(False)
@@ -813,6 +859,7 @@ Partial Class frmGesSich
        CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).EndInit()
        Me.panOben.ResumeLayout(False)
        Me.panOben.PerformLayout()
+        Me.ContextMenuStrip1.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@@ -827,7 +874,7 @@ Partial Class frmGesSich
    Friend WithEvents txtCRNDate As TextBox
    Friend WithEvents txtMRNTime As TextBox
    Friend WithEvents txtMRNDate As TextBox
-    Friend WithEvents btnSave As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btnSaveOben As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents txtCRNSicherheitsbetrag As TextBox
    Friend WithEvents txtCRNWarenwert As TextBox
    Friend WithEvents txtCRN As TextBox
@@ -860,7 +907,7 @@ Partial Class frmGesSich
    Friend WithEvents Label15 As Label
    Friend WithEvents txtPos As TextBox
    Friend WithEvents panOverlay As Panel
-    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btnSave As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents txtLKWID As TextBox
    Friend WithEvents txtAbfertNum As TextBox
    Friend WithEvents Label18 As Label
@@ -872,4 +919,8 @@ Partial Class frmGesSich
    Friend WithEvents btnUpdateOpen As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents btnDeleteClose As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents btnDeleteOpen As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblWarenort As Label
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ClosedErzeugenToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmGesamtsicherheiten.resx
+++ b/Aviso/frmGesamtsicherheiten.resx
--- a/Aviso/frmGesamtsicherheiten.vb
+++ b/Aviso/frmGesamtsicherheiten.vb
@@ -0,0 +1,752 @@
+Imports System.Reflection
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmGesamtsicherheiten
+
+    Public Property gessicherheitID As Integer
+    Public Property datum As DateTime = Nothing
+    Property GesSichRef As cGesamtSicherheitsReferenz
+    Property Standort As String = ""
+
+    Public ZollsatzMulti As Double = 0
+
+    Public Saldo As Integer = 0
+
+    Public Neu As Boolean = False
+
+    Public FilialNummer As Integer
+
+    Public Abfertigungsnummer As String
+
+    Public LKWID As String
+
+    Public warenortID As String
+
+    Dim openopened As cSicherheiten
+
+    Dim closedopened As cSicherheiten
+
+    Dim sicherheiten As cSicherheiten
+
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+    Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
+
+        Dim dgv As String = ""
+        For Each c As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns
+            dgv &= c.Width & c.HeaderText & vbCrLf
+        Next
+        '  MsgBox(dgv)
+        LoadDGV()
+        GesSichRef.LOAD()
+        LoadStandort()
+    End Sub
+
+    Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If setNullToZero(gessicherheitID) = "" Or Neu = True Then
+            panOben.Enabled = False : panOben.Enabled = False
+            panOverlay.Visible = True
+            cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
+            cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+            If datum = Nothing Then datum = Date.Now
+        Else
+            LoadDGV()
+        End If
+        LoadStandort()
+        cboATR.Enabled = GesSichRef.gsr_ATR
+
+        Me.Text = "Gesamtsicherheit " & Standort
+        frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitCRN)
+    End Sub
+
+
+    Public Sub LoadDGV()
+        'lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString("N")
+        lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString()
+        lblGestellungNr.Text = ""
+        Dim sqladd1 As String = ""
+        If GesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & GesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust"
+        If GesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]"
+
+
+        Dim addtosqlstring As String = ""
+        Dim SQLStringMRN As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "' and [gs_art] = 'Open' order by [gs_datum]"
+        dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,)
+        dgvGesamtsicherheitMRN.LOAD()
+
+        Dim SQLStringCRN As String = "select [gs_gsId], [gs_ATBNr], [gs_datum],  [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo], [gs_freitext] from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "' and [gs_art] = 'Close' order by [gs_datum]"
+        dgvGesamtsicherheitCRN.SET_SQL(SQLStringCRN, "AVISO", ,)
+        dgvGesamtsicherheitCRN.LOAD()
+
+        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
+
+        If dt.Rows.Count > 0 Then
+            'Me.GesamtsichNr = dt.Rows(0).Item("GesamtsichNr")
+            Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
+            Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr"))
+            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
+
+            If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
+            If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
+            If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
+        End If
+
+
+        If dgvGesamtsicherheitMRN.Columns.Count > 0 Then
+            With dgvGesamtsicherheitMRN
+                .RowHeadersWidth = 10
+                .Columns("gs_gsId").Visible = False
+                .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
+                .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
+                .Columns("gs_saldo").DefaultCellStyle.Format = "c"
+                .Columns("gs_saldo").Visible = False
+                Select Case GesSichRef.gsr_ATR
+                    Case True
+                        .Columns("gs_ATBNr").HeaderText = "ATB"
+                        .Columns("gs_atr").HeaderText = "ATR"
+                        .Columns("gs_atr").Width = 33
+                        .Columns("gs_ust").Width = 69
+                    Case Else
+                        .Columns("gs_ATBNr").HeaderText = "CRN"
+                End Select
+                .Columns("gs_ATBNr").Width = 146
+
+                .Columns("gs_posNr").Width = 20
+                .Columns("gs_datum").Width = 95
+                .Columns("gs_warenwert").Width = 100
+                .Columns("gs_saldo").Width = 100
+
+                .Columns("gs_sicherheitsbetrag").Width = 100
+                .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            End With
+            ' For Each col As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns
+            'col.Width = 120
+            'Next
+        End If
+
+        If dgvGesamtsicherheitCRN.Columns.Count > 0 Then
+            With dgvGesamtsicherheitCRN
+                .RowHeadersWidth = 10
+                .Columns("gs_gsId").Visible = False
+                .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
+                .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
+                .Columns("gs_saldo").DefaultCellStyle.Format = "c"
+                .Columns("gs_saldo").Visible = False
+                Select Case GesSichRef.gsr_ATR
+                    Case True
+                        .Columns("gs_ATBNr").HeaderText = "ATC / MRN"
+                    Case Else
+                        .Columns("gs_ATBNr").HeaderText = "CRN"
+                End Select
+                .Columns("gs_ATBNr").Width = 120
+                .Columns("gs_datum").Width = 140
+                .Columns("gs_warenwert").Width = 100
+                .Columns("gs_sicherheitsbetrag").Width = 100
+                .Columns("gs_freitext").Width = 220
+            End With
+            'For Each col As DataGridViewColumn In dgvGesamtsicherheitCRN.Columns
+            '    col.Width = 120
+            'Next
+        End If
+
+
+    End Sub
+
+
+    Public Sub LoadStandort()
+        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & Standort & "'"
+        'Dim dt As New DataTable
+        'dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
+        'Zollsatz = dt.Rows(0).Item("Zollsatz")
+        'Referenzwert = dt.Rows(0).Item("Referenzwert")
+
+        'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N")
+        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString()
+        lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%"
+        ZollsatzMulti = GesSichRef.gsr_zollsatz / 100
+    End Sub
+
+
+
+    'Private Sub CalcSaldo()
+    '    Dim SaldoString As String = "select SUM([MRN_Sicherheitsbetrag]) as sumone, SUM([CRN_Sicherheitsbetrag]) As sumtwo from [tblGesamtsicherheit]"
+    '    Dim dt As New DataTable
+    '    dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
+    '    Dim mrn As Integer = dt.Rows(0).Item(0)
+    '    Dim crn As Integer = dt.Rows(0).Item(1)
+
+    '    Saldo = Referenzwert - mrn + crn
+
+    '    lblSaldo.Text = "Saldo: €" & Saldo.ToString("N")
+    'End Sub
+
+
+    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtCRNWarenwert.TextChanged
+        Try
+            Select Case sender.name
+                Case "txtMRNWarenwert"
+                    txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N")
+                    If GesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.gsr_ust / 100)
+                Case "txtCRNWarenwert"
+                    txtCRNSicherheitsbetrag.Text = (txtCRNWarenwert.Text * ZollsatzMulti).ToString("N")
+            End Select
+        Catch
+        End Try
+    End Sub
+
+    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtCRNWarenwert.KeyPress, txtPos.KeyPress
+        Select Case Asc(e.KeyChar)
+            Case 48 To 57, 8, 44
+                ' Zahlen, Backspace und , zulassen
+
+            Case Else
+                ' alle anderen Eingaben unterdrücken
+                e.Handled = True
+        End Select
+    End Sub
+
+    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtCRNDate.KeyPress, txtCRNTime.KeyPress, txtMRNDate.KeyPress, txtMRNTime.KeyPress
+        Select Case Asc(e.KeyChar)
+            Case 48 To 57, 8, 46, 58
+                ' Zahlen, Backspace, . und : zulassen
+
+            Case Else
+                ' alle anderen Eingaben unterdrücken
+                e.Handled = True
+        End Select
+    End Sub
+
+
+    Private Sub btnSaveOben_Click(sender As Object, e As EventArgs) Handles btnSaveOben.Click
+        Try
+            Dim a As Date = Date.ParseExact(txtMRNDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            Dim b As Date = Date.ParseExact(txtMRNTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+
+            Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
+            MsgBox(ab.ToString)
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtMRNDate.GotFocus, txtCRNDate.GotFocus, txtMRNTime.GotFocus, txtCRNTime.GotFocus
+        Select Case sender.name
+            Case "txtMRNDate"
+                If txtMRNDate.Text.Length < 1 Then txtMRNDate.Text = Date.Today.ToString("dd.MM.yyyy")
+            Case "txtCRNDate"
+                If txtCRNDate.Text.Length < 1 Then txtCRNDate.Text = Date.Today.ToString("dd.MM.yyyy")
+            Case "txtMRNTime"
+                If txtMRNTime.Text.Length < 1 Then txtMRNTime.Text = Date.Now.ToString("HH:mm")
+            Case "txtCRNTime"
+                If txtCRNTime.Text.Length < 1 Then txtCRNTime.Text = Date.Now.ToString("HH:mm")
+        End Select
+    End Sub
+
+    Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click
+        Try
+
+            If Integer.Parse(setNullToZero(txtPos.Text)) > 1 Then
+
+                Dim limit As Integer = Integer.Parse(setNullToZero(txtPos.Text))
+
+                For count As Integer = 1 To limit
+                    If (count > 1) Then txtMRNWarenwert.Text = 0
+                    Dim OPENWithMultiplePosNr As New cSicherheiten()
+
+                    With OPENWithMultiplePosNr
+                        .gs_ATBNr = txtMRN.Text
+                        .gs_posNr = count
+                        .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
+                        .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+                        .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+                        .gs_standort = Me.Standort
+                        .gs_art = "OPEN"
+                        .gs_gsNr = Me.gessicherheitID
+                        .gs_erstellungsdatum = Me.datum
+                        .gs_freitext = Me.txtFreitextOpen.Text
+                        .gs_saldo = GesSichRef.gsr_Saldo
+                        .gs_atr = setNullToZero(cboATR.SelectedItem)
+                        setEnviromentDataToObject(OPENWithMultiplePosNr, Me)
+                    End With
+
+                    If Neu = True AndAlso count <= 1 Then OPENWithMultiplePosNr.gs_gsNr = AddNewGesamtSichNr()
+
+                    Select Case checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID)
+                        Case "Neu"
+                            OPENWithMultiplePosNr.SAVE()
+                        Case Else
+                            If (count > 1) Then
+                                OPENWithMultiplePosNr.SAVE()
+                            Else
+                                MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID) & "eingetragen") : OPENWithMultiplePosNr.SAVE()
+                            End If
+
+                    End Select
+
+                Next
+
+                AfterButton()
+
+            Else
+
+                'Dim OPEN As New cSicherheiten(Me)
+                Dim OPEN As New cSicherheiten()
+
+                With OPEN
+                    .gs_ATBNr = txtMRN.Text
+                    .gs_posNr = Integer.Parse(setNullToZero(txtPos.Text))
+                    .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
+                    .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+                    .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+                    .gs_standort = Me.Standort
+                    .gs_art = "OPEN"
+                    .gs_gsNr = Me.gessicherheitID
+                    .gs_erstellungsdatum = Me.datum
+                    .gs_freitext = Me.txtFreitextOpen.Text
+                    .gs_saldo = GesSichRef.gsr_Saldo
+                    .gs_atr = setNullToZero(cboATR.SelectedItem)
+                    setEnviromentDataToObject(OPEN, Me)
+                End With
+
+
+                If Neu = True Then OPEN.gs_gsNr = AddNewGesamtSichNr()
+
+                Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
+                    Case "Neu"
+                        OPEN.SAVE()
+                    Case Else
+                        MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE()
+                End Select
+
+
+                AfterButton()
+
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click
+        Try
+            'Dim Close As New cSicherheiten(Me)
+            Dim Close As New cSicherheiten()
+            With Close
+                .gs_ATBNr = txtCRN.Text
+                .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
+                .gs_warenwert = Integer.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+                .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+                .gs_standort = Me.Standort
+                .gs_art = "CLOSE"
+                .gs_gsNr = Me.gessicherheitID
+                .gs_erstellungsdatum = Me.datum
+                .gs_freitext = Me.txtFreitextClose.Text
+                .gs_saldo = GesSichRef.gsr_Saldo
+            End With
+
+            If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr()
+
+            Select Case checkIfExist(Close.gs_ATBNr, gessicherheitID)
+                Case "Neu"
+                    Close.SAVE()
+                Case Else
+                    MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.gs_ATBNr, gessicherheitID) & "eingetragen") : Exit Sub
+            End Select
+
+            AfterButton()
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+    Function setNullToZero(s As String, Optional type As String = "")
+
+        If s = "" Then
+            Dim zero As Double = 0
+
+            Return zero
+        Else
+            Return s
+        End If
+    End Function
+    Sub AfterButton()
+        GesSichRef.CalcSaldo()
+        LoadDGV()
+        EmptyTXT()
+    End Sub
+
+    Public Function AddNewGesamtSichNr() As Integer
+        Dim sqlq As String = "select MAX([gs_gsNr]) as MaxGesSich from tblGesamtsicherheit"
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+        Dim LetzteGesSichNum As Integer = -1
+        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
+
+            LetzteGesSichNum = dt.Rows(0).Item(0)
+            Me.gessicherheitID = LetzteGesSichNum + 1
+            Me.Neu = False
+
+        End If
+
+        Return Me.gessicherheitID
+    End Function
+
+    Public Sub EmptyTXT()
+        Dim a As New List(Of Control)
+        For Each contr As Control In panOben.Controls
+            If contr.GetType.FullName = "System.Windows.Forms.TextBox" Then contr.Text = ""
+        Next
+        cboATR.SelectedItem = Nothing
+    End Sub
+
+    Public Function checkIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") As String
+        If lkw = "" And Me.gessicherheitID > 0 Then lkw = gessicherheitID
+
+        Dim SQLString As String = "Select * from [tblGesamtsicherheit] where [gs_ATBNr] = '" & KennnummerStr & "'"
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True)
+        If dt.Rows.Count > 0 Then
+            Return dt.Rows(0).Item("gs_gsNr").ToString
+        Else
+            Return "Neu"
+        End If
+    End Function
+
+    Public Function DateTimeString2DateTimeKonvertinator(datum As String, uhrzeit As String) As DateTime
+        Try
+            Dim a As Date = Date.ParseExact(datum, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            Dim b As Date = Date.ParseExact(uhrzeit, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+
+            Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
+            Return ab
+        Catch ex As Exception
+            MsgBox(ex.Message)
+            Return Date.Now
+        End Try
+    End Function
+
+
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click, btnSaveOben.Click
+
+        If checkMandatoryFieldsAreFilled() = False Then Exit Sub
+
+        Try
+            Me.FilialNummer = checkNothingValue(cboFiliale.SelectedItem, "Integer")
+        Catch
+            Me.FilialNummer = "0"
+        End Try
+
+        Try
+            Me.warenortID = checkNothingValue(cboWarenort.SelectedItem, "String")
+
+        Catch
+            Me.warenortID = "-"
+        End Try
+
+        Me.Abfertigungsnummer = txtAbfertNum.Text
+        Me.LKWID = txtLKWID.Text
+
+        If setNullToZero(Me.gessicherheitID) >= 0 Then
+            Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWID] = '" & Me.LKWID & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' "
+            SQL.doSQL(sqlstring, "AVISO")
+            LoadDGV()
+        End If
+
+        panOben.Enabled = True : panOben.Enabled = True
+        panOverlay.Visible = False
+    End Sub
+
+    Private Function checkNothingValue(obj As Object, Optional type As String = "String") As Object
+        Select Case type
+            Case "String"
+                If obj Is Nothing Then
+                    Return ""
+                Else
+                    Return obj.value.ToString
+                End If
+            Case "Integer"
+                If obj Is Nothing Then
+                    Return Nothing
+                Else
+                    Return Integer.Parse(obj.value)
+                End If
+        End Select
+
+
+    End Function
+
+    Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick
+
+        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("gs_gsId").Value)
+        'Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value)
+
+        txtMRN.Text = Sicherh.gs_ATBNr
+        txtPos.Text = Sicherh.gs_posNr
+        txtMRNWarenwert.Text = Sicherh.gs_warenwert
+        txtFreitextOpen.Text = Sicherh.gs_freitext
+        cboATR.SelectedItem = Sicherh.gs_atr
+        txtMRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy")
+        txtMRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm")
+
+        openopened = Sicherh
+
+        btnAddOpen.Visible = False
+        btnUpdateOpen.Visible = True
+        btnDeleteOpen.Visible = True
+    End Sub
+
+    Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click
+        With openopened
+            .gs_ATBNr = txtMRN.Text
+            .gs_posNr = Double.Parse(setNullToZero(txtPos.Text))
+            .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
+            .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_standort = Me.Standort
+            .gs_art = "OPEN"
+            .gs_gsNr = Me.gessicherheitID
+            '.MakeDate = Me.MakeDate
+            .gs_freitext = Me.txtFreitextOpen.Text
+            '.saldo = GesSichRef.Saldo
+            .gs_atr = setNullToZero(cboATR.SelectedItem)
+        End With
+        openopened.SAVE()
+        btnUpdateOpen.Visible = False
+        btnAddOpen.Visible = True
+        btnDeleteOpen.Visible = False
+        AfterButton()
+    End Sub
+
+    Private Sub btnDeleteClose_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click
+        With closedopened
+            .gs_ATBNr = txtCRN.Text
+            .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
+            .gs_warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
+            .gs_standort = Me.Standort
+            .gs_art = "CLOSE"
+            .gs_freitext = Me.txtFreitextClose.Text
+        End With
+        closedopened.SAVE()
+        btnAddClose.Visible = True
+        btnUpdateClose.Visible = False
+        btnDeleteClose.Visible = False
+        AfterButton()
+    End Sub
+
+    Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick
+
+        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value)
+        'Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value)
+
+        txtCRN.Text = Sicherh.gs_ATBNr
+        txtCRNWarenwert.Text = Sicherh.gs_warenwert
+        txtFreitextClose.Text = Sicherh.gs_freitext
+        txtCRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy")
+        txtCRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm")
+
+        closedopened = Sicherh
+
+        btnDeleteClose.Visible = True
+        btnAddClose.Visible = False
+        btnUpdateClose.Visible = True
+    End Sub
+
+    Private Sub btnDeleteOpen_Click(sender As Object, e As EventArgs) Handles btnDeleteOpen.Click
+        Try
+            openopened.Delete()
+            btnUpdateOpen.Visible = False
+            btnAddOpen.Visible = True
+            btnDeleteOpen.Visible = False
+            AfterButton()
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+    Private Sub btnDeleteClose_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click
+        Try
+            closedopened.Delete()
+            btnUpdateClose.Visible = False
+            btnAddClose.Visible = True
+            btnDeleteClose.Visible = False
+            AfterButton()
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles lblGestellungNr.DoubleClick
+        panOverlay.Visible = True
+        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
+        cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
+        cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+        cboWarenort.SelectedIndex = cboWarenort.FindString(Me.warenortID)
+        txtAbfertNum.Text = Me.Abfertigungsnummer
+        txtLKWID.Text = Me.LKWID
+        panOben.Enabled = False
+    End Sub
+
+    Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click
+        Close()
+    End Sub
+
+    Private Function checkMandatoryFieldsAreFilled() As Boolean
+        Dim isFilled = True
+
+        If cboWarenort._value = Nothing Or cboWarenort._value = "" Then
+
+            MsgBox("Bitte Warenort angeben!")
+            isFilled = False
+        End If
+
+        Return isFilled
+
+    End Function
+
+    Private Sub setEnviromentDataToObject(sicherheiten As cSicherheiten, Optional ByVal gessich As frmGesamtsicherheiten = Nothing)
+
+        sicherheiten.gs_filialenNr = gessich.FilialNummer
+        sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer
+        sicherheiten.gs_LKWKZ = gessich.LKWID
+        sicherheiten.gs_warenort = gessich.warenortID
+    End Sub
+
+    Private Sub ClosedErzeugenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClosedErzeugenToolStripMenuItem.Click
+        MsgBox("")
+
+
+
+    End Sub
+End Class
+
+'Public Class cSicherheit
+'    Property GesamtSichID As Object
+'    Property Kennnummer As String
+'    Property PosNr As Integer
+'    Property DateTime As DateTime
+'    Property MakeDate As DateTime
+'    Property Warenwert As Double
+'    Property Sicherheitsbetrag As Double
+'    Property saldo As Double
+'    Property standort As String
+'    Property Art As String
+'    Property GesamtsichNr As Integer
+'    Property Ust As Integer
+'    Property Freitext As String
+'    Property FilialNummer As Integer
+'    Property Abfertigungsnummer As String
+'    Property LKWID As String
+'    Property ATRJN As String = ""
+'    Property gs_warenort As String
+
+'    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+'    Public Sub New(Optional ByVal gessich As frmGesamtsicherheiten = Nothing)
+'        If gessich IsNot Nothing Then
+'            Me.FilialNummer = gessich.FilialNummer
+'            Me.Abfertigungsnummer = gessich.Abfertigungsnummer
+'            Me.LKWID = gessich.LKWID
+'            Me.gs_warenort = gessich.warenortID
+'            Me.GesamtSichID = GenerateID()
+'        End If
+'    End Sub
+
+'    Public Function Load(GsID As String)
+'        Me.GesamtSichID = GsID
+'        Load()
+'    End Function
+
+'    Public Function Load()
+'        Dim dt As New DataTable
+'        Dim sqlstring As String = "SELECT  *  FROM [AVISO].[dbo].[tblGesamtsicherheit] where GesamtsichID = '" & Me.GesamtSichID & "'"
+'        dt = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
+'        Dim test As cSicherheit = SQLEintraege.LoadEntities(Me, dt)
+'        '    MsgBox("")
+'    End Function
+
+'    Public Function GenerateID() As String
+'        Return Date.Now.ToString.Replace(".", "").Replace("-", "").Replace(",", "").Replace(" ", "").Replace(":", "")
+'    End Function
+
+'    Public Function Save()
+'        'MakeDate = frmGesSich.MakeDate
+'        Dim entities As New List(Of SQLEintraege)
+'        For Each prop As PropertyInfo In Me.GetType().GetProperties()
+'            If prop.GetValue(Me, Nothing).GetType = GetType(Double) Then
+'                '        MsgBox(prop.Name)
+'                entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing).ToString.Replace(",", ".")))
+'            Else
+'                entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing)))
+'            End If
+'            '  entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing)))
+'        Next
+
+'        '''
+'        Dim dt As DataTable = SQL.loadDgvBySql("Select * from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
+'        If dt.Rows.Count > 0 Then
+'            Dim UpdateString As String = ""
+'            For Each i In entities
+'                If Not i.Spalte = "GesamtSichID" Then
+'                    UpdateString &= "[" & i.Spalte & "]='" & i.Wert & "',"
+'                End If
+'            Next
+'            UpdateString = UpdateString.Substring(0, UpdateString.Length - 1)
+
+'            Dim sqlquery As String
+'            sqlquery = "update [tblGesamtsicherheit] set " & UpdateString & " where GesamtSichID = '" & Me.GesamtSichID & "'"
+'            SQL.doSQL(sqlquery, "AVISO")
+'        Else
+
+'            Dim text, value, insert As String
+'            For Each i In entities
+'                text &= i.Spalte & ", "
+'                value &= "'" & i.Wert & "', "
+'            Next
+'            text = text.Substring(0, text.Length - 2)
+'            value = value.Substring(0, value.Length - 2)
+
+'            insert = "(" & text & ") VALUES (" & value & ")"
+
+'            Dim sqlquery As String
+'            sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")"
+'            SQL.doSQL(sqlquery, "AVISO")
+'        End If
+
+'    End Function
+
+'    Public Function Delete()
+'        SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
+'    End Function
+
+'End Class
+
+Public Class SQLEintraege
+    Property Spalte As String
+    Property Wert As String
+    Public Sub New(_Spalte As String, _Wert As String)
+        Spalte = _Spalte
+        Wert = _Wert
+    End Sub
+
+    Public Shared Function LoadEntities(Obj As Object, dt As DataTable) As Object
+        Try
+            For Each prop As PropertyInfo In Obj.GetType().GetProperties()
+                If dt.Rows(0).Item(prop.Name) IsNot Nothing And dt.Rows(0).Item(prop.Name) IsNot DBNull.Value Then
+                    If dt.Rows(0).Item(prop.Name).GetType Is GetType(Decimal) Then
+                        prop.SetValue(Obj, Double.Parse(dt.Rows(0).Item(prop.Name)))
+                    Else
+                        prop.SetValue(Obj, dt.Rows(0).Item(prop.Name))
+                    End If
+
+                End If
+            Next
+            Return Obj
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Function
+End Class
--- a/Aviso/frmGesamtsicherheitenMenu.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenu.Designer.vb
@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmGesSichMenu
+Partial Class frmGesamtsicherheitenMenu
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -23,7 +23,7 @@ Partial Class frmGesSichMenu
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesSichMenu))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenMenu))
        Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -42,6 +42,10 @@ Partial Class frmGesSichMenu
        Me.lblReferenzwert = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.lblFiliale = New System.Windows.Forms.Label()
+        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label4 = New System.Windows.Forms.Label()
        CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -54,15 +58,19 @@ Partial Class frmGesSichMenu
        Me.dgvListe.AllowUserToDeleteRows = False
        Me.dgvListe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvListe.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvListe.Location = New System.Drawing.Point(0, 156)
+        Me.dgvListe.Location = New System.Drawing.Point(0, 196)
        Me.dgvListe.Name = "dgvListe"
        Me.dgvListe.ReadOnly = True
-        Me.dgvListe.Size = New System.Drawing.Size(502, 565)
+        Me.dgvListe.Size = New System.Drawing.Size(502, 525)
        Me.dgvListe.TabIndex = 1
        '
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.cbxWarenort)
+        Me.Panel1.Controls.Add(Me.Label4)
+        Me.Panel1.Controls.Add(Me.cbxStandort)
+        Me.Panel1.Controls.Add(Me.lblFiliale)
        Me.Panel1.Controls.Add(Me.FlatButton2)
        Me.Panel1.Controls.Add(Me.btnSucheStarten)
        Me.Panel1.Controls.Add(Me.txtbis)
@@ -80,17 +88,18 @@ Partial Class frmGesSichMenu
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel1.Location = New System.Drawing.Point(0, 0)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(502, 156)
+        Me.Panel1.Size = New System.Drawing.Size(502, 196)
        Me.Panel1.TabIndex = 0
        '
        'FlatButton2
        '
        Me.FlatButton2.allowBorder = False
+        Me.FlatButton2.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.FlatButton2.BackColor = System.Drawing.Color.White
        Me.FlatButton2.FlatAppearance.BorderSize = 0
        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton2.Location = New System.Drawing.Point(112, 101)
+        Me.FlatButton2.Location = New System.Drawing.Point(112, 133)
        Me.FlatButton2.Name = "FlatButton2"
        Me.FlatButton2.Size = New System.Drawing.Size(81, 20)
        Me.FlatButton2.TabIndex = 10
@@ -100,11 +109,12 @@ Partial Class frmGesSichMenu
        'btnSucheStarten
        '
        Me.btnSucheStarten.allowBorder = False
+        Me.btnSucheStarten.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
-        Me.btnSucheStarten.Location = New System.Drawing.Point(201, 127)
+        Me.btnSucheStarten.Location = New System.Drawing.Point(201, 159)
        Me.btnSucheStarten.Name = "btnSucheStarten"
        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
        Me.btnSucheStarten.TabIndex = 11
@@ -116,15 +126,18 @@ Partial Class frmGesSichMenu
        Me.txtbis._DateTimeOnly = False
        Me.txtbis._numbersOnly = False
        Me.txtbis._numbersOnlyKommastellen = ""
+        Me.txtbis._numbersOnlyTrennzeichen = True
        Me.txtbis._Prozent = False
        Me.txtbis._ShortDateNew = False
        Me.txtbis._ShortDateOnly = False
        Me.txtbis._TimeOnly = False
+        Me.txtbis._TimeOnly_Seconds = False
        Me.txtbis._value = ""
        Me.txtbis._Waehrung = False
        Me.txtbis._WaehrungZeichen = True
+        Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.txtbis.ForeColor = System.Drawing.Color.Black
-        Me.txtbis.Location = New System.Drawing.Point(112, 77)
+        Me.txtbis.Location = New System.Drawing.Point(112, 109)
        Me.txtbis.MaxLineLength = -1
        Me.txtbis.MaxLines_Warning = ""
        Me.txtbis.MaxLines_Warning_Label = Nothing
@@ -137,15 +150,18 @@ Partial Class frmGesSichMenu
        Me.txtVon._DateTimeOnly = False
        Me.txtVon._numbersOnly = False
        Me.txtVon._numbersOnlyKommastellen = ""
+        Me.txtVon._numbersOnlyTrennzeichen = True
        Me.txtVon._Prozent = False
        Me.txtVon._ShortDateNew = False
        Me.txtVon._ShortDateOnly = False
        Me.txtVon._TimeOnly = False
+        Me.txtVon._TimeOnly_Seconds = False
        Me.txtVon._value = ""
        Me.txtVon._Waehrung = False
        Me.txtVon._WaehrungZeichen = True
+        Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.txtVon.ForeColor = System.Drawing.Color.Black
-        Me.txtVon.Location = New System.Drawing.Point(12, 77)
+        Me.txtVon.Location = New System.Drawing.Point(12, 109)
        Me.txtVon.MaxLineLength = -1
        Me.txtVon.MaxLines_Warning = ""
        Me.txtVon.MaxLines_Warning_Label = Nothing
@@ -159,7 +175,7 @@ Partial Class frmGesSichMenu
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label3.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label3.Location = New System.Drawing.Point(109, 59)
+        Me.Label3.Location = New System.Drawing.Point(109, 90)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(24, 15)
        Me.Label3.TabIndex = 5
@@ -171,7 +187,7 @@ Partial Class frmGesSichMenu
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label2.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label2.Location = New System.Drawing.Point(12, 59)
+        Me.Label2.Location = New System.Drawing.Point(12, 90)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(28, 15)
        Me.Label2.TabIndex = 4
@@ -183,7 +199,7 @@ Partial Class frmGesSichMenu
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label1.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label1.Location = New System.Drawing.Point(12, 11)
+        Me.Label1.Location = New System.Drawing.Point(12, 4)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(45, 15)
        Me.Label1.TabIndex = 0
@@ -192,12 +208,13 @@ Partial Class frmGesSichMenu
        'FlatButton1
        '
        Me.FlatButton1.allowBorder = False
+        Me.FlatButton1.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.FlatButton1.BackColor = System.Drawing.Color.White
        Me.FlatButton1.FlatAppearance.BorderSize = 0
        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
        Me.FlatButton1.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.FlatButton1.Location = New System.Drawing.Point(233, 22)
+        Me.FlatButton1.Location = New System.Drawing.Point(233, 18)
        Me.FlatButton1.Name = "FlatButton1"
        Me.FlatButton1.Size = New System.Drawing.Size(32, 33)
        Me.FlatButton1.TabIndex = 2
@@ -205,18 +222,20 @@ Partial Class frmGesSichMenu
        '
        'txtSuchbegriff
        '
-        Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 29)
+        Me.txtSuchbegriff.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 22)
        Me.txtSuchbegriff.Name = "txtSuchbegriff"
        Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20)
        Me.txtSuchbegriff.TabIndex = 1
        '
        'chkOffen
        '
+        Me.chkOffen.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.chkOffen.AutoSize = True
        Me.chkOffen.Checked = True
        Me.chkOffen.CheckState = System.Windows.Forms.CheckState.Checked
        Me.chkOffen.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.chkOffen.Location = New System.Drawing.Point(28, 131)
+        Me.chkOffen.Location = New System.Drawing.Point(28, 163)
        Me.chkOffen.Name = "chkOffen"
        Me.chkOffen.Size = New System.Drawing.Size(120, 17)
        Me.chkOffen.TabIndex = 12
@@ -226,11 +245,12 @@ Partial Class frmGesSichMenu
        'btnNeu
        '
        Me.btnNeu.allowBorder = False
+        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.btnNeu.BackColor = System.Drawing.Color.White
        Me.btnNeu.FlatAppearance.BorderSize = 0
        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnNeu.ForeColor = System.Drawing.Color.Black
-        Me.btnNeu.Location = New System.Drawing.Point(415, 127)
+        Me.btnNeu.Location = New System.Drawing.Point(415, 159)
        Me.btnNeu.Name = "btnNeu"
        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
        Me.btnNeu.TabIndex = 13
@@ -243,7 +263,7 @@ Partial Class frmGesSichMenu
        Me.lblSaldo.AutoSize = True
        Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblSaldo.Location = New System.Drawing.Point(294, 24)
+        Me.lblSaldo.Location = New System.Drawing.Point(294, 17)
        Me.lblSaldo.Name = "lblSaldo"
        Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
        Me.lblSaldo.TabIndex = 3
@@ -255,9 +275,9 @@ Partial Class frmGesSichMenu
        Me.lblZollsatz.AutoSize = True
        Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblZollsatz.Location = New System.Drawing.Point(295, 86)
+        Me.lblZollsatz.Location = New System.Drawing.Point(295, 79)
        Me.lblZollsatz.Name = "lblZollsatz"
-        Me.lblZollsatz.Size = New System.Drawing.Size(86, 16)
+        Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
        Me.lblZollsatz.TabIndex = 9
        Me.lblZollsatz.Text = "Zollsatz: 12%"
        '
@@ -267,9 +287,9 @@ Partial Class frmGesSichMenu
        Me.lblReferenzwert.AutoSize = True
        Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblReferenzwert.Location = New System.Drawing.Point(295, 59)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(295, 52)
        Me.lblReferenzwert.Name = "lblReferenzwert"
-        Me.lblReferenzwert.Size = New System.Drawing.Size(137, 16)
+        Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
        Me.lblReferenzwert.TabIndex = 6
        Me.lblReferenzwert.Text = "Referenzwert: €80.000"
        '
@@ -277,15 +297,63 @@ Partial Class frmGesSichMenu
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(132, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(133, 26)
        '
        'ExportCSVToolStripMenuItem
        '
        Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
-        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(131, 22)
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22)
        Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
        '
-        'frmGesSichMenu
+        'lblFiliale
+        '
+        Me.lblFiliale.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lblFiliale.AutoSize = True
+        Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.lblFiliale.ForeColor = System.Drawing.Color.Honeydew
+        Me.lblFiliale.Location = New System.Drawing.Point(12, 45)
+        Me.lblFiliale.Name = "lblFiliale"
+        Me.lblFiliale.Size = New System.Drawing.Size(43, 15)
+        Me.lblFiliale.TabIndex = 14
+        Me.lblFiliale.Text = "Filiale:"
+        '
+        'cbxStandort
+        '
+        Me.cbxStandort._allowedValuesFreiText = Nothing
+        Me.cbxStandort._allowFreiText = False
+        Me.cbxStandort._value = ""
+        Me.cbxStandort.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.cbxStandort.FormattingEnabled = True
+        Me.cbxStandort.Location = New System.Drawing.Point(12, 63)
+        Me.cbxStandort.Name = "cbxStandort"
+        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxStandort.TabIndex = 15
+        '
+        'cbxWarenort
+        '
+        Me.cbxWarenort._allowedValuesFreiText = Nothing
+        Me.cbxWarenort._allowFreiText = False
+        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.cbxWarenort.FormattingEnabled = True
+        Me.cbxWarenort.Location = New System.Drawing.Point(112, 63)
+        Me.cbxWarenort.Name = "cbxWarenort"
+        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxWarenort.TabIndex = 17
+        '
+        'Label4
+        '
+        Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Label4.ForeColor = System.Drawing.Color.Honeydew
+        Me.Label4.Location = New System.Drawing.Point(112, 45)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(60, 15)
+        Me.Label4.TabIndex = 16
+        Me.Label4.Text = "Warenort:"
+        '
+        'frmGesamtsicherheitenMenu
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -295,7 +363,8 @@ Partial Class frmGesSichMenu
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximumSize = New System.Drawing.Size(800, 760)
        Me.MinimumSize = New System.Drawing.Size(499, 760)
-        Me.Name = "frmGesSichMenu"
+        Me.Name = "frmGesamtsicherheitenMenu"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "frmGesSichMenu"
        CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
@@ -323,4 +392,8 @@ Partial Class frmGesSichMenu
    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents ExportCSVToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents lblFiliale As Label
+    Friend WithEvents cbxStandort As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label4 As Label
 End Class
--- a/Aviso/frmGesamtsicherheitenMenu.resx
+++ b/Aviso/frmGesamtsicherheitenMenu.resx
@@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/Aviso/frmGesamtsicherheitenMenu.vb
+++ b/Aviso/frmGesamtsicherheitenMenu.vb
@@ -1,6 +1,6 @@
 Imports System.Reflection

-Public Class frmGesSichMenu
+Public Class frmGesamtsicherheitenMenu
    ' Public Zollsatz As Integer = 0
    ' Public ZollsatzMulti As Double = 0
    ' Public Referenzwert As Integer = 0
@@ -8,13 +8,18 @@ Public Class frmGesSichMenu
    'Public Ust As Integer
    ' Public Saldo As Integer = 0
    Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
-    Dim GesSichRef As New cGesamtSicherheitsReferenz
+    'Dim GesSichRef As New cGesamtSicherheitsReferenz
+    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz
+
    'Public ATR As Boolean = False
    Public Property Standort As String = ""
    Private Sub frmGesamtsicherheiten_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
+        cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
        Me.Text = "Gesamtsicherheiten " & Standort
        frmHauptfenster.EnableDoubleBuffered(dgvListe)
-        GesSichRef.LoadStandort(Standort)
+        GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
+        'GesSichRef.LOAD("standort", Standort)
        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")

        txtVon._ShortDateOnly = True
@@ -28,7 +33,9 @@ Public Class frmGesSichMenu

    Public Function LoadDGV()
        Dim sqladdon As String = ""
-        If chkOffen.Checked Then sqladdon &= " AND Sicherheitssaldo != '0,00 €'"
+        If chkOffen.Checked Then sqladdon &= " AND gs_Sicherheitssaldo != '0,00 €'"
+        If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'"
+        If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"

        '        Dim sqlstring As String = "select * from (Select GesamtsichNr, MIN(Standort) as Standort, MIN(FilialNummer) as FilialNummer,  min(Abfertigungsnummer) as Abfertigungsnummer,
        'max(LKWID) as LKWID, min (MakeDate) as Datum, FORMAT(SUM( 
@@ -42,21 +49,24 @@ Public Class frmGesSichMenu
        '" & sqladdon & "
        'order by GesamtsichNr"

-        Dim sqlstring As String = " select * from (Select gesamtsichnr, MIN(Standort) as Standort, MIN(FilialNummer) as FilialNummer, min(Abfertigungsnummer) as Abfertigungsnummer,
-max(LKWID) as LKWID, min (MakeDate) as Datum, FORMAT(SUM( 
-Case 
-	when Art = 'Open' then (Sicherheitsbetrag * -1)
-	when Art = 'Close' then Sicherheitsbetrag
-End) , 'C', 'de-DE')As SicherheitsSaldo
-From (select * from (select GesamtsichNr as ding from [tblGesamtsicherheit] where 
-Freitext like '%" & txtSuchbegriff.Text & "%' OR
-Abfertigungsnummer like '%" & txtSuchbegriff.Text & "%' OR
-Kennnummer like '%" & txtSuchbegriff.Text & "%' OR
-LKWID like '%" & txtSuchbegriff.Text & "%' 
-)as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.GesamtsichNr) as meh group by GesamtsichNr) as meh2
-Where Standort = '" & Standort & "' " & sqladdon & "
-AND Datum > '" & Date.Parse(txtVon.Text) & "'
-AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
+        Dim sqlstring As String =
+            " select * from (Select gs_gsNr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr,
+                max(gs_LKWID) as gs_LKWID, min (gs_datum) as gs_datum, FORMAT(SUM( 
+            Case 
+	            when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+	            when gs_art = 'Close' then gs_sicherheitsbetrag
+            End) , 'C', 'de-DE')As gs_SicherheitsSaldo
+
+            From (select * from (select gs_gsNr as ding from [tblGesamtsicherheit] where 
+                gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
+                gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR
+                gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR
+                gs_LKWID like '%" & txtSuchbegriff.Text & "%' OR
+                gs_warenort like '%" & txtSuchbegriff.Text & "%'
+            ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsNr) as meh group by gs_gsNr) as meh2
+            Where gs_standort = '" & Standort & "' " & sqladdon & "
+            AND gs_datum > '" & Date.Parse(txtVon.Text) & "'
+            AND gs_datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"

        dgvListe.SET_SQL(sqlstring, "AVISO")
        dgvListe.LOAD()
@@ -64,19 +74,22 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
        With dgvListe
            .SelectionMode = DataGridViewSelectionMode.FullRowSelect
            .RowHeadersWidth = 6
-            .Columns("Standort").Visible = False
-            .Columns("GesamtsichNr").HeaderText = "#"
-            .Columns("GesamtsichNr").Width = 36
-            .Columns("Filialnummer").HeaderText = "Filiale"
-            .Columns("Filialnummer").Width = 43
-            .Columns("Abfertigungsnummer").HeaderText = "Abfert.Nr."
-            .Columns("Abfertigungsnummer").Width = 107
-            .Columns("Datum").Width = 112
-            .Columns("SicherheitsSaldo").Width = 96
+            .Columns("gs_standort").Visible = False
+            .Columns("gs_gsnr").HeaderText = "#"
+            .Columns("gs_gsnr").Width = 36
+            .Columns("gs_filialenNr").HeaderText = "Filiale"
+            .Columns("gs_filialenNr").Width = 43
+            .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr."
+            .Columns("gs_abfertigungsNr").Width = 107
+            .Columns("gs_datum").Width = 112
+            .Columns("gs_SicherheitsSaldo").Width = 106
+            .Columns("gs_Warenort").Width = 96
+            .Columns("gs_Warenort").HeaderText = "Warenort"
+
        End With

        For Each row As DataGridViewRow In dgvListe.Rows
-            If row.Cells("SicherheitsSaldo").Value <> 0 Then
+            If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
                row.DefaultCellStyle.BackColor = Color.Red
            Else
                row.DefaultCellStyle.BackColor = Color.Green
@@ -86,8 +99,9 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
    End Function

    Public Sub ShowStandort()
-        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.Referenzwert.ToString("N")
-        lblZollsatz.Text = "Zollsatz: " & GesSichRef.Zollsatz & "%"
+        'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N")
+        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString()
+        lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%"
        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
    End Sub

@@ -95,15 +109,16 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"


    Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick
-        Dim frm As New frmGesSich
+        Dim frm As New frmGesamtsicherheiten
        With frm
            .GesSichRef = GesSichRef
-            .GesamtsichNr = dgvListe.CurrentRow.Cells("GesamtsichNr").Value
+            .gessicherheitID = dgvListe.CurrentRow.Cells("gs_gsnr").Value
            .Standort = Me.Standort
-            .MakeDate = dgvListe.CurrentRow.Cells("Datum").Value
-            .LKWID = dgvListe.CurrentRow.Cells("LKWID").Value
-            .FilialNummer = dgvListe.CurrentRow.Cells("FilialNummer").Value
-            .Abfertigungsnummer = dgvListe.CurrentRow.Cells("Abfertigungsnummer").Value
+            .datum = dgvListe.CurrentRow.Cells("gs_datum").Value
+            .LKWID = dgvListe.CurrentRow.Cells("gs_LKWID").Value
+            .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value
+            .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value
+            .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
        End With

        AddHandler frm.FormClosing, Function()
@@ -116,11 +131,11 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
    End Sub

    Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
-        Dim frm As New frmGesSich
+        Dim frm As New frmGesamtsicherheiten
        With frm
            .GesSichRef = GesSichRef
            .Standort = Me.Standort
-            .MakeDate = Date.Now
+            .datum = Date.Now
            '.ATR = GesSichRef.ATR
            '.Ust = GesSichRef.Ust
            '.UstEnabled = GesSichRef.UstEnabled
@@ -158,10 +173,9 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
        txtSuchbegriff.Text = "" : chkOffen.Checked = True
        txtVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy")
        txtbis.Text = Date.Today.ToString("dd.MM.yyyy")
-    End Sub
-
-    Private Sub MyTextBox1_TextChanged(sender As Object, e As EventArgs)
-
+        cbxStandort._value = ""
+        cbxWarenort._value = ""
+        btnSucheStarten_Click(sender, e)
    End Sub

    Private Sub btnSucheStarten_Click(sender As Object, e As EventArgs) Handles btnSucheStarten.Click
@@ -228,55 +242,63 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
    End Function
 End Class

-Public Class cGesamtSicherheitsReferenz
-    Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
+'Public Class cGesamtSicherheitsReferenz
+'    Public SQL As New VERAG_PROG_ALLGEMEIN.SQL

-    Property Zollsatz As Integer = 0
-    Property ZollsatzMulti As Double = 0
-    Property Referenzwert As Double = 0
-    Property UstEnabled As Boolean = False
-    Property Ust As Integer
-    Property Saldo As Double = 0
-    Property ATR As Boolean = False
-    Property Standort As String = ""
+'    Property Zollsatz As Integer = 0
+'    Property ZollsatzMulti As Double = 0
+'    Property Referenzwert As Double = 0
+'    Property UstEnabled As Boolean = False
+'    Property Ust As Integer
+'    Property Saldo As Double = 0
+'    Property ATR As Boolean = False
+'    Property Standort As String = ""

-    Public Sub LoadStandort(_Standort As String)
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
-        Zollsatz = dt.Rows(0).Item("Zollsatz")
-        Referenzwert = dt.Rows(0).Item("Referenzwert")
-        UstEnabled = dt.Rows(0).Item("UstEnabled")
-        Ust = dt.Rows(0).Item("Ust")
-        ATR = dt.Rows(0).Item("ATR")
-        ZollsatzMulti = Zollsatz / 100
-        Saldo = dt.Rows(0).Item("aktSaldo")
-        Standort = _Standort
-    End Sub
+'    Public Sub LoadStandort(_Standort As String)
+'        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'"
+'        Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where gsr_standort = " & "'" & _Standort & "'"
+'        Dim dt As New DataTable
+'        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
+'        'Zollsatz = dt.Rows(0).Item("Zollsatz")
+'        Zollsatz = dt.Rows(0).Item("gsr_zollsatz")
+'        'Referenzwert = dt.Rows(0).Item("Referenzwert")
+'        Referenzwert = dt.Rows(0).Item("gsr_referenzwert")
+'        UstEnabled = dt.Rows(0).Item("gsr_ustEnabled")
+'        'UstEnabled = dt.Rows(0).Item("UstEnabled")
+'        Ust = dt.Rows(0).Item("gsr_ust")
+'        'Ust = dt.Rows(0).Item("Ust")
+'        ATR = dt.Rows(0).Item("gsr_ATR")
+'        'ATR = dt.Rows(0).Item("ATR")
+'        ZollsatzMulti = Zollsatz / 100
+'        Saldo = dt.Rows(0).Item("gsr_aktSaldo")
+'        'Saldo = dt.Rows(0).Item("aktSaldo")
+'        Standort = _Standort
+'    End Sub

-    Public Function CalcSaldo() As String
-        Dim SaldoString As String = "select SUM( 
-case 
-	when Art = 'Open' then (Sicherheitsbetrag * -1)
-	when Art = 'Close' then Sicherheitsbetrag
-end) as SicherheitsSaldo
-from [tblGesamtsicherheit] Where Standort = '" & Standort & "'"
+'    Public Function CalcSaldo() As String
+'        Dim SaldoString As String =
+'            "select SUM( 
+'                case 
+'	                when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+'	                when gs_art = 'Close' then gs_sicherheitsbetrag
+'                end) as SicherheitsSaldo
+'        from [tblGesamtsicherheit] Where gs_standort = '" & Standort & "'"

-        Dim dt As New DataTable
-        Dim mrn As Double = 0
-        dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
-        If dt.Rows(0).Item(0).ToString.Length > 0 Then
-            mrn = dt.Rows(0).Item(0)
-        End If
+'        Dim dt As New DataTable
+'        Dim mrn As Double = 0
+'        dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
+'        If dt.Rows(0).Item(0).ToString.Length > 0 Then
+'            mrn = dt.Rows(0).Item(0)
+'        End If

-        Saldo = Referenzwert + mrn
+'        Saldo = Referenzwert + mrn

-        UpdateSaldo()
-        Return Saldo
-    End Function
+'        updateSaldo()
+'        Return Saldo
+'    End Functio

-    Public Function UpdateSaldo()
-        SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set aktSaldo = '" & Saldo & "' WHERE Standort = '" & Standort & "'", "AVISO")
-    End Function
+'    Public Function updateSaldo()
+'        SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set gsr_aktSaldo = '" & Saldo & "' WHERE gsr_Standort = '" & Standort & "'", "AVISO")
+'    End Function

-End Class
+'End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -0,0 +1,718 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmGesamtsicherheitenMenuNEU
+    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(frmGesamtsicherheitenMenuNEU))
+        Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportCSV2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label26 = New System.Windows.Forms.Label()
+        Me.btnBisTag = New System.Windows.Forms.Button()
+        Me.btnVonTag = New System.Windows.Forms.Button()
+        Me.btnTag = New System.Windows.Forms.Button()
+        Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label24 = New System.Windows.Forms.Label()
+        Me.btnJahr = New System.Windows.Forms.Button()
+        Me.btnBisJahr = New System.Windows.Forms.Button()
+        Me.btnVonJahr = New System.Windows.Forms.Button()
+        Me.btnMonat = New System.Windows.Forms.Button()
+        Me.btnBisMonat = New System.Windows.Forms.Button()
+        Me.btnVonMonat = New System.Windows.Forms.Button()
+        Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
+        Me.Label25 = New System.Windows.Forms.Label()
+        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
+        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblFiliale = New System.Windows.Forms.Label()
+        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtSuchbegriff = New System.Windows.Forms.TextBox()
+        Me.chkOffen = New System.Windows.Forms.CheckBox()
+        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.lblSaldo = New System.Windows.Forms.Label()
+        Me.lblZollsatz = New System.Windows.Forms.Label()
+        Me.lblReferenzwert = New System.Windows.Forms.Label()
+        CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContextMenuStrip1.SuspendLayout()
+        Me.Panel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'dgvListe
+        '
+        Me.dgvListe.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvListe.AllowUserToAddRows = False
+        Me.dgvListe.AllowUserToDeleteRows = False
+        Me.dgvListe.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgvListe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvListe.ContextMenuStrip = Me.ContextMenuStrip1
+        Me.dgvListe.Location = New System.Drawing.Point(-3, 288)
+        Me.dgvListe.Name = "dgvListe"
+        Me.dgvListe.ReadOnly = True
+        Me.dgvListe.Size = New System.Drawing.Size(658, 427)
+        Me.dgvListe.TabIndex = 1
+        '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.ExportCSV2ToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(171, 48)
+        '
+        'ExportCSVToolStripMenuItem
+        '
+        Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
+        Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
+        '
+        'ExportCSV2ToolStripMenuItem
+        '
+        Me.ExportCSV2ToolStripMenuItem.Name = "ExportCSV2ToolStripMenuItem"
+        Me.ExportCSV2ToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
+        Me.ExportCSV2ToolStripMenuItem.Text = "Export CSV Details"
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.btnOpenOver85Days)
+        Me.Panel1.Controls.Add(Me.txtDatBis)
+        Me.Panel1.Controls.Add(Me.Label26)
+        Me.Panel1.Controls.Add(Me.btnBisTag)
+        Me.Panel1.Controls.Add(Me.btnVonTag)
+        Me.Panel1.Controls.Add(Me.btnTag)
+        Me.Panel1.Controls.Add(Me.txtDatVon)
+        Me.Panel1.Controls.Add(Me.Label24)
+        Me.Panel1.Controls.Add(Me.btnJahr)
+        Me.Panel1.Controls.Add(Me.btnBisJahr)
+        Me.Panel1.Controls.Add(Me.btnVonJahr)
+        Me.Panel1.Controls.Add(Me.btnMonat)
+        Me.Panel1.Controls.Add(Me.btnBisMonat)
+        Me.Panel1.Controls.Add(Me.btnVonMonat)
+        Me.Panel1.Controls.Add(Me.DateTimePicker2)
+        Me.Panel1.Controls.Add(Me.Label25)
+        Me.Panel1.Controls.Add(Me.DateTimePicker1)
+        Me.Panel1.Controls.Add(Me.cbxWarenort)
+        Me.Panel1.Controls.Add(Me.Label4)
+        Me.Panel1.Controls.Add(Me.cbxStandort)
+        Me.Panel1.Controls.Add(Me.lblFiliale)
+        Me.Panel1.Controls.Add(Me.FlatButton2)
+        Me.Panel1.Controls.Add(Me.btnSucheStarten)
+        Me.Panel1.Controls.Add(Me.txtbis)
+        Me.Panel1.Controls.Add(Me.txtVon)
+        Me.Panel1.Controls.Add(Me.Label3)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.Label1)
+        Me.Panel1.Controls.Add(Me.btnResetFilter)
+        Me.Panel1.Controls.Add(Me.txtSuchbegriff)
+        Me.Panel1.Controls.Add(Me.chkOffen)
+        Me.Panel1.Controls.Add(Me.btnNeu)
+        Me.Panel1.Controls.Add(Me.lblSaldo)
+        Me.Panel1.Controls.Add(Me.lblZollsatz)
+        Me.Panel1.Controls.Add(Me.lblReferenzwert)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel1.Location = New System.Drawing.Point(0, 0)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(658, 288)
+        Me.Panel1.TabIndex = 0
+        '
+        'btnOpenOver85Days
+        '
+        Me.btnOpenOver85Days.allowBorder = False
+        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
+        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
+        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
+        Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210)
+        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
+        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
+        Me.btnOpenOver85Days.TabIndex = 32
+        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
+        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
+        Me.btnOpenOver85Days.Visible = False
+        '
+        'txtDatBis
+        '
+        Me.txtDatBis._DateTimeOnly = False
+        Me.txtDatBis._numbersOnly = False
+        Me.txtDatBis._numbersOnlyKommastellen = ""
+        Me.txtDatBis._numbersOnlyTrennzeichen = True
+        Me.txtDatBis._Prozent = False
+        Me.txtDatBis._ShortDateNew = False
+        Me.txtDatBis._ShortDateOnly = True
+        Me.txtDatBis._TimeOnly = False
+        Me.txtDatBis._TimeOnly_Seconds = False
+        Me.txtDatBis._value = ""
+        Me.txtDatBis._Waehrung = False
+        Me.txtDatBis._WaehrungZeichen = True
+        Me.txtDatBis.Enabled = False
+        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
+        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
+        Me.txtDatBis.MaxLength = 10
+        Me.txtDatBis.MaxLineLength = -1
+        Me.txtDatBis.MaxLines_Warning = ""
+        Me.txtDatBis.MaxLines_Warning_Label = Nothing
+        Me.txtDatBis.Name = "txtDatBis"
+        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatBis.TabIndex = 25
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = True
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label26.ForeColor = System.Drawing.Color.White
+        Me.Label26.Location = New System.Drawing.Point(33, 120)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(43, 13)
+        Me.Label26.TabIndex = 11
+        Me.Label26.Text = "Datum"
+        '
+        'btnBisTag
+        '
+        Me.btnBisTag.BackColor = System.Drawing.Color.White
+        Me.btnBisTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBisTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnBisTag.ForeColor = System.Drawing.Color.Black
+        Me.btnBisTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisTag.Location = New System.Drawing.Point(311, 120)
+        Me.btnBisTag.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnBisTag.Name = "btnBisTag"
+        Me.btnBisTag.Size = New System.Drawing.Size(34, 23)
+        Me.btnBisTag.TabIndex = 14
+        Me.btnBisTag.Text = ">>"
+        Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisTag.UseVisualStyleBackColor = False
+        '
+        'btnVonTag
+        '
+        Me.btnVonTag.BackColor = System.Drawing.Color.White
+        Me.btnVonTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVonTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnVonTag.ForeColor = System.Drawing.Color.Black
+        Me.btnVonTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonTag.Location = New System.Drawing.Point(192, 120)
+        Me.btnVonTag.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnVonTag.Name = "btnVonTag"
+        Me.btnVonTag.Size = New System.Drawing.Size(34, 23)
+        Me.btnVonTag.TabIndex = 12
+        Me.btnVonTag.Text = "<<"
+        Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonTag.UseVisualStyleBackColor = False
+        '
+        'btnTag
+        '
+        Me.btnTag.BackColor = System.Drawing.Color.White
+        Me.btnTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnTag.ForeColor = System.Drawing.Color.Black
+        Me.btnTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnTag.Location = New System.Drawing.Point(225, 120)
+        Me.btnTag.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnTag.Name = "btnTag"
+        Me.btnTag.Size = New System.Drawing.Size(87, 23)
+        Me.btnTag.TabIndex = 13
+        Me.btnTag.Text = "Heute"
+        Me.btnTag.UseVisualStyleBackColor = False
+        '
+        'txtDatVon
+        '
+        Me.txtDatVon._DateTimeOnly = False
+        Me.txtDatVon._numbersOnly = False
+        Me.txtDatVon._numbersOnlyKommastellen = ""
+        Me.txtDatVon._numbersOnlyTrennzeichen = True
+        Me.txtDatVon._Prozent = False
+        Me.txtDatVon._ShortDateNew = False
+        Me.txtDatVon._ShortDateOnly = True
+        Me.txtDatVon._TimeOnly = False
+        Me.txtDatVon._TimeOnly_Seconds = False
+        Me.txtDatVon._value = ""
+        Me.txtDatVon._Waehrung = False
+        Me.txtDatVon._WaehrungZeichen = True
+        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
+        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
+        Me.txtDatVon.MaxLength = 10
+        Me.txtDatVon.MaxLineLength = -1
+        Me.txtDatVon.MaxLines_Warning = ""
+        Me.txtDatVon.MaxLines_Warning_Label = Nothing
+        Me.txtDatVon.Name = "txtDatVon"
+        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatVon.TabIndex = 18
+        '
+        'Label24
+        '
+        Me.Label24.AutoSize = True
+        Me.Label24.ForeColor = System.Drawing.Color.White
+        Me.Label24.Location = New System.Drawing.Point(33, 173)
+        Me.Label24.Name = "Label24"
+        Me.Label24.Size = New System.Drawing.Size(23, 13)
+        Me.Label24.TabIndex = 23
+        Me.Label24.Text = "bis:"
+        '
+        'btnJahr
+        '
+        Me.btnJahr.BackColor = System.Drawing.Color.White
+        Me.btnJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnJahr.ForeColor = System.Drawing.Color.Black
+        Me.btnJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnJahr.Location = New System.Drawing.Point(225, 172)
+        Me.btnJahr.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnJahr.Name = "btnJahr"
+        Me.btnJahr.Size = New System.Drawing.Size(87, 23)
+        Me.btnJahr.TabIndex = 28
+        Me.btnJahr.Text = "2016"
+        Me.btnJahr.UseVisualStyleBackColor = False
+        '
+        'btnBisJahr
+        '
+        Me.btnBisJahr.BackColor = System.Drawing.Color.White
+        Me.btnBisJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBisJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnBisJahr.ForeColor = System.Drawing.Color.Black
+        Me.btnBisJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisJahr.Location = New System.Drawing.Point(311, 172)
+        Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnBisJahr.Name = "btnBisJahr"
+        Me.btnBisJahr.Size = New System.Drawing.Size(34, 23)
+        Me.btnBisJahr.TabIndex = 29
+        Me.btnBisJahr.Text = ">>"
+        Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisJahr.UseVisualStyleBackColor = False
+        '
+        'btnVonJahr
+        '
+        Me.btnVonJahr.BackColor = System.Drawing.Color.White
+        Me.btnVonJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVonJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnVonJahr.ForeColor = System.Drawing.Color.Black
+        Me.btnVonJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonJahr.Location = New System.Drawing.Point(192, 172)
+        Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnVonJahr.Name = "btnVonJahr"
+        Me.btnVonJahr.Size = New System.Drawing.Size(34, 23)
+        Me.btnVonJahr.TabIndex = 27
+        Me.btnVonJahr.Text = "<<"
+        Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonJahr.UseVisualStyleBackColor = False
+        '
+        'btnMonat
+        '
+        Me.btnMonat.BackColor = System.Drawing.Color.White
+        Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnMonat.ForeColor = System.Drawing.Color.Black
+        Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnMonat.Location = New System.Drawing.Point(225, 146)
+        Me.btnMonat.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnMonat.Name = "btnMonat"
+        Me.btnMonat.Size = New System.Drawing.Size(87, 23)
+        Me.btnMonat.TabIndex = 20
+        Me.btnMonat.Text = "September"
+        Me.btnMonat.UseVisualStyleBackColor = False
+        '
+        'btnBisMonat
+        '
+        Me.btnBisMonat.BackColor = System.Drawing.Color.White
+        Me.btnBisMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBisMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnBisMonat.ForeColor = System.Drawing.Color.Black
+        Me.btnBisMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisMonat.Location = New System.Drawing.Point(311, 146)
+        Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnBisMonat.Name = "btnBisMonat"
+        Me.btnBisMonat.Size = New System.Drawing.Size(34, 23)
+        Me.btnBisMonat.TabIndex = 21
+        Me.btnBisMonat.Text = ">>"
+        Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnBisMonat.UseVisualStyleBackColor = False
+        '
+        'btnVonMonat
+        '
+        Me.btnVonMonat.BackColor = System.Drawing.Color.White
+        Me.btnVonMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVonMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btnVonMonat.ForeColor = System.Drawing.Color.Black
+        Me.btnVonMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonMonat.Location = New System.Drawing.Point(192, 146)
+        Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnVonMonat.Name = "btnVonMonat"
+        Me.btnVonMonat.Size = New System.Drawing.Size(34, 23)
+        Me.btnVonMonat.TabIndex = 19
+        Me.btnVonMonat.Text = "<<"
+        Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVonMonat.UseVisualStyleBackColor = False
+        '
+        'DateTimePicker2
+        '
+        Me.DateTimePicker2.CustomFormat = "''"
+        Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.DateTimePicker2.Location = New System.Drawing.Point(62, 170)
+        Me.DateTimePicker2.Margin = New System.Windows.Forms.Padding(0)
+        Me.DateTimePicker2.Name = "DateTimePicker2"
+        Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.DateTimePicker2.Size = New System.Drawing.Size(92, 20)
+        Me.DateTimePicker2.TabIndex = 26
+        '
+        'Label25
+        '
+        Me.Label25.AutoSize = True
+        Me.Label25.ForeColor = System.Drawing.Color.White
+        Me.Label25.Location = New System.Drawing.Point(33, 149)
+        Me.Label25.Name = "Label25"
+        Me.Label25.Size = New System.Drawing.Size(28, 13)
+        Me.Label25.TabIndex = 16
+        Me.Label25.Text = "von:"
+        '
+        'DateTimePicker1
+        '
+        Me.DateTimePicker1.CustomFormat = "''"
+        Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.DateTimePicker1.Location = New System.Drawing.Point(62, 145)
+        Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0)
+        Me.DateTimePicker1.Name = "DateTimePicker1"
+        Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20)
+        Me.DateTimePicker1.TabIndex = 17
+        '
+        'cbxWarenort
+        '
+        Me.cbxWarenort._allowedValuesFreiText = Nothing
+        Me.cbxWarenort._allowFreiText = False
+        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.FormattingEnabled = True
+        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
+        Me.cbxWarenort.Name = "cbxWarenort"
+        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxWarenort.TabIndex = 8
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Label4.ForeColor = System.Drawing.Color.Honeydew
+        Me.Label4.Location = New System.Drawing.Point(132, 51)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(60, 15)
+        Me.Label4.TabIndex = 5
+        Me.Label4.Text = "Warenort:"
+        '
+        'cbxStandort
+        '
+        Me.cbxStandort._allowedValuesFreiText = Nothing
+        Me.cbxStandort._allowFreiText = False
+        Me.cbxStandort._value = ""
+        Me.cbxStandort.FormattingEnabled = True
+        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
+        Me.cbxStandort.Name = "cbxStandort"
+        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxStandort.TabIndex = 7
+        '
+        'lblFiliale
+        '
+        Me.lblFiliale.AutoSize = True
+        Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.lblFiliale.ForeColor = System.Drawing.Color.Honeydew
+        Me.lblFiliale.Location = New System.Drawing.Point(32, 51)
+        Me.lblFiliale.Name = "lblFiliale"
+        Me.lblFiliale.Size = New System.Drawing.Size(43, 15)
+        Me.lblFiliale.TabIndex = 4
+        Me.lblFiliale.Text = "Filiale:"
+        '
+        'FlatButton2
+        '
+        Me.FlatButton2.allowBorder = False
+        Me.FlatButton2.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.FlatButton2.BackColor = System.Drawing.Color.White
+        Me.FlatButton2.FlatAppearance.BorderSize = 0
+        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
+        Me.FlatButton2.Location = New System.Drawing.Point(565, 220)
+        Me.FlatButton2.Name = "FlatButton2"
+        Me.FlatButton2.Size = New System.Drawing.Size(81, 20)
+        Me.FlatButton2.TabIndex = 30
+        Me.FlatButton2.Text = "jedes Datum"
+        Me.FlatButton2.UseVisualStyleBackColor = False
+        Me.FlatButton2.Visible = False
+        '
+        'btnSucheStarten
+        '
+        Me.btnSucheStarten.allowBorder = False
+        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
+        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
+        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
+        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254)
+        Me.btnSucheStarten.Name = "btnSucheStarten"
+        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
+        Me.btnSucheStarten.TabIndex = 33
+        Me.btnSucheStarten.Text = "Suche starten"
+        Me.btnSucheStarten.UseVisualStyleBackColor = False
+        '
+        'txtbis
+        '
+        Me.txtbis._DateTimeOnly = False
+        Me.txtbis._numbersOnly = False
+        Me.txtbis._numbersOnlyKommastellen = ""
+        Me.txtbis._numbersOnlyTrennzeichen = True
+        Me.txtbis._Prozent = False
+        Me.txtbis._ShortDateNew = False
+        Me.txtbis._ShortDateOnly = False
+        Me.txtbis._TimeOnly = False
+        Me.txtbis._TimeOnly_Seconds = False
+        Me.txtbis._value = ""
+        Me.txtbis._Waehrung = False
+        Me.txtbis._WaehrungZeichen = True
+        Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.txtbis.ForeColor = System.Drawing.Color.Black
+        Me.txtbis.Location = New System.Drawing.Point(565, 196)
+        Me.txtbis.MaxLineLength = -1
+        Me.txtbis.MaxLines_Warning = ""
+        Me.txtbis.MaxLines_Warning_Label = Nothing
+        Me.txtbis.Name = "txtbis"
+        Me.txtbis.Size = New System.Drawing.Size(81, 20)
+        Me.txtbis.TabIndex = 24
+        Me.txtbis.TabStop = False
+        Me.txtbis.Visible = False
+        '
+        'txtVon
+        '
+        Me.txtVon._DateTimeOnly = False
+        Me.txtVon._numbersOnly = False
+        Me.txtVon._numbersOnlyKommastellen = ""
+        Me.txtVon._numbersOnlyTrennzeichen = True
+        Me.txtVon._Prozent = False
+        Me.txtVon._ShortDateNew = False
+        Me.txtVon._ShortDateOnly = False
+        Me.txtVon._TimeOnly = False
+        Me.txtVon._TimeOnly_Seconds = False
+        Me.txtVon._value = ""
+        Me.txtVon._Waehrung = False
+        Me.txtVon._WaehrungZeichen = True
+        Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.txtVon.ForeColor = System.Drawing.Color.Black
+        Me.txtVon.Location = New System.Drawing.Point(562, 153)
+        Me.txtVon.MaxLineLength = -1
+        Me.txtVon.MaxLines_Warning = ""
+        Me.txtVon.MaxLines_Warning_Label = Nothing
+        Me.txtVon.Name = "txtVon"
+        Me.txtVon.Size = New System.Drawing.Size(81, 20)
+        Me.txtVon.TabIndex = 15
+        Me.txtVon.TabStop = False
+        Me.txtVon.Visible = False
+        '
+        'Label3
+        '
+        Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Label3.ForeColor = System.Drawing.Color.Honeydew
+        Me.Label3.Location = New System.Drawing.Point(562, 177)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(24, 15)
+        Me.Label3.TabIndex = 22
+        Me.Label3.Text = "Bis"
+        Me.Label3.Visible = False
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Label2.ForeColor = System.Drawing.Color.Honeydew
+        Me.Label2.Location = New System.Drawing.Point(562, 134)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(28, 15)
+        Me.Label2.TabIndex = 10
+        Me.Label2.Text = "Von"
+        Me.Label2.Visible = False
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Label1.ForeColor = System.Drawing.Color.Honeydew
+        Me.Label1.Location = New System.Drawing.Point(32, 10)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(45, 15)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Suche:"
+        '
+        'btnResetFilter
+        '
+        Me.btnResetFilter.allowBorder = False
+        Me.btnResetFilter.BackColor = System.Drawing.Color.White
+        Me.btnResetFilter.FlatAppearance.BorderSize = 0
+        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
+        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btnResetFilter.Location = New System.Drawing.Point(249, 24)
+        Me.btnResetFilter.Name = "btnResetFilter"
+        Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
+        Me.btnResetFilter.TabIndex = 3
+        Me.btnResetFilter.UseVisualStyleBackColor = False
+        '
+        'txtSuchbegriff
+        '
+        Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28)
+        Me.txtSuchbegriff.Name = "txtSuchbegriff"
+        Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20)
+        Me.txtSuchbegriff.TabIndex = 2
+        '
+        'chkOffen
+        '
+        Me.chkOffen.AutoSize = True
+        Me.chkOffen.Checked = True
+        Me.chkOffen.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.chkOffen.ForeColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.chkOffen.Location = New System.Drawing.Point(35, 210)
+        Me.chkOffen.Name = "chkOffen"
+        Me.chkOffen.Size = New System.Drawing.Size(120, 17)
+        Me.chkOffen.TabIndex = 31
+        Me.chkOffen.Text = "nur offene anzeigen"
+        Me.chkOffen.UseVisualStyleBackColor = True
+        '
+        'btnNeu
+        '
+        Me.btnNeu.allowBorder = False
+        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnNeu.BackColor = System.Drawing.Color.White
+        Me.btnNeu.FlatAppearance.BorderSize = 0
+        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeu.ForeColor = System.Drawing.Color.Black
+        Me.btnNeu.Location = New System.Drawing.Point(571, 253)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
+        Me.btnNeu.TabIndex = 34
+        Me.btnNeu.Text = "Neu"
+        Me.btnNeu.UseVisualStyleBackColor = False
+        '
+        'lblSaldo
+        '
+        Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lblSaldo.AutoSize = True
+        Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblSaldo.ForeColor = System.Drawing.Color.Red
+        Me.lblSaldo.Location = New System.Drawing.Point(450, 11)
+        Me.lblSaldo.Name = "lblSaldo"
+        Me.lblSaldo.Size = New System.Drawing.Size(82, 24)
+        Me.lblSaldo.TabIndex = 1
+        Me.lblSaldo.Text = "Saldo: -"
+        '
+        'lblZollsatz
+        '
+        Me.lblZollsatz.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lblZollsatz.AutoSize = True
+        Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
+        Me.lblZollsatz.Location = New System.Drawing.Point(451, 116)
+        Me.lblZollsatz.Name = "lblZollsatz"
+        Me.lblZollsatz.Size = New System.Drawing.Size(63, 16)
+        Me.lblZollsatz.TabIndex = 9
+        Me.lblZollsatz.Text = "Zollsatz: -"
+        '
+        'lblReferenzwert
+        '
+        Me.lblReferenzwert.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lblReferenzwert.AutoSize = True
+        Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
+        Me.lblReferenzwert.Location = New System.Drawing.Point(451, 89)
+        Me.lblReferenzwert.Name = "lblReferenzwert"
+        Me.lblReferenzwert.Size = New System.Drawing.Size(95, 16)
+        Me.lblReferenzwert.TabIndex = 6
+        Me.lblReferenzwert.Text = "Referenzwert: -"
+        '
+        'frmGesamtsicherheitenMenuNEU
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(658, 721)
+        Me.Controls.Add(Me.dgvListe)
+        Me.Controls.Add(Me.Panel1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximumSize = New System.Drawing.Size(800, 760)
+        Me.MinimumSize = New System.Drawing.Size(499, 760)
+        Me.Name = "frmGesamtsicherheitenMenuNEU"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "frmGesSichMenu"
+        CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents dgvListe As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents lblSaldo As Label
+    Friend WithEvents lblZollsatz As Label
+    Friend WithEvents lblReferenzwert As Label
+    Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents chkOffen As CheckBox
+    Friend WithEvents txtSuchbegriff As TextBox
+    Friend WithEvents btnResetFilter As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtbis As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtVon As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents btnSucheStarten As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ExportCSVToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents lblFiliale As Label
+    Friend WithEvents cbxStandort As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents txtDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label26 As Label
+    Friend WithEvents btnBisTag As Button
+    Friend WithEvents btnVonTag As Button
+    Friend WithEvents btnTag As Button
+    Friend WithEvents txtDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label24 As Label
+    Friend WithEvents btnJahr As Button
+    Friend WithEvents btnBisJahr As Button
+    Friend WithEvents btnVonJahr As Button
+    Friend WithEvents btnMonat As Button
+    Friend WithEvents btnBisMonat As Button
+    Friend WithEvents btnVonMonat As Button
+    Friend WithEvents DateTimePicker2 As DateTimePicker
+    Friend WithEvents Label25 As Label
+    Friend WithEvents DateTimePicker1 As DateTimePicker
+    Friend WithEvents btnOpenOver85Days As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents ExportCSV2ToolStripMenuItem As ToolStripMenuItem
+End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.resx
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.resx
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACAAAAAgAAAAMAAAAEAAAAChEAEQ8NAA0TAAAAFgAA
+        ABkAAAAbAAAAGgAAABgAAAAUAAAADgAAAAwAAAAIAAAABAAAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAUgICAIEhISDg0NDRQAAAAbAAAAJAAA
+        ACsAAAAvAAAAMgAAADQAAAAzAAAAMAAAACsAAAAmAAAAHgAAABYAAAAQAAAACwAAAAYAAAAEAAAAAQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAFAAAACg8PDxEJCQkbBwcHJQUF
+        BTEEBAQ9AAAARwAAAE0AAABSAAAAUwAAAFIAAABOAAAESAAABD8AAAAzAAAAKAAAAB0AAAAUAAAADQAA
+        AAcAAAADAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAgAAAAQCgAKGg0G
+        DSgJDgk4BwcHSAYGBlsCAgVqAAAAcgAAAHUAAAB0AAAAcwAAAnAAAAVoAwMGWwMDA0wEAAA8AAAALQAA
+        AB4AAAAUAAAADAAAAAUAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAEAAAACgwM
+        DBUICAgiCgoKMwMHB0oFBQViCggCfmhWALWZfwDXpIYA37mXAOyxkQDmqIcA25d8AMlbSgCYAAMAZAMD
+        AE0ABAA6AAAAKAAAABoAAAAQAAAABwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
+        AAYAAAAMFhYWFw0NDScFBQU3RjgAX7SUAM/XsQD/37YA/9+0AP/ftQD/37UA/9+1AP/etgD/3rUA/9+2
+        AP/UrQD5qosArSMjAEEABgYqAAAAHAAAABEAAAAJAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAACAAAABgAAAAsMDAwWGhoJHcCdAJ7ctwD/3rYA/9+2AP/htgD/4rcA/+K3AP/itwD/4rcA/+K3
+        AP/itwD/4bYA/9+2AP/etgD/2bMA9LKTAG0NDQ0UAAAAEAAAAAgAAAADAAAAAQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAEAAAADAAAAB3ZiAA3YtADF3rYA/+C2AP/iuAD/5LgA/+W5AP/mugD/57oA/+e6
+        AP/nugD/57oA/+a5AP/luQD/47gA/+K3AP/ftgD/3bYA/9eyAJEAAAAAAAAABAAAAAIAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA3bcA1963AP/iuAD/5LoA/+e7AP/nvAD/6LwA/+m8
+        AP/rvQD/7L4A/+2+AP/svwD/7L4A/+q8AP/ovAD/5rsA/+O6AP/huAD/3bYA/+C6AJsAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOC6ALXfuAD/4roA/+a8AP/nvAD/6b0A/+u+
+        AP/svwD/7MAA/76cAP+NdwD/e2sb/3JkIv+HcwD/p4kA/+K5AP/qvQD/57wA/+W8AP/hugD/3rgA/965
+        AG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADfugBn3rkA/+K7AP/mvgD/6b4A/+u/
+        AP/rwAD/78QA/8CeAP9WTzL/QEBB/0JERf9ERUX/QUFB/zs8PP81NTX/Qzwn//DDAP/rvwD/6L4A/+a9
+        AP/huwD/3bgA/9WxACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd25AO/hvAD/5r4A/+nA
+        AP/rwQD/7MIA//DEAP+ykwD/Ozw+/0VGRv9JSUn/SEtK/0dHSP9BQkT/Ozs8/zQ0NP9vYBP/8MUA/+zC
+        AP/rwQD/6L8A/+W+AP/huwD/27gAugAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADduQB44bwA/+a+
+        AP/pwQD/7MMA/+7EAP/wxQD/1a8A/zw+Pv9HR0f/TU5O/05PUP+QgC7/uJsA/9WwAP/DowD/m4MA/6yQ
+        AP/xxQD/78QA/+7EAP/rwgD/6MAA/+W9AP/guwD/3LkALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN26
+        ANrkvgD/6MEA/+vEAP/uxAD/8MUA//TJAP9wYiv/Q0ZG/05PT/9RVFX/up0Q//TJAP/xxwD/8ccA//HH
+        AP/yxwD/8scA//DGAP/wxgD/8MUA/+3FAP/rwwD/58AA/+K+AP/euwCZAAAAAAAAAAAAAAAAAAAAAAAA
+        AADcuQAW4L4A/+XBAP/qxQD/7cYA/+/IAP/1ywD/7cQA/z9BQP9MTU3/VVZW/351TP/4zwD/9MsA//XL
+        AP/1ywD/9csA//TLAP/xyQD/8ckA//HJAP/wyQD/78cA/+3GAP/pxAD/5cAA/969AOoAAAAAAAAAAAAA
+        AAAAAAAAAAAAAN27AEvjwAD/6MQA/+zGAP/vyAD/9swA/0xEHv8yMjT/QkRE/09QUP9XWFj/Wltb/1dZ
+        XP9SVFb/Sk1P/0JERv86Ojv/ZFgr//bNAP/zygD/88oA//PKAP/xygD/78gA/+vFAP/nwwD/4b8A/8aq
+        AAkAAAAAAAAAAAAAAAAAAAAA378Jb+TCAP/qxgD/7skA//DMAP/1zwD/dmUf/0xHNP9CRET/T1BQ/1dY
+        WP9zblX/e3NR/3dvTP9yaUb/bGI+/2NcNf+Ccyf/9tAA//PNAP/zzQD/880A//LMAP/wywD/7cgA/+jG
+        AP/jwQD/274GKwAAAAAAAAAAAAAAAAAAAADfvx545MQT/+rHAv/uywD/8s0A//TPAP/evAD/kn4q/0BB
+        Qf9OTk7/VVZX/7ykOv/fwBH/3b4V/9y9Ev/buxb/2roK/9++AP/10AD/9M8A//TPAP/0zwD/884A//HM
+        AP/uygD/6cYF/+TDFf/fvxs4AAAAAAAAAAAAAAAAAAAAAODCJXXlxiL/68oX//DND//zzwH/+NMA/0pD
+        If8tLi7/PDw8/0hKSf9SUlL/VVdY/1VXWf9RVFb/S05R/0VGSf87PD//Zlwz//nUAP/20QD/9tEA//bR
+        AP/10QD/888B/+7MEv/qyRn/5MQk/968IS4AAAAAAAAAAAAAAAAAAAAA4cMwVeXGLv/ryyn/8M4l//PR
+        Iv/31CH/lIEg/31tLf80NTX/QUFB/0pMTP9lYVD/m41J/5mISf+XiEb/lINB/5B/Of+ljzD/+NUf//fT
+        Hv/30x7/9tMe//XRIf/y0CP/7s0m/+rKKv/kxTD/2b8mFAAAAAAAAAAAAAAAAAAAAADixTMj5cY4/+vM
+        M//w0DL/9NIw//bUMf/51zD//9sw/0pELf83Nzf/QUJC/05OSv/y0TH/+9ct//rXLf/61y3/+tcw//rX
+        MP/41i//+NYv//jWL//31TD/9tQx//PRMf/vzzP/6ss0/+LFNvcAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADkxj/06sw//+/QPv/z0z7/9tY8//jXPf/62D//tJw1/ywtLf83Nzf/QEBA/2pjSP/lyEL//No9//rZ
+        Pv/72T7//Ns8//TTPv/51z3/+Nc9//jXPf/21Tz/8tI+/+7PPf/oyj7/4sU+qAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAOHFRJLoy0T/7s9F//LTRv/21kf/+NdF//nYR//+3Ej/a2Aw/ywsLP81NTX/Ozs7/0VG
+        QP9vZ0X/k4VH/3dtQf9DQDT/s50+//vbR//52Ef/+NdF//bWR//x0kX/7c5G/+fJRf/hw0JNAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA379AEObKSv/sz0v/8dNM//XXTv/32U7/+dtN//rcTv/52k3/cGQy/ygo
+        KP8uLi7/MjQ0/zU2Nv81NTX/MTIy/ywsLP97bjf//NxQ//naTf/32E//9NZM//DSTf/rzkv/5MhI2AAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5clNiOnNUf/v0VP/89ZV//fZVf/521j/+txX//vc
+        Wf//4Vr/wqpJ/1xTL/8lJSX/KCkp/ygpKf8mJib/Ly0n/4Z3Of/93Vj/+dpX//bYVv/y1VT/7dFT/+fM
+        Uf/hyE5FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/v0AE5spS3ezQVf/w1Fj/9dda//fa
+        XP/53Fz/+t1d//veXf/932D//+Fg/+zQWP/ZwFP/2cFU/93DVf/+4l7//d9e//ncXP/22Vz/89da/+/S
+        V//qzlT/5MpTowAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADbwlUV5stY9+zR
+        W//w1V7/9dhg//fbYv/53GL/+t1k//veY//73mX//OBk//zgZf/832b//N9k//ndY//53GP/9tpg//PX
+        Xv/w1F3/69Ba/+XKV9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADizFcj5stb7ezRXv/w1GL/89dj//XZZf/322b/+Nxn//ncZ//53Gf/+dxn//ncZ//43Gf/99tm//XZ
+        ZP/y12P/79Ng/+vQXf/my1rJ1apVBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADVv1UM5stcxevQYP/u02L/8NZk//PXZv/02Wf/9dpo//XaaP/12mj/9dpo//TZ
+        Z//y12X/8NVk/+3SYv/pz1//5stdjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5ctfWebNYOLq0WP/7NJk/+7UZv/w1Wf/8NZn//DW
+        Z//v1Wb/7tRl/+vSZP/q0GL/58xfvuLMXyMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLLYyzlzGOB5s1izefP
+        ZNTp0GP/6dBj/ejOY9HmzWLA5sthcefCYRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA+AAAf/AAAB/wAAAP4AAAD+AAAA/gAAAP4AAAB+AAAE/0AAA/+AAAH/AA
+        AA/gAAAP4AAAB+AAAAfAAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAH4AAAB+AAAAfgAAAP8AAAD/AA
+        AB/4AAA//AAAP/4AAP//gAH//+AH//////8=
+</value>
+  </data>
+</root>
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -0,0 +1,417 @@
+Imports SDL
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmGesamtsicherheitenMenuNEU
+
+    Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cAufschubKonten
+    Public dataTable As DataTable
+    Public Property Standort As String = ""
+
+
+    Private Sub frmGesamtsicherheitenNEU_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
+        cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+        Me.Text = "Gesamtsicherheiten " & Standort
+        frmHauptfenster.EnableDoubleBuffered(dgvListe)
+
+        GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
+        If GesSichRef.hasEntry = False Then
+            MsgBox("Für den Standort " & Standort & " wurde keine Referenz hingerlegt!")
+            Exit Sub
+
+        End If
+        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
+
+
+        'txtDatVon.Text = Now.ToShortDateString
+
+
+        'Hiermit werden alle offenen Gestellungen angezeigt.
+        txtDatVon.Text = Date.Parse("01.01.2001")
+        txtDatBis.Text = Now.ToShortDateString
+        chkOffen.Checked = True
+
+        btnMonat.Text = MONAT.ToString("MMMM")
+        btnJahr.Text = JAHR.Year
+
+        If GesSichRef.brgakto_gs_ATR = True Then
+            Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs()
+            If anzahlOffenerGSUeber85Tage > 0 Then
+                btnOpenOver85Days.Visible = True
+            End If
+        End If
+
+        ShowStandort()
+        LoadDGV()
+    End Sub
+
+    Public Function LoadDGV()
+        Dim sqladdon As String = ""
+        If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'"
+        If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'"
+        If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"
+
+        Dim sqlstring As String =
+            " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
+                max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
+                  (Select SUM( Case 
+			when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+			when gs_art = 'Close' then gs_sicherheitsbetrag
+		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
+		        )
+		        +
+		        (Select SUM( Case 
+			when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
+			when gsp_art = 'Close' then gsp_sicherheitsbetrag
+		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
+			        ) , 'C', 'de-DE') as gs_SicherheitsSaldo
+
+            From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where 
+                gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
+                gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR
+                gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR
+                gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR
+                gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR
+                gs_warenort like '%" & txtSuchbegriff.Text & "%'
+            ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2
+            Where gs_standort = '" & Standort & "' " & sqladdon & "
+            AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "'
+            AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr"
+
+        dgvListe.SET_SQL(sqlstring, "AVISO")
+        dgvListe.LOAD()
+
+        With dgvListe
+            .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+            .RowHeadersWidth = 6
+            .Columns("gs_standort").Visible = False
+            .Columns("gs_gsnr").HeaderText = "#"
+            .Columns("gs_gsnr").Width = 36
+            .Columns("gs_filialenNr").HeaderText = "Filiale"
+            .Columns("gs_filialenNr").Width = 43
+            .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr."
+            .Columns("gs_abfertigungsNr").Width = 107
+            .Columns("gs_datum").Width = 112
+            .Columns("gs_datum").HeaderText = "Datum"
+            .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("gs_SicherheitsSaldo").HeaderText = "Sicherheitssaldo"
+            .Columns("gs_Warenort").Width = 96
+            .Columns("gs_Warenort").HeaderText = "Warenort"
+            .Columns("gs_avisoId").Width = 96
+            .Columns("gs_avisoId").HeaderText = "LKW-ID"
+            .Columns("gs_LKWKZ").HeaderText = "LKW-KZ"
+
+        End With
+
+
+
+        If dgvListe.Rows.Count = 0 Then Exit Function
+
+        dataTable = New DataTable()
+        dataTable.Columns.Add("gs_gsnr", GetType(Integer))
+        dataTable.Columns.Add("gs_isOpen", GetType(Boolean))
+
+
+
+
+        For Each row As DataGridViewRow In dgvListe.Rows
+            If Not IsDBNull(row.Cells("gs_SicherheitsSaldo").Value) Then
+                If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
+
+                    dataTable.Rows.Add(row.Cells("gs_gsnr").Value, True)
+                Else
+                    dataTable.Rows.Add(row.Cells("gs_gsnr").Value, False)
+                End If
+            End If
+        Next
+
+
+        'Debug
+        'For i As Integer = 0 To dt.Rows.Count - 1
+        '    MsgBox("gs_nr: " & dt.Rows(i).Item("gs_gsnr").ToString & " " & "gs_isOpen: " & dt.Rows(i).Item("gs_isOpen").ToString)
+        'Next
+
+
+
+        For Each row As DataGridViewRow In dgvListe.Rows
+            If Not IsDBNull(row.Cells("gs_SicherheitsSaldo").Value) Then
+                If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
+                    row.DefaultCellStyle.BackColor = Color.Red
+                Else
+                    row.DefaultCellStyle.BackColor = Color.Green
+                End If
+            End If
+        Next
+
+    End Function
+
+    Public Sub ShowStandort()
+        lblReferenzwert.Text = "Referenzwert: €" & CDbl(GesSichRef.brgakto_betrag).ToString("N")
+        lblZollsatz.Text = "Zollsatz: " & GesSichRef.brgakto_gs_zollsatz & "%"
+        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
+    End Sub
+
+
+
+
+    Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick
+        Dim frm As New frmGesamtsicherheitenNEU
+        With frm
+            .currentGesSichRef = GesSichRef
+            .gessicherheitID = dgvListe.CurrentRow.Cells("gs_gsnr").Value
+            .Standort = Me.Standort
+            .datum = dgvListe.CurrentRow.Cells("gs_datum").Value
+            .LKWKZ = dgvListe.CurrentRow.Cells("gs_LKWKZ").Value
+            .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value
+            .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value
+            .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
+            .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value
+            .dataTable = Me.dataTable
+        End With
+
+        AddHandler frm.FormClosing, Function()
+                                        GesSichRef.CalcSaldo()
+                                        ShowStandort()
+                                        LoadDGV()
+                                        Me.BringToFront()
+                                    End Function
+        frm.Show()
+    End Sub
+
+    Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
+        Dim frm As New frmGesamtsicherheitenNEU
+        With frm
+            .currentGesSichRef = GesSichRef
+            .Standort = Me.Standort
+            .datum = Date.Now
+            .Neu = True
+            .dataTable = Me.dataTable
+        End With
+        AddHandler frm.FormClosing, Function()
+                                        GesSichRef.CalcSaldo()
+                                        ShowStandort()
+                                        LoadDGV()
+                                        Me.BringToFront()
+                                    End Function
+        frm.Show()
+    End Sub
+
+    Private Sub lblSaldo_Click(sender As Object, e As EventArgs) Handles lblSaldo.Click
+        lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
+        LoadDGV()
+    End Sub
+
+    Private Sub chkOffen_CheckedChanged(sender As Object, e As EventArgs)
+        If Me.Visible Then LoadDGV()
+    End Sub
+    Private Sub Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs)
+        Select Case Asc(e.KeyChar)
+            Case 48 To 57, 8, 46, 58, 32, 44, 65 To 90, 97 To 122
+                ' Zahlen, Backspace, . und : zulassen
+
+            Case Else
+                ' alle anderen Eingaben unterdrücken
+                e.Handled = True
+        End Select
+    End Sub
+
+    Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles btnResetFilter.Click
+        txtSuchbegriff.Text = "" : chkOffen.Checked = True
+        txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy")
+        txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy")
+        cbxStandort._value = ""
+        cbxWarenort._value = ""
+        btnSucheStarten_Click(sender, e)
+    End Sub
+
+    Private Sub btnSucheStarten_Click(sender As Object, e As EventArgs) Handles btnSucheStarten.Click
+        Try
+            Date.Parse(txtDatVon.Text)
+            Date.Parse(txtDatBis.Text)
+            If Me.Visible Then LoadDGV()
+        Catch ex As Exception
+            MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.")
+        End Try
+    End Sub
+
+    Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1)
+    Dim TAG As Date = CDate(Now.ToShortDateString)
+    Dim JAHR As Date = CDate("01.01." & Now.Year)
+
+
+    Sub initBtns(MonatJahr)
+        btnMonat.Text = MONAT.ToString("MMMM")
+        btnJahr.Text = JAHR.Year
+        Select Case MonatJahr
+            Case "Monat"
+                DateTimePicker1.Value = MONAT
+                DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1)
+            Case "Jahr"
+
+                DateTimePicker1.Value = JAHR
+                DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1)
+                'End If
+            Case "Tag"
+
+                DateTimePicker1.Value = TAG
+                DateTimePicker2.Value = TAG
+                If TAG = Now.ToShortDateString Then
+                    btnTag.Text = "Heute"
+                ElseIf TAG = Now.AddDays(-1).ToShortDateString Then
+                    btnTag.Text = "Gestern"
+                ElseIf TAG = Now.AddDays(-2).ToShortDateString Then
+                    btnTag.Text = "Vorgestern"
+                ElseIf TAG = Now.AddDays(1).ToShortDateString Then
+                    btnTag.Text = "Morgen"
+                Else
+                    btnTag.Text = TAG.ToString("dd.MM")
+                End If
+
+                'End If
+            Case ""
+                DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year)
+                DateTimePicker2.Value = Now
+        End Select
+
+    End Sub
+
+
+    Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click
+        initBtns("Jahr")
+    End Sub
+
+    Private Sub btnPlusJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click
+        JAHR = JAHR.AddYears(1)
+        initBtns("Jahr")
+    End Sub
+
+    Private Sub btnMinusJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click
+        JAHR = JAHR.AddYears(-1)
+        initBtns("Jahr")
+    End Sub
+
+    Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click
+        initBtns("Monat")
+    End Sub
+
+    Private Sub btnPlusMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click
+        MONAT = MONAT.AddMonths(1)
+        initBtns("Monat")
+    End Sub
+
+    Private Sub btnMinusMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click
+        MONAT = MONAT.AddMonths(-1)
+        initBtns("Monat")
+    End Sub
+
+
+    Private Sub btnTag_Click(sender As Object, e As EventArgs) Handles btnTag.Click
+        initBtns("Tag")
+    End Sub
+
+    Private Sub btnMinusTag_Click(sender As Object, e As EventArgs) Handles btnVonTag.Click
+        TAG = TAG.AddDays(-1)
+        initBtns("Tag")
+    End Sub
+
+    Private Sub btnPlusTag_Click(sender As Object, e As EventArgs) Handles btnBisTag.Click
+        TAG = TAG.AddDays(1)
+        initBtns("Tag")
+    End Sub
+
+    Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged
+        txtDatVon._value = CDate(sender.value).ToShortDateString
+        btnSucheStarten_Click(sender, e)
+    End Sub
+
+    Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged
+        txtDatBis._value = CDate(sender.value).ToShortDateString
+        btnSucheStarten_Click(sender, e)
+    End Sub
+
+    Function setNullToZero(s As String, Optional type As String = "")
+
+        If s = "" Then
+            Dim zero As Double = 0
+
+            Return zero
+        Else
+            Return s
+        End If
+    End Function
+
+    Private Sub btnOpenOver85Days_Click(sender As Object, e As EventArgs) Handles btnOpenOver85Days.Click
+        resetSearchfields_Click(sender, e)
+        chkOffen.Checked = True
+        DateTimePicker1.Value = Now.AddYears(-20)
+        DateTimePicker2.Value = Now.AddDays(-85)
+
+        btnSucheStarten_Click(sender, e)
+
+    End Sub
+
+    Private Function checkOpenATBs() As Integer
+
+        Dim anzahlOffenerGSUeber85Tage As Integer
+
+        Dim dtNew As New DataTable
+
+        Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, 
+                  (Select SUM( Case 
+			when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+			when gs_art = 'Close' then gs_sicherheitsbetrag
+		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
+		        )
+		        +
+		        (Select SUM( Case 
+			when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
+			when gsp_art = 'Close' then gsp_sicherheitsbetrag
+		        End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
+			        ) as Sicherheitssaldo
+
+            From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
+            Where gs_standort = '" & Standort & "'  AND Sicherheitssaldo != '0' AND gs_datum < '" & Date.Now().AddDays(-85) & "'"
+
+        dtNew = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
+
+        If (dtNew.Rows(0).Item(0) IsNot DBNull.Value) Then
+
+            anzahlOffenerGSUeber85Tage = dtNew.Rows(0).Item(0)
+            If anzahlOffenerGSUeber85Tage > 0 Then
+                MsgBox("Es sind " & anzahlOffenerGSUeber85Tage & " ATBs offen, die älter als 85 Tage sind!")
+            End If
+            Return anzahlOffenerGSUeber85Tage
+        End If
+
+
+
+    End Function
+
+    Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ExportCSVToolStripMenuItem.Click
+
+        SDL.cProgramFunctions.genExcelFromDGV_NEW(dgvListe)
+
+    End Sub
+
+    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportCSV2ToolStripMenuItem.Click
+
+        If dgvListe.Rows.Count > 0 Then
+            Dim list As New List(Of Integer)
+
+            For Each row As DataGridViewRow In dgvListe.Rows
+                list.Add(CInt(row.Cells("gs_gsnr").Value))
+
+
+            Next
+            Dim frm As New frmGesamtsicherheitenNEU
+
+            Dim datumVon As String = DateTimePicker1.Value.AddDays(-1)
+
+            frm.LoadDataTableSicherheitenForExport(list, datumVon, txtDatBis.Text)
+
+            SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+
+        End If
+    End Sub
+End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
--- a/Aviso/frmGesamtsicherheitenNEU.resx
+++ b/Aviso/frmGesamtsicherheitenNEU.resx
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>268, 15</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACAAAAAgAAAAMAAAAEAAAAChEAEQ8NAA0TAAAAFgAA
+        ABkAAAAbAAAAGgAAABgAAAAUAAAADgAAAAwAAAAIAAAABAAAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAUgICAIEhISDg0NDRQAAAAbAAAAJAAA
+        ACsAAAAvAAAAMgAAADQAAAAzAAAAMAAAACsAAAAmAAAAHgAAABYAAAAQAAAACwAAAAYAAAAEAAAAAQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAFAAAACg8PDxEJCQkbBwcHJQUF
+        BTEEBAQ9AAAARwAAAE0AAABSAAAAUwAAAFIAAABOAAAESAAABD8AAAAzAAAAKAAAAB0AAAAUAAAADQAA
+        AAcAAAADAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAgAAAAQCgAKGg0G
+        DSgJDgk4BwcHSAYGBlsCAgVqAAAAcgAAAHUAAAB0AAAAcwAAAnAAAAVoAwMGWwMDA0wEAAA8AAAALQAA
+        AB4AAAAUAAAADAAAAAUAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAEAAAACgwM
+        DBUICAgiCgoKMwMHB0oFBQViCggCfmhWALWZfwDXpIYA37mXAOyxkQDmqIcA25d8AMlbSgCYAAMAZAMD
+        AE0ABAA6AAAAKAAAABoAAAAQAAAABwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
+        AAYAAAAMFhYWFw0NDScFBQU3RjgAX7SUAM/XsQD/37YA/9+0AP/ftQD/37UA/9+1AP/etgD/3rUA/9+2
+        AP/UrQD5qosArSMjAEEABgYqAAAAHAAAABEAAAAJAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAACAAAABgAAAAsMDAwWGhoJHcCdAJ7ctwD/3rYA/9+2AP/htgD/4rcA/+K3AP/itwD/4rcA/+K3
+        AP/itwD/4bYA/9+2AP/etgD/2bMA9LKTAG0NDQ0UAAAAEAAAAAgAAAADAAAAAQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAEAAAADAAAAB3ZiAA3YtADF3rYA/+C2AP/iuAD/5LgA/+W5AP/mugD/57oA/+e6
+        AP/nugD/57oA/+a5AP/luQD/47gA/+K3AP/ftgD/3bYA/9eyAJEAAAAAAAAABAAAAAIAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA3bcA1963AP/iuAD/5LoA/+e7AP/nvAD/6LwA/+m8
+        AP/rvQD/7L4A/+2+AP/svwD/7L4A/+q8AP/ovAD/5rsA/+O6AP/huAD/3bYA/+C6AJsAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOC6ALXfuAD/4roA/+a8AP/nvAD/6b0A/+u+
+        AP/svwD/7MAA/76cAP+NdwD/e2sb/3JkIv+HcwD/p4kA/+K5AP/qvQD/57wA/+W8AP/hugD/3rgA/965
+        AG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADfugBn3rkA/+K7AP/mvgD/6b4A/+u/
+        AP/rwAD/78QA/8CeAP9WTzL/QEBB/0JERf9ERUX/QUFB/zs8PP81NTX/Qzwn//DDAP/rvwD/6L4A/+a9
+        AP/huwD/3bgA/9WxACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd25AO/hvAD/5r4A/+nA
+        AP/rwQD/7MIA//DEAP+ykwD/Ozw+/0VGRv9JSUn/SEtK/0dHSP9BQkT/Ozs8/zQ0NP9vYBP/8MUA/+zC
+        AP/rwQD/6L8A/+W+AP/huwD/27gAugAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADduQB44bwA/+a+
+        AP/pwQD/7MMA/+7EAP/wxQD/1a8A/zw+Pv9HR0f/TU5O/05PUP+QgC7/uJsA/9WwAP/DowD/m4MA/6yQ
+        AP/xxQD/78QA/+7EAP/rwgD/6MAA/+W9AP/guwD/3LkALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN26
+        ANrkvgD/6MEA/+vEAP/uxAD/8MUA//TJAP9wYiv/Q0ZG/05PT/9RVFX/up0Q//TJAP/xxwD/8ccA//HH
+        AP/yxwD/8scA//DGAP/wxgD/8MUA/+3FAP/rwwD/58AA/+K+AP/euwCZAAAAAAAAAAAAAAAAAAAAAAAA
+        AADcuQAW4L4A/+XBAP/qxQD/7cYA/+/IAP/1ywD/7cQA/z9BQP9MTU3/VVZW/351TP/4zwD/9MsA//XL
+        AP/1ywD/9csA//TLAP/xyQD/8ckA//HJAP/wyQD/78cA/+3GAP/pxAD/5cAA/969AOoAAAAAAAAAAAAA
+        AAAAAAAAAAAAAN27AEvjwAD/6MQA/+zGAP/vyAD/9swA/0xEHv8yMjT/QkRE/09QUP9XWFj/Wltb/1dZ
+        XP9SVFb/Sk1P/0JERv86Ojv/ZFgr//bNAP/zygD/88oA//PKAP/xygD/78gA/+vFAP/nwwD/4b8A/8aq
+        AAkAAAAAAAAAAAAAAAAAAAAA378Jb+TCAP/qxgD/7skA//DMAP/1zwD/dmUf/0xHNP9CRET/T1BQ/1dY
+        WP9zblX/e3NR/3dvTP9yaUb/bGI+/2NcNf+Ccyf/9tAA//PNAP/zzQD/880A//LMAP/wywD/7cgA/+jG
+        AP/jwQD/274GKwAAAAAAAAAAAAAAAAAAAADfvx545MQT/+rHAv/uywD/8s0A//TPAP/evAD/kn4q/0BB
+        Qf9OTk7/VVZX/7ykOv/fwBH/3b4V/9y9Ev/buxb/2roK/9++AP/10AD/9M8A//TPAP/0zwD/884A//HM
+        AP/uygD/6cYF/+TDFf/fvxs4AAAAAAAAAAAAAAAAAAAAAODCJXXlxiL/68oX//DND//zzwH/+NMA/0pD
+        If8tLi7/PDw8/0hKSf9SUlL/VVdY/1VXWf9RVFb/S05R/0VGSf87PD//Zlwz//nUAP/20QD/9tEA//bR
+        AP/10QD/888B/+7MEv/qyRn/5MQk/968IS4AAAAAAAAAAAAAAAAAAAAA4cMwVeXGLv/ryyn/8M4l//PR
+        Iv/31CH/lIEg/31tLf80NTX/QUFB/0pMTP9lYVD/m41J/5mISf+XiEb/lINB/5B/Of+ljzD/+NUf//fT
+        Hv/30x7/9tMe//XRIf/y0CP/7s0m/+rKKv/kxTD/2b8mFAAAAAAAAAAAAAAAAAAAAADixTMj5cY4/+vM
+        M//w0DL/9NIw//bUMf/51zD//9sw/0pELf83Nzf/QUJC/05OSv/y0TH/+9ct//rXLf/61y3/+tcw//rX
+        MP/41i//+NYv//jWL//31TD/9tQx//PRMf/vzzP/6ss0/+LFNvcAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADkxj/06sw//+/QPv/z0z7/9tY8//jXPf/62D//tJw1/ywtLf83Nzf/QEBA/2pjSP/lyEL//No9//rZ
+        Pv/72T7//Ns8//TTPv/51z3/+Nc9//jXPf/21Tz/8tI+/+7PPf/oyj7/4sU+qAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAOHFRJLoy0T/7s9F//LTRv/21kf/+NdF//nYR//+3Ej/a2Aw/ywsLP81NTX/Ozs7/0VG
+        QP9vZ0X/k4VH/3dtQf9DQDT/s50+//vbR//52Ef/+NdF//bWR//x0kX/7c5G/+fJRf/hw0JNAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA379AEObKSv/sz0v/8dNM//XXTv/32U7/+dtN//rcTv/52k3/cGQy/ygo
+        KP8uLi7/MjQ0/zU2Nv81NTX/MTIy/ywsLP97bjf//NxQ//naTf/32E//9NZM//DSTf/rzkv/5MhI2AAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5clNiOnNUf/v0VP/89ZV//fZVf/521j/+txX//vc
+        Wf//4Vr/wqpJ/1xTL/8lJSX/KCkp/ygpKf8mJib/Ly0n/4Z3Of/93Vj/+dpX//bYVv/y1VT/7dFT/+fM
+        Uf/hyE5FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/v0AE5spS3ezQVf/w1Fj/9dda//fa
+        XP/53Fz/+t1d//veXf/932D//+Fg/+zQWP/ZwFP/2cFU/93DVf/+4l7//d9e//ncXP/22Vz/89da/+/S
+        V//qzlT/5MpTowAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADbwlUV5stY9+zR
+        W//w1V7/9dhg//fbYv/53GL/+t1k//veY//73mX//OBk//zgZf/832b//N9k//ndY//53GP/9tpg//PX
+        Xv/w1F3/69Ba/+XKV9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADizFcj5stb7ezRXv/w1GL/89dj//XZZf/322b/+Nxn//ncZ//53Gf/+dxn//ncZ//43Gf/99tm//XZ
+        ZP/y12P/79Ng/+vQXf/my1rJ1apVBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADVv1UM5stcxevQYP/u02L/8NZk//PXZv/02Wf/9dpo//XaaP/12mj/9dpo//TZ
+        Z//y12X/8NVk/+3SYv/pz1//5stdjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5ctfWebNYOLq0WP/7NJk/+7UZv/w1Wf/8NZn//DW
+        Z//v1Wb/7tRl/+vSZP/q0GL/58xfvuLMXyMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLLYyzlzGOB5s1izefP
+        ZNTp0GP/6dBj/ejOY9HmzWLA5sthcefCYRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA+AAAf/AAAB/wAAAP4AAAD+AAAA/gAAAP4AAAB+AAAE/0AAA/+AAAH/AA
+        AA/gAAAP4AAAB+AAAAfAAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAH4AAAB+AAAAfgAAAP8AAAD/AA
+        AB/4AAA//AAAP/4AAP//gAH//+AH//////8=
+</value>
+  </data>
+</root>
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -259,6 +259,12 @@
  <metadata name="Timer_REFRESH.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1421, 17</value>
  </metadata>
+  <metadata name="ColorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1557, 17</value>
+  </metadata>
+  <metadata name="ctxtFarben.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -11,10 +11,14 @@ Imports Hardcodet.Wpf.TaskbarNotification
 Imports com.esendex.sdk.messaging
 Imports Newtonsoft.Json
 Imports System.Reflection
+Imports System.Runtime.InteropServices


 'Imports UID
 Public Class frmHauptfenster
+
+
+
    Public aktiv = False
    Private AvisoDAL As New cAvisoDAL
    Private VermerkeDAL As New cVermerkeDAL
@@ -188,6 +192,9 @@ Public Class frmHauptfenster
        'transparentpnl.BackColor = Color.FromArgb(25, Color.Red)
        ' transparentpnl.BackColor = Color.Transparent

+
+
+
        TimerAkte.Enabled = True
        Grid_aktiv = False

@@ -216,7 +223,8 @@ Public Class frmHauptfenster
        'cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
        cboGrenzstelle.changeItem("")

-        txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        '  txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})

        cboImEx.Items.Clear()
        cboImEx.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -226,6 +234,7 @@ Public Class frmHauptfenster



+
        If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
            cboMy_Grenzstelle.Items.Clear()
            cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "'  AND  grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'   AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
@@ -250,6 +259,7 @@ Public Class frmHauptfenster
        cboMy_Grenzstelle.changeItem("")

        cboMyAvisoAnzeige.Items.Clear()
+        cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
        cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer"))
        cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False)
        cboMyAvisoAnzeige.changeItem("Benutzer")
@@ -264,6 +274,8 @@ Public Class frmHauptfenster

            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                StandortWechselnToolStripMenuItem.Visible = True
+            ElseIf VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
+                StandortWechselnToolStripMenuItem.Visible = True
            End If

            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then
@@ -524,6 +536,13 @@ Public Class frmHauptfenster
            btnKassenbuch.Visible = True
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ESSENSBESTELLUNGEN", "AVISO") Then
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                Case "FRONTOFFICE", "VERAG", "IMEX"
+                    EssensbestellungenToolStripMenuItem.Visible = True
+            End Select
+        End If
+
        Panel1.Height -= pnlSearch.Height

    End Sub
@@ -1090,14 +1109,17 @@ Public Class frmHauptfenster
                '----------------------------------------------------------------------------------------------------------------------------------
                '--- Sendung ---
                '----------------------------------------------------------------------------------------------------------------------------------
-                Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 "
+                Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
                If cboMyAvisoAnzeige._value <> "" Then
-                    If cboMyAvisoAnzeige._value = "T1" Then
+                    If cboMyAvisoAnzeige._value = "ALLE" Then
+                        '  inBearbeitungSQL = " 1=1 " 'ALLE
+                        inBearbeitungSQL = " (  (tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id]  FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'))       OR      (Aviso.[TeamId] IN (SELECT [team_id]  FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND tblSendungen.[tblSnd_TeamId] is null))       OR        tblSendungen.LetzterMitarbeiterId=@maId) "
+                    ElseIf cboMyAvisoAnzeige._value = "T1" Then
                        inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
                        'NUR VERAG/IMEX:
                        inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE  Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
                    ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
-                        inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
+                        inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & "  AND tblSendungen.[tblSnd_TeamId] is null)  OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
                    End If
                End If

@@ -1119,11 +1141,40 @@ Public Class frmHauptfenster
                End Select
                If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"

+
+                'Farbe
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
+                    Select Case btnColor.BackColor
+                        Case Color.Red
+                            sqlStr &= " AND (Status = 3 ) "
+                        Case Color.Orange
+                            ' sqlStr &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
+                            sqlStr &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) "
+                        Case Color.Yellow
+                            sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND  cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",GETDATE()) AS DATE) ) ) "
+                    End Select
+                End If
+                ''Farbe
+                'If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
+                '    Select Case btnColor.BackColor
+                '        Case Color.Red
+                '            sqlStr &= " AND (Status = 3 OR (Status IN (0, 3, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE)<= cast(GETDATE() AS DATE) ) or VoraussichtlichesEintreffen is null) "
+                '        Case Color.Orange
+                '            sqlStr &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
+                '        Case Color.Yellow
+                '            sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 2,GETDATE()) AS DATE) AND  cast(DATEADD(DAY, 3,GETDATE()) AS DATE) ) ) "
+                '    End Select
+                'End If
+
+                '''sqlStr &= " AND (Grenzstelle ='???' OR  Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
+                ''' Funktioniert nciht, wg. WO
+
+
                sqlStr &= " ORDER BY case	 " &
-                                                 " when [Status] =3 then 0 " &
-                                                 " when [Status] =1 then 5 " &
-                                                 " else 1 " &
-                                         " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
+                                                     " when [Status] =3 then 0 " &
+                                                     " when [Status] =1 then 5 " &
+                                                     " else 1 " &
+                                             " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            End If

            'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END  as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
@@ -1167,7 +1218,13 @@ Public Class frmHauptfenster
            '   Dim bfont = New Font(gridMyAviso.Font.FontFamily, gridMyAviso.Font.Size, FontStyle.Bold)
            Dim nfont = New Font(gridMyAviso.Font.FontFamily, gridMyAviso.Font.Size, FontStyle.Regular)

+
+            'MsgBox(sqlStr)
+
+
            With gridMyAviso
+                If .Columns.Count = 0 Then pic.Visible = False : Exit Sub
+
                .DefaultCellStyle.Font = nfont

                .MultiSelect = False
@@ -1366,8 +1423,61 @@ Public Class frmHauptfenster
                    'End If


+
+
+                    'Farbkennung
+
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
+                        If Not cbx_My_LKW.Checked Then
+                            Select Case r.Cells("Status").Value
+                                Case "1", "2"
+                                ' Freigabe, N.Eingetr.
+                                Case "3"
+                                    ' Ankunft
+                                    r.DefaultCellStyle.BackColor = Color.IndianRed
+                                    r.Cells("DauerText").Style.ForeColor = Color.White
+                                Case Else
+                                    'Alle anderen Status:
+                                    If r.Cells("VoraussichtlichesEintreffen").Value IsNot DBNull.Value AndAlso IsDate(r.Cells("VoraussichtlichesEintreffen").Value) Then
+
+                                        Dim VoraussichtlichesEintreffen = CDate(r.Cells("VoraussichtlichesEintreffen").Value)
+
+                                        'If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute
+                                        '    r.DefaultCellStyle.BackColor = Color.IndianRed
+                                        'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'morgen
+                                        '    r.DefaultCellStyle.BackColor = Color.Orange
+                                        'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'Ümorgen+ÜÜmorgen
+                                        '    r.DefaultCellStyle.BackColor = Color.LightYellow
+                                        'End If
+
+                                        'If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'heute
+                                        '    r.DefaultCellStyle.BackColor = Color.Orange
+                                        'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'morgen
+                                        '    r.DefaultCellStyle.BackColor = Color.LightYellow
+                                        'End If
+
+                                        If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(getDateVorschreiben(1).ToShortDateString) Then 'heute
+                                            r.DefaultCellStyle.BackColor = Color.Orange
+                                        ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(getDateVorschreiben(3).ToShortDateString) Then 'morgen
+                                            r.DefaultCellStyle.BackColor = Color.LightYellow
+                                        End If
+
+                                    Else
+                                    End If
+                            End Select
+                        End If
+                    End If
+
+
                Next

+
+
+
+
+
+
+
                '.Width = gridAviso.Width - gridVermerke.Width
                '.Sort(.Columns(3), System.ComponentModel.ListSortDirection.Descending)
                .SelectionMode = DataGridViewSelectionMode.FullRowSelect
@@ -1376,6 +1486,7 @@ Public Class frmHauptfenster
            End With

        Catch ex As Exception
+            ' MsgBox(ex.Message)
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
        '   Grid_aktiv = True
@@ -1384,6 +1495,25 @@ Public Class frmHauptfenster



+    Function getDateVorschreiben(addDays) As Date
+        Dim FT As New VERAG_PROG_ALLGEMEIN.cFeiertage(Now.Year) 'Evtl Jahressprung, darum neu definieren
+
+        While FT.isFeiertag(Now.AddDays(addDays), VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND()) Or FT.isWeekend(Now.AddDays(addDays))
+            addDays += 1
+        End While
+        Return Now.AddDays(addDays)
+    End Function
+
+    Function getDaysVorschreiben(addDays) As Integer
+        Dim FT As New VERAG_PROG_ALLGEMEIN.cFeiertage(Now.Year) 'Evtl Jahressprung, darum neu definieren
+
+        While FT.isFeiertag(Now.AddDays(addDays), VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND()) Or FT.isWeekend(Now.AddDays(addDays))
+            addDays += 1
+        End While
+        Return addDays
+    End Function
+
+
    Private Sub dgvSendungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridMyAviso.CellClick
        Try
            If e.RowIndex > 0 Then
@@ -1537,7 +1667,7 @@ Public Class frmHauptfenster

                If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then
                    'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red
-                        gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
+                    gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
                End If
        End Select

@@ -1838,14 +1968,14 @@ Public Class frmHauptfenster
        If frmLogin.AnmeldungOK Then

            Try
-            If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
-                avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
-                UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
+                If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
+                    avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
+                    UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)

-            End If
-        Catch ex As Exception
+                End If
+            Catch ex As Exception

-        End Try
+            End Try

            If False Then 'NUR AKTUALISIEREN; WENN FENSTER AKTIV --> bei 2. Monitor PROBLEM
                Try
@@ -2182,32 +2312,32 @@ Public Class frmHauptfenster
                End If


-                    'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)

-                    '    Case "ATILLA"
-                    '        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
-                    '            Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu)
-                    '            If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
-                    '                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    '            Else
-                    '                If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
-                    '                    Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    '                End If
-                    '            End If
-                    '        End If
-                    '    Case Else
-                    '        Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails)
-                    '        If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
-                    '            Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    '        Else
-                    '            usrcntl.changeCurrentSndId()
-                    '            If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
-                    '                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    '            End If
-                    '        End If
-                    'End Select
+                '    Case "ATILLA"
+                '        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
+                '            Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu)
+                '            If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
+                '                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                '            Else
+                '                If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
+                '                    Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                '                End If
+                '            End If
+                '        End If
+                '    Case Else
+                '        Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails)
+                '        If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
+                '            Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                '        Else
+                '            usrcntl.changeCurrentSndId()
+                '            If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
+                '                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                '            End If
+                '        End If
+                'End Select

-                End If
+            End If
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
        End Try
@@ -2417,19 +2547,19 @@ Public Class frmHauptfenster
            End If

            btnWichtigeStandort.Visible = False
-                Panel2.Visible = False
-                Label4.Visible = False
-                cboGrenzstelle.Visible = False
-                BürgschaftenExcelToolStripMenuItem.Visible = True
-                ToolStripMenuItem4.Visible = True
-                ToolStripMenuItem5.Visible = True
-            ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
-                'btnGenerelleGestellungen.Visible = False
-                ToolStripMenuItem4.Visible = True
-                ToolStripMenuItem5.Visible = True
-                ToolStripMenuItem6.Visible = True
-            Else 'VERAG
-                BürgschaftenExcelToolStripMenuItem.Visible = True
+            Panel2.Visible = False
+            Label4.Visible = False
+            cboGrenzstelle.Visible = False
+            BürgschaftenExcelToolStripMenuItem.Visible = True
+            ToolStripMenuItem4.Visible = True
+            ToolStripMenuItem5.Visible = True
+        ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
+            'btnGenerelleGestellungen.Visible = False
+            ToolStripMenuItem4.Visible = True
+            ToolStripMenuItem5.Visible = True
+            ToolStripMenuItem6.Visible = True
+        Else 'VERAG
+            BürgschaftenExcelToolStripMenuItem.Visible = True
            ToolStripMenuItem4.Visible = True
            ToolStripMenuItem5.Visible = True
            ToolStripMenuItem6.Visible = True
@@ -2437,13 +2567,32 @@ Public Class frmHauptfenster
                Button5.Visible = True
            End If
        End If
-        If SplitContainer2.Width > 800 Then
-            'SplitContainer2.Panel2MinSize = 600
-            SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750
-            If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!!
-            '  If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900
+
+
+
+        'Wenn Teamzuweisung --> Backoffice --> Meine Senungen größer!
+        If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, 0) > 0 Then
+            splitMain.SplitterDistance = CInt(splitMain.Height / 2)
+        Else
+
+
        End If

+        'If SplitContainer2.Width > 800 Then
+        '    'SplitContainer2.Panel2MinSize = 600
+        '    SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750
+        '    If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!!
+        '    '  If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900
+        'End If
+
+        If SplitContainer2.Width > 1000 Then
+            SplitContainer2.SplitterDistance = 350 'SplitContainer2.Width - 750
+        Else
+            SplitContainer2.SplitterDistance = 160 'SplitContainer2.Width - 750
+        End If
+
+
+
        If My.Computer.Screen.WorkingArea.Width < 1300 Then
            'tabAnkunft.Text = "ANKUNFT."
            'tabErfasst.Text = "ERFASST"
@@ -2456,6 +2605,10 @@ Public Class frmHauptfenster
        End If
        tbcntrAviso.Width = Panel1.Width
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
+
+
+
+
    End Sub

    WithEvents timerStart As New Timer
@@ -2632,8 +2785,26 @@ Public Class frmHauptfenster

    End Function
    Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
+        Try


+            Dim MIC = New VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment
+            MIC.ImportShipmentMessage.ImportShipment.Shipment.company = "UK"
+            MIC.SaveToFile("C:\VeragTMP\Test2.xml")
+
+            'Dim MIC = VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment.LoadFromFile("C:\VeragTMP\Test.xml")
+            ''Dim MIC = VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment.LoadFromFile("C:\VeragTMP\MicCustImportShipment_Sample.xml")
+
+            'MsgBox(MIC.ImportShipmentMessage.ImportShipment.Shipment.company)
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+
+
+
+        Exit Sub
+

        Dim rpt As New rptTEST

@@ -3295,7 +3466,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub ATILLAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATILLAToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "ATILLA")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "ATILLA", "SUB", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3303,7 +3474,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub IMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IMEXToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "IMEX")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "IMEX", "SUB", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3311,13 +3482,13 @@ Public Class frmHauptfenster
    End Sub

    Private Sub VERAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERAG")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERAG", "SUB", True)) Then
            showMeNew()
        End If
    End Sub
    Sub showMeNew()
-        VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA()
-        VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER()
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA()
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER()
        closeOK = True

        For Each ft As Form In Application.OpenForms
@@ -3510,7 +3681,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED", "SUB", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3518,7 +3689,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR", "AMB", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3629,6 +3800,11 @@ Public Class frmHauptfenster
        cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked
        Label17.Visible = Not cbx_My_LKW.Checked

+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
+            btnColor.Visible = Not cbx_My_LKW.Checked
+        Else
+            btnColor.Visible = False
+        End If
        If cbx_My_LKW.Checked Then
            lblMeineAviso.Text = "Meine Aviso:"
        Else
@@ -3741,7 +3917,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub FRONTOFFICEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FRONTOFFICEToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "FRONTOFFICE")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "FRONTOFFICE", "SUB", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3749,7 +3925,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub VERIMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERIMEXToolStripMenuItem.Click
-        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERIMEX")) Then
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERIMEX", "", True)) Then
            showMeNew()
        Else
            MsgBox("Keine Berechtigung!")
@@ -3798,7 +3974,7 @@ Public Class frmHauptfenster
    End Sub

    Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click
-        CHMRC.VATTEST(InputBox("Token"))
+        cHMRC.VATTEST(InputBox("Token"))
    End Sub

    Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click
@@ -3854,25 +4030,25 @@ Public Class frmHauptfenster
    End Sub

    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragAGToolStripMenuItem.Click
-        Dim frm As New frmGesSichMenu
+        Dim frm As New frmGesamtsicherheitenMenuNEU
        frm.Standort = "VERAG AG"
        frm.Show()
    End Sub

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

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

    Private Sub ATGesamtsicherheitVeragCSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragCSToolStripMenuItem.Click
-        Dim frm As New frmGesSichMenu
+        Dim frm As New frmGesamtsicherheitenMenuNEU
        frm.Standort = "Verag CS"
        frm.Show()
    End Sub
@@ -3992,6 +4168,60 @@ Public Class frmHauptfenster
    Private Sub GüterlisteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GüterlisteToolStripMenuItem.Click
        Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Gueterlisten/gueterlisten_node.html")
    End Sub
+
+    Private Sub RoutenverwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RoutenverwaltungToolStripMenuItem.Click
+        gridAviso.ClearSelection()
+        gridMyAviso.ClearSelection()
+        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 1
+        Dim f As New frmNCTSRouten()
+        f.ShowDialog(Me)
+    End Sub
+
+    Private Sub DTBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DTBToolStripMenuItem.Click
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = sender.text
+            VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = sender.text 'Nochmal, sonst wird es durch MA geändert 
+            showMeNew()
+        Else
+            MsgBox("Keine Berechtigung!")
+        End If
+    End Sub
+
+    Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnColor.Click
+        ctxtFarben.Show(Cursor.Position)
+
+    End Sub
+
+    Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click
+        btnColor.BackColor = Color.Red
+        meineAviso_anzeigen()
+    End Sub
+
+    Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click
+        btnColor.BackColor = Color.Orange
+        meineAviso_anzeigen()
+    End Sub
+
+    Private Sub ToolStripMenuItem21_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem21.Click
+        btnColor.BackColor = Color.Yellow
+        meineAviso_anzeigen()
+    End Sub
+
+
+    Private Sub ALLEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ALLEToolStripMenuItem.Click
+        btnColor.BackColor = Color.White
+        meineAviso_anzeigen()
+    End Sub
+
+    Private Sub StandarddruckerWechselnToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StandarddruckerWechselnToolStripMenuItem.Click
+        Dim f As New frmWechselStandarddrucker()
+        f.ShowDialog(Me)
+    End Sub
+
+    Private Sub EssensbestellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EssensbestellungenToolStripMenuItem.Click
+        Dim f As New frmEssensbestellungen()
+        f.ShowDialog(Me)
+    End Sub
 End Class

 Public Class AvisoStatusFunctions
@@ -4407,64 +4637,64 @@ Public Class AvisoStatusFunctions


            If GrenzstelleMail = "" And art <> 5 Then
-                    '----------------------------------------
-                    Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL!
-                    'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+                '----------------------------------------
+                Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL!
+                'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+            End If
+
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO"
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI"
+
+            If GrenzstelleMail <> "" Then
+                Dim Standort As New cStandort
+
+                Standort = Standorte.LesenStandort(0, GrenzstelleMail, "")
+
+                If Not IsNothing(Standort) Then
+                    Select Case art
+                        Case 1, 3
+                            If Standort.eMail_Ankunft_Betreff <> "" Then
+                                hBetreff = Standort.eMail_Ankunft_Betreff
+                                hBody = Standort.eMail_Ankunft_Text
+                            End If
+                        Case 2, 4
+                            If Standort.eMail_Freigabe_Betreff <> "" Then
+                                hBetreff = Standort.eMail_Freigabe_Betreff
+                                hBody = Standort.eMail_Freigabe_Text
+                            End If
+                        Case 5
+                            If Standort.eMail_Status_Betreff <> "" Then
+                                hBetreff = Standort.eMail_Status_Betreff
+                                hBody = Standort.eMail_Status_Text
+                            End If
+                    End Select
                End If

-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO"
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI"
+            End If

-                If GrenzstelleMail <> "" Then
-                    Dim Standort As New cStandort
-
-                    Standort = Standorte.LesenStandort(0, GrenzstelleMail, "")
-
-                    If Not IsNothing(Standort) Then
-                        Select Case art
-                            Case 1, 3
-                                If Standort.eMail_Ankunft_Betreff <> "" Then
-                                    hBetreff = Standort.eMail_Ankunft_Betreff
-                                    hBody = Standort.eMail_Ankunft_Text
-                                End If
-                            Case 2, 4
-                                If Standort.eMail_Freigabe_Betreff <> "" Then
-                                    hBetreff = Standort.eMail_Freigabe_Betreff
-                                    hBody = Standort.eMail_Freigabe_Text
-                                End If
-                            Case 5
-                                If Standort.eMail_Status_Betreff <> "" Then
-                                    hBetreff = Standort.eMail_Status_Betreff
-                                    hBody = Standort.eMail_Status_Text
-                                End If
-                        End Select
-                    End If
-
-                End If
-
-                Dim anhaenge As New List(Of String)
-                hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird.
-                hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge)
+            Dim anhaenge As New List(Of String)
+            hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird.
+            hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge)


-                hBody = hBody.Replace("%0", "<br>")
+            hBody = hBody.Replace("%0", "<br>")

-                hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht!
+            hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht!

-                'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX"
-                '    Case "VERAG"
-                '    Case "UNISPED"
-                '        hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz
-                'End Select
+            'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX"
+            '    Case "VERAG"
+            '    Case "UNISPED"
+            '        hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz
+            'End Select

-                Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId)
+            Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId)

-                API.api_EMail = EMails
-                API.api_EMailCC = EMails_CC
-                API.api_EMailBCC = EMails_BCC
-                API.api_EMailSubject = hBetreff
-                API.api_EMailText = hBody
-                API.api_EMailAttCnt = anhaenge.Count
+            API.api_EMail = EMails
+            API.api_EMailCC = EMails_CC
+            API.api_EMailBCC = EMails_BCC
+            API.api_EMailSubject = hBetreff
+            API.api_EMailText = hBody
+            API.api_EMailAttCnt = anhaenge.Count


            If ForceMail <> "" Then
@@ -4500,25 +4730,25 @@ Public Class AvisoStatusFunctions
                    AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)")

                Else
-                        API.UPDTAE_ERR()
-                        AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
-                    End If
+                    API.UPDTAE_ERR()
+                    AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
                End If
-
-                'OLD ----------------------------------
-                If False Then
-                    Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff
-                    If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC
-                    If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC
-                    If hBody <> "" Then hMail += "&Body=" & hBody
-                    Try
-                        System.Diagnostics.Process.Start(hMail)
-                    Catch ex As Exception
-                        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten")
-                    End Try
-                End If
-                ' ----------------------------------
            End If
+
+            'OLD ----------------------------------
+            If False Then
+                Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff
+                If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC
+                If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC
+                If hBody <> "" Then hMail += "&Body=" & hBody
+                Try
+                    System.Diagnostics.Process.Start(hMail)
+                Catch ex As Exception
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten")
+                End Try
+            End If
+            ' ----------------------------------
+        End If
    End Sub


@@ -5186,6 +5416,7 @@ Public Class AvisoStatusFunctions

            SendFreigabeEmail(Aviso)

+            VERAG_PROG_ALLGEMEIN.cMessenger.SET_LKWCHAT_INAKTIV(Aviso.AvisoID)

            If True Then

@@ -5622,20 +5853,26 @@ Public Class AvisoStatusFunctions

        SENDUNG_TMP.saveSachbearbeiter = True

-        If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then
+        If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then ' VB gesetzt!
            SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            SENDUNG_TMP.tblSnd_FilialeAbklaerung = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
            '    SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            'End If

+
+            'Lt. Bespr. ML und TW (6.10.22) --> wenn VBQS gesetzt, soll MA leer sein:
+            SENDUNG_TMP.LetzterMitarbeiter = ""
+            SENDUNG_TMP.LetzterMitarbeiterId = -1
+
+
            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERIMEX" Then
                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            End If
            SENDUNG_TMP.tblSnd_Vorbereitet = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-                AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
-            Else
-                SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
+            AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+        Else
+            SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()
@@ -5787,7 +6024,9 @@ Public Class AvisoStatusFunctions
            End If
        Else
            If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle.ToString <> "" Then
-                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                '                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
+                hGrenzstelle = VERAGSQL.getValueTxtBySql("SELECT  [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND  ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))  order by left(Code,2), Description ", "FMZOLL")
+
            End If
        End If

@@ -5883,10 +6122,10 @@ Public Class AvisoStatusFunctions

                                Dim AtcMrn = ""
                                Dim DsId = ""
-                        Dim DsId2 = ""
-                        Dim frist = ""
-                        Dim gestellungsadresse = "<td><td/>"
-                        Dim found = False
+                                Dim DsId2 = ""
+                                Dim frist = ""
+                                Dim gestellungsadresse = "<td><td/>"
+                                Dim found = False
                                Select Case s.tblSnd_Abfertigungsart_ID
                                    Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand 
                                        gestellungsadresse = "<td>" & s.getNCTSAdress(True, True, False) & "</td>"
@@ -5953,10 +6192,10 @@ Public Class AvisoStatusFunctions
                                            End If
                                        End If
                                    Case Else
-                                getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2)
-                                If s.tblSnd_Abfertigungsart_ID = 23 Then
-                                    s.LOAD_HANDLING()
-                                    For Each hd In s.HANDLING
+                                        getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2)
+                                        If s.tblSnd_Abfertigungsart_ID = 23 Then
+                                            s.LOAD_HANDLING()
+                                            For Each hd In s.HANDLING
                                                AtcMrn &= hd.sndhdg_nr & ", "
                                            Next
                                            If AtcMrn.EndsWith(", ") Then AtcMrn = AtcMrn.Substring(0, AtcMrn.Length - 2)
@@ -6255,7 +6494,7 @@ Public Class AvisoStatusFunctions
        myVermerk.VermerkCodeId = VermerkCodeId
        Dim VermerkeDAL As New cVermerkeDAL
        VermerkeDAL.SpeichernVermerk(myVermerk)
-        frmHauptfenster.Details_anzeigen(AvisoID)
+        If frmHauptfenster IsNot Nothing Then frmHauptfenster.Details_anzeigen(AvisoID)

    End Sub

--- a/Aviso/frmLaufzettel.vb
+++ b/Aviso/frmLaufzettel.vb
@@ -163,12 +163,21 @@ Public Class frmLaufzettel
            btnLaufzettelDrucken.Enabled = True
        End If

+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+            Case "WAI", "DTB"
+                CheckBox2.Checked = True
+                CheckBox3.Visible = False
+                CheckBox4.Checked = True
+        End Select
+
+
        'pnlZumZoll
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" Then
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "DTB" Then
            CheckBox2.Checked = False ' Wenn nicht FO, dann normal nicht gewählt...
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "SUB" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" Then '... und nur in SUBEN ersichtlich
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "SUB" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "DTB" Then '... und nur in SUBEN ersichtlich
                pnlZumZoll.Visible = False
            End If
+
        End If

        If SENDUNG_LIST Is Nothing Then
@@ -249,27 +258,36 @@ Public Class frmLaufzettel


        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then
-                Try
-                    Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_WAI(AVISO)
+            Try
+                Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_WAI(AVISO)
                If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
                ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
            Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
-            Else
-                If Not CheckBox3.Checked And Not CheckBox4.Checked Then
-                    MsgBox("Bitte 'AT ZOLL' oder 'DE ZOLL' auswählen!")
-                    Exit Sub
-                End If
+        ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "DTB" Then
+            Try
+                Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_DTB(AVISO)
+                If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
+                ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
+            Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
+        Else

-                Try
-                    'If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO, If(CheckBox3.Checked, "AT", If(CheckBox4.Checked, "DE", "")))
-                    Dim path = ""
-                    If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_AT(AVISO)
-                    If CheckBox4.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_DE(AVISO)
+            If Not CheckBox3.Checked And Not CheckBox4.Checked Then
+                MsgBox("Bitte 'AT ZOLL' oder 'DE ZOLL' auswählen!")
+                Exit Sub
+            End If
+
+            Try
+                'If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO, If(CheckBox3.Checked, "AT", If(CheckBox4.Checked, "DE", "")))
+                Dim path = ""
+                If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_AT(AVISO)
+                If CheckBox4.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_DE(AVISO)

                If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
                'If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName)
            Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
-            End If
+        End If
+
+



--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -4,6 +4,7 @@ Imports VERAG_PROG_ALLGEMEIN

 Imports System.Reflection
 Imports System.DirectoryServices
+Imports Therefore.API

 Public Class frmLogin

@@ -20,8 +21,8 @@ Public Class frmLogin
        Icon = cMeineFunktionenAVISO.GetProgrammIcon
    End Sub

-    'Dim TESTSYSTEM As Boolean = False !aus Sicherheitsgünden!
-    Dim TESTSYSTEM As Boolean = True
+    Dim TESTSYSTEM As Boolean = False
+
    Private Sub frmLogin_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
        If e.Modifiers = Keys.Control And e.KeyCode = Keys.T Then
            TESTSYSTEM = Not TESTSYSTEM
@@ -271,8 +272,6 @@ Public Class frmLogin

    End Sub
    Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
-
-
        VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False

        'Auf WARENORT UMSTELLEN
@@ -486,6 +485,11 @@ Public Class frmLogin
            '  If MsgBox("AUTO-LOGIN?", vbYesNoCancel) = vbYes Then btnOK.PerformClick()
        End If

+        If Environment.MachineName = "H6CCWP3" Then
+            txtSachbear.Text = "daniel"
+            txtKennwort.Text = "debug"
+        End If
+

        ' Spire.License.LicenseProvider.SetLicenseKey("PFIX3V0pG5DaAQCBLK1gLRCjwhu+wX1JsEcX0hyXZty9sbe8Zm5XIrWr214umg/g22Jy0+5BJQ6QgRhLl0eUqVMyCAHswvrA+jVz8s20VTNEOTWhzwpLBqoRG6IFh3EGNawUS7a+fW5OVPLApUd3Y+IcKYZihow7+5lKPN6+seKWy5uFjwRFNSBOTAjUGsfEw9sukXvtcnLh2Vo5ttKbPSLb1EeCdgaNd8nWa+RKQk0Rlg4R/7M9BBTURZXCVAoA4kfbNyPnksggPvYPbpVqPqtT9LbjycBLSB/Uwf16fZlVDuDrCJCij2ZI3ebSwM1sumBtXj4WhXk+Mwxj7acdb9saqmOsmyAcd11MZ2NfRAhv2L8S7RLSGr4OYR9/9Fnk9aN9q7T8D51jUfJgV82ZIZMvCpI2RTtsRaOyMandpfpFE96k1kjlVRuWm8JGKUHZV0bETyaBTqpiwn4ShoqdlYlyvIjfjWX/TbWCuy2uSugCC9BLW0P0ND/G2z2kbHQCEiQCRn92TrlvTpQg9veACDn1Lb3savBYyW3VQMuHgybLpq3x9LIV5nrTli87kzqvTuZmUZanhgx0M4BFi2CsWlf28yRpQo2l1HDLjScgzxvXOk3/N9wOlS2gbfeN74iHU0vb1heHfa5ahmRwtgg7C6iYu0WD1u5p/hO3Ja5tkNBxicJO5TJXq3W5U65lCsQDOQbiZCeTJzjYP0SGypIo701hqqVG9hW/Sd2siqb4w/W1H9xKTxDCL+EwCHduLZuNze1gyyxKR5nGCsIhaXBaRCaQ8Z1OHlU25h+yeHwFF1yMKzdbX6VKG+5GjZ3yvSjwqGgFfDPLVr2QxJpLqpAwcdmG7w6xwVoOP81C8Sv60U2UaDLw7I0U1GfMhkqOr0tRtFQRa2iDgPnrZWhiNPPjDYtPyHt5ZwdIoAKaNRpI1f+u6rDJRmyAr4jizBRxHIlsSM86MXRbEvBLkDEyDQPLC3ntaPi5kRn7vObrlDGR7aZEKy+8PkU8qrVw7wgqxQtbc+isO8x6yoe/yTydhFiY1HlUbjPlAM9s+SSV4D2L9oHmYCtO1wdo3Gl0Dj6Mp3hioi9Cyd4+bp/A28ukhQXjtNUhUhNgzcyfP/Fg1at6lj0NPYWvOibJr0I/Fi38AeBM+kXNnuMblXnlawtTjnjGvi/fA9tHz6EI44ChhIrd8a3Kjx2bGcFlVENXe3YDu1W5ZbDOcoERW8qxZLBKqYIMiwQ61ZAq69PXKSZZk+1mi8oyCNS9xpBZndWLKTKG6XqM1FkZew1bTD4GLZRdC4x72iqSmVIu3ZU8rSk7rxGQUNWKIi7gIJhXEnmeWt322KDCxBWDZcrxKKGc8ZIDRL3EmW13/7ow4WowlCUW+lvhlkbwsXDPwqtO+IQJ3UisJFnF2jnFqaLoKELNJx6hfg2iyYR2+gJgiKWLKOzS56Id7o3iY4ou1TZauqSK9A836t36UxXtjYWSk9aoDDhZwlqRbwXok9pds5dC")

--- a/Aviso/frmNCTSRouten.Designer.vb
+++ b/Aviso/frmNCTSRouten.Designer.vb
@@ -0,0 +1,472 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmNCTSRouten
+    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()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.btn_Cancel = New System.Windows.Forms.Button()
+        Me.btnNeu = New System.Windows.Forms.Button()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.pnlNCTSRouten = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.txtVonRegion = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.lblWarningTransportmittel = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.cbxTransportmittel = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtNach = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxVon = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.sbxNach = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.lblWarningRoute = New System.Windows.Forms.Label()
+        Me.lblWarningAZS = New System.Windows.Forms.Label()
+        Me.lblWarningDauer = New System.Windows.Forms.Label()
+        Me.lblWarningBST = New System.Windows.Forms.Label()
+        Me.sbxVon = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cbxNach = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtDauer = New System.Windows.Forms.TextBox()
+        Me.cbxRoutenart = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.dgvNCTSRouten = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.pnlNCTSRouten.SuspendLayout()
+        CType(Me.dgvNCTSRouten, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'btnOK
+        '
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(478, 468)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(75, 23)
+        Me.btnOK.TabIndex = 1
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'btn_Cancel
+        '
+        Me.btn_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btn_Cancel.Location = New System.Drawing.Point(12, 477)
+        Me.btn_Cancel.Name = "btn_Cancel"
+        Me.btn_Cancel.Size = New System.Drawing.Size(75, 23)
+        Me.btn_Cancel.TabIndex = 2
+        Me.btn_Cancel.Text = "Abbrechen"
+        Me.btn_Cancel.UseVisualStyleBackColor = True
+        '
+        'btnNeu
+        '
+        Me.btnNeu.Image = Global.AVISO.My.Resources.Resources.plus
+        Me.btnNeu.Location = New System.Drawing.Point(509, 170)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(44, 31)
+        Me.btnNeu.TabIndex = 29
+        Me.btnNeu.UseVisualStyleBackColor = True
+        '
+        'btnSave
+        '
+        Me.btnSave.Location = New System.Drawing.Point(478, 468)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 31
+        Me.btnSave.Text = "Speichern"
+        Me.btnSave.UseVisualStyleBackColor = True
+        Me.btnSave.Visible = False
+        '
+        'pnlNCTSRouten
+        '
+        Me.pnlNCTSRouten.Controls.Add(Me.txtVonRegion)
+        Me.pnlNCTSRouten.Controls.Add(Me.lblWarningTransportmittel)
+        Me.pnlNCTSRouten.Controls.Add(Me.Label5)
+        Me.pnlNCTSRouten.Controls.Add(Me.cbxTransportmittel)
+        Me.pnlNCTSRouten.Controls.Add(Me.txtNach)
+        Me.pnlNCTSRouten.Controls.Add(Me.txtVon)
+        Me.pnlNCTSRouten.Controls.Add(Me.cbxVon)
+        Me.pnlNCTSRouten.Controls.Add(Me.sbxNach)
+        Me.pnlNCTSRouten.Controls.Add(Me.lblWarningRoute)
+        Me.pnlNCTSRouten.Controls.Add(Me.lblWarningAZS)
+        Me.pnlNCTSRouten.Controls.Add(Me.lblWarningDauer)
+        Me.pnlNCTSRouten.Controls.Add(Me.lblWarningBST)
+        Me.pnlNCTSRouten.Controls.Add(Me.sbxVon)
+        Me.pnlNCTSRouten.Controls.Add(Me.Label2)
+        Me.pnlNCTSRouten.Controls.Add(Me.Label1)
+        Me.pnlNCTSRouten.Controls.Add(Me.Label3)
+        Me.pnlNCTSRouten.Controls.Add(Me.Label4)
+        Me.pnlNCTSRouten.Controls.Add(Me.cbxNach)
+        Me.pnlNCTSRouten.Controls.Add(Me.txtDauer)
+        Me.pnlNCTSRouten.Controls.Add(Me.cbxRoutenart)
+        Me.pnlNCTSRouten.Location = New System.Drawing.Point(12, 4)
+        Me.pnlNCTSRouten.Name = "pnlNCTSRouten"
+        Me.pnlNCTSRouten.Size = New System.Drawing.Size(491, 197)
+        Me.pnlNCTSRouten.TabIndex = 30
+        '
+        'txtVonRegion
+        '
+        Me.txtVonRegion._DateTimeOnly = False
+        Me.txtVonRegion._numbersOnly = False
+        Me.txtVonRegion._numbersOnlyKommastellen = ""
+        Me.txtVonRegion._numbersOnlyTrennzeichen = True
+        Me.txtVonRegion._Prozent = False
+        Me.txtVonRegion._ShortDateNew = False
+        Me.txtVonRegion._ShortDateOnly = False
+        Me.txtVonRegion._TimeOnly = False
+        Me.txtVonRegion._TimeOnly_Seconds = False
+        Me.txtVonRegion._value = ""
+        Me.txtVonRegion._Waehrung = False
+        Me.txtVonRegion._WaehrungZeichen = True
+        Me.txtVonRegion.Enabled = False
+        Me.txtVonRegion.ForeColor = System.Drawing.Color.Black
+        Me.txtVonRegion.Location = New System.Drawing.Point(104, 91)
+        Me.txtVonRegion.MaxLineLength = -1
+        Me.txtVonRegion.MaxLines_Warning = ""
+        Me.txtVonRegion.MaxLines_Warning_Label = Nothing
+        Me.txtVonRegion.Name = "txtVonRegion"
+        Me.txtVonRegion.ReadOnly = True
+        Me.txtVonRegion.Size = New System.Drawing.Size(67, 20)
+        Me.txtVonRegion.TabIndex = 43
+        '
+        'lblWarningTransportmittel
+        '
+        Me.lblWarningTransportmittel.AutoSize = True
+        Me.lblWarningTransportmittel.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningTransportmittel.Location = New System.Drawing.Point(356, 156)
+        Me.lblWarningTransportmittel.Name = "lblWarningTransportmittel"
+        Me.lblWarningTransportmittel.Size = New System.Drawing.Size(105, 13)
+        Me.lblWarningTransportmittel.TabIndex = 42
+        Me.lblWarningTransportmittel.Text = "Bitte Route angeben"
+        Me.lblWarningTransportmittel.Visible = False
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(356, 116)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(79, 13)
+        Me.Label5.TabIndex = 41
+        Me.Label5.Text = "Transportmittel:"
+        '
+        'cbxTransportmittel
+        '
+        Me.cbxTransportmittel._allowedValuesFreiText = Nothing
+        Me.cbxTransportmittel._allowFreiText = False
+        Me.cbxTransportmittel._value = ""
+        Me.cbxTransportmittel.Enabled = False
+        Me.cbxTransportmittel.FormattingEnabled = True
+        Me.cbxTransportmittel.Location = New System.Drawing.Point(356, 132)
+        Me.cbxTransportmittel.Name = "cbxTransportmittel"
+        Me.cbxTransportmittel.Size = New System.Drawing.Size(121, 21)
+        Me.cbxTransportmittel.TabIndex = 40
+        '
+        'txtNach
+        '
+        Me.txtNach._DateTimeOnly = False
+        Me.txtNach._numbersOnly = False
+        Me.txtNach._numbersOnlyKommastellen = ""
+        Me.txtNach._numbersOnlyTrennzeichen = True
+        Me.txtNach._Prozent = False
+        Me.txtNach._ShortDateNew = False
+        Me.txtNach._ShortDateOnly = False
+        Me.txtNach._TimeOnly = False
+        Me.txtNach._TimeOnly_Seconds = False
+        Me.txtNach._value = ""
+        Me.txtNach._Waehrung = False
+        Me.txtNach._WaehrungZeichen = True
+        Me.txtNach.Enabled = False
+        Me.txtNach.ForeColor = System.Drawing.Color.Black
+        Me.txtNach.Location = New System.Drawing.Point(220, 91)
+        Me.txtNach.MaxLineLength = -1
+        Me.txtNach.MaxLines_Warning = ""
+        Me.txtNach.MaxLines_Warning_Label = Nothing
+        Me.txtNach.Name = "txtNach"
+        Me.txtNach.ReadOnly = True
+        Me.txtNach.Size = New System.Drawing.Size(100, 20)
+        Me.txtNach.TabIndex = 39
+        '
+        'txtVon
+        '
+        Me.txtVon._DateTimeOnly = False
+        Me.txtVon._numbersOnly = False
+        Me.txtVon._numbersOnlyKommastellen = ""
+        Me.txtVon._numbersOnlyTrennzeichen = True
+        Me.txtVon._Prozent = False
+        Me.txtVon._ShortDateNew = False
+        Me.txtVon._ShortDateOnly = False
+        Me.txtVon._TimeOnly = False
+        Me.txtVon._TimeOnly_Seconds = False
+        Me.txtVon._value = ""
+        Me.txtVon._Waehrung = False
+        Me.txtVon._WaehrungZeichen = True
+        Me.txtVon.Enabled = False
+        Me.txtVon.ForeColor = System.Drawing.Color.Black
+        Me.txtVon.Location = New System.Drawing.Point(10, 91)
+        Me.txtVon.MaxLineLength = -1
+        Me.txtVon.MaxLines_Warning = ""
+        Me.txtVon.MaxLines_Warning_Label = Nothing
+        Me.txtVon.Name = "txtVon"
+        Me.txtVon.ReadOnly = True
+        Me.txtVon.Size = New System.Drawing.Size(88, 20)
+        Me.txtVon.TabIndex = 38
+        '
+        'cbxVon
+        '
+        Me.cbxVon._allowedValuesFreiText = New String() {"Test"}
+        Me.cbxVon._allowFreiText = False
+        Me.cbxVon._value = ""
+        Me.cbxVon.Enabled = False
+        Me.cbxVon.FormattingEnabled = True
+        Me.cbxVon.Location = New System.Drawing.Point(10, 25)
+        Me.cbxVon.Name = "cbxVon"
+        Me.cbxVon.Size = New System.Drawing.Size(121, 21)
+        Me.cbxVon.TabIndex = 37
+        '
+        'sbxNach
+        '
+        Me.sbxNach._allowFreitext = True
+        Me.sbxNach._AllowSetValue = False
+        Me.sbxNach._allowSpaceAsSplitter = False
+        Me.sbxNach._autoSizeGross = False
+        Me.sbxNach._hideIfListEmpty = True
+        Me.sbxNach._value = Nothing
+        Me.sbxNach.conn_art = "FMZOLL"
+        Me.sbxNach.dgvpos = "LEFT"
+        Me.sbxNach.DISPLAY_PARAM = Nothing
+        Me.sbxNach.Enabled = False
+        Me.sbxNach.INVISIBLE_COLUMNS = Nothing
+        Me.sbxNach.key_visible = False
+        Me.sbxNach.KEYPARAM = Nothing
+        Me.sbxNach.Location = New System.Drawing.Point(221, 65)
+        Me.sbxNach.Name = "sbxNach"
+        Me.sbxNach.searchActive = True
+        Me.sbxNach.Size = New System.Drawing.Size(161, 20)
+        Me.sbxNach.SQL_ORDER_BY = Nothing
+        Me.sbxNach.SQL_SELECT = Nothing
+        Me.sbxNach.SQL_WHERE = Nothing
+        Me.sbxNach.SQL_WhereParamList = Nothing
+        Me.sbxNach.TabIndex = 36
+        Me.sbxNach.usrcntl = Nothing
+        Me.sbxNach.Visible = False
+        '
+        'lblWarningRoute
+        '
+        Me.lblWarningRoute.AutoSize = True
+        Me.lblWarningRoute.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningRoute.Location = New System.Drawing.Point(10, 156)
+        Me.lblWarningRoute.Name = "lblWarningRoute"
+        Me.lblWarningRoute.Size = New System.Drawing.Size(105, 13)
+        Me.lblWarningRoute.TabIndex = 35
+        Me.lblWarningRoute.Text = "Bitte Route angeben"
+        Me.lblWarningRoute.Visible = False
+        '
+        'lblWarningAZS
+        '
+        Me.lblWarningAZS.AutoSize = True
+        Me.lblWarningAZS.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningAZS.Location = New System.Drawing.Point(10, 49)
+        Me.lblWarningAZS.Name = "lblWarningAZS"
+        Me.lblWarningAZS.Size = New System.Drawing.Size(135, 13)
+        Me.lblWarningAZS.TabIndex = 34
+        Me.lblWarningAZS.Text = "Bitte Abgangs-ZS angeben"
+        Me.lblWarningAZS.Visible = False
+        '
+        'lblWarningDauer
+        '
+        Me.lblWarningDauer.AutoSize = True
+        Me.lblWarningDauer.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningDauer.Location = New System.Drawing.Point(218, 156)
+        Me.lblWarningDauer.Name = "lblWarningDauer"
+        Me.lblWarningDauer.Size = New System.Drawing.Size(90, 13)
+        Me.lblWarningDauer.TabIndex = 33
+        Me.lblWarningDauer.Text = "Dauer nicht gültig"
+        Me.lblWarningDauer.Visible = False
+        '
+        'lblWarningBST
+        '
+        Me.lblWarningBST.AutoSize = True
+        Me.lblWarningBST.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningBST.Location = New System.Drawing.Point(217, 49)
+        Me.lblWarningBST.Name = "lblWarningBST"
+        Me.lblWarningBST.Size = New System.Drawing.Size(155, 13)
+        Me.lblWarningBST.TabIndex = 32
+        Me.lblWarningBST.Text = "Bitte Bestimmungs-ZS angeben"
+        Me.lblWarningBST.Visible = False
+        '
+        'sbxVon
+        '
+        Me.sbxVon._allowFreitext = True
+        Me.sbxVon._AllowSetValue = False
+        Me.sbxVon._allowSpaceAsSplitter = False
+        Me.sbxVon._autoSizeGross = False
+        Me.sbxVon._hideIfListEmpty = True
+        Me.sbxVon._value = Nothing
+        Me.sbxVon.conn_art = "FMZOLL"
+        Me.sbxVon.dgvpos = "LEFT"
+        Me.sbxVon.DISPLAY_PARAM = Nothing
+        Me.sbxVon.Enabled = False
+        Me.sbxVon.INVISIBLE_COLUMNS = Nothing
+        Me.sbxVon.key_visible = False
+        Me.sbxVon.KEYPARAM = Nothing
+        Me.sbxVon.Location = New System.Drawing.Point(10, 65)
+        Me.sbxVon.Name = "sbxVon"
+        Me.sbxVon.searchActive = True
+        Me.sbxVon.Size = New System.Drawing.Size(161, 20)
+        Me.sbxVon.SQL_ORDER_BY = Nothing
+        Me.sbxVon.SQL_SELECT = Nothing
+        Me.sbxVon.SQL_WHERE = Nothing
+        Me.sbxVon.SQL_WhereParamList = Nothing
+        Me.sbxVon.TabIndex = 30
+        Me.sbxVon.usrcntl = Nothing
+        Me.sbxVon.Visible = False
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(217, 10)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(111, 13)
+        Me.Label2.TabIndex = 3
+        Me.Label2.Text = "Bestimmungszollstelle:"
+        Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(7, 10)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(91, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Abgangszollstelle:"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(10, 116)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(39, 13)
+        Me.Label3.TabIndex = 4
+        Me.Label3.Text = "Route:"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(217, 117)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(90, 13)
+        Me.Label4.TabIndex = 5
+        Me.Label4.Text = "Dauer (in Tagen):"
+        '
+        'cbxNach
+        '
+        Me.cbxNach._allowedValuesFreiText = New String() {"Test"}
+        Me.cbxNach._allowFreiText = False
+        Me.cbxNach._value = ""
+        Me.cbxNach.Enabled = False
+        Me.cbxNach.FormattingEnabled = True
+        Me.cbxNach.Location = New System.Drawing.Point(221, 26)
+        Me.cbxNach.Name = "cbxNach"
+        Me.cbxNach.Size = New System.Drawing.Size(121, 21)
+        Me.cbxNach.TabIndex = 2
+        '
+        'txtDauer
+        '
+        Me.txtDauer.Enabled = False
+        Me.txtDauer.Location = New System.Drawing.Point(220, 133)
+        Me.txtDauer.Name = "txtDauer"
+        Me.txtDauer.Size = New System.Drawing.Size(100, 20)
+        Me.txtDauer.TabIndex = 4
+        '
+        'cbxRoutenart
+        '
+        Me.cbxRoutenart._allowedValuesFreiText = Nothing
+        Me.cbxRoutenart._allowFreiText = False
+        Me.cbxRoutenart._value = ""
+        Me.cbxRoutenart.Enabled = False
+        Me.cbxRoutenart.FormattingEnabled = True
+        Me.cbxRoutenart.Location = New System.Drawing.Point(10, 132)
+        Me.cbxRoutenart.Name = "cbxRoutenart"
+        Me.cbxRoutenart.Size = New System.Drawing.Size(121, 21)
+        Me.cbxRoutenart.TabIndex = 3
+        '
+        'dgvNCTSRouten
+        '
+        Me.dgvNCTSRouten.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvNCTSRouten.AllowUserToAddRows = False
+        Me.dgvNCTSRouten.AllowUserToDeleteRows = False
+        Me.dgvNCTSRouten.AllowUserToResizeColumns = False
+        Me.dgvNCTSRouten.AllowUserToResizeRows = False
+        Me.dgvNCTSRouten.BackgroundColor = System.Drawing.Color.White
+        Me.dgvNCTSRouten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvNCTSRouten.Location = New System.Drawing.Point(12, 217)
+        Me.dgvNCTSRouten.MultiSelect = False
+        Me.dgvNCTSRouten.Name = "dgvNCTSRouten"
+        Me.dgvNCTSRouten.ReadOnly = True
+        Me.dgvNCTSRouten.RowHeadersVisible = False
+        Me.dgvNCTSRouten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvNCTSRouten.Size = New System.Drawing.Size(541, 243)
+        Me.dgvNCTSRouten.TabIndex = 10
+        '
+        'frmNCTSRouten
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(565, 503)
+        Me.Controls.Add(Me.btnSave)
+        Me.Controls.Add(Me.pnlNCTSRouten)
+        Me.Controls.Add(Me.dgvNCTSRouten)
+        Me.Controls.Add(Me.btn_Cancel)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.btnNeu)
+        Me.Name = "frmNCTSRouten"
+        Me.Text = "frmNCTSRouten"
+        Me.pnlNCTSRouten.ResumeLayout(False)
+        Me.pnlNCTSRouten.PerformLayout()
+        CType(Me.dgvNCTSRouten, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents Label1 As Label
+    Friend WithEvents btnOK As Button
+    Friend WithEvents btn_Cancel As Button
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents txtDauer As TextBox
+    Friend WithEvents cbxRoutenart As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxNach As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents dgvNCTSRouten As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents btnNeu As Button
+    Friend WithEvents pnlNCTSRouten As VERAG_PROG_ALLGEMEIN.MyPanel
+    Friend WithEvents sbxVon As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents lblWarningRoute As Label
+    Friend WithEvents lblWarningAZS As Label
+    Friend WithEvents lblWarningDauer As Label
+    Friend WithEvents lblWarningBST As Label
+    Friend WithEvents btnSave As Button
+    Friend WithEvents sbxNach As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents cbxVon As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents txtNach As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtVon As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label5 As Label
+    Friend WithEvents cbxTransportmittel As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblWarningTransportmittel As Label
+    Friend WithEvents txtVonRegion As VERAG_PROG_ALLGEMEIN.MyTextBox
+End Class
--- a/Aviso/frmNCTSRouten.resx
+++ b/Aviso/frmNCTSRouten.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Aviso/frmNCTSRouten.vb
+++ b/Aviso/frmNCTSRouten.vb
@@ -0,0 +1,340 @@
+
+Imports System.Security.Authentication.ExtendedProtection
+Imports DocumentFormat.OpenXml.Drawing
+Imports GrapeCity.ActiveReports.Document.Section
+Imports VERAG_PROG_ALLGEMEIN
+
+
+Public Class frmNCTSRouten
+
+    Dim routenId As Integer = -1
+    Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim currentRoute As New VERAG_PROG_ALLGEMEIN.cNCTSRouten
+    Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+    Private Sub frmNCTSRouten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        init()
+    End Sub
+
+    Sub init()
+
+        initDGVRouten()
+
+        'Abgangszollstelle/Gebiet - woher kommt der LKW
+        cbxVon.Items.Clear()
+        cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Istanbul", "TR341300"))
+        cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("München", "DE001526"))
+        cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ankara", "TR061500"))
+        'cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
+        cbxVon.changeItem("")
+
+
+        sbxVon.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]",
+                                        {" [Code]", "Description"},
+                                        " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ",
+                                        " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+
+
+        'Bestimmungszollstelle - an Welcher Zollstelle kommt der LKW
+        cbxNach.Items.Clear()
+        cbxNach.fillWithSQL("SELECT [grz_ZollamtDST],[grz_Grenzstelle] FROM tblGrenzstelle where [grz_Firma]='" & FIRMA_TMP & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,)
+        cbxNach.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
+        cbxNach.changeItem("")
+
+        sbxNach.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]",
+                                        {" [Code]", "Description"},
+                                        " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ",
+                                        " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+
+
+        cbxRoutenart.Items.Clear()
+        cbxRoutenart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cbxRoutenart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Landweg", "Landweg"))
+        cbxRoutenart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Seeweg", "Seeweg"))
+        cbxRoutenart.changeItem("")
+
+        cbxTransportmittel.Items.Clear()
+        cbxTransportmittel.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("LKW", "LKW"))
+        'aktuell nur der Defaultwert "LKW" verfügbar!
+        cbxTransportmittel.changeItem("LKW")
+
+
+        txtDauer.Text = ""
+        txtVon.Text = ""
+        txtVonRegion.Text = ""
+
+        txtNach.Text = ""
+
+        dgvNCTSRouten.ClearSelection()
+        DisableUserControl()
+
+
+    End Sub
+
+
+    Sub initDGVRouten()
+
+        dgvNCTSRouten.Enabled = True
+
+        With dgvNCTSRouten
+
+            .Columns.Clear()
+
+            .DataSource = sql.loadDgvBySql("SELECT [nctsr_id],[nctsr_von],[nctsr_von_region],[nctsr_nach],[nctsr_dauer_in_tagen],[nctsr_route], [nctsr_transportmittel] FROM [VERAG].[dbo].[tblNTCSRouten]",
+                                           "VERAG")
+
+            '  .RowTemplate.Height = 30
+            .Columns("nctsr_id").Visible = False
+            .Columns("nctsr_von").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("nctsr_von").HeaderText = "Von"
+            .Columns("nctsr_von_region").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("nctsr_von_region").HeaderText = "Herkunftsregion"
+            .Columns("nctsr_nach").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("nctsr_nach").HeaderText = "Nach"
+            .Columns("nctsr_dauer_in_tagen").Visible = True
+            .Columns("nctsr_dauer_in_tagen").Width = 50
+            .Columns("nctsr_dauer_in_tagen").HeaderText = "Dauer"
+            .Columns("nctsr_dauer_in_tagen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
+            .Columns("nctsr_route").Visible = True
+            .Columns("nctsr_route").Width = 100
+            .Columns("nctsr_route").HeaderText = "Route"
+            .Columns("nctsr_route").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft
+            .Columns("nctsr_transportmittel").HeaderText = "Transportmittel"
+            .Columns("nctsr_transportmittel").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
+
+
+
+        End With
+
+
+    End Sub
+
+
+
+
+    Private Sub saveRoute(curRoute As cNCTSRouten)
+
+        curRoute.nctsr_von = txtVon._value.ToString 'IIf(sbxVon._value Is Nothing Or sbxVon._value = "", cbxVon._value, sbxVon._value)
+        curRoute.nctsr_von_region = txtVonRegion._value.ToString
+        curRoute.nctsr_nach = txtNach._value.ToString 'IIf(sbxNach._value Is Nothing Or sbxNach._value = "", cbxNach._value, sbxNach._value)
+        curRoute.nctsr_route = cbxRoutenart._value
+        curRoute.nctsr_dauer_in_tagen = CInt(txtDauer.Text)
+        curRoute.nctsr_transportmittel = cbxTransportmittel._value
+        If Not curRoute.SAVE() Then
+            Me.DialogResult = Windows.Forms.DialogResult.None
+        End If
+
+        dgvNCTSRouten.GetOrder()
+        initDGVRouten()
+        dgvNCTSRouten.SetOrder()
+
+        setOKButton()
+
+    End Sub
+
+
+    Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
+
+        dgvNCTSRouten.ClearSelection()
+
+        dgvNCTSRouten.Enabled = False
+
+        currentRoute = New VERAG_PROG_ALLGEMEIN.cNCTSRouten With {
+            .nctsr_von = "",
+            .nctsr_von_region = "",
+            .nctsr_nach = "",
+            .nctsr_dauer_in_tagen = 0,
+            .nctsr_route = "",
+            .nctsr_transportmittel = ""
+        }
+        loadChangedDSToPanel(currentRoute)
+        EnableUserControl()
+        setSaveButton()
+
+    End Sub
+
+    Sub setSaveButton()
+        btnSave.Visible = True
+        btnOK.Visible = False
+    End Sub
+
+    Sub setOKButton()
+        btnSave.Visible = False
+        btnOK.Visible = True
+    End Sub
+
+    Private Sub loadChangedDSToPanel(curRoute As VERAG_PROG_ALLGEMEIN.cNCTSRouten)
+
+
+        txtVon.Text = curRoute.nctsr_von.ToString
+        txtVonRegion.Text = curRoute.nctsr_von_region.ToString
+        txtNach.Text = curRoute.nctsr_nach.ToString
+
+        cbxRoutenart._value = curRoute.nctsr_route.ToString
+        txtDauer.Text = curRoute.nctsr_dauer_in_tagen.ToString
+        cbxTransportmittel._value = curRoute.nctsr_transportmittel.ToString
+
+        For Each c As Control In pnlNCTSRouten.Controls
+            If TypeOf (c) Is CheckBox Then
+                AddHandler CType(c, ComboBox).SelectedValueChanged, AddressOf SomethingChanged
+            ElseIf TypeOf (c) Is TextBox Then
+                AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged
+            End If
+        Next
+    End Sub
+
+    Private Sub checkDestination()
+
+    End Sub
+
+
+    Private Sub SomethingChanged(sender As Object, e As EventArgs)
+        setSaveButton()
+    End Sub
+
+    Private Sub btn_OK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+        Close()
+
+    End Sub
+
+    Private Sub btn_Cancel_Click(sender As Object, e As EventArgs) Handles btn_Cancel.Click
+        Close()
+    End Sub
+
+    Private Sub EnableUserControl()
+
+        For Each c As Control In pnlNCTSRouten.Controls
+            c.Enabled = True
+        Next
+
+    End Sub
+
+    Private Sub DisableUserControl()
+
+        For Each c As Control In pnlNCTSRouten.Controls
+            c.Enabled = False
+        Next
+
+    End Sub
+
+    Private Sub dgvNCTSRouten_SelectionChanged(sender As Object, e As EventArgs) Handles dgvNCTSRouten.SelectionChanged
+
+
+        If dgvNCTSRouten.SelectedRows.Count > 0 Then
+            EnableUserControl()
+            Dim rowindex = dgvNCTSRouten.SelectedRows(0).Index
+            currentRoute = New VERAG_PROG_ALLGEMEIN.cNCTSRouten(dgvNCTSRouten.SelectedRows(0).Cells("nctsr_id").Value)
+
+            loadChangedDSToPanel(currentRoute)
+            cbxVon.changeItem("")
+            cbxNach.changeItem("")
+
+
+            If dgvNCTSRouten.Enabled = False Then Exit Sub
+            routenId = dgvNCTSRouten.SelectedRows(0).Cells("nctsr_id").Value
+        End If
+
+    End Sub
+
+    Private Sub sbxVon_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles sbxVon.PreviewKeyDown
+        If sender Is sbxVon Then sbxVon.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None
+        If sender Is sbxNach Then sbxNach.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None
+
+    End Sub
+
+    Public Function GetTxtDauer() As TextBox
+        Return txtDauer
+    End Function
+
+    Function checkUserInput(txtDauer As TextBox) As Boolean
+
+        Dim validInputs As Boolean = True
+        lblWarningBST.Visible = False
+        lblWarningAZS.Visible = False
+        lblWarningDauer.Visible = False
+        lblWarningRoute.Visible = False
+
+        'If (cbxVon._value = "" Or cbxVon._value Is Nothing) Then
+        If (txtVon._value = "") Then
+            lblWarningAZS.Visible = True
+            validInputs = False
+        End If
+        'If (cbxNach._value = "" Or cbxNach._value Is Nothing) Then
+        If (txtNach._value = "") Then
+            lblWarningBST.Visible = True
+            validInputs = False
+        End If
+
+        If (cbxVon._value = "???" AndAlso sbxVon._value Is Nothing) Then
+            lblWarningAZS.Visible = True
+            validInputs = False
+        End If
+
+        If (cbxNach._value = "???" AndAlso sbxNach._value Is Nothing) Then
+            lblWarningAZS.Visible = True
+            validInputs = False
+        End If
+
+        If (Not IsNumeric(txtDauer.Text) Or txtDauer.Text = "") Then
+            lblWarningDauer.Visible = True
+            validInputs = False
+        End If
+
+        If cbxRoutenart._value = "" Or cbxRoutenart._value Is Nothing Then
+            lblWarningRoute.Visible = True
+            validInputs = False
+        End If
+
+        If cbxTransportmittel._value = "" Or cbxTransportmittel._value Is Nothing Then
+            lblWarningTransportmittel.Visible = True
+            validInputs = False
+        End If
+
+        Return validInputs
+    End Function
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+
+        If checkUserInput(GetTxtDauer()) Then saveRoute(currentRoute)
+
+
+    End Sub
+
+    Private Sub cbxVon_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxVon.SelectedValueChanged
+        If cbxVon._value.ToString = "???" Then
+            setSearchboxVisible(sbxVon, True)
+
+        Else
+            txtVon.Text = cbxVon._value.ToString
+            txtVonRegion.Text = cbxVon.Text.ToString
+            setSearchboxVisible(sbxVon, False)
+            sbxVon.Clear()
+        End If
+    End Sub
+
+    Private Sub cbxNach_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxNach.SelectedValueChanged
+
+        If cbxNach._value.ToString = "???" Then
+            setSearchboxVisible(sbxNach, True)
+
+        Else
+            txtNach.Text = cbxNach._value.ToString
+            setSearchboxVisible(sbxNach, False)
+            sbxNach.Clear()
+        End If
+
+    End Sub
+
+    Sub setSearchboxVisible(searchbox As VERAG_PROG_ALLGEMEIN.MySearchBox, visible As Boolean)
+        searchbox.Visible = visible
+    End Sub
+
+    Sub cbxNach_ValueChanged() Handles sbxNach.VALUE_CHANGED
+        If cbxNach._value = "???" AndAlso sbxNach._value <> "" Then
+            txtNach.Text = sbxNach._value
+        End If
+    End Sub
+
+End Class
+
--- a/Aviso/frmRoutendauerBerechnen.Designer.vb
+++ b/Aviso/frmRoutendauerBerechnen.Designer.vb
@@ -0,0 +1,289 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmRoutendauerBerechnen
+    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()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRoutendauerBerechnen))
+        Me.btnMinus = New System.Windows.Forms.Button()
+        Me.btnPlus = New System.Windows.Forms.Button()
+        Me.cbxVon = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblBZS = New System.Windows.Forms.Label()
+        Me.lblAZS = New System.Windows.Forms.Label()
+        Me.txtNach = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.txbAbgangsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txbVoraussichtlichesEintreffen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblWarning = New System.Windows.Forms.Label()
+        Me.lblDauer = New System.Windows.Forms.Label()
+        Me.lblberechneteDauer = New System.Windows.Forms.Label()
+        Me.lbWarningDateIsPast = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
+        '
+        'btnMinus
+        '
+        Me.btnMinus.Location = New System.Drawing.Point(192, 102)
+        Me.btnMinus.Name = "btnMinus"
+        Me.btnMinus.Size = New System.Drawing.Size(29, 23)
+        Me.btnMinus.TabIndex = 16
+        Me.btnMinus.Text = "-"
+        Me.btnMinus.UseVisualStyleBackColor = True
+        '
+        'btnPlus
+        '
+        Me.btnPlus.Location = New System.Drawing.Point(263, 102)
+        Me.btnPlus.Name = "btnPlus"
+        Me.btnPlus.Size = New System.Drawing.Size(29, 23)
+        Me.btnPlus.TabIndex = 15
+        Me.btnPlus.Text = "+"
+        Me.btnPlus.UseVisualStyleBackColor = True
+        '
+        'cbxVon
+        '
+        Me.cbxVon._allowedValuesFreiText = Nothing
+        Me.cbxVon._allowFreiText = False
+        Me.cbxVon._value = ""
+        Me.cbxVon.FormattingEnabled = True
+        Me.cbxVon.Location = New System.Drawing.Point(11, 39)
+        Me.cbxVon.Name = "cbxVon"
+        Me.cbxVon.Size = New System.Drawing.Size(121, 21)
+        Me.cbxVon.TabIndex = 13
+        '
+        'lblBZS
+        '
+        Me.lblBZS.AutoSize = True
+        Me.lblBZS.Location = New System.Drawing.Point(189, 23)
+        Me.lblBZS.Name = "lblBZS"
+        Me.lblBZS.Size = New System.Drawing.Size(111, 13)
+        Me.lblBZS.TabIndex = 12
+        Me.lblBZS.Text = "Bestimmungszollstelle:"
+        '
+        'lblAZS
+        '
+        Me.lblAZS.AutoSize = True
+        Me.lblAZS.Location = New System.Drawing.Point(8, 23)
+        Me.lblAZS.Name = "lblAZS"
+        Me.lblAZS.Size = New System.Drawing.Size(91, 13)
+        Me.lblAZS.TabIndex = 11
+        Me.lblAZS.Text = "Abgangszollstelle:"
+        '
+        'txtNach
+        '
+        Me.txtNach._DateTimeOnly = False
+        Me.txtNach._numbersOnly = False
+        Me.txtNach._numbersOnlyKommastellen = ""
+        Me.txtNach._numbersOnlyTrennzeichen = True
+        Me.txtNach._Prozent = False
+        Me.txtNach._ShortDateNew = False
+        Me.txtNach._ShortDateOnly = False
+        Me.txtNach._TimeOnly = False
+        Me.txtNach._TimeOnly_Seconds = False
+        Me.txtNach._value = ""
+        Me.txtNach._Waehrung = False
+        Me.txtNach._WaehrungZeichen = True
+        Me.txtNach.ForeColor = System.Drawing.Color.Black
+        Me.txtNach.Location = New System.Drawing.Point(192, 39)
+        Me.txtNach.MaxLineLength = -1
+        Me.txtNach.MaxLines_Warning = ""
+        Me.txtNach.MaxLines_Warning_Label = Nothing
+        Me.txtNach.Name = "txtNach"
+        Me.txtNach.ReadOnly = True
+        Me.txtNach.Size = New System.Drawing.Size(109, 20)
+        Me.txtNach.TabIndex = 10
+        '
+        'btnOK
+        '
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(223, 173)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(71, 23)
+        Me.btnOK.TabIndex = 17
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(8, 173)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(71, 23)
+        Me.btnCancel.TabIndex = 18
+        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'txbAbgangsdatum
+        '
+        Me.txbAbgangsdatum._DateTimeOnly = False
+        Me.txbAbgangsdatum._numbersOnly = False
+        Me.txbAbgangsdatum._numbersOnlyKommastellen = ""
+        Me.txbAbgangsdatum._numbersOnlyTrennzeichen = False
+        Me.txbAbgangsdatum._Prozent = False
+        Me.txbAbgangsdatum._ShortDateNew = True
+        Me.txbAbgangsdatum._ShortDateOnly = False
+        Me.txbAbgangsdatum._TimeOnly = False
+        Me.txbAbgangsdatum._TimeOnly_Seconds = False
+        Me.txbAbgangsdatum._value = ""
+        Me.txbAbgangsdatum._Waehrung = False
+        Me.txbAbgangsdatum._WaehrungZeichen = False
+        Me.txbAbgangsdatum.ForeColor = System.Drawing.Color.Black
+        Me.txbAbgangsdatum.Location = New System.Drawing.Point(11, 79)
+        Me.txbAbgangsdatum.MaxLength = 10
+        Me.txbAbgangsdatum.MaxLineLength = -1
+        Me.txbAbgangsdatum.MaxLines_Warning = ""
+        Me.txbAbgangsdatum.MaxLines_Warning_Label = Nothing
+        Me.txbAbgangsdatum.Name = "txbAbgangsdatum"
+        Me.txbAbgangsdatum.Size = New System.Drawing.Size(100, 20)
+        Me.txbAbgangsdatum.TabIndex = 19
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(8, 63)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(81, 13)
+        Me.Label1.TabIndex = 20
+        Me.Label1.Text = "Abgangsdatum:"
+        '
+        'txbVoraussichtlichesEintreffen
+        '
+        Me.txbVoraussichtlichesEintreffen._DateTimeOnly = False
+        Me.txbVoraussichtlichesEintreffen._numbersOnly = False
+        Me.txbVoraussichtlichesEintreffen._numbersOnlyKommastellen = ""
+        Me.txbVoraussichtlichesEintreffen._numbersOnlyTrennzeichen = False
+        Me.txbVoraussichtlichesEintreffen._Prozent = False
+        Me.txbVoraussichtlichesEintreffen._ShortDateNew = True
+        Me.txbVoraussichtlichesEintreffen._ShortDateOnly = True
+        Me.txbVoraussichtlichesEintreffen._TimeOnly = False
+        Me.txbVoraussichtlichesEintreffen._TimeOnly_Seconds = False
+        Me.txbVoraussichtlichesEintreffen._value = ""
+        Me.txbVoraussichtlichesEintreffen._Waehrung = False
+        Me.txbVoraussichtlichesEintreffen._WaehrungZeichen = False
+        Me.txbVoraussichtlichesEintreffen.ForeColor = System.Drawing.Color.Black
+        Me.txbVoraussichtlichesEintreffen.Location = New System.Drawing.Point(192, 79)
+        Me.txbVoraussichtlichesEintreffen.MaxLength = 10
+        Me.txbVoraussichtlichesEintreffen.MaxLineLength = -1
+        Me.txbVoraussichtlichesEintreffen.MaxLines_Warning = ""
+        Me.txbVoraussichtlichesEintreffen.MaxLines_Warning_Label = Nothing
+        Me.txbVoraussichtlichesEintreffen.Name = "txbVoraussichtlichesEintreffen"
+        Me.txbVoraussichtlichesEintreffen.ReadOnly = True
+        Me.txbVoraussichtlichesEintreffen.Size = New System.Drawing.Size(100, 20)
+        Me.txbVoraussichtlichesEintreffen.TabIndex = 21
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(189, 63)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(90, 13)
+        Me.Label2.TabIndex = 22
+        Me.Label2.Text = "voraus. Eintreffen"
+        '
+        'lblWarning
+        '
+        Me.lblWarning.AutoSize = True
+        Me.lblWarning.ForeColor = System.Drawing.Color.Red
+        Me.lblWarning.Location = New System.Drawing.Point(5, 102)
+        Me.lblWarning.Name = "lblWarning"
+        Me.lblWarning.Size = New System.Drawing.Size(152, 13)
+        Me.lblWarning.TabIndex = 23
+        Me.lblWarning.Text = "Bitte Abgangsdatum eingeben!"
+        Me.lblWarning.Visible = False
+        '
+        'lblDauer
+        '
+        Me.lblDauer.AutoSize = True
+        Me.lblDauer.Location = New System.Drawing.Point(5, 128)
+        Me.lblDauer.Name = "lblDauer"
+        Me.lblDauer.Size = New System.Drawing.Size(84, 13)
+        Me.lblDauer.TabIndex = 24
+        Me.lblDauer.Text = "Dauer in Tagen:"
+        Me.lblDauer.Visible = False
+        '
+        'lblberechneteDauer
+        '
+        Me.lblberechneteDauer.AutoSize = True
+        Me.lblberechneteDauer.Location = New System.Drawing.Point(95, 128)
+        Me.lblberechneteDauer.Name = "lblberechneteDauer"
+        Me.lblberechneteDauer.Size = New System.Drawing.Size(0, 13)
+        Me.lblberechneteDauer.TabIndex = 25
+        Me.lblberechneteDauer.Visible = False
+        '
+        'lbWarningDateIsPast
+        '
+        Me.lbWarningDateIsPast.AutoSize = True
+        Me.lbWarningDateIsPast.ForeColor = System.Drawing.Color.Red
+        Me.lbWarningDateIsPast.Location = New System.Drawing.Point(5, 141)
+        Me.lbWarningDateIsPast.Name = "lbWarningDateIsPast"
+        Me.lbWarningDateIsPast.Size = New System.Drawing.Size(231, 13)
+        Me.lbWarningDateIsPast.TabIndex = 26
+        Me.lbWarningDateIsPast.Text = "Datum des Eintreffens liegt in der Verangenheit!"
+        Me.lbWarningDateIsPast.Visible = False
+        '
+        'frmRoutendauerBerechnen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(317, 208)
+        Me.Controls.Add(Me.lbWarningDateIsPast)
+        Me.Controls.Add(Me.lblberechneteDauer)
+        Me.Controls.Add(Me.lblDauer)
+        Me.Controls.Add(Me.lblWarning)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txbVoraussichtlichesEintreffen)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txbAbgangsdatum)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.btnMinus)
+        Me.Controls.Add(Me.btnPlus)
+        Me.Controls.Add(Me.cbxVon)
+        Me.Controls.Add(Me.lblBZS)
+        Me.Controls.Add(Me.lblAZS)
+        Me.Controls.Add(Me.txtNach)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmRoutendauerBerechnen"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = " Routendauer berechnen"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents btnMinus As Button
+    Friend WithEvents btnPlus As Button
+    Friend WithEvents cbxVon As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblBZS As Label
+    Friend WithEvents lblAZS As Label
+    Friend WithEvents txtNach As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents btnOK As Button
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents txbAbgangsdatum As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txbVoraussichtlichesEintreffen As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents lblWarning As Label
+    Friend WithEvents lblDauer As Label
+    Friend WithEvents lblberechneteDauer As Label
+    Friend WithEvents lbWarningDateIsPast As Label
+End Class
--- a/Aviso/frmRoutendauerBerechnen.resx
+++ b/Aviso/frmRoutendauerBerechnen.resx
--- a/Aviso/frmRoutendauerBerechnen.vb
+++ b/Aviso/frmRoutendauerBerechnen.vb
@@ -0,0 +1,203 @@
+Imports System.CodeDom
+Imports DocumentFormat.OpenXml.Bibliography
+Imports DocumentFormat.OpenXml.Drawing
+Imports Org.BouncyCastle.Utilities
+Imports SDL
+Imports Therefore.API
+
+Public Class frmRoutendauerBerechnen
+
+    Public calculatedDate As New DateTime
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim destination As String = ""
+    Dim departure As String
+    Dim transportmittel As String = "LKW" 'Defaultvalue -> wird in Zukunft ev. noch erweitert (LKW, Sprinter, etc.)
+    Dim days As Integer = -1
+    Dim calcDays As Integer = -1
+    Dim destinationShortcut As String = ""
+
+
+    Sub New(dest As String)
+
+        InitializeComponent()
+        destination = dest
+
+    End Sub
+
+
+    Function findDestinationAndReplaceToShortCut(destination As String) As String
+
+        Dim shortcut As String
+        shortcut = CStr(SQL.DLookup("[grz_ZollamtDST]", "[tblGrenzstelle]", "[grz_Grenzstelle]= '" & destination & "'", "AVISO", ""))
+        Return shortcut
+
+    End Function
+
+    Private Sub frmRoutendauerBerechnen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        txtNach.Text = destination
+        destinationShortcut = findDestinationAndReplaceToShortCut(destination)
+        If destinationShortcut = "" Then
+            initComboboxDeparture(destination)
+        Else
+            initComboboxDeparture(destinationShortcut)
+        End If
+
+        txbAbgangsdatum._value = ""
+
+    End Sub
+
+    Sub initComboboxDeparture(destination As String)
+
+        cbxVon.Items.Clear()
+        cbxVon.fillWithSQL("SELECT [nctsr_von], [nctsr_von_region] FROM [tblNTCSRouten] WHERE [nctsr_nach] = '" & destination & "'", False, "FMZOLL", False)
+        cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cbxVon.changeItem("")
+        If cbxVon._value = "" Then
+            MsgBox("Es wurde für die Bestimmungszollstelle " & txtNach.Text & " keine Route definiert." & vbCrLf & "Bitte voraus. Datum des Eintreffens manuell eingeben!")
+        End If
+
+
+    End Sub
+
+    Private Sub btnPlus_Click(sender As Object, e As EventArgs) Handles btnPlus.Click
+        If checkIfDepartureDateIsFilled() = False Then Exit Sub
+        addDaysToGivenDate(txbVoraussichtlichesEintreffen, 1)
+        calcDays += 1
+        checkIfDepatureDateIsNotPast()
+    End Sub
+
+    Private Sub btnMinus_Click(sender As Object, e As EventArgs) Handles btnMinus.Click
+        If checkIfDepartureDateIsFilled() = False Then Exit Sub
+        addDaysToGivenDate(txbVoraussichtlichesEintreffen, -1)
+        calcDays -= 1
+        checkIfDepatureDateIsNotPast()
+    End Sub
+
+    Function lookUpTripDuration() As Integer
+
+        Dim departure As String
+
+        departure = cbxVon._value
+
+        Try
+            days = CInt(SQL.DLookup("nctsr_dauer_in_tagen", "tblNTCSRouten", "[nctsr_von]='" & departure & "' AND [nctsr_nach]= '" & destinationShortcut & "' AND [nctsr_route]= 'Landweg' AND [nctsr_transportmittel]= '" & transportmittel & "'", "VERAG", 0))
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+        Return days
+
+    End Function
+
+    Private Sub addDaysToGivenDate(givenDate As VERAG_PROG_ALLGEMEIN.MyTextBox, days As Integer)
+
+        txbVoraussichtlichesEintreffen._value = Convert.ToDateTime(givenDate._value).AddDays(days)
+        txbVoraussichtlichesEintreffen.Show()
+
+        lblberechneteDauer.Text = CStr(calcDuration())
+        lblberechneteDauer.Visible = True
+
+
+    End Sub
+
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+
+        calculatedDate = CDate(txbVoraussichtlichesEintreffen._value)
+
+    End Sub
+
+    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+        Close()
+    End Sub
+
+    Private Sub txbAbgangsdatum_TextChanged(sender As Object, e As EventArgs) Handles txbAbgangsdatum.TextChanged, cbxVon.SelectedValueChanged
+
+        If checkIfDepartureDateIsFilled() = False Then Exit Sub
+
+        days = lookUpTripDuration()
+        calcDays = days
+
+        If days >= 0 Then
+            addDaysToGivenDate(txbAbgangsdatum, days)
+        End If
+
+        checkIfDepatureDateIsNotPast()
+
+    End Sub
+
+    Function checkIfDepartureDateIsFilled() As Boolean
+
+        Dim isFilled = False
+
+        If txbAbgangsdatum._value = "" Then
+            lblWarning.Visible = True
+            lblDauer.Visible = False
+            lblberechneteDauer.Text = ""
+            lblberechneteDauer.Visible = False
+            btnOK.DialogResult = DialogResult.None
+
+
+        Else
+
+            lblWarning.Visible = False
+            isFilled = True
+            lblDauer.Visible = True
+            btnOK.DialogResult = DialogResult.OK
+
+
+
+
+        End If
+
+        Return isFilled
+
+    End Function
+
+    Function checkIfDepatureDateIsNotPast() As Boolean
+        Dim depatureDateIsNotPast = False
+
+        If txbVoraussichtlichesEintreffen._value <> "" Then
+            If CDate(txbVoraussichtlichesEintreffen._value) >= CDate(Today().ToShortDateString) Then
+
+
+                depatureDateIsNotPast = True
+                lbWarningDateIsPast.Visible = False
+                btnOK.DialogResult = DialogResult.OK
+                btnMinus.Enabled = True
+            Else
+                btnOK.DialogResult = DialogResult.None
+                lbWarningDateIsPast.Visible = True
+                btnMinus.Enabled = False
+
+            End If
+        End If
+
+        Return depatureDateIsNotPast
+
+    End Function
+
+
+    Function calcDuration() As Integer
+        Dim result As Integer = 0
+
+        If txbVoraussichtlichesEintreffen._value <> "" Then
+            Dim StartDate = Convert.ToDateTime(txbAbgangsdatum._value)
+            Dim EndDate = Convert.ToDateTime(txbVoraussichtlichesEintreffen._value)
+            result = (EndDate - StartDate).Days
+            If (result < 0) Then
+                MsgBox("Transportdauer kann nicht negativ sein!")
+
+                btnOK.DialogResult = DialogResult.None
+            Else
+
+                btnOK.DialogResult = DialogResult.OK
+            End If
+        End If
+        Return result
+
+    End Function
+
+
+End Class
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1542,25 +1542,6 @@
  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>296, 17</value>
  </metadata>
-  <data name="Button14.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAytJREFUOE+d
-        kmtIU2EYx3df01qiZYX0JfuYBEFF2U2JEgqESCgScYpQZlYalV20mpUVRuk03+k2L7Plpt0sO5ouK7tf
-        zcsSnYlCecl5vLy7uXOezuYpEhOqHzzwwvv8f/CHh/MTHo/H9/PznxUt25+kLiQGr98wkunpWTG+vn4+
-        fD6fy679EZIkJx5CoVAUvDYsVqU1jpdXN43nEv2WHMJC3qlpHG9u73VGRspC/f3ne09sT8Uj4nJ5/OUr
-        N8Yo9C3DOY8HB98NA27HgHtsgM1WwPc7qd6OfiupUun2sbkpeERSqa/05Nky52F9f9+tLsCPBwC7ZZ9G
-        AX8YAfzMAriszTXwtOF997JlK9ew2Ul4ROvWb086eqnKcbEBsLoZsFv2sBdwPSOs6wdc2QO4qNk1ml5q
-        /pKRka1ns5PwiKJk578HJzc1h2TaamN1zobLL6iurNd0i/wRZUwhXLXKRtqS+ZweOWjAnUplEcFmJ+ER
-        7Yw8M7TqwMfWoNQxtC3fUXCkiiqT19Pa1Ic0SqqkmHHd3qF23N2lHG3IzdVMLwoJjZKFx+QNbM1xoORK
-        F1K8pZHeDOhmF6DCFkByI41kWkeBvNT8LSUlY3qRROLts+9o4VCczqa5+opGNb2AmuyATE5AL4YBlZgA
-        pVVTqvonr1tFIrEXm52ER8QcAGfJkuCQs4r7HZpGu/rN0Hj+IEWjURpQu51SVXW71ApFOWRmFn/dvGlL
-        uFjAEXvSv8GKOByBQCRZsWJzXOL+C905xcSn9j6LvmeALLtn/NhXcfNBa3LyxdaiwsrOiuxjddd2Lyzx
-        9ebOnUhO8Ev0kwULAleHhcl00dGHiLi4I0RERAIhEAi9REKh+FxCrMGkDQer6TRk7w0smT+bG8DGpoqm
-        Q8DjiOPXzdR2KIPAZToJuOkEXNmzWDOPlf21yM1MMWdOYqikpA0tZWTHYYyRZcUvKmZqzvknkRufGdyA
-        hA1emrY8t+wEU/MM5MUvNNjGyBnsyt/jI+EGJIZIis3ump/ToOelBiinXcp+/xtMzbmJG7wMhqvHQH7q
-        GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII=
-</value>
-  </data>
  <data name="Button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAACQpJREFUaEPl
@@ -1637,6 +1618,25 @@
        unWE9PR0gRI74cyZM0J1dbUQGRkpUHYpnD59WsjMzBQKCgqEc+fOCXRkvn9xkU0hfWVqarqN5DNS1OZj
        YWHBS3Nzcx8zMzMf+r/F26ysrHg5efJk3qav20a+7iQLDqZcaTSZ6jXxA4rHBGDyP2IuNJzUb+7ZAAAA
        AElFTkSuQmCC
+</value>
+  </data>
+  <data name="Button14.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAytJREFUOE+d
+        kmtIU2EYx3df01qiZYX0JfuYBEFF2U2JEgqESCgScYpQZlYalV20mpUVRuk03+k2L7Plpt0sO5ouK7tf
+        zcsSnYlCecl5vLy7uXOezuYpEhOqHzzwwvv8f/CHh/MTHo/H9/PznxUt25+kLiQGr98wkunpWTG+vn4+
+        fD6fy679EZIkJx5CoVAUvDYsVqU1jpdXN43nEv2WHMJC3qlpHG9u73VGRspC/f3ne09sT8Uj4nJ5/OUr
+        N8Yo9C3DOY8HB98NA27HgHtsgM1WwPc7qd6OfiupUun2sbkpeERSqa/05Nky52F9f9+tLsCPBwC7ZZ9G
+        AX8YAfzMAriszTXwtOF997JlK9ew2Ul4ROvWb086eqnKcbEBsLoZsFv2sBdwPSOs6wdc2QO4qNk1ml5q
+        /pKRka1ns5PwiKJk578HJzc1h2TaamN1zobLL6iurNd0i/wRZUwhXLXKRtqS+ZweOWjAnUplEcFmJ+ER
+        7Yw8M7TqwMfWoNQxtC3fUXCkiiqT19Pa1Ic0SqqkmHHd3qF23N2lHG3IzdVMLwoJjZKFx+QNbM1xoORK
+        F1K8pZHeDOhmF6DCFkByI41kWkeBvNT8LSUlY3qRROLts+9o4VCczqa5+opGNb2AmuyATE5AL4YBlZgA
+        pVVTqvonr1tFIrEXm52ER8QcAGfJkuCQs4r7HZpGu/rN0Hj+IEWjURpQu51SVXW71ApFOWRmFn/dvGlL
+        uFjAEXvSv8GKOByBQCRZsWJzXOL+C905xcSn9j6LvmeALLtn/NhXcfNBa3LyxdaiwsrOiuxjddd2Lyzx
+        9ebOnUhO8Ev0kwULAleHhcl00dGHiLi4I0RERAIhEAi9REKh+FxCrMGkDQer6TRk7w0smT+bG8DGpoqm
+        Q8DjiOPXzdR2KIPAZToJuOkEXNmzWDOPlf21yM1MMWdOYqikpA0tZWTHYYyRZcUvKmZqzvknkRufGdyA
+        hA1emrY8t+wEU/MM5MUvNNjGyBnsyt/jI+EGJIZIis3ump/ToOelBiinXcp+/xtMzbmJG7wMhqvHQH7q
+        GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII=
 </value>
  </data>
  <metadata name="clmnVK_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -6,6 +6,8 @@ Imports System.Management
 Imports System.Data.SqlClient
 Imports iTextSharp.text.pdf
 Imports Microsoft.Office.Interop
+Imports DocumentFormat.OpenXml.Presentation
+

 Public Class frmSendungsdetailsNEU
    Public AvisoId As Integer
@@ -30,6 +32,7 @@ Public Class frmSendungsdetailsNEU
    Dim usrcntl_FISKAL As usrCntlSND_NCTSFiskalEndempf
    Dim usrcntl_ATA As usrCntlSND_Handling
    Dim usrcntl_ATB As usrCntlSND_ATBGestellung
+    Dim usrcntl_AUSFUHR As usrCntlSND_Ausfuhr


    Sub New()
@@ -131,20 +134,49 @@ Public Class frmSendungsdetailsNEU

    Function VALIDATE_ME() As Boolean
        Dim FilialeAktFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(SENDUNG_LIST(CURRENT_INDEX).FilialenNr,, "")
+        lblErr_AvisiererKdNr.Visible = False
+        lblErr_EmpfKdNr.Visible = False
+        lblErr_FraechterKdNr.Visible = False

-        If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then
-            'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen.
-        Else
-            If FilialeAktFirma <> "" Then
-                If Panel6.Enabled Then 'wenn gesperrt, auch keine Prüfung!
-                    If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
-                    If Not txtAuftraggeber.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
-                    If Not txtEmpfaenger.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
-                    If Not txtFrachtfuehrer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
-                    If Not txtAbsender.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+        'Aktuell noch nicht!
+        'Select Case CInt((SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID))
+        '    Case <= 0, 10
+        '    Case Else
+        '        If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr, "0")) <= 0 Then lblErr_AvisiererKdNr.Visible = True : Return False
+        '        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr <= 0 Then lblErr_EmpfKdNr.Visible = True : Return False
+        '        If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr, "0")) <= 0 Then lblErr_FraechterKdNr.Visible = True : Return False
+        'End Select
+        If Not SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then
+
+
+            If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then
+                'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen.
+            Else
+                If FilialeAktFirma <> "" Then
+                    If Panel6.Enabled Then 'wenn gesperrt, auch keine Prüfung!
+                        If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Avisierer: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+                        If Not txtAuftraggeber.checkFirma(FilialeAktFirma) Then MsgBox("Auftraggeber: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+                        If Not txtEmpfaenger.checkFirma(FilialeAktFirma) Then MsgBox("Empfänger: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+                        If Not txtFrachtfuehrer.checkFirma(FilialeAktFirma) Then MsgBox("Frachtführer: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+                        If Not txtAbsender.checkFirma(FilialeAktFirma) Then MsgBox("Absender: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False
+                    End If
+                End If
+            End If
+
+        End If
+
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
+
+            If (cboVorpapier.Text.Trim <> String.Empty And txtVorpapierPos.Text.Trim = String.Empty) Or
+                (cboVorpapier2.Text.Trim <> String.Empty And txtVorpapier2Pos.Text.Trim = String.Empty) Or
+                (cboVorpapier3.Text.Trim <> String.Empty And txtVorpapier3Pos.Text.Trim = String.Empty) Then
+                If MsgBox("Pre-Paper Position is not filled. Really continue?", vbYesNoCancel) <> vbYes Then
+                    Return False
                End If
            End If
        End If
+
        Return True
    End Function

@@ -262,10 +294,12 @@ Public Class frmSendungsdetailsNEU

            AVISO = AvisoDAL.LesenAviso(AvisoId, "")

-            txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)
+            txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] , [Description] As Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate Is null Or StartDate< GETDATE()) And (EndDate Is null Or EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)

            If AVISO.Grenzstelle.Replace("???", "") = "" Then
-                lblGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
+                'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
+                lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+
            Else


@@ -276,7 +310,7 @@ Public Class frmSendungsdetailsNEU

                End If

-                
+
            End If

            initVorpapiere()
@@ -357,6 +391,7 @@ Public Class frmSendungsdetailsNEU
            '    cboZolltarif.changeItem("0")

            usrcntl_NCTS = New usrCntlSND_NCTSGestellungsadresse
+            usrcntl_AUSFUHR = New usrCntlSND_Ausfuhr
            usrcntl_FISKAL = New usrCntlSND_NCTSFiskalEndempf
            'usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
            If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZollanmeldungen", Me) Then
@@ -422,6 +457,8 @@ Public Class frmSendungsdetailsNEU
            txtFrachtfuehrer.initKdBox(Me, txtFrachtfuehrerKdNr)

            AddHandler txtAvisierer.PropertyChanged, Sub()
+                                                         lblErr_AvisiererKdNr.Visible = False
+
                                                         btnAvisierer.BackgroundImage = IIf(txtAvisierer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text
                                                         SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = txtAvisierer.KdNr
@@ -439,6 +476,8 @@ Public Class frmSendungsdetailsNEU
                                                     End Sub

            AddHandler txtFrachtfuehrer.PropertyChanged, Sub()
+                                                             lblErr_FraechterKdNr.Visible = False
+
                                                             btnFrachtfuehrer.BackgroundImage = IIf(txtFrachtfuehrer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                             SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text
                                                             SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = txtFrachtfuehrer.KdNr
@@ -457,6 +496,8 @@ Public Class frmSendungsdetailsNEU

            txtEmpfaenger.initKdBox(Me, txtEmpfaengerKdNr)
            AddHandler txtEmpfaenger.PropertyChanged, Sub()
+                                                          lblErr_EmpfKdNr.Visible = False
+
                                                          FlatButton1.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
                                                          SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text
                                                          SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr
@@ -874,7 +915,8 @@ Public Class frmSendungsdetailsNEU
        b_add.Size = New Size(30, 30)
        b_add.Margin = New Padding(2, 22, 0, 0)
        b_add.Text = "+"
-        b_add.Font = New Font(b_add.Font.FontFamily, 14, FontStyle.Bold)
+        'b_add.Font = New Font()
+        'b_add.Font.FontFamily, 14, FontStyle.Bold)
        b_add.BackColor = Color.LightGray()
        AddHandler b_add.Click, Sub(send As Object, ev As EventArgs)
                                    If AVISO.Abgeschlossen Then Exit Sub
@@ -1107,7 +1149,9 @@ Public Class frmSendungsdetailsNEU



-            txtFrachtkosten.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "")
+            txtFrachtkostenEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "")
+            txtFrachtkostenNichtEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU, "")
+            txtFrachtkostenGesamt.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenGesamt, "")

            txtWarenwert.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, "")
            txtWarenwertWaehrung.SET_VALUE(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung, ""))
@@ -1246,6 +1290,7 @@ Public Class frmSendungsdetailsNEU

            pnlT1.Controls.Clear()
            usrcntl_NCTS.reset()
+            usrcntl_AUSFUHR.reset()
            usrcntl_FISKAL.reset()
            usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
            usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
@@ -1262,7 +1307,7 @@ Public Class frmSendungsdetailsNEU

            '   txtT1Verzollungsadresse.Text = ""
            Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID
-                Case 5, 6
+                Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                    If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
                        usrcntl_NCTS.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId)
                        usrcntl_NCTS.setValues()
@@ -1284,6 +1329,25 @@ Public Class frmSendungsdetailsNEU
                Case 26, 28
                    usrcntl_FISKAL.rtbFiskalEndempf.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_EUFiskalEmpfaenger, "")
                    pnlT1.Controls.Add(usrcntl_FISKAL)
+                Case 7
+                    If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
+                        usrcntl_AUSFUHR.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId)
+                        usrcntl_AUSFUHR.setValues()
+                    End If
+                    'trotzdem überschreiben:
+                    usrcntl_AUSFUHR.txtT1Verzollungsadresse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseStrasse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadressePlz.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_PLZ, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseOrt.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ort, "")
+                    usrcntl_AUSFUHR.sbT1VerzollungsadresseLand.SET_VALUE(loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Land, ""))
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI_NL.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseAnspr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner, "")
+                    usrcntl_AUSFUHR.txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle, ""))
+                    usrcntl_AUSFUHR.cbxNCTSAufDispo.Checked = SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO
+
+                    pnlT1.Controls.Add(usrcntl_AUSFUHR)
+
                Case 23
                    usrcntl_ATA.txtATAold.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr, "")
                    usrcntl_ATA.txtATCMRNFremd.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATCMRN_Fremd, "")
@@ -1329,6 +1393,9 @@ Public Class frmSendungsdetailsNEU
            initGesColliGewicht()
            '  initKdInfo(-1)

+            initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+
+
            SENDUNG_LIST(CURRENT_INDEX).LOAD_VORKOSTEN()
            If tbcntr.SelectedTab Is tbBAR Then
                initDGVBelege()
@@ -1625,7 +1692,7 @@ Public Class frmSendungsdetailsNEU
        SENDUNG_LIST(CURRENT_INDEX).tblSnd_EUFiskalEmpfaenger = Nothing

        Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID
-            Case 5, 6
+            Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_NCTSGestellungsadresse) Then
                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse = usrcntl_NCTS.txtT1Verzollungsadresse.Text
                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse = usrcntl_NCTS.txtT1VerzollungsadresseStrasse.Text
@@ -1640,6 +1707,21 @@ Public Class frmSendungsdetailsNEU
                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO = usrcntl_NCTS.cbxNCTSAufDispo.Checked
                End If

+            Case 7
+                If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_Ausfuhr) Then
+                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse = usrcntl_AUSFUHR.txtT1Verzollungsadresse.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse = usrcntl_AUSFUHR.txtT1VerzollungsadresseStrasse.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_PLZ = usrcntl_AUSFUHR.txtT1VerzollungsadressePlz.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ort = usrcntl_AUSFUHR.txtT1VerzollungsadresseOrt.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Land = usrcntl_AUSFUHR.sbT1VerzollungsadresseLand._value
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI = usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL = usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI_NL.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner = usrcntl_AUSFUHR.txtT1VerzollungsadresseAnspr.Text
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle = usrcntl_AUSFUHR.txtT1VerzollungsadresseBestimmungszollstelle._value
+                    SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId = If(usrcntl_AUSFUHR.NCTS_GA IsNot Nothing, usrcntl_AUSFUHR.NCTS_GA.nga_id, Nothing)
+                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO = usrcntl_AUSFUHR.cbxNCTSAufDispo.Checked
+                End If
+
            Case 26, 28
                '      SENDUNG_LIST(CURRENT_INDEX).tblSnd_Endempfaenger = txtT1Verzollungsadresse.Text
                If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_NCTSFiskalEndempf) Then
@@ -1661,7 +1743,10 @@ Public Class frmSendungsdetailsNEU
        End Select


-        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkosten.Text)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkostenEU.Text)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU = SQL.isNullNothingDbl(txtFrachtkostenNichtEU.Text)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenGesamt = SQL.isNullNothingDbl(txtFrachtkostenGesamt.Text)
+

        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = SQL.isNullNothingDbl(txtWarenwert.Text)
        SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = SQL.isNullNothing(txtWarenwertWaehrung._value)
@@ -2086,6 +2171,8 @@ Public Class frmSendungsdetailsNEU
        btnAufschub_Empf.Visible = (cboAbfertigungsart._value <> "23")
        btnAufschub_VERAG.Visible = (cboAbfertigungsart._value <> "23")

+        setContextMenuGVMSControl()
+
        If cboAbfertigungsart._value = "23" Then
            SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = ""
        ElseIf cboAbfertigungsart._value = "9" Then
@@ -2104,8 +2191,14 @@ Public Class frmSendungsdetailsNEU

        pnlT1.Controls.Clear()
        Select Case cboAbfertigungsart._value
-            Case "5", "6", "24", "33", "34"
+            Case "5", "18", "32"
                pnlT1.Controls.Add(usrcntl_NCTS)
+ '               usrcntl_NCTS.Label33.Text = "NCTS-" & vbNewLine & "Gestellungsadr."
+            Case "6", "24", "33", "34", "37", "40", "42"
+                pnlT1.Controls.Add(usrcntl_NCTS)
+'                usrcntl_NCTS.Label33.Text = "Amtsplatz/" & vbNewLine & "Zollstopp"
+            Case "7"
+                pnlT1.Controls.Add(usrcntl_AUSFUHR)
            Case "26", "28"
                pnlT1.Controls.Add(usrcntl_FISKAL)

@@ -2819,6 +2912,7 @@ Public Class frmSendungsdetailsNEU

                    Dim FilialeAktFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(SENDUNG_LIST(CURRENT_INDEX).FilialenNr,, "")
                    Dim FilialeNeuFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value,, "")
+                    setContextMenuGVMSControl()

                    If FilialeNeuFirma <> "FRONTOFFICE" And FilialeAktFirma <> "FRONTOFFICE" Then
                        If FilialeAktFirma <> "" And FilialeNeuFirma <> "" Then
@@ -2846,12 +2940,12 @@ Public Class frmSendungsdetailsNEU
                        End If
                    End If
                End If
-                End If
            End If
+        End If



-            txtAnzahlPos.Visible = (cboFiliale._value = "7001")
+        txtAnzahlPos.Visible = (cboFiliale._value = "7001")
        Label4.Visible = (cboFiliale._value = "7001")

        Dim tmp = cboAbfertigungsart._value
@@ -3800,7 +3894,13 @@ Public Class frmSendungsdetailsNEU
                    If Not IO.File.Exists(docPath) Then
                        MsgBox("Die Datei existiert nicht!")
                    Else
-                        Process.Start(docPath)
+                        If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler  (bereits von Benutzer soUndSo geöffnet)
+                            Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG()
+                            System.IO.File.Copy(docPath, docPathTMP)
+                            Process.Start(docPathTMP)
+                        Else
+                            Process.Start(docPath)
+                        End If
                    End If
                End If
            End If
@@ -3901,20 +4001,18 @@ Public Class frmSendungsdetailsNEU
                        Dim TextHTML = ""
                        TextHTML &= "Sehr geehrte Damen und Herren,<br>"
                        TextHTML &= "<br>"
-                            TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
-                            TextHTML &= "<br>"
+                        TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
+                        TextHTML &= "<br>"

-                            TextHTML &= "Mit freundlichen Grüßen<br>"
-                            TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
-                            TextHTML &= "<br>"
+                        TextHTML &= "Mit freundlichen Grüßen<br>"
+                        TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                        TextHTML &= "<br>"

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

-                            AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
-
-                        End If
-
-                        Mail.Display()
+                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
+                    End If
+                    Mail.Display()

                Catch ex As Exception
                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
@@ -3925,6 +4023,125 @@ Public Class frmSendungsdetailsNEU
        End Try
    End Sub

+    Private Sub GestellungsgarantieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OhneGestellungsgarantieToolStripMenuItem.Click, MitGestellungsgarantieToolStripMenuItem.Click
+
+
+        Try
+            VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
+
+            Try
+                Dim outl As New Outlook.Application
+                Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                Mail = outl.CreateItem(0)
+
+                If dgvAnhang.SelectedRows.Count >= 1 Then
+                    For Each r As DataGridViewRow In dgvAnhang.SelectedRows
+
+                        Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                    Next
+                End If
+
+                Dim language As String
+
+                Select Case usrcntl_NCTS.sbT1VerzollungsadresseLand.Text
+                    Case "DE", "AT", "CH", "D", "A"
+                        language = "DE"
+                    Case Else
+                        language = "EN"
+
+                End Select
+
+                If language = "DE" Then
+                    Mail.Subject = "T1 Bestätigung | "
+                Else
+                    Mail.Subject = "T1 Confirmation | "
+
+                End If
+
+                Mail.Subject &= AVISO.LKW_Nr
+
+                If txtEmpfaenger.Text <> "" Then Mail.Subject &= " | " & txtEmpfaenger.Text
+
+                If txtColli.Text <> "" AndAlso txtGewicht.Text <> "" Then Mail.Subject &= " | " & txtColli.Text & " Pk. " & txtGewicht.Text & " kg"
+
+
+                Dim firstTextHTMLDE = ""
+                firstTextHTMLDE &= "Sehr geehrter Geschäftspartner,<br>"
+                firstTextHTMLDE &= "<br>"
+                firstTextHTMLDE &= "wir bitten um Bestätigung, dass wir für die angefügte Sendung ein T1-Versandschein an folgender Adresse erstellen dürfen:<br>"
+                firstTextHTMLDE &= "Mit der Bestätigung stimmen Sie zu, diesen Versandverfahren bei Ihnen zu beenden.<br>"
+                firstTextHTMLDE &= "<br>"
+
+                Dim firstTextHTMLEN = ""
+                firstTextHTMLEN &= "Dear Business Partner,<br>"
+                firstTextHTMLEN &= "<br>"
+                firstTextHTMLEN &= "we request confirmation that we may issue a T1 dispatch note for the attached item to the following address:<br>"
+                firstTextHTMLEN &= "By confirming, you agree to terminate this shipping procedure with you.<br>"
+                firstTextHTMLEN &= "<br>"
+
+                Dim TextHTMLInfo = ""
+                TextHTMLInfo &= usrcntl_NCTS.txtT1Verzollungsadresse.Text & "<br>"
+                TextHTMLInfo &= usrcntl_NCTS.txtT1VerzollungsadresseStrasse.Text & "<br>"
+                TextHTMLInfo &= usrcntl_NCTS.sbT1VerzollungsadresseLand.Text & "-" & usrcntl_NCTS.txtT1VerzollungsadressePlz.Text & " " & usrcntl_NCTS.txtT1VerzollungsadresseOrt.Text & "<br>"
+                TextHTMLInfo &= usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle.Text & "<br>"
+
+                Dim lastTextHTMLDE = ""
+                Dim lastTextHTMLEN = ""
+
+                If sender Is MitGestellungsgarantieToolStripMenuItem Then
+                    lastTextHTMLDE &= "Für eine dauerhafte Gestellungsgarantie füllen Sie bitte beilg. Formular aus und schicken uns dieses unterzeichnet zurück.<br>"
+                    lastTextHTMLEN &= "For a permanent permit, please complete and sign the enclosed form and return it to us.<br>"
+
+                    Dim usrcntlGestellungsgarantieNew As New SDL.usrcntlGestellungsgarantie()
+
+                    usrcntlGestellungsgarantieNew.cboSprache.Items.Clear()
+                    usrcntlGestellungsgarantieNew.cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE"))
+                    usrcntlGestellungsgarantieNew.cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EN", "EN"))
+
+                    usrcntlGestellungsgarantieNew.cboSprache._value = language
+
+                    usrcntlGestellungsgarantieNew.txtFirma.Text = usrcntl_NCTS.txtT1Verzollungsadresse.Text
+                    usrcntlGestellungsgarantieNew.txtAdresse1.Text = usrcntl_NCTS.txtT1VerzollungsadresseStrasse.Text
+                    usrcntlGestellungsgarantieNew.txtAdresse2.Text = usrcntl_NCTS.sbT1VerzollungsadresseLand.Text & " " & usrcntl_NCTS.txtT1VerzollungsadressePlz.Text & " " & usrcntl_NCTS.txtT1VerzollungsadresseOrt.Text
+                    usrcntlGestellungsgarantieNew.txtBestimmungszollamt.Text = usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle.Text
+                    usrcntlGestellungsgarantieNew.txtEORI.Text = usrcntl_NCTS.txtT1VerzollungsadresseEORI.Text
+
+                    Dim PDF_PFad = SDL.FormularManagerNEU.genPDF(usrcntlGestellungsgarantieNew).Item(0).ToString
+
+                    Mail.Attachments.Add(PDF_PFad, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                End If
+
+
+                lastTextHTMLDE &= "Mit freundlichen Grüßen<br>"
+                lastTextHTMLDE &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                lastTextHTMLDE &= "<br>"
+
+                lastTextHTMLEN &= "Best regards<br>"
+                lastTextHTMLEN &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                lastTextHTMLEN &= "<br>"
+
+
+
+                If language = "DE" Then
+
+                    Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & firstTextHTMLDE & TextHTMLInfo & lastTextHTMLDE & SDL.cFakturierung.getSignature(language) & "</div>"
+                Else
+                    Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & firstTextHTMLEN & TextHTMLInfo & lastTextHTMLEN & SDL.cFakturierung.getSignature(language) & "</div>"
+                End If
+
+                AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "T1 Bestätigung gesendet", 96)
+
+                Mail.Display()
+
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+            End Try
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+        End Try
+    End Sub
+
+
    Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click
        FormularArt = SDL.FormularManagerArten.Importaviso_VK
        ctxtWeitereFormulare.Show(Cursor.Position)
@@ -4011,7 +4228,7 @@ Public Class frmSendungsdetailsNEU
                    DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = True
                End If
            Else
-                    If pnlKundenInfo.Controls.Count > 0 Then
+                If pnlKundenInfo.Controls.Count > 0 Then
                    DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = False
                End If
            End If
@@ -4642,7 +4859,7 @@ Public Class frmSendungsdetailsNEU
                        Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr)
                        If AD IsNot Nothing Then
                            Blatt.Range("E13").Value = AD.Name_1
-                            Blatt.Range("E14").Value = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & " " & If(AD.Straße, "")).trim
+                            Blatt.Range("E14").Value = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & " " & If(AD.Straße, "")).Trim
                        End If
                        Blatt.Range("E13").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer
                    Else
@@ -4702,7 +4919,9 @@ Public Class frmSendungsdetailsNEU
                    TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                    TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                    TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    ' TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
                    TextHTML &= "</table>"
                    TextHTML &= "<br>"
                    TextHTML &= "<br>"
@@ -4754,7 +4973,9 @@ Public Class frmSendungsdetailsNEU
                    TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                    TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                    TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    '                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
                    TextHTML &= "</table>"
                    TextHTML &= "<br>"
                    TextHTML &= "<br>"
@@ -4806,7 +5027,10 @@ Public Class frmSendungsdetailsNEU
                    TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
                    TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
                    TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
-                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    '                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") & "</b></td></tr>"
+
+
                    TextHTML &= "</table>"
                    TextHTML &= "<br>"
                    TextHTML &= "<br>"
@@ -5023,7 +5247,6 @@ Public Class frmSendungsdetailsNEU
                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                    Mail = outl.CreateItem(0)

-
                    Dim OnylSND = -1
                    If sender Is AktuelleSendungAnhängeWählenToolStripMenuItem Then
                        'For Each r As DataGridViewRow In dgvAnhang.SelectedRows
@@ -5190,6 +5413,134 @@ Public Class frmSendungsdetailsNEU
        Me.Cursor = Cursors.Default
    End Sub

+
+    Private Sub AktuelleSendungGVMSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleEIDRSendungenToolStripMenuItem.Click, AktuelleSendungToolStripMenuItem.Click
+        Me.Cursor = Cursors.WaitCursor
+
+        Dim currentFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(SENDUNG_LIST(CURRENT_INDEX).FilialenNr,, "")
+        Try
+            VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
+            If True Then
+                Try
+
+                    Dim outl As New Outlook.Application
+                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                    Dim isReply As Boolean = False
+
+                    If dgvAnhang.SelectedRows.Count = 1 AndAlso dgvAnhang.CurrentRow.Cells("anh_Typ").Value = "MSG" Then
+
+                        Dim olSess = outl.Session
+
+                        Dim PathTmpANH = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.CurrentRow.Cells("anh_docId").Value)
+
+                        Mail = CType(olSess.OpenSharedItem(PathTmpANH), Outlook.MailItem)
+
+                        Mail = Mail.Reply()
+                        isReply = True
+
+                    Else
+
+                        Mail = outl.CreateItem(0)
+                    End If
+
+                    Dim OnylSND = -1
+                    If sender Is AktuelleSendungToolStripMenuItem Then
+
+                        OnylSND = CURRENT_INDEX
+                    End If
+
+                    'LEX 
+                    Mail.Subject = "GVMS: Kennzeichen: " & AVISO.LKW_Nr
+
+                    If OnylSND >= 0 Then Mail.Subject &= "  |  Pos: " & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "/" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr
+
+                    Dim DETextHTML = ""
+                    DETextHTML &= "Sehr geehrter Geschäftspartner,<br>"
+                    DETextHTML &= "<br>"
+                    DETextHTML &= "hiermit bestätigen wir, dass die folgende(n) Sendung(en) durch uns im EIDR Verfahren erfasst wurden.<br>
+                                Sie dürfen somit ins Zollgebiet des Vereinigten Königreichs einfahren und die Waren in den Freien Verkehr bringen.<br>"
+
+                    DETextHTML &= "Bitte beachten Sie, dass Sie vor der Überfahrt einen GVMS-Eintrag erstellen müssen.<br>"
+
+                    DETextHTML &= "Bitte verwenden Sie als Deklarationstyp die Entry In Declarant's Records (EIDR) und als Referenz unsere EORI-Nr: GB078068385000 <br>"
+
+                    DETextHTML &= "Wir übernehmen gerne die Eintragung für Sie – bitte antworten Sie auf dieses Mail, wenn die Anmeldung durch uns durchgeführt werden sollte.<br><br>"
+
+                    Dim ENTextHTML = ""
+                    ENTextHTML &= "<br>"
+                    ENTextHTML &= "Dear Business Partner,<br>"
+                    ENTextHTML &= "<br>"
+                    ENTextHTML &= "We hereby confirm that the following shipment(s) have been registered by us under the EIDR procedure.<br>
+                                You may therefore enter the customs territory of the United Kingdom and release the goods for free circulation.<br>"
+
+                    ENTextHTML &= "Please use Entry In Declarant's Records (EIDR) as declaration type and EORI no. GB078068385000 as reference.<br>"
+
+                    ENTextHTML &= "Please note that you must create a GVMS entry before crossing.<br>
+                                   We will be happy to make the entry for you - please reply to this email if the entry should be made by us"
+
+                    ENTextHTML &= "You will find instructions attached.<br><br>"
+                    ENTextHTML &= "Sendungen/Shipment(s):<br>"
+
+                    Dim TextHTMLtable = ""
+
+                    TextHTMLtable &= "<table border=1>"
+                    TextHTMLtable &= "<tr><td>Pos</td><td>Referenz</td><td>Absender/Sender</td><td>Empfänger/Recipient</td><td>Sendung/Shipment</td><td>Kennzeichen/License plate</td></tr>"
+
+
+                    Dim cnt = 1
+                    For Each SND In SENDUNG_LIST
+                        If (OnylSND >= 0 AndAlso SND Is SENDUNG_LIST(OnylSND)) Or (OnylSND < 0 And SND.FilialenNr = 7001 And SND.tblSnd_Abfertigungsart_ID = 46) Then
+                            TextHTMLtable &= "<tr>"
+                            TextHTMLtable &= "<td><b>" & cnt & "</b></td>"
+                            TextHTMLtable &= "<td><b>" & SND.FilialenNr & "/" & SND.AbfertigungsNr & "</b></td>"
+                            TextHTMLtable &= "<td><b>" & SND.tblSnd_Absender & "</b></td>"
+                            TextHTMLtable &= "<td><b>" & SND.tblSnd_Empfaenger & "</b></td>"
+                            TextHTMLtable &= "<td><b>" & SND.tblSnd_Colli & " Pk. " & SND.tblSnd_Warenbezeichnung & "   -  " & SND.tblSnd_Gewicht & " kg </b></td>"
+                            TextHTMLtable &= "<td><b>" & AVISO.LKW_Nr & "</b></td>"
+                            TextHTMLtable &= "</tr>"
+
+                            cnt += 1
+                        End If
+                    Next
+
+                    TextHTMLtable &= "</table>"
+
+                    Dim EndTextHTML = ""
+
+                    EndTextHTML &= "<br>"
+                    EndTextHTML &= "<br>"
+                    EndTextHTML &= "Für Rückfragen stehen wir gerne zur Verfügung/We are at your disposal for any questions<br>"
+                    EndTextHTML &= "<br>"
+                    EndTextHTML &= "Mit freundlichen Grüßen/Best regards<br>"
+                    EndTextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                    EndTextHTML &= "<br>"
+
+
+                    If isReply Then
+
+                        Dim HTML = DETextHTML & ENTextHTML & TextHTMLtable & EndTextHTML & SDL.cFakturierung.getSignature("DE") & Mail.HTMLBody
+                        Mail.HTMLBody = HTML
+                        Mail.Display()
+                    Else
+
+                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & DETextHTML & ENTextHTML & TextHTMLtable & EndTextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
+                        Mail.Display()
+                    End If
+
+                    'AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Doks an Fremdspedition (SUBEN) weitergeleitet.", 46)
+
+                Catch ex As Exception
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+                End Try
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+
+
    Private Sub AMBARZollbeschauToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARZollbeschauToolStripMenuItem.Click

        Me.Cursor = Cursors.WaitCursor
@@ -5281,4 +5632,119 @@ Public Class frmSendungsdetailsNEU
        End Try
        Me.Cursor = Cursors.Default
    End Sub
+
+    Sub calculateFreightCosts()
+
+        Dim frachkosten = New frmFrachtkostenBerechnen(txtAbsenderKdNr._value, txtEmpfaengerKdNr._value, txtGewicht.Text, txtFrachtkostenGesamt.Text)
+
+
+        If frachkosten.ShowDialog() = DialogResult.OK Then
+            txtFrachtkostenEU._value = frachkosten.EUAnteil
+            txtFrachtkostenNichtEU._value = frachkosten.nichtEUAnteil
+            txtFrachtkostenGesamt._value = frachkosten.tbxGesamtfrachtkosten._value
+        End If
+
+    End Sub
+
+    Private Sub btn_FrachtkostenBerechnen_Click(sender As Object, e As EventArgs) Handles btn_FrachtkostenBerechnen.Click
+
+        If txtFrachtkostenGesamt.Text = "" AndAlso txtGewicht.Text = "" Then
+            MsgBox("Bitte Gewicht oder Gesamtfrachtkosten angeben!")
+            txtGewicht.Focus()
+        Else
+            calculateFreightCosts()
+        End If
+
+    End Sub
+
+    Private Sub Button17_Click_2(sender As Object, e As EventArgs) Handles Button17.Click
+        Dim f As New SDL.frmCMR
+
+        f.btnCMRtoAkt.Visible = True
+        f.txtCMRName.Visible = True
+
+
+        If txtAbsender.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtAbsender.Text = txtAbsender.KdData_ADRESSEN.getAdressFromatted()
+        If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted()
+        If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted()
+
+        f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "")))
+
+        f.uCmr.txtKfz.Text = AVISO.LKW_Nr
+        f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr
+
+        If f.ShowDialog(Me) Then
+
+            Dim da_id = -1
+            Dim anhId = -1
+            Dim destPath = ""
+
+            Dim Typ = ""
+
+            If f.PDF_Path <> "" Then
+                Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR")
+                frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+                initAnhang()
+
+            End If
+
+        End If
+    End Sub
+
+
+    Sub initSND_CHAT(SendungsID)
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("LKW_CHAT") Then
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("LKW_CHAT", Me.FindForm) Then
+
+
+                picAVISOMessengerSNDChat.Visible = True
+                lblSNDChat_MsgCnt.Visible = False
+                Dim newMsgSnd = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT_SendungsID(SendungsID)
+                If newMsgSnd > 0 Then
+                    lblSNDChat_MsgCnt.Text = newMsgSnd
+                    lblSNDChat_MsgCnt.Visible = True
+                    lblSNDChat_MsgCnt.BringToFront()
+                End If
+
+
+            End If
+        End If
+
+    End Sub
+
+    Private Sub picAVISOMessengerSNDChat_Click(sender As Object, e As EventArgs) Handles picAVISOMessengerSNDChat.Click, lblSNDChat_MsgCnt.Click
+        SAVE_ME()
+
+        If SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr <= 0 Then MsgBox("Bitte zuerst AbfertigungsNr und FilialenNr vergeben!") : Exit Sub
+        If SENDUNG_LIST(CURRENT_INDEX).FilialenNr <= 0 Then MsgBox("Bitte zuerst AbfertigungsNr und FilialenNr vergeben!") : Exit Sub
+
+
+
+        Me.Cursor = Cursors.WaitCursor
+
+        If VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat.openSND_Chat(AVISO, SENDUNG_LIST(CURRENT_INDEX)) Then
+            initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+        End If
+
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub setContextMenuGVMSControl()
+
+        If cboFiliale._value = "7001" AndAlso cboAbfertigungsart._value = "46" Then
+            GVMSInfoToolStripMenuItem.Visible = True
+        Else
+            GVMSInfoToolStripMenuItem.Visible = False
+        End If
+
+    End Sub
+
+    Private Sub OhneGestellungsgarantieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OhneGestellungsgarantieToolStripMenuItem.Click
+
+    End Sub
+
+    Private Sub MitGestellungsgarantieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MitGestellungsgarantieToolStripMenuItem.Click
+
+    End Sub
 End Class
--- a/Aviso/frmWechselStandarddrucker.Designer.vb
+++ b/Aviso/frmWechselStandarddrucker.Designer.vb
@@ -0,0 +1,205 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmWechselStandarddrucker
+    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.cboDefaultprinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboDefaultprinterBON = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.lblDefaultprinter = New System.Windows.Forms.Label()
+        Me.lblDefaultbonprinter = New System.Windows.Forms.Label()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.lblCurrentPrinter = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtCurrentPrinter = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtCurrentPrinterBon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.SuspendLayout()
+        '
+        'cboDefaultprinter
+        '
+        Me.cboDefaultprinter._allowedValuesFreiText = Nothing
+        Me.cboDefaultprinter._allowFreiText = False
+        Me.cboDefaultprinter._value = ""
+        Me.cboDefaultprinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboDefaultprinter.FormattingEnabled = True
+        Me.cboDefaultprinter.Location = New System.Drawing.Point(156, 30)
+        Me.cboDefaultprinter.Name = "cboDefaultprinter"
+        Me.cboDefaultprinter.Size = New System.Drawing.Size(149, 21)
+        Me.cboDefaultprinter.TabIndex = 0
+        '
+        'cboDefaultprinterBON
+        '
+        Me.cboDefaultprinterBON._allowedValuesFreiText = Nothing
+        Me.cboDefaultprinterBON._allowFreiText = False
+        Me.cboDefaultprinterBON._value = ""
+        Me.cboDefaultprinterBON.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboDefaultprinterBON.FormattingEnabled = True
+        Me.cboDefaultprinterBON.Location = New System.Drawing.Point(156, 79)
+        Me.cboDefaultprinterBON.Name = "cboDefaultprinterBON"
+        Me.cboDefaultprinterBON.Size = New System.Drawing.Size(149, 21)
+        Me.cboDefaultprinterBON.TabIndex = 1
+        '
+        'btnOK
+        '
+        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(230, 106)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(75, 23)
+        Me.btnOK.TabIndex = 2
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'lblDefaultprinter
+        '
+        Me.lblDefaultprinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblDefaultprinter.AutoSize = True
+        Me.lblDefaultprinter.Location = New System.Drawing.Point(12, 33)
+        Me.lblDefaultprinter.Name = "lblDefaultprinter"
+        Me.lblDefaultprinter.Size = New System.Drawing.Size(45, 13)
+        Me.lblDefaultprinter.TabIndex = 3
+        Me.lblDefaultprinter.Text = "Drucker"
+        '
+        'lblDefaultbonprinter
+        '
+        Me.lblDefaultbonprinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblDefaultbonprinter.AutoSize = True
+        Me.lblDefaultbonprinter.Location = New System.Drawing.Point(12, 82)
+        Me.lblDefaultbonprinter.Name = "lblDefaultbonprinter"
+        Me.lblDefaultbonprinter.Size = New System.Drawing.Size(62, 13)
+        Me.lblDefaultbonprinter.TabIndex = 4
+        Me.lblDefaultbonprinter.Text = "Bondrucker"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(15, 106)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 5
+        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'lblCurrentPrinter
+        '
+        Me.lblCurrentPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblCurrentPrinter.AutoSize = True
+        Me.lblCurrentPrinter.Location = New System.Drawing.Point(12, 9)
+        Me.lblCurrentPrinter.Name = "lblCurrentPrinter"
+        Me.lblCurrentPrinter.Size = New System.Drawing.Size(88, 13)
+        Me.lblCurrentPrinter.TabIndex = 6
+        Me.lblCurrentPrinter.Text = "aktueller Drucker"
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 60)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(105, 13)
+        Me.Label1.TabIndex = 7
+        Me.Label1.Text = "aktueller Bondrucker"
+        '
+        'txtCurrentPrinter
+        '
+        Me.txtCurrentPrinter._DateTimeOnly = False
+        Me.txtCurrentPrinter._numbersOnly = False
+        Me.txtCurrentPrinter._numbersOnlyKommastellen = ""
+        Me.txtCurrentPrinter._numbersOnlyTrennzeichen = True
+        Me.txtCurrentPrinter._Prozent = False
+        Me.txtCurrentPrinter._ShortDateNew = False
+        Me.txtCurrentPrinter._ShortDateOnly = False
+        Me.txtCurrentPrinter._TimeOnly = False
+        Me.txtCurrentPrinter._TimeOnly_Seconds = False
+        Me.txtCurrentPrinter._value = ""
+        Me.txtCurrentPrinter._Waehrung = False
+        Me.txtCurrentPrinter._WaehrungZeichen = True
+        Me.txtCurrentPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtCurrentPrinter.ForeColor = System.Drawing.Color.Black
+        Me.txtCurrentPrinter.Location = New System.Drawing.Point(156, 6)
+        Me.txtCurrentPrinter.MaxLineLength = -1
+        Me.txtCurrentPrinter.MaxLines_Warning = ""
+        Me.txtCurrentPrinter.MaxLines_Warning_Label = Nothing
+        Me.txtCurrentPrinter.Name = "txtCurrentPrinter"
+        Me.txtCurrentPrinter.ReadOnly = True
+        Me.txtCurrentPrinter.Size = New System.Drawing.Size(149, 20)
+        Me.txtCurrentPrinter.TabIndex = 8
+        '
+        'txtCurrentPrinterBon
+        '
+        Me.txtCurrentPrinterBon._DateTimeOnly = False
+        Me.txtCurrentPrinterBon._numbersOnly = False
+        Me.txtCurrentPrinterBon._numbersOnlyKommastellen = ""
+        Me.txtCurrentPrinterBon._numbersOnlyTrennzeichen = True
+        Me.txtCurrentPrinterBon._Prozent = False
+        Me.txtCurrentPrinterBon._ShortDateNew = False
+        Me.txtCurrentPrinterBon._ShortDateOnly = False
+        Me.txtCurrentPrinterBon._TimeOnly = False
+        Me.txtCurrentPrinterBon._TimeOnly_Seconds = False
+        Me.txtCurrentPrinterBon._value = ""
+        Me.txtCurrentPrinterBon._Waehrung = False
+        Me.txtCurrentPrinterBon._WaehrungZeichen = True
+        Me.txtCurrentPrinterBon.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtCurrentPrinterBon.ForeColor = System.Drawing.Color.Black
+        Me.txtCurrentPrinterBon.Location = New System.Drawing.Point(156, 57)
+        Me.txtCurrentPrinterBon.MaxLineLength = -1
+        Me.txtCurrentPrinterBon.MaxLines_Warning = ""
+        Me.txtCurrentPrinterBon.MaxLines_Warning_Label = Nothing
+        Me.txtCurrentPrinterBon.Name = "txtCurrentPrinterBon"
+        Me.txtCurrentPrinterBon.ReadOnly = True
+        Me.txtCurrentPrinterBon.Size = New System.Drawing.Size(149, 20)
+        Me.txtCurrentPrinterBon.TabIndex = 9
+        '
+        'frmWechselStandarddrucker
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(315, 141)
+        Me.Controls.Add(Me.txtCurrentPrinterBon)
+        Me.Controls.Add(Me.txtCurrentPrinter)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.lblCurrentPrinter)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.lblDefaultbonprinter)
+        Me.Controls.Add(Me.lblDefaultprinter)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.cboDefaultprinterBON)
+        Me.Controls.Add(Me.cboDefaultprinter)
+        Me.Name = "frmWechselStandarddrucker"
+        Me.Text = "Standarddrucker wechseln"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents cboDefaultprinter As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboDefaultprinterBON As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents btnOK As Button
+    Friend WithEvents lblDefaultprinter As Label
+    Friend WithEvents lblDefaultbonprinter As Label
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents lblCurrentPrinter As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtCurrentPrinter As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtCurrentPrinterBon As VERAG_PROG_ALLGEMEIN.MyTextBox
+End Class
--- a/Aviso/frmWechselStandarddrucker.resx
+++ b/Aviso/frmWechselStandarddrucker.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Aviso/frmWechselStandarddrucker.vb
+++ b/Aviso/frmWechselStandarddrucker.vb
@@ -0,0 +1,119 @@
+Imports System.IO
+Imports System.Runtime.InteropServices
+
+Public Class frmWechselStandarddrucker
+
+
+    Private filePathListOfPrinters As List(Of String) = New List(Of String)
+
+    Private Sub frmWechselStandarddrucker_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+
+        filePathListOfPrinters.Add(FileIO.SpecialDirectories.MyDocuments & "\AVISO_OPTIONS.txt")
+        filePathListOfPrinters.Add("C:\AVISO_OPTIONS.txt")
+
+        For Each path As String In filePathListOfPrinters
+            getCurrentPrintersFromFile(path)
+        Next
+
+        txtCurrentPrinter._value = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD
+        txtCurrentPrinterBon._value = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
+
+
+        SDL.cProgramFunctions.initDrucker(cboDefaultprinter, VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD, False)
+        SDL.cProgramFunctions.initDrucker(cboDefaultprinterBON, VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON, False)
+
+
+    End Sub
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+
+        If cboDefaultprinterBON.SelectedItem Is Nothing Or cboDefaultprinter.SelectedItem Is Nothing Then Me.Close()
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD = cboDefaultprinter._value
+        VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON = cboDefaultprinterBON._value
+        Try
+            SetDefaultPrinter(cboDefaultprinter._value)
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+
+        For Each path As String In filePathListOfPrinters
+            changetxtFileForPrinter(path)
+        Next
+        MsgBox("Drucker wurden geändert")
+
+    End Sub
+
+    Private Function changetxtFileForPrinter(printerFile As String) As Boolean
+
+        Dim changed As Boolean = False
+        Try
+            If File.Exists(printerFile) Then
+                Dim l = IO.File.ReadAllLines(printerFile, System.Text.Encoding.Default)
+                If l.Count > 0 Then
+                    If Not String.IsNullOrWhiteSpace(cboDefaultprinter._value) Then
+                        Dim lines As List(Of String) = IO.File.ReadAllLines(printerFile).ToList
+                        For index As Integer = 0 To lines.Count - 1
+                            If lines(index).ToLower.StartsWith("printer") Then
+                                lines(index) = String.Concat("PRINTER:", cboDefaultprinter._value)
+                                changed = True
+                            End If
+                        Next
+                        If changed Then IO.File.WriteAllLines(printerFile, lines.ToArray)
+                    End If
+
+                    If Not String.IsNullOrWhiteSpace(cboDefaultprinterBON._value) Then
+                        Dim lines As List(Of String) = IO.File.ReadAllLines(printerFile).ToList
+                        For index As Integer = 0 To lines.Count - 1
+                            If lines(index).ToLower.StartsWith("bon") Then
+                                lines(index) = String.Concat("BON:", cboDefaultprinterBON._value)
+                                changed = True
+                            End If
+                        Next
+                        If changed Then IO.File.WriteAllLines(printerFile, lines.ToArray)
+                    End If
+
+                End If
+            End If
+
+            Return changed
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+
+    End Function
+
+    Private Sub getCurrentPrintersFromFile(printerFile As String)
+        Try
+
+            If File.Exists(printerFile) Then
+                Dim l = IO.File.ReadAllLines(printerFile, System.Text.Encoding.Default)
+                If l.Count > 0 Then
+                    For Each li In l
+                        If li.StartsWith("BON:") Then
+                            VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON = (li.Replace("BON:", "")).Trim
+                        End If
+                        If li.StartsWith("PRINTER:") Then
+                            VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD = (li.Replace("PRINTER:", "")).Trim
+
+                        End If
+                    Next
+                End If
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+
+    End Sub
+
+
+
+
+    <DllImport("winspool.drv", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function SetDefaultPrinter(Name As String) As Boolean
+    End Function
+
+
+
+End Class
--- a/Aviso/packages.config
+++ b/Aviso/packages.config
@@ -4,18 +4,16 @@
  <package id="cef.redist.x86" version="75.1.14" targetFramework="net47" />
  <package id="CefSharp.Common" version="75.1.143" targetFramework="net47" />
  <package id="CefSharp.WinForms" version="75.1.143" targetFramework="net47" />
-  <package id="ClosedXML" version="0.96.0" targetFramework="net47" />
  <package id="Common.Logging" version="3.4.1" targetFramework="net47" />
  <package id="Common.Logging.Core" version="3.4.1" targetFramework="net47" />
-  <package id="DocumentFormat.OpenXml" version="2.16.0" targetFramework="net47" />
+  <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
  <package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
-  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net47" />
  <package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
  <package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
  <package id="itext7" version="7.1.11" targetFramework="net47" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net47" />
+  <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
  <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
  <package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
--- a/Aviso/usrCntlAviso_Vorpapiere.Designer.vb
+++ b/Aviso/usrCntlAviso_Vorpapiere.Designer.vb
@@ -33,10 +33,13 @@ Partial Class usrCntlAviso_Vorpapiere
        '
        'GroupBox1
        '
+        Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.GroupBox1.Controls.Add(Me.dgvVorpapier)
        Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(403, 150)
+        Me.GroupBox1.Size = New System.Drawing.Size(403, 157)
        Me.GroupBox1.TabIndex = 57
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "Vorpapiere"
@@ -46,13 +49,16 @@ Partial Class usrCntlAviso_Vorpapiere
        Me.dgvVorpapier.AKTUALISIERUNGS_INTERVALL = -1
        Me.dgvVorpapier.AllowUserToResizeColumns = False
        Me.dgvVorpapier.AllowUserToResizeRows = False
+        Me.dgvVorpapier.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.dgvVorpapier.BackgroundColor = System.Drawing.Color.White
        Me.dgvVorpapier.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvVorpapier.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.clmnMRN})
        Me.dgvVorpapier.Location = New System.Drawing.Point(9, 19)
        Me.dgvVorpapier.Name = "dgvVorpapier"
        Me.dgvVorpapier.RowHeadersWidth = 25
-        Me.dgvVorpapier.Size = New System.Drawing.Size(388, 126)
+        Me.dgvVorpapier.Size = New System.Drawing.Size(388, 133)
        Me.dgvVorpapier.TabIndex = 36
        '
        'clmnArt
--- a/Aviso/usrCntlEintragAvisoAtilla.vb
+++ b/Aviso/usrCntlEintragAvisoAtilla.vb
@@ -1,12 +1,19 @@
 Public Class usrCntlEintragAvisoAtilla

    Private Sub usrCntlEintragAvisoAtilla_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
-        sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+        'sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_name] +' (' +[basncd_alpha]+')' as display FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "display", "ATLAS", , 400, 200, {"display", "basncd_dstnr"})
+
+        sbDurchgangszollstelle1.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle2.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle3.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle4.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle5.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        sbDurchgangszollstelle6.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})

    End Sub

--- a/Aviso/usrCntlSND_Ausfuhr.Designer.vb
+++ b/Aviso/usrCntlSND_Ausfuhr.Designer.vb
@@ -0,0 +1,455 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class usrCntlSND_Ausfuhr
+    Inherits System.Windows.Forms.UserControl
+
+    'UserControl ü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.pnlT1 = New System.Windows.Forms.Panel()
+        Me.cbxNCTSAufDispo = New System.Windows.Forms.CheckBox()
+        Me.picDel = New System.Windows.Forms.PictureBox()
+        Me.txtT1Verzollungsadresse = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.lblNGAId = New System.Windows.Forms.Label()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.txtT1VerzollungsadresseEORI_NL = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.txtT1VerzollungsadresseAnspr = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.sbT1VerzollungsadresseLand = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.txtT1VerzollungsadresseEORI = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.txtT1VerzollungsadresseOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtT1VerzollungsadressePlz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtT1VerzollungsadresseStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label33 = New System.Windows.Forms.Label()
+        Me.LinkLabel4 = New System.Windows.Forms.LinkLabel()
+        Me.pnlT1.SuspendLayout()
+        CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'pnlT1
+        '
+        Me.pnlT1.Controls.Add(Me.cbxNCTSAufDispo)
+        Me.pnlT1.Controls.Add(Me.picDel)
+        Me.pnlT1.Controls.Add(Me.txtT1Verzollungsadresse)
+        Me.pnlT1.Controls.Add(Me.Label5)
+        Me.pnlT1.Controls.Add(Me.lblNGAId)
+        Me.pnlT1.Controls.Add(Me.btn)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseEORI_NL)
+        Me.pnlT1.Controls.Add(Me.Label2)
+        Me.pnlT1.Controls.Add(Me.Label3)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseAnspr)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseBestimmungszollstelle)
+        Me.pnlT1.Controls.Add(Me.Label1)
+        Me.pnlT1.Controls.Add(Me.sbT1VerzollungsadresseLand)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseEORI)
+        Me.pnlT1.Controls.Add(Me.Label9)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseOrt)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadressePlz)
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseStrasse)
+        Me.pnlT1.Controls.Add(Me.Label33)
+        Me.pnlT1.Controls.Add(Me.LinkLabel4)
+        Me.pnlT1.Location = New System.Drawing.Point(0, 0)
+        Me.pnlT1.Name = "pnlT1"
+        Me.pnlT1.Size = New System.Drawing.Size(549, 101)
+        Me.pnlT1.TabIndex = 0
+        '
+        'cbxNCTSAufDispo
+        '
+        Me.cbxNCTSAufDispo.AutoSize = True
+        Me.cbxNCTSAufDispo.Checked = True
+        Me.cbxNCTSAufDispo.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxNCTSAufDispo.Location = New System.Drawing.Point(397, 75)
+        Me.cbxNCTSAufDispo.Name = "cbxNCTSAufDispo"
+        Me.cbxNCTSAufDispo.Size = New System.Drawing.Size(96, 17)
+        Me.cbxNCTSAufDispo.TabIndex = 19
+        Me.cbxNCTSAufDispo.Text = "Adr. auf Dispo."
+        Me.cbxNCTSAufDispo.UseVisualStyleBackColor = True
+        Me.cbxNCTSAufDispo.Visible = False
+        '
+        'picDel
+        '
+        Me.picDel.BackgroundImage = Global.AVISO.My.Resources.Resources.del
+        Me.picDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.picDel.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.picDel.Location = New System.Drawing.Point(100, 52)
+        Me.picDel.Name = "picDel"
+        Me.picDel.Size = New System.Drawing.Size(15, 15)
+        Me.picDel.TabIndex = 18
+        Me.picDel.TabStop = False
+        Me.picDel.Visible = False
+        '
+        'txtT1Verzollungsadresse
+        '
+        Me.txtT1Verzollungsadresse._allowFreitext = True
+        Me.txtT1Verzollungsadresse._AllowSetValue = False
+        Me.txtT1Verzollungsadresse._allowSpaceAsSplitter = False
+        Me.txtT1Verzollungsadresse._autoSizeGross = False
+        Me.txtT1Verzollungsadresse._hideIfListEmpty = True
+        Me.txtT1Verzollungsadresse._value = Nothing
+        Me.txtT1Verzollungsadresse.conn_art = "FMZOLL"
+        Me.txtT1Verzollungsadresse.dgvpos = "LEFT"
+        Me.txtT1Verzollungsadresse.DISPLAY_PARAM = Nothing
+        Me.txtT1Verzollungsadresse.INVISIBLE_COLUMNS = Nothing
+        Me.txtT1Verzollungsadresse.key_visible = False
+        Me.txtT1Verzollungsadresse.KEYPARAM = Nothing
+        Me.txtT1Verzollungsadresse.Location = New System.Drawing.Point(121, 11)
+        Me.txtT1Verzollungsadresse.Name = "txtT1Verzollungsadresse"
+        Me.txtT1Verzollungsadresse.searchActive = True
+        Me.txtT1Verzollungsadresse.Size = New System.Drawing.Size(269, 20)
+        Me.txtT1Verzollungsadresse.SQL_ORDER_BY = Nothing
+        Me.txtT1Verzollungsadresse.SQL_SELECT = Nothing
+        Me.txtT1Verzollungsadresse.SQL_WHERE = Nothing
+        Me.txtT1Verzollungsadresse.SQL_WhereParamList = Nothing
+        Me.txtT1Verzollungsadresse.TabIndex = 1
+        Me.txtT1Verzollungsadresse.usrcntl = Nothing
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(23, 52)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(19, 13)
+        Me.Label5.TabIndex = 8
+        Me.Label5.Text = "Id:"
+        '
+        'lblNGAId
+        '
+        Me.lblNGAId.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblNGAId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblNGAId.Location = New System.Drawing.Point(48, 52)
+        Me.lblNGAId.Name = "lblNGAId"
+        Me.lblNGAId.Size = New System.Drawing.Size(46, 17)
+        Me.lblNGAId.TabIndex = 9
+        Me.lblNGAId.Text = "-"
+        Me.lblNGAId.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'btn
+        '
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.btn.Location = New System.Drawing.Point(438, 51)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(108, 23)
+        Me.btn.TabIndex = 17
+        Me.btn.Text = "speichern"
+        Me.btn.UseVisualStyleBackColor = True
+        '
+        'txtT1VerzollungsadresseEORI_NL
+        '
+        Me.txtT1VerzollungsadresseEORI_NL._allowFreitext = False
+        Me.txtT1VerzollungsadresseEORI_NL._AllowSetValue = False
+        Me.txtT1VerzollungsadresseEORI_NL._allowSpaceAsSplitter = False
+        Me.txtT1VerzollungsadresseEORI_NL._autoSizeGross = False
+        Me.txtT1VerzollungsadresseEORI_NL._hideIfListEmpty = True
+        Me.txtT1VerzollungsadresseEORI_NL._value = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.conn_art = "FMZOLL"
+        Me.txtT1VerzollungsadresseEORI_NL.dgvpos = "LEFT"
+        Me.txtT1VerzollungsadresseEORI_NL.DISPLAY_PARAM = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.INVISIBLE_COLUMNS = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.key_visible = False
+        Me.txtT1VerzollungsadresseEORI_NL.KEYPARAM = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.Location = New System.Drawing.Point(455, 30)
+        Me.txtT1VerzollungsadresseEORI_NL.MaxLength = 4
+        Me.txtT1VerzollungsadresseEORI_NL.Name = "txtT1VerzollungsadresseEORI_NL"
+        Me.txtT1VerzollungsadresseEORI_NL.searchActive = True
+        Me.txtT1VerzollungsadresseEORI_NL.Size = New System.Drawing.Size(91, 20)
+        Me.txtT1VerzollungsadresseEORI_NL.SQL_ORDER_BY = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.SQL_SELECT = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.SQL_WHERE = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.SQL_WhereParamList = Nothing
+        Me.txtT1VerzollungsadresseEORI_NL.TabIndex = 7
+        Me.txtT1VerzollungsadresseEORI_NL.usrcntl = Nothing
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(396, 33)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(53, 13)
+        Me.Label2.TabIndex = 6
+        Me.Label2.Text = "EORI-NL:"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(23, 75)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(51, 13)
+        Me.Label3.TabIndex = 15
+        Me.Label3.Text = "Zollstelle:"
+        '
+        'txtT1VerzollungsadresseAnspr
+        '
+        Me.txtT1VerzollungsadresseAnspr._allowFreitext = False
+        Me.txtT1VerzollungsadresseAnspr._AllowSetValue = False
+        Me.txtT1VerzollungsadresseAnspr._allowSpaceAsSplitter = False
+        Me.txtT1VerzollungsadresseAnspr._autoSizeGross = False
+        Me.txtT1VerzollungsadresseAnspr._hideIfListEmpty = True
+        Me.txtT1VerzollungsadresseAnspr._value = Nothing
+        Me.txtT1VerzollungsadresseAnspr.conn_art = "FMZOLL"
+        Me.txtT1VerzollungsadresseAnspr.dgvpos = "LEFT"
+        Me.txtT1VerzollungsadresseAnspr.DISPLAY_PARAM = Nothing
+        Me.txtT1VerzollungsadresseAnspr.INVISIBLE_COLUMNS = Nothing
+        Me.txtT1VerzollungsadresseAnspr.key_visible = False
+        Me.txtT1VerzollungsadresseAnspr.KEYPARAM = Nothing
+        Me.txtT1VerzollungsadresseAnspr.Location = New System.Drawing.Point(438, 49)
+        Me.txtT1VerzollungsadresseAnspr.MaxLength = 35
+        Me.txtT1VerzollungsadresseAnspr.Name = "txtT1VerzollungsadresseAnspr"
+        Me.txtT1VerzollungsadresseAnspr.searchActive = True
+        Me.txtT1VerzollungsadresseAnspr.Size = New System.Drawing.Size(108, 20)
+        Me.txtT1VerzollungsadresseAnspr.SQL_ORDER_BY = Nothing
+        Me.txtT1VerzollungsadresseAnspr.SQL_SELECT = Nothing
+        Me.txtT1VerzollungsadresseAnspr.SQL_WHERE = Nothing
+        Me.txtT1VerzollungsadresseAnspr.SQL_WhereParamList = Nothing
+        Me.txtT1VerzollungsadresseAnspr.TabIndex = 14
+        Me.txtT1VerzollungsadresseAnspr.usrcntl = Nothing
+        Me.txtT1VerzollungsadresseAnspr.Visible = False
+        '
+        'txtT1VerzollungsadresseBestimmungszollstelle
+        '
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.conn_art = "FMZOLL"
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.dgvpos = "LEFT"
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.DISPLAY_PARAM = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72)
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 50
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle"
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(269, 20)
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_ORDER_BY = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_SELECT = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WHERE = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WhereParamList = Nothing
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 16
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(396, 52)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(40, 13)
+        Me.Label1.TabIndex = 13
+        Me.Label1.Text = "Anspr.:"
+        Me.Label1.Visible = False
+        '
+        'sbT1VerzollungsadresseLand
+        '
+        Me.sbT1VerzollungsadresseLand._allowFreitext = False
+        Me.sbT1VerzollungsadresseLand._AllowSetValue = False
+        Me.sbT1VerzollungsadresseLand._allowSpaceAsSplitter = False
+        Me.sbT1VerzollungsadresseLand._autoSizeGross = False
+        Me.sbT1VerzollungsadresseLand._hideIfListEmpty = True
+        Me.sbT1VerzollungsadresseLand._value = Nothing
+        Me.sbT1VerzollungsadresseLand.conn_art = "FMZOLL"
+        Me.sbT1VerzollungsadresseLand.dgvpos = "LEFT"
+        Me.sbT1VerzollungsadresseLand.DISPLAY_PARAM = Nothing
+        Me.sbT1VerzollungsadresseLand.INVISIBLE_COLUMNS = Nothing
+        Me.sbT1VerzollungsadresseLand.key_visible = False
+        Me.sbT1VerzollungsadresseLand.KEYPARAM = Nothing
+        Me.sbT1VerzollungsadresseLand.Location = New System.Drawing.Point(121, 49)
+        Me.sbT1VerzollungsadresseLand.MaxLength = 20
+        Me.sbT1VerzollungsadresseLand.Name = "sbT1VerzollungsadresseLand"
+        Me.sbT1VerzollungsadresseLand.searchActive = True
+        Me.sbT1VerzollungsadresseLand.Size = New System.Drawing.Size(32, 20)
+        Me.sbT1VerzollungsadresseLand.SQL_ORDER_BY = Nothing
+        Me.sbT1VerzollungsadresseLand.SQL_SELECT = Nothing
+        Me.sbT1VerzollungsadresseLand.SQL_WHERE = Nothing
+        Me.sbT1VerzollungsadresseLand.SQL_WhereParamList = Nothing
+        Me.sbT1VerzollungsadresseLand.TabIndex = 10
+        Me.sbT1VerzollungsadresseLand.usrcntl = Nothing
+        '
+        'txtT1VerzollungsadresseEORI
+        '
+        Me.txtT1VerzollungsadresseEORI._allowFreitext = False
+        Me.txtT1VerzollungsadresseEORI._AllowSetValue = False
+        Me.txtT1VerzollungsadresseEORI._allowSpaceAsSplitter = False
+        Me.txtT1VerzollungsadresseEORI._autoSizeGross = False
+        Me.txtT1VerzollungsadresseEORI._hideIfListEmpty = True
+        Me.txtT1VerzollungsadresseEORI._value = Nothing
+        Me.txtT1VerzollungsadresseEORI.conn_art = "FMZOLL"
+        Me.txtT1VerzollungsadresseEORI.dgvpos = "LEFT"
+        Me.txtT1VerzollungsadresseEORI.DISPLAY_PARAM = Nothing
+        Me.txtT1VerzollungsadresseEORI.INVISIBLE_COLUMNS = Nothing
+        Me.txtT1VerzollungsadresseEORI.key_visible = False
+        Me.txtT1VerzollungsadresseEORI.KEYPARAM = Nothing
+        Me.txtT1VerzollungsadresseEORI.Location = New System.Drawing.Point(438, 11)
+        Me.txtT1VerzollungsadresseEORI.MaxLength = 17
+        Me.txtT1VerzollungsadresseEORI.Name = "txtT1VerzollungsadresseEORI"
+        Me.txtT1VerzollungsadresseEORI.searchActive = True
+        Me.txtT1VerzollungsadresseEORI.Size = New System.Drawing.Size(108, 20)
+        Me.txtT1VerzollungsadresseEORI.SQL_ORDER_BY = Nothing
+        Me.txtT1VerzollungsadresseEORI.SQL_SELECT = Nothing
+        Me.txtT1VerzollungsadresseEORI.SQL_WHERE = Nothing
+        Me.txtT1VerzollungsadresseEORI.SQL_WhereParamList = Nothing
+        Me.txtT1VerzollungsadresseEORI.TabIndex = 2
+        Me.txtT1VerzollungsadresseEORI.usrcntl = Nothing
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(396, 14)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(36, 13)
+        Me.Label9.TabIndex = 4
+        Me.Label9.Text = "EORI:"
+        '
+        'txtT1VerzollungsadresseOrt
+        '
+        Me.txtT1VerzollungsadresseOrt._DateTimeOnly = False
+        Me.txtT1VerzollungsadresseOrt._numbersOnly = False
+        Me.txtT1VerzollungsadresseOrt._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadresseOrt._numbersOnlyTrennzeichen = True
+        Me.txtT1VerzollungsadresseOrt._Prozent = False
+        Me.txtT1VerzollungsadresseOrt._ShortDateNew = False
+        Me.txtT1VerzollungsadresseOrt._ShortDateOnly = False
+        Me.txtT1VerzollungsadresseOrt._TimeOnly = False
+        Me.txtT1VerzollungsadresseOrt._TimeOnly_Seconds = False
+        Me.txtT1VerzollungsadresseOrt._value = Nothing
+        Me.txtT1VerzollungsadresseOrt._Waehrung = False
+        Me.txtT1VerzollungsadresseOrt._WaehrungZeichen = True
+        Me.txtT1VerzollungsadresseOrt.ForeColor = System.Drawing.Color.Black
+        Me.txtT1VerzollungsadresseOrt.Location = New System.Drawing.Point(213, 49)
+        Me.txtT1VerzollungsadresseOrt.MaxLength = 35
+        Me.txtT1VerzollungsadresseOrt.MaxLineLength = -1
+        Me.txtT1VerzollungsadresseOrt.MaxLines_Warning = ""
+        Me.txtT1VerzollungsadresseOrt.MaxLines_Warning_Label = Nothing
+        Me.txtT1VerzollungsadresseOrt.Name = "txtT1VerzollungsadresseOrt"
+        Me.txtT1VerzollungsadresseOrt.Size = New System.Drawing.Size(177, 20)
+        Me.txtT1VerzollungsadresseOrt.TabIndex = 12
+        '
+        'txtT1VerzollungsadressePlz
+        '
+        Me.txtT1VerzollungsadressePlz._DateTimeOnly = False
+        Me.txtT1VerzollungsadressePlz._numbersOnly = False
+        Me.txtT1VerzollungsadressePlz._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadressePlz._numbersOnlyTrennzeichen = True
+        Me.txtT1VerzollungsadressePlz._Prozent = False
+        Me.txtT1VerzollungsadressePlz._ShortDateNew = False
+        Me.txtT1VerzollungsadressePlz._ShortDateOnly = False
+        Me.txtT1VerzollungsadressePlz._TimeOnly = False
+        Me.txtT1VerzollungsadressePlz._TimeOnly_Seconds = False
+        Me.txtT1VerzollungsadressePlz._value = Nothing
+        Me.txtT1VerzollungsadressePlz._Waehrung = False
+        Me.txtT1VerzollungsadressePlz._WaehrungZeichen = True
+        Me.txtT1VerzollungsadressePlz.ForeColor = System.Drawing.Color.Black
+        Me.txtT1VerzollungsadressePlz.Location = New System.Drawing.Point(152, 49)
+        Me.txtT1VerzollungsadressePlz.MaxLength = 9
+        Me.txtT1VerzollungsadressePlz.MaxLineLength = -1
+        Me.txtT1VerzollungsadressePlz.MaxLines_Warning = ""
+        Me.txtT1VerzollungsadressePlz.MaxLines_Warning_Label = Nothing
+        Me.txtT1VerzollungsadressePlz.Name = "txtT1VerzollungsadressePlz"
+        Me.txtT1VerzollungsadressePlz.Size = New System.Drawing.Size(62, 20)
+        Me.txtT1VerzollungsadressePlz.TabIndex = 11
+        '
+        'txtT1VerzollungsadresseStrasse
+        '
+        Me.txtT1VerzollungsadresseStrasse._DateTimeOnly = False
+        Me.txtT1VerzollungsadresseStrasse._numbersOnly = False
+        Me.txtT1VerzollungsadresseStrasse._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadresseStrasse._numbersOnlyTrennzeichen = True
+        Me.txtT1VerzollungsadresseStrasse._Prozent = False
+        Me.txtT1VerzollungsadresseStrasse._ShortDateNew = False
+        Me.txtT1VerzollungsadresseStrasse._ShortDateOnly = False
+        Me.txtT1VerzollungsadresseStrasse._TimeOnly = False
+        Me.txtT1VerzollungsadresseStrasse._TimeOnly_Seconds = False
+        Me.txtT1VerzollungsadresseStrasse._value = Nothing
+        Me.txtT1VerzollungsadresseStrasse._Waehrung = False
+        Me.txtT1VerzollungsadresseStrasse._WaehrungZeichen = True
+        Me.txtT1VerzollungsadresseStrasse.ForeColor = System.Drawing.Color.Black
+        Me.txtT1VerzollungsadresseStrasse.Location = New System.Drawing.Point(121, 30)
+        Me.txtT1VerzollungsadresseStrasse.MaxLength = 35
+        Me.txtT1VerzollungsadresseStrasse.MaxLineLength = -1
+        Me.txtT1VerzollungsadresseStrasse.MaxLines_Warning = ""
+        Me.txtT1VerzollungsadresseStrasse.MaxLines_Warning_Label = Nothing
+        Me.txtT1VerzollungsadresseStrasse.Name = "txtT1VerzollungsadresseStrasse"
+        Me.txtT1VerzollungsadresseStrasse.Size = New System.Drawing.Size(269, 20)
+        Me.txtT1VerzollungsadresseStrasse.TabIndex = 5
+        '
+        'Label33
+        '
+        Me.Label33.AutoSize = True
+        Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label33.Location = New System.Drawing.Point(23, 14)
+        Me.Label33.Name = "Label33"
+        Me.Label33.Size = New System.Drawing.Size(57, 26)
+        Me.Label33.TabIndex = 3
+        Me.Label33.Text = "Amtsplatz/" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zollstopp" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+        '
+        'LinkLabel4
+        '
+        Me.LinkLabel4.AutoSize = True
+        Me.LinkLabel4.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.LinkLabel4.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(30, Byte), Integer), CType(CType(90, Byte), Integer))
+        Me.LinkLabel4.Location = New System.Drawing.Point(319, -2)
+        Me.LinkLabel4.Name = "LinkLabel4"
+        Me.LinkLabel4.Size = New System.Drawing.Size(41, 9)
+        Me.LinkLabel4.TabIndex = 0
+        Me.LinkLabel4.TabStop = True
+        Me.LinkLabel4.Text = "= Absender"
+        '
+        'usrCntlSND_Ausfuhr
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.pnlT1)
+        Me.Name = "usrCntlSND_Ausfuhr"
+        Me.Size = New System.Drawing.Size(549, 94)
+        Me.pnlT1.ResumeLayout(False)
+        Me.pnlT1.PerformLayout()
+        CType(Me.picDel, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents pnlT1 As System.Windows.Forms.Panel
+    Friend WithEvents sbT1VerzollungsadresseLand As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents txtT1VerzollungsadresseEORI As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents Label9 As System.Windows.Forms.Label
+    Friend WithEvents txtT1VerzollungsadresseOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtT1VerzollungsadressePlz As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtT1VerzollungsadresseStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label33 As System.Windows.Forms.Label
+    Friend WithEvents LinkLabel4 As System.Windows.Forms.LinkLabel
+    Friend WithEvents txtT1VerzollungsadresseAnspr As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label3 As System.Windows.Forms.Label
+    Friend WithEvents txtT1VerzollungsadresseEORI_NL As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+    Friend WithEvents btn As Button
+    Friend WithEvents Label5 As Label
+    Friend WithEvents lblNGAId As Label
+    Friend WithEvents txtT1Verzollungsadresse As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents picDel As PictureBox
+    Friend WithEvents cbxNCTSAufDispo As CheckBox
+End Class
--- a/Aviso/usrCntlSND_Ausfuhr.resx
+++ b/Aviso/usrCntlSND_Ausfuhr.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Aviso/usrCntlSND_Ausfuhr.vb
+++ b/Aviso/usrCntlSND_Ausfuhr.vb
@@ -0,0 +1,134 @@
+Public Class usrCntlSND_Ausfuhr
+
+    Public NCTS_GA As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
+
+
+    Sub New()
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
+    Sub New(id)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(id)
+
+
+
+    End Sub
+
+
+    Public Sub setValues()
+        txtT1Verzollungsadresse.Text = If(NCTS_GA.nga_name, "")
+        txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "")
+        txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "")
+        txtT1VerzollungsadresseOrt.Text = If(NCTS_GA.nga_ort, "")
+        sbT1VerzollungsadresseLand.SET_VALUE(If(NCTS_GA.nga_land, ""))
+
+        txtT1VerzollungsadresseAnspr.Text = If(NCTS_GA.nga_Ansprechpartner, "")
+        txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "")
+        txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "")
+        txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, ""))
+
+
+        lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
+        picDel.Visible = (NCTS_GA.nga_id > 0)
+    End Sub
+
+
+    Public Sub getValues()
+        NCTS_GA.nga_name = txtT1Verzollungsadresse.Text
+        NCTS_GA.nga_strasse = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseStrasse.Text)
+        NCTS_GA.nga_plz = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadressePlz.Text)
+        NCTS_GA.nga_ort = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseOrt.Text)
+        NCTS_GA.nga_land = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(sbT1VerzollungsadresseLand._value)
+
+        NCTS_GA.nga_Ansprechpartner = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseAnspr.Text)
+        NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text)
+        NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text)
+        NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value)
+    End Sub
+
+    Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked
+        Try
+            If Me.FindForm.GetType Is GetType(frmSendungsdetailsNEU) Then
+                Dim f = DirectCast(Me.FindForm, frmSendungsdetailsNEU)
+                If f.txtAbsender.KdNr > 0 AndAlso f.txtAbsender.KdData_ADRESSEN IsNot Nothing Then
+                    txtT1Verzollungsadresse.Text = (If(f.txtAbsender.KdData_ADRESSEN.Name_1, "") & " " & If(f.txtAbsender.KdData_ADRESSEN.Name_2, "")).trim
+                    txtT1VerzollungsadresseStrasse.Text = If(f.txtAbsender.KdData_ADRESSEN.Straße, "")
+                    txtT1VerzollungsadressePlz.Text = If(f.txtAbsender.KdData_ADRESSEN.PLZ, "")
+                    txtT1VerzollungsadresseOrt.Text = If(f.txtAbsender.KdData_ADRESSEN.Ort, "")
+
+                    sbT1VerzollungsadresseLand.SET_VALUE(SDL.cProgramFunctions.getISO2Land(If(f.txtAbsender.KdData_ADRESSEN.LandKz, "")))
+
+                    If f.txtAbsender.KdData_KUNDE IsNot Nothing Then
+                        txtT1VerzollungsadresseEORI.Text = If(f.txtAbsender.KdData_KUNDE.EORITIN, "")
+                        txtT1VerzollungsadresseEORI_NL.Text = If(f.txtAbsender.KdData_KUNDE.EORITIN_NL, "")
+
+                    End If
+                Else
+                    txtT1Verzollungsadresse.Text = f.txtAbsender.Text
+                End If
+            End If
+        Catch ex As Exception
+
+        End Try
+    End Sub
+
+    Private Sub usrCntlSND_NCTSGestellungsadresse_Load(sender As Object, e As EventArgs) Handles Me.Load
+        If NCTS_GA Is Nothing Then : NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
+        Else : setValues() : End If
+
+
+        '   txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as displayPARAM FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "displayPARAM", "FMZOLL", True, 400, 200, {"displayPARAM", "Code"})
+
+        sbT1VerzollungsadresseLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code] display   FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200)
+        txtT1Verzollungsadresse.initSearchBox(Me.FindForm, " [nga_id] ,[nga_name] as Name,isnull(nga_ort,'') as Ort   FROM tblNCTSGestellungsadressen", {"nga_id", "nga_name", "nga_ort", "nga_strasse", "nga_bestZollst", "nga_EORI"}, " nga_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", "nga_id", "nga_id", "Name", "FMZOLL", , 400, 200, {"nga_id"})
+    End Sub
+
+
+    Sub reset()
+        NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
+        setValues()
+    End Sub
+
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+        Save_Me()
+
+    End Sub
+
+    Function Save_Me() As Boolean
+
+        getValues()
+        Save_Me = NCTS_GA.SAVE
+        lblNGAId.Text = NCTS_GA.nga_id
+
+    End Function
+
+    Private Sub txtT1Verzollungsadresse_VALUE_CHANGED() Handles txtT1Verzollungsadresse.VALUE_CHANGED
+        If txtT1Verzollungsadresse._value <> "" Then
+            NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(txtT1Verzollungsadresse._value)
+            setValues()
+        End If
+
+    End Sub
+
+    Private Sub lblNGAId_Click(sender As Object, e As EventArgs) Handles lblNGAId.Click
+        reset()
+    End Sub
+
+    Private Sub picDel_Click(sender As Object, e As EventArgs) Handles picDel.Click
+        If vbYes = MsgBox("Möchten Sie die NCTS-Gestellungsadresse wirklich löschen?", vbYesNoCancel + MsgBoxStyle.DefaultButton2) Then
+            NCTS_GA.DELETE()
+            NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
+            setValues()
+        End If
+    End Sub
+
+End Class
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
@@ -102,6 +102,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.txtT1Verzollungsadresse._allowFreitext = True
        Me.txtT1Verzollungsadresse._AllowSetValue = False
+        Me.txtT1Verzollungsadresse._allowSpaceAsSplitter = False
        Me.txtT1Verzollungsadresse._autoSizeGross = False
        Me.txtT1Verzollungsadresse._hideIfListEmpty = True
        Me.txtT1Verzollungsadresse._value = Nothing
@@ -158,6 +159,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.txtT1VerzollungsadresseEORI_NL._allowFreitext = False
        Me.txtT1VerzollungsadresseEORI_NL._AllowSetValue = False
+        Me.txtT1VerzollungsadresseEORI_NL._allowSpaceAsSplitter = False
        Me.txtT1VerzollungsadresseEORI_NL._autoSizeGross = False
        Me.txtT1VerzollungsadresseEORI_NL._hideIfListEmpty = True
        Me.txtT1VerzollungsadresseEORI_NL._value = Nothing
@@ -201,6 +203,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.txtT1VerzollungsadresseAnspr._allowFreitext = False
        Me.txtT1VerzollungsadresseAnspr._AllowSetValue = False
+        Me.txtT1VerzollungsadresseAnspr._allowSpaceAsSplitter = False
        Me.txtT1VerzollungsadresseAnspr._autoSizeGross = False
        Me.txtT1VerzollungsadresseAnspr._hideIfListEmpty = True
        Me.txtT1VerzollungsadresseAnspr._value = Nothing
@@ -227,6 +230,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False
        Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False
+        Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False
        Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False
        Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True
        Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing
@@ -237,7 +241,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False
        Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing
        Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72)
-        Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8
+        Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 50
        Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle"
        Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True
        Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(269, 20)
@@ -262,6 +266,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.sbT1VerzollungsadresseLand._allowFreitext = False
        Me.sbT1VerzollungsadresseLand._AllowSetValue = False
+        Me.sbT1VerzollungsadresseLand._allowSpaceAsSplitter = False
        Me.sbT1VerzollungsadresseLand._autoSizeGross = False
        Me.sbT1VerzollungsadresseLand._hideIfListEmpty = True
        Me.sbT1VerzollungsadresseLand._value = Nothing
@@ -287,6 +292,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        Me.txtT1VerzollungsadresseEORI._allowFreitext = False
        Me.txtT1VerzollungsadresseEORI._AllowSetValue = False
+        Me.txtT1VerzollungsadresseEORI._allowSpaceAsSplitter = False
        Me.txtT1VerzollungsadresseEORI._autoSizeGross = False
        Me.txtT1VerzollungsadresseEORI._hideIfListEmpty = True
        Me.txtT1VerzollungsadresseEORI._value = Nothing
@@ -322,10 +328,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.txtT1VerzollungsadresseOrt._DateTimeOnly = False
        Me.txtT1VerzollungsadresseOrt._numbersOnly = False
        Me.txtT1VerzollungsadresseOrt._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadresseOrt._numbersOnlyTrennzeichen = True
        Me.txtT1VerzollungsadresseOrt._Prozent = False
        Me.txtT1VerzollungsadresseOrt._ShortDateNew = False
        Me.txtT1VerzollungsadresseOrt._ShortDateOnly = False
        Me.txtT1VerzollungsadresseOrt._TimeOnly = False
+        Me.txtT1VerzollungsadresseOrt._TimeOnly_Seconds = False
        Me.txtT1VerzollungsadresseOrt._value = Nothing
        Me.txtT1VerzollungsadresseOrt._Waehrung = False
        Me.txtT1VerzollungsadresseOrt._WaehrungZeichen = True
@@ -344,10 +352,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.txtT1VerzollungsadressePlz._DateTimeOnly = False
        Me.txtT1VerzollungsadressePlz._numbersOnly = False
        Me.txtT1VerzollungsadressePlz._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadressePlz._numbersOnlyTrennzeichen = True
        Me.txtT1VerzollungsadressePlz._Prozent = False
        Me.txtT1VerzollungsadressePlz._ShortDateNew = False
        Me.txtT1VerzollungsadressePlz._ShortDateOnly = False
        Me.txtT1VerzollungsadressePlz._TimeOnly = False
+        Me.txtT1VerzollungsadressePlz._TimeOnly_Seconds = False
        Me.txtT1VerzollungsadressePlz._value = Nothing
        Me.txtT1VerzollungsadressePlz._Waehrung = False
        Me.txtT1VerzollungsadressePlz._WaehrungZeichen = True
@@ -366,10 +376,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.txtT1VerzollungsadresseStrasse._DateTimeOnly = False
        Me.txtT1VerzollungsadresseStrasse._numbersOnly = False
        Me.txtT1VerzollungsadresseStrasse._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadresseStrasse._numbersOnlyTrennzeichen = True
        Me.txtT1VerzollungsadresseStrasse._Prozent = False
        Me.txtT1VerzollungsadresseStrasse._ShortDateNew = False
        Me.txtT1VerzollungsadresseStrasse._ShortDateOnly = False
        Me.txtT1VerzollungsadresseStrasse._TimeOnly = False
+        Me.txtT1VerzollungsadresseStrasse._TimeOnly_Seconds = False
        Me.txtT1VerzollungsadresseStrasse._value = Nothing
        Me.txtT1VerzollungsadresseStrasse._Waehrung = False
        Me.txtT1VerzollungsadresseStrasse._WaehrungZeichen = True
@@ -391,7 +403,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.Label33.Name = "Label33"
        Me.Label33.Size = New System.Drawing.Size(83, 26)
        Me.Label33.TabIndex = 3
-        Me.Label33.Text = "NCTS-" & Global.Microsoft.VisualBasic.ChrW(10) & "Gestellungsadr.:"
+        Me.Label33.Text = "NCTS-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Gestellungsadr.:"
        '
        'LinkLabel4
        '
@@ -428,7 +440,6 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
    Friend WithEvents Label33 As System.Windows.Forms.Label
    Friend WithEvents LinkLabel4 As System.Windows.Forms.LinkLabel
    Friend WithEvents txtT1VerzollungsadresseAnspr As VERAG_PROG_ALLGEMEIN.MySearchBox
-    Friend WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
    Friend WithEvents Label1 As System.Windows.Forms.Label
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents txtT1VerzollungsadresseEORI_NL As VERAG_PROG_ALLGEMEIN.MySearchBox
@@ -436,7 +447,8 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
    Friend WithEvents btn As Button
    Friend WithEvents Label5 As Label
    Friend WithEvents lblNGAId As Label
-    Friend WithEvents txtT1Verzollungsadresse As VERAG_PROG_ALLGEMEIN.MySearchBox
    Friend WithEvents picDel As PictureBox
    Friend WithEvents cbxNCTSAufDispo As CheckBox
+    Public WithEvents txtT1Verzollungsadresse As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Public WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
 End Class
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
@@ -85,7 +85,9 @@
        Else : setValues() : End If


-        txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        '   txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+        txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as displayPARAM FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "displayPARAM", "FMZOLL", True, 400, 200, {"displayPARAM", "Code"})
+
        sbT1VerzollungsadresseLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code] display   FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200)
        txtT1Verzollungsadresse.initSearchBox(Me.FindForm, " [nga_id] ,[nga_name] as Name,isnull(nga_ort,'') as Ort   FROM tblNCTSGestellungsadressen", {"nga_id", "nga_name", "nga_ort", "nga_strasse", "nga_bestZollst", "nga_EORI"}, " nga_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", "nga_id", "nga_id", "Name", "FMZOLL", , 400, 200, {"nga_id"})
    End Sub
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -45,17 +45,13 @@ Partial Class usrcntlAktDetails
        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.lnlSendungText = New System.Windows.Forms.Label()
-        Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlSBG = New System.Windows.Forms.Panel()
        Me.lblSndFremd = New System.Windows.Forms.Label()
        Me.Label21 = New System.Windows.Forms.Label()
-        Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label20 = New System.Windows.Forms.Label()
        Me.Label19 = New System.Windows.Forms.Label()
        Me.lblFiskde = New System.Windows.Forms.Label()
-        Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.lblFiskAT = New System.Windows.Forms.Label()
-        Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cbxSammelakt = New System.Windows.Forms.CheckBox()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
@@ -73,14 +69,11 @@ Partial Class usrcntlAktDetails
        Me.Button12 = New System.Windows.Forms.Button()
        Me.Button11 = New System.Windows.Forms.Button()
        Me.btnKasse_User = New System.Windows.Forms.Button()
-        Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Button8 = New System.Windows.Forms.Button()
        Me.btnLZDruck = New System.Windows.Forms.Button()
        Me.Button9 = New System.Windows.Forms.Button()
        Me.btnKasse_LG = New System.Windows.Forms.Button()
-        Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
-        Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.Button18 = New System.Windows.Forms.Button()
        Me.gridVermerke = New System.Windows.Forms.DataGridView()
        Me.pnlVermerkeTop = New System.Windows.Forms.Panel()
@@ -104,7 +97,9 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_Vorgeschrieben = New System.Windows.Forms.TextBox()
        Me.txtMAinfo_VorbereitetQs = New System.Windows.Forms.TextBox()
        Me.Panel8 = New System.Windows.Forms.Panel()
+        Me.lblLKWChat_MsgCnt = New System.Windows.Forms.Label()
        Me.lblBarZuKassierenSumme = New System.Windows.Forms.Label()
+        Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
        Me.btnAktUebernehmen = New System.Windows.Forms.Button()
        Me.Button7 = New System.Windows.Forms.Button()
        Me.btnLkwBeleg = New System.Windows.Forms.Button()
@@ -169,6 +164,15 @@ Partial Class usrcntlAktDetails
        Me.btnÄndern = New System.Windows.Forms.Button()
        Me.btnTV = New System.Windows.Forms.Button()
        Me.Button10 = New System.Windows.Forms.Button()
+        Me.lblSNDChat_MsgCnt = New System.Windows.Forms.Label()
+        Me.picAVISOMessengerSNDChat = New System.Windows.Forms.PictureBox()
+        Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
+        Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -191,6 +195,7 @@ Partial Class usrcntlAktDetails
        CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel8.SuspendLayout()
+        CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlAbgeschlossen.SuspendLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.FlowLayoutPanel.SuspendLayout()
@@ -204,6 +209,7 @@ Partial Class usrcntlAktDetails
        Me.conMenuVermerke.SuspendLayout()
        Me.cntxtFormulare.SuspendLayout()
        Me.pnlOptionen.SuspendLayout()
+        CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnlDetailsRechts
@@ -361,32 +367,6 @@ Partial Class usrcntlAktDetails
        Me.lnlSendungText.TabIndex = 2
        Me.lnlSendungText.Text = "Sendung"
        '
-        'txtSendungen
-        '
-        Me.txtSendungen._DateTimeOnly = False
-        Me.txtSendungen._numbersOnly = True
-        Me.txtSendungen._numbersOnlyKommastellen = ""
-        Me.txtSendungen._numbersOnlyTrennzeichen = True
-        Me.txtSendungen._Prozent = False
-        Me.txtSendungen._ShortDateNew = False
-        Me.txtSendungen._ShortDateOnly = False
-        Me.txtSendungen._TimeOnly = False
-        Me.txtSendungen._TimeOnly_Seconds = False
-        Me.txtSendungen._value = ""
-        Me.txtSendungen._Waehrung = False
-        Me.txtSendungen._WaehrungZeichen = True
-        Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSendungen.ForeColor = System.Drawing.Color.Black
-        Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
-        Me.txtSendungen.MaxLineLength = -1
-        Me.txtSendungen.MaxLines_Warning = ""
-        Me.txtSendungen.MaxLines_Warning_Label = Nothing
-        Me.txtSendungen.Name = "txtSendungen"
-        Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
-        Me.txtSendungen.TabIndex = 1
-        Me.txtSendungen.Text = "1"
-        Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
        'pnlSBG
        '
        Me.pnlSBG.Controls.Add(Me.lblSndFremd)
@@ -423,33 +403,6 @@ Partial Class usrcntlAktDetails
        Me.Label21.Text = "1"
        Me.Label21.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'txtSndFremd
-        '
-        Me.txtSndFremd._DateTimeOnly = False
-        Me.txtSndFremd._numbersOnly = True
-        Me.txtSndFremd._numbersOnlyKommastellen = ""
-        Me.txtSndFremd._numbersOnlyTrennzeichen = True
-        Me.txtSndFremd._Prozent = False
-        Me.txtSndFremd._ShortDateNew = False
-        Me.txtSndFremd._ShortDateOnly = False
-        Me.txtSndFremd._TimeOnly = False
-        Me.txtSndFremd._TimeOnly_Seconds = False
-        Me.txtSndFremd._value = ""
-        Me.txtSndFremd._Waehrung = False
-        Me.txtSndFremd._WaehrungZeichen = True
-        Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
-        Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
-        Me.txtSndFremd.MaxLineLength = -1
-        Me.txtSndFremd.MaxLines_Warning = ""
-        Me.txtSndFremd.MaxLines_Warning_Label = Nothing
-        Me.txtSndFremd.Name = "txtSndFremd"
-        Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
-        Me.txtSndFremd.TabIndex = 83
-        Me.txtSndFremd.Text = "0"
-        Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        Me.txtSndFremd.Visible = False
-        '
        'Label20
        '
        Me.Label20.AutoSize = True
@@ -477,32 +430,6 @@ Partial Class usrcntlAktDetails
        Me.lblFiskde.TabIndex = 6
        Me.lblFiskde.Text = "Fiskal DE"
        '
-        'txtSndFiskalDE
-        '
-        Me.txtSndFiskalDE._DateTimeOnly = False
-        Me.txtSndFiskalDE._numbersOnly = True
-        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
-        Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True
-        Me.txtSndFiskalDE._Prozent = False
-        Me.txtSndFiskalDE._ShortDateNew = False
-        Me.txtSndFiskalDE._ShortDateOnly = False
-        Me.txtSndFiskalDE._TimeOnly = False
-        Me.txtSndFiskalDE._TimeOnly_Seconds = False
-        Me.txtSndFiskalDE._value = ""
-        Me.txtSndFiskalDE._Waehrung = False
-        Me.txtSndFiskalDE._WaehrungZeichen = True
-        Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
-        Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
-        Me.txtSndFiskalDE.MaxLineLength = -1
-        Me.txtSndFiskalDE.MaxLines_Warning = ""
-        Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
-        Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
-        Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
-        Me.txtSndFiskalDE.TabIndex = 5
-        Me.txtSndFiskalDE.Text = "0"
-        Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
        'lblFiskAT
        '
        Me.lblFiskAT.AutoSize = True
@@ -512,32 +439,6 @@ Partial Class usrcntlAktDetails
        Me.lblFiskAT.TabIndex = 4
        Me.lblFiskAT.Text = "Fiskal AT"
        '
-        'txtSndFiskalAT
-        '
-        Me.txtSndFiskalAT._DateTimeOnly = False
-        Me.txtSndFiskalAT._numbersOnly = True
-        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
-        Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True
-        Me.txtSndFiskalAT._Prozent = False
-        Me.txtSndFiskalAT._ShortDateNew = False
-        Me.txtSndFiskalAT._ShortDateOnly = False
-        Me.txtSndFiskalAT._TimeOnly = False
-        Me.txtSndFiskalAT._TimeOnly_Seconds = False
-        Me.txtSndFiskalAT._value = ""
-        Me.txtSndFiskalAT._Waehrung = False
-        Me.txtSndFiskalAT._WaehrungZeichen = True
-        Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
-        Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
-        Me.txtSndFiskalAT.MaxLineLength = -1
-        Me.txtSndFiskalAT.MaxLines_Warning = ""
-        Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
-        Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
-        Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
-        Me.txtSndFiskalAT.TabIndex = 3
-        Me.txtSndFiskalAT.Text = "0"
-        Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
        'cbxSammelakt
        '
        Me.cbxSammelakt.AutoSize = True
@@ -664,7 +565,7 @@ Partial Class usrcntlAktDetails
        Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image)
        Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnQuckScan.Location = New System.Drawing.Point(468, 202)
+        Me.btnQuckScan.Location = New System.Drawing.Point(468, 203)
        Me.btnQuckScan.Name = "btnQuckScan"
        Me.btnQuckScan.Size = New System.Drawing.Size(107, 34)
        Me.btnQuckScan.TabIndex = 107
@@ -679,9 +580,9 @@ Partial Class usrcntlAktDetails
        Me.picArrowDown.BackgroundImage = Global.AVISO.My.Resources.Resources.arrow_down_orange
        Me.picArrowDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
        Me.picArrowDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.picArrowDown.Location = New System.Drawing.Point(1, 234)
+        Me.picArrowDown.Location = New System.Drawing.Point(1, 221)
        Me.picArrowDown.Name = "picArrowDown"
-        Me.picArrowDown.Size = New System.Drawing.Size(34, 34)
+        Me.picArrowDown.Size = New System.Drawing.Size(36, 50)
        Me.picArrowDown.TabIndex = 104
        Me.picArrowDown.TabStop = False
        Me.picArrowDown.Visible = False
@@ -838,17 +739,6 @@ Partial Class usrcntlAktDetails
        Me.btnKasse_User.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnKasse_User.UseVisualStyleBackColor = False
        '
-        'cboFormulareRgAn
-        '
-        Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
-        Me.cboFormulareRgAn._allowFreiText = False
-        Me.cboFormulareRgAn._value = ""
-        Me.cboFormulareRgAn.FormattingEnabled = True
-        Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
-        Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
-        Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
-        Me.cboFormulareRgAn.TabIndex = 108
-        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -923,42 +813,13 @@ Partial Class usrcntlAktDetails
        Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)"
        Me.btnKasse_LG.UseVisualStyleBackColor = False
        '
-        'cbxLZRg
-        '
-        Me.cbxLZRg._value = ""
-        Me.cbxLZRg.AutoSize = True
-        Me.cbxLZRg.Checked = True
-        Me.cbxLZRg.Checked_value = False
-        Me.cbxLZRg.CheckedValue = False
-        Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
-        Me.cbxLZRg.Name = "cbxLZRg"
-        Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
-        Me.cbxLZRg.TabIndex = 115
-        Me.cbxLZRg.Text = "Rechnungen"
-        Me.cbxLZRg.UseVisualStyleBackColor = True
-        '
-        'cbxLZT1
-        '
-        Me.cbxLZT1._value = ""
-        Me.cbxLZT1.AutoSize = True
-        Me.cbxLZT1.Checked_value = False
-        Me.cbxLZT1.CheckedValue = False
-        Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
-        Me.cbxLZT1.Name = "cbxLZT1"
-        Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
-        Me.cbxLZT1.TabIndex = 114
-        Me.cbxLZT1.Text = "T1"
-        Me.cbxLZT1.UseVisualStyleBackColor = True
-        Me.cbxLZT1.Visible = False
-        '
        'Button18
        '
        Me.Button18.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button18.Image = CType(resources.GetObject("Button18.Image"), System.Drawing.Image)
        Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button18.Location = New System.Drawing.Point(447, 235)
+        Me.Button18.Location = New System.Drawing.Point(447, 236)
        Me.Button18.Name = "Button18"
        Me.Button18.Size = New System.Drawing.Size(128, 34)
        Me.Button18.TabIndex = 103
@@ -1018,7 +879,7 @@ Partial Class usrcntlAktDetails
        Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.gridVermerke.ShowCellErrors = False
        Me.gridVermerke.ShowRowErrors = False
-        Me.gridVermerke.Size = New System.Drawing.Size(575, 214)
+        Me.gridVermerke.Size = New System.Drawing.Size(575, 208)
        Me.gridVermerke.TabIndex = 70
        Me.gridVermerke.TabStop = False
        '
@@ -1159,25 +1020,27 @@ Partial Class usrcntlAktDetails
        '
        'pnlMAInfo
        '
+        Me.pnlMAInfo.Controls.Add(Me.lblSNDChat_MsgCnt)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_TRVorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_TRVorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_AbklaerungTR)
+        Me.pnlMAInfo.Controls.Add(Me.picAVISOMessengerSNDChat)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_Vorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.picMAinfo_VorbereitetQs)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_AbklaerungTR)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_Vorgeschrieben)
        Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_VorbereitetQs)
        Me.pnlMAInfo.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 244)
+        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 238)
        Me.pnlMAInfo.Name = "pnlMAInfo"
-        Me.pnlMAInfo.Size = New System.Drawing.Size(575, 28)
+        Me.pnlMAInfo.Size = New System.Drawing.Size(575, 34)
        Me.pnlMAInfo.TabIndex = 106
        '
        'picMAinfo_TRVorgeschrieben
        '
        Me.picMAinfo_TRVorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv
        Me.picMAinfo_TRVorgeschrieben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(437, 3)
+        Me.picMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(451, 3)
        Me.picMAinfo_TRVorgeschrieben.Name = "picMAinfo_TRVorgeschrieben"
        Me.picMAinfo_TRVorgeschrieben.Size = New System.Drawing.Size(26, 21)
        Me.picMAinfo_TRVorgeschrieben.TabIndex = 111
@@ -1191,11 +1054,11 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_TRVorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand
        Me.txtMAinfo_TRVorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.txtMAinfo_TRVorgeschrieben.ForeColor = System.Drawing.Color.Black
-        Me.txtMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(469, 5)
+        Me.txtMAinfo_TRVorgeschrieben.Location = New System.Drawing.Point(481, 5)
        Me.txtMAinfo_TRVorgeschrieben.MaxLength = 0
        Me.txtMAinfo_TRVorgeschrieben.Name = "txtMAinfo_TRVorgeschrieben"
        Me.txtMAinfo_TRVorgeschrieben.ReadOnly = True
-        Me.txtMAinfo_TRVorgeschrieben.Size = New System.Drawing.Size(105, 14)
+        Me.txtMAinfo_TRVorgeschrieben.Size = New System.Drawing.Size(90, 14)
        Me.txtMAinfo_TRVorgeschrieben.TabIndex = 112
        Me.txtMAinfo_TRVorgeschrieben.TabStop = False
        Me.txtMAinfo_TRVorgeschrieben.Text = "-"
@@ -1205,7 +1068,7 @@ Partial Class usrcntlAktDetails
        '
        Me.picMAinfo_AbklaerungTR.BackgroundImage = Global.AVISO.My.Resources.Resources.abklaerungTR_Inaktiv
        Me.picMAinfo_AbklaerungTR.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picMAinfo_AbklaerungTR.Location = New System.Drawing.Point(36, 4)
+        Me.picMAinfo_AbklaerungTR.Location = New System.Drawing.Point(76, 4)
        Me.picMAinfo_AbklaerungTR.Name = "picMAinfo_AbklaerungTR"
        Me.picMAinfo_AbklaerungTR.Size = New System.Drawing.Size(26, 21)
        Me.picMAinfo_AbklaerungTR.TabIndex = 109
@@ -1215,7 +1078,7 @@ Partial Class usrcntlAktDetails
        '
        Me.picMAinfo_Vorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv
        Me.picMAinfo_Vorgeschrieben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(304, 4)
+        Me.picMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(326, 4)
        Me.picMAinfo_Vorgeschrieben.Name = "picMAinfo_Vorgeschrieben"
        Me.picMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(26, 21)
        Me.picMAinfo_Vorgeschrieben.TabIndex = 107
@@ -1225,7 +1088,7 @@ Partial Class usrcntlAktDetails
        '
        Me.picMAinfo_VorbereitetQs.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorbereitet_InAktiv
        Me.picMAinfo_VorbereitetQs.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picMAinfo_VorbereitetQs.Location = New System.Drawing.Point(160, 4)
+        Me.picMAinfo_VorbereitetQs.Location = New System.Drawing.Point(200, 4)
        Me.picMAinfo_VorbereitetQs.Name = "picMAinfo_VorbereitetQs"
        Me.picMAinfo_VorbereitetQs.Size = New System.Drawing.Size(26, 21)
        Me.picMAinfo_VorbereitetQs.TabIndex = 0
@@ -1238,7 +1101,7 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_AbklaerungTR.Cursor = System.Windows.Forms.Cursors.Hand
        Me.txtMAinfo_AbklaerungTR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.txtMAinfo_AbklaerungTR.ForeColor = System.Drawing.Color.Black
-        Me.txtMAinfo_AbklaerungTR.Location = New System.Drawing.Point(68, 6)
+        Me.txtMAinfo_AbklaerungTR.Location = New System.Drawing.Point(105, 6)
        Me.txtMAinfo_AbklaerungTR.MaxLength = 0
        Me.txtMAinfo_AbklaerungTR.Name = "txtMAinfo_AbklaerungTR"
        Me.txtMAinfo_AbklaerungTR.ReadOnly = True
@@ -1254,11 +1117,11 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_Vorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand
        Me.txtMAinfo_Vorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.txtMAinfo_Vorgeschrieben.ForeColor = System.Drawing.Color.Black
-        Me.txtMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(336, 6)
+        Me.txtMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(355, 6)
        Me.txtMAinfo_Vorgeschrieben.MaxLength = 0
        Me.txtMAinfo_Vorgeschrieben.Name = "txtMAinfo_Vorgeschrieben"
        Me.txtMAinfo_Vorgeschrieben.ReadOnly = True
-        Me.txtMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(105, 14)
+        Me.txtMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(90, 14)
        Me.txtMAinfo_Vorgeschrieben.TabIndex = 108
        Me.txtMAinfo_Vorgeschrieben.TabStop = False
        Me.txtMAinfo_Vorgeschrieben.Text = "-"
@@ -1270,11 +1133,11 @@ Partial Class usrcntlAktDetails
        Me.txtMAinfo_VorbereitetQs.Cursor = System.Windows.Forms.Cursors.Hand
        Me.txtMAinfo_VorbereitetQs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.txtMAinfo_VorbereitetQs.ForeColor = System.Drawing.Color.Black
-        Me.txtMAinfo_VorbereitetQs.Location = New System.Drawing.Point(192, 6)
+        Me.txtMAinfo_VorbereitetQs.Location = New System.Drawing.Point(230, 6)
        Me.txtMAinfo_VorbereitetQs.MaxLength = 0
        Me.txtMAinfo_VorbereitetQs.Name = "txtMAinfo_VorbereitetQs"
        Me.txtMAinfo_VorbereitetQs.ReadOnly = True
-        Me.txtMAinfo_VorbereitetQs.Size = New System.Drawing.Size(105, 14)
+        Me.txtMAinfo_VorbereitetQs.Size = New System.Drawing.Size(90, 14)
        Me.txtMAinfo_VorbereitetQs.TabIndex = 106
        Me.txtMAinfo_VorbereitetQs.TabStop = False
        Me.txtMAinfo_VorbereitetQs.Text = "-"
@@ -1282,7 +1145,9 @@ Partial Class usrcntlAktDetails
        'Panel8
        '
        Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel8.Controls.Add(Me.lblLKWChat_MsgCnt)
        Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme)
+        Me.Panel8.Controls.Add(Me.picAVISOMessenger)
        Me.Panel8.Controls.Add(Me.btnAktUebernehmen)
        Me.Panel8.Controls.Add(Me.Button7)
        Me.Panel8.Controls.Add(Me.btnLkwBeleg)
@@ -1308,6 +1173,20 @@ Partial Class usrcntlAktDetails
        Me.Panel8.Size = New System.Drawing.Size(575, 120)
        Me.Panel8.TabIndex = 92
        '
+        'lblLKWChat_MsgCnt
+        '
+        Me.lblLKWChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.lblLKWChat_MsgCnt.BackColor = System.Drawing.Color.Red
+        Me.lblLKWChat_MsgCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
+        Me.lblLKWChat_MsgCnt.ForeColor = System.Drawing.Color.White
+        Me.lblLKWChat_MsgCnt.Location = New System.Drawing.Point(187, 106)
+        Me.lblLKWChat_MsgCnt.Name = "lblLKWChat_MsgCnt"
+        Me.lblLKWChat_MsgCnt.Size = New System.Drawing.Size(25, 13)
+        Me.lblLKWChat_MsgCnt.TabIndex = 104
+        Me.lblLKWChat_MsgCnt.Text = "99"
+        Me.lblLKWChat_MsgCnt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.lblLKWChat_MsgCnt.Visible = False
+        '
        'lblBarZuKassierenSumme
        '
        Me.lblBarZuKassierenSumme.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1321,6 +1200,19 @@ Partial Class usrcntlAktDetails
        Me.lblBarZuKassierenSumme.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        Me.lblBarZuKassierenSumme.Visible = False
        '
+        'picAVISOMessenger
+        '
+        Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger
+        Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.picAVISOMessenger.Location = New System.Drawing.Point(167, 74)
+        Me.picAVISOMessenger.Name = "picAVISOMessenger"
+        Me.picAVISOMessenger.Size = New System.Drawing.Size(36, 40)
+        Me.picAVISOMessenger.TabIndex = 103
+        Me.picAVISOMessenger.TabStop = False
+        Me.picAVISOMessenger.Visible = False
+        '
        'btnAktUebernehmen
        '
        Me.btnAktUebernehmen.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1468,11 +1360,11 @@ Partial Class usrcntlAktDetails
        Me.txtAktMA.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.txtAktMA.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtAktMA.ForeColor = System.Drawing.Color.Black
-        Me.txtAktMA.Location = New System.Drawing.Point(172, 96)
+        Me.txtAktMA.Location = New System.Drawing.Point(214, 96)
        Me.txtAktMA.MaxLength = 0
        Me.txtAktMA.Name = "txtAktMA"
        Me.txtAktMA.ReadOnly = True
-        Me.txtAktMA.Size = New System.Drawing.Size(247, 16)
+        Me.txtAktMA.Size = New System.Drawing.Size(199, 16)
        Me.txtAktMA.TabIndex = 97
        Me.txtAktMA.TabStop = False
        '
@@ -1481,7 +1373,7 @@ Partial Class usrcntlAktDetails
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label3.ForeColor = System.Drawing.Color.Black
-        Me.Label3.Location = New System.Drawing.Point(169, 76)
+        Me.Label3.Location = New System.Drawing.Point(211, 76)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(59, 17)
        Me.Label3.TabIndex = 96
@@ -1609,9 +1501,9 @@ Partial Class usrcntlAktDetails
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblAktUebernommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblAktUebernommen.ForeColor = System.Drawing.Color.Green
-        Me.lblAktUebernommen.Location = New System.Drawing.Point(166, 75)
+        Me.lblAktUebernommen.Location = New System.Drawing.Point(208, 75)
        Me.lblAktUebernommen.Name = "lblAktUebernommen"
-        Me.lblAktUebernommen.Size = New System.Drawing.Size(241, 38)
+        Me.lblAktUebernommen.Size = New System.Drawing.Size(205, 38)
        Me.lblAktUebernommen.TabIndex = 102
        Me.lblAktUebernommen.Text = "Akt übernommen!"
        Me.lblAktUebernommen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -2169,6 +2061,178 @@ Partial Class usrcntlAktDetails
        Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.Button10.UseVisualStyleBackColor = False
        '
+        'lblSNDChat_MsgCnt
+        '
+        Me.lblSNDChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.lblSNDChat_MsgCnt.BackColor = System.Drawing.Color.Red
+        Me.lblSNDChat_MsgCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold)
+        Me.lblSNDChat_MsgCnt.ForeColor = System.Drawing.Color.White
+        Me.lblSNDChat_MsgCnt.Location = New System.Drawing.Point(53, 21)
+        Me.lblSNDChat_MsgCnt.Name = "lblSNDChat_MsgCnt"
+        Me.lblSNDChat_MsgCnt.Size = New System.Drawing.Size(22, 11)
+        Me.lblSNDChat_MsgCnt.TabIndex = 111
+        Me.lblSNDChat_MsgCnt.Text = "99"
+        Me.lblSNDChat_MsgCnt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.lblSNDChat_MsgCnt.Visible = False
+        '
+        'picAVISOMessengerSNDChat
+        '
+        Me.picAVISOMessengerSNDChat.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.picAVISOMessengerSNDChat.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger
+        Me.picAVISOMessengerSNDChat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.picAVISOMessengerSNDChat.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.picAVISOMessengerSNDChat.Location = New System.Drawing.Point(30, 1)
+        Me.picAVISOMessengerSNDChat.Name = "picAVISOMessengerSNDChat"
+        Me.picAVISOMessengerSNDChat.Size = New System.Drawing.Size(32, 30)
+        Me.picAVISOMessengerSNDChat.TabIndex = 110
+        Me.picAVISOMessengerSNDChat.TabStop = False
+        Me.picAVISOMessengerSNDChat.Visible = False
+        '
+        'txtSendungen
+        '
+        Me.txtSendungen._DateTimeOnly = False
+        Me.txtSendungen._numbersOnly = True
+        Me.txtSendungen._numbersOnlyKommastellen = ""
+        Me.txtSendungen._numbersOnlyTrennzeichen = True
+        Me.txtSendungen._Prozent = False
+        Me.txtSendungen._ShortDateNew = False
+        Me.txtSendungen._ShortDateOnly = False
+        Me.txtSendungen._TimeOnly = False
+        Me.txtSendungen._TimeOnly_Seconds = False
+        Me.txtSendungen._value = ""
+        Me.txtSendungen._Waehrung = False
+        Me.txtSendungen._WaehrungZeichen = True
+        Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSendungen.ForeColor = System.Drawing.Color.Black
+        Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
+        Me.txtSendungen.MaxLineLength = -1
+        Me.txtSendungen.MaxLines_Warning = ""
+        Me.txtSendungen.MaxLines_Warning_Label = Nothing
+        Me.txtSendungen.Name = "txtSendungen"
+        Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
+        Me.txtSendungen.TabIndex = 1
+        Me.txtSendungen.Text = "1"
+        Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'txtSndFremd
+        '
+        Me.txtSndFremd._DateTimeOnly = False
+        Me.txtSndFremd._numbersOnly = True
+        Me.txtSndFremd._numbersOnlyKommastellen = ""
+        Me.txtSndFremd._numbersOnlyTrennzeichen = True
+        Me.txtSndFremd._Prozent = False
+        Me.txtSndFremd._ShortDateNew = False
+        Me.txtSndFremd._ShortDateOnly = False
+        Me.txtSndFremd._TimeOnly = False
+        Me.txtSndFremd._TimeOnly_Seconds = False
+        Me.txtSndFremd._value = ""
+        Me.txtSndFremd._Waehrung = False
+        Me.txtSndFremd._WaehrungZeichen = True
+        Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
+        Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
+        Me.txtSndFremd.MaxLineLength = -1
+        Me.txtSndFremd.MaxLines_Warning = ""
+        Me.txtSndFremd.MaxLines_Warning_Label = Nothing
+        Me.txtSndFremd.Name = "txtSndFremd"
+        Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
+        Me.txtSndFremd.TabIndex = 83
+        Me.txtSndFremd.Text = "0"
+        Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        Me.txtSndFremd.Visible = False
+        '
+        'txtSndFiskalDE
+        '
+        Me.txtSndFiskalDE._DateTimeOnly = False
+        Me.txtSndFiskalDE._numbersOnly = True
+        Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
+        Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True
+        Me.txtSndFiskalDE._Prozent = False
+        Me.txtSndFiskalDE._ShortDateNew = False
+        Me.txtSndFiskalDE._ShortDateOnly = False
+        Me.txtSndFiskalDE._TimeOnly = False
+        Me.txtSndFiskalDE._TimeOnly_Seconds = False
+        Me.txtSndFiskalDE._value = ""
+        Me.txtSndFiskalDE._Waehrung = False
+        Me.txtSndFiskalDE._WaehrungZeichen = True
+        Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
+        Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
+        Me.txtSndFiskalDE.MaxLineLength = -1
+        Me.txtSndFiskalDE.MaxLines_Warning = ""
+        Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
+        Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
+        Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
+        Me.txtSndFiskalDE.TabIndex = 5
+        Me.txtSndFiskalDE.Text = "0"
+        Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'txtSndFiskalAT
+        '
+        Me.txtSndFiskalAT._DateTimeOnly = False
+        Me.txtSndFiskalAT._numbersOnly = True
+        Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
+        Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True
+        Me.txtSndFiskalAT._Prozent = False
+        Me.txtSndFiskalAT._ShortDateNew = False
+        Me.txtSndFiskalAT._ShortDateOnly = False
+        Me.txtSndFiskalAT._TimeOnly = False
+        Me.txtSndFiskalAT._TimeOnly_Seconds = False
+        Me.txtSndFiskalAT._value = ""
+        Me.txtSndFiskalAT._Waehrung = False
+        Me.txtSndFiskalAT._WaehrungZeichen = True
+        Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
+        Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
+        Me.txtSndFiskalAT.MaxLineLength = -1
+        Me.txtSndFiskalAT.MaxLines_Warning = ""
+        Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
+        Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
+        Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
+        Me.txtSndFiskalAT.TabIndex = 3
+        Me.txtSndFiskalAT.Text = "0"
+        Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'cboFormulareRgAn
+        '
+        Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
+        Me.cboFormulareRgAn._allowFreiText = False
+        Me.cboFormulareRgAn._value = ""
+        Me.cboFormulareRgAn.FormattingEnabled = True
+        Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
+        Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
+        Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
+        Me.cboFormulareRgAn.TabIndex = 108
+        '
+        'cbxLZRg
+        '
+        Me.cbxLZRg._value = ""
+        Me.cbxLZRg.AutoSize = True
+        Me.cbxLZRg.Checked = True
+        Me.cbxLZRg.Checked_value = False
+        Me.cbxLZRg.CheckedValue = False
+        Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
+        Me.cbxLZRg.Name = "cbxLZRg"
+        Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
+        Me.cbxLZRg.TabIndex = 115
+        Me.cbxLZRg.Text = "Rechnungen"
+        Me.cbxLZRg.UseVisualStyleBackColor = True
+        '
+        'cbxLZT1
+        '
+        Me.cbxLZT1._value = ""
+        Me.cbxLZT1.AutoSize = True
+        Me.cbxLZT1.Checked_value = False
+        Me.cbxLZT1.CheckedValue = False
+        Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
+        Me.cbxLZT1.Name = "cbxLZT1"
+        Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
+        Me.cbxLZT1.TabIndex = 114
+        Me.cbxLZT1.Text = "T1"
+        Me.cbxLZT1.UseVisualStyleBackColor = True
+        Me.cbxLZT1.Visible = False
+        '
        'usrcntlAktDetails
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2205,6 +2269,7 @@ Partial Class usrcntlAktDetails
        CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel8.ResumeLayout(False)
        Me.Panel8.PerformLayout()
+        CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlAbgeschlossen.ResumeLayout(False)
        Me.pnlAbgeschlossen.PerformLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2226,6 +2291,7 @@ Partial Class usrcntlAktDetails
        Me.conMenuVermerke.ResumeLayout(False)
        Me.cntxtFormulare.ResumeLayout(False)
        Me.pnlOptionen.ResumeLayout(False)
+        CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -2365,4 +2431,8 @@ Partial Class usrcntlAktDetails
    Friend WithEvents Button16 As Button
    Friend WithEvents picMAinfo_TRVorgeschrieben As PictureBox
    Friend WithEvents txtMAinfo_TRVorgeschrieben As TextBox
+    Friend WithEvents lblLKWChat_MsgCnt As Label
+    Friend WithEvents picAVISOMessenger As PictureBox
+    Friend WithEvents lblSNDChat_MsgCnt As Label
+    Friend WithEvents picAVISOMessengerSNDChat As PictureBox
 End Class
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -116,6 +116,10 @@ Public Class usrcntlAktDetails
        lblSendungsanzahl.Visible = False
        '___________

+
+        initLKW_CHAT()
+
+
        If dgvSendungen.RowCount = 0 Then
            pnlAlt.Visible = True
        Else
@@ -125,7 +129,39 @@ Public Class usrcntlAktDetails
        End If
    End Sub

+    Sub initLKW_CHAT()

+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("LKW_CHAT") Then
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("LKW_CHAT", Me.FindForm) Then
+                picAVISOMessenger.Visible = True
+                lblLKWChat_MsgCnt.Visible = False
+                Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT_AVISOID(AvisoID)
+                If newMsg > 0 Then
+                    lblLKWChat_MsgCnt.Text = newMsg
+                    lblLKWChat_MsgCnt.Visible = True
+                    lblLKWChat_MsgCnt.BringToFront()
+                End If
+            End If
+        End If
+
+    End Sub
+    Sub initSND_CHAT(SendungsID)
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("LKW_CHAT") Then
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("LKW_CHAT", Me.FindForm) Then
+
+                picAVISOMessengerSNDChat.Visible = True
+                lblSNDChat_MsgCnt.Visible = False
+                Dim newMsgSnd = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT_SendungsID(SendungsID)
+                If newMsgSnd > 0 Then
+                    lblSNDChat_MsgCnt.Text = newMsgSnd
+                    lblSNDChat_MsgCnt.Visible = True
+                    lblSNDChat_MsgCnt.BringToFront()
+                End If
+            End If
+        End If
+
+    End Sub

    'Private Sub Me_shown(sender As Object, e As EventArgs) Handles Me.Shown
    '     MsgBox("shown")
@@ -203,6 +239,8 @@ Public Class usrcntlAktDetails
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then
            Button2.Visible = True
        End If
+
+
        'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then
        '    tbcntlVermerke.TabPages.Remove(tbAnhang)
        'End If
@@ -807,6 +845,8 @@ Public Class usrcntlAktDetails
                        sendwhere = " AND VermerkArt='S'  AND SendungID=" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value


+                        initSND_CHAT(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+
                        '---------------------------------------------------------
                        'MA INFO
                        '---------------------------------------------------------
@@ -1120,6 +1160,12 @@ Public Class usrcntlAktDetails
                    '  avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
                    'Vermerke_aktualisieren()
                    init = True '   Vermerke_anzeigen(e.RowIndex)
+                Case "96"
+                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                    myVermerk.VermerkCodeId = 97
+                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                    init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()

            End Select
            loaded = False
@@ -1299,6 +1345,12 @@ Public Class usrcntlAktDetails
                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen."
                            End If

+                        Case 96
+                            If Not existCodeInGridVermerke(97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                optionCell.Value = "T1 Bestätigung erhalten"
+                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1 Bestätigung erhalten' einzutragen."
+                            End If
+
                        Case 80
                            If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
                                optionCell.Value = "ATB-Nr. erhalten"
@@ -1993,16 +2045,18 @@ Public Class usrcntlAktDetails


                DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_gray_small
+                DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen"
                If r.Cells("LetzterMitarbeiterId").Value IsNot DBNull.Value AndAlso r.Cells("LetzterMitarbeiterId").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
                    DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_blue_small
                    DirectCast(r.Cells("SenungWeiterleiten"), DataGridViewImageCell).Value = My.Resources.weiterleiten_small1
-                Else
+                    DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Bereits 'meine Sendung'"
+                ElseIf r.Cells("LetzterMitarbeiterId").Value IsNot DBNull.Value AndAlso CInt(r.Cells("LetzterMitarbeiterId").Value) > 0 Then
                    If r.Cells("tblSnd_VG_MA").Value IsNot DBNull.Value Then
                        DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_small
+                        If r.Cells("LetzterMitarbeiter").Value IsNot DBNull.Value AndAlso r.Cells("LetzterMitarbeiter").Value <> "" Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung von '" & r.Cells("LetzterMitarbeiter").Value & "' übernehmen"
                    End If
-                    DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen"
+                    ' DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen"
                End If
-                If r.Cells("LetzterMitarbeiter").Value IsNot DBNull.Value Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung von '" & r.Cells("LetzterMitarbeiter").Value & "' übernehmen"

                If dgvSendungen.Columns("SendungFakturiert") IsNot Nothing Then
                    If (r.Cells("tblSnd_Fakturiert").Value) IsNot DBNull.Value Then
@@ -2152,7 +2206,7 @@ Public Class usrcntlAktDetails
                        dgvSendungen.FirstDisplayedScrollingRowIndex = tmpscroll
                    End If
                    loaded = True
-                    'Vermerke_anzeigen()
+                    Vermerke_anzeigen()

                End If
            End If
@@ -3501,5 +3555,37 @@ Public Class usrcntlAktDetails
    Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click
        Process.Start("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
    End Sub
+
+    Private Sub picAVISOMessenger_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click
+
+        Me.Cursor = Cursors.WaitCursor
+        If VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat.openLKW_Chat(AVISO) Then
+            initLKW_CHAT()
+        End If
+
+        Me.Cursor = Cursors.Default
+
+
+
+    End Sub
+
+    Private Sub picAVISOMessengerSNDChat_Click(sender As Object, e As EventArgs) Handles picAVISOMessengerSNDChat.Click, lblSNDChat_MsgCnt.Click
+
+        If dgvSendungen.SelectedRows.Count > 0 Then
+
+            If dgvSendungen.SelectedRows(0).Cells("AbfertigungsNr").Value = "0/0" Then MsgBox("Bitte zuerst AbfertigungsNr/FilialenNr vergeben!") : Exit Sub
+
+            Me.Cursor = Cursors.WaitCursor
+
+            Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+            If VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat.openSND_Chat(AVISO, SND) Then
+                initSND_CHAT(SND.tblSnd_SendungID)
+            End If
+
+            Me.Cursor = Cursors.Default
+
+        End If
+
+    End Sub
 End Class

--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -517,7 +517,20 @@ Public Class usrcntlAktDetailsATILLANeu
        Try

            If dgvanhaenge.SelectedRows.Count > 0 Then
-                    Process.Start(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value))
+                Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value)
+                If Not IO.File.Exists(docPath) Then
+                    MsgBox("Die Datei existiert nicht!")
+                Else
+                    If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler  (bereits von Benutzer soUndSo geöffnet)
+                        Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG()
+                        File.Copy(docPath, docPathTMP)
+                        Process.Start(docPathTMP)
+                    Else
+                        Process.Start(docPath)
+                    End If
+
+                End If
+
                End If

        Catch ex As Exception
@@ -1537,6 +1550,7 @@ Public Class usrcntlAktDetailsATILLANeu

        f.btnCMRtoAkt.Visible = True
        f.txtCMRName.Visible = True
+        f.txtCMRName.Visible = True

        If f.ShowDialog(Me) Then

--- a/AvisoTV/AvisoTV.vbproj
+++ b/AvisoTV/AvisoTV.vbproj
@@ -164,10 +164,6 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
-      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
-      <Name>VERAG_PROG_ALLGEMEIN</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}</Project>
      <Name>Gemeinsames</Name>
--- a/Gemeinsames/Gemeinsames.vbproj
+++ b/Gemeinsames/Gemeinsames.vbproj
@@ -88,9 +88,6 @@
    <PlatformTarget>x64</PlatformTarget>
    <OutputPath>bin\x64\Release\</OutputPath>
  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Accessibility" />
    <Reference Include="GrapeCity.ActiveReports">
@@ -126,6 +123,10 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
@@ -258,16 +259,6 @@
  <ItemGroup>
    <None Include="Resources\road.jpg" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
-      <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
-      <Name>DAKOSY_Worker_lib</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>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
      <Visible>False</Visible>
@@ -312,6 +303,12 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
+      <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
+      <Name>DAKOSY_Worker_lib</Name>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@@ -0,0 +1 @@
+GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
--- a/Gemeinsames/rptSendungen.vb
+++ b/Gemeinsames/rptSendungen.vb
@@ -157,11 +157,16 @@ Public Class rptSendungen
        End If

        Select Case VALUES.ABF_ART
-            Case 5, 6
+            Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                txtNCTSVZAdr.Visible = True
                lblNCTSVZAdr.Visible = True
                txtNCTSVZAdr.Text = VALUES.NCTS_VZAdr
                lblNCTSVZAdr.Text = "NCTS" & vbNewLine & "Gest.-Adr.:"
+            Case 7
+                txtNCTSVZAdr.Visible = True
+                lblNCTSVZAdr.Visible = True
+                txtNCTSVZAdr.Text = VALUES.NCTS_VZAdr
+                lblNCTSVZAdr.Text = "Amtsplatz/" & vbNewLine & "Zollstopp:"
            Case 26, 28
                txtNCTSVZAdr.Visible = True
                lblNCTSVZAdr.Visible = True
--- a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj
+++ b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj
@@ -313,15 +313,14 @@
      <Project>{1f68e194-88a8-47f2-b9f9-20e092efa30a}</Project>
      <Name>Bria_API_CSharp_SampleApp_3.0</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>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="ATAPI">
      <Version>2018.3.9</Version>
    </PackageReference>
+    <PackageReference Include="LinphoneSDK.Windows">
+      <Version>5.2.0-alpha.156</Version>
+    </PackageReference>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="lib\" />
Author	SHA1	Message	Date
d.breimaier	914da90d60	Berechtigung für Essensbestellung	2022-11-30 16:09:47 +01:00
d.breimaier	67601f4ee3	Essensbestellungen GUIVerbesserungen	2022-11-30 14:34:57 +01:00
d.breimaier	72693343d8	Gesamtsicherheiten und Essensbestellungen	2022-11-30 14:10:00 +01:00
d.breimaier	b73bb67349	Essensbestellungen	2022-11-30 10:24:58 +01:00
d.breimaier	d0f4c450fb	Essensbestellungen	2022-11-29 17:25:00 +01:00
d.breimaier	340fdc57c0	Essensbestellung	2022-11-29 15:19:34 +01:00
d.breimaier	e5909bd403	Essensbestellungen	2022-11-29 15:15:05 +01:00
d.breimaier	4882bdfa18	Essensbestellungen	2022-11-28 17:37:49 +01:00
d.breimaier	926580e58f	Essensbestellung	2022-11-28 16:50:52 +01:00
d.breimaier	068d3d8fb2	Essensbestellungen	2022-11-28 11:46:30 +01:00
d.breimaier	d7109597c7	Bugfix Gesamtsicherheiten	2022-11-25 12:18:15 +01:00
d.breimaier	7c87228bff	Standarddrucker	2022-11-25 11:55:33 +01:00
d.breimaier	132ae678a0	Standarddrucker	2022-11-25 11:54:47 +01:00
d.breimaier	abbf016761	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-25 11:42:21 +01:00
d.breimaier	22778c3d15	Feature: Standarddrucker wechseln	2022-11-25 11:39:19 +01:00
Andreas Luxbauer	7b0acd449d	version	2022-11-25 09:11:03 +01:00
Andreas Luxbauer	76f37928fb	version	2022-11-25 09:10:33 +01:00
Andreas Luxbauer	ceb20cb934	version	2022-11-25 09:09:54 +01:00
Andreas Luxbauer	f50b4ac803	Korrektur Steuerung Meine Sendungen --> TeamID	2022-11-24 23:21:22 +01:00
d.breimaier	f0e9eb8867	Gesamtsicherheiten: Hinweis bei Überschreitung von Referenzwert!	2022-11-23 17:02:15 +01:00
d.breimaier	c999394224	Fehlerhandling verbessert -> falsche von Nutzer eingegebene Werte werden in div. Spalten geprüft/entfernt.	2022-11-23 11:45:14 +01:00
d.breimaier	51f2e33a10	Bugfix gesamtsicherheiten: Typo "avisioId"	2022-11-23 10:38:01 +01:00
d.breimaier	ea6a3f1135	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-23 09:41:37 +01:00
d.breimaier	25c9ac0f42	Bugfix, weitere Änderungen T1 Bestätigung	2022-11-23 09:41:30 +01:00
Andreas Luxbauer	1da7a5f5f7	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-22 22:38:14 +01:00
Andreas Luxbauer	feed78ca9b	Vermerkesteuerung 96,97	2022-11-22 22:38:06 +01:00
d.breimaier	272f0edd64	Feature: T1 Bestätigung	2022-11-22 17:27:23 +01:00
d.breimaier	710318d04f	Gesamtsicherheiten: KennNr bei Warenorte eingefügt.	2022-11-22 08:40:10 +01:00
d.breimaier	19c147d6c0	Frachtkosten berechnen für Transport von/nach GB	2022-11-21 09:40:22 +01:00
d.breimaier	da98c623d3	Fix GMVS	2022-11-16 09:06:52 +01:00
d.breimaier	7a9d8ae767	Fixes GMVS	2022-11-16 09:04:38 +01:00
d.breimaier	a2b9b2ad08	GVMS Feature	2022-11-15 16:13:35 +01:00
d.breimaier	c4aaf70bee	GVMS Feature implementiert	2022-11-15 15:54:10 +01:00
d.breimaier	4598cce1d1	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-14 13:47:47 +01:00
d.breimaier	d7f8020b28	Gesamtsicherheiten_Defaultfilter	2022-11-14 13:47:41 +01:00
Andreas Luxbauer	a1f143af5f	Version	2022-11-14 13:13:58 +01:00
d.breimaier	068d35126e	gesamtsicherheiten_Umbau auf ADMIN-tbl	2022-11-14 12:12:15 +01:00
Andreas Luxbauer	f06bed5f1b	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-14 11:15:55 +01:00
Andreas Luxbauer	fd38aacd33	AMBAR Grenzstelle änderbar	2022-11-14 10:49:25 +01:00
d.breimaier	5055074cf6	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-14 09:03:13 +01:00
d.breimaier	0d39ab2293	tbl Warenorte neu erstellt und im Aviso eingebunden	2022-11-14 09:03:08 +01:00
Andreas Luxbauer	5ec4a96a63	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-10 09:09:25 +01:00
Andreas Luxbauer	57c49ac006	Vermerke anzeige, DragDrop ImportAssist.	2022-11-10 09:09:18 +01:00
d.breimaier	adfc240b32	Export CSV mit cProgramFunction implementiert.	2022-11-09 17:06:03 +01:00
d.breimaier	06cb3c4599	Gesamtsicherheiten: CSV Export	2022-11-09 16:30:21 +01:00
d.breimaier	e5d6b27caf	fix	2022-11-09 12:14:07 +01:00
d.breimaier	76fa88382b	fix	2022-11-09 12:09:57 +01:00
d.breimaier	afe37f7d7f	Gesamtsicherheiten: CSV-Export für Gesamtsicherh + Positionen	2022-11-09 12:06:41 +01:00
d.breimaier	2a0420a46c	Gesamtsicherheiten	2022-11-09 09:55:07 +01:00
d.breimaier	aa03ff853c	Gesamtsicherheiten: Änderungen von Mestan durchgeführt	2022-11-09 09:21:11 +01:00
d.breimaier	9145618f58	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-08 17:07:31 +01:00
d.breimaier	3090a65b41	gesamtsicherheiten: AT-Nrn ändern	2022-11-08 17:07:26 +01:00
Andreas Luxbauer	e2f5268fb0	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-11-08 14:05:18 +01:00
Andreas Luxbauer	1d39579548	Layout Sendungen/LKWDetails	2022-11-08 14:05:13 +01:00
d.breimaier	5fa8a3ff41	Message bei Gesamtsicherheiten ausgeblendet.	2022-11-08 10:56:14 +01:00
d.breimaier	19c48fd6ea	gesamtsicherheiten, datum bei LKW-ID dropbox	2022-11-07 14:37:59 +01:00
d.breimaier	ff9be06159	gesamtsicherheiten: Positionsnummerierung und AvisoID eingebaut	2022-11-02 17:34:13 +01:00
d.breimaier	a1e0c2bc6e	feature_gesamtsicherheiten änderungen	2022-11-02 12:34:40 +01:00
d.breimaier	e0a0e60440	Gesamtsicherheiten: GUI-Verbesserungen	2022-10-31 16:31:21 +01:00
d.breimaier	52b9143157	feature_Gesamtsicherheiten: GUI verbessert	2022-10-31 14:29:32 +01:00
d.breimaier	15019021c0	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-31 08:30:14 +01:00
d.breimaier	13453a027f	bugfixing gesamtsicherheiten	2022-10-31 08:30:10 +01:00
Andreas Luxbauer	4917250a4d	LKW CHAT Basis	2022-10-30 22:29:13 +01:00
Andreas Luxbauer	55c8b1578b	neu	2022-10-28 16:22:46 +02:00
d.breimaier	0b6e9800e2	bugfixing_gesamtsicherheiten	2022-10-28 16:10:58 +02:00
Andreas Luxbauer	e70c75aecc	Test	2022-10-28 15:42:46 +02:00
Andreas Luxbauer	4227726afe	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-28 14:46:17 +02:00
d.breimaier	6340c9d055	Gesamtsicherheiten_CSVExport	2022-10-28 14:18:26 +02:00
d.breimaier	0fdf25d07e	Feature_Gesamtsicherheiten	2022-10-28 12:01:16 +02:00
d.breimaier	2f763da552	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-28 08:05:43 +02:00
d.breimaier	32ded84b4d	feature_gesamtsicherheiten	2022-10-28 08:05:38 +02:00
Andreas Luxbauer	698443a23e	Warnmeldung VP Pos	2022-10-25 23:33:21 +02:00
Andreas Luxbauer	f2306d3225	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-25 22:57:48 +02:00
Andreas Luxbauer	fd62f3aacb	Vorpapier	2022-10-25 22:38:03 +02:00
Andreas Luxbauer	ce2675b5d7	SndDetails	2022-10-22 23:55:27 +02:00
d.breimaier	3d5f7302dd	feature_gesamtsicherheiten	2022-10-21 17:01:56 +02:00
d.breimaier	ed4e9bc99b	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-21 08:27:53 +02:00
Andreas Luxbauer	4c54c34eaf	CMR	2022-10-19 22:22:30 +02:00
d.breimaier	b67e780cb7	Feature_Gesamtsicherheiten	2022-10-19 17:04:36 +02:00
d.breimaier	21e4681df7	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-19 09:46:33 +02:00
d.breimaier	5647343b76	Feature_GesamtsicherheitenNEU	2022-10-19 09:46:29 +02:00
Andreas Luxbauer	1c8603c9b9	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-19 09:39:18 +02:00
Andreas Luxbauer	5c886da4c2	Version	2022-10-19 09:39:12 +02:00
d.breimaier	db85cc6243	Feature_Gesamtsicherheiten	2022-10-18 17:03:04 +02:00
d.breimaier	1b0c272c32	Feature_Refactoring Gesamtsicherheiten	2022-10-17 17:43:30 +02:00
d.breimaier	8f213f0789	Feature Gesamtsicherheiten: Refactorting und Einbau der neuen Funktionen	2022-10-14 16:20:30 +02:00
d.breimaier	5961aa77b3	Feature Frachtkostenberechnen um Gesamtfrachtkostenlogik erweitert.	2022-10-14 09:09:38 +02:00
Andreas Luxbauer	d29fc1c7af	neu	2022-10-14 08:24:27 +02:00
Andreas Luxbauer	fdc10fec10	Frachtkosten	2022-10-14 08:21:46 +02:00
Andreas Luxbauer	3fb8032cc2	Frachtkosten	2022-10-14 08:20:48 +02:00
Andreas Luxbauer	7622804091	Design Änderugnen	2022-10-14 08:16:28 +02:00
Andreas Luxbauer	fcc4d95267	Design Änderugnen	2022-10-14 08:11:50 +02:00
d.breimaier	d84e99ab06	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-12 14:24:36 +02:00
d.breimaier	faec94f9e3	Bugfix	2022-10-12 14:23:58 +02:00
Andreas Luxbauer	f4031a36e3	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-12 14:21:04 +02:00
Andreas Luxbauer	2ca94dcf78	Fixes	2022-10-12 14:20:57 +02:00
d.breimaier	acf168c72e	Meldung bei fehlerhafter Standortermittlung.	2022-10-12 11:33:03 +02:00
d.breimaier	e9a84ab255	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-12 11:23:49 +02:00
d.breimaier	e5f6b65a9c	Bugfixes	2022-10-12 11:23:39 +02:00
d.breimaier	457faacad0	Bugfix Frachtkostenberechnung	2022-10-12 10:58:18 +02:00
Andreas Luxbauer	00330cccda	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-11 22:24:02 +02:00
Andreas Luxbauer	bd85a560a1	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-11 22:23:58 +02:00
Andreas Luxbauer	52739070bf	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-11 22:19:54 +02:00
Andreas Luxbauer	43f7efc7c6	Meine-Sendungen Anzeige	2022-10-11 22:19:48 +02:00
d.breimaier	e6930cc9dd	Typo korrigiert	2022-10-11 17:36:07 +02:00
d.breimaier	caf034d5f0	Feature_Implementierung Frachkostenberechnung	2022-10-11 16:35:32 +02:00
d.breimaier	70e583853f	feature_Frachtkostenberechnung	2022-10-10 17:36:28 +02:00
d.breimaier	276c19cc30	Mergekonflikt aufgelöst (eingehene Änderungen von Andreas wurden übernommen).	2022-10-10 14:18:18 +02:00
d.breimaier	89edda0a7d	feature_implementierung frachkostenberechnung	2022-10-10 14:14:49 +02:00
Andreas Luxbauer	4dcbcbab96	Merge: Routen, AVISO-Ansicht	2022-10-10 14:10:47 +02:00
d.breimaier	fe6bcdb8eb	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-10-10 11:18:47 +02:00
d.breimaier	21bf05ed06	Exception-Handling verfeinert, kleine Bugfixes durchgeführt.	2022-10-10 11:17:11 +02:00
Andreas Luxbauer	b44f5efd69	AVISO Ansicht, Sendung-Frachtksoten	2022-10-10 10:33:38 +02:00
d.breimaier	bba6f37e92	Exception-Handling verfeinert, kleine Bugfixes.	2022-10-10 09:27:39 +02:00
d.breimaier	2b982ebb9a	Feature_Routenberechnung implementiert	2022-10-07 16:13:36 +02:00
d.breimaier	ed48c0eaef	frmRoutenBerechnung im frmEintragAvios eingebaut, inkl. Berechnungslogik	2022-10-05 17:07:53 +02:00
d.breimaier	01b51759b0	Feature: frmEintragAviso Berechnung für Transportwegdauer	2022-10-04 17:29:28 +02:00
d.breimaier	3b59053b4b	Feature: UserControl für Routenverwaltung erstellt (NCTSRouten).	2022-10-04 16:03:13 +02:00
Andreas Luxbauer	8404604de3	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-09-30 22:43:32 +02:00
Andreas Luxbauer	120fa35a97	divers	2022-09-30 22:17:55 +02:00
d.breimaier	9f2f0d8ed6	Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO	2022-09-30 16:39:34 +02:00
d.breimaier	521fe878ef	Feature_In VMs können nun ebenfalls Emails abgespeichert werden.	2022-09-30 16:38:42 +02:00
Andreas Luxbauer	dc3b07e539	neu	2022-09-19 08:38:57 +02:00
				`@@ -0,0 +1 @@`
				`GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff`