merge

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -26,6 +26,9 @@ Partial Class frmATEZ_EZA
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmATEZ_EZA))
         Me.btnSend = New System.Windows.Forms.Button()
         Me.pnlHead = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.lblInfo = New System.Windows.Forms.Label()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -35,13 +38,11 @@ Partial Class frmATEZ_EZA
         Me.Label9 = New System.Windows.Forms.Label()
         Me.sbAdressierteZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.txtDyMandant = New System.Windows.Forms.Label()
-        Me.Label1 = New System.Windows.Forms.Label()
         Me.txtDyNiederlassung = New System.Windows.Forms.Label()
         Me.lblBezugsnummer = New System.Windows.Forms.Label()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.lblAnh = New System.Windows.Forms.Label()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.btnAgg_Tnr = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.btnAgg_Origin = New System.Windows.Forms.Button()
@@ -49,9 +50,15 @@ Partial Class frmATEZ_EZA
         Me.btnAgg_desc = New System.Windows.Forms.Button()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnPrio_CommInv = New System.Windows.Forms.Button()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.btnPrio_eFatura = New System.Windows.Forms.Button()
+        Me.btnPrio_Export = New System.Windows.Forms.Button()
+        Me.btnPrio_ftz = New System.Windows.Forms.Button()
+        Me.Panel1 = New System.Windows.Forms.Panel()
         Me.pnlHead.SuspendLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
         'btnSend
@@ -62,7 +69,7 @@ Partial Class frmATEZ_EZA
         Me.btnSend.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.btnSend.Image = Global.AVISO.My.Resources.Resources.ico_atez_declarantAI
         Me.btnSend.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSend.Location = New System.Drawing.Point(473, 348)
+        Me.btnSend.Location = New System.Drawing.Point(473, 343)
         Me.btnSend.Margin = New System.Windows.Forms.Padding(2)
         Me.btnSend.Name = "btnSend"
         Me.btnSend.Padding = New System.Windows.Forms.Padding(5, 0, 5, 0)
@@ -76,6 +83,8 @@ Partial Class frmATEZ_EZA
         '
         Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.pnlHead.BackColor = System.Drawing.Color.White
+        Me.pnlHead.Controls.Add(Me.Button1)
+        Me.pnlHead.Controls.Add(Me.Button2)
         Me.pnlHead.Controls.Add(Me.Label1)
         Me.pnlHead.Controls.Add(Me.Label4)
         Me.pnlHead.Controls.Add(Me.lblInfo)
@@ -93,6 +102,35 @@ Partial Class frmATEZ_EZA
         Me.pnlHead.Size = New System.Drawing.Size(675, 151)
         Me.pnlHead.TabIndex = 112
         '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(553, 117)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(122, 23)
+        Me.Button1.TabIndex = 153
+        Me.Button1.Text = "Clear Token Cache"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(610, 96)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(65, 23)
+        Me.Button2.TabIndex = 158
+        Me.Button2.Text = "json"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.BackColor = System.Drawing.Color.White
+        Me.Label1.Location = New System.Drawing.Point(387, 13)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(89, 13)
+        Me.Label1.TabIndex = 106
+        Me.Label1.Text = "Bezugsnummer:"
+        '
         'Label4
         '
         Me.Label4.BackColor = System.Drawing.Color.White
@@ -216,17 +254,6 @@ Partial Class frmATEZ_EZA
         Me.txtDyMandant.Text = "VERG"
         Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'Label1
-        '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label1.AutoSize = True
-        Me.Label1.BackColor = System.Drawing.Color.White
-        Me.Label1.Location = New System.Drawing.Point(387, 13)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(89, 13)
-        Me.Label1.TabIndex = 106
-        Me.Label1.Text = "Bezugsnummer:"
-        '
         'txtDyNiederlassung
         '
         Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White
@@ -273,19 +300,10 @@ Partial Class frmATEZ_EZA
         Me.lblAnh.TabIndex = 151
         Me.lblAnh.Visible = False
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(3, 383)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(178, 23)
-        Me.Button1.TabIndex = 153
-        Me.Button1.Text = "Clear Token Cache"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'btnAgg_Tnr
         '
         Me.btnAgg_Tnr.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.btnAgg_Tnr.Location = New System.Drawing.Point(79, 345)
+        Me.btnAgg_Tnr.Location = New System.Drawing.Point(76, 3)
         Me.btnAgg_Tnr.Name = "btnAgg_Tnr"
         Me.btnAgg_Tnr.Size = New System.Drawing.Size(83, 23)
         Me.btnAgg_Tnr.TabIndex = 154
@@ -296,7 +314,7 @@ Partial Class frmATEZ_EZA
         'Label2
         '
         Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.0!)
-        Me.Label2.Location = New System.Drawing.Point(6, 350)
+        Me.Label2.Location = New System.Drawing.Point(3, 8)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(103, 17)
         Me.Label2.TabIndex = 149
@@ -305,7 +323,7 @@ Partial Class frmATEZ_EZA
         'btnAgg_Origin
         '
         Me.btnAgg_Origin.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.btnAgg_Origin.Location = New System.Drawing.Point(165, 345)
+        Me.btnAgg_Origin.Location = New System.Drawing.Point(162, 3)
         Me.btnAgg_Origin.Name = "btnAgg_Origin"
         Me.btnAgg_Origin.Size = New System.Drawing.Size(92, 23)
         Me.btnAgg_Origin.TabIndex = 155
@@ -315,7 +333,7 @@ Partial Class frmATEZ_EZA
         '
         'btnAgg_Unit
         '
-        Me.btnAgg_Unit.Location = New System.Drawing.Point(260, 345)
+        Me.btnAgg_Unit.Location = New System.Drawing.Point(257, 3)
         Me.btnAgg_Unit.Name = "btnAgg_Unit"
         Me.btnAgg_Unit.Size = New System.Drawing.Size(79, 23)
         Me.btnAgg_Unit.TabIndex = 156
@@ -325,7 +343,7 @@ Partial Class frmATEZ_EZA
         '
         'btnAgg_desc
         '
-        Me.btnAgg_desc.Location = New System.Drawing.Point(342, 345)
+        Me.btnAgg_desc.Location = New System.Drawing.Point(339, 3)
         Me.btnAgg_desc.Name = "btnAgg_desc"
         Me.btnAgg_desc.Size = New System.Drawing.Size(126, 23)
         Me.btnAgg_desc.TabIndex = 157
@@ -358,34 +376,91 @@ Partial Class frmATEZ_EZA
         Me.columnName.Name = "columnName"
         Me.columnName.ReadOnly = True
         '
-        'Button2
+        'btnPrio_CommInv
         '
-        Me.Button2.Location = New System.Drawing.Point(402, 383)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(65, 23)
-        Me.Button2.TabIndex = 158
-        Me.Button2.Text = "json"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnPrio_CommInv.BackColor = System.Drawing.Color.White
+        Me.btnPrio_CommInv.Location = New System.Drawing.Point(76, 28)
+        Me.btnPrio_CommInv.Name = "btnPrio_CommInv"
+        Me.btnPrio_CommInv.Size = New System.Drawing.Size(116, 23)
+        Me.btnPrio_CommInv.TabIndex = 159
+        Me.btnPrio_CommInv.Tag = "0"
+        Me.btnPrio_CommInv.Text = "Handelsrechnung"
+        Me.btnPrio_CommInv.UseVisualStyleBackColor = False
+        '
+        'Label5
+        '
+        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.0!)
+        Me.Label5.Location = New System.Drawing.Point(3, 33)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(103, 17)
+        Me.Label5.TabIndex = 160
+        Me.Label5.Text = "Priorität:"
+        '
+        'btnPrio_eFatura
+        '
+        Me.btnPrio_eFatura.BackColor = System.Drawing.Color.White
+        Me.btnPrio_eFatura.Location = New System.Drawing.Point(195, 28)
+        Me.btnPrio_eFatura.Name = "btnPrio_eFatura"
+        Me.btnPrio_eFatura.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_eFatura.TabIndex = 161
+        Me.btnPrio_eFatura.Tag = "0"
+        Me.btnPrio_eFatura.Text = "eFatura"
+        Me.btnPrio_eFatura.UseVisualStyleBackColor = False
+        '
+        'btnPrio_Export
+        '
+        Me.btnPrio_Export.BackColor = System.Drawing.Color.White
+        Me.btnPrio_Export.Location = New System.Drawing.Point(267, 28)
+        Me.btnPrio_Export.Name = "btnPrio_Export"
+        Me.btnPrio_Export.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_Export.TabIndex = 162
+        Me.btnPrio_Export.Tag = "0"
+        Me.btnPrio_Export.Text = "Ausfuhr"
+        Me.btnPrio_Export.UseVisualStyleBackColor = False
+        '
+        'btnPrio_ftz
+        '
+        Me.btnPrio_ftz.BackColor = System.Drawing.Color.White
+        Me.btnPrio_ftz.Location = New System.Drawing.Point(339, 28)
+        Me.btnPrio_ftz.Name = "btnPrio_ftz"
+        Me.btnPrio_ftz.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_ftz.TabIndex = 163
+        Me.btnPrio_ftz.Tag = "0"
+        Me.btnPrio_ftz.Text = "FTZ"
+        Me.btnPrio_ftz.UseVisualStyleBackColor = False
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.SystemColors.InactiveBorder
+        Me.Panel1.Controls.Add(Me.btnPrio_CommInv)
+        Me.Panel1.Controls.Add(Me.btnAgg_Tnr)
+        Me.Panel1.Controls.Add(Me.btnPrio_ftz)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.btnPrio_Export)
+        Me.Panel1.Controls.Add(Me.btnAgg_Origin)
+        Me.Panel1.Controls.Add(Me.btnPrio_eFatura)
+        Me.Panel1.Controls.Add(Me.btnAgg_Unit)
+        Me.Panel1.Controls.Add(Me.Label5)
+        Me.Panel1.Controls.Add(Me.btnAgg_desc)
+        Me.Panel1.Location = New System.Drawing.Point(0, 343)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(470, 54)
+        Me.Panel1.TabIndex = 164
         '
         'frmATEZ_EZA
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ClientSize = New System.Drawing.Size(680, 413)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.btnAgg_desc)
-        Me.Controls.Add(Me.btnAgg_Tnr)
-        Me.Controls.Add(Me.btnAgg_Unit)
-        Me.Controls.Add(Me.btnAgg_Origin)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.Button1)
+        Me.BackColor = System.Drawing.SystemColors.InactiveBorder
+        Me.ClientSize = New System.Drawing.Size(680, 409)
         Me.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.lblAnh)
         Me.Controls.Add(Me.pnlHead)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.btnSend)
         Me.Controls.Add(Me.dgvAnhaenge)
