merge

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -378,12 +378,12 @@ Partial Class frmATEZ_EZA
         '
         'btnPrio_CommInv
         '
-        Me.btnPrio_CommInv.BackColor = System.Drawing.Color.DeepSkyBlue
+        Me.btnPrio_CommInv.BackColor = System.Drawing.Color.White
         Me.btnPrio_CommInv.Location = New System.Drawing.Point(76, 28)
         Me.btnPrio_CommInv.Name = "btnPrio_CommInv"
         Me.btnPrio_CommInv.Size = New System.Drawing.Size(116, 23)
         Me.btnPrio_CommInv.TabIndex = 159
-        Me.btnPrio_CommInv.Tag = "1"
+        Me.btnPrio_CommInv.Tag = "0"
         Me.btnPrio_CommInv.Text = "Handelsrechnung"
         Me.btnPrio_CommInv.UseVisualStyleBackColor = False
         '

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -345,13 +345,18 @@ Public Class frmATEZ_EZA
     End Sub
 
     Private Function getTelefon() As String
+        Dim defaultDW = "200"
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "ATILLA" : Return "0043 7711 28450"
             Case "AMBAR" : Return "0049 8651 9962492"
+            Case "UNISPED" : defaultDW = "800"
+            Case "IMEX" : defaultDW = "602"
+            Case "VERAG" : defaultDW = "200"
         End Select
 
-        Return "0049 8503 7973999 " & If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl), "200", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl)
+        Dim dw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
-
+        Return "0049 8503 7973999 " &
+               If(String.IsNullOrEmpty(dw) OrElse dw.Length >= 5, defaultDW, dw)
     End Function
     Private Function getDefaultMail_FIRMA() As String
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props" Condition="Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" />
   <Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" />
@@ -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>
@@ -767,6 +803,12 @@
     <Compile Include="frmAddSendungsvermerkShort.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.Designer.vb">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmAnkunftAendern.Designer.vb">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </Compile>
@@ -1437,6 +1479,9 @@
     <EmbeddedResource Include="frmAddSendungsvermerkShort.resx">
       <DependentUpon>frmAddSendungsvermerkShort.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmSendungsDokumentanforderung.resx">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAnkunftAendern.resx">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </EmbeddedResource>
@@ -1545,6 +1590,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmLogin.resx">
       <DependentUpon>frmLogin.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAuswahl_Aviso.resx">
       <DependentUpon>frmAuswahl_Aviso.vb</DependentUpon>

Aviso/AvisoStatusFunctions.vb

@@ -1182,7 +1182,7 @@ Public Class AvisoStatusFunctions
     End Function
 
 
-    Public Function setNichtEingeftroffen(AvisoID, Optional geloescht = False) As Boolean
+    Public Function setNichtEingeftroffen(AvisoID, Optional geloescht = False, Optional auto = False) As Boolean
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
             MsgBox("Keine Berechtigung!")
             Return False
@@ -1220,18 +1220,19 @@ Public Class AvisoStatusFunctions
             Return False
         End If
         Dim tmpid = -1
+        Dim mitarbeiter = If(auto, "AUTO", VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter)
         ' If Aviso.Status = VERAG_PROG_ALLGEMEIN.cglobal.Status_Erfasst Then
         Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen
-        Aviso.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
+        Aviso.letzterMitarbeiter =
         Aviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
         tmpid = AvisoDAL.SpeichernAviso(Aviso)
 
         If geloescht Then
-            Aviso.Änderungen = "auf 'Gelöscht' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
+            Aviso.Änderungen = "auf 'Gelöscht' gesetzt von " & mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
-            AvisoDAL.addAenderung(tmpid, "auf 'Gelöscht' gesetzt", "auf 'Gelöscht' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(tmpid, "auf 'Gelöscht' gesetzt", "auf 'Gelöscht' gesetzt von " & mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
         Else
-            Aviso.Änderungen = "auf LKW nicht eingetroffen gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
+            Aviso.Änderungen = "auf LKW nicht eingetroffen gesetzt von " & mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
-            AvisoDAL.addAenderung(tmpid, "auf LKW nicht eingetroffen gesetzt", "auf LKW nicht eingetroffen gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(tmpid, "auf LKW nicht eingetroffen gesetzt", "auf LKW nicht eingetroffen gesetzt von " & mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
         End If
 
         '  End If

Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb

@@ -277,6 +277,9 @@ Public Class frmAvisoWeiterleiten
             'addBtn(flpFirma, "A", "FISK", "VERAG Fiskal")
             addBtn(flpFirma, "A", "VRR", "VERRECHNUNG")
 
+
+            addBtn(flpFirma, "N", "KLIPP", "VERAG KLIPPHAUSEN")
+
             Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='VERAG' order by team_id", "ADMIN")
             If dt IsNot Nothing Then
                 For Each t In dt.Rows
@@ -302,7 +305,10 @@ Public Class frmAvisoWeiterleiten
                 Next
             End If
         ElseIf sender Is btnFrontoffice Then
-            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True)
+            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE SUBEN", True)
+            'addBtn(flpFirma, "F", "FRONTOFFICE_KLIPP", "FRONT-OFFICE KLIPPHAUSEN", True) -> Wenn Firma gegründet
+
+
         ElseIf sender Is btnATILLA Then
             addBtn(flpFirma, "F", "ATILLA", "ATILLA", True)
             Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='ATILLA' order by team_id", "ADMIN")

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.5.9")>
+<Assembly: AssemblyVersion("4.2.7.5")>
-<Assembly: AssemblyFileVersion("4.2.5.9")>
+<Assembly: AssemblyFileVersion("4.2.7.5")>

Aviso/frmAddSendungsvermerkShort.Designer.vb

@@ -27,59 +27,36 @@ Partial Class frmAddSendungsvermerkShort
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.pnlSendungsVermker = New System.Windows.Forms.Panel()
-        Me.optDraft = New System.Windows.Forms.CheckBox()
+        Me.flpAngefordert = New System.Windows.Forms.FlowLayoutPanel()
-        Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox()
-        Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox()
-        Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox()
-        Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox()
-        Me.cbxPackliste = New System.Windows.Forms.CheckBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.optFremd_ATB = New System.Windows.Forms.CheckBox()
         Me.optFremd_SendungAvisiert = New System.Windows.Forms.CheckBox()
-        Me.optFahrerKeinATR = New System.Windows.Forms.CheckBox()
-        Me.optFrachtkostenAngefordert = New System.Windows.Forms.CheckBox()
-        Me.optKundeNichtErreichbar = New System.Windows.Forms.CheckBox()
-        Me.optAbsenderbestätigung = New System.Windows.Forms.CheckBox()
-        Me.cbxRgBest = New System.Windows.Forms.CheckBox()
-        Me.optUeberwachungsdok = New System.Windows.Forms.CheckBox()
         Me.lblErrSpedition = New System.Windows.Forms.Label()
+        Me.lblDragIndicator = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.lblErrGrund = New System.Windows.Forms.Label()
         Me.btnCLose = New System.Windows.Forms.Button()
-        Me.lblErrDokument = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.txtSpedition = New System.Windows.Forms.TextBox()
         Me.optSendungInVorbereitung = New System.Windows.Forms.CheckBox()
         Me.optSpeditionWeitergeleitet = New System.Windows.Forms.CheckBox()
         Me.optFreierText = New System.Windows.Forms.CheckBox()
         Me.optATAangefordert = New System.Windows.Forms.CheckBox()
-        Me.optVorkasseAngefordert = New System.Windows.Forms.CheckBox()
-        Me.optKontaktdatenAngefordert = New System.Windows.Forms.CheckBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.lblErr240Zeichen = New System.Windows.Forms.Label()
         Me.txtDetail = New System.Windows.Forms.TextBox()
         Me.lblZustzlFreitext = New System.Windows.Forms.Label()
         Me.txtSendungSpedition = New System.Windows.Forms.TextBox()
-        Me.cbxNichtLeserlich = New System.Windows.Forms.CheckBox()
         Me.btnOK = New System.Windows.Forms.Button()
-        Me.cbxSonstDok = New System.Windows.Forms.CheckBox()
+        Me.btnDokumtanforderung = New System.Windows.Forms.Button()
         Me.Label9 = New System.Windows.Forms.Label()
-        Me.cbxVollmacht = New System.Windows.Forms.CheckBox()
-        Me.cbxCMR = New System.Windows.Forms.CheckBox()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label13 = New System.Windows.Forms.Label()
-        Me.cbxATR = New System.Windows.Forms.CheckBox()
-        Me.cbxLS = New System.Windows.Forms.CheckBox()
         Me.txtFreierText = New System.Windows.Forms.TextBox()
-        Me.cbxRechnung = New System.Windows.Forms.CheckBox()
-        Me.Label20 = New System.Windows.Forms.Label()
-        Me.cbxAuftrag = New System.Windows.Forms.CheckBox()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.PictureBox4 = New System.Windows.Forms.PictureBox()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.pnlMain.SuspendLayout()
         Me.pnlSendungsVermker.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -95,135 +72,62 @@ Partial Class frmAddSendungsvermerkShort
         Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlMain.Location = New System.Drawing.Point(0, 0)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(454, 605)
+        Me.pnlMain.Size = New System.Drawing.Size(474, 400)
         Me.pnlMain.TabIndex = 0
         '
         'pnlSendungsVermker
         '
         Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White
         Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnlSendungsVermker.Controls.Add(Me.optDraft)
+        Me.pnlSendungsVermker.Controls.Add(Me.flpAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optGewPackAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optKostenbestaetigungAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optZolltarifnummerAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.txtSonstigesDokumentFehlt)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxPackliste)
         Me.pnlSendungsVermker.Controls.Add(Me.Label4)
         Me.pnlSendungsVermker.Controls.Add(Me.optFremd_ATB)
         Me.pnlSendungsVermker.Controls.Add(Me.optFremd_SendungAvisiert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optFahrerKeinATR)
-        Me.pnlSendungsVermker.Controls.Add(Me.optFrachtkostenAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optKundeNichtErreichbar)
-        Me.pnlSendungsVermker.Controls.Add(Me.optAbsenderbestätigung)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxRgBest)
-        Me.pnlSendungsVermker.Controls.Add(Me.optUeberwachungsdok)
         Me.pnlSendungsVermker.Controls.Add(Me.lblErrSpedition)
+        Me.pnlSendungsVermker.Controls.Add(Me.lblDragIndicator)
         Me.pnlSendungsVermker.Controls.Add(Me.Label2)
         Me.pnlSendungsVermker.Controls.Add(Me.lblErrGrund)
         Me.pnlSendungsVermker.Controls.Add(Me.btnCLose)
-        Me.pnlSendungsVermker.Controls.Add(Me.lblErrDokument)
         Me.pnlSendungsVermker.Controls.Add(Me.Label1)
         Me.pnlSendungsVermker.Controls.Add(Me.txtSpedition)
         Me.pnlSendungsVermker.Controls.Add(Me.optSendungInVorbereitung)
         Me.pnlSendungsVermker.Controls.Add(Me.optSpeditionWeitergeleitet)
         Me.pnlSendungsVermker.Controls.Add(Me.optFreierText)
         Me.pnlSendungsVermker.Controls.Add(Me.optATAangefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optVorkasseAngefordert)
-        Me.pnlSendungsVermker.Controls.Add(Me.optKontaktdatenAngefordert)
         Me.pnlSendungsVermker.Controls.Add(Me.Label3)
         Me.pnlSendungsVermker.Controls.Add(Me.lblErr240Zeichen)
         Me.pnlSendungsVermker.Controls.Add(Me.txtDetail)
         Me.pnlSendungsVermker.Controls.Add(Me.lblZustzlFreitext)
         Me.pnlSendungsVermker.Controls.Add(Me.txtSendungSpedition)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxNichtLeserlich)
         Me.pnlSendungsVermker.Controls.Add(Me.btnOK)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxSonstDok)
