merge

Aviso/App.config

@@ -90,12 +90,16 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.7.21.0" newVersion="10.7.21.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.web>

Aviso/Aviso.vbproj

@@ -148,8 +148,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="BouncyCastle.Cryptography">
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
@@ -201,32 +201,44 @@
     <Reference Include="Gemeinsames">
       <HintPath>..\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath>
     </Reference>
-    <Reference Include="itext.barcodes, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.barcodes, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.barcodes.dll</HintPath>
     </Reference>
-    <Reference Include="itext.forms, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.bouncy-castle-adapter, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.forms.dll</HintPath>
+      <HintPath>..\packages\itext.bouncy-castle-adapter.9.6.0\lib\net461\itext.bouncy-castle-adapter.dll</HintPath>
     </Reference>
-    <Reference Include="itext.io, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.bouncy-castle-connector, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.io.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath>
     </Reference>
-    <Reference Include="itext.kernel, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.commons, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.kernel.dll</HintPath>
+      <HintPath>..\packages\itext.commons.9.6.0\lib\net461\itext.commons.dll</HintPath>
     </Reference>
-    <Reference Include="itext.layout, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.forms, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.layout.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.forms.dll</HintPath>
     </Reference>
-    <Reference Include="itext.pdfa, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.io, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.pdfa.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.io.dll</HintPath>
     </Reference>
-    <Reference Include="itext.sign, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.kernel, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.sign.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.kernel.dll</HintPath>
     </Reference>
-    <Reference Include="itext.styledxmlparser, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.layout, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.styledxmlparser.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.layout.dll</HintPath>
     </Reference>
-    <Reference Include="itext.svg, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+    <Reference Include="itext.pdfa, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.svg.dll</HintPath>
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfa.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.pdfua, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfua.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.sign, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.sign.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.styledxmlparser, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.styledxmlparser.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.svg, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.svg.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -397,8 +409,8 @@
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Configuration">
@@ -407,15 +419,27 @@
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection">
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Hosting">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Hosting.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
@@ -455,6 +479,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
@@ -501,6 +528,9 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -524,13 +554,19 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Xml, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Xml.6.0.2\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>

Aviso/AvisoStatusFunctions.vb

@@ -2174,7 +2174,7 @@ ELSE_ATILLA:
                                 Dim DsId = ""
                                 Dim DsId2 = ""
                                 Dim frist = ""
-                                Dim gestellungsadresse = "<td><td/>"
+                                Dim gestellungsadresse = "<td></td>"
                                 Dim found = False
                                 Select Case s.tblSnd_Abfertigungsart_ID
                                     Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand 
@@ -2265,7 +2265,7 @@ ELSE_ATILLA:
                                                                 Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)
                                                                 If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True
                                                             End If
-                                                            If IsNumeric(DsId) Then
+                                                            If IsNumeric(DsId2) Then
                                                                 Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False)
                                                                 If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True
                                                             End If
@@ -2294,7 +2294,7 @@ ELSE_ATILLA:
                         If cnt = 1 Then ' wurde nicht erhöht -> keine Einträge
                             SendungslistTXT = ""
                         End If
-                        If KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
+                        If KUNDE_ERW IsNot Nothing AndAlso KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
                     End If
                 End If
         End Select
@@ -2375,7 +2375,7 @@ ELSE_ATILLA:
         If AbfertigungsNr <= 0 Then Return False
 
         If FilialenNr <> 4805 And FilialenNr <> 4811 Then ' Kein Ü-T 
-            Dim dt = VERAGSQL.loadDgvBySql("SELECT isnull(dy_vbd_dsid,'') as DsId ,isnull(isnull(ncts_MRN,ncts_ANR),'') as MRN, isnull(ncts_Wiedergestellungsdatum ,'') as WG FROM   tblDakosy_Zollanmeldungen   inner join tblDakosy_nctsout on dy_id=ncts_dyaAnmID where dy_SendungsId='" & SendungsId & "' and dy_status <= 70 order by dy_status desc, dy_Erstellung desc", "FMZOLL")
+            Dim dt = VERAGSQL.loadDgvBySql("SELECT isnull(dy_vbd_dsid,'') as DsId ,isnull(isnull(ncts_MRN,ncts_ANR),'') as MRN, isnull(ncts_LimitDate ,'') as WG FROM   tblDakosy_Zollanmeldungen   inner join tblDakosy_NCTSOut004 on dy_id=ncts_dyaAnmID where dy_SendungsId='" & SendungsId & "' and dy_status <= 70 order by dy_status desc, dy_Erstellung desc", "FMZOLL")
             If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
                 AtcMrn = dt.Rows(0)("MRN")
                 dsId = dt.Rows(0)("DsId")

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.7.1")>
+<Assembly: AssemblyVersion("4.2.8.8")>
-<Assembly: AssemblyFileVersion("4.2.7.1")>
+<Assembly: AssemblyFileVersion("4.2.8.8")>

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -24,13 +24,14 @@ Public Class frmGesamtsicherheitenMenuNEU
 
 
         Select Case Standort
-            Case "Verag GmbH" : firmaId = 2 : chkOffen.Checked = True
+            Case Sicherheiten_Standort.VERAG_GMBH : firmaId = 2 : chkOffen.Checked = True
-            Case "VERAG AG" : firmaId = 1 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.VERAG_AG : firmaId = 1 : chkOffen.Checked = False
-            Case "IMEX" : firmaId = 20 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.IMEX : firmaId = 20 : chkOffen.Checked = False
-            Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.VERAG_CS : firmaId = 11 : chkOffen.Checked = False
-            Case "Unisped GmbH" : firmaId = 21 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.UNISPED : firmaId = 21 : chkOffen.Checked = False
-            Case "AMBAR GmbH" : firmaId = 24 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.AMBAR : firmaId = 24 : chkOffen.Checked = False
-            Case "Atilla GmbH" : firmaId = 7 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.ATILLA : firmaId = 7 : chkOffen.Checked = False
+            Case Sicherheiten_Standort.ZOLLERN : firmaId = 90 : chkOffen.Checked = False
         End Select
 
 