+        Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmATEZ_EZA"
@@ -394,6 +469,7 @@ Partial Class frmATEZ_EZA
         Me.pnlHead.ResumeLayout(False)
         Me.pnlHead.PerformLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -423,4 +499,10 @@ Partial Class frmATEZ_EZA
     Friend WithEvents btnAgg_desc As Button
     Friend WithEvents Label4 As Label
     Friend WithEvents Button2 As Button
+    Friend WithEvents btnPrio_CommInv As Button
+    Friend WithEvents Label5 As Label
+    Friend WithEvents btnPrio_eFatura As Button
+    Friend WithEvents btnPrio_Export As Button
+    Friend WithEvents btnPrio_ftz As Button
+    Friend WithEvents Panel1 As Panel
 End Class

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -146,6 +146,14 @@ Public Class frmATEZ_EZA
             If btnAgg_Unit.Tag = 1 Then AdditionalSettings.Add("unit_type")
 
 
+            Dim combineItemsPriorityDocumentType As String = ""
+            If btnPrio_CommInv.Tag = 1 Then combineItemsPriorityDocumentType = "commercial_invoice"
+            If btnPrio_eFatura.Tag = 1 Then combineItemsPriorityDocumentType = "invoice"
+            If btnPrio_Export.Tag = 1 Then combineItemsPriorityDocumentType = "tr_export_declaration"
+            If btnPrio_ftz.Tag = 1 Then combineItemsPriorityDocumentType = "ftz"
+            'If btnPrio_CommInv.Tag = 1 Then combineItemsPriorityDocumentType = "packing_list"
+
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
                 .referenceNo = ioReference,
                 .outputApplication = "dakosy/sftp/verg",'.outputApplication = "dakosy/sftp/vera",
@@ -183,7 +191,8 @@ Public Class frmATEZ_EZA
                             }
                     },
                  .additionalSettings = New cRelayHubAdditionalSettings With {
-                        .combineOptions = AdditionalSettings
+                        .combineOptions = AdditionalSettings,
+                        .combineItemsPriorityDocumentType = combineItemsPriorityDocumentType
                     }
             }
 
@@ -336,13 +345,18 @@ Public Class frmATEZ_EZA
     End Sub
 
     Private Function getTelefon() As String
+        Dim defaultDW = "200"
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "ATILLA" : Return "0043 7711 28450"
             Case "AMBAR" : Return "0049 8651 9962492"
+            Case "UNISPED" : defaultDW = "800"
+            Case "IMEX" : defaultDW = "602"
+            Case "VERAG" : defaultDW = "200"
         End Select
 
-        Return "0049 8503 7973999 " & If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl), "200", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl)
-
+        Dim dw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
+        Return "0049 8503 7973999 " &
+               If(String.IsNullOrEmpty(dw) OrElse dw.Length >= 5, defaultDW, dw)
     End Function
     Private Function getDefaultMail_FIRMA() As String
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -809,4 +823,20 @@ Public Class frmATEZ_EZA
             sender.BackColor = SystemColors.Control
         End If
     End Sub
-End Class
+    Private Sub Buttonprio_Click(sender As Object, e As EventArgs) Handles btnPrio_CommInv.Click, btnPrio_ftz.Click, btnPrio_eFatura.Click, btnPrio_Export.Click
+
+        If sender IsNot btnPrio_CommInv Then btnPrio_CommInv.Tag = 0 : btnPrio_CommInv.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_eFatura Then btnPrio_eFatura.Tag = 0 : btnPrio_eFatura.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_Export Then btnPrio_Export.Tag = 0 : btnPrio_Export.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_ftz Then btnPrio_ftz.Tag = 0 : btnPrio_ftz.BackColor = SystemColors.Control
+
+
+        If sender.Tag = 0 Then
+            sender.Tag = 1
+            sender.BackColor = Color.DeepSkyBlue
+        Else
+            sender.Tag = 0
+            sender.BackColor = SystemColors.Control
+        End If
+        End Sub
+        End Class

Aviso/App.config

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

Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb

@@ -50,6 +50,8 @@ Partial Class usrctlStatVERIMEX
         Me.datAbfStatVon = New System.Windows.Forms.DateTimePicker()
         Me.btnAbfBericht = New System.Windows.Forms.Button()
         Me.btnAbfExcel = New System.Windows.Forms.Button()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.cboAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Panel3.SuspendLayout()
         Me.Panel4.SuspendLayout()
         CType(Me.dgvAbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -67,12 +69,11 @@ Partial Class usrctlStatVERIMEX
         Me.Panel3.Controls.Add(Me.Button1)
         Me.Panel3.Location = New System.Drawing.Point(15, 17)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(701, 423)
+        Me.Panel3.Size = New System.Drawing.Size(790, 423)
         Me.Panel3.TabIndex = 0
         '
         'Button4
         '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.Location = New System.Drawing.Point(310, 389)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(135, 23)
@@ -103,13 +104,12 @@ Partial Class usrctlStatVERIMEX
         Me.Panel4.Controls.Add(Me.datStatVon)
         Me.Panel4.Location = New System.Drawing.Point(3, 24)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(670, 359)
+        Me.Panel4.Size = New System.Drawing.Size(784, 359)
         Me.Panel4.TabIndex = 1
         '
         'Button3
         '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(532, 8)
+        Me.Button3.Location = New System.Drawing.Point(646, 9)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(135, 23)
         Me.Button3.TabIndex = 6
@@ -139,11 +139,14 @@ Partial Class usrctlStatVERIMEX
         '
         'dgvAbklaerungTR
         '
+        Me.dgvAbklaerungTR.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.dgvAbklaerungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAbklaerungTR.Location = New System.Drawing.Point(6, 38)
         Me.dgvAbklaerungTR.Name = "dgvAbklaerungTR"
         Me.dgvAbklaerungTR.RowHeadersWidth = 62
-        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(661, 318)
+        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(775, 318)
         Me.dgvAbklaerungTR.TabIndex = 7
         '
         'Label10
@@ -182,8 +185,7 @@ Partial Class usrctlStatVERIMEX
         '
         'Button2
         '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(598, 389)
+        Me.Button2.Location = New System.Drawing.Point(712, 389)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(75, 23)
         Me.Button2.TabIndex = 3
@@ -192,8 +194,7 @@ Partial Class usrctlStatVERIMEX
         '
         'Button1
         '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(517, 389)
+        Me.Button1.Location = New System.Drawing.Point(631, 389)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(75, 23)
         Me.Button1.TabIndex = 2
@@ -209,12 +210,11 @@ Partial Class usrctlStatVERIMEX
         Me.Panel1.Controls.Add(Me.btnAbfExcel)
         Me.Panel1.Location = New System.Drawing.Point(15, 467)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(701, 423)
+        Me.Panel1.Size = New System.Drawing.Size(790, 423)
         Me.Panel1.TabIndex = 5
         '
         'btnAbfDetailbereicht
         '
-        Me.btnAbfDetailbereicht.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAbfDetailbereicht.Location = New System.Drawing.Point(310, 389)
         Me.btnAbfDetailbereicht.Name = "btnAbfDetailbereicht"
         Me.btnAbfDetailbereicht.Size = New System.Drawing.Size(135, 23)
@@ -234,6 +234,8 @@ Partial Class usrctlStatVERIMEX
         'Panel2
         '
         Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.Panel2.Controls.Add(Me.cboAbfArt)
+        Me.Panel2.Controls.Add(Me.Label7)
         Me.Panel2.Controls.Add(Me.btnAbfAuswerten)
         Me.Panel2.Controls.Add(Me.Label3)
         Me.Panel2.Controls.Add(Me.cboAbfFirma)
@@ -244,13 +246,12 @@ Partial Class usrctlStatVERIMEX
         Me.Panel2.Controls.Add(Me.datAbfStatVon)
         Me.Panel2.Location = New System.Drawing.Point(3, 24)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(670, 359)
+        Me.Panel2.Size = New System.Drawing.Size(784, 359)
         Me.Panel2.TabIndex = 1
         '
         'btnAbfAuswerten
         '
-        Me.btnAbfAuswerten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAbfAuswerten.Location = New System.Drawing.Point(532, 8)
+        Me.btnAbfAuswerten.Location = New System.Drawing.Point(646, 9)
         Me.btnAbfAuswerten.Name = "btnAbfAuswerten"
         Me.btnAbfAuswerten.Size = New System.Drawing.Size(135, 23)
         Me.btnAbfAuswerten.TabIndex = 6
@@ -260,7 +261,7 @@ Partial Class usrctlStatVERIMEX
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(346, 13)
+        Me.Label3.Location = New System.Drawing.Point(305, 13)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(35, 13)
         Me.Label3.TabIndex = 0
@@ -272,19 +273,22 @@ Partial Class usrctlStatVERIMEX
         Me.cboAbfFirma._allowFreiText = False
         Me.cboAbfFirma._value = ""
         Me.cboAbfFirma.FormattingEnabled = True
-        Me.cboAbfFirma.Location = New System.Drawing.Point(386, 11)
+        Me.cboAbfFirma.Location = New System.Drawing.Point(345, 11)
         Me.cboAbfFirma.Margin = New System.Windows.Forms.Padding(2)
         Me.cboAbfFirma.Name = "cboAbfFirma"
-        Me.cboAbfFirma.Size = New System.Drawing.Size(111, 21)
+        Me.cboAbfFirma.Size = New System.Drawing.Size(84, 21)
         Me.cboAbfFirma.TabIndex = 5
         '
         'dgvAbfertigungTR
         '
+        Me.dgvAbfertigungTR.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.dgvAbfertigungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAbfertigungTR.Location = New System.Drawing.Point(6, 38)
         Me.dgvAbfertigungTR.Name = "dgvAbfertigungTR"
         Me.dgvAbfertigungTR.RowHeadersWidth = 62
-        Me.dgvAbfertigungTR.Size = New System.Drawing.Size(661, 318)
+        Me.dgvAbfertigungTR.Size = New System.Drawing.Size(775, 318)
         Me.dgvAbfertigungTR.TabIndex = 7
         '
         'Label4
@@ -323,8 +327,7 @@ Partial Class usrctlStatVERIMEX
         '
         'btnAbfBericht
         '
-        Me.btnAbfBericht.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAbfBericht.Location = New System.Drawing.Point(598, 389)
+        Me.btnAbfBericht.Location = New System.Drawing.Point(712, 389)
         Me.btnAbfBericht.Name = "btnAbfBericht"
         Me.btnAbfBericht.Size = New System.Drawing.Size(75, 23)
         Me.btnAbfBericht.TabIndex = 3
@@ -333,14 +336,34 @@ Partial Class usrctlStatVERIMEX
         '
         'btnAbfExcel
         '
-        Me.btnAbfExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAbfExcel.Location = New System.Drawing.Point(517, 389)
+        Me.btnAbfExcel.Location = New System.Drawing.Point(631, 389)
         Me.btnAbfExcel.Name = "btnAbfExcel"
         Me.btnAbfExcel.Size = New System.Drawing.Size(75, 23)
         Me.btnAbfExcel.TabIndex = 2
         Me.btnAbfExcel.Text = "Excel"
         Me.btnAbfExcel.UseVisualStyleBackColor = True
         '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(434, 15)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(85, 13)
+        Me.Label7.TabIndex = 8
+        Me.Label7.Text = "Abfertigungs-Art:"
+        '
+        'cboAbfArt
+        '
+        Me.cboAbfArt._allowedValuesFreiText = Nothing
+        Me.cboAbfArt._allowFreiText = False
+        Me.cboAbfArt._value = ""
+        Me.cboAbfArt.FormattingEnabled = True
+        Me.cboAbfArt.Location = New System.Drawing.Point(524, 11)
+        Me.cboAbfArt.Margin = New System.Windows.Forms.Padding(2)
+        Me.cboAbfArt.Name = "cboAbfArt"
+        Me.cboAbfArt.Size = New System.Drawing.Size(117, 21)
+        Me.cboAbfArt.TabIndex = 9
+        '
         'usrctlStatVERIMEX
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -392,4 +415,6 @@ Partial Class usrctlStatVERIMEX
     Friend WithEvents datAbfStatVon As DateTimePicker
     Friend WithEvents btnAbfBericht As Button
     Friend WithEvents btnAbfExcel As Button
+    Friend WithEvents cboAbfArt As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label7 As Label
 End Class

Aviso/Auswertung/usrctlStatVERIMEX.vb

@@ -45,12 +45,15 @@ Public Class usrctlStatVERIMEX
                 innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
         End Select
 
+
+
         With dgvAbfertigungTR
             Dim sqlstr = "SELECT  mit_vname + ' ' + mit_nname as Mitarbeiter ,sum(tblSnd_AbfertigungTRAnzahl) as Versandscheine ,sum(tblSnd_AbfertigungTRAnzahlPos) as Positionen ,count(distinct(avisoid)) as LKW
                   FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
                   " & innerJoinFiliale & "
                   where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "'  and tblSnd_AbfertigungTR_MA is not null 
                   " & whereFiliale & "
+                  " & If(cboAbfArt._value <> "", " AND tblSnd_Abfertigungsart_ID IN(" & cboAbfArt._value & ")", "") & "
                   group by mit_vname,mit_nname"
             'früher: Datum statt tblSnd_AbfertigungTR
             '           MsgBox(sqlstr)
@@ -138,6 +141,12 @@ Public Class usrctlStatVERIMEX
         cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*Nicht zugeordnet", "0"))
         cboFirma.changeItem("")
 
+        cboAbfArt.Items.Clear()
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "'5','18','32'"))
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T2", "'6','33','34','37','40','42'"))
+
+
         cboAbfFirma.Items.Clear()
         cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
         cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))