+        Me.pnlSendungsVermker.Controls.Add(Me.btnDokumtanforderung)
         Me.pnlSendungsVermker.Controls.Add(Me.Label9)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxVollmacht)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxCMR)
         Me.pnlSendungsVermker.Controls.Add(Me.Label17)
         Me.pnlSendungsVermker.Controls.Add(Me.Label13)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxATR)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxLS)
         Me.pnlSendungsVermker.Controls.Add(Me.txtFreierText)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxRechnung)
-        Me.pnlSendungsVermker.Controls.Add(Me.Label20)
-        Me.pnlSendungsVermker.Controls.Add(Me.cbxAuftrag)
-        Me.pnlSendungsVermker.Controls.Add(Me.PictureBox1)
         Me.pnlSendungsVermker.Controls.Add(Me.PictureBox4)
         Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0)
         Me.pnlSendungsVermker.Name = "pnlSendungsVermker"
-        Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 605)
+        Me.pnlSendungsVermker.Size = New System.Drawing.Size(474, 400)
         Me.pnlSendungsVermker.TabIndex = 0
         '
-        'optDraft
+        'flpAngefordert
         '
-        Me.optDraft.AutoSize = True
+        Me.flpAngefordert.BackColor = System.Drawing.Color.White
-        Me.optDraft.Location = New System.Drawing.Point(12, 262)
+        Me.flpAngefordert.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
-        Me.optDraft.Name = "optDraft"
+        Me.flpAngefordert.Location = New System.Drawing.Point(12, 50)
-        Me.optDraft.Size = New System.Drawing.Size(174, 17)
+        Me.flpAngefordert.Margin = New System.Windows.Forms.Padding(0)
-        Me.optDraft.TabIndex = 102
+        Me.flpAngefordert.Name = "flpAngefordert"
-        Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert"
+        Me.flpAngefordert.Size = New System.Drawing.Size(450, 131)
-        Me.optDraft.UseVisualStyleBackColor = True
+        Me.flpAngefordert.TabIndex = 122
-        '
-        'optGewPackAngefordert
-        '
-        Me.optGewPackAngefordert.AutoSize = True
-        Me.optGewPackAngefordert.Location = New System.Drawing.Point(12, 236)
-        Me.optGewPackAngefordert.Name = "optGewPackAngefordert"
-        Me.optGewPackAngefordert.Size = New System.Drawing.Size(245, 17)
-        Me.optGewPackAngefordert.TabIndex = 101
-        Me.optGewPackAngefordert.Text = "Gewicht/Packstücke mangelhaft - angefordert"
-        Me.optGewPackAngefordert.UseVisualStyleBackColor = True
-        '
-        'optKostenbestaetigungAngefordert
-        '
-        Me.optKostenbestaetigungAngefordert.AutoSize = True
-        Me.optKostenbestaetigungAngefordert.Location = New System.Drawing.Point(270, 214)
-        Me.optKostenbestaetigungAngefordert.Name = "optKostenbestaetigungAngefordert"
-        Me.optKostenbestaetigungAngefordert.Size = New System.Drawing.Size(177, 17)
-        Me.optKostenbestaetigungAngefordert.TabIndex = 99
-        Me.optKostenbestaetigungAngefordert.Text = "Kostenbestätigung - angefordert"
-        Me.optKostenbestaetigungAngefordert.UseVisualStyleBackColor = True
-        '
-        'optZolltarifnummerAngefordert
-        '
-        Me.optZolltarifnummerAngefordert.AutoSize = True
-        Me.optZolltarifnummerAngefordert.Location = New System.Drawing.Point(12, 214)
-        Me.optZolltarifnummerAngefordert.Name = "optZolltarifnummerAngefordert"
-        Me.optZolltarifnummerAngefordert.Size = New System.Drawing.Size(154, 17)
-        Me.optZolltarifnummerAngefordert.TabIndex = 98
-        Me.optZolltarifnummerAngefordert.Text = "Zolltarifnummer angefordert"
-        Me.optZolltarifnummerAngefordert.UseVisualStyleBackColor = True
-        '
-        'txtSonstigesDokumentFehlt
-        '
-        Me.txtSonstigesDokumentFehlt.BackColor = System.Drawing.Color.White
-        Me.txtSonstigesDokumentFehlt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(94, 96)
-        Me.txtSonstigesDokumentFehlt.MaxLength = 80
-        Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt"
-        Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(198, 20)
-        Me.txtSonstigesDokumentFehlt.TabIndex = 10
-        '
-        'cbxPackliste
-        '
-        Me.cbxPackliste.AutoSize = True
-        Me.cbxPackliste.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxPackliste.Location = New System.Drawing.Point(308, 75)
-        Me.cbxPackliste.Name = "cbxPackliste"
-        Me.cbxPackliste.Size = New System.Drawing.Size(69, 17)
-        Me.cbxPackliste.TabIndex = 97
-        Me.cbxPackliste.Text = "Packliste"
-        Me.cbxPackliste.UseVisualStyleBackColor = False
         '
         'Label4
         '
         Me.Label4.AutoSize = True
         Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(11, 411)
+        Me.Label4.Location = New System.Drawing.Point(12, 268)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(125, 17)
         Me.Label4.TabIndex = 96
@@ -233,7 +137,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFremd_ATB.AutoSize = True
         Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 458)
+        Me.optFremd_ATB.Location = New System.Drawing.Point(13, 303)
         Me.optFremd_ATB.Name = "optFremd_ATB"
         Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17)
         Me.optFremd_ATB.TabIndex = 94
@@ -244,93 +148,44 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFremd_SendungAvisiert.AutoSize = True
         Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 435)
+        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(13, 286)
         Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert"
         Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17)
         Me.optFremd_SendungAvisiert.TabIndex = 93
         Me.optFremd_SendungAvisiert.Text = "Sendung an Fremdeinsteller avisiert"
         Me.optFremd_SendungAvisiert.UseVisualStyleBackColor = False
         '
-        'optFahrerKeinATR
-        '
-        Me.optFahrerKeinATR.AutoSize = True
-        Me.optFahrerKeinATR.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFahrerKeinATR.Location = New System.Drawing.Point(308, 52)
-        Me.optFahrerKeinATR.Name = "optFahrerKeinATR"
-        Me.optFahrerKeinATR.Size = New System.Drawing.Size(125, 17)
-        Me.optFahrerKeinATR.TabIndex = 92
-        Me.optFahrerKeinATR.Text = "Fahrer hat kein A.TR"
-        Me.optFahrerKeinATR.UseVisualStyleBackColor = False
-        '
-        'optFrachtkostenAngefordert
-        '
-        Me.optFrachtkostenAngefordert.AutoSize = True
-        Me.optFrachtkostenAngefordert.Location = New System.Drawing.Point(12, 162)
-        Me.optFrachtkostenAngefordert.Name = "optFrachtkostenAngefordert"
-        Me.optFrachtkostenAngefordert.Size = New System.Drawing.Size(145, 17)
-        Me.optFrachtkostenAngefordert.TabIndex = 91
-        Me.optFrachtkostenAngefordert.Text = "Frachtkosten angefordert"
-        Me.optFrachtkostenAngefordert.UseVisualStyleBackColor = True
-        '
-        'optKundeNichtErreichbar
-        '
-        Me.optKundeNichtErreichbar.AutoSize = True
-        Me.optKundeNichtErreichbar.Location = New System.Drawing.Point(270, 141)
-        Me.optKundeNichtErreichbar.Name = "optKundeNichtErreichbar"
-        Me.optKundeNichtErreichbar.Size = New System.Drawing.Size(133, 17)
-        Me.optKundeNichtErreichbar.TabIndex = 90
-        Me.optKundeNichtErreichbar.Text = "Kunde nicht erreichbar"
-        Me.optKundeNichtErreichbar.UseVisualStyleBackColor = True
-        '
-        'optAbsenderbestätigung
-        '
-        Me.optAbsenderbestätigung.AutoSize = True
-        Me.optAbsenderbestätigung.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optAbsenderbestätigung.Location = New System.Drawing.Point(308, 32)
-        Me.optAbsenderbestätigung.Name = "optAbsenderbestätigung"
-        Me.optAbsenderbestätigung.Size = New System.Drawing.Size(136, 17)
-        Me.optAbsenderbestätigung.TabIndex = 89
-        Me.optAbsenderbestätigung.Text = "Absenderbestät. angef."
-        Me.optAbsenderbestätigung.UseVisualStyleBackColor = False
-        '
-        'cbxRgBest
-        '
-        Me.cbxRgBest.AutoSize = True
-        Me.cbxRgBest.Location = New System.Drawing.Point(270, 185)
-        Me.cbxRgBest.Name = "cbxRgBest"
-        Me.cbxRgBest.Size = New System.Drawing.Size(146, 17)
-        Me.cbxRgBest.TabIndex = 86
-        Me.cbxRgBest.Text = "Rechnungsbestät. angef."
-        Me.cbxRgBest.UseVisualStyleBackColor = True
-        '
-        'optUeberwachungsdok
-        '
-        Me.optUeberwachungsdok.AutoSize = True
-        Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 163)
-        Me.optUeberwachungsdok.Name = "optUeberwachungsdok"
-        Me.optUeberwachungsdok.Size = New System.Drawing.Size(114, 17)
-        Me.optUeberwachungsdok.TabIndex = 85
-        Me.optUeberwachungsdok.Text = "Ü-Dok. angefodert"
-        Me.optUeberwachungsdok.UseVisualStyleBackColor = True
-        '
         'lblErrSpedition
         '
         Me.lblErrSpedition.AutoSize = True
         Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red
-        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 316)
+        Me.lblErrSpedition.Location = New System.Drawing.Point(177, 194)
         Me.lblErrSpedition.Name = "lblErrSpedition"
         Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13)
         Me.lblErrSpedition.TabIndex = 17
         Me.lblErrSpedition.Text = "Bitte eine Spedition angegeben:"
         Me.lblErrSpedition.Visible = False
         '
+        'lblDragIndicator
+        '
+        Me.lblDragIndicator.AutoSize = True
+        Me.lblDragIndicator.BackColor = System.Drawing.Color.Transparent
+        Me.lblDragIndicator.Cursor = System.Windows.Forms.Cursors.SizeAll
+        Me.lblDragIndicator.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblDragIndicator.ForeColor = System.Drawing.Color.Gray
+        Me.lblDragIndicator.Location = New System.Drawing.Point(323, 3)
+        Me.lblDragIndicator.Name = "lblDragIndicator"
+        Me.lblDragIndicator.Size = New System.Drawing.Size(84, 15)
+        Me.lblDragIndicator.TabIndex = 132
+        Me.lblDragIndicator.Text = "✥ Verschieben"
+        '
         'Label2
         '
         Me.Label2.AutoSize = True
         Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label2.Location = New System.Drawing.Point(175, 316)
+        Me.Label2.Location = New System.Drawing.Point(176, 205)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(57, 13)
         Me.Label2.TabIndex = 84
@@ -341,7 +196,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.lblErrGrund.AutoSize = True
         Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke
         Me.lblErrGrund.ForeColor = System.Drawing.Color.Red
-        Me.lblErrGrund.Location = New System.Drawing.Point(147, 385)
+        Me.lblErrGrund.Location = New System.Drawing.Point(148, 257)
         Me.lblErrGrund.Name = "lblErrGrund"
         Me.lblErrGrund.Size = New System.Drawing.Size(149, 13)
         Me.lblErrGrund.TabIndex = 26
@@ -357,7 +212,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.btnCLose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnCLose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnCLose.ForeColor = System.Drawing.Color.White
-        Me.btnCLose.Location = New System.Drawing.Point(399, -1)
+        Me.btnCLose.Location = New System.Drawing.Point(419, -1)
         Me.btnCLose.Name = "btnCLose"
         Me.btnCLose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.btnCLose.Size = New System.Drawing.Size(54, 20)
@@ -365,24 +220,12 @@ Partial Class frmAddSendungsvermerkShort
         Me.btnCLose.Text = "X"
         Me.btnCLose.UseVisualStyleBackColor = False
         '
