Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

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')" />
@@ -803,12 +803,6 @@
     <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>
@@ -1479,9 +1473,6 @@
     <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>
@@ -1590,7 +1581,6 @@
     </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

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

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmAddSendungsvermerkShort.Designer.vb

@@ -27,36 +27,59 @@ 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.flpAngefordert = New System.Windows.Forms.FlowLayoutPanel()
+        Me.optDraft = New System.Windows.Forms.CheckBox()
+        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.btnDokumtanforderung = New System.Windows.Forms.Button()
+        Me.cbxSonstDok = New System.Windows.Forms.CheckBox()
         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()
         '
@@ -72,62 +95,135 @@ 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(474, 400)
+        Me.pnlMain.Size = New System.Drawing.Size(454, 605)
         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.flpAngefordert)
+        Me.pnlSendungsVermker.Controls.Add(Me.optDraft)
+        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.btnDokumtanforderung)
+        Me.pnlSendungsVermker.Controls.Add(Me.cbxSonstDok)
         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(474, 400)
+        Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 605)
         Me.pnlSendungsVermker.TabIndex = 0
         '
-        'flpAngefordert
+        'optDraft
         '
-        Me.flpAngefordert.BackColor = System.Drawing.Color.White
+        Me.optDraft.AutoSize = True
-        Me.flpAngefordert.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
+        Me.optDraft.Location = New System.Drawing.Point(12, 262)
-        Me.flpAngefordert.Location = New System.Drawing.Point(12, 50)
+        Me.optDraft.Name = "optDraft"
-        Me.flpAngefordert.Margin = New System.Windows.Forms.Padding(0)
+        Me.optDraft.Size = New System.Drawing.Size(174, 17)
-        Me.flpAngefordert.Name = "flpAngefordert"
+        Me.optDraft.TabIndex = 102
-        Me.flpAngefordert.Size = New System.Drawing.Size(450, 131)
+        Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert"
-        Me.flpAngefordert.TabIndex = 122
+        Me.optDraft.UseVisualStyleBackColor = True
+        '
+        '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(12, 268)
+        Me.Label4.Location = New System.Drawing.Point(11, 411)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(125, 17)
         Me.Label4.TabIndex = 96
@@ -137,7 +233,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(13, 303)
+        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 458)
         Me.optFremd_ATB.Name = "optFremd_ATB"
         Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17)
         Me.optFremd_ATB.TabIndex = 94
@@ -148,44 +244,93 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFremd_SendungAvisiert.AutoSize = True
         Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(13, 286)
+        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 435)
         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(177, 194)
+        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 316)
         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(176, 205)
+        Me.Label2.Location = New System.Drawing.Point(175, 316)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(57, 13)
         Me.Label2.TabIndex = 84
@@ -196,7 +341,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(148, 257)
+        Me.lblErrGrund.Location = New System.Drawing.Point(147, 385)
         Me.lblErrGrund.Name = "lblErrGrund"
         Me.lblErrGrund.Size = New System.Drawing.Size(149, 13)
         Me.lblErrGrund.TabIndex = 26
@@ -212,7 +357,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(419, -1)
+        Me.btnCLose.Location = New System.Drawing.Point(399, -1)
         Me.btnCLose.Name = "btnCLose"
         Me.btnCLose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.btnCLose.Size = New System.Drawing.Size(54, 20)
@@ -220,12 +365,24 @@ 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.Transparent
+        Me.Label1.BackColor = System.Drawing.Color.WhiteSmoke
         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, 0)
+        Me.Label1.Location = New System.Drawing.Point(9, 9)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(156, 17)
         Me.Label1.TabIndex = 1
@@ -235,16 +392,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(178, 215)
+        Me.txtSpedition.Location = New System.Drawing.Point(177, 332)
         Me.txtSpedition.MaxLength = 50
         Me.txtSpedition.Name = "txtSpedition"
-        Me.txtSpedition.Size = New System.Drawing.Size(126, 20)
+        Me.txtSpedition.Size = New System.Drawing.Size(125, 20)
         Me.txtSpedition.TabIndex = 20
         '
         'optSendungInVorbereitung
         '
         Me.optSendungInVorbereitung.AutoSize = True
-        Me.optSendungInVorbereitung.Location = New System.Drawing.Point(174, 3)
+        Me.optSendungInVorbereitung.Location = New System.Drawing.Point(203, 3)
         Me.optSendungInVorbereitung.Name = "optSendungInVorbereitung"
         Me.optSendungInVorbereitung.Size = New System.Drawing.Size(143, 17)
         Me.optSendungInVorbereitung.TabIndex = 13
@@ -256,7 +413,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optSpeditionWeitergeleitet.AutoSize = True
         Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(13, 215)
+        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 334)
         Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet"
         Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17)
         Me.optSpeditionWeitergeleitet.TabIndex = 19
@@ -267,7 +424,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFreierText.AutoSize = True
         Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFreierText.Location = New System.Drawing.Point(13, 232)
+        Me.optFreierText.Location = New System.Drawing.Point(12, 361)
         Me.optFreierText.Name = "optFreierText"
         Me.optFreierText.Size = New System.Drawing.Size(105, 17)
         Me.optFreierText.TabIndex = 27