Aviso/Aviso.vbproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props" Condition="Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" />
   <Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" />
@@ -148,8 +148,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="BouncyCastle.Cryptography">
-      <HintPath>F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll</HintPath>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
@@ -201,32 +201,44 @@
     <Reference Include="Gemeinsames">
       <HintPath>..\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath>
     </Reference>
-    <Reference Include="itext.barcodes, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll</HintPath>
+    <Reference Include="itext.barcodes, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.barcodes.dll</HintPath>
     </Reference>
-    <Reference Include="itext.forms, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.forms.dll</HintPath>
+    <Reference Include="itext.bouncy-castle-adapter, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.bouncy-castle-adapter.9.6.0\lib\net461\itext.bouncy-castle-adapter.dll</HintPath>
     </Reference>
-    <Reference Include="itext.io, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.io.dll</HintPath>
+    <Reference Include="itext.bouncy-castle-connector, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath>
     </Reference>
-    <Reference Include="itext.kernel, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.kernel.dll</HintPath>
+    <Reference Include="itext.commons, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.commons.9.6.0\lib\net461\itext.commons.dll</HintPath>
     </Reference>
-    <Reference Include="itext.layout, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.layout.dll</HintPath>
+    <Reference Include="itext.forms, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.forms.dll</HintPath>
     </Reference>
-    <Reference Include="itext.pdfa, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.pdfa.dll</HintPath>
+    <Reference Include="itext.io, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.io.dll</HintPath>
     </Reference>
-    <Reference Include="itext.sign, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.sign.dll</HintPath>
+    <Reference Include="itext.kernel, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.kernel.dll</HintPath>
     </Reference>
-    <Reference Include="itext.styledxmlparser, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.styledxmlparser.dll</HintPath>
+    <Reference Include="itext.layout, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.layout.dll</HintPath>
     </Reference>
-    <Reference Include="itext.svg, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.svg.dll</HintPath>
+    <Reference Include="itext.pdfa, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfa.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.pdfua, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfua.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.sign, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.sign.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.styledxmlparser, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.styledxmlparser.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.svg, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.svg.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -397,8 +409,8 @@
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Configuration">
@@ -407,15 +419,27 @@
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Hosting">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Hosting.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
@@ -455,6 +479,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
@@ -501,6 +528,9 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -524,13 +554,19 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Xml, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Xml.6.0.2\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
@@ -767,6 +803,12 @@
     <Compile Include="frmAddSendungsvermerkShort.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.Designer.vb">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmAnkunftAendern.Designer.vb">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </Compile>
@@ -1152,6 +1194,12 @@
     <Compile Include="frmWarenbezeichnungBegriffeEdit.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmReferenzenSicherheiten.Designer.vb">
+      <DependentUpon>frmReferenzenSicherheiten.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmReferenzenSicherheiten.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmWarenorte.Designer.vb">
       <DependentUpon>frmWarenorte.vb</DependentUpon>
     </Compile>
@@ -1431,6 +1479,9 @@
     <EmbeddedResource Include="frmAddSendungsvermerkShort.resx">
       <DependentUpon>frmAddSendungsvermerkShort.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmSendungsDokumentanforderung.resx">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAnkunftAendern.resx">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </EmbeddedResource>
@@ -1539,6 +1590,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmLogin.resx">
       <DependentUpon>frmLogin.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAuswahl_Aviso.resx">
       <DependentUpon>frmAuswahl_Aviso.vb</DependentUpon>
@@ -1627,6 +1679,9 @@
     <EmbeddedResource Include="frmWarenbezeichnungBegriffeEdit.resx">
       <DependentUpon>frmWarenbezeichnungBegriffeEdit.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmReferenzenSicherheiten.resx">
+      <DependentUpon>frmReferenzenSicherheiten.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmWarenorte.resx">
       <DependentUpon>frmWarenorte.vb</DependentUpon>
     </EmbeddedResource>

Aviso/AvisoStatusFunctions.vb

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

Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb

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

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmAddSendungsvermerkShort.Designer.vb

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

Aviso/frmAddSendungsvermerkShort.vb

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

Aviso/frmGesamtsicherheiten.vb

@@ -5,7 +5,7 @@ Public Class frmGesamtsicherheiten
 
     Public Property gessicherheitID As Integer
     Public Property datum As DateTime = Nothing
-    Property GesSichRef As cGesamtSicherheitsReferenz
+    Property GesSichRef As VERAG_PROG_ALLGEMEIN.cAufschubKonten
     Property Standort As String = ""
 
     Public ZollsatzMulti As Double = 0
@@ -53,7 +53,7 @@ Public Class frmGesamtsicherheiten
             LoadDGV()
         End If
         LoadStandort()
-        cboATR.Enabled = GesSichRef.gsr_ATR
+        cboATR.Enabled = GesSichRef.brgakto_gs_ATR
 
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitCRN)
@@ -62,11 +62,11 @@ Public Class frmGesamtsicherheiten
 
     Public Sub LoadDGV()
         'lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString("N")
-        lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString()
+        lblSaldo.Text = "Saldo: € " & GesSichRef.brgakto_gs_aktSaldo.ToString()
         lblGestellungNr.Text = ""
         Dim sqladd1 As String = ""