-        'lblErrDokument
-        '
-        Me.lblErrDokument.AutoSize = True
-        Me.lblErrDokument.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.lblErrDokument.ForeColor = System.Drawing.Color.Red
-        Me.lblErrDokument.Location = New System.Drawing.Point(91, 115)
-        Me.lblErrDokument.Name = "lblErrDokument"
-        Me.lblErrDokument.Size = New System.Drawing.Size(157, 13)
-        Me.lblErrDokument.TabIndex = 11
-        Me.lblErrDokument.Text = "Bitte ein Dokument angegeben!"
-        Me.lblErrDokument.Visible = False
-        '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(9, 9)
+        Me.Label1.Location = New System.Drawing.Point(9, 0)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(156, 17)
         Me.Label1.TabIndex = 1
@@ -392,16 +235,16 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSpedition.Location = New System.Drawing.Point(177, 332)
+        Me.txtSpedition.Location = New System.Drawing.Point(178, 215)
         Me.txtSpedition.MaxLength = 50
         Me.txtSpedition.Name = "txtSpedition"
-        Me.txtSpedition.Size = New System.Drawing.Size(125, 20)
+        Me.txtSpedition.Size = New System.Drawing.Size(126, 20)
         Me.txtSpedition.TabIndex = 20
         '
         'optSendungInVorbereitung
         '
         Me.optSendungInVorbereitung.AutoSize = True
-        Me.optSendungInVorbereitung.Location = New System.Drawing.Point(203, 3)
+        Me.optSendungInVorbereitung.Location = New System.Drawing.Point(174, 3)
         Me.optSendungInVorbereitung.Name = "optSendungInVorbereitung"
         Me.optSendungInVorbereitung.Size = New System.Drawing.Size(143, 17)
         Me.optSendungInVorbereitung.TabIndex = 13
@@ -413,7 +256,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optSpeditionWeitergeleitet.AutoSize = True
         Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 334)
+        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(13, 215)
         Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet"
         Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17)
         Me.optSpeditionWeitergeleitet.TabIndex = 19
@@ -424,7 +267,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFreierText.AutoSize = True
         Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFreierText.Location = New System.Drawing.Point(12, 361)
+        Me.optFreierText.Location = New System.Drawing.Point(13, 232)
         Me.optFreierText.Name = "optFreierText"
         Me.optFreierText.Size = New System.Drawing.Size(105, 17)
         Me.optFreierText.TabIndex = 27
@@ -435,38 +278,18 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optATAangefordert.AutoSize = True
         Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optATAangefordert.Location = New System.Drawing.Point(164, 458)
+        Me.optATAangefordert.Location = New System.Drawing.Point(165, 303)
         Me.optATAangefordert.Name = "optATAangefordert"
         Me.optATAangefordert.Size = New System.Drawing.Size(208, 17)
         Me.optATAangefordert.TabIndex = 15
         Me.optATAangefordert.Text = "ATA/ATC-Nr. angefordert (Fremdanm.)"
         Me.optATAangefordert.UseVisualStyleBackColor = False
         '
-        'optVorkasseAngefordert
-        '
-        Me.optVorkasseAngefordert.AutoSize = True
-        Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 184)
-        Me.optVorkasseAngefordert.Name = "optVorkasseAngefordert"
-        Me.optVorkasseAngefordert.Size = New System.Drawing.Size(144, 17)
-        Me.optVorkasseAngefordert.TabIndex = 14
-        Me.optVorkasseAngefordert.Text = "Vorauskasse angefordert"
-        Me.optVorkasseAngefordert.UseVisualStyleBackColor = True
-        '
-        'optKontaktdatenAngefordert
-        '
-        Me.optKontaktdatenAngefordert.AutoSize = True
-        Me.optKontaktdatenAngefordert.Location = New System.Drawing.Point(12, 141)
-        Me.optKontaktdatenAngefordert.Name = "optKontaktdatenAngefordert"
-        Me.optKontaktdatenAngefordert.Size = New System.Drawing.Size(212, 17)
-        Me.optKontaktdatenAngefordert.TabIndex = 12
-        Me.optKontaktdatenAngefordert.Text = "Kontaktdaten (z.B.Tel-Nr.) - angefordert"
-        Me.optKontaktdatenAngefordert.UseVisualStyleBackColor = True
-        '
         'Label3
         '
         Me.Label3.AutoSize = True
         Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label3.Location = New System.Drawing.Point(308, 335)
+        Me.Label3.Location = New System.Drawing.Point(309, 216)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(57, 13)
         Me.Label3.TabIndex = 22
@@ -476,7 +299,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.lblErr240Zeichen.AutoSize = True
         Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
-        Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 496)
+        Me.lblErr240Zeichen.Location = New System.Drawing.Point(224, 332)
         Me.lblErr240Zeichen.Name = "lblErr240Zeichen"
         Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13)
         Me.lblErr240Zeichen.TabIndex = 32
@@ -488,12 +311,12 @@ Partial Class frmAddSendungsvermerkShort
         Me.txtDetail.AcceptsReturn = True
         Me.txtDetail.BackColor = System.Drawing.Color.White
         Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText
-        Me.txtDetail.Location = New System.Drawing.Point(12, 512)
+        Me.txtDetail.Location = New System.Drawing.Point(17, 348)
         Me.txtDetail.MaxLength = 240
         Me.txtDetail.Multiline = True
         Me.txtDetail.Name = "txtDetail"
         Me.txtDetail.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.txtDetail.Size = New System.Drawing.Size(302, 54)
+        Me.txtDetail.Size = New System.Drawing.Size(303, 41)
         Me.txtDetail.TabIndex = 33
         Me.txtDetail.TabStop = False
         Me.txtDetail.WordWrap = False
@@ -501,7 +324,7 @@ Partial Class frmAddSendungsvermerkShort
         'lblZustzlFreitext
         '
         Me.lblZustzlFreitext.AutoSize = True
-        Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 496)
+        Me.lblZustzlFreitext.Location = New System.Drawing.Point(14, 331)
         Me.lblZustzlFreitext.Name = "lblZustzlFreitext"
         Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13)
         Me.lblZustzlFreitext.TabIndex = 31
@@ -511,84 +334,50 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 332)
+        Me.txtSendungSpedition.Location = New System.Drawing.Point(126, 234)
         Me.txtSendungSpedition.MaxLength = 50
         Me.txtSendungSpedition.Name = "txtSendungSpedition"
-        Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20)
+        Me.txtSendungSpedition.Size = New System.Drawing.Size(26, 20)
         Me.txtSendungSpedition.TabIndex = 18
         Me.txtSendungSpedition.Visible = False
         '
-        'cbxNichtLeserlich
-        '
-        Me.cbxNichtLeserlich.AutoSize = True
-        Me.cbxNichtLeserlich.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxNichtLeserlich.Location = New System.Drawing.Point(308, 98)
-        Me.cbxNichtLeserlich.Name = "cbxNichtLeserlich"
-        Me.cbxNichtLeserlich.Size = New System.Drawing.Size(90, 17)
-        Me.cbxNichtLeserlich.TabIndex = 8
-        Me.cbxNichtLeserlich.Text = "nicht leserlich"
-        Me.cbxNichtLeserlich.UseVisualStyleBackColor = False
-        '
         'btnOK
         '
         Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Location = New System.Drawing.Point(320, 512)
+        Me.btnOK.Location = New System.Drawing.Point(325, 348)
         Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(124, 54)
+        Me.btnOK.Size = New System.Drawing.Size(125, 41)
         Me.btnOK.TabIndex = 34
         Me.btnOK.Text = "Hinzufügen"
         Me.btnOK.UseVisualStyleBackColor = True
         '
-        'cbxSonstDok
+        'btnDokumtanforderung
         '
-        Me.cbxSonstDok.AutoSize = True
+        Me.btnDokumtanforderung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cbxSonstDok.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.btnDokumtanforderung.Location = New System.Drawing.Point(323, 22)
-        Me.cbxSonstDok.Location = New System.Drawing.Point(12, 98)
+        Me.btnDokumtanforderung.Name = "btnDokumtanforderung"
-        Me.cbxSonstDok.Name = "cbxSonstDok"
+        Me.btnDokumtanforderung.Size = New System.Drawing.Size(140, 23)
-        Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17)
+        Me.btnDokumtanforderung.TabIndex = 133
-        Me.cbxSonstDok.TabIndex = 9
+        Me.btnDokumtanforderung.Text = "Dokumtanforderung"
-        Me.cbxSonstDok.Text = "Dok. Name:"
+        Me.btnDokumtanforderung.UseVisualStyleBackColor = True
-        Me.cbxSonstDok.UseVisualStyleBackColor = False
         '
         'Label9
         '
         Me.Label9.AutoSize = True
         Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label9.Location = New System.Drawing.Point(354, 385)
+        Me.Label9.Location = New System.Drawing.Point(355, 257)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(90, 13)
         Me.Label9.TabIndex = 30
         Me.Label9.Text = "(max. 80 Zeichen)"
         '
-        'cbxVollmacht
-        '
-        Me.cbxVollmacht.AutoSize = True
-        Me.cbxVollmacht.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxVollmacht.Location = New System.Drawing.Point(164, 75)
-        Me.cbxVollmacht.Name = "cbxVollmacht"
-        Me.cbxVollmacht.Size = New System.Drawing.Size(72, 17)
-        Me.cbxVollmacht.TabIndex = 7
-        Me.cbxVollmacht.Text = "Vollmacht"
-        Me.cbxVollmacht.UseVisualStyleBackColor = False
-        '
-        'cbxCMR
-        '
-        Me.cbxCMR.AutoSize = True
-        Me.cbxCMR.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxCMR.Location = New System.Drawing.Point(164, 32)
-        Me.cbxCMR.Name = "cbxCMR"
-        Me.cbxCMR.Size = New System.Drawing.Size(50, 17)
-        Me.cbxCMR.TabIndex = 3
-        Me.cbxCMR.Text = "CMR"
-        Me.cbxCMR.UseVisualStyleBackColor = False
-        '
         'Label17
         '
         Me.Label17.AutoSize = True
         Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic)
-        Me.Label17.Location = New System.Drawing.Point(144, 385)
+        Me.Label17.Location = New System.Drawing.Point(145, 257)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(182, 13)
         Me.Label17.TabIndex = 29
@@ -599,92 +388,29 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label13.AutoSize = True
         Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label13.Location = New System.Drawing.Point(9, 307)
+        Me.Label13.Location = New System.Drawing.Point(10, 196)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(84, 17)
         Me.Label13.TabIndex = 16
         Me.Label13.Text = "Sonstiges:"
         '
-        'cbxATR
-        '
-        Me.cbxATR.AutoSize = True
-        Me.cbxATR.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxATR.Location = New System.Drawing.Point(164, 52)
-        Me.cbxATR.Name = "cbxATR"
-        Me.cbxATR.Size = New System.Drawing.Size(127, 17)
-        Me.cbxATR.TabIndex = 5
-        Me.cbxATR.Text = "A.TR (Original/Kopie)"
-        Me.cbxATR.UseVisualStyleBackColor = False
-        '
-        'cbxLS
-        '
-        Me.cbxLS.AutoSize = True
-        Me.cbxLS.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxLS.Location = New System.Drawing.Point(12, 75)
-        Me.cbxLS.Name = "cbxLS"
-        Me.cbxLS.Size = New System.Drawing.Size(83, 17)
-        Me.cbxLS.TabIndex = 6
-        Me.cbxLS.Text = "Lieferschein"
-        Me.cbxLS.UseVisualStyleBackColor = False
-        '
         'txtFreierText
         '
         Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtFreierText.Location = New System.Drawing.Point(122, 359)
+        Me.txtFreierText.Location = New System.Drawing.Point(123, 230)
         Me.txtFreierText.MaxLength = 80
         Me.txtFreierText.Name = "txtFreierText"
-        Me.txtFreierText.Size = New System.Drawing.Size(322, 23)
+        Me.txtFreierText.Size = New System.Drawing.Size(323, 23)
         Me.txtFreierText.TabIndex = 28
         '