@@ -41,9 +42,9 @@ Public Class frmGesamtsicherheitenMenuNEU
         Me.Text = "Gesamtsicherheiten " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvListe)
 
-        GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
+        GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId)
         If GesSichRef.hasEntry = False Then
-            MsgBox("Für den Standort " & Standort & " wurde keine Referenz hingerlegt!")
+            MsgBox("Für den Standort " & Standort & " wurde keine Referenz hinterlegt!")
             Exit Sub
 
         End If

Aviso/frmGesamtsicherheitenNEU.vb

@@ -66,7 +66,20 @@ Public Class frmGesamtsicherheitenNEU
         End If
 
 
-        currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
+        Select Case Standort
+            Case Sicherheiten_Standort.VERAG_GMBH : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO : firmaId = 2
+            Case Sicherheiten_Standort.AMBAR : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO :: firmaId = 24
+            Case Sicherheiten_Standort.ATILLA : btnDAKOSY_AUTO.Enabled = False : firmaId = 7
+            Case Sicherheiten_Standort.VERAG_AG : btnDAKOSY_AUTO.Enabled = False : firmaId = 1
+            Case Sicherheiten_Standort.IMEX : btnDAKOSY_AUTO.Enabled = False : firmaId = 20
+            Case Sicherheiten_Standort.VERAG_CS : btnDAKOSY_AUTO.Enabled = False : firmaId = 11
+            Case Sicherheiten_Standort.UNISPED : btnDAKOSY_AUTO.Enabled = False : firmaId = 21
+            Case Sicherheiten_Standort.ZOLLERN : btnDAKOSY_AUTO.Enabled = False : firmaId = 90
+            Case Else : btnDAKOSY_AUTO.Enabled = False
+
+        End Select
+
+        currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId)
         SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
         lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
 
@@ -100,17 +113,7 @@ Public Class frmGesamtsicherheitenNEU
         initPrevNextButtons()
         changeLabel()
 
-        Select Case Standort
-            Case "Verag GmbH" : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
-            Case "AMBAR GmbH" : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
-            Case "Atilla GmbH" : btnDAKOSY_AUTO.Enabled = False
-            Case "VERAG AG" : btnDAKOSY_AUTO.Enabled = False
-            Case "IMEX" : btnDAKOSY_AUTO.Enabled = False
-            Case "Verag CS" : btnDAKOSY_AUTO.Enabled = False
-            Case "Unisped GmbH" : btnDAKOSY_AUTO.Enabled = False
-            Case Else : btnDAKOSY_AUTO.Enabled = False
 
-        End Select
 
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
@@ -172,7 +175,7 @@ Public Class frmGesamtsicherheitenNEU
                         .Columns("gs_ust").DefaultCellStyle.Format = "c2"
 
                     Case Else
-                        If Standort = "Verag GmbH" Then
+                        If Standort = Sicherheiten_Standort.VERAG_GMBH Then
                             .Columns("gs_ATBNr").HeaderText = "Reg-Nr."
                         Else
                             .Columns("gs_ATBNr").HeaderText = "T1 MRN"
@@ -241,7 +244,21 @@ Public Class frmGesamtsicherheitenNEU
 
         Me.Cursor = Cursors.WaitCursor
 
-        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+
+        Select Case standort
+            Case Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
+            Case Sicherheiten_Standort.AMBAR : firmaId = 24
+            Case Sicherheiten_Standort.ATILLA : firmaId = 7
+            Case Sicherheiten_Standort.VERAG_AG : firmaId = 1
+            Case Sicherheiten_Standort.IMEX : firmaId = 20
+            Case Sicherheiten_Standort.VERAG_CS : firmaId = 11
+            Case Sicherheiten_Standort.UNISPED : firmaId = 21
+            Case Else
+
+        End Select
+
+
+        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort, firmaId)
 
 
         'Dim gsnr As String
@@ -422,7 +439,21 @@ Public Class frmGesamtsicherheitenNEU
 
         Me.Cursor = Cursors.WaitCursor
 
-        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+
+        Select Case standort
+            Case Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
+            Case Sicherheiten_Standort.AMBAR : firmaId = 24
+            Case Sicherheiten_Standort.ATILLA : firmaId = 7
+            Case Sicherheiten_Standort.VERAG_AG : firmaId = 1
+            Case Sicherheiten_Standort.IMEX : firmaId = 20
+            Case Sicherheiten_Standort.VERAG_CS : firmaId = 11
+            Case Sicherheiten_Standort.UNISPED : firmaId = 21
+            Case Else
+
+        End Select
+
+
+        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort, firmaId)
 
         Dim gsnr As String
         Dim counter = 0
@@ -464,7 +495,7 @@ Public Class frmGesamtsicherheitenNEU
         dtSicherheiten.Columns.Add("SSaldo")
 
         If currentGesSichRef Is Nothing Then
-            currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+            currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort, firmaId)
         End If
 
         Dim drFirst = dtSicherheiten.NewRow
@@ -561,9 +592,9 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 Select Case currentGesSichRef.brgakto_gs_ATR
                     Case True
-                        If Standort = "Verag GmbH" Then
+                        If Standort = Sicherheiten_Standort.VERAG_GMBH Then
                             .Columns("gsp_MRNNr").HeaderText = "ATC. / MRN"
-                        ElseIf Standort = "VERAG AG" Then
+                        ElseIf Standort = Sicherheiten_Standort.VERAG_AG Then
                             .Columns("gsp_MRNNr").HeaderText = "T1 CRN"
                         Else
                             .Columns("gsp_MRNNr").HeaderText = "EZA / T1 CRN"
@@ -2081,7 +2112,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub changeLabel(Optional isATR As Boolean = True)
 
-        If Standort = "Verag GmbH" Then
+        If Standort = Sicherheiten_Standort.VERAG_GMBH Then
             'Label1.Text = "Reg-Nr."
 
             If isATR Then
@@ -2092,7 +2123,7 @@ Public Class frmGesamtsicherheitenNEU
             End If
 
 