-        If GesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & GesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust"
-        If GesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]"
+        If GesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & GesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
+        If GesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
 
 
         Dim addtosqlstring As String = ""
@@ -102,7 +102,7 @@ Public Class frmGesamtsicherheiten
                 .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").Visible = False
-                Select Case GesSichRef.gsr_ATR
+                Select Case GesSichRef.brgakto_gs_ATR
                     Case True
                         .Columns("gs_ATBNr").HeaderText = "ATB"
                         .Columns("gs_atr").HeaderText = "ATR"
@@ -134,7 +134,7 @@ Public Class frmGesamtsicherheiten
                 .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").Visible = False
-                Select Case GesSichRef.gsr_ATR
+                Select Case GesSichRef.brgakto_gs_ATR
                     Case True
                         .Columns("gs_ATBNr").HeaderText = "ATC / MRN"
                     Case Else
@@ -163,9 +163,9 @@ Public Class frmGesamtsicherheiten
         'Referenzwert = dt.Rows(0).Item("Referenzwert")
 
         'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N")
-        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString()
-        lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%"
-        ZollsatzMulti = GesSichRef.gsr_zollsatz / 100
+        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.getReferenzbetrag(Now()).ToString()
+        lblZollsatz.Text = "Zollsatz: " & GesSichRef.brgakto_gs_zollsatz & "%"
+        ZollsatzMulti = GesSichRef.brgakto_gs_zollsatz / 100
     End Sub
 
 
@@ -188,7 +188,7 @@ Public Class frmGesamtsicherheiten
             Select Case sender.name
                 Case "txtMRNWarenwert"
                     txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N")
-                    If GesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.gsr_ust / 100)
+                    If GesSichRef.brgakto_gs_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.brgakto_gs_ust / 100)
                 Case "txtCRNWarenwert"
                     txtCRNSicherheitsbetrag.Text = (txtCRNWarenwert.Text * ZollsatzMulti).ToString("N")
             End Select
@@ -266,7 +266,7 @@ Public Class frmGesamtsicherheiten
                         .gs_gsNr = Me.gessicherheitID
                         .gs_erstellungsdatum = Me.datum
                         .gs_freitext = Me.txtFreitextOpen.Text
-                        .gs_saldo = GesSichRef.gsr_Saldo
+                        .gs_saldo = GesSichRef.brgakto_gs_aktSaldo
                         .gs_atr = setNullToZero(cboATR.SelectedItem)
                         setEnviromentDataToObject(OPENWithMultiplePosNr, Me)
                     End With
@@ -305,7 +305,7 @@ Public Class frmGesamtsicherheiten
                     .gs_gsNr = Me.gessicherheitID
                     .gs_erstellungsdatum = Me.datum
                     .gs_freitext = Me.txtFreitextOpen.Text
-                    .gs_saldo = GesSichRef.gsr_Saldo
+                    .gs_saldo = GesSichRef.brgakto_gs_aktSaldo
                     .gs_atr = setNullToZero(cboATR.SelectedItem)
                     setEnviromentDataToObject(OPEN, Me)
                 End With
@@ -343,7 +343,7 @@ Public Class frmGesamtsicherheiten
                 .gs_gsNr = Me.gessicherheitID
                 .gs_erstellungsdatum = Me.datum
                 .gs_freitext = Me.txtFreitextClose.Text
-                .gs_saldo = GesSichRef.gsr_Saldo
+                .gs_saldo = GesSichRef.brgakto_gs_aktSaldo
             End With
 
             If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr()

Aviso/frmGesamtsicherheitenMenu.vb

@@ -9,7 +9,7 @@ Public Class frmGesamtsicherheitenMenu
     ' Public Saldo As Integer = 0
     Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
     'Dim GesSichRef As New cGesamtSicherheitsReferenz
-    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz
+    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cAufschubKonten
 
     'Public ATR As Boolean = False
     Public Property Standort As String = ""
@@ -18,7 +18,7 @@ Public Class frmGesamtsicherheitenMenu
         cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
         Me.Text = "Gesamtsicherheiten " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvListe)
-        GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
+        GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
         'GesSichRef.LOAD("standort", Standort)
         lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
 
@@ -100,8 +100,8 @@ Public Class frmGesamtsicherheitenMenu
 
     Public Sub ShowStandort()
         'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N")
-        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString()
-        lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%"
+        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.getReferenzbetrag(Now()).ToString()
+        lblZollsatz.Text = "Zollsatz: " & GesSichRef.brgakto_gs_zollsatz & "%"
         lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
     End Sub
 

Aviso/frmGesamtsicherheitenMenuNEU.vb

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

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -22,13 +22,14 @@ Partial Class frmGesamtsicherheitenNEU
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MRNNRÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -65,9 +66,9 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label16 = New System.Windows.Forms.Label()
         Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip()
+        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlSummeGes = New System.Windows.Forms.Panel()
         Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()

Aviso/frmGesamtsicherheitenNEU.vb

@@ -100,9 +100,17 @@ 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
 
-        btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
-
+        End Select
 
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
@@ -357,9 +365,9 @@ Public Class frmGesamtsicherheitenNEU
 
 
                             indexOflastEntry = dtSicherheiten.Rows.IndexOf(r)
-                                endSaldo = r.Item("Saldo")
+                            endSaldo = r.Item("Saldo")
 
-                            End If
+                        End If
 
 
                     End If
@@ -1368,7 +1376,7 @@ Public Class frmGesamtsicherheitenNEU
             '    Return False
             'End If
 
-            If (offenerSicherheitsbetrag <0 Or offenerSicherheitsbetrag <offenerSicherheitsbetragPos) Then
+            If (offenerSicherheitsbetrag < 0 Or offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then
                 If vbYes = MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!" & vbCrLf & "Trotzdem speichen?", vbYesNo) Then
                     Return True
                 Else

Aviso/frmHauptfenster.Designer.vb

@@ -22,19 +22,20 @@ Partial Class frmHauptfenster
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle36 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.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.conFertig = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@@ -80,6 +81,7 @@ Partial Class frmHauptfenster
         Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PrüfeBilderAufBase64ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -97,6 +99,7 @@ Partial Class frmHauptfenster
         Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DTBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.KLIPPHAUSENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EnglishToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -131,6 +134,7 @@ Partial Class frmHauptfenster
         Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DEAmbarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ATAtillaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ReferenzwerteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
         Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
@@ -281,7 +285,7 @@ Partial Class frmHauptfenster
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.Timer1 = New System.Windows.Forms.Timer()
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.btnWichtige = New System.Windows.Forms.Button()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
         Me.btnMinimieren = New System.Windows.Forms.Button()
@@ -296,7 +300,7 @@ Partial Class frmHauptfenster
         Me.Label20 = New System.Windows.Forms.Label()
         Me.pnlLinksOben = New System.Windows.Forms.Panel()
         Me.Button9 = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.btnE_Aviso = New System.Windows.Forms.Button()
@@ -308,7 +312,7 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel6 = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.cbx_My_CBAM = New System.Windows.Forms.CheckBox()
@@ -323,7 +327,7 @@ Partial Class frmHauptfenster
         Me.lblMySND_Anzeige = New System.Windows.Forms.Label()
         Me.lblAkte = New System.Windows.Forms.Label()
         Me.btnClose = New System.Windows.Forms.Button()
-        Me.TimerAkte = New System.Windows.Forms.Timer()
+        Me.TimerAkte = New System.Windows.Forms.Timer(Me.components)
         Me.tabVorgeschrieben = New System.Windows.Forms.TabPage()
         Me.tabFreigegeben = New System.Windows.Forms.TabPage()
         Me.tabNichtEingetroffen = New System.Windows.Forms.TabPage()
@@ -340,7 +344,7 @@ Partial Class frmHauptfenster
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlDetailsLinks = New System.Windows.Forms.Panel()
         Me.splitMain = New System.Windows.Forms.SplitContainer()
-        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.tbcntrAvisoSND = New System.Windows.Forms.TabControl()
@@ -387,16 +391,16 @@ Partial Class frmHauptfenster
         Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
         Me.cbxAlle = New System.Windows.Forms.CheckBox()
         Me.btnSmall = New System.Windows.Forms.Button()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip()
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
-        Me.timerStandzeit = New System.Windows.Forms.Timer()
-        Me.TimerUPDATE = New System.Windows.Forms.Timer()
+        Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.btnKasse_User = New System.Windows.Forms.Button()
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -405,23 +409,25 @@ Partial Class frmHauptfenster
         Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
         Me.ColorDialog = New System.Windows.Forms.ColorDialog()
-        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip()
+        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
         Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.PrüfeBilderAufBase64ToolStripMenuItem = 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.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -769,6 +775,12 @@ Partial Class frmHauptfenster
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
         '
+        'PrüfeBilderAufBase64ToolStripMenuItem
+        '
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Name = "PrüfeBilderAufBase64ToolStripMenuItem"
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
+        '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -825,7 +837,7 @@ Partial Class frmHauptfenster
         '
         'StandortWechselnToolStripMenuItem
         '
-        Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem})
+        Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem, Me.KLIPPHAUSENToolStripMenuItem})
         Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem"
         Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
         Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln"
@@ -834,46 +846,52 @@ Partial Class frmHauptfenster
         'SUBToolStripMenuItem
         '
         Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem"
-        Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.SUBToolStripMenuItem.Text = "SUB"
         '
         'SBGToolStripMenuItem
         '
         Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem"
-        Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.SBGToolStripMenuItem.Text = "SBG"
         '
         'WAIToolStripMenuItem
         '
         Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem"
-        Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.WAIToolStripMenuItem.Text = "WAI"
         '
         'NKDToolStripMenuItem
         '
         Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem"
-        Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.NKDToolStripMenuItem.Text = "NKD"
         '
         'NEUToolStripMenuItem
         '
         Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem"
-        Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.NEUToolStripMenuItem.Text = "NEU"
         '
         'AMBToolStripMenuItem
         '
         Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem"