-        'cbxRechnung
-        '
-        Me.cbxRechnung.AutoSize = True
-        Me.cbxRechnung.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxRechnung.Location = New System.Drawing.Point(12, 53)
-        Me.cbxRechnung.Name = "cbxRechnung"
-        Me.cbxRechnung.Size = New System.Drawing.Size(137, 17)
-        Me.cbxRechnung.TabIndex = 4
-        Me.cbxRechnung.Text = "Rechnung (mangelhaft)"
-        Me.cbxRechnung.UseVisualStyleBackColor = False
-        '
-        'Label20
-        '
-        Me.Label20.AutoSize = True
-        Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label20.Location = New System.Drawing.Point(267, 335)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(0, 13)
-        Me.Label20.TabIndex = 21
-        '
-        'cbxAuftrag
-        '
-        Me.cbxAuftrag.AutoSize = True
-        Me.cbxAuftrag.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cbxAuftrag.Location = New System.Drawing.Point(12, 32)
-        Me.cbxAuftrag.Name = "cbxAuftrag"
-        Me.cbxAuftrag.Size = New System.Drawing.Size(60, 17)
-        Me.cbxAuftrag.TabIndex = 2
-        Me.cbxAuftrag.Text = "Auftrag"
-        Me.cbxAuftrag.UseVisualStyleBackColor = False
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PictureBox1.Location = New System.Drawing.Point(-1, -1)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(453, 130)
-        Me.PictureBox1.TabIndex = 83
-        Me.PictureBox1.TabStop = False
-        '
         'PictureBox4
         '
         Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke
         Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PictureBox4.Location = New System.Drawing.Point(-1, 297)
+        Me.PictureBox4.Location = New System.Drawing.Point(-1, 190)
         Me.PictureBox4.Name = "PictureBox4"
-        Me.PictureBox4.Size = New System.Drawing.Size(453, 189)
+        Me.PictureBox4.Size = New System.Drawing.Size(474, 139)
         Me.PictureBox4.TabIndex = 78
         Me.PictureBox4.TabStop = False
         '
@@ -695,14 +421,14 @@ Partial Class frmAddSendungsvermerkShort
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel4.Location = New System.Drawing.Point(0, 0)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(454, 0)
+        Me.Panel4.Size = New System.Drawing.Size(474, 0)
         Me.Panel4.TabIndex = 1
         '
         'frmAddSendungsvermerkShort
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(454, 605)
+        Me.ClientSize = New System.Drawing.Size(474, 400)
         Me.Controls.Add(Me.pnlMain)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -714,7 +440,6 @@ Partial Class frmAddSendungsvermerkShort
         Me.pnlMain.ResumeLayout(False)
         Me.pnlSendungsVermker.ResumeLayout(False)
         Me.pnlSendungsVermker.PerformLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
@@ -723,53 +448,31 @@ Partial Class frmAddSendungsvermerkShort
     Friend WithEvents pnlMain As System.Windows.Forms.Panel
     Friend WithEvents Panel4 As System.Windows.Forms.Panel
     Friend WithEvents pnlSendungsVermker As System.Windows.Forms.Panel
-    Friend WithEvents txtSonstigesDokumentFehlt As System.Windows.Forms.TextBox
     Friend WithEvents optSpeditionWeitergeleitet As System.Windows.Forms.CheckBox
     Friend WithEvents optFreierText As System.Windows.Forms.CheckBox
     Friend WithEvents optATAangefordert As System.Windows.Forms.CheckBox
-    Friend WithEvents optVorkasseAngefordert As System.Windows.Forms.CheckBox
-    Friend WithEvents optKontaktdatenAngefordert As System.Windows.Forms.CheckBox
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents lblErr240Zeichen As System.Windows.Forms.Label
     Friend WithEvents lblZustzlFreitext As System.Windows.Forms.Label
     Friend WithEvents txtSendungSpedition As System.Windows.Forms.TextBox
-    Friend WithEvents cbxNichtLeserlich As System.Windows.Forms.CheckBox
     Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents cbxSonstDok As System.Windows.Forms.CheckBox
+    Friend WithEvents btnDokumtanforderung As System.Windows.Forms.Button
     Friend WithEvents Label9 As System.Windows.Forms.Label
-    Friend WithEvents cbxVollmacht As System.Windows.Forms.CheckBox
     Friend WithEvents lblErrSpedition As System.Windows.Forms.Label
-    Friend WithEvents cbxCMR As System.Windows.Forms.CheckBox
     Friend WithEvents lblErrGrund As System.Windows.Forms.Label
     Friend WithEvents Label17 As System.Windows.Forms.Label
     Friend WithEvents Label13 As System.Windows.Forms.Label
-    Friend WithEvents cbxATR As System.Windows.Forms.CheckBox
-    Friend WithEvents cbxLS As System.Windows.Forms.CheckBox
     Friend WithEvents txtFreierText As System.Windows.Forms.TextBox
     Friend WithEvents txtSpedition As System.Windows.Forms.TextBox
-    Friend WithEvents cbxRechnung As System.Windows.Forms.CheckBox
-    Friend WithEvents Label20 As System.Windows.Forms.Label
-    Friend WithEvents cbxAuftrag As System.Windows.Forms.CheckBox
     Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox
     Friend WithEvents Label1 As System.Windows.Forms.Label
     Friend WithEvents optSendungInVorbereitung As System.Windows.Forms.CheckBox
-    Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+    Friend WithEvents lblDragIndicator As System.Windows.Forms.Label
-    Friend WithEvents lblErrDokument As System.Windows.Forms.Label
     Friend WithEvents btnCLose As System.Windows.Forms.Button
     Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents optUeberwachungsdok As System.Windows.Forms.CheckBox
-    Friend WithEvents cbxRgBest As CheckBox
     Friend WithEvents Label4 As Label
     Friend WithEvents optFremd_ATB As CheckBox
     Friend WithEvents optFremd_SendungAvisiert As CheckBox
-    Friend WithEvents optFahrerKeinATR As CheckBox
-    Friend WithEvents optFrachtkostenAngefordert As CheckBox
-    Friend WithEvents optKundeNichtErreichbar As CheckBox
-    Friend WithEvents optAbsenderbestätigung As CheckBox
-    Friend WithEvents cbxPackliste As CheckBox
-    Friend WithEvents optGewPackAngefordert As CheckBox
-    Friend WithEvents optKostenbestaetigungAngefordert As CheckBox
-    Friend WithEvents optZolltarifnummerAngefordert As CheckBox
-    Friend WithEvents optDraft As CheckBox
     Public WithEvents txtDetail As TextBox
+    Friend WithEvents flpAngefordert As FlowLayoutPanel
 End Class

Aviso/frmAddSendungsvermerkShort.vb

@@ -1,7 +1,13 @@
-
+
-Imports AVISO.AvisoStatusFunctions
+Imports System.Configuration
-Imports SDL
+Imports System.IO
+Imports System.Net
+Imports System.Net.Mail
+Imports System.Text
+Imports Newtonsoft.Json
+Imports Newtonsoft.Json.Linq
 Imports VERAG_PROG_ALLGEMEIN
+Imports AVISO.AvisoStatusFunctions
 Public Class frmAddSendungsvermerkShort
 
     Dim AvisoDAL As New cAvisoDAL
@@ -15,6 +21,9 @@ Public Class frmAddSendungsvermerkShort
     Public SendungID As Integer = -1
     Public AvisoID As Integer = -1
 
+    Private _anforderungCheckboxes As New List(Of CheckBox)
+    Private _backendBezeichnungByCodeId As New Dictionary(Of Integer, String)
+    Private Const BereichAngefordert As Integer = 2
 
     Dim txtSendung As New TextBox
 
@@ -31,7 +40,7 @@ Public Class frmAddSendungsvermerkShort
     End Sub
 
     Private Sub frmEintragVermerk_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles Me.KeyDown
-        'Escape händisch abfangen und auf Abbruch-Taste legen
+        'Escape händisch abfangen und auf Abbruch-Taste legen
         If e.KeyCode = Keys.Escape Then
             '  btnAbbruch.PerformClick()
             Me.Close()
@@ -59,16 +68,18 @@ Public Class frmAddSendungsvermerkShort
     End Sub
 
     Private Sub frmEintragVermerk_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
-        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
+        Dim pt As Point = Cursor.Position
-        'cboDokumente.Items.Clear()
+        Dim screenBounds As Rectangle = Screen.FromPoint(pt).WorkingArea
-        '  cboDokumente.Items.Add(New MyListItem("nachgefordert", CStr(0)))
+        If pt.X + Me.Width > screenBounds.Right Then
-        'cboDokumente.Items.Add(New MyListItem("erhalten", CStr(1)))
+            pt.X = screenBounds.Right - Me.Width
-        'cboDokumente.SelectedIndex = 0
-
-        Me.CenterToParent()
-        If My.Computer.Screen.WorkingArea.Height < Me.Height Then
-            Me.Height = My.Computer.Screen.WorkingArea.Height
         End If
+        If pt.Y + Me.Height > screenBounds.Bottom Then
+            pt.Y = screenBounds.Bottom - Me.Height
+        End If
+        Me.Location = pt
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
+
         For Each c In Me.Controls
             If c.GetType.Name.ToString = "RadioButton" Then
                 AddHandler DirectCast(c, RadioButton).CheckedChanged, AddressOf selectionChanged
@@ -92,6 +103,9 @@ Public Class frmAddSendungsvermerkShort
         Else
             optSendungInVorbereitung.Visible = False
         End If
+
+        SetupDynamicAnforderungCheckboxes()
+
         'bereits vorhandene Vermerke laden
         'txtInfo.Text = VermerkeDAL.Vermerke_einlesen(myAviso.AvisoID)
         Me.Text = "AKT " & myAviso.LKW_Nr & ""
@@ -119,6 +133,81 @@ Public Class frmAddSendungsvermerkShort
     '      Me.Close()
     '  End Sub
 
+    Private Sub SetupDynamicAnforderungCheckboxes()
+        _anforderungCheckboxes.Clear()
+        _backendBezeichnungByCodeId.Clear()
+
+        Dim dt As DataTable = Nothing
+        Try
+            dt = AvisoDAL.loadDataTableBySQL("SELECT [VermerkCodeId],[Bezeichnung],[FrontendBezeichnung],[AnforderungBereich] FROM [VermerkeCodes] WHERE [Anforderung]=1 ORDER BY [Bezeichnung]")
+        Catch
+            Try
+                dt = AvisoDAL.loadDataTableBySQL("SELECT [VermerkCodeId],[Bezeichnung],[AnforderungBereich] FROM [VermerkeCodes] WHERE [Anforderung]=1 ORDER BY [Bezeichnung]")
+            Catch
+                Return
+            End Try
+        End Try
+
+        If dt Is Nothing OrElse dt.Rows.Count = 0 Then
+            Return
+        End If
+
+        flpAngefordert.Controls.Clear()
+
+        For Each row As DataRow In dt.Rows
+            Dim id As Integer
+            Try
+                id = CInt(row("VermerkCodeId"))
+            Catch
+                Continue For
+            End Try
+
+            Dim bezeichnung = If(IsDBNull(row("Bezeichnung")), "", CStr(row("Bezeichnung"))).Trim()
+            If bezeichnung = "" Then Continue For
+            _backendBezeichnungByCodeId(id) = bezeichnung
+
+            Dim frontendBezeichnung = bezeichnung
+            If dt.Columns.Contains("FrontendBezeichnung") Then
+                frontendBezeichnung = If(IsDBNull(row("FrontendBezeichnung")), "", CStr(row("FrontendBezeichnung"))).Trim()
+                If frontendBezeichnung = "" Then frontendBezeichnung = bezeichnung
+            End If
+
+            Dim bereich As Integer = BereichAngefordert
+            Try
+                If Not IsDBNull(row("AnforderungBereich")) Then
+                    bereich = CInt(row("AnforderungBereich"))
+                End If
+            Catch
+            End Try
+
+            If bereich = BereichAngefordert Then
+                Dim cb As New CheckBox()
+                cb.Text = frontendBezeichnung
+                cb.Tag = id
+                cb.Margin = New Padding(0, 0, 4, 0)
+
+                ConfigureAnforderungCheckbox(cb, flpAngefordert)
+                flpAngefordert.Controls.Add(cb)
+                _anforderungCheckboxes.Add(cb)
+            End If
+        Next
+    End Sub
+
+    Private Sub ConfigureAnforderungCheckbox(cb As CheckBox, container As Control)
+        If cb Is Nothing OrElse container Is Nothing Then Return
+
+        cb.AutoSize = False
+        cb.Height = 18
+
+        Dim cols As Integer = 2
+        Dim colGap As Integer = 14
+        Dim minCbWidth As Integer = 180
+
+        Dim usableWidth = Math.Max(120, container.Width - 20)
+        Dim cbWidth = CInt(Math.Floor((usableWidth - ((cols - 1) * colGap)) / cols))
+        cb.Width = Math.Max(minCbWidth, Math.Min(cbWidth, 220))
+    End Sub
+
     Private Sub txtFeld_GotFocus(sender As Object, e As System.EventArgs) Handles txtFreierText.GotFocus, txtSpedition.GotFocus
         CType(sender, TextBox).SelectAll()
     End Sub