-        ElseIf Standort = "VERAG AG" Then
+        ElseIf Standort = Sicherheiten_Standort.VERAG_AG Then
             Label12.Text = "T1 CRN"
             'Label1.Text = "T1 MRN"
         Else
@@ -2325,7 +2356,7 @@ Public Class frmGesamtsicherheitenNEU
         Dim whereWarenort As String = " WHERE [wo_aktiv] = 1  AND wo_ze = 1"
 
 
-        If Standort = "Atilla GmbH" Then
+        If Standort = Sicherheiten_Standort.ATILLA Then
 
             '----'nicht unisped und cs und ambar aber alle anderen - laut j.Siener am 23.03.2026
 
@@ -2345,7 +2376,7 @@ Public Class frmGesamtsicherheitenNEU
 
         If setDefaultValue AndAlso cboWarenort.Items.Count > 0 Then
 
-            If Standort = "AMBAR GmbH" Then
+            If Standort = Sicherheiten_Standort.AMBAR Then
                 For i As Integer = 0 To cboFiliale.Items.Count - 1
                     If cboFiliale.Items(i).ToString().Contains("5701") Then
                         cboFiliale.SelectedIndex = i

Aviso/frmHauptfenster.Designer.vb

@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -194,6 +194,9 @@ Partial Class frmHauptfenster
         Me.AnnahmeblattIMPORTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AnnahmeblattEXPORTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ChecklisteVerwahrlagerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator()
         Me.EinheitspapierToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CMRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -425,9 +428,7 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DEZollernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -959,26 +960,26 @@ Partial Class frmHauptfenster
         'GenerelleGestellungenDurchsuchenToolStripMenuItem
         '
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
         '
         'KundenVonFremdenSpeditionenToolStripMenuItem
         '
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
         '
         'KundenverwaltungToolStripMenuItem
         '
         Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
         '
         'MDMParkplatzkartenToolStripMenuItem
         '
         Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
         '
         'SMSSendenToolStripMenuItem
@@ -986,7 +987,7 @@ Partial Class frmHauptfenster
         Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
         Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
         Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.SMSSendenToolStripMenuItem.Text = "SMS"
         '
         'NeueSMSSendenToolStripMenuItem
@@ -1004,139 +1005,139 @@ Partial Class frmHauptfenster
         'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
         '
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
         '
         'MRNBarcodedruckToolStripMenuItem
         '
         Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
         '
         'NewsletterToolStripMenuItem
         '
         Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
-        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.NewsletterToolStripMenuItem.Text = "Newsletter"
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
         '
         'tool_BRGXLS
         '
         Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
         Me.tool_BRGXLS.Text = "Bürgschaften Excel"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
         Me.ToolStripMenuItem4.Visible = False
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
         Me.ToolStripMenuItem5.Visible = False
         '
         'BürgschaftenExcelToolStripMenuItem
         '
         Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
         Me.BürgschaftenExcelToolStripMenuItem.Visible = False
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
         Me.ToolStripMenuItem6.Visible = False
         '
         'GesamtsicherheitenToolStripMenuItem
         '
-        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem, Me.ReferenzwerteToolStripMenuItem})
+        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem, Me.DEZollernToolStripMenuItem, Me.ReferenzwerteToolStripMenuItem})
         Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
         Me.GesamtsicherheitenToolStripMenuItem.Visible = False
         '
         'ATVeragAGToolStripMenuItem
         '
         Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem"
-        Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG"
         '
         'ATImexCSToolStripMenuItem
         '
         Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem"
-        Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH"
         '
         'ATVeragCSToolStripMenuItem
         '
         Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem"
-        Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS"
         '
         'DEVeragGmbHToolStripMenuItem
         '
         Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem"
-        Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH"
         '
         'ATUnispedGmbHToolStripMenuItem
         '
         Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem"
-        Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH"
         '
         'DEAmbarToolStripMenuItem
         '
         Me.DEAmbarToolStripMenuItem.Name = "DEAmbarToolStripMenuItem"
-        Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH"
         Me.DEAmbarToolStripMenuItem.Visible = False
         '
         'ATAtillaToolStripMenuItem
         '
         Me.ATAtillaToolStripMenuItem.Name = "ATAtillaToolStripMenuItem"
-        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
         '
         'ReferenzwerteToolStripMenuItem
         '
         Me.ReferenzwerteToolStripMenuItem.Name = "ReferenzwerteToolStripMenuItem"
-        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ReferenzwerteToolStripMenuItem.Text = "Referenzwerte"
         '
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
         '
         'TICKETWaidhausToolStripMenuItem
         '
         Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
         '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
         '
         'DAKOSYToolStripMenuItem
         '
         Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
         Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
         '
         'StammreferenzenVerwaltenToolStripMenuItem
@@ -1148,76 +1149,76 @@ Partial Class frmHauptfenster
         'ToolStripSeparator23
         '
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
         '
         'toolOriginalATR
         '
         Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
         Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
         Me.toolOriginalATR.Text = "Original-ATR"
         '
         'SDLAbholaufträgeToolStripMenuItem
         '
         Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
         '
         'ToolStripMenuItem13
         '
         Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
         '
         'VerträgeToolStripMenuItem
         '
         Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
         Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
-        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.VerträgeToolStripMenuItem.Text = "Verträge"
         '
         'VorauskassenToolStripMenuItem
         '
         Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
         Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
         '
         'ToolStripSeparator11
         '
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
         '
         'EssensbestellungenToolStripMenuItem
         '
         Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
         Me.EssensbestellungenToolStripMenuItem.Visible = False
         '
         'AdministrationEssensbestellungenToolStripMenuItem
         '
         Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
         Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
         '
         'WarenorteToolStripMenuItem
         '
         Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.WarenorteToolStripMenuItem.Text = "Warenorte"
         '
         'DatevBuchungsexportToolStripMenuItem
         '
         Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
         Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
         Me.DatevBuchungsexportToolStripMenuItem.Visible = False
         '
@@ -1236,13 +1237,13 @@ Partial Class frmHauptfenster
         'APIToolStripMenuItem
         '
         Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.APIToolStripMenuItem.Text = "API"
         '
         'FIBUSachkontenToolStripMenuItem
         '
         Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
-        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
         Me.FIBUSachkontenToolStripMenuItem.Visible = False
         '