-        Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.AMBToolStripMenuItem.Text = "AMB"
         Me.AMBToolStripMenuItem.Visible = False
         '
         'DTBToolStripMenuItem
         '
         Me.DTBToolStripMenuItem.Name = "DTBToolStripMenuItem"
-        Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.DTBToolStripMenuItem.Text = "DTB"
         '
+        'KLIPPHAUSENToolStripMenuItem
+        '
+        Me.KLIPPHAUSENToolStripMenuItem.Name = "KLIPPHAUSENToolStripMenuItem"
+        Me.KLIPPHAUSENToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
+        Me.KLIPPHAUSENToolStripMenuItem.Text = "KLIPPHAUSEN"
+        '
         'SpracheWechselnToolStripMenuItem
         '
         Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.EnglishToolStripMenuItem, Me.TürkischToolStripMenuItem})
@@ -1042,7 +1060,7 @@ Partial Class frmHauptfenster
         '
         '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.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.Name = "GesamtsicherheitenToolStripMenuItem"
         Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
@@ -1091,6 +1109,12 @@ Partial Class frmHauptfenster
         Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
         Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
         '
+        'ReferenzwerteToolStripMenuItem
+        '
+        Me.ReferenzwerteToolStripMenuItem.Name = "ReferenzwerteToolStripMenuItem"
+        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ReferenzwerteToolStripMenuItem.Text = "Referenzwerte"
+        '
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
@@ -1279,7 +1303,7 @@ Partial Class frmHauptfenster
         'ToolStripFormulare
         '
         Me.ToolStripFormulare.BackColor = System.Drawing.Color.White
-        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
+        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripMenuItem3, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
         Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black
         Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight
@@ -1293,20 +1317,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(277, 22)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6)
         '
         'MailvorlagenToolStripMenuItem
         '
         Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift
         Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem"
-        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
         Me.MailvorlagenToolStripMenuItem.Visible = False
         '
@@ -1314,7 +1338,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(277, 22)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem2.Text = "Vollmachten"
         '
         'toolStrVM_de
@@ -1350,38 +1374,38 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem12.Text = "Importaviso"
         '
         'ToolStripMenuItem15
         '
         Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem15.Text = "Dispoliste"
         '
         'ToolStripMenuItem18
         '
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem18.Text = "Verzollungspreise"
         '
         'AuftragÜberwachungsdokumentToolStripMenuItem
         '
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument"
         '
         'toolVUB
         '
         Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem})
         Me.toolVUB.Name = "toolVUB"
-        Me.toolVUB.Size = New System.Drawing.Size(277, 22)
+        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
         Me.toolVUB.Text = "VUB"
         '
         'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1399,37 +1423,37 @@ Partial Class frmHauptfenster
         'toolVPCreditreform
         '
         Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
         Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
         Me.toolVPCreditreform.Visible = False
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
         '
         'VerzollungsunterlagenToolStripMenuItem
         '
         Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
         'ToolStripMenuItem11
         '
         Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6)
         '
         'WAIDHAUSToolStripMenuItem
         '
         Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem})
         Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem"
-        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
         '
         'ToolStripMenuItem8
@@ -1465,36 +1489,36 @@ Partial Class frmHauptfenster
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
         '
         'EinheitspapierToolStripMenuItem
         '
         Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
         '
         'CMRToolStripMenuItem
         '
         Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CMRToolStripMenuItem.Text = "CMR"
         '
         'Einheitspapier0735VersandverfahrenToolStripMenuItem
         '
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
         '
         'CarnetTIRToolStripMenuItem
         '
         Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
         '
         'CarnetTIRALTToolStripMenuItem
         '
         Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
         '
         'mnuFragezeichen
@@ -2699,38 +2723,38 @@ Partial Class frmHauptfenster
         Me.gridMyAviso.AllowUserToDeleteRows = False
         Me.gridMyAviso.AllowUserToOrderColumns = True
         Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle28.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28
         Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle29
         Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle30.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))
+        DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle30
         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
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle31.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))
+        DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle31
         Me.gridMyAviso.RowHeadersVisible = False
         Me.gridMyAviso.RowHeadersWidth = 62
         Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
@@ -3157,47 +3181,47 @@ Partial Class frmHauptfenster
         Me.gridAviso.AllowUserToAddRows = False
         Me.gridAviso.AllowUserToDeleteRows = False
         Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle32.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
         Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
         Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle33.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))
+        DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle33
         Me.gridAviso.ColumnHeadersHeight = 25
         Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle34.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))
+        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle34
         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
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle35.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))
+        DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle35
         Me.gridAviso.RowHeadersVisible = False
         Me.gridAviso.RowHeadersWidth = 62
         Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle36
         Me.gridAviso.RowTemplate.ReadOnly = True
         Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
         Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -4048,11 +4072,24 @@ Partial Class frmHauptfenster
         Me.Panel7.Size = New System.Drawing.Size(252, 51)
         Me.Panel7.TabIndex = 4
         '
-        'PrüfeBilderAufBase64ToolStripMenuItem
+        'ToolStripMenuItem3
         '
-        Me.PrüfeBilderAufBase64ToolStripMenuItem.Name = "PrüfeBilderAufBase64ToolStripMenuItem"
-        Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
-        Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
+        Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25})
+        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30)
+        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
         '
@@ -4517,4 +4554,9 @@ Partial Class frmHauptfenster
     Friend WithEvents ServicesToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents cbx_My_CBAM As CheckBox
     Friend WithEvents PrüfeBilderAufBase64ToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ReferenzwerteToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents KLIPPHAUSENToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.resx

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

Aviso/frmHauptfenster.vb

@@ -207,12 +207,12 @@ Public Class frmHauptfenster
 
         If message.StartsWith("OpenKd_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        FUNC.showKd(split(1), True)
                    End Sub)
         ElseIf message.StartsWith("OpenAvisoSnd_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
                            Dim frmSendungsdetails As New frmSendungsdetailsNEU(split(1), -1)
                            frmSendungsdetails.ShowDialog(Me)
@@ -221,7 +221,7 @@ Public Class frmHauptfenster
 
         ElseIf message.StartsWith("OpenAviso_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
 
                            If IsNumeric(split(1)) AndAlso split(1) > 0 Then
@@ -613,7 +613,7 @@ Public Class frmHauptfenster
         'zuerst noch prüfen, ob unerledigte Aviso auf nicht eingetroffen gesetzt werden können
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then
             'Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & "  And dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE() and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI')  "
-            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-21)) & " AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI') and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  and ((Transportmittelart = 'CONTAINER' and dateadd(DAY,20,VoraussichtlichesEintreffen) < GETDATE()) or (Transportmittelart <> 'CONTAINER' and dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE()))"
+            Dim hSQL As String = "Select * FROM Aviso WHERE Status In (0,4,5) And Datum < " & SQLDatum(Now.AddDays(-28)) & " AND Grenzstelle IN ('AMB','NKD','SBG','SUB','WAI') and  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  and ((Transportmittelart = 'CONTAINER' and dateadd(DAY,20,VoraussichtlichesEintreffen) < GETDATE()) or (Transportmittelart <> 'CONTAINER' and dateadd(DAY,10,VoraussichtlichesEintreffen) < GETDATE()))"
             'dateadd(DAY,10,VoraussichtlichesEintreffen)  --> Voraussichtliches Eintreffen muss zudem um 10 Tage überschritten sein --> Container/Hafen haben lange Vorlaufzeiten
             Dim anz As Integer = AvisoDAL.Check_Nicht_eingetroffen(hSQL)
             If anz > 0 Then
@@ -1513,7 +1513,14 @@ ELSE_ATILLA:
                     sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
                 Else
                     sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
+                 '   MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                    'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
+                    '    '+AMBAR
+                    '    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR (tblSendungen.FilialenNr  IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66))  ) "
 
+                    'Else
+                    '    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  ) "
+                    'End If
                 End If
 
             Else
@@ -2305,7 +2312,7 @@ ELSE_ATILLA:
                     Dim t As String = txtSuche.Text
                     '    t = t.Replace("/V003/", "")
                     t = t.Replace("/", "")
-                    Dim v() = t.split("-")
+                    Dim v() = t.Split("-")
                     'Dim o As New cOptionenDAL
                     If v.Length > 1 Then
 
@@ -3196,6 +3203,7 @@ ELSE_ATILLA:
         DEAmbarToolStripMenuItem.Visible = False
         ATUnispedGmbHToolStripMenuItem.Visible = False
         ATAtillaToolStripMenuItem.Visible = False
+        ReferenzwerteToolStripMenuItem.Visible = False
 
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
@@ -3226,6 +3234,7 @@ ELSE_ATILLA:
             DEVeragGmbHToolStripMenuItem.Visible = True
             ATVeragAGToolStripMenuItem.Visible = True
             ATImexCSToolStripMenuItem.Visible = True
+            ReferenzwerteToolStripMenuItem.Visible = True
 
         End If
 
@@ -5418,7 +5427,6 @@ ELSE_ATILLA:
 
         'MsgBox(IIf(VERAG_PROG_ALLGEMEIN.cProgramFunctions.IsBase64(testBase64), "true", "false"))
 
-
         Dim errors = VERAG_PROG_ALLGEMEIN.cProgramFunctions.CheckAllReportImages()
 
         If errors.Count > 0 Then
@@ -5430,5 +5438,33 @@ ELSE_ATILLA:
 
 
 
+    End Sub
+
+    Private Sub ReferenzwerteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzwerteToolStripMenuItem.Click
+        Dim writepermissions As Boolean
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then writepermissions = True
+
+        Dim f As New frmReferenzenSicherheiten(writepermissions)
+        f.ShowDialog(Me)
+    End Sub
+
+    Private Sub KLIPPHAUSENToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KLIPPHAUSENToolStripMenuItem.Click
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "KLIPP"
+            VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = "KLIPP" 'Nochmal, sonst wird es durch MA geändert 
+            showMeNew()
+        Else
+            MsgBox("Keine Berechtigung!")
+        End If
+    End Sub
+
+    Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
+
+    Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU")
+        DS.OPEN_SINGLE_ORIG()
     End Sub
 End Class