@@ -145,8 +234,7 @@ Public Class frmAddSendungsvermerkShort
             End If
         End If
 
-
+        'Plausibilität prüfen
-        'Plausibilität prüfen
         If optFreierText.Checked Then
             If txtFreierText.Text.Trim = "" Then
                 showErr(lblErrGrund)
@@ -156,44 +244,32 @@ Public Class frmAddSendungsvermerkShort
             insertSendungsVermerk(SendungID, myAviso.AvisoID, txtFreierText.Text.Trim & " - offen", 101)
         End If
 
-        If cbxAuftrag.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Auftrag für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 1)
+        For Each cb In _anforderungCheckboxes
-        If cbxRechnung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnung für Sendung '" & txtSendung.Text.Trim & "' fehlt / mangelhaft - angefordert", 3)
+            If cb IsNot Nothing AndAlso cb.Checked Then
-        If cbxLS.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Lieferschein für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 5)
+                Dim codeId As Integer = 0
-        If cbxATR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATR für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 7)
+                If Integer.TryParse(If(cb.Tag, "").ToString(), codeId) Then
-        If cbxVollmacht.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Vollmacht für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 9)
+                    Dim text = ""
-        If cbxCMR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "CMR bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 11)
+                    If _backendBezeichnungByCodeId.ContainsKey(codeId) Then
-        If cbxPackliste.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Packliste bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 90)
+                        text = If(_backendBezeichnungByCodeId(codeId), "").Trim()
-        If cbxRgBest.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnungsbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 55)
+                    End If
-        If optGewPackAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Gewicht/Packstücke bei Sendung '" & txtSendung.Text.Trim & "' mangelhaft - angefordert", 103)
+                    If text = "" Then text = cb.Text.Trim()
-        If optZolltarifnummerAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Zolltarifnummer bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 105)
-        If optKostenbestaetigungAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kostenbestaetigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 107)
 
-        If optFrachtkostenAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Frachtkosten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 74)
+                    Dim sendText = txtSendung.Text.Trim()
-        If optAbsenderbestätigung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Absenderbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 76)
+                    If text <> "" AndAlso sendText <> "" AndAlso InStr(text, "sendung", CompareMethod.Text) = 0 Then
+                        text &= " bei Sendung '" & sendText & "'"
+                    End If
+
+                    If text <> "" Then
+                        insertSendungsVermerk(SendungID, myAviso.AvisoID, text, codeId)
+                    End If
+                End If
+            End If
+        Next
 
-        If optKundeNichtErreichbar.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kunde bei Sendung '" & txtSendung.Text.Trim & "' nicht erreichbar", 70)
-        If optFahrerKeinATR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Fahrer ohne A.TR bei Sendung '" & txtSendung.Text.Trim & "'", 71)
         If optFremd_ATB.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATB von Fremdeinsteller erhalten bei Sendung '" & txtSendung.Text.Trim & "' ", 72)
         If optFremd_SendungAvisiert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' an Fremdeinsteller avisiert", 73)
         ' If optSndUmmelden.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' umgemeldet", 94)
-        If optDraft.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "T2 Draft OK bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 118)
 
-
-        If optUeberwachungsdok.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Ü-Dok bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 53)
-
-        If cbxSonstDok.Checked Then
-            If txtSonstigesDokumentFehlt.Text.Trim = "" Then
-                showErr(lblErrDokument) : txtSonstigesDokumentFehlt.Focus() : Return False
-            End If
-            insertSendungsVermerk(SendungID, myAviso.AvisoID, "Dokument '" & txtSonstigesDokumentFehlt.Text.Trim & "' fehlt - angefordert.", 25)
-        End If
-
-        If cbxNichtLeserlich.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Dokument(e) nachgefordert, da nicht leserlich.", 42)
-
-
-        If optVorkasseAngefordert.Checked = True Then
-            insertSendungsVermerk(SendungID, myAviso.AvisoID, "Vorauskasse bei Sendung '" & txtSendung.Text.Trim & "' angefordert", 13)
-        End If
         If optSpeditionWeitergeleitet.Checked = True Then
             If txtSpedition.Text.Trim = "" Then
                 showErr(lblErrSpedition)
@@ -206,9 +282,6 @@ Public Class frmAddSendungsvermerkShort
             insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' in Vorbereitung.", 31)
             VermerkeDAL.UpdateSendungVorbereitet(AvisoID, SendungID, VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.MitarbeiterID, True)
         End If
-        If optKontaktdatenAngefordert.Checked = True Then
-            insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kontaktdaten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 36)
-        End If
         ' If optSendungVorbereitet.Checked = True Then
         'insertSendungsVermerk(SendungID,myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' Vorbereitung abgeschlossen.", 32)
         ' VermerkeDAL.UpdateSendungVorbereitet(AvisoID, SendungID, VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.MitarbeiterID, False)
@@ -275,7 +348,6 @@ Public Class frmAddSendungsvermerkShort
     End Sub
 
     Sub showErr(l As Label)
-        lblErrDokument.Visible = False
         ' lblErrFach.Visible = False
         lblErrGrund.Visible = False
         ' lblErrSendungProbleme.Visible = False
@@ -299,13 +371,11 @@ Public Class frmAddSendungsvermerkShort
     '    optDokumente.Checked = True
     'End Sub
 
-    Private Sub cbxAuftrag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAuftrag.CheckedChanged, cbxRechnung.CheckedChanged, cbxLS.CheckedChanged,
+    Private Sub cbxAuftrag_CheckedChanged(sender As Object, e As EventArgs)
-        cbxCMR.CheckedChanged, cbxATR.CheckedChanged, cbxVollmacht.CheckedChanged, cbxSonstDok.CheckedChanged, cbxNichtLeserlich.CheckedChanged, cbxPackliste.CheckedChanged
         '  optDokumente.Checked = True
     End Sub
-    Private Sub SonstChanged(sender As Object, e As EventArgs) Handles txtSonstigesDokumentFehlt.TextChanged
+    Private Sub SonstChanged(sender As Object, e As EventArgs)
         '  optDokumente.Checked = True
-        cbxSonstDok.Checked = (sender.text <> "")
     End Sub
     Private Sub txtSendungSpedition_TextChanged(sender As Object, e As EventArgs) Handles txtSendungSpedition.TextChanged, txtSpedition.TextChanged
         optSpeditionWeitergeleitet.Checked = True
@@ -327,18 +397,51 @@ Public Class frmAddSendungsvermerkShort
 
 
     Private Sub frmAddSendungsvermerk_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        Dim p = Cursor.Position
-        If (p.X + Me.Width) > My.Computer.Screen.WorkingArea.Width Then p.X = My.Computer.Screen.WorkingArea.Width - Me.Width
-        If (p.Y + Me.Height) > My.Computer.Screen.WorkingArea.Height Then p.Y = My.Computer.Screen.WorkingArea.Height - Me.Height
-        Me.Location = p '.Me.PointToClient(System.Cursor.Position)
         txtSendung.SelectionLength = 0
-        cbxAuftrag.Focus()
+        txtFreierText.Focus()
     End Sub
+    Private drag As Boolean
+    Private mouseX As Integer
+    Private mouseY As Integer
+
+    Private Sub Form_MouseDown(sender As Object, e As MouseEventArgs) Handles lblDragIndicator.MouseDown
+        If e.Button = MouseButtons.Left Then
+            drag = True
+            mouseX = Cursor.Position.X - Me.Left
+            mouseY = Cursor.Position.Y - Me.Top
+        End If
+    End Sub
+
+    Private Sub Form_MouseMove(sender As Object, e As MouseEventArgs) Handles lblDragIndicator.MouseMove
+        If drag Then
+            Me.Top = Cursor.Position.Y - mouseY
+            Me.Left = Cursor.Position.X - mouseX
+        End If
+    End Sub
+
+    Private Sub Form_MouseUp(sender As Object, e As MouseEventArgs) Handles lblDragIndicator.MouseUp
+        drag = False
+    End Sub
+    ' ----------------------
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnCLose.Click
         Me.Close()
     End Sub
 
+    Private Sub btnDokumtanforderung_Click(sender As Object, e As EventArgs) Handles btnDokumtanforderung.Click
+        Dim resolvedAvisoId As Integer = AvisoID
+        If resolvedAvisoId <= 0 AndAlso myAviso IsNot Nothing AndAlso IsNumeric(myAviso.AvisoID) Then
+            resolvedAvisoId = CInt(myAviso.AvisoID)
+        End If
+        Dim resolvedSendungId As Integer = SendungID
+        Using frm As New frmSendungsDokumentanforderung(resolvedAvisoId, resolvedSendungId, Nothing)
+            If frm.ShowDialog(Me) = DialogResult.OK Then
+                frmHauptfenster.avisoAktualisierenAktiveIdBehalten(myAviso.AvisoID)
+                Me.Close()
+            End If
+        End Using
+    End Sub
+
     Private Sub Button2_Click(sender As Object, e As EventArgs)
         If insertVermerke() Then
             VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(myAviso.AvisoID, SendungID, 1, "T", 13, , 1)

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -264,7 +264,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                 .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value
                 .dataTable = Me.dataTable
                 .DAKOSY_AUTO = dgvListe.CurrentRow.Cells("gs_DAKOSYAUTO").Value
-
+                .firmaId = Me.firmaId
             End With
 
             AddHandler frm.FormClosing, Function()

Aviso/frmHauptfenster.resx

@@ -257,6 +257,9 @@
         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

@@ -613,7 +613,7 @@ Public Class frmHauptfenster
         'zuerst noch prüfen, ob unerledigte Aviso auf nicht eingetroffen gesetzt werden können
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then
             'Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & "  And dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE() and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI')  "
-            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & " AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI') and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  and ((Transportmittelart = 'CONTAINER' and dateadd(DAY,20,VoraussichtlichesEintreffen) < GETDATE()) or (Transportmittelart <> 'CONTAINER' and dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE()))"
+            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-28)) & " AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI') and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  and ((Transportmittelart = 'CONTAINER' and dateadd(DAY,20,VoraussichtlichesEintreffen) < GETDATE()) or (Transportmittelart <> 'CONTAINER' and dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE()))"
             'dateadd(DAY,10,VoraussichtlichesEintreffen)  --> Voraussichtliches Eintreffen muss zudem um 10 Tage überschritten sein --> Container/Hafen haben lange Vorlaufzeiten
             Dim anz As Integer = AvisoDAL.Check_Nicht_eingetroffen(hSQL)
             If anz > 0 Then
@@ -5447,4 +5447,24 @@ ELSE_ATILLA:
         Dim f As New frmReferenzenSicherheiten(writepermissions)
         f.ShowDialog(Me)
     End Sub
+
+    Private Sub KLIPPHAUSENToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KLIPPHAUSENToolStripMenuItem.Click
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "KLIPP"
+            VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = "KLIPP" 'Nochmal, sonst wird es durch MA geändert 
+            showMeNew()
+        Else
+            MsgBox("Keine Berechtigung!")
+        End If
+    End Sub
+
+    Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
+
+    Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
 End Class

Aviso/frmHauptfensterNew.Designer.vb

@@ -288,6 +288,7 @@ Partial Class frmHauptfensterNew
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
         Me.Panel9 = New System.Windows.Forms.Panel()