@@ -1317,20 +1318,20 @@ Partial Class frmHauptfenster
         Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note
         Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem"
-        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
         '
         'MailvorlagenToolStripMenuItem
         '
         Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift
         Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem"
-        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
         Me.MailvorlagenToolStripMenuItem.Visible = False
         '
@@ -1338,7 +1339,7 @@ Partial Class frmHauptfenster
         '
         Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem})
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem2.Text = "Vollmachten"
         '
         'toolStrVM_de
@@ -1374,38 +1375,38 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem12.Text = "Importaviso"
         '
         'ToolStripMenuItem15
         '
         Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem15.Text = "Dispoliste"
         '
         'ToolStripMenuItem18
         '
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem18.Text = "Verzollungspreise"
         '
         'AuftragÜberwachungsdokumentToolStripMenuItem
         '
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument"
         '
         'toolVUB
         '
         Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem})
         Me.toolVUB.Name = "toolVUB"
-        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
+        Me.toolVUB.Size = New System.Drawing.Size(277, 22)
         Me.toolVUB.Text = "VUB"
         '
         'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1423,37 +1424,37 @@ Partial Class frmHauptfenster
         'toolVPCreditreform
         '
         Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
         Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
         Me.toolVPCreditreform.Visible = False
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
         '
         'VerzollungsunterlagenToolStripMenuItem
         '
         Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
         'ToolStripMenuItem11
         '
         Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
         Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
         '
         'WAIDHAUSToolStripMenuItem
         '
         Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem})
         Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem"
-        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
         '
         'ToolStripMenuItem8
@@ -1486,39 +1487,58 @@ Partial Class frmHauptfenster
         Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
         Me.ChecklisteVerwahrlagerToolStripMenuItem.Text = "Checkliste Verwahrlager"
         '
+        'ToolStripMenuItem3
+        '
+        Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25})
+        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN"
+        '
+        'ToolStripMenuItem23
+        '
+        Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
+        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR"
+        '
+        'ToolStripMenuItem25
+        '
+        Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25"
+        Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB"
+        '
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
         '
         'EinheitspapierToolStripMenuItem
         '
         Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
         '
         'CMRToolStripMenuItem
         '
         Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.CMRToolStripMenuItem.Text = "CMR"
         '
         'Einheitspapier0735VersandverfahrenToolStripMenuItem
         '
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
         '
         'CarnetTIRToolStripMenuItem
         '
         Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
         '
         'CarnetTIRALTToolStripMenuItem
         '
         Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
         Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
         '
         'mnuFragezeichen
@@ -2723,38 +2743,38 @@ Partial Class frmHauptfenster
         Me.gridMyAviso.AllowUserToDeleteRows = False
         Me.gridMyAviso.AllowUserToOrderColumns = True
         Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle28.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle29
+        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
         Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle30
+        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
         Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
         Me.gridMyAviso.Name = "gridMyAviso"
         Me.gridMyAviso.ReadOnly = True
-        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle31
+        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.gridMyAviso.RowHeadersVisible = False
         Me.gridMyAviso.RowHeadersWidth = 62
         Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
@@ -3181,47 +3201,47 @@ Partial Class frmHauptfenster
         Me.gridAviso.AllowUserToAddRows = False
         Me.gridAviso.AllowUserToDeleteRows = False
         Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle32.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
         Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle33.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle33.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle33
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
         Me.gridAviso.ColumnHeadersHeight = 25
         Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle34
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7
         Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridAviso.Location = New System.Drawing.Point(0, 248)
         Me.gridAviso.MultiSelect = False
         Me.gridAviso.Name = "gridAviso"
         Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle35
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
         Me.gridAviso.RowHeadersVisible = False
         Me.gridAviso.RowHeadersWidth = 62
         Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle36
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9
         Me.gridAviso.RowTemplate.ReadOnly = True
         Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
         Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -4072,24 +4092,11 @@ Partial Class frmHauptfenster
         Me.Panel7.Size = New System.Drawing.Size(252, 51)
         Me.Panel7.TabIndex = 4
         '
-        'ToolStripMenuItem3
+        'DEZollernToolStripMenuItem
         '
-        Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25})
+        Me.DEZollernToolStripMenuItem.Name = "DEZollernToolStripMenuItem"
-        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
+        Me.DEZollernToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30)
+        Me.DEZollernToolStripMenuItem.Text = "DE | Zollern"
-        Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN"
-        '
-        'ToolStripMenuItem23
-        '
-        Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
-        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22)
-        Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR"
-        '
-        'ToolStripMenuItem25
-        '
-        Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25"
-        Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22)
-        Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB"
         '
         'frmHauptfenster
         '
@@ -4559,4 +4566,5 @@ Partial Class frmHauptfenster
     Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
+    Friend WithEvents DEZollernToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.resx

@@ -257,9 +257,6 @@
         sDvNfNUAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>560, 17</value>
-  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>659, 17</value>
   </metadata>

Aviso/frmHauptfenster.vb

@@ -4781,17 +4781,20 @@ ELSE_ATILLA:
         Process.Start("https://www.ros.ie/customs-roro-control-web/ros/pbn/create")
     End Sub
 
-    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click, DEAmbarToolStripMenuItem.Click, ATAtillaToolStripMenuItem.Click
+    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click, DEAmbarToolStripMenuItem.Click, ATAtillaToolStripMenuItem.Click, DEZollernToolStripMenuItem.Click
+
+
 
         Dim frm As New frmGesamtsicherheitenMenuNEU()
         Select Case sender.name
-            Case "ATVeragAGToolStripMenuItem" : frm.Standort = "VERAG AG"
+            Case "ATVeragAGToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.VERAG_AG
-            Case "DEVeragGmbHToolStripMenuItem" : frm.Standort = "Verag GmbH"
+            Case "DEVeragGmbHToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.VERAG_GMBH
-            Case "ATImexCSToolStripMenuItem" : frm.Standort = "IMEX"
+            Case "ATImexCSToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.IMEX
-            Case "ATVeragCSToolStripMenuItem" : frm.Standort = "Verag CS"
+            Case "ATVeragCSToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.VERAG_CS
-            Case "ATUnispedGmbHToolStripMenuItem" : frm.Standort = "Unisped GmbH"
+            Case "ATUnispedGmbHToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.UNISPED
-            Case "DEAmbarToolStripMenuItem" : frm.Standort = "AMBAR GmbH"
+            Case "DEAmbarToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.AMBAR
-            Case "ATAtillaToolStripMenuItem" : frm.Standort = "Atilla GmbH"
+            Case "ATAtillaToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.ATILLA
+            Case "DEZollernToolStripMenuItem" : frm.Standort = Sicherheiten_Standort.ZOLLERN
         End Select
 
         frm.Show()