Aviso/frmHauptfensterNew.Designer.vb

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

Aviso/frmHauptfensterNew.vb

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

Aviso/frmLaufzettel.vb

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

Aviso/frmReferenzenSicherheiten.Designer.vb

@@ -0,0 +1,341 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmReferenzenSicherheiten
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmReferenzenSicherheiten))
+        Me.pnlTop = New System.Windows.Forms.Panel()
+        Me.lblWarning = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnAdd = New System.Windows.Forms.Button()
+        Me.btnDelete = New System.Windows.Forms.Button()
+        Me.txtStandort = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtReferenzwert = New System.Windows.Forms.TextBox()
+        Me.txtUst = New System.Windows.Forms.TextBox()
+        Me.cbxATR = New System.Windows.Forms.CheckBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.txtSaldo = New System.Windows.Forms.TextBox()
+        Me.mainPanel = New System.Windows.Forms.Panel()
+        Me.txtZollsatz = New System.Windows.Forms.TextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.dgvWarenorteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.cbxUst = New System.Windows.Forms.CheckBox()
+        Me.pnlTop.SuspendLayout()
+        Me.mainPanel.SuspendLayout()
+        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'pnlTop
+        '
+        Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.pnlTop.Controls.Add(Me.lblWarning)
+        Me.pnlTop.Controls.Add(Me.Label4)
+        Me.pnlTop.Controls.Add(Me.Label3)
+        Me.pnlTop.Controls.Add(Me.cbxFirma)
+        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
+        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
+        Me.pnlTop.Name = "pnlTop"
+        Me.pnlTop.Size = New System.Drawing.Size(726, 48)
+        Me.pnlTop.TabIndex = 2
+        '
+        'lblWarning
+        '
+        Me.lblWarning.AutoSize = True
+        Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarning.ForeColor = System.Drawing.Color.Red
+        Me.lblWarning.Location = New System.Drawing.Point(166, 13)
+        Me.lblWarning.Name = "lblWarning"
+        Me.lblWarning.Size = New System.Drawing.Size(0, 13)
+        Me.lblWarning.TabIndex = 14
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.ForeColor = System.Drawing.Color.White
+        Me.Label4.Location = New System.Drawing.Point(10, 13)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(166, 26)
+        Me.Label4.TabIndex = 0
+        Me.Label4.Text = "Referenzwerte"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.ForeColor = System.Drawing.Color.White
+        Me.Label3.Location = New System.Drawing.Point(592, 8)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(32, 13)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Firma"
+        '
+        'cbxFirma
+        '
+        Me.cbxFirma._allowedValuesFreiText = Nothing
+        Me.cbxFirma._allowFreiText = False
+        Me.cbxFirma._value = ""
+        Me.cbxFirma.DropDownWidth = 150
+        Me.cbxFirma.FormattingEnabled = True
+        Me.cbxFirma.Location = New System.Drawing.Point(595, 24)
+        Me.cbxFirma.Name = "cbxFirma"
+        Me.cbxFirma.Size = New System.Drawing.Size(128, 21)
+        Me.cbxFirma.TabIndex = 13
+        '
+        'btnAdd
+        '
+        Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
+        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAdd.Location = New System.Drawing.Point(267, 360)
+        Me.btnAdd.Name = "btnAdd"
+        Me.btnAdd.Size = New System.Drawing.Size(24, 20)
+        Me.btnAdd.TabIndex = 97
+        Me.btnAdd.UseVisualStyleBackColor = True
+        '
+        'btnDelete
+        '
+        Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del
+        Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDelete.Location = New System.Drawing.Point(290, 360)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(24, 20)
+        Me.btnDelete.TabIndex = 96
+        Me.btnDelete.UseVisualStyleBackColor = True
+        '
+        'txtStandort
+        '
+        Me.txtStandort.Location = New System.Drawing.Point(12, 25)
+        Me.txtStandort.Name = "txtStandort"
+        Me.txtStandort.Size = New System.Drawing.Size(126, 20)
+        Me.txtStandort.TabIndex = 0
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(9, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(47, 13)
+        Me.Label1.TabIndex = 1
+        Me.Label1.Text = "Standort"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(152, 9)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(80, 13)
+        Me.Label2.TabIndex = 3
+        Me.Label2.Text = "Referenzbetrag"
+        '
+        'txtReferenzwert
+        '
+        Me.txtReferenzwert.Location = New System.Drawing.Point(155, 25)
+        Me.txtReferenzwert.Name = "txtReferenzwert"
+        Me.txtReferenzwert.Size = New System.Drawing.Size(161, 20)
+        Me.txtReferenzwert.TabIndex = 2
+        '
+        'txtUst
+        '
+        Me.txtUst.Location = New System.Drawing.Point(77, 75)
+        Me.txtUst.Name = "txtUst"
+        Me.txtUst.Size = New System.Drawing.Size(61, 20)
+        Me.txtUst.TabIndex = 5
+        '
+        'cbxATR
+        '
+        Me.cbxATR.AutoSize = True
+        Me.cbxATR.Location = New System.Drawing.Point(346, 9)
+        Me.cbxATR.Name = "cbxATR"
+        Me.cbxATR.Size = New System.Drawing.Size(48, 17)
+        Me.cbxATR.TabIndex = 3
+        Me.cbxATR.Text = "ATR"
+        Me.cbxATR.UseVisualStyleBackColor = True
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Location = New System.Drawing.Point(152, 59)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(77, 13)
+        Me.Label8.TabIndex = 16
+        Me.Label8.Text = "aktueller Saldo"
+        '
+        'txtSaldo
+        '
+        Me.txtSaldo.Location = New System.Drawing.Point(155, 75)
+        Me.txtSaldo.Name = "txtSaldo"
+        Me.txtSaldo.ReadOnly = True
+        Me.txtSaldo.Size = New System.Drawing.Size(161, 20)
+        Me.txtSaldo.TabIndex = 6
+        '
+        'mainPanel
+        '
+        Me.mainPanel.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.mainPanel.Controls.Add(Me.cbxUst)
+        Me.mainPanel.Controls.Add(Me.txtZollsatz)
+        Me.mainPanel.Controls.Add(Me.Label10)
+        Me.mainPanel.Controls.Add(Me.btnSave)
+        Me.mainPanel.Controls.Add(Me.cbxATR)
+        Me.mainPanel.Controls.Add(Me.Label1)
+        Me.mainPanel.Controls.Add(Me.Label8)
+        Me.mainPanel.Controls.Add(Me.txtStandort)
+        Me.mainPanel.Controls.Add(Me.txtSaldo)
+        Me.mainPanel.Controls.Add(Me.txtReferenzwert)
+        Me.mainPanel.Controls.Add(Me.Label2)
+        Me.mainPanel.Controls.Add(Me.txtUst)
+        Me.mainPanel.Location = New System.Drawing.Point(320, 55)
+        Me.mainPanel.Name = "mainPanel"
+        Me.mainPanel.Size = New System.Drawing.Size(406, 125)
+        Me.mainPanel.TabIndex = 17
+        '
+        'txtZollsatz
+        '
+        Me.txtZollsatz.Location = New System.Drawing.Point(12, 75)
+        Me.txtZollsatz.Name = "txtZollsatz"
+        Me.txtZollsatz.Size = New System.Drawing.Size(44, 20)
+        Me.txtZollsatz.TabIndex = 4
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(9, 59)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(43, 13)
+        Me.Label10.TabIndex = 23
+        Me.Label10.Text = "Zollsatz"
+        '
+        'btnSave
+        '
+        Me.btnSave.Location = New System.Drawing.Point(331, 73)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 10
+        Me.btnSave.Text = "Speichern"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
+        'dgvWarenorteNew
+        '
+        Me.dgvWarenorteNew.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvWarenorteNew.AllowUserToAddRows = False
+        Me.dgvWarenorteNew.AllowUserToDeleteRows = False
+        Me.dgvWarenorteNew.BackgroundColor = System.Drawing.Color.White
+        Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49)
+        Me.dgvWarenorteNew.Name = "dgvWarenorteNew"
+        Me.dgvWarenorteNew.Size = New System.Drawing.Size(314, 331)
+        Me.dgvWarenorteNew.TabIndex = 98
+        '
+        'MyDatagridview1
+        '
+        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
+        Me.MyDatagridview1.AllowUserToAddRows = False
+        Me.MyDatagridview1.AllowUserToDeleteRows = False
+        Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.White
+        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.MyDatagridview1.Location = New System.Drawing.Point(322, 204)
+        Me.MyDatagridview1.Name = "MyDatagridview1"
+        Me.MyDatagridview1.Size = New System.Drawing.Size(401, 176)
+        Me.MyDatagridview1.TabIndex = 99
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(329, 188)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(82, 13)
+        Me.Label6.TabIndex = 24
+        Me.Label6.Text = "Referenzverlauf"
+        '
+        'cbxUst
+        '
+        Me.cbxUst.AutoSize = True
+        Me.cbxUst.Location = New System.Drawing.Point(77, 58)
+        Me.cbxUst.Name = "cbxUst"
+        Me.cbxUst.Size = New System.Drawing.Size(44, 17)
+        Me.cbxUst.TabIndex = 24
+        Me.cbxUst.Text = "USt"
+        Me.cbxUst.UseVisualStyleBackColor = True
+        '
+        'frmReferenzenSicherheiten
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(726, 382)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.MyDatagridview1)
+        Me.Controls.Add(Me.mainPanel)
+        Me.Controls.Add(Me.btnAdd)
+        Me.Controls.Add(Me.btnDelete)
+        Me.Controls.Add(Me.pnlTop)
+        Me.Controls.Add(Me.dgvWarenorteNew)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmReferenzenSicherheiten"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Gesamtsicherheiten-Referenzwerte"
+        Me.pnlTop.ResumeLayout(False)
+        Me.pnlTop.PerformLayout()
+        Me.mainPanel.ResumeLayout(False)
+        Me.mainPanel.PerformLayout()
+        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents pnlTop As Panel
+    Friend WithEvents Label4 As Label
+    Friend WithEvents btnAdd As Button
+    Friend WithEvents btnDelete As Button
+    Friend WithEvents cbxATR As CheckBox
+    Friend WithEvents txtUst As TextBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtReferenzwert As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtStandort As TextBox
+    Friend WithEvents cbxFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label8 As Label
+    Friend WithEvents txtSaldo As TextBox
+    Friend WithEvents mainPanel As Panel
+    Friend WithEvents btnSave As Button
+    Friend WithEvents lblWarning As Label
+    Friend WithEvents dgvWarenorteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents txtZollsatz As TextBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents Label11 As Label
+    Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Label6 As Label
+    Friend WithEvents cbxUst As CheckBox
+End Class