+        Me.Button4 = New System.Windows.Forms.Button()
         Me.btnSmall = New System.Windows.Forms.Button()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
@@ -323,7 +324,9 @@ Partial Class frmHauptfensterNew
         Me.Panel7 = New System.Windows.Forms.Panel()
         Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
         Me.UidAbfrageService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.ToolStripMenuItem3 = 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()
@@ -1143,7 +1146,7 @@ Partial Class frmHauptfensterNew
         'ToolStripFormulare
         '
         Me.ToolStripFormulare.BackColor = System.Drawing.Color.White
-        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
+        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripMenuItem3, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
         Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black
         Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight
@@ -1157,20 +1160,20 @@ Partial Class frmHauptfensterNew
         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(277, 22)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 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(277, 22)
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
         Me.MailvorlagenToolStripMenuItem.Visible = False
         '
@@ -1178,7 +1181,7 @@ Partial Class frmHauptfensterNew
         '
         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(277, 22)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem2.Text = "Vollmachten"
         '
         'toolStrVM_de
@@ -1214,38 +1217,38 @@ Partial Class frmHauptfensterNew
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem12.Text = "Importaviso"
         '
         'ToolStripMenuItem15
         '
         Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem15.Text = "Dispoliste"
         '
         'ToolStripMenuItem18
         '
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem18.Text = "Verzollungspreise"
         '
         'AuftragÜberwachungsdokumentToolStripMenuItem
         '
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         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(277, 22)
+        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
         Me.toolVUB.Text = "VUB"
         '
         'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1263,37 +1266,37 @@ Partial Class frmHauptfensterNew
         'toolVPCreditreform
         '
         Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
         Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
         Me.toolVPCreditreform.Visible = False
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
         '
         'VerzollungsunterlagenToolStripMenuItem
         '
         Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
         'ToolStripMenuItem11
         '
         Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 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(277, 22)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
         '
         'ToolStripMenuItem8
@@ -1329,36 +1332,36 @@ Partial Class frmHauptfensterNew
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
         '
         'EinheitspapierToolStripMenuItem
         '
         Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
         '
         'CMRToolStripMenuItem
         '
         Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CMRToolStripMenuItem.Text = "CMR"
         '
         'Einheitspapier0735VersandverfahrenToolStripMenuItem
         '
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
         '
         'CarnetTIRToolStripMenuItem
         '
         Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
         '
         'CarnetTIRALTToolStripMenuItem
         '
         Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
         '
         'mnuFragezeichen
@@ -2558,6 +2561,25 @@ Partial Class frmHauptfensterNew
         Me.Panel9.Size = New System.Drawing.Size(156, 157)
         Me.Panel9.TabIndex = 88
         '
+        'Button4
+        '
+        Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.Button4.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Button4.FlatAppearance.BorderSize = 3
+        Me.Button4.Font = New System.Drawing.Font("Segoe UI", 10.0!)
+        Me.Button4.ForeColor = System.Drawing.Color.Black
+        Me.Button4.Image = Global.AVISO.My.Resources.Resources.ico_atez_tariffAI
+        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button4.Location = New System.Drawing.Point(11, 84)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0)
+        Me.Button4.Size = New System.Drawing.Size(135, 52)
+        Me.Button4.TabIndex = 8
+        Me.Button4.Text = "Tariff AI"
+        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button4.UseVisualStyleBackColor = False
+        '
         'btnSmall
         '
         Me.btnSmall.BackColor = System.Drawing.Color.White
@@ -2853,24 +2875,24 @@ Partial Class frmHauptfensterNew
         Me.UidAbfrageService1.Url = "https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/"
         Me.UidAbfrageService1.UseDefaultCredentials = False
         '
-        'Button4
+        'ToolStripMenuItem3
         '
-        Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25})
-        Me.Button4.Cursor = System.Windows.Forms.Cursors.Default
+        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.Button4.FlatAppearance.BorderSize = 3
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30)
-        Me.Button4.Font = New System.Drawing.Font("Segoe UI", 10.0!)
+        Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN"
-        Me.Button4.ForeColor = System.Drawing.Color.Black
+        '
-        Me.Button4.Image = Global.AVISO.My.Resources.Resources.ico_atez_tariffAI
+        'ToolStripMenuItem23
-        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
-        Me.Button4.Location = New System.Drawing.Point(11, 84)
+        Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
-        Me.Button4.Margin = New System.Windows.Forms.Padding(0)
+        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22)
-        Me.Button4.Name = "Button4"
+        Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR"
-        Me.Button4.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0)
+        '
-        Me.Button4.Size = New System.Drawing.Size(135, 52)
+        'ToolStripMenuItem25
-        Me.Button4.TabIndex = 8
+        '
-        Me.Button4.Text = "Tariff AI"
+        Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25"
-        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22)
-        Me.Button4.UseVisualStyleBackColor = False
+        Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB"
         '
         'frmHauptfensterNew
         '
@@ -3236,4 +3258,7 @@ Partial Class frmHauptfensterNew
     Friend WithEvents btnDEFAULT_UnSelected As Button
     Friend WithEvents UsrCntlMessenger_ListNewChats1 As VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ListNewChats
     Friend WithEvents Button4 As Button
+    Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
 End Class

Aviso/frmHauptfensterNew.vb

@@ -3959,4 +3959,15 @@ ELSE_ATILLA:
     Private Sub Button4_Click_2(sender As Object, e As EventArgs) Handles Button4.Click
 
     End Sub
+
+    Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
+
+
+    Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
 End Class

Aviso/frmLaufzettel.vb

@@ -423,9 +423,9 @@ Public Class frmLaufzettel
                             tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
                         Case "DTB"
                             Mail.To = "poststelle.za-dettelbach@zoll.bund.de"
-                            tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                            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 = ""
@@ -448,7 +448,12 @@ Public Class frmLaufzettel
                     End If
 
                     For Each p In paths
-                        Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
+                        If p <> "" Then
+                            Dim fileInfo As New IO.FileInfo(p)
+                            If Not fileInfo.Exists Then Continue For
+                            Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
+                        End If
+
                     Next
 
 
@@ -508,7 +513,13 @@ Public Class frmLaufzettel
                     Try
 
                         For Each p In paths
-                            VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({p}, cboPrinter.SelectedItem.ToString)
+                            If p <> "" Then
+                                'If Not System.IO.Directory.Exists(p) Then Continue For
+                                'Dim fileInfo As New IO.FileInfo(p)
+                                'If Not fileInfo.Exists Then Continue For
+                                VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({p}, cboPrinter.SelectedItem.ToString)
+                            End If
+
                         Next
 
                         'If paths.Count = 1 Then '1 Gestellungsliste
@@ -526,16 +537,18 @@ Public Class frmLaufzettel
 
 
             Catch ex As Exception
-                MsgBox("Fehler beim erstellen der E-Mail:" & vbNewLine & ex.Message & ex.StackTrace)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, )
             End Try
 
         Else
             Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False,, digitalDruck)
             If path <> "" Then
+                'Dim fileInfo As New IO.FileInfo(path)
+                'If fileInfo.Exists Then
                 'Process.Start(path)
                 VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString)
+                'End If
             End If
-
         End If
 
         If cbxDokumenteDrucken.Checked Then

Aviso/frmSendungsDokumentanforderung.Designer.vb