Aviso/frmLaufzettel.vb

@@ -425,7 +425,7 @@ Public Class frmLaufzettel
                             Mail.To = "poststelle.za-dettelbach@zoll.bund.de"
                             tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_DTB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
                         Case "WAI"
-                            Mail.To = ""
+                            Mail.To = "zE-zV-VERAG.hza-regensburg@zoll.bund.de"
                             tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_WAI", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
                         Case "SBG"
                             Mail.To = ""
@@ -643,7 +643,4 @@ Public Class frmLaufzettel
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAktenzettelDruck.CheckedChanged
-
-    End Sub
 End Class

Aviso/frmSendungsdetailsNEU.Designer.vb

@@ -37,7 +37,11 @@ Partial Class frmSendungsdetailsNEU
         Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -1038,7 +1042,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem8.Text = "T1"
         '
         'ToolStripMenuItem9
@@ -1046,7 +1050,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9"
-        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem9.Text = "T2"
         '
         'ToolStripMenuItem10
@@ -1054,7 +1058,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem10.Enabled = False
         Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem10.Text = "Ü-T"
         Me.ToolStripMenuItem10.Visible = False
         '
@@ -2729,8 +2733,24 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvAbrechnung.AllowUserToResizeColumns = False
         Me.dgvAbrechnung.AllowUserToResizeRows = False
         Me.dgvAbrechnung.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvAbrechnung.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
         Me.dgvAbrechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAbrechnung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAbrId, Me.clmnAbrFirma, Me.clmnAbrLeistungsNr, Me.clmnAbrLeistung, Me.clmnAbrPreis})
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAbrechnung.DefaultCellStyle = DataGridViewCellStyle15
         Me.dgvAbrechnung.Location = New System.Drawing.Point(6, 35)
         Me.dgvAbrechnung.MultiSelect = False
         Me.dgvAbrechnung.Name = "dgvAbrechnung"
@@ -2776,8 +2796,8 @@ Partial Class frmSendungsdetailsNEU
         '
         'clmnAbrPreis
         '
-        DataGridViewCellStyle13.Format = "C2"
+        DataGridViewCellStyle14.Format = "C2"
-        Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle13
+        Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle14
         Me.clmnAbrPreis.HeaderText = "Preis"
         Me.clmnAbrPreis.MaxInputLength = 15
         Me.clmnAbrPreis.MinimumWidth = 6
@@ -2985,8 +3005,24 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvVorkosten.AllowUserToResizeColumns = False
         Me.dgvVorkosten.AllowUserToResizeRows = False
         Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
         Me.dgvVorkosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVorkosten.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnVK_id, Me.clmnFirma, Me.clmnLeistung, Me.clmnPreis})
+        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle18
         Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4)
         Me.dgvVorkosten.MultiSelect = False
         Me.dgvVorkosten.Name = "dgvVorkosten"
@@ -3028,8 +3064,8 @@ Partial Class frmSendungsdetailsNEU
         'clmnPreis
         '
         Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle14.Format = "C2"
+        DataGridViewCellStyle17.Format = "C2"
-        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14
+        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle17
         Me.clmnPreis.HeaderText = "Preis"
         Me.clmnPreis.MaxInputLength = 15
         Me.clmnPreis.MinimumWidth = 6

Aviso/frmSendungsdetailsNEU.vb

@@ -296,29 +296,64 @@ Public Class frmSendungsdetailsNEU
                 'End If
                 If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID = 44 Then ' ATB GEstellung
 
+
+                    If Not IsValid18AlphaNumericCode(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1) Then
+                        Dim err = "T1/Vorpapier nicht korrekt (18-stellig)!"
+                        rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+
+                    Else
+
                         If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
                             Dim err = "- ATB-Gestellung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte."
                             rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
                             'If showErr Then MsgBox(err) : Return False
                         End If
 
+                    End If
 
                 End If
             End If
 
+            Dim isVerimex As Boolean = (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX")
 
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
+            Dim invalidPrepaper As Boolean =
+                        (cboVorpapier.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier.Text) AndAlso txtVorpapierPos.Text.Trim = "") OrElse
+                        (cboVorpapier2.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier2.Text) AndAlso txtVorpapier2Pos.Text.Trim = "") OrElse
+                        (cboVorpapier3.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier3.Text) AndAlso txtVorpapier3Pos.Text.Trim = "")
 
-                If (cboVorpapier.Text.Trim <> String.Empty And txtVorpapierPos.Text.Trim = String.Empty) Or
+            Dim missingPosition As Boolean =
-                    (cboVorpapier2.Text.Trim <> String.Empty And txtVorpapier2Pos.Text.Trim = String.Empty) Or
+                        (cboVorpapier.Text.Trim <> "" AndAlso txtVorpapierPos.Text.Trim = "" Or cboVorpapier.Text.Trim = "" AndAlso txtVorpapierPos.Text.Trim <> "") OrElse
-                    (cboVorpapier3.Text.Trim <> String.Empty And txtVorpapier3Pos.Text.Trim = String.Empty) Then
+                        (cboVorpapier2.Text.Trim <> "" AndAlso txtVorpapier2Pos.Text.Trim = "" Or cboVorpapier2.Text.Trim = "" AndAlso txtVorpapier2Pos.Text.Trim <> "") OrElse
-                    If showErr AndAlso MsgBox("Pre-Paper Position is not filled. Really continue?", vbYesNoCancel) <> vbYes Then
+                        (cboVorpapier3.Text.Trim <> "" AndAlso txtVorpapier3Pos.Text.Trim = "" Or cboVorpapier3.Text.Trim = "" AndAlso txtVorpapier3Pos.Text.Trim <> "")
+
+            Dim hasIssue As Boolean
+
+            If isVerimex Then
+                hasIssue = (invalidPrepaper OrElse missingPosition)
+            Else
+                hasIssue = (invalidPrepaper OrElse missingPosition)
+            End If
+
+            Dim InfoMsg As String
+
+            If isVerimex Then
+                InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete. Continue?"
+            Else
+                InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig, fortfahren?"
+            End If
+
+            If hasIssue Then
+
+                If showErr Then
+                    If MsgBox(InfoMsg, vbYesNoCancel) <> vbYes Then
                         Return False
                     End If
                 End If