Aviso/frmReferenzenSicherheiten.vb

@@ -0,0 +1,316 @@
+
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmReferenzenSicherheiten
+    'Dim REF As New VERAG_PROG_ALLGEMEIN.cAufschubKonten
+    Dim writepermission As Boolean
+
+    Sub New(writepermission As Boolean)
+        InitializeComponent()
+        Me.writepermission = writepermission
+
+    End Sub
+
+    Private Sub Warenorte_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        If Not writepermission Then
+            btnSave.Enabled = False
+            btnDelete.Enabled = False
+            btnAdd.Enabled = False
+
+            For Each c As Control In mainPanel.Controls
+                If TypeOf c Is MyTextBox Then
+                    Dim mytxtb As MyTextBox = c
+                    mytxtb.ReadOnly = True
+                ElseIf TypeOf c Is TextBox Then
+                    Dim txtb As TextBox = c
+                    txtb.ReadOnly = True
+                ElseIf TypeOf c Is CheckBox Then
+                    Dim cbx As CheckBox = c
+                    cbx.Enabled = False
+                ElseIf TypeOf c Is MyComboBox Then
+                    Dim mycbx As MyComboBox = c
+                    mycbx.Enabled = False
+                ElseIf TypeOf c Is GroupBox Then
+                    Dim gb As GroupBox = c
+                    gb.Enabled = False
+                End If
+
+            Next
+        End If
+
+        initDGVWarenort()
+        cbxFirma.fillWithSQL("SELECT [Firma_id],[Firma_Bez]  FROM  [tblFirma] ", False, "FMZOLL", True)
+
+    End Sub
+
+
+    Private Sub initDGVWarenort(Optional firma As Integer = 0)
+
+        lblWarning.Text = ""
+
+        Dim SQLString As String = "SELECT [brgakto_id],[brgakto_betrag],[brgakto_gs_standort],[brgakto_gs_zollsatz],[brgakto_gs_aktSaldo],[brgakto_gs_ustEnabled],[brgakto_gs_ust],[brgakto_gs_ATR],[brgakto_firmaID] FROM [tblBrgAufschubKonten] WHERE brgakto_gs_standort is not null"
+        Dim SQLWHere = ""
+        If firma <> 0 Then
+            SQLWHere = "  AND brgakto_firmaID = " & firma
+        End If
+
+
+        dgvWarenorteNew.SET_SQL(SQLString & SQLWHere, "ADMIN", ,)
+        dgvWarenorteNew.LOAD()
+
+
+        If dgvWarenorteNew.Columns.Count < 1 Then Exit Sub
+
+        With dgvWarenorteNew
+            If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+            .MultiSelect = False
+            .RowHeadersVisible = False
+            .ReadOnly = True
+            .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+            .Columns("brgakto_id").Visible = False
+            .Columns("brgakto_gs_standort").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("brgakto_gs_standort").HeaderText = "Standort"
+            .Columns("brgakto_betrag").Visible = False
+            .Columns("brgakto_gs_aktSaldo").Visible = False
+            .Columns("brgakto_gs_ustEnabled").Visible = False
+            .Columns("brgakto_gs_zollsatz").Visible = False
+            .Columns("brgakto_gs_ust").Visible = False
+            .Columns("brgakto_gs_ATR").Visible = False
+            .Columns("brgakto_firmaID").HeaderText = "Firma"
+            .Columns("brgakto_firmaID").Width = 150
+        End With
+
+        For Each row As DataGridViewRow In dgvWarenorteNew.Rows
+
+
+            If row.Cells("brgakto_firmaID").Value IsNot DBNull.Value AndAlso row.Cells("brgakto_firmaID").Value <> 0 Then
+                If CInt(row.Cells("brgakto_firmaID").Value) > 0 Then
+
+                    Dim tmpFirma = New VERAG_PROG_ALLGEMEIN.cFirmen(row.Cells("brgakto_firmaID").Value)
+                    'row.Cells("brgakto_firmaID").Value = tmpFirma.Firma_Bez.ToString
+                End If
+            End If
+
+        Next
+
+
+        initdgvDetails()
+
+
+
+
+
+
+
+
+
+
+    End Sub
+
+    Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
+
+        If checkIfFirmaIsFilled(True) = False Then Exit Sub
+
+        Dim input = InputBox("Bitte geben Sie die Bezeichnung des neuen Referenz ein:", "Referenz anlegen")
+        If input <> "" Then
+            If checkNameIsValid(input) Then
+                Dim REF As New VERAG_PROG_ALLGEMEIN.cAufschubKonten(input, CInt(cbxFirma._value))
+                REF.brgakto_gs_ust = 0
+                REF.brgakto_betrag = 0
+                REF.brgakto_gs_ustEnabled = False
+                REF.brgakto_gs_zollsatz = 0
+                REF.brgakto_gs_ATR = False
+
+                If REF.SAVE() Then
+                    initDGVWarenort(cbxFirma._value)
+                End If
+
+            Else
+                MsgBox("Es existiert bereits eine Referenz " & input & " für die Firma " & cbxFirma._value)
+            End If
+
+        Else
+            MsgBox("Keine Bezeichnung angegeben!")
+        End If
+    End Sub
+
+    Private Sub initdgvDetails()
+
+        If dgvWarenorteNew.Rows.Count = 1 OrElse dgvWarenorteNew.SelectedRows.Count = 1 Then
+
+            Dim gsid As Integer = 0
+
+            If dgvWarenorteNew.Rows.Count = 1 Then
+                gsid = dgvWarenorteNew.Rows(0).Cells.Item("brgakto_id").Value
+
+            ElseIf dgvWarenorteNew.SelectedRows.Count = 1 Then
+                gsid = dgvWarenorteNew.SelectedRows(0).Cells.Item("brgakto_id").Value
+            End If
+
+            If gsid > 0 Then
+
+                Dim SQLStringREF As String = "SELECT  [brgarefb_gsid],[brgarefb_refbetrag],[brgarefb_gueltig_ab],[brgarefb_gueltig_bis],[brgarefb_gs_aktiv] FROM [tblBrgAufschubReferenzberaege] WHERE brgarefb_gsid = " & gsid & " order by brgarefb_gueltig_ab, brgarefb_gueltig_bis"
+
+                MyDatagridview1.SET_SQL(SQLStringREF, "ADMIN", ,)
+                MyDatagridview1.LOAD()
+
+                With MyDatagridview1
+                    If .RowCount = 0 Then Exit Sub
+
+                    .ReadOnly = True
+                    .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+                    .Columns("brgarefb_gsid").Visible = False
+                    .Columns("brgarefb_refbetrag").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                    .Columns("brgarefb_refbetrag").HeaderText = "Ref-Betrag"
+                    .Columns("brgarefb_gs_aktiv").Visible = False
+                    .Columns("brgarefb_gueltig_ab").HeaderText = "Gültig ab"
+                    .Columns("brgarefb_gueltig_ab").Width = 75
+                    .Columns("brgarefb_gueltig_bis").HeaderText = "Gültig bis"
+                    .Columns("brgarefb_gueltig_bis").Width = 75
+
+                End With
+
+            End If
+        End If
+
+    End Sub
+
+    'Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+    '    If dgvWarenorteNew.SelectedRows.Count > 0 Then
+
+    '        Dim Warenort As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)
+
+    '        If vbYes = MsgBox("Möchten Sie diesen Warenort " & Warenort.wo_warenort & " in " & Warenort.wo_firma & " wirklich löschen?", vbYesNo) Then
+    '            Warenort.deleteWarenort(Warenort.wo_id)
+    '            initDGVWarenort(cbxFirma._value)
+    '        End If
+
+    '    End If
+
+    'End Sub
+
+    Private Function checkNameIsValid(name As String) As Boolean
+
+        If dgvWarenorteNew.Rows.Count = 0 Then Return True
+        If checkIfFirmaIsFilled(False) = False Then Return False
+
+
+        For Each row As DataGridViewRow In dgvWarenorteNew.Rows
+            If Not IsDBNull(row.Cells("brgakto_gs_standort").Value) AndAlso Not IsDBNull(row.Cells("brgakto_firmaID").Value) Then
+                If row.Cells("brgakto_gs_standort").Value.ToLower = name.ToLower AndAlso row.Cells("brgakto_firmaID").Value = cbxFirma._value Then
+                    Return False
+                End If
+            End If
+
+        Next
+
+        Return True
+
+    End Function
+
+
+    Private Sub dgvWarenorteNew_SelectionChanged(sender As Object, e As EventArgs) Handles dgvWarenorteNew.SelectionChanged
+
+        If dgvWarenorteNew.SelectedRows.Count < 1 Then
+            mainPanel.Enabled = False
+            Exit Sub
+        Else
+            mainPanel.Enabled = True
+
+        End If
+
+        Dim REF = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(CInt(dgvWarenorteNew.SelectedRows(0).Cells("brgakto_id").Value))
+
+        txtStandort.Text = REF.brgakto_gs_standort
+        txtReferenzwert.Text = REF.getReferenzbetrag(Now())
+        cbxATR.Checked = REF.brgakto_gs_ATR
+        txtUst.Text = REF.brgakto_gs_ust
+        cbxUst.Checked = REF.brgakto_gs_ustEnabled
+        txtSaldo.Text = REF.brgakto_gs_aktSaldo
+        txtZollsatz.Text = REF.brgakto_gs_zollsatz
+
+
+        initdgvDetails()
+
+
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+
+        checkIfFirmaIsFilled(False)
+
+        Dim REF_NEW As New VERAG_PROG_ALLGEMEIN.cAufschubKonten(CInt(dgvWarenorteNew.SelectedRows(0).Cells("brgakto_id").Value))
+
+        If checkFields() = False Then Exit Sub
+
+        REF_NEW.brgakto_gs_standort = txtStandort.Text
+        REF_NEW.brgakto_betrag = txtReferenzwert.Text
+        REF_NEW.brgakto_gs_ATR = cbxATR.Checked
+        REF_NEW.brgakto_gs_ustEnabled = cbxUst.Checked
+        REF_NEW.brgakto_gs_ust = txtUst.Text
+        REF_NEW.brgakto_gs_zollsatz = txtZollsatz.Text
+        REF_NEW.SAVE()
+
+        dgvWarenorteNew.GetOrder()
+        initDGVWarenort(IIf(cbxFirma._value = "", 0, cbxFirma._value))
+        dgvWarenorteNew.SetOrder()
+
+
+
+
+
+    End Sub
+
+    Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged
+        dgvWarenorteNew.GetOrder()
+        initDGVWarenort(IIf(cbxFirma._value = "", 0, cbxFirma._value))
+        dgvWarenorteNew.SetOrder()
+
+
+    End Sub
+
+    Private Function checkIfFirmaIsFilled(initialSave As Boolean, Optional setWarning As Boolean = True)
+
+
+        Dim firmaLeer As Boolean = String.IsNullOrEmpty(cbxFirma._value)
+
+        Dim gridFirmaLeer As Boolean =
+            dgvWarenorteNew.SelectedRows(0).Cells("brgakto_firmaID").Value Is DBNull.Value OrElse
+            dgvWarenorteNew.SelectedRows(0).Cells("brgakto_firmaID").Value Is Nothing OrElse
+            dgvWarenorteNew.SelectedRows(0).Cells("brgakto_firmaID").Value.ToString() = ""
+
+        If firmaLeer AndAlso (gridFirmaLeer OrElse initialSave) Then
+
+            lblWarning.Text = If(setWarning, "Bitte Firma auswählen!", "")
+            Return False
+
+        End If
+
+        lblWarning.Text = ""
+        Return True
+    End Function
+
+    Private Function checkFields() As Boolean
+
+        If txtStandort.TextLength > 50 Then
+            lblWarning.Text = "Standort darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtReferenzwert.TextLength > 50 Then
+            lblWarning.Text = "REF-Wert darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtZollsatz.TextLength > 60 Then
+            lblWarning.Text = "Zollsatz darf max 60 Zeichen besitzen!"
+            Return False
+        ElseIf txtUst.TextLength > 50 Then
+            lblWarning.Text = "Ust darf max 50 Zeichen besitzen!"
+            Return False
+        End If
+
+        lblWarning.Text = ""
+        Return True
+
+
+    End Function
+
+End Class