@@ -278,18 +435,38 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optATAangefordert.AutoSize = True
         Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optATAangefordert.Location = New System.Drawing.Point(165, 303)
+        Me.optATAangefordert.Location = New System.Drawing.Point(164, 458)
         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(309, 216)
+        Me.Label3.Location = New System.Drawing.Point(308, 335)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(57, 13)
         Me.Label3.TabIndex = 22
@@ -299,7 +476,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.lblErr240Zeichen.AutoSize = True
         Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
-        Me.lblErr240Zeichen.Location = New System.Drawing.Point(224, 332)
+        Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 496)
         Me.lblErr240Zeichen.Name = "lblErr240Zeichen"
         Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13)
         Me.lblErr240Zeichen.TabIndex = 32
@@ -311,12 +488,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(17, 348)
+        Me.txtDetail.Location = New System.Drawing.Point(12, 512)
         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(303, 41)
+        Me.txtDetail.Size = New System.Drawing.Size(302, 54)
         Me.txtDetail.TabIndex = 33
         Me.txtDetail.TabStop = False
         Me.txtDetail.WordWrap = False
@@ -324,7 +501,7 @@ Partial Class frmAddSendungsvermerkShort
         'lblZustzlFreitext
         '
         Me.lblZustzlFreitext.AutoSize = True
-        Me.lblZustzlFreitext.Location = New System.Drawing.Point(14, 331)
+        Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 496)
         Me.lblZustzlFreitext.Name = "lblZustzlFreitext"
         Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13)
         Me.lblZustzlFreitext.TabIndex = 31
@@ -334,50 +511,84 @@ 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(126, 234)
+        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 332)
         Me.txtSendungSpedition.MaxLength = 50
         Me.txtSendungSpedition.Name = "txtSendungSpedition"
-        Me.txtSendungSpedition.Size = New System.Drawing.Size(26, 20)
+        Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 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(325, 348)
+        Me.btnOK.Location = New System.Drawing.Point(320, 512)
         Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(125, 41)
+        Me.btnOK.Size = New System.Drawing.Size(124, 54)
         Me.btnOK.TabIndex = 34
         Me.btnOK.Text = "Hinzufügen"
         Me.btnOK.UseVisualStyleBackColor = True
         '
-        'btnDokumtanforderung
+        'cbxSonstDok
         '
-        Me.btnDokumtanforderung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cbxSonstDok.AutoSize = True
-        Me.btnDokumtanforderung.Location = New System.Drawing.Point(323, 22)
+        Me.cbxSonstDok.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.btnDokumtanforderung.Name = "btnDokumtanforderung"
+        Me.cbxSonstDok.Location = New System.Drawing.Point(12, 98)
-        Me.btnDokumtanforderung.Size = New System.Drawing.Size(140, 23)
+        Me.cbxSonstDok.Name = "cbxSonstDok"
-        Me.btnDokumtanforderung.TabIndex = 133
+        Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17)
-        Me.btnDokumtanforderung.Text = "Dokumtanforderung"
+        Me.cbxSonstDok.TabIndex = 9
-        Me.btnDokumtanforderung.UseVisualStyleBackColor = True
+        Me.cbxSonstDok.Text = "Dok. Name:"
+        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(355, 257)
+        Me.Label9.Location = New System.Drawing.Point(354, 385)
         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(145, 257)
+        Me.Label17.Location = New System.Drawing.Point(144, 385)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(182, 13)
         Me.Label17.TabIndex = 29
@@ -388,29 +599,92 @@ 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(10, 196)
+        Me.Label13.Location = New System.Drawing.Point(9, 307)
         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(123, 230)
+        Me.txtFreierText.Location = New System.Drawing.Point(122, 359)
         Me.txtFreierText.MaxLength = 80
         Me.txtFreierText.Name = "txtFreierText"
-        Me.txtFreierText.Size = New System.Drawing.Size(323, 23)
+        Me.txtFreierText.Size = New System.Drawing.Size(322, 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, 190)
+        Me.PictureBox4.Location = New System.Drawing.Point(-1, 297)
         Me.PictureBox4.Name = "PictureBox4"
-        Me.PictureBox4.Size = New System.Drawing.Size(474, 139)
+        Me.PictureBox4.Size = New System.Drawing.Size(453, 189)
         Me.PictureBox4.TabIndex = 78
         Me.PictureBox4.TabStop = False
         '
@@ -421,14 +695,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(474, 0)
+        Me.Panel4.Size = New System.Drawing.Size(454, 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(474, 400)
+        Me.ClientSize = New System.Drawing.Size(454, 605)
         Me.Controls.Add(Me.pnlMain)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -440,6 +714,7 @@ 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)
 
@@ -448,31 +723,53 @@ 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 btnDokumtanforderung As System.Windows.Forms.Button
+    Friend WithEvents cbxSonstDok As System.Windows.Forms.CheckBox
     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 lblDragIndicator As System.Windows.Forms.Label