@@ -0,0 +1,486 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmSendungsDokumentanforderung
+    Inherits System.Windows.Forms.Form
+
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    Private components As System.ComponentModel.IContainer
+
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.flpDokumenteFehlenMain = New System.Windows.Forms.FlowLayoutPanel()
+        Me.cbxSonstDok = New System.Windows.Forms.CheckBox()
+        Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox()
+        Me.cbxNichtLeserlich = New System.Windows.Forms.CheckBox()
+        Me.lblErrDokument = New System.Windows.Forms.Label()
+        Me.pnlDocumentEditor = New System.Windows.Forms.Panel()
+        Me.flpDocumentTabs = New System.Windows.Forms.FlowLayoutPanel()
+        Me.lblDocumentEditorTitle = New System.Windows.Forms.Label()
+        Me.lblDocumentEditorName = New System.Windows.Forms.Label()
+        Me.txtDocumentEditorName = New System.Windows.Forms.TextBox()
+        Me.lblDocumentEditorAnhangsart = New System.Windows.Forms.Label()
+        Me.cmbDocumentEditorAnhangsart = New System.Windows.Forms.ComboBox()
+        Me.lblDocumentEditorInfo = New System.Windows.Forms.Label()
+        Me.txtDocumentEditorInfo = New System.Windows.Forms.TextBox()
+        Me.lblDocumentEditorStatus = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.btnCustomerUploadLink = New System.Windows.Forms.Button()
+        Me.btnCustomerUploadEmail = New System.Windows.Forms.Button()
+        Me.txtCustomerUploadEmail = New System.Windows.Forms.TextBox()
+        Me.lblCustomerUploadEmail = New System.Windows.Forms.Label()
+        Me.lblCustomerUploadValidityHours = New System.Windows.Forms.Label()
+        Me.nudCustomerUploadValidityHours = New System.Windows.Forms.NumericUpDown()
+        Me.cmbCustomerUploadLanguage = New System.Windows.Forms.ComboBox()
+        Me.lblCustomerUploadLanguage = New System.Windows.Forms.Label()
+        Me.cmbCustomerUploadEmailTemplate = New System.Windows.Forms.ComboBox()
+        Me.lblCustomerUploadEmailTemplate = New System.Windows.Forms.Label()
+        Me.txtCustomerUploadEmailText = New System.Windows.Forms.TextBox()
+        Me.lblCustomerUploadEmailText = New System.Windows.Forms.Label()
+        Me.btnVermerkSetzen = New System.Windows.Forms.Button()
+        Me.lblTitel = New System.Windows.Forms.Label()
+        Me.lblKontaktEmails = New System.Windows.Forms.Label()
+        Me.dgvKontaktEmails = New System.Windows.Forms.DataGridView()
+        Me.pnlDocumentEditor.SuspendLayout()
+        CType(Me.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvKontaktEmails, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'flpDokumenteFehlenMain
+        '
+        Me.flpDokumenteFehlenMain.BackColor = System.Drawing.Color.Transparent
+        Me.flpDokumenteFehlenMain.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
+        Me.flpDokumenteFehlenMain.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.flpDokumenteFehlenMain.Location = New System.Drawing.Point(18, 42)
+        Me.flpDokumenteFehlenMain.Margin = New System.Windows.Forms.Padding(0)
+        Me.flpDokumenteFehlenMain.Name = "flpDokumenteFehlenMain"
+        Me.flpDokumenteFehlenMain.Size = New System.Drawing.Size(675, 138)
+        Me.flpDokumenteFehlenMain.TabIndex = 0
+        '
+        'cbxSonstDok
+        '
+        Me.cbxSonstDok.AutoSize = True
+        Me.cbxSonstDok.Location = New System.Drawing.Point(18, 191)
+        Me.cbxSonstDok.Name = "cbxSonstDok"
+        Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17)
+        Me.cbxSonstDok.TabIndex = 1
+        Me.cbxSonstDok.Text = "Dok. Name:"
+        Me.cbxSonstDok.UseVisualStyleBackColor = True
+        '
+        'txtSonstigesDokumentFehlt
+        '
+        Me.txtSonstigesDokumentFehlt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(132, 189)
+        Me.txtSonstigesDokumentFehlt.MaxLength = 80
+        Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt"
+        Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(336, 20)
+        Me.txtSonstigesDokumentFehlt.TabIndex = 2
+        '
+        'cbxNichtLeserlich
+        '
+        Me.cbxNichtLeserlich.AutoSize = True
+        Me.cbxNichtLeserlich.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cbxNichtLeserlich.Location = New System.Drawing.Point(596, 191)
+        Me.cbxNichtLeserlich.Name = "cbxNichtLeserlich"
+        Me.cbxNichtLeserlich.Size = New System.Drawing.Size(90, 17)
+        Me.cbxNichtLeserlich.TabIndex = 3
+        Me.cbxNichtLeserlich.Text = "nicht leserlich"
+        Me.cbxNichtLeserlich.UseVisualStyleBackColor = True
+        '
+        'lblErrDokument
+        '
+        Me.lblErrDokument.AutoSize = True
+        Me.lblErrDokument.ForeColor = System.Drawing.Color.Red
+        Me.lblErrDokument.Location = New System.Drawing.Point(133, 212)
+        Me.lblErrDokument.Name = "lblErrDokument"
+        Me.lblErrDokument.Size = New System.Drawing.Size(157, 13)
+        Me.lblErrDokument.TabIndex = 4
+        Me.lblErrDokument.Text = "Bitte ein Dokument angegeben!"
+        Me.lblErrDokument.Visible = False
+        '
+        'pnlDocumentEditor
+        '
+        Me.pnlDocumentEditor.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.pnlDocumentEditor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlDocumentEditor.Controls.Add(Me.flpDocumentTabs)
+        Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorTitle)
+        Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorName)
+        Me.pnlDocumentEditor.Controls.Add(Me.txtDocumentEditorName)
+        Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorAnhangsart)
+        Me.pnlDocumentEditor.Controls.Add(Me.cmbDocumentEditorAnhangsart)
+        Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorInfo)
+        Me.pnlDocumentEditor.Controls.Add(Me.txtDocumentEditorInfo)
+        Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorStatus)
+        Me.pnlDocumentEditor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.pnlDocumentEditor.Location = New System.Drawing.Point(9, 226)
+        Me.pnlDocumentEditor.Name = "pnlDocumentEditor"
+        Me.pnlDocumentEditor.Size = New System.Drawing.Size(687, 201)
+        Me.pnlDocumentEditor.TabIndex = 5
+        '
+        'flpDocumentTabs
+        '
+        Me.flpDocumentTabs.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.flpDocumentTabs.AutoScroll = True
+        Me.flpDocumentTabs.BackColor = System.Drawing.Color.FromArgb(CType(CType(220, Byte), Integer), CType(CType(220, Byte), Integer), CType(CType(220, Byte), Integer))
+        Me.flpDocumentTabs.Location = New System.Drawing.Point(1, 0)
+        Me.flpDocumentTabs.Name = "flpDocumentTabs"
+        Me.flpDocumentTabs.Size = New System.Drawing.Size(683, 48)
+        Me.flpDocumentTabs.TabIndex = 0
+        Me.flpDocumentTabs.WrapContents = False
+        '
+        'lblDocumentEditorTitle
+        '
+        Me.lblDocumentEditorTitle.AutoSize = True
+        Me.lblDocumentEditorTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblDocumentEditorTitle.Location = New System.Drawing.Point(10, 56)
+        Me.lblDocumentEditorTitle.Name = "lblDocumentEditorTitle"
+        Me.lblDocumentEditorTitle.Size = New System.Drawing.Size(101, 13)
+        Me.lblDocumentEditorTitle.TabIndex = 1
+        Me.lblDocumentEditorTitle.Text = "Dokumentdetails"
+        '
+        'lblDocumentEditorName
+        '
+        Me.lblDocumentEditorName.AutoSize = True
+        Me.lblDocumentEditorName.Location = New System.Drawing.Point(10, 87)
+        Me.lblDocumentEditorName.Name = "lblDocumentEditorName"
+        Me.lblDocumentEditorName.Size = New System.Drawing.Size(85, 13)
+        Me.lblDocumentEditorName.TabIndex = 2
+        Me.lblDocumentEditorName.Text = "Dokumentname:"
+        '
+        'txtDocumentEditorName
+        '
+        Me.txtDocumentEditorName.Location = New System.Drawing.Point(155, 84)
+        Me.txtDocumentEditorName.MaxLength = 120
+        Me.txtDocumentEditorName.Name = "txtDocumentEditorName"
+        Me.txtDocumentEditorName.Size = New System.Drawing.Size(206, 20)
+        Me.txtDocumentEditorName.TabIndex = 3
+        '
+        'lblDocumentEditorAnhangsart
+        '
+        Me.lblDocumentEditorAnhangsart.AutoSize = True
+        Me.lblDocumentEditorAnhangsart.Location = New System.Drawing.Point(377, 87)
+        Me.lblDocumentEditorAnhangsart.Name = "lblDocumentEditorAnhangsart"
+        Me.lblDocumentEditorAnhangsart.Size = New System.Drawing.Size(64, 13)
+        Me.lblDocumentEditorAnhangsart.TabIndex = 4
+        Me.lblDocumentEditorAnhangsart.Text = "Anhangsart:"
+        '
+        'cmbDocumentEditorAnhangsart
+        '
+        Me.cmbDocumentEditorAnhangsart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cmbDocumentEditorAnhangsart.Location = New System.Drawing.Point(468, 84)
+        Me.cmbDocumentEditorAnhangsart.Name = "cmbDocumentEditorAnhangsart"
+        Me.cmbDocumentEditorAnhangsart.Size = New System.Drawing.Size(205, 21)
+        Me.cmbDocumentEditorAnhangsart.TabIndex = 5
+        '
+        'lblDocumentEditorInfo
+        '
+        Me.lblDocumentEditorInfo.AutoSize = True
+        Me.lblDocumentEditorInfo.Location = New System.Drawing.Point(10, 115)
+        Me.lblDocumentEditorInfo.Name = "lblDocumentEditorInfo"
+        Me.lblDocumentEditorInfo.Size = New System.Drawing.Size(80, 13)
+        Me.lblDocumentEditorInfo.TabIndex = 6
+        Me.lblDocumentEditorInfo.Text = "Dokument Info:"
+        '
+        'txtDocumentEditorInfo
+        '
+        Me.txtDocumentEditorInfo.Location = New System.Drawing.Point(155, 112)
+        Me.txtDocumentEditorInfo.MaxLength = 500
+        Me.txtDocumentEditorInfo.Name = "txtDocumentEditorInfo"
+        Me.txtDocumentEditorInfo.Size = New System.Drawing.Size(518, 20)
+        Me.txtDocumentEditorInfo.TabIndex = 7
+        Me.txtDocumentEditorInfo.Text = "Bitte das Dokument hochladen."
+        '
+        'lblDocumentEditorStatus
+        '
+        Me.lblDocumentEditorStatus.AutoSize = True
+        Me.lblDocumentEditorStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(102, Byte), Integer), CType(CType(153, Byte), Integer))
+        Me.lblDocumentEditorStatus.Location = New System.Drawing.Point(10, 151)
+        Me.lblDocumentEditorStatus.Name = "lblDocumentEditorStatus"
+        Me.lblDocumentEditorStatus.Size = New System.Drawing.Size(339, 13)
+        Me.lblDocumentEditorStatus.TabIndex = 8
+        Me.lblDocumentEditorStatus.Text = "Wählen Sie ein Dokument, um Name und Dokument Info anzupassen."
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(9, 438)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(202, 17)
+        Me.Label5.TabIndex = 6
+        Me.Label5.Text = "Kundenportal Upload-Link:"
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(102, Byte), Integer), CType(CType(153, Byte), Integer))
+        Me.Label20.Location = New System.Drawing.Point(314, 442)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(207, 13)
+        Me.Label20.TabIndex = 7
+        Me.Label20.Text = "Bitte zuerst Dokument(e) oben auswählen."
+        '
+        'btnCustomerUploadLink
+        '
+        Me.btnCustomerUploadLink.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnCustomerUploadLink.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCustomerUploadLink.Location = New System.Drawing.Point(553, 466)
+        Me.btnCustomerUploadLink.Name = "btnCustomerUploadLink"
+        Me.btnCustomerUploadLink.Size = New System.Drawing.Size(143, 30)
+        Me.btnCustomerUploadLink.TabIndex = 11
+        Me.btnCustomerUploadLink.Text = "Link kopieren"
+        Me.btnCustomerUploadLink.UseVisualStyleBackColor = True
+        '
+        'btnCustomerUploadEmail
+        '
+        Me.btnCustomerUploadEmail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnCustomerUploadEmail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCustomerUploadEmail.Location = New System.Drawing.Point(553, 502)
+        Me.btnCustomerUploadEmail.Name = "btnCustomerUploadEmail"
+        Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(143, 30)
+        Me.btnCustomerUploadEmail.TabIndex = 13
+        Me.btnCustomerUploadEmail.Text = "E-Mail senden"
+        Me.btnCustomerUploadEmail.UseVisualStyleBackColor = True
+        '
+        'txtCustomerUploadEmail
+        '
+        Me.txtCustomerUploadEmail.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtCustomerUploadEmail.Location = New System.Drawing.Point(132, 507)
+        Me.txtCustomerUploadEmail.MaxLength = 255
+        Me.txtCustomerUploadEmail.Name = "txtCustomerUploadEmail"
+        Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(409, 20)
+        Me.txtCustomerUploadEmail.TabIndex = 12
+        '
+        'lblCustomerUploadEmail
+        '
+        Me.lblCustomerUploadEmail.AutoSize = True
+        Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(9, 510)
+        Me.lblCustomerUploadEmail.Name = "lblCustomerUploadEmail"
+        Me.lblCustomerUploadEmail.Size = New System.Drawing.Size(54, 13)
+        Me.lblCustomerUploadEmail.TabIndex = 10
+        Me.lblCustomerUploadEmail.Text = "E-Mail an:"
+        '
+        'lblCustomerUploadValidityHours
+        '
+        Me.lblCustomerUploadValidityHours.AutoSize = True
+        Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(262, 471)
+        Me.lblCustomerUploadValidityHours.Name = "lblCustomerUploadValidityHours"
+        Me.lblCustomerUploadValidityHours.Size = New System.Drawing.Size(66, 13)
+        Me.lblCustomerUploadValidityHours.TabIndex = 9
+        Me.lblCustomerUploadValidityHours.Text = "Gültigkeit(h):"
+        '
+        'nudCustomerUploadValidityHours
+        '
+        Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(352, 469)
+        Me.nudCustomerUploadValidityHours.Maximum = New Decimal(New Integer() {168, 0, 0, 0})
+        Me.nudCustomerUploadValidityHours.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
+        Me.nudCustomerUploadValidityHours.Name = "nudCustomerUploadValidityHours"
+        Me.nudCustomerUploadValidityHours.Size = New System.Drawing.Size(110, 20)
+        Me.nudCustomerUploadValidityHours.TabIndex = 10
+        Me.nudCustomerUploadValidityHours.Value = New Decimal(New Integer() {168, 0, 0, 0})
+        '
+        'cmbCustomerUploadLanguage
+        '
+        Me.cmbCustomerUploadLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cmbCustomerUploadLanguage.FormattingEnabled = True
+        Me.cmbCustomerUploadLanguage.Items.AddRange(New Object() {"de", "en", "tr", "sr", "bg"})
+        Me.cmbCustomerUploadLanguage.Location = New System.Drawing.Point(132, 469)
+        Me.cmbCustomerUploadLanguage.Name = "cmbCustomerUploadLanguage"
+        Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(108, 21)
+        Me.cmbCustomerUploadLanguage.TabIndex = 9
+        '
+        'lblCustomerUploadLanguage
+        '
+        Me.lblCustomerUploadLanguage.AutoSize = True
+        Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(9, 472)
+        Me.lblCustomerUploadLanguage.Name = "lblCustomerUploadLanguage"
+        Me.lblCustomerUploadLanguage.Size = New System.Drawing.Size(72, 13)
+        Me.lblCustomerUploadLanguage.TabIndex = 8
+        Me.lblCustomerUploadLanguage.Text = "Mail Sprache:"
+        '
+        'txtCustomerUploadEmailText
+        '
+        Me.txtCustomerUploadEmailText.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtCustomerUploadEmailText.Location = New System.Drawing.Point(132, 570)
+        Me.txtCustomerUploadEmailText.MaxLength = 500
+        Me.txtCustomerUploadEmailText.Multiline = True
+        Me.txtCustomerUploadEmailText.Name = "txtCustomerUploadEmailText"
+        Me.txtCustomerUploadEmailText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtCustomerUploadEmailText.Size = New System.Drawing.Size(564, 50)
+        Me.txtCustomerUploadEmailText.TabIndex = 14
+        Me.txtCustomerUploadEmailText.Text = ""
+        ' 
+        'lblCustomerUploadEmailText
+        '
+        Me.lblCustomerUploadEmailText.AutoSize = True
+        Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(9, 573)
+        Me.lblCustomerUploadEmailText.Name = "lblCustomerUploadEmailText"
+        Me.lblCustomerUploadEmailText.Size = New System.Drawing.Size(63, 13)
+        Me.lblCustomerUploadEmailText.TabIndex = 15
+        Me.lblCustomerUploadEmailText.Text = "E-Mail Text:"
+        '
+        'cmbCustomerUploadEmailTemplate
+        '
+        Me.cmbCustomerUploadEmailTemplate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cmbCustomerUploadEmailTemplate.FormattingEnabled = True
+        Me.cmbCustomerUploadEmailTemplate.Location = New System.Drawing.Point(132, 543)
+        Me.cmbCustomerUploadEmailTemplate.Name = "cmbCustomerUploadEmailTemplate"
+        Me.cmbCustomerUploadEmailTemplate.Size = New System.Drawing.Size(564, 21)
+        Me.cmbCustomerUploadEmailTemplate.TabIndex = 19
+        Me.cmbCustomerUploadEmailTemplate.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        '
+        'lblCustomerUploadEmailTemplate
+        '
+        Me.lblCustomerUploadEmailTemplate.AutoSize = True
+        Me.lblCustomerUploadEmailTemplate.Location = New System.Drawing.Point(9, 546)
+        Me.lblCustomerUploadEmailTemplate.Name = "lblCustomerUploadEmailTemplate"
+        Me.lblCustomerUploadEmailTemplate.Size = New System.Drawing.Size(63, 13)
+        Me.lblCustomerUploadEmailTemplate.TabIndex = 20
+        Me.lblCustomerUploadEmailTemplate.Text = "Vorlage:"
+        '
+        'lblKontaktEmails
+        '
+        Me.lblKontaktEmails.AutoSize = True
+        Me.lblKontaktEmails.Location = New System.Drawing.Point(9, 628)
+        Me.lblKontaktEmails.Name = "lblKontaktEmails"
+        Me.lblKontaktEmails.Size = New System.Drawing.Size(245, 13)
+        Me.lblKontaktEmails.TabIndex = 17
+        Me.lblKontaktEmails.Text = "Hinterlegte E-Mail-Adressen (Doppelklick = Übernehmen):"
+        '
+        'dgvKontaktEmails
+        '
+        Me.dgvKontaktEmails.AllowUserToAddRows = False
+        Me.dgvKontaktEmails.AllowUserToDeleteRows = False
+        Me.dgvKontaktEmails.AllowUserToResizeRows = False
+        Me.dgvKontaktEmails.BackgroundColor = System.Drawing.Color.White
+        Me.dgvKontaktEmails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvKontaktEmails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgvKontaktEmails.Location = New System.Drawing.Point(9, 647)
+        Me.dgvKontaktEmails.MultiSelect = False
+        Me.dgvKontaktEmails.Name = "dgvKontaktEmails"
+        Me.dgvKontaktEmails.ReadOnly = True
+        Me.dgvKontaktEmails.RowHeadersVisible = False
+        Me.dgvKontaktEmails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvKontaktEmails.Size = New System.Drawing.Size(687, 170)
+        Me.dgvKontaktEmails.TabIndex = 18
+        '
+        'btnVermerkSetzen
+        '
+        Me.btnVermerkSetzen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVermerkSetzen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnVermerkSetzen.Location = New System.Drawing.Point(553, 823)
+        Me.btnVermerkSetzen.Name = "btnVermerkSetzen"
+        Me.btnVermerkSetzen.Size = New System.Drawing.Size(143, 36)
+        Me.btnVermerkSetzen.TabIndex = 16
+        Me.btnVermerkSetzen.Text = "Vermerk setzen"
+        Me.btnVermerkSetzen.UseVisualStyleBackColor = True
+        '
+        'lblTitel
+        '
+        Me.lblTitel.AutoSize = True
+        Me.lblTitel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblTitel.Location = New System.Drawing.Point(12, 14)
+        Me.lblTitel.Name = "lblTitel"
+        Me.lblTitel.Size = New System.Drawing.Size(156, 17)
+        Me.lblTitel.TabIndex = 18
+        Me.lblTitel.Text = "Dokument(e) fehlen:"
+        '
+        'frmSendungsDokumentanforderung
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(711, 864)
+        Me.Controls.Add(Me.lblCustomerUploadEmailTemplate)
+        Me.Controls.Add(Me.cmbCustomerUploadEmailTemplate)
+        Me.Controls.Add(Me.dgvKontaktEmails)
+        Me.Controls.Add(Me.lblKontaktEmails)
+        Me.Controls.Add(Me.lblTitel)
+        Me.Controls.Add(Me.btnVermerkSetzen)
+        Me.Controls.Add(Me.lblCustomerUploadEmailText)
+        Me.Controls.Add(Me.cmbCustomerUploadEmailTemplate)
+        Me.Controls.Add(Me.txtCustomerUploadEmailText)
+        Me.Controls.Add(Me.lblCustomerUploadLanguage)
+        Me.Controls.Add(Me.cmbCustomerUploadLanguage)
+        Me.Controls.Add(Me.nudCustomerUploadValidityHours)
+        Me.Controls.Add(Me.lblCustomerUploadValidityHours)
+        Me.Controls.Add(Me.lblCustomerUploadEmail)
+        Me.Controls.Add(Me.txtCustomerUploadEmail)
+        Me.Controls.Add(Me.btnCustomerUploadEmail)
+        Me.Controls.Add(Me.btnCustomerUploadLink)
+        Me.Controls.Add(Me.Label20)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.pnlDocumentEditor)
+        Me.Controls.Add(Me.lblErrDokument)
+        Me.Controls.Add(Me.cbxNichtLeserlich)
+        Me.Controls.Add(Me.txtSonstigesDokumentFehlt)
+        Me.Controls.Add(Me.cbxSonstDok)
+        Me.Controls.Add(Me.flpDokumenteFehlenMain)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmSendungsDokumentanforderung"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Dokumentanforderung"
+        Me.pnlDocumentEditor.ResumeLayout(False)
+        Me.pnlDocumentEditor.PerformLayout()
+        CType(Me.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvKontaktEmails, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents flpDokumenteFehlenMain As FlowLayoutPanel
+    Friend WithEvents cbxSonstDok As CheckBox
+    Friend WithEvents txtSonstigesDokumentFehlt As TextBox
+    Friend WithEvents cbxNichtLeserlich As CheckBox
+    Friend WithEvents lblErrDokument As Label
+    Friend WithEvents pnlDocumentEditor As Panel
+    Friend WithEvents flpDocumentTabs As FlowLayoutPanel
+    Friend WithEvents lblDocumentEditorTitle As Label
+    Friend WithEvents lblDocumentEditorName As Label
+    Friend WithEvents txtDocumentEditorName As TextBox
+    Friend WithEvents lblDocumentEditorAnhangsart As Label
+    Friend WithEvents cmbDocumentEditorAnhangsart As ComboBox
+    Friend WithEvents lblDocumentEditorInfo As Label
+    Friend WithEvents txtDocumentEditorInfo As TextBox
+    Friend WithEvents lblDocumentEditorStatus As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Label20 As Label
+    Friend WithEvents btnCustomerUploadLink As Button
+    Friend WithEvents btnCustomerUploadEmail As Button
+    Friend WithEvents txtCustomerUploadEmail As TextBox
+    Friend WithEvents lblCustomerUploadEmail As Label
+    Friend WithEvents lblCustomerUploadValidityHours As Label
+    Friend WithEvents nudCustomerUploadValidityHours As NumericUpDown
+    Friend WithEvents cmbCustomerUploadLanguage As ComboBox
+    Friend WithEvents lblCustomerUploadLanguage As Label
+    Friend WithEvents txtCustomerUploadEmailText As TextBox
+    Friend WithEvents lblCustomerUploadEmailText As Label
+    Friend WithEvents btnVermerkSetzen As Button
+    Friend WithEvents lblTitel As Label
+    Friend WithEvents lblKontaktEmails As Label
+    Friend WithEvents cmbCustomerUploadEmailTemplate As ComboBox
+    Friend WithEvents lblCustomerUploadEmailTemplate As Label
+    Friend WithEvents dgvKontaktEmails As DataGridView
+
+End Class

Aviso/frmSendungsDokumentanforderung.resx

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Aviso/frmSendungsdetailsNEU.vb

@@ -1465,11 +1465,11 @@ Public Class frmSendungsdetailsNEU
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
                 Case "FRONTOFFICE"
-                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,7001) "
+                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,5802,7001) "
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     End If
 
                 Case Else