+
             End If
 
 
+
             If cntlAvisierer_Abf.Visible = False And
                 cntlAuftr_Abf.Visible = False And
                 cntlEmpf_Abf.Visible = False And
@@ -1981,7 +2016,6 @@ Public Class frmSendungsdetailsNEU
         End If
 
 
-
         If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
             btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
             setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")
@@ -4955,15 +4989,22 @@ Public Class frmSendungsdetailsNEU
             Try
                 Dim files As New List(Of String) '
                 Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
+                Dim counter As Integer = 0
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
 
-                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then
+                        files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                        counter += 1
+                    End If
                 Next
+
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
+                If outputFile <> "" AndAlso counter > 0 Then
                     Process.Start(outputFile)
+                End If
 
             Catch ex As Exception
                 VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -7962,6 +8003,9 @@ Public Class frmSendungsdetailsNEU
                 Exit Sub
             End If
 
+            If Not IsValid18AlphaNumericCode(vorpT1) Then MsgBox("T1/Vorpapier nicht korrekt (18-stellig)!") : Exit Sub
+
+
             If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
                 MsgBox("Warenwert der Gestellung darf nur in EUR angegeben werden")
                 Exit Sub
@@ -8230,4 +8274,13 @@ Public Class frmSendungsdetailsNEU
             e.SuppressKeyPress = True
         End If
     End Sub
+
+    Private Function IsValid18AlphaNumericCode(value As String) As Boolean
+        value = value.Trim()
+
+        If value.Length <> 18 Then Return False
+
+        Return value.All(Function(c) Char.IsLetterOrDigit(c))
+    End Function
+
 End Class

Aviso/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net48" />
   <package id="cef.redist.x64" version="75.1.14" targetFramework="net47" />
   <package id="cef.redist.x86" version="75.1.14" targetFramework="net47" />
   <package id="CefSharp.Common" version="75.1.143" targetFramework="net47" />
@@ -15,14 +16,24 @@
   <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="itext" version="9.6.0" targetFramework="net48" />
+  <package id="itext.bouncy-castle-adapter" version="9.6.0" targetFramework="net48" />
+  <package id="itext.commons" version="9.6.0" targetFramework="net48" />
+  <package id="itext7" version="9.6.0" targetFramework="net48" />
   <package id="librdkafka.redist" version="2.11.1" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
   <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
   <package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="5.0.0" targetFramework="net48" />
   <package id="System.Interactive.Async" version="4.0.0" targetFramework="net48" />
   <package id="System.IO" version="4.3.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
@@ -33,12 +44,15 @@
   <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net48" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net47" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Xml" version="6.0.2" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
   <package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net47" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net47" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
 </packages>

Aviso/usrCntlSND_ATBGestellung.Designer.vb

@@ -23,25 +23,27 @@ Partial Class usrCntlSND_ATBGestellung
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.pnlT1 = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+        Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.btnGesSicherheit = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label33 = New System.Windows.Forms.Label()
-        Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtATBT1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
         Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label33 = New System.Windows.Forms.Label()
         Me.pnlT1.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'pnlT1
         '
+        Me.pnlT1.Controls.Add(Me.Button2)
         Me.pnlT1.Controls.Add(Me.PictureBox5)
         Me.pnlT1.Controls.Add(Me.txtT1Datum)
         Me.pnlT1.Controls.Add(Me.DateTimePicker1)
@@ -60,6 +62,18 @@ Partial Class usrCntlSND_ATBGestellung
         Me.pnlT1.Size = New System.Drawing.Size(549, 125)
         Me.pnlT1.TabIndex = 0
         '
+        'Button2
+        '
+        Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(424, 94)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(94, 28)
+        Me.Button2.TabIndex = 133
+        Me.Button2.Text = "Saldocheck"
+        Me.Button2.UseVisualStyleBackColor = True
+        Me.Button2.Visible = False
+        '
         'PictureBox5
         '
         Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen1
@@ -70,6 +84,31 @@ Partial Class usrCntlSND_ATBGestellung
         Me.PictureBox5.TabIndex = 132
         Me.PictureBox5.TabStop = False
         '
+        'txtT1Datum
+        '
+        Me.txtT1Datum._DateTimeOnly = False
+        Me.txtT1Datum._numbersOnly = False
+        Me.txtT1Datum._numbersOnlyKommastellen = ""
+        Me.txtT1Datum._numbersOnlyTrennzeichen = True
+        Me.txtT1Datum._Prozent = False
+        Me.txtT1Datum._ShortDateNew = True
+        Me.txtT1Datum._ShortDateOnly = False
+        Me.txtT1Datum._TimeOnly = False
+        Me.txtT1Datum._TimeOnly_Seconds = False
+        Me.txtT1Datum._value = ""
+        Me.txtT1Datum._Waehrung = False
+        Me.txtT1Datum._WaehrungZeichen = True
+        Me.txtT1Datum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtT1Datum.ForeColor = System.Drawing.Color.Black
+        Me.txtT1Datum.Location = New System.Drawing.Point(272, 33)
+        Me.txtT1Datum.MaxLength = 10
+        Me.txtT1Datum.MaxLineLength = -1
+        Me.txtT1Datum.MaxLines_Warning = ""
+        Me.txtT1Datum.MaxLines_Warning_Label = Nothing
+        Me.txtT1Datum.Name = "txtT1Datum"
+        Me.txtT1Datum.Size = New System.Drawing.Size(83, 20)
+        Me.txtT1Datum.TabIndex = 38
+        '
         'DateTimePicker1
         '
         Me.DateTimePicker1.CustomFormat = "''"