+    Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+    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,13 +1,7 @@
-
+
-Imports System.Configuration
-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
+Imports SDL
+Imports VERAG_PROG_ALLGEMEIN
 Public Class frmAddSendungsvermerkShort
 
     Dim AvisoDAL As New cAvisoDAL
@@ -21,9 +15,6 @@ 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
 
@@ -40,7 +31,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()
@@ -68,18 +59,16 @@ Public Class frmAddSendungsvermerkShort
     End Sub
 
     Private Sub frmEintragVermerk_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
-        Dim pt As Point = Cursor.Position
-        Dim screenBounds As Rectangle = Screen.FromPoint(pt).WorkingArea
-        If pt.X + Me.Width > screenBounds.Right Then
-            pt.X = screenBounds.Right - Me.Width
-        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)
+        'cboDokumente.Items.Clear()
+        '  cboDokumente.Items.Add(New MyListItem("nachgefordert", CStr(0)))
+        'cboDokumente.Items.Add(New MyListItem("erhalten", CStr(1)))
+        'cboDokumente.SelectedIndex = 0
 
+        Me.CenterToParent()
+        If My.Computer.Screen.WorkingArea.Height < Me.Height Then
+            Me.Height = My.Computer.Screen.WorkingArea.Height
+        End If
         For Each c In Me.Controls
             If c.GetType.Name.ToString = "RadioButton" Then
                 AddHandler DirectCast(c, RadioButton).CheckedChanged, AddressOf selectionChanged
@@ -103,9 +92,6 @@ 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 & ""
@@ -133,81 +119,6 @@ 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
@@ -234,7 +145,8 @@ 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)
@@ -244,32 +156,44 @@ Public Class frmAddSendungsvermerkShort
             insertSendungsVermerk(SendungID, myAviso.AvisoID, txtFreierText.Text.Trim & " - offen", 101)
         End If
 
-        For Each cb In _anforderungCheckboxes
+        If cbxAuftrag.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Auftrag für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 1)
-            If cb IsNot Nothing AndAlso cb.Checked Then
+        If cbxRechnung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnung für Sendung '" & txtSendung.Text.Trim & "' fehlt / mangelhaft - angefordert", 3)
-                Dim codeId As Integer = 0
+        If cbxLS.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Lieferschein für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 5)
-                If Integer.TryParse(If(cb.Tag, "").ToString(), codeId) Then
+        If cbxATR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATR für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 7)
-                    Dim text = ""
+        If cbxVollmacht.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Vollmacht für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 9)
-                    If _backendBezeichnungByCodeId.ContainsKey(codeId) Then
+        If cbxCMR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "CMR bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 11)
-                        text = If(_backendBezeichnungByCodeId(codeId), "").Trim()
+        If cbxPackliste.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Packliste bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 90)
-                    End If
+        If cbxRgBest.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnungsbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 55)
-                    If text = "" Then text = cb.Text.Trim()
+        If optGewPackAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Gewicht/Packstücke bei Sendung '" & txtSendung.Text.Trim & "' mangelhaft - angefordert", 103)
+        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)
 
-                    Dim sendText = txtSendung.Text.Trim()
+        If optFrachtkostenAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Frachtkosten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 74)
-                    If text <> "" AndAlso sendText <> "" AndAlso InStr(text, "sendung", CompareMethod.Text) = 0 Then
+        If optAbsenderbestätigung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Absenderbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 76)
-                        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)
@@ -282,6 +206,9 @@ 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)
@@ -348,6 +275,7 @@ Public Class frmAddSendungsvermerkShort
     End Sub
 
     Sub showErr(l As Label)
+        lblErrDokument.Visible = False
         ' lblErrFach.Visible = False
         lblErrGrund.Visible = False
         ' lblErrSendungProbleme.Visible = False
@@ -371,11 +299,13 @@ Public Class frmAddSendungsvermerkShort
     '    optDokumente.Checked = True
     'End Sub
 
-    Private Sub cbxAuftrag_CheckedChanged(sender As Object, e As EventArgs)
+    Private Sub cbxAuftrag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAuftrag.CheckedChanged, cbxRechnung.CheckedChanged, cbxLS.CheckedChanged,
+        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)
+    Private Sub SonstChanged(sender As Object, e As EventArgs) Handles txtSonstigesDokumentFehlt.TextChanged
         '  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
@@ -397,51 +327,18 @@ 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
-        txtFreierText.Focus()
+        cbxAuftrag.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

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

Aviso/frmGesamtsicherheitenNEU.vb

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

Aviso/frmHauptfenster.Designer.vb

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

Aviso/frmHauptfenster.resx

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

Aviso/frmHauptfenster.vb

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

Aviso/frmLaufzettel.vb

@@ -643,7 +643,4 @@ Public Class frmLaufzettel
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAktenzettelDruck.CheckedChanged
-
-    End Sub
 End Class

Aviso/frmSendungsDokumentanforderung.Designer.vb

@@ -1,486 +0,0 @@
-<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

@@ -1,61 +0,0 @@
-<?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.Designer.vb

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

Aviso/frmSendungsdetailsNEU.vb

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

Aviso/usrCntlSND_ATBGestellung.Designer.vb

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

Aviso/usrCntlSND_ATBGestellung.vb

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