@@ -4958,7 +4958,8 @@ Public Class frmSendungsdetailsNEU
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
-                    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))
                 Next
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
@@ -7503,7 +7504,7 @@ Public Class frmSendungsdetailsNEU
 
             If item IsNot Nothing Then
 
-                listOfTextconserven = New cTextkonserve_LIST("FRM_MNGR_MailText", item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                listOfTextconserven = New cTextkonserve_LIST(8, item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
 
                 If listOfTextconserven.LIST.Count = 0 Then
                     'ContextMenuStrip1.Show(Cursor.Position)

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/usrcntlAktDetails.vb

@@ -1,12 +1,12 @@
-Imports VERAG_PROG_ALLGEMEIN
-Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
-
-Imports System.IO
 'Imports Gemeinsames.cDatenbank
 Imports System.Drawing
-Imports Microsoft.Office.Interop
+Imports System.IO
 Imports System.Security.Cryptography
 Imports GrapeCity.DataVisualization.TypeScript
+Imports Microsoft.Office.Interop
+Imports Microsoft.Reporting.WinForms
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 
 Public Class usrcntlAktDetails
 
@@ -361,7 +361,7 @@ Public Class usrcntlAktDetails
             btnOptionen.Enabled = False
             btnLkwBeleg.Visible = False
             'tbcntlVermerke.TabPages.Remove(tbAnhang)
-            Button18.Visible = False
+            Button18.Visible = True ' Berechtigung freigegben 16.04.26
 
             btnDipoListeEmail.Visible = False
             btnLZDruckDIGITAL.Visible = False
@@ -3717,23 +3717,44 @@ Public Class usrcntlAktDetails
     End Sub
 
     Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click, Button8.Click, btnQRVerwahrung.Click
-        Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
+        Try
 
-        If dgvSendungen.SelectedRows.Count > 0 Then
+            Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
-            SND = New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
-        End If
 
-        Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND)
+            If dgvSendungen.SelectedRows.Count > 0 Then
-        Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
+                SND = New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
-        If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
+            End If
-        If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
 
+            Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND)
+            Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("EPSON", True)
 
-        If sender Is Button8 OrElse printer = "" Then
+            'If printer <> "" Then
-            SDL.cProgramFunctions.showRpt(rpt, "AVISO", False)
+
-        Else
+            '    'rpt.PageSettings.PaperKind = Drawing.Printing.PaperKind.Custom
-            SDL.cProgramFunctions.printRpt(rpt, printer, True)
+            '    'rpt.PageSettings.PaperName = "BON80X200"
-        End If
+            '    'rpt.PageSettings.PaperWidth = 3.15F
+            '    'rpt.PageSettings.PaperHeight = 7.87F
+            '    'rpt.Document.Printer.PrinterName = printername
+
+            '    ' rpt.Document.Printer.PaperSize = New GrapeCity.ActiveReports.Printing.PaperSize("Custom", 800, 2500)
+            '    '   rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
+
+            'End If
+            ''rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
+            'rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize = New GrapeCity.ActiveReports.Printing.PaperSize("Custom", 800, 2500) ' ps.PaperSize '.SetPageSettings(ps)
+
+            If sender Is Button8 OrElse printer = "" Then
+                SDL.cProgramFunctions.showRpt(rpt, "AVISO", False)
+            Else
+                SDL.cProgramFunctions.printRpt(rpt, printer, True)
+            End If
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
 
     End Sub