@@ -125,60 +164,6 @@ Partial Class usrCntlSND_ATBGestellung
         Me.cbxATBFakturieren.ThreeState = True
         Me.cbxATBFakturieren.UseVisualStyleBackColor = True
         '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(23, 59)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(92, 13)
-        Me.Label4.TabIndex = 20
-        Me.Label4.Text = "ATB / Gestellung:"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(23, 81)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(51, 13)
-        Me.Label3.TabIndex = 15
-        Me.Label3.Text = "Zollstelle:"
-        '
-        '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(79, 13)
-        Me.Label33.TabIndex = 3
-        Me.Label33.Text = "Vorpapier / T1:"
-        '
-        'txtT1Datum
-        '
-        Me.txtT1Datum._DateTimeOnly = False
-        Me.txtT1Datum._numbersOnly = False
-        Me.txtT1Datum._numbersOnlyKommastellen = ""
-        Me.txtT1Datum._numbersOnlyTrennzeichen = True
-        Me.txtT1Datum._Prozent = False
-        Me.txtT1Datum._ShortDateNew = True
-        Me.txtT1Datum._ShortDateOnly = False
-        Me.txtT1Datum._TimeOnly = False
-        Me.txtT1Datum._TimeOnly_Seconds = False
-        Me.txtT1Datum._value = ""
-        Me.txtT1Datum._Waehrung = False
-        Me.txtT1Datum._WaehrungZeichen = True
-        Me.txtT1Datum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtT1Datum.ForeColor = System.Drawing.Color.Black
-        Me.txtT1Datum.Location = New System.Drawing.Point(272, 33)
-        Me.txtT1Datum.MaxLength = 10
-        Me.txtT1Datum.MaxLineLength = -1
-        Me.txtT1Datum.MaxLines_Warning = ""
-        Me.txtT1Datum.MaxLines_Warning_Label = Nothing
-        Me.txtT1Datum.Name = "txtT1Datum"
-        Me.txtT1Datum.Size = New System.Drawing.Size(83, 20)
-        Me.txtT1Datum.TabIndex = 38
-        '
         'txtATBNr
         '
         Me.txtATBNr._DateTimeOnly = False
@@ -225,6 +210,25 @@ Partial Class usrCntlSND_ATBGestellung
         Me.txtATBT1.Size = New System.Drawing.Size(269, 20)
         Me.txtATBT1.TabIndex = 22
         '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.Location = New System.Drawing.Point(23, 59)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(92, 13)
+        Me.Label4.TabIndex = 20
+        Me.Label4.Text = "ATB / Gestellung:"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(23, 81)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(51, 13)
+        Me.Label3.TabIndex = 15
+        Me.Label3.Text = "Zollstelle:"
+        '
         'txtT1VerzollungsadresseBestimmungszollstelle
         '
         Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False
@@ -251,6 +255,16 @@ Partial Class usrCntlSND_ATBGestellung
         Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 16
         Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing
         '
+        '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(79, 13)
+        Me.Label33.TabIndex = 3
+        Me.Label33.Text = "Vorpapier / T1:"
+        '
         'usrCntlSND_ATBGestellung
         '
         Me.Controls.Add(Me.pnlT1)
@@ -276,4 +290,5 @@ Partial Class usrCntlSND_ATBGestellung
     Friend WithEvents txtT1Datum As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents DateTimePicker1 As DateTimePicker
     Friend WithEvents PictureBox5 As PictureBox
+    Friend WithEvents Button2 As Button
 End Class

Aviso/usrCntlSND_ATBGestellung.vb

@@ -1,6 +1,5 @@
 Imports DAKOSY_Worker
 Imports SDL
-
 Imports VERAG_PROG_ALLGEMEIN
 
 
@@ -38,6 +37,10 @@ Public Class usrCntlSND_ATBGestellung
         Dim f As frmSendungsdetailsNEU = Me.FindForm
         If f.SAVE_ME() Then
 
+            Dim INfoVorpapier As String = ""
+
+            If Not checkSendungenVorpapierte(f.SENDUNG_LIST, INfoVorpapier) Then MsgBox(INfoVorpapier) : Exit Sub
+
             SND = f.SENDUNG_LIST(f.CURRENT_INDEX)
 
                 If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
@@ -59,7 +62,9 @@ Public Class usrCntlSND_ATBGestellung
                     WarenwertEUR = SND.tblSnd_Warenwert
                 End If
 
-            If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub
+                If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("T1/Vorpapier angeben!") : Exit Sub
+
+            If Not IsValid18AlphaNumericCode(If(SND.tblSnd_ATB_T1, "")) Then MsgBox("T1/Vorpapier nicht korrekt (18-stellig)!") : Exit Sub
 
             If If(SND.tblSnd_Zollsystem_Land, "") = "" Then MsgBox("Abf-Land muss angegeben werden!") : Exit Sub
 
@@ -83,18 +88,19 @@ Public Class usrCntlSND_ATBGestellung
                 End If
 
                 Dim Standort As String = ""
+                Dim firmaID As Integer = -1
 
                 Select Case SND.FilialenNr
                     Case 4803, 4809
-                        Standort = "VERAG AG"
+                        Standort = Sicherheiten_Standort.VERAG_AG : firmaID = 1
                     Case 5601
-                        Standort = "Unisped GmbH"
+                        Standort = Sicherheiten_Standort.UNISPED : firmaID = 21
                     Case 5701
-                        Standort = "AMBAR GmbH"
+                        Standort = Sicherheiten_Standort.AMBAR : firmaID = 24
                     Case 4810, 5103, 5901
-                        Standort = "VERAG GmbH"
+                        Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
                     Case 5501
-                        Standort = "IMEX"
+                        Standort = Sicherheiten_Standort.IMEX : firmaID = 20
                 End Select
 
                 'sonderfälle lt. Mestan
@@ -102,30 +108,37 @@ Public Class usrCntlSND_ATBGestellung
 
                     Select Case SND.FilialenNr
                         Case 5501, 4803, 4809, 5103