Aviso/frmSendungsDokumentanforderung.Designer.vb

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

Aviso/frmSendungsDokumentanforderung.resx

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

Aviso/frmSendungsdetailsNEU.vb

@@ -1465,11 +1465,11 @@ Public Class frmSendungsdetailsNEU
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
                 Case "FRONTOFFICE"
-                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,7001) "
+                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,5802,7001) "
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     End If
 
                 Case Else
@@ -1915,10 +1915,6 @@ Public Class frmSendungsdetailsNEU
 
     Sub initSendungs_Status()
 
-        Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & cboFiliale._value & "' AND AbfertigungsNr='" & txtAbfertigungsnummer.Text & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
-        'cbxSpedBuch.Checked = (vorhanden > 0)
-        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
-
 
 
         btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Inaktiv
@@ -2025,6 +2021,10 @@ Public Class frmSendungsdetailsNEU
         End Select
 
 
+        Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "' AND AbfertigungsNr='" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
+        'cbxSpedBuch.Checked = (vorhanden > 0)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
+
 
     End Sub
 
@@ -4958,7 +4958,8 @@ Public Class frmSendungsdetailsNEU
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
-                    files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+
+                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
                 Next
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
@@ -7503,7 +7504,7 @@ Public Class frmSendungsdetailsNEU
 
             If item IsNot Nothing Then
 
-                listOfTextconserven = New cTextkonserve_LIST("FRM_MNGR_MailText", item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                listOfTextconserven = New cTextkonserve_LIST(8, item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
 
                 If listOfTextconserven.LIST.Count = 0 Then
                     'ContextMenuStrip1.Show(Cursor.Position)

Aviso/packages.config

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

Aviso/usrCntlSND_ATBGestellung.vb

@@ -128,8 +128,8 @@ Public Class usrCntlSND_ATBGestellung
                 Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.gsr_zollsatz / 100)
 
                 If sicherheitsbertrag > saldo Then
-                    If MsgBox("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
-                End If
+                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
+            End If
 
                 Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort, WarenwertEUR, gsnr_proLKW_global)
 

Aviso/usrcntlAktDetails.vb

@@ -1,12 +1,12 @@
-Imports VERAG_PROG_ALLGEMEIN
-Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
-
-Imports System.IO
 'Imports Gemeinsames.cDatenbank
 Imports System.Drawing
-Imports Microsoft.Office.Interop
+Imports System.IO
 Imports System.Security.Cryptography
 Imports GrapeCity.DataVisualization.TypeScript
+Imports Microsoft.Office.Interop
+Imports Microsoft.Reporting.WinForms
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 
 Public Class usrcntlAktDetails
 
@@ -361,7 +361,7 @@ Public Class usrcntlAktDetails
             btnOptionen.Enabled = False
             btnLkwBeleg.Visible = False
             'tbcntlVermerke.TabPages.Remove(tbAnhang)
-            Button18.Visible = False
+            Button18.Visible = True ' Berechtigung freigegben 16.04.26
 
             btnDipoListeEmail.Visible = False
             btnLZDruckDIGITAL.Visible = False
@@ -1236,6 +1236,11 @@ Public Class usrcntlAktDetails
                     End If
                 Case Else
                     If paarId > 0 Then
+                        Select Case vermerkCode
+                            Case 101, 25 'Sonderfall -> BEzeichnung sollte übernommen werden
+                                paarBez = gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").value.ToString.Replace("angefordert", "erhalten").ToString.Replace("offen", "erledigt")
+                        End Select
+
                         myVermerk.Hinweis_Vermerk = paarBez
                         myVermerk.VermerkCodeId = paarId
                         Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
@@ -1260,7 +1265,6 @@ Public Class usrcntlAktDetails
                         End Select
                     End If
             End Select
-
         End If
 
     End Sub
@@ -1354,11 +1358,11 @@ Public Class usrcntlAktDetails
                                 End If
                             End If
 
-                        Case 101, 25
-                            If paarId > 0 AndAlso r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
-                                optionCell.Value = paarBez
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
-                            End If
+                            'Case 101, 25
+                            '    If paarId > 0 AndAlso r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
+                            '        optionCell.Value = paarBez
+                            '        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
+                            '    End If
                         Case Else
                             If paarId > 0 Then
                                 If Not existCodeInGridVermerke(r, gridvermerke, paarId, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
@@ -1417,7 +1421,7 @@ Public Class usrcntlAktDetails
                         Select Case code
                             Case 59
                                 Return True
-                            Case 2, 4, 6, 8, 10, 12, 30, 37, 34
+                            Case 2, 4, 6, 8, 10, 12, 30, 37, 34, 102
                                 If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
                                     Return True
                                 End If
@@ -3713,23 +3717,44 @@ Public Class usrcntlAktDetails
     End Sub
 
     Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click, Button8.Click, btnQRVerwahrung.Click
-        Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
+        Try
 
-        If dgvSendungen.SelectedRows.Count > 0 Then
-            SND = New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
-        End If
+            Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
 
-        Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND)
-        Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
-        If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
-        If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
+            If dgvSendungen.SelectedRows.Count > 0 Then
+                SND = New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+            End If
 
+            Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND)
+            Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
+            If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("EPSON", True)
 
-        If sender Is Button8 OrElse printer = "" Then
-            SDL.cProgramFunctions.showRpt(rpt, "AVISO", False)
-        Else
-            SDL.cProgramFunctions.printRpt(rpt, printer, True)
-        End If
+            'If printer <> "" Then
+
+            '    'rpt.PageSettings.PaperKind = Drawing.Printing.PaperKind.Custom
+            '    'rpt.PageSettings.PaperName = "BON80X200"
+            '    'rpt.PageSettings.PaperWidth = 3.15F
+            '    'rpt.PageSettings.PaperHeight = 7.87F
+            '    'rpt.Document.Printer.PrinterName = printername
+
+            '    ' rpt.Document.Printer.PaperSize = New GrapeCity.ActiveReports.Printing.PaperSize("Custom", 800, 2500)
+            '    '   rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
+
+            'End If
+            ''rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
+            'rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize = New GrapeCity.ActiveReports.Printing.PaperSize("Custom", 800, 2500) ' ps.PaperSize '.SetPageSettings(ps)
+
+            If sender Is Button8 OrElse printer = "" Then
+                SDL.cProgramFunctions.showRpt(rpt, "AVISO", False)
+            Else
+                SDL.cProgramFunctions.printRpt(rpt, printer, True)
+            End If
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
 
     End Sub