-                            Standort = "VERAG GmbH"
+                            Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
                     End Select
 
                 ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
 
                     If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA  
-                        Standort = "VERAG CS"
+                        Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
                     ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
                         Select Case SND.FilialenNr
                             Case 4803, 5303, 4809, 5103
-                                Standort = "VERAG CS"
+                                Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
                         End Select
 
                     End If
 
                 End If
 
+                If isZollern(SND) Then
 
-                Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 90
+
+            End If
+
+
+
+                Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaID)
                 If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub
 
                 Dim saldo = CDbl(GesSichRef.CalcSaldo())
 
-                Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.gsr_zollsatz / 100)
+                Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100)
 
                 If sicherheitsbertrag > saldo Then
                     If MsgBox(Standort & vbNewLine & "Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert in EUR: " & WarenwertEUR & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub
@@ -183,19 +196,20 @@ Public Class usrCntlSND_ATBGestellung
             Dim frm As New frmGesamtsicherheitenNEU()
 
             Select Case gessicherheit.gs_standort
-                Case "Verag GmbH"
+                Case Sicherheiten_Standort.VERAG_GMBH
                     firmaId = 2
-                Case "Verag AG"
+                Case Sicherheiten_Standort.VERAG_AG
                     firmaId = 1
-                Case "Unisped GmbH"
+                Case Sicherheiten_Standort.UNISPED
                     firmaId = 21
-                Case "AMBAR GmbH"
+                Case Sicherheiten_Standort.AMBAR
                     firmaId = 24
-                Case "Verag CS"
+                Case Sicherheiten_Standort.VERAG_CS
                     firmaId = 11
-                Case "IMEX"
+                Case Sicherheiten_Standort.IMEX
                     firmaId = 20
-
+                Case Sicherheiten_Standort.ZOLLERN
+                    firmaId = 90
             End Select
 
             With frm
@@ -226,15 +240,15 @@ Public Class usrCntlSND_ATBGestellung
 
             Select Case SND.FilialenNr
                 Case 4803, 4809
-                    Standort = "VERAG AG" : firmaId = 1
+                    Standort = Sicherheiten_Standort.VERAG_AG : firmaId = 1
                 Case 5601
-                    Standort = "Unisped GmbH" : firmaId = 21
+                    Standort = Sicherheiten_Standort.UNISPED : firmaId = 21
                 Case 5701
-                    Standort = "AMBAR GmbH" : firmaId = 24
+                    Standort = Sicherheiten_Standort.AMBAR : firmaId = 24
                 Case 4810, 5103, 5901
-                    Standort = "VERAG GmbH" : firmaId = 2
+                    Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
                 Case 5501
-                    Standort = "IMEX" : firmaId = 20
+                    Standort = Sicherheiten_Standort.IMEX : firmaId = 20
             End Select
 
             'sonderfälle lt. Mestan
@@ -242,24 +256,33 @@ Public Class usrCntlSND_ATBGestellung
 
                 Select Case SND.FilialenNr
                     Case 5501, 4803, 4809, 5103
-                        Standort = "VERAG GmbH" : firmaId = 2
+                        Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
                 End Select
 
             ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
 
                 If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA  
-                    Standort = "VERAG CS" : firmaId = 11
+                    Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11
                 ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
                     Select Case SND.FilialenNr
                         Case 4803, 5303, 4809, 5103
-                            Standort = "VERAG CS" : firmaId = 11
+                            Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11
                     End Select
 
                 End If
 
             End If
 
-            Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
+
+
+            If isZollern(SND) Then
+
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 90
+
+            End If
+
+
+            Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId)
             Dim frm As New frmGesamtsicherheitenNEU
 
 
@@ -362,4 +385,66 @@ Public Class usrCntlSND_ATBGestellung
         Process.Start(webAddress)
     End Sub
 
+    Private Function isZollern(SND As cSendungen)
+
+        Dim zollernKdnr = {772383, 712203}
+
+        If zollernKdnr.Contains(SND.tblSnd_AbsenderKdNr) OrElse
+            zollernKdnr.Contains(SND.tblSnd_AuftraggeberKdNr) OrElse
+            (SND.tblSnd_AvisiererKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_AvisiererKdNr)) OrElse
+            zollernKdnr.Contains(SND.tblSnd_EmpfaengerKdNr) OrElse
+            (SND.tblSnd_FrachtfuehrerKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_FrachtfuehrerKdNr)) Then
+            Return True
+        Else
+            Return False
+        End If
+
+
+    End Function
+
+    Private Function IsValid18AlphaNumericCode(value As String) As Boolean
+        value = value.Trim()
+
+        If value.Length <> 18 Then Return False
+
+        Return value.All(Function(c) Char.IsLetterOrDigit(c))
+    End Function
+
+
+    Private Function checkSendungenVorpapierte(list As List(Of cSendungen), ByRef MsgInfo As String) As Boolean
+
+        Dim index As Integer = 1
+        Dim existingVorpapier As Boolean = False
+
+        For Each SND As cSendungen In list
+
+            Dim existing As Boolean =
+            (SND.tblSnd_Vorpapier.ToString.Trim <> "") OrElse
+            (SND.tblSnd_Vorpapier2.ToString.Trim <> "") OrElse
+            (SND.tblSnd_Vorpapier3.ToString.Trim <> "")
+
+            If existing Then existingVorpapier = existing
+
+
+            Dim invalidPrepaper As Boolean =
+            (SND.tblSnd_Vorpapier.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier.ToString.Trim)) OrElse
+            (SND.tblSnd_Vorpapier2.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier2.ToString.Trim)) OrElse
+            (SND.tblSnd_Vorpapier3.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier3.ToString.Trim))
+
+            If invalidPrepaper Then
+                MsgInfo = "Vorpapier-Nr bei Sendung " & index & " ist ungültig!"
+                Return False
+            End If
+
+            index += 1
+
+        Next
+
+        If Not existingVorpapier Then
+            MsgInfo = "keine Vorpapier-Nr bei den Sendung(en) hinterlegt!"
+        End If
+
+        Return existingVorpapier
+
+    End Function
 End Class