merge

update vermerke
vermerke
2026-04-30 09:36:52 +02:00 · 2026-04-30 09:26:04 +02:00 · 2026-04-30 09:18:46 +02:00 · 2026-04-30 09:18:46 +02:00 · 2026-04-30 09:18:45 +02:00 · 2026-04-30 09:18:45 +02:00
164 changed files with 17276 additions and 5550 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+[*.vb]
+
+# BC42104: Die Variable wurde verwendet, bevor ihr ein Wert zugewiesen wurde.
+dotnet_diagnostic.BC42104.severity = suggestion
+
+# Default severity for all analyzer diagnostics
+dotnet_analyzer_diagnostic.severity = suggestion
--- a/Aviso.sln
+++ b/Aviso.sln
@@ -33,6 +33,11 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MDM_Worker_lib", "..\..\ADMIN\ADMIN\MDM_Worker\MDM_Worker_lib.vbproj", "{2E4DBC09-E57B-4AC5-8554-6117D71F993B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
--- a/Aviso/ATEZ/frmATEZ_EZA.Designer.vb
+++ b/Aviso/ATEZ/frmATEZ_EZA.Designer.vb
@@ -26,6 +26,10 @@ 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()
        Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -34,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()
@@ -48,10 +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.Label4 = New System.Windows.Forms.Label()
-        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
@@ -59,23 +66,26 @@ Partial Class frmATEZ_EZA
        Me.btnSend.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnSend.BackColor = System.Drawing.Color.White
        Me.btnSend.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.btnSend.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSend.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSend.Image = Global.AVISO.My.Resources.Resources.Declarant
-        Me.btnSend.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnSend.Location = New System.Drawing.Point(486, 348)
+        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, 343)
        Me.btnSend.Margin = New System.Windows.Forms.Padding(2)
        Me.btnSend.Name = "btnSend"
-        Me.btnSend.Size = New System.Drawing.Size(192, 58)
+        Me.btnSend.Padding = New System.Windows.Forms.Padding(5, 0, 5, 0)
+        Me.btnSend.Size = New System.Drawing.Size(205, 58)
        Me.btnSend.TabIndex = 26
        Me.btnSend.Text = "An ATEZ senden >>"
-        Me.btnSend.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnSend.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnSend.UseVisualStyleBackColor = False
        '
        'pnlHead
        '
        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)
        Me.pnlHead.Controls.Add(Me.Label8)
@@ -85,7 +95,6 @@ Partial Class frmATEZ_EZA
        Me.pnlHead.Controls.Add(Me.Label9)
        Me.pnlHead.Controls.Add(Me.sbAdressierteZollstelle)
        Me.pnlHead.Controls.Add(Me.txtDyMandant)
-        Me.pnlHead.Controls.Add(Me.Label1)
        Me.pnlHead.Controls.Add(Me.txtDyNiederlassung)
        Me.pnlHead.Controls.Add(Me.lblBezugsnummer)
        Me.pnlHead.Location = New System.Drawing.Point(3, 2)
@@ -93,6 +102,44 @@ 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
+        Me.Label4.Location = New System.Drawing.Point(108, 13)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(45, 12)
+        Me.Label4.TabIndex = 149
+        Me.Label4.Text = "SUB"
+        '
        'lblInfo
        '
        Me.lblInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -106,9 +153,9 @@ Partial Class frmATEZ_EZA
        '
        Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(10, 61)
+        Me.Label8.Location = New System.Drawing.Point(6, 61)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(80, 13)
+        Me.Label8.Size = New System.Drawing.Size(86, 13)
        Me.Label8.TabIndex = 146
        Me.Label8.Text = "Stammreferenz:"
        Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -154,17 +201,19 @@ Partial Class frmATEZ_EZA
        '
        'Label3
        '
-        Me.Label3.Location = New System.Drawing.Point(10, 91)
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(6, 91)
        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(103, 17)
+        Me.Label3.Size = New System.Drawing.Size(48, 13)
        Me.Label3.TabIndex = 113
        Me.Label3.Text = "LKW-KZ:"
        '
        'Label9
        '
-        Me.Label9.Location = New System.Drawing.Point(10, 117)
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(6, 117)
        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(103, 17)
+        Me.Label9.Size = New System.Drawing.Size(117, 13)
        Me.Label9.TabIndex = 110
        Me.Label9.Text = "Adressierte-Zollstelle:"
        '
@@ -196,29 +245,19 @@ Partial Class frmATEZ_EZA
        '
        'txtDyMandant
        '
+        Me.txtDyMandant.AutoSize = True
        Me.txtDyMandant.BackColor = System.Drawing.Color.White
-        Me.txtDyMandant.Location = New System.Drawing.Point(2, 7)
+        Me.txtDyMandant.Location = New System.Drawing.Point(6, 13)
        Me.txtDyMandant.Name = "txtDyMandant"
-        Me.txtDyMandant.Size = New System.Drawing.Size(44, 13)
+        Me.txtDyMandant.Size = New System.Drawing.Size(35, 13)
        Me.txtDyMandant.TabIndex = 109
        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, 20)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(82, 13)
-        Me.Label1.TabIndex = 106
-        Me.Label1.Text = "Bezugsnummer:"
-        '
        'txtDyNiederlassung
        '
        Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White
-        Me.txtDyNiederlassung.Location = New System.Drawing.Point(52, 7)
+        Me.txtDyNiederlassung.Location = New System.Drawing.Point(55, 13)
        Me.txtDyNiederlassung.Name = "txtDyNiederlassung"
        Me.txtDyNiederlassung.Size = New System.Drawing.Size(45, 12)
        Me.txtDyNiederlassung.TabIndex = 108
@@ -229,7 +268,7 @@ Partial Class frmATEZ_EZA
        Me.lblBezugsnummer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblBezugsnummer.BackColor = System.Drawing.Color.White
        Me.lblBezugsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblBezugsnummer.Location = New System.Drawing.Point(475, 14)
+        Me.lblBezugsnummer.Location = New System.Drawing.Point(475, 8)
        Me.lblBezugsnummer.Name = "lblBezugsnummer"
        Me.lblBezugsnummer.Size = New System.Drawing.Size(193, 23)
        Me.lblBezugsnummer.TabIndex = 107
@@ -238,10 +277,9 @@ Partial Class frmATEZ_EZA
        '
        'Button3
        '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(473, 159)
+        Me.Button3.Location = New System.Drawing.Point(473, 157)
        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(205, 23)
+        Me.Button3.Size = New System.Drawing.Size(205, 25)
        Me.Button3.TabIndex = 152
        Me.Button3.Text = "alle Anhänge auswählen"
        Me.Button3.UseVisualStyleBackColor = True
@@ -262,21 +300,10 @@ Partial Class frmATEZ_EZA
        Me.lblAnh.TabIndex = 151
        Me.lblAnh.Visible = False
        '
-        'Button1
-        '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        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.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_Tnr.Location = New System.Drawing.Point(71, 344)
+        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
@@ -286,7 +313,8 @@ Partial Class frmATEZ_EZA
        '
        'Label2
        '
-        Me.Label2.Location = New System.Drawing.Point(6, 350)
+        Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.0!)
+        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
@@ -295,10 +323,9 @@ Partial Class frmATEZ_EZA
        'btnAgg_Origin
        '
        Me.btnAgg_Origin.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.btnAgg_Origin.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_Origin.Location = New System.Drawing.Point(160, 344)
+        Me.btnAgg_Origin.Location = New System.Drawing.Point(162, 3)
        Me.btnAgg_Origin.Name = "btnAgg_Origin"
-        Me.btnAgg_Origin.Size = New System.Drawing.Size(90, 23)
+        Me.btnAgg_Origin.Size = New System.Drawing.Size(92, 23)
        Me.btnAgg_Origin.TabIndex = 155
        Me.btnAgg_Origin.Tag = "1"
        Me.btnAgg_Origin.Text = "Ursprungsland"
@@ -306,8 +333,7 @@ Partial Class frmATEZ_EZA
        '
        'btnAgg_Unit
        '
-        Me.btnAgg_Unit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_Unit.Location = New System.Drawing.Point(255, 344)
+        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
@@ -317,8 +343,7 @@ Partial Class frmATEZ_EZA
        '
        'btnAgg_desc
        '
-        Me.btnAgg_desc.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_desc.Location = New System.Drawing.Point(340, 344)
+        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
@@ -351,44 +376,92 @@ Partial Class frmATEZ_EZA
        Me.columnName.Name = "columnName"
        Me.columnName.ReadOnly = True
        '
-        'Label4
+        'btnPrio_CommInv
        '
-        Me.Label4.BackColor = System.Drawing.Color.White
-        Me.Label4.Location = New System.Drawing.Point(106, 8)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(45, 12)
-        Me.Label4.TabIndex = 149
-        Me.Label4.Text = "SUB"
+        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
        '
-        'Button2
+        'Label5
        '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(416, 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.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"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -396,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
@@ -425,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
--- a/Aviso/ATEZ/frmATEZ_EZA.vb
+++ b/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",
@@ -168,9 +176,9 @@ Public Class frmATEZ_EZA
                                .headerData = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubHeaderData With {
                                    .agentContact = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAgentContact With {
                                        .contactPersonName = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname, ""),
-                                        .contactPersonPhoneNumber = "0049 8503 7973999 " & If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl), "200", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl),'If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr, "+43 7711/2777 0"),
+                                        .contactPersonPhoneNumber = getTelefon(),
                                        .contactPersonPosition = "Zolldeklarant/in",
-                                        .contactPersonEmail = If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email), "quickstop@verag.ag", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email)
+                                        .contactPersonEmail = If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email), getDefaultMail_FIRMA(), VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email)
                                    },
                                    .declarantIsConsignee = True,
                                    .representationRelationshipCode = "",'-1, '??????????????????????????????????????????????????????????????
@@ -183,7 +191,8 @@ Public Class frmATEZ_EZA
                            }
                    },
                 .additionalSettings = New cRelayHubAdditionalSettings With {
-                        .combineOptions = AdditionalSettings
+                        .combineOptions = AdditionalSettings,
+                        .combineItemsPriorityDocumentType = combineItemsPriorityDocumentType
                    }
            }

@@ -335,6 +344,29 @@ 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
+
+        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
+            Case "VERAG" : Return "quickstop@verag.ag"
+            Case "IMEX" : Return "steuerbescheide@imex-group.at"
+            Case "UNISPED" : Return "office@unisped.at"
+            Case "AMBAR" : Return "office@ambarlog.com"
+        End Select
+        Return "quickstop@verag.ag"
+    End Function
    'Private Function sendAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As Boolean

    '    Dim failreDesc As String
@@ -474,9 +506,9 @@ Public Class frmATEZ_EZA
        '    Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
        '    Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
        'End Select 
-        FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)
-        txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY)
-        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY)
+        FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me, "EZA")
+        txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY, "EZA")
+        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "EZA")

        Label4.Text = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "-").ToString

@@ -566,7 +598,7 @@ Public Class frmATEZ_EZA

                                                case WHEN [anh_size] > 0 Then ROUND([anh_size] / 1000000,2) End as anh_size,
                                                   [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] 
-                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ = 'PDF'
+                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ NOT IN ('MSG', 'SONSTIGES')
                                           ORDER BY  anh_SendungsId desc,
 										  case	  
                                                when [anh_Art] = 'ATR-EUR1' then 0
@@ -791,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
--- a/Aviso/ATEZ/frmATEZ_NCTS.Designer.vb
+++ b/Aviso/ATEZ/frmATEZ_NCTS.Designer.vb
@@ -39,11 +39,9 @@ Partial Class frmATEZ_NCTS
        Me.lblC = New System.Windows.Forms.Label()
        Me.txtTransporttemp = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cbxTemperatur = New System.Windows.Forms.CheckBox()
-        Me.sbDurchgangszollstelle5 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle9 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle8 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle7 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
-        Me.sbDurchgangszollstelle6 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle4 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle3 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.sbDurchgangszollstelle2 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
@@ -69,11 +67,14 @@ Partial Class frmATEZ_NCTS
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtDyNiederlassung = New System.Windows.Forms.Label()
        Me.lblBezugsnummer = New System.Windows.Forms.Label()
+        Me.sbDurchgangszollstelle5 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.sbDurchgangszollstelle6 = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.lblAnh = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
        Me.pnlHead.SuspendLayout()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -83,17 +84,17 @@ Partial Class frmATEZ_NCTS
        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button1.BackColor = System.Drawing.Color.White
        Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Button1.Image = Global.AVISO.My.Resources.Resources.Transcode
-        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.Button1.Location = New System.Drawing.Point(395, 773)
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.Button1.Image = Global.AVISO.My.Resources.Resources.ico_atez_transitAI
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(379, 773)
        Me.Button1.Margin = New System.Windows.Forms.Padding(2)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(192, 58)
+        Me.Button1.Padding = New System.Windows.Forms.Padding(5, 0, 5, 0)
+        Me.Button1.Size = New System.Drawing.Size(208, 58)
        Me.Button1.TabIndex = 26
        Me.Button1.Text = "An ATEZ senden >>"
-        Me.Button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button1.UseVisualStyleBackColor = False
        '
        'pnlHead
@@ -154,7 +155,7 @@ Partial Class frmATEZ_NCTS
        Me.Label2.AutoSize = True
        Me.Label2.Location = New System.Drawing.Point(10, 59)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(52, 13)
+        Me.Label2.Size = New System.Drawing.Size(56, 13)
        Me.Label2.TabIndex = 150
        Me.Label2.Text = "Prozedur:"
        Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -168,7 +169,7 @@ Partial Class frmATEZ_NCTS
        Me.cboProzedur.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboProzedur.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.cboProzedur.FormattingEnabled = True
-        Me.cboProzedur.Location = New System.Drawing.Point(151, 56)
+        Me.cboProzedur.Location = New System.Drawing.Point(157, 56)
        Me.cboProzedur.Name = "cboProzedur"
        Me.cboProzedur.Size = New System.Drawing.Size(100, 21)
        Me.cboProzedur.TabIndex = 149
@@ -186,9 +187,9 @@ Partial Class frmATEZ_NCTS
        '
        Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(389, 88)
+        Me.Label8.Location = New System.Drawing.Point(378, 88)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(57, 13)
+        Me.Label8.Size = New System.Drawing.Size(61, 13)
        Me.Label8.TabIndex = 146
        Me.Label8.Text = "Stammref.:"
        Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -222,12 +223,12 @@ Partial Class frmATEZ_NCTS
        Me.txtLKWId._Waehrung = False
        Me.txtLKWId._WaehrungZeichen = True
        Me.txtLKWId.ForeColor = System.Drawing.Color.Black
-        Me.txtLKWId.Location = New System.Drawing.Point(151, 86)
+        Me.txtLKWId.Location = New System.Drawing.Point(157, 86)
        Me.txtLKWId.MaxLineLength = -1
        Me.txtLKWId.MaxLines_Warning = ""
        Me.txtLKWId.MaxLines_Warning_Label = Nothing
        Me.txtLKWId.Name = "txtLKWId"
-        Me.txtLKWId.Size = New System.Drawing.Size(196, 20)
+        Me.txtLKWId.Size = New System.Drawing.Size(196, 22)
        Me.txtLKWId.TabIndex = 144
        '
        'usrCntl_Carrier
@@ -255,7 +256,7 @@ Partial Class frmATEZ_NCTS
        Me.txtDat._WaehrungZeichen = True
        Me.txtDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtDat.ForeColor = System.Drawing.Color.Black
-        Me.txtDat.Location = New System.Drawing.Point(151, 160)
+        Me.txtDat.Location = New System.Drawing.Point(157, 160)
        Me.txtDat.MaxLength = 10
        Me.txtDat.MaxLineLength = -1
        Me.txtDat.MaxLines_Warning = ""
@@ -270,7 +271,7 @@ Partial Class frmATEZ_NCTS
        Me.dtpDat.CustomFormat = "''"
        Me.dtpDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.dtpDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.dtpDat.Location = New System.Drawing.Point(151, 160)
+        Me.dtpDat.Location = New System.Drawing.Point(157, 160)
        Me.dtpDat.Margin = New System.Windows.Forms.Padding(0)
        Me.dtpDat.Name = "dtpDat"
        Me.dtpDat.Size = New System.Drawing.Size(110, 24)
@@ -278,16 +279,17 @@ Partial Class frmATEZ_NCTS
        '
        'Label7
        '
-        Me.Label7.Location = New System.Drawing.Point(10, 160)
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(10, 165)
        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(134, 17)
+        Me.Label7.Size = New System.Drawing.Size(145, 13)
        Me.Label7.TabIndex = 140
        Me.Label7.Text = "Wiedergestellungs-Datum:"
        '
        'lblC
        '
        Me.lblC.AutoSize = True
-        Me.lblC.Location = New System.Drawing.Point(251, 191)
+        Me.lblC.Location = New System.Drawing.Point(257, 191)
        Me.lblC.Name = "lblC"
        Me.lblC.Size = New System.Drawing.Size(18, 13)
        Me.lblC.TabIndex = 139
@@ -308,51 +310,26 @@ Partial Class frmATEZ_NCTS
        Me.txtTransporttemp._Waehrung = False
        Me.txtTransporttemp._WaehrungZeichen = True
        Me.txtTransporttemp.ForeColor = System.Drawing.Color.Black
-        Me.txtTransporttemp.Location = New System.Drawing.Point(151, 187)
+        Me.txtTransporttemp.Location = New System.Drawing.Point(157, 187)
        Me.txtTransporttemp.MaxLineLength = -1
        Me.txtTransporttemp.MaxLines_Warning = ""
        Me.txtTransporttemp.MaxLines_Warning_Label = Nothing
        Me.txtTransporttemp.Name = "txtTransporttemp"
-        Me.txtTransporttemp.Size = New System.Drawing.Size(100, 20)
+        Me.txtTransporttemp.Size = New System.Drawing.Size(100, 22)
        Me.txtTransporttemp.TabIndex = 138
        '
        'cbxTemperatur
        '
        Me.cbxTemperatur.AutoSize = True
-        Me.cbxTemperatur.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxTemperatur.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cbxTemperatur.Location = New System.Drawing.Point(13, 187)
        Me.cbxTemperatur.Name = "cbxTemperatur"
-        Me.cbxTemperatur.Size = New System.Drawing.Size(131, 17)
+        Me.cbxTemperatur.Size = New System.Drawing.Size(138, 17)
        Me.cbxTemperatur.TabIndex = 137
        Me.cbxTemperatur.TabStop = False
        Me.cbxTemperatur.Text = "Transport-Temperatur:"
        Me.cbxTemperatur.UseVisualStyleBackColor = True
        '
-        'sbDurchgangszollstelle5
-        '
-        Me.sbDurchgangszollstelle5._allowFreitext = False
-        Me.sbDurchgangszollstelle5._AllowSetValue = False
-        Me.sbDurchgangszollstelle5._allowSpaceAsSplitter = False
-        Me.sbDurchgangszollstelle5._autoSizeGross = False
-        Me.sbDurchgangszollstelle5._hideIfListEmpty = True
-        Me.sbDurchgangszollstelle5._value = ""
-        Me.sbDurchgangszollstelle5.conn_art = "FMZOLL"
-        Me.sbDurchgangszollstelle5.dgvpos = "LEFT"
-        Me.sbDurchgangszollstelle5.DISPLAY_PARAM = Nothing
-        Me.sbDurchgangszollstelle5.INVISIBLE_COLUMNS = Nothing
-        Me.sbDurchgangszollstelle5.key_visible = False
-        Me.sbDurchgangszollstelle5.KEYPARAM = Nothing
-        Me.sbDurchgangszollstelle5.Location = New System.Drawing.Point(206, 415)
-        Me.sbDurchgangszollstelle5.Name = "sbDurchgangszollstelle5"
-        Me.sbDurchgangszollstelle5.searchActive = True
-        Me.sbDurchgangszollstelle5.Size = New System.Drawing.Size(171, 20)
-        Me.sbDurchgangszollstelle5.SQL_ORDER_BY = Nothing
-        Me.sbDurchgangszollstelle5.SQL_SELECT = Nothing
-        Me.sbDurchgangszollstelle5.SQL_WHERE = Nothing
-        Me.sbDurchgangszollstelle5.SQL_WhereParamList = Nothing
-        Me.sbDurchgangszollstelle5.TabIndex = 132
-        Me.sbDurchgangszollstelle5.usrcntl = Nothing
-        '
        'sbDurchgangszollstelle9
        '
        Me.sbDurchgangszollstelle9._allowFreitext = False
@@ -370,7 +347,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle9.Location = New System.Drawing.Point(376, 434)
        Me.sbDurchgangszollstelle9.Name = "sbDurchgangszollstelle9"
        Me.sbDurchgangszollstelle9.searchActive = True
-        Me.sbDurchgangszollstelle9.Size = New System.Drawing.Size(198, 20)
+        Me.sbDurchgangszollstelle9.Size = New System.Drawing.Size(198, 22)
        Me.sbDurchgangszollstelle9.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle9.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle9.SQL_WHERE = Nothing
@@ -395,7 +372,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle8.Location = New System.Drawing.Point(207, 434)
        Me.sbDurchgangszollstelle8.Name = "sbDurchgangszollstelle8"
        Me.sbDurchgangszollstelle8.searchActive = True
-        Me.sbDurchgangszollstelle8.Size = New System.Drawing.Size(171, 20)
+        Me.sbDurchgangszollstelle8.Size = New System.Drawing.Size(171, 22)
        Me.sbDurchgangszollstelle8.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle8.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle8.SQL_WHERE = Nothing
@@ -420,7 +397,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle7.Location = New System.Drawing.Point(13, 434)
        Me.sbDurchgangszollstelle7.Name = "sbDurchgangszollstelle7"
        Me.sbDurchgangszollstelle7.searchActive = True
-        Me.sbDurchgangszollstelle7.Size = New System.Drawing.Size(197, 20)
+        Me.sbDurchgangszollstelle7.Size = New System.Drawing.Size(197, 22)
        Me.sbDurchgangszollstelle7.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle7.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle7.SQL_WHERE = Nothing
@@ -428,31 +405,6 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle7.TabIndex = 134
        Me.sbDurchgangszollstelle7.usrcntl = Nothing
        '
-        'sbDurchgangszollstelle6
-        '
-        Me.sbDurchgangszollstelle6._allowFreitext = False
-        Me.sbDurchgangszollstelle6._AllowSetValue = False
-        Me.sbDurchgangszollstelle6._allowSpaceAsSplitter = False
-        Me.sbDurchgangszollstelle6._autoSizeGross = False
-        Me.sbDurchgangszollstelle6._hideIfListEmpty = True
-        Me.sbDurchgangszollstelle6._value = ""
-        Me.sbDurchgangszollstelle6.conn_art = "FMZOLL"
-        Me.sbDurchgangszollstelle6.dgvpos = "LEFT"
-        Me.sbDurchgangszollstelle6.DISPLAY_PARAM = Nothing
-        Me.sbDurchgangszollstelle6.INVISIBLE_COLUMNS = Nothing
-        Me.sbDurchgangszollstelle6.key_visible = False
-        Me.sbDurchgangszollstelle6.KEYPARAM = Nothing
-        Me.sbDurchgangszollstelle6.Location = New System.Drawing.Point(375, 415)
-        Me.sbDurchgangszollstelle6.Name = "sbDurchgangszollstelle6"
-        Me.sbDurchgangszollstelle6.searchActive = True
-        Me.sbDurchgangszollstelle6.Size = New System.Drawing.Size(199, 20)
-        Me.sbDurchgangszollstelle6.SQL_ORDER_BY = Nothing
-        Me.sbDurchgangszollstelle6.SQL_SELECT = Nothing
-        Me.sbDurchgangszollstelle6.SQL_WHERE = Nothing
-        Me.sbDurchgangszollstelle6.SQL_WhereParamList = Nothing
-        Me.sbDurchgangszollstelle6.TabIndex = 133
-        Me.sbDurchgangszollstelle6.usrcntl = Nothing
-        '
        'sbDurchgangszollstelle4
        '
        Me.sbDurchgangszollstelle4._allowFreitext = False
@@ -470,7 +422,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle4.Location = New System.Drawing.Point(13, 415)
        Me.sbDurchgangszollstelle4.Name = "sbDurchgangszollstelle4"
        Me.sbDurchgangszollstelle4.searchActive = True
-        Me.sbDurchgangszollstelle4.Size = New System.Drawing.Size(195, 20)
+        Me.sbDurchgangszollstelle4.Size = New System.Drawing.Size(195, 22)
        Me.sbDurchgangszollstelle4.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle4.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle4.SQL_WHERE = Nothing
@@ -495,7 +447,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle3.Location = New System.Drawing.Point(376, 396)
        Me.sbDurchgangszollstelle3.Name = "sbDurchgangszollstelle3"
        Me.sbDurchgangszollstelle3.searchActive = True
-        Me.sbDurchgangszollstelle3.Size = New System.Drawing.Size(198, 20)
+        Me.sbDurchgangszollstelle3.Size = New System.Drawing.Size(198, 22)
        Me.sbDurchgangszollstelle3.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle3.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle3.SQL_WHERE = Nothing
@@ -520,7 +472,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle2.Location = New System.Drawing.Point(207, 396)
        Me.sbDurchgangszollstelle2.Name = "sbDurchgangszollstelle2"
        Me.sbDurchgangszollstelle2.searchActive = True
-        Me.sbDurchgangszollstelle2.Size = New System.Drawing.Size(171, 20)
+        Me.sbDurchgangszollstelle2.Size = New System.Drawing.Size(171, 22)
        Me.sbDurchgangszollstelle2.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle2.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle2.SQL_WHERE = Nothing
@@ -545,7 +497,7 @@ Partial Class frmATEZ_NCTS
        Me.sbDurchgangszollstelle1.Location = New System.Drawing.Point(13, 396)
        Me.sbDurchgangszollstelle1.Name = "sbDurchgangszollstelle1"
        Me.sbDurchgangszollstelle1.searchActive = True
-        Me.sbDurchgangszollstelle1.Size = New System.Drawing.Size(197, 20)
+        Me.sbDurchgangszollstelle1.Size = New System.Drawing.Size(197, 22)
        Me.sbDurchgangszollstelle1.SQL_ORDER_BY = Nothing
        Me.sbDurchgangszollstelle1.SQL_SELECT = Nothing
        Me.sbDurchgangszollstelle1.SQL_WHERE = Nothing
@@ -567,7 +519,7 @@ Partial Class frmATEZ_NCTS
        Me.lklRoutenauswahl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.lklRoutenauswahl.Location = New System.Drawing.Point(493, 475)
        Me.lklRoutenauswahl.Name = "lklRoutenauswahl"
-        Me.lklRoutenauswahl.Size = New System.Drawing.Size(81, 13)
+        Me.lklRoutenauswahl.Size = New System.Drawing.Size(88, 13)
        Me.lklRoutenauswahl.TabIndex = 117
        Me.lklRoutenauswahl.TabStop = True
        Me.lklRoutenauswahl.Text = "Routenauswahl"
@@ -589,7 +541,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute5.Location = New System.Drawing.Point(205, 510)
        Me.sbRoute5.Name = "sbRoute5"
        Me.sbRoute5.searchActive = True
-        Me.sbRoute5.Size = New System.Drawing.Size(183, 20)
+        Me.sbRoute5.Size = New System.Drawing.Size(183, 22)
        Me.sbRoute5.SQL_ORDER_BY = Nothing
        Me.sbRoute5.SQL_SELECT = Nothing
        Me.sbRoute5.SQL_WHERE = Nothing
@@ -614,7 +566,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute9.Location = New System.Drawing.Point(387, 529)
        Me.sbRoute9.Name = "sbRoute9"
        Me.sbRoute9.searchActive = True
-        Me.sbRoute9.Size = New System.Drawing.Size(187, 20)
+        Me.sbRoute9.Size = New System.Drawing.Size(187, 22)
        Me.sbRoute9.SQL_ORDER_BY = Nothing
        Me.sbRoute9.SQL_SELECT = Nothing
        Me.sbRoute9.SQL_WHERE = Nothing
@@ -639,7 +591,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute8.Location = New System.Drawing.Point(205, 529)
        Me.sbRoute8.Name = "sbRoute8"
        Me.sbRoute8.searchActive = True
-        Me.sbRoute8.Size = New System.Drawing.Size(183, 20)
+        Me.sbRoute8.Size = New System.Drawing.Size(183, 22)
        Me.sbRoute8.SQL_ORDER_BY = Nothing
        Me.sbRoute8.SQL_SELECT = Nothing
        Me.sbRoute8.SQL_WHERE = Nothing
@@ -664,7 +616,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute7.Location = New System.Drawing.Point(13, 529)
        Me.sbRoute7.Name = "sbRoute7"
        Me.sbRoute7.searchActive = True
-        Me.sbRoute7.Size = New System.Drawing.Size(195, 20)
+        Me.sbRoute7.Size = New System.Drawing.Size(195, 22)
        Me.sbRoute7.SQL_ORDER_BY = Nothing
        Me.sbRoute7.SQL_SELECT = Nothing
        Me.sbRoute7.SQL_WHERE = Nothing
@@ -689,7 +641,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute6.Location = New System.Drawing.Point(387, 510)
        Me.sbRoute6.Name = "sbRoute6"
        Me.sbRoute6.searchActive = True
-        Me.sbRoute6.Size = New System.Drawing.Size(187, 20)
+        Me.sbRoute6.Size = New System.Drawing.Size(187, 22)
        Me.sbRoute6.SQL_ORDER_BY = Nothing
        Me.sbRoute6.SQL_SELECT = Nothing
        Me.sbRoute6.SQL_WHERE = Nothing
@@ -714,7 +666,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute4.Location = New System.Drawing.Point(13, 510)
        Me.sbRoute4.Name = "sbRoute4"
        Me.sbRoute4.searchActive = True
-        Me.sbRoute4.Size = New System.Drawing.Size(195, 20)
+        Me.sbRoute4.Size = New System.Drawing.Size(195, 22)
        Me.sbRoute4.SQL_ORDER_BY = Nothing
        Me.sbRoute4.SQL_SELECT = Nothing
        Me.sbRoute4.SQL_WHERE = Nothing
@@ -739,7 +691,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute3.Location = New System.Drawing.Point(387, 491)
        Me.sbRoute3.Name = "sbRoute3"
        Me.sbRoute3.searchActive = True
-        Me.sbRoute3.Size = New System.Drawing.Size(187, 20)
+        Me.sbRoute3.Size = New System.Drawing.Size(187, 22)
        Me.sbRoute3.SQL_ORDER_BY = Nothing
        Me.sbRoute3.SQL_SELECT = Nothing
        Me.sbRoute3.SQL_WHERE = Nothing
@@ -764,7 +716,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute2.Location = New System.Drawing.Point(205, 491)
        Me.sbRoute2.Name = "sbRoute2"
        Me.sbRoute2.searchActive = True
-        Me.sbRoute2.Size = New System.Drawing.Size(183, 20)
+        Me.sbRoute2.Size = New System.Drawing.Size(183, 22)
        Me.sbRoute2.SQL_ORDER_BY = Nothing
        Me.sbRoute2.SQL_SELECT = Nothing
        Me.sbRoute2.SQL_WHERE = Nothing
@@ -789,7 +741,7 @@ Partial Class frmATEZ_NCTS
        Me.sbRoute1.Location = New System.Drawing.Point(13, 491)
        Me.sbRoute1.Name = "sbRoute1"
        Me.sbRoute1.searchActive = True
-        Me.sbRoute1.Size = New System.Drawing.Size(195, 20)
+        Me.sbRoute1.Size = New System.Drawing.Size(195, 22)
        Me.sbRoute1.SQL_ORDER_BY = Nothing
        Me.sbRoute1.SQL_SELECT = Nothing
        Me.sbRoute1.SQL_WHERE = Nothing
@@ -807,9 +759,9 @@ Partial Class frmATEZ_NCTS
        '
        'Label4
        '
-        Me.Label4.Location = New System.Drawing.Point(10, 138)
+        Me.Label4.Location = New System.Drawing.Point(10, 141)
        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(121, 17)
+        Me.Label4.Size = New System.Drawing.Size(135, 17)
        Me.Label4.TabIndex = 114
        Me.Label4.Text = "Bestimmungs-Zollstelle:"
        '
@@ -827,10 +779,10 @@ Partial Class frmATEZ_NCTS
        Me.sbBestimmungsZollstelle.INVISIBLE_COLUMNS = Nothing
        Me.sbBestimmungsZollstelle.key_visible = False
        Me.sbBestimmungsZollstelle.KEYPARAM = Nothing
-        Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(151, 138)
+        Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(157, 138)
        Me.sbBestimmungsZollstelle.Name = "sbBestimmungsZollstelle"
        Me.sbBestimmungsZollstelle.searchActive = True
-        Me.sbBestimmungsZollstelle.Size = New System.Drawing.Size(196, 20)
+        Me.sbBestimmungsZollstelle.Size = New System.Drawing.Size(196, 22)
        Me.sbBestimmungsZollstelle.SQL_ORDER_BY = Nothing
        Me.sbBestimmungsZollstelle.SQL_SELECT = Nothing
        Me.sbBestimmungsZollstelle.SQL_WHERE = Nothing
@@ -868,10 +820,10 @@ Partial Class frmATEZ_NCTS
        Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing
        Me.sbAbgangZollstelle.key_visible = False
        Me.sbAbgangZollstelle.KEYPARAM = Nothing
-        Me.sbAbgangZollstelle.Location = New System.Drawing.Point(151, 112)
+        Me.sbAbgangZollstelle.Location = New System.Drawing.Point(157, 112)
        Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle"
        Me.sbAbgangZollstelle.searchActive = True
-        Me.sbAbgangZollstelle.Size = New System.Drawing.Size(196, 20)
+        Me.sbAbgangZollstelle.Size = New System.Drawing.Size(196, 22)
        Me.sbAbgangZollstelle.SQL_ORDER_BY = Nothing
        Me.sbAbgangZollstelle.SQL_SELECT = Nothing
        Me.sbAbgangZollstelle.SQL_WHERE = Nothing
@@ -896,14 +848,14 @@ Partial Class frmATEZ_NCTS
        Me.Label1.BackColor = System.Drawing.Color.White
        Me.Label1.Location = New System.Drawing.Point(296, 19)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(82, 13)
+        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
-        Me.txtDyNiederlassung.Location = New System.Drawing.Point(52, 15)
+        Me.txtDyNiederlassung.Location = New System.Drawing.Point(52, 14)
        Me.txtDyNiederlassung.Name = "txtDyNiederlassung"
        Me.txtDyNiederlassung.Size = New System.Drawing.Size(45, 12)
        Me.txtDyNiederlassung.TabIndex = 108
@@ -921,9 +873,58 @@ Partial Class frmATEZ_NCTS
        Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
        Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
+        'sbDurchgangszollstelle5
+        '
+        Me.sbDurchgangszollstelle5._allowFreitext = False
+        Me.sbDurchgangszollstelle5._AllowSetValue = False
+        Me.sbDurchgangszollstelle5._allowSpaceAsSplitter = False
+        Me.sbDurchgangszollstelle5._autoSizeGross = False
+        Me.sbDurchgangszollstelle5._hideIfListEmpty = True
+        Me.sbDurchgangszollstelle5._value = ""
+        Me.sbDurchgangszollstelle5.conn_art = "FMZOLL"
+        Me.sbDurchgangszollstelle5.dgvpos = "LEFT"
+        Me.sbDurchgangszollstelle5.DISPLAY_PARAM = Nothing
+        Me.sbDurchgangszollstelle5.INVISIBLE_COLUMNS = Nothing
+        Me.sbDurchgangszollstelle5.key_visible = False
+        Me.sbDurchgangszollstelle5.KEYPARAM = Nothing
+        Me.sbDurchgangszollstelle5.Location = New System.Drawing.Point(206, 415)
+        Me.sbDurchgangszollstelle5.Name = "sbDurchgangszollstelle5"
+        Me.sbDurchgangszollstelle5.searchActive = True
+        Me.sbDurchgangszollstelle5.Size = New System.Drawing.Size(171, 22)
+        Me.sbDurchgangszollstelle5.SQL_ORDER_BY = Nothing
+        Me.sbDurchgangszollstelle5.SQL_SELECT = Nothing
+        Me.sbDurchgangszollstelle5.SQL_WHERE = Nothing
+        Me.sbDurchgangszollstelle5.SQL_WhereParamList = Nothing
+        Me.sbDurchgangszollstelle5.TabIndex = 132
+        Me.sbDurchgangszollstelle5.usrcntl = Nothing
+        '
+        'sbDurchgangszollstelle6
+        '
+        Me.sbDurchgangszollstelle6._allowFreitext = False
+        Me.sbDurchgangszollstelle6._AllowSetValue = False
+        Me.sbDurchgangszollstelle6._allowSpaceAsSplitter = False
+        Me.sbDurchgangszollstelle6._autoSizeGross = False
+        Me.sbDurchgangszollstelle6._hideIfListEmpty = True
+        Me.sbDurchgangszollstelle6._value = ""
+        Me.sbDurchgangszollstelle6.conn_art = "FMZOLL"
+        Me.sbDurchgangszollstelle6.dgvpos = "LEFT"
+        Me.sbDurchgangszollstelle6.DISPLAY_PARAM = Nothing
+        Me.sbDurchgangszollstelle6.INVISIBLE_COLUMNS = Nothing
+        Me.sbDurchgangszollstelle6.key_visible = False
+        Me.sbDurchgangszollstelle6.KEYPARAM = Nothing
+        Me.sbDurchgangszollstelle6.Location = New System.Drawing.Point(375, 415)
+        Me.sbDurchgangszollstelle6.Name = "sbDurchgangszollstelle6"
+        Me.sbDurchgangszollstelle6.searchActive = True
+        Me.sbDurchgangszollstelle6.Size = New System.Drawing.Size(199, 22)
+        Me.sbDurchgangszollstelle6.SQL_ORDER_BY = Nothing
+        Me.sbDurchgangszollstelle6.SQL_SELECT = Nothing
+        Me.sbDurchgangszollstelle6.SQL_WHERE = Nothing
+        Me.sbDurchgangszollstelle6.SQL_WhereParamList = Nothing
+        Me.sbDurchgangszollstelle6.TabIndex = 133
+        Me.sbDurchgangszollstelle6.usrcntl = Nothing
+        '
        'Button3
        '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button3.Location = New System.Drawing.Point(409, 584)
        Me.Button3.Name = "Button3"
        Me.Button3.Size = New System.Drawing.Size(178, 23)
@@ -970,18 +971,30 @@ Partial Class frmATEZ_NCTS
        Me.lblAnh.TabIndex = 151
        Me.lblAnh.Visible = False
        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(3, 807)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(178, 23)
+        Me.Button2.TabIndex = 155
+        Me.Button2.Text = "JSON"
+        Me.Button2.UseVisualStyleBackColor = True
+        Me.Button2.Visible = False
+        '
        'frmATEZ_NCTS
        '
        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(589, 842)
+        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.lblAnh)
        Me.Controls.Add(Me.pnlHead)
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.dgvAnhaenge)
+        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_NCTS"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -1042,4 +1055,5 @@ Partial Class frmATEZ_NCTS
    Friend WithEvents cboProzedur As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents lblAnh As Label
    Friend WithEvents Button3 As Button
+    Friend WithEvents Button2 As Button
 End Class
--- a/Aviso/ATEZ/frmATEZ_NCTS.vb
+++ b/Aviso/ATEZ/frmATEZ_NCTS.vb
@@ -72,7 +72,7 @@ Public Class frmATEZ_NCTS

    End Sub

-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click, Button2.Click
        Try


@@ -148,6 +148,11 @@ Public Class frmATEZ_NCTS
            saveRoute(atez_data)
            setDurchgangszolstellen()
            setRoute()
+
+            If sender Is Button2 Then
+                MsgBox(getJSONAtezData(atez_data, atez))
+                Exit Sub
+            End If
            If sendAtezData(atez_data, atez) Then
                AvisoStatusFunctions.insertSendungsVermerk(SENDUNG.tblSnd_SendungID, SENDUNG.tblSnd_AvisoID, "An ATEZ gesendet", 109)
                Me.Close()
@@ -165,6 +170,10 @@ Public Class frmATEZ_NCTS

    End Sub

+    Private Function getJSONAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As String
+        Dim jsonData = atez.setJsonPDF(atezData, dgvAnhaenge)
+        Return (jsonData.Emit())
+    End Function
    Private Function sendAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As Boolean

        Dim failreDesc As String
@@ -446,7 +455,7 @@ Public Class frmATEZ_NCTS
                                                when [anh_Art] = 'Sonstiges' then 'OTHER'
                                                when [anh_Art] ='' then 'OTHER' End
                                                [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] 
-                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ = 'PDF'
+                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ NOT IN ('MSG', 'SONSTIGES')
                                           ORDER BY  anh_SendungsId desc,
 										  case	  
                                                when [anh_Art] = 'ATR-EUR1' then 0
--- a/Aviso/AktenErfassung/frmEintragAviso.vb
+++ b/Aviso/AktenErfassung/frmEintragAviso.vb
@@ -11,7 +11,7 @@ Public Class frmEintragAviso
    Dim ATILLA_NEUERAKTENDECKEL = True
    Dim Firmen As New cFirmenDAL
    Dim AvisoDAL As New cAvisoDAL
-    Dim myAviso As New cAviso
+    Public myAviso As New cAviso
    Dim AVISOFUNC As New AvisoStatusFunctions
    Dim ADMIN As New cADMIN
    Dim hÄnderung As Boolean = False
@@ -34,6 +34,7 @@ Public Class frmEintragAviso

    Dim INFO As String = ""

+    Public getFromAVISO_Trip As cAviso = Nothing

    Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

@@ -351,6 +352,60 @@ Public Class frmEintragAviso
            If FIRMA_TMP = "AMBAR" Then
                cboGrenzstelle.changeItem("AMB")
            End If
+
+
+
+            If getFromAVISO_Trip IsNot Nothing Then
+                myAviso.AvisoTripId = getFromAVISO_Trip.AvisoTripId ' --> Trip gespeichert!
+
+                myAviso.Frächter = getFromAVISO_Trip.Frächter
+                myAviso.Frächter_KdNr = getFromAVISO_Trip.Frächter_KdNr
+                myAviso.Auftraggeber = getFromAVISO_Trip.Auftraggeber
+                myAviso.Auftraggeber_KdNr = getFromAVISO_Trip.Auftraggeber_KdNr
+
+                myAviso.Zugmaschine = getFromAVISO_Trip.Zugmaschine
+                myAviso.LKW_Nr = getFromAVISO_Trip.LKW_Nr
+                myAviso.LKW_Nationalitaet = getFromAVISO_Trip.LKW_Nationalitaet
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                myAviso.AvisoEingang = getFromAVISO_Trip.AvisoEingang
+                myAviso.FahrerHandy = getFromAVISO_Trip.FahrerHandy
+                myAviso.KdAuftragsNr_Avisierer = getFromAVISO_Trip.KdAuftragsNr_Avisierer
+                myAviso.Telefonisch = getFromAVISO_Trip.Telefonisch
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                '---------ANZEIGE----------------------------------
+                If myAviso.Frächter_KdNr > 0 Then
+                    kdFrächter.KdNr = myAviso.Frächter_KdNr
+                Else
+                    kdFrächter.Text = myAviso.Frächter
+                End If
+
+                If myAviso.Auftraggeber_KdNr > 0 Then
+                    kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr
+                Else
+                    kdAvisierer.Text = myAviso.Auftraggeber
+                End If
+
+
+                txtLKW_Nr.Text = myAviso.LKW_Nr
+                sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet)
+                txtFahrerHandy.Text = If(myAviso.FahrerHandy, "")
+                txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "")
+
+
+                optAvisoEingang.Checked = True  'bei Änderung kann kein Eingang ohne Aviso erfolgen...
+
+                If myAviso.Telefonisch = "Telefon" Then
+                    optTelefonisch.Checked = True
+                ElseIf myAviso.Telefonisch = "Schriftl." Then
+                    optSchriftlich.Checked = True
+                Else
+                    optUnbekannt.Checked = True
+                End If
+                cboTransportmittelart.changeItem(myAviso.Transportmittelart)
+            End If
+
        Else
            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
                Me.Close()
@@ -376,9 +431,9 @@ Public Class frmEintragAviso
                kdFrächter.KdNr = myAviso.Frächter_KdNr
            Else
                kdFrächter.Text = myAviso.Frächter
-                End If
+            End If

-                If myAviso.Auftraggeber_KdNr > 0 Then
+            If myAviso.Auftraggeber_KdNr > 0 Then
                    kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr
                Else
                    kdAvisierer.Text = myAviso.Auftraggeber
@@ -755,60 +810,63 @@ Public Class frmEintragAviso
                Dim ListOfLKWNr = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkLKWNr(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))


+                If getFromAVISO_Trip Is Nothing Then 'wenn Trip -> Prüfung überspringen 

-                For Each LKWNr In ListOfLKWNr
-                    Dim temp_avisoID As Integer = -1
-                    Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(LKWNr, temp_avisoID)
-                    If hLKWCheck2 <> "" Then
-                        Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
-                                           "Aviso-Eintrag")
-                        If antwort = vbNo Then
-                            If temp_avisoID > 0 Then
-                                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
-                                Dim FRM As New frmSendungsdetailsNEU(temp_avisoID, -1)
-                                FRM.ShowDialog(frmGrayOut)
-                                frmGrayOut.Close()

-                                Exit Sub
-                            Else
-                                MsgBox("AVISO-ID konnte nicht ermittelt werden")
-                                Exit Sub
-                            End If
-
-                        ElseIf antwort = vbCancel Then
-                                Exit Sub
-                            Else
-                                EintragMehrfach = True
-                        End If
-                    End If
-
-                    If hLKWCheck2 = "" Then
-                        'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
-                        Dim hLKWCheck As String = AvisoDAL.Suche_LKW(LKWNr, temp_avisoID)
-                        If hLKWCheck <> "" Then
-                            Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
-                                               "Aviso-Eintrag")
+                    For Each LKWNr In ListOfLKWNr
+                        Dim temp_avisoID As Integer = -1
+                        Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(LKWNr, temp_avisoID)
+                        If hLKWCheck2 <> "" Then
+                            Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                                   "Aviso-Eintrag")
                            If antwort = vbNo Then
                                If temp_avisoID > 0 Then
                                    Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
                                    Dim FRM As New frmSendungsdetailsNEU(temp_avisoID, -1)
                                    FRM.ShowDialog(frmGrayOut)
                                    frmGrayOut.Close()
+
                                    Exit Sub
                                Else
                                    MsgBox("AVISO-ID konnte nicht ermittelt werden")
                                    Exit Sub
                                End If
+
                            ElseIf antwort = vbCancel Then
                                Exit Sub
                            Else
-
                                EintragMehrfach = True
                            End If
                        End If
-                    End If

-                Next
+                        If hLKWCheck2 = "" Then
+                            'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
+                            Dim hLKWCheck As String = AvisoDAL.Suche_LKW(LKWNr, temp_avisoID)
+                            If hLKWCheck <> "" Then
+                                Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                                       "Aviso-Eintrag")
+                                If antwort = vbNo Then
+                                    If temp_avisoID > 0 Then
+                                        Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                                        Dim FRM As New frmSendungsdetailsNEU(temp_avisoID, -1)
+                                        FRM.ShowDialog(frmGrayOut)
+                                        frmGrayOut.Close()
+                                        Exit Sub
+                                    Else
+                                        MsgBox("AVISO-ID konnte nicht ermittelt werden")
+                                        Exit Sub
+                                    End If
+                                ElseIf antwort = vbCancel Then
+                                    Exit Sub
+                                Else
+
+                                    EintragMehrfach = True
+                                End If
+                            End If
+                        End If
+
+                    Next
+                End If

            End If

--- a/Aviso/App.config
+++ b/Aviso/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -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>
--- a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb
+++ b/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
--- a/Aviso/Auswertung/usrctlStatVERIMEX.vb
+++ b/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"))
--- a/Aviso/Aviso.vbproj
+++ b/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>
@@ -195,35 +195,50 @@
    <Reference Include="EAGetMail, Version=5.3.5.0, Culture=neutral, PublicKeyToken=e10a0812eb29cf94, processorArchitecture=MSIL">
      <HintPath>..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll</HintPath>
    </Reference>
+    <Reference Include="fiskaltrust.interface, Version=1.3.45.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\fiskaltrust.interface.1.3.45\lib\net461\fiskaltrust.interface.dll</HintPath>
+    </Reference>
    <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>
@@ -394,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">
@@ -404,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>
@@ -452,9 +479,15 @@
    <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" />
+    <Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
+    </Reference>
    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
      <Private>True</Private>
@@ -468,6 +501,9 @@
    <Reference Include="System.IO.Packaging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath>
    </Reference>
+    <Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
+    </Reference>
    <Reference Include="System.Management" />
    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
@@ -489,8 +525,12 @@
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
+    <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>
@@ -514,11 +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>
@@ -755,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>
@@ -1140,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>
@@ -1271,6 +1331,12 @@
    <Compile Include="usrcntlFrachtkostenberechnung.vb">
      <SubType>UserControl</SubType>
    </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_SND.Designer.vb">
+      <DependentUpon>usrCntlHauptfenster_Suche_SND.vb</DependentUpon>
+    </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_SND.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="usrCntlHauptfenster_Suche_AVISO.Designer.vb">
      <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
    </Compile>
@@ -1413,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>
@@ -1521,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>
@@ -1609,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>
@@ -1673,6 +1746,9 @@
    <EmbeddedResource Include="usrcntlFrachtkostenberechnung.resx">
      <DependentUpon>usrcntlFrachtkostenberechnung.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="usrCntlHauptfenster_Suche_SND.resx">
+      <DependentUpon>usrCntlHauptfenster_Suche_SND.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="usrCntlHauptfenster_Suche_AVISO.resx">
      <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
    </EmbeddedResource>
@@ -1873,6 +1949,8 @@
    <None Include="Resources\ambar_boarder_new.png">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
+    <None Include="Resources\AVISO_DCS.png" />
+    <None Include="Resources\aktualisieren-40.png" />
    <Content Include="Resources\FO.png">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
@@ -1894,6 +1972,54 @@
    <None Include="Resources\qr.png" />
    <None Include="Resources\qr_s.png" />
    <None Include="Resources\Transcode.png" />
+    <None Include="Resources\SND_verbinden.png" />
+    <None Include="Resources\SND_loesen.png" />
+    <None Include="Resources\ico_settings.png" />
+    <None Include="Resources\ico_kunden.png" />
+    <None Include="Resources\ico_fakturierung.png" />
+    <None Include="Resources\ico_rechnungen.png" />
+    <None Include="Resources\ico_mitarbeiter.png" />
+    <None Include="Resources\ico_kassenbuch.png" />
+    <None Include="Resources\ico_dienstplan.png" />
+    <None Include="Resources\ico_zeiterfassung.png" />
+    <None Include="Resources\ico_parkzeit.png" />
+    <None Include="Resources\ico_truck.png" />
+    <None Include="Resources\ico_docSearch.png" />
+    <None Include="Resources\ico_checklist.png" />
+    <None Include="Resources\ico_persDocument.png" />
+    <None Include="Resources\ico_security.png" />
+    <None Include="Resources\ico_handshake.png" />
+    <None Include="Resources\ico_docSave.png" />
+    <None Include="Resources\ico_DocEdit.png" />
+    <None Include="Resources\ico_docFin.png" />
+    <None Include="Resources\ico_mail.png" />
+    <None Include="Resources\ico_add.png" />
+    <None Include="Resources\ico_weel.png" />
+    <None Include="Resources\ico_loupe.png" />
+    <None Include="Resources\ico_inventor.png" />
+    <None Include="Resources\ico_verzeichnis.png" />
+    <None Include="Resources\ico_webWww.png" />
+    <None Include="Resources\ico_www.png" />
+    <None Include="Resources\ico_verknuepfung.png" />
+    <None Include="Resources\ico_webSearch.png" />
+    <None Include="Resources\ico_webSecurity.png" />
+    <None Include="Resources\ico_organigram.png" />
+    <None Include="Resources\ico_support.png" />
+    <None Include="Resources\ico_speditionsbuch.png" />
+    <None Include="Resources\ico_statistic.png" />
+    <None Include="Resources\ico_zertifikate.png" />
+    <None Include="Resources\ico_Options.png" />
+    <None Include="Resources\ico_ATR.png" />
+    <None Include="Resources\ico_CMR.png" />
+    <None Include="Resources\ico_ImportAssistant.png" />
+    <None Include="Resources\ico_kasse.png" />
+    <None Include="Resources\ico_importaviso.png" />
+    <None Include="Resources\ico_vorkasse.png" />
+    <None Include="Resources\ico_weitereForm.png" />
+    <None Include="Resources\ico_atez_transitAI.png" />
+    <None Include="Resources\ico_atez_declarantAI.png" />
+    <None Include="Resources\ico_atez_tariffAI.png" />
+    <None Include="Resources\ico_atez_logicust.png" />
    <Content Include="Resources\WLAN\RunNHide.exe">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Aviso/AvisoStatusFunctions.vb
+++ b/Aviso/AvisoStatusFunctions.vb
@@ -1,4 +1,5 @@
-Imports SDL
+Imports Confluent.Kafka
+Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.cGlobal
 Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
@@ -1181,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
@@ -1219,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
@@ -1813,8 +1815,8 @@ ELSE_ATILLA:

        If SendungsId Is Nothing Then Return False
        If Not IsNumeric(SendungsId) Then Return False
-        If AvisoID Is Nothing Then Return False
-        If Not IsNumeric(AvisoID) Then Return False
+        'If AvisoID Is Nothing Then Return False
+        'If Not IsNumeric(AvisoID) Then Return False

        Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)

@@ -1837,10 +1839,10 @@ ELSE_ATILLA:
                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
            End If
            SENDUNG_TMP.tblSnd_Vorbereitet = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        Else
            SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()

@@ -1850,8 +1852,8 @@ ELSE_ATILLA:

        If SendungsId Is Nothing Then Return False
        If Not IsNumeric(SendungsId) Then Return False
-        If AvisoID Is Nothing Then Return False
-        If Not IsNumeric(AvisoID) Then Return False
+        'If AvisoID Is Nothing Then Return False
+        'If Not IsNumeric(AvisoID) Then Return False

        Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)

@@ -1876,21 +1878,39 @@ ELSE_ATILLA:
            'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId

            SENDUNG_TMP.tblSnd_AbklaerungTR = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf ABGEKLÄRT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEKLÄRT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf ABGEKLÄRT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEKLÄRT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        Else
            SENDUNG_TMP.tblSnd_AbklaerungTR = Nothing
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT ABGEKLÄRT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT ABGEKLÄRT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf NICHT ABGEKLÄRT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT ABGEKLÄRT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()

    End Function

+    Public Function setSendungSpeditionsbuchEintrag(SendungsId, AvisoID) As Boolean
+
+        Dim FUNC As New AvisoStatusFunctions
+
+        Dim posnr As posNr = FUNC.SpeditionsbuchEintrag(AvisoID, SendungsId)
+        If posnr IsNot Nothing Then
+            Dim sndEntry As New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)
+            sndEntry.FilialenNr = posnr.Filiale
+            sndEntry.AbfertigungsNr = posnr.Abfertigungsnummer
+            sndEntry.UnterNr = posnr.UnterNr
+            'sndEntry.tblSnd_SpeditionsbuchEingetragen = (posnr.Filiale > 0 And posnr.Abfertigungsnummer > 0 And posnr.UnterNr >= 0) ' Wenn Sped Eintrag gelöscht-> - 1, dann ist der Eintrag nicht mehr vorhanden
+            Dim vorhanden = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & sndEntry.FilialenNr & "' AND AbfertigungsNr='" & sndEntry.AbfertigungsNr & "' AND UnterNr='" & sndEntry.UnterNr & "'", "FMZOLL")
+            sndEntry.tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
+            sndEntry.SAVE()
+        End If
+        'Vermerke_anzeigen()
+
+    End Function
    Public Function setSendungAbfertigungTR(SendungsId, AvisoID, Optional anzahl = 1, Optional anzahlPos = 1) As Boolean

        If SendungsId Is Nothing Then Return False
        If Not IsNumeric(SendungsId) Then Return False
-        If AvisoID Is Nothing Then Return False
-        If Not IsNumeric(AvisoID) Then Return False
+        'If AvisoID Is Nothing Then Return False
+        'If Not IsNumeric(AvisoID) Then Return False

        Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)

@@ -1917,10 +1937,10 @@ ELSE_ATILLA:
            ' If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId

            SENDUNG_TMP.tblSnd_AbfertigungTR = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf ABGEFERTIGT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEFERTIGT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & "(Anz:" & SENDUNG_TMP.tblSnd_AbfertigungTRAnzahl & ", Pos:" & SENDUNG_TMP.tblSnd_AbfertigungTRAnzahlPos & ")")
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf ABGEFERTIGT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf ABGEFERTIGT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & "(Anz:" & SENDUNG_TMP.tblSnd_AbfertigungTRAnzahl & ", Pos:" & SENDUNG_TMP.tblSnd_AbfertigungTRAnzahlPos & ")")
        Else
            SENDUNG_TMP.tblSnd_AbfertigungTR = Nothing
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT ABGEFERTIGT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT ABGEFERTIGT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf NICHT ABGEFERTIGT (TR) gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT ABGEFERTIGT (TR) gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()

@@ -1930,8 +1950,8 @@ ELSE_ATILLA:

        If SendungsId Is Nothing Then Return False
        If Not IsNumeric(SendungsId) Then Return False
-        If AvisoID Is Nothing Then Return False
-        If Not IsNumeric(AvisoID) Then Return False
+        'If AvisoID Is Nothing Then Return False
+        'If Not IsNumeric(AvisoID) Then Return False

        Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)

@@ -1940,10 +1960,10 @@ ELSE_ATILLA:
        If SENDUNG_TMP.tblSnd_Fakturiert Is Nothing Then

            SENDUNG_TMP.tblSnd_Fakturiert = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        Else
            SENDUNG_TMP.tblSnd_Fakturiert = Nothing
-            AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
+            AvisoDAL.addAenderung(If(AvisoID, -1), "Sendung auf NICHT FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
        End If
        Return SENDUNG_TMP.SAVE()

@@ -1955,9 +1975,9 @@ ELSE_ATILLA:


            If sendId Is Nothing Then Return Nothing
-            If AvisoID Is Nothing Then Return Nothing
+            ' If AvisoID Is Nothing Then Return Nothing
            If sendId <= 0 Then Return Nothing
-            If AvisoID <= 0 Then Return Nothing
+            ' If AvisoID <= 0 Then Return Nothing

            For Each openForm In Application.OpenForms()
                If TypeOf (openForm) Is frmSendungsdetailsNEU Then
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/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")
@@ -330,8 +336,15 @@ Public Class frmAvisoWeiterleiten
                Next
            End If
        ElseIf sender Is Button2 Then
-            addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG")
-            addBtn(flpFirma, "W", "WO_MERIS", "MERIS", True, "VERAG")
+
+
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT grz_Grenzstelle, grz_Bezeichnung, grz_Firma  FROM tblGrenzstelle WHERE grz_FreigabeWeb = 1 and grz_Firma is not null order by grz_Grenzstelle", "AVISO")
+            If dt IsNot Nothing Then
+                For Each t In dt.Rows
+                    addBtn(flpFirma, "W", t("grz_Grenzstelle"), t("grz_Bezeichnung"), True, t("grz_Firma"))
+                Next
+            End If
+

        End If

--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
@@ -53,7 +53,7 @@ Partial Class usrCntlBenachrichtigungen
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel2.Location = New System.Drawing.Point(0, 0)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(284, 203)
+        Me.Panel2.Size = New System.Drawing.Size(284, 278)
        Me.Panel2.TabIndex = 2
        '
        'MyComboBox2
@@ -89,7 +89,7 @@ Partial Class usrCntlBenachrichtigungen
        Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen"
        Me.gridAvisoBenachrichtigungen.ReadOnly = True
        Me.gridAvisoBenachrichtigungen.RowHeadersVisible = False
-        Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(284, 144)
+        Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(284, 209)
        Me.gridAvisoBenachrichtigungen.TabIndex = 2
        '
        'Panel4
@@ -101,16 +101,16 @@ Partial Class usrCntlBenachrichtigungen
        Me.Panel4.Controls.Add(Me.Button10)
        Me.Panel4.Controls.Add(Me.txtVermerk)
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel4.Location = New System.Drawing.Point(0, 165)
+        Me.Panel4.Location = New System.Drawing.Point(0, 230)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(284, 38)
+        Me.Panel4.Size = New System.Drawing.Size(284, 48)
        Me.Panel4.TabIndex = 5
        '
        'cbxTaskForce
        '
        Me.cbxTaskForce.AutoSize = True
        Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black
-        Me.cbxTaskForce.Location = New System.Drawing.Point(174, 19)
+        Me.cbxTaskForce.Location = New System.Drawing.Point(174, 30)
        Me.cbxTaskForce.Name = "cbxTaskForce"
        Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17)
        Me.cbxTaskForce.TabIndex = 33
@@ -122,7 +122,7 @@ Partial Class usrCntlBenachrichtigungen
        '
        Me.cbxVerwarung.AutoSize = True
        Me.cbxVerwarung.ForeColor = System.Drawing.Color.Black
-        Me.cbxVerwarung.Location = New System.Drawing.Point(85, 19)
+        Me.cbxVerwarung.Location = New System.Drawing.Point(85, 30)
        Me.cbxVerwarung.Name = "cbxVerwarung"
        Me.cbxVerwarung.Size = New System.Drawing.Size(83, 17)
        Me.cbxVerwarung.TabIndex = 32
@@ -134,7 +134,7 @@ Partial Class usrCntlBenachrichtigungen
        '
        Me.cbxNeukunden.AutoSize = True
        Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
-        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 19)
+        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 30)
        Me.cbxNeukunden.Name = "cbxNeukunden"
        Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
        Me.cbxNeukunden.TabIndex = 30
@@ -146,11 +146,10 @@ Partial Class usrCntlBenachrichtigungen
        '
        Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button10.Enabled = False
-        Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button10.ForeColor = System.Drawing.Color.Black
        Me.Button10.Image = Global.AVISO.My.Resources.Resources.ok
        Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button10.Location = New System.Drawing.Point(159, 3)
+        Me.Button10.Location = New System.Drawing.Point(159, 0)
        Me.Button10.Name = "Button10"
        Me.Button10.Size = New System.Drawing.Size(121, 30)
        Me.Button10.TabIndex = 3
@@ -163,7 +162,7 @@ Partial Class usrCntlBenachrichtigungen
        '
        Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtVermerk.Location = New System.Drawing.Point(7, -1)
+        Me.txtVermerk.Location = New System.Drawing.Point(7, 3)
        Me.txtVermerk.Name = "txtVermerk"
        Me.txtVermerk.ReadOnly = True
        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
@@ -233,7 +232,7 @@ Partial Class usrCntlBenachrichtigungen
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.Panel2)
        Me.Name = "usrCntlBenachrichtigungen"
-        Me.Size = New System.Drawing.Size(284, 203)
+        Me.Size = New System.Drawing.Size(284, 278)
        Me.Panel2.ResumeLayout(False)
        CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel4.ResumeLayout(False)
--- a/Elemente/SendTAB.Designer.vb
+++ b/Elemente/SendTAB.Designer.vb
@@ -25,6 +25,7 @@ Partial Class sendTAB
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(sendTAB))
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.lblColliWeight = New System.Windows.Forms.Label()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.lblAuftr = New System.Windows.Forms.Label()
        Me.lblAbfBez = New System.Windows.Forms.Label()
@@ -39,6 +40,7 @@ Partial Class sendTAB
        'pnl
        '
        Me.pnl.BackColor = System.Drawing.Color.LightGray
+        Me.pnl.Controls.Add(Me.lblColliWeight)
        Me.pnl.Controls.Add(Me.pic)
        Me.pnl.Controls.Add(Me.lblAuftr)
        Me.pnl.Controls.Add(Me.lblAbfBez)
@@ -47,14 +49,31 @@ Partial Class sendTAB
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Margin = New System.Windows.Forms.Padding(0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(90, 50)
+        Me.pnl.Size = New System.Drawing.Size(100, 60)
        Me.pnl.TabIndex = 0
        '
+        'lblColliWeight
+        '
+        Me.lblColliWeight.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblColliWeight.BackColor = System.Drawing.Color.DarkGray
+        Me.lblColliWeight.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblColliWeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.5!)
+        Me.lblColliWeight.Location = New System.Drawing.Point(1, 47)
+        Me.lblColliWeight.Margin = New System.Windows.Forms.Padding(0)
+        Me.lblColliWeight.Name = "lblColliWeight"
+        Me.lblColliWeight.Size = New System.Drawing.Size(100, 13)
+        Me.lblColliWeight.TabIndex = 4
+        Me.lblColliWeight.Text = "-"
+        Me.lblColliWeight.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.lblColliWeight.UseCompatibleTextRendering = True
+        '
        'pic
        '
+        Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
        Me.pic.Image = CType(resources.GetObject("pic.Image"), System.Drawing.Image)
-        Me.pic.Location = New System.Drawing.Point(78, 2)
+        Me.pic.Location = New System.Drawing.Point(88, 2)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(10, 10)
        Me.pic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -63,10 +82,13 @@ Partial Class sendTAB
        '
        'lblAuftr
        '
+        Me.lblAuftr.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.lblAuftr.Cursor = System.Windows.Forms.Cursors.Hand
        Me.lblAuftr.Location = New System.Drawing.Point(3, 19)
        Me.lblAuftr.Name = "lblAuftr"
-        Me.lblAuftr.Size = New System.Drawing.Size(86, 31)
+        Me.lblAuftr.Size = New System.Drawing.Size(96, 27)
        Me.lblAuftr.TabIndex = 2
        Me.lblAuftr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
@@ -94,7 +116,7 @@ Partial Class sendTAB
        '
        Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungDuplizierenToolStripMenuItem})
        Me.cntxt.Name = "cntxt"
-        Me.cntxt.Size = New System.Drawing.Size(184, 48)
+        Me.cntxt.Size = New System.Drawing.Size(184, 26)
        '
        'SendungDuplizierenToolStripMenuItem
        '
@@ -110,7 +132,7 @@ Partial Class sendTAB
        Me.Controls.Add(Me.pnl)
        Me.Margin = New System.Windows.Forms.Padding(2, 2, 0, 0)
        Me.Name = "sendTAB"
-        Me.Size = New System.Drawing.Size(90, 50)
+        Me.Size = New System.Drawing.Size(100, 60)
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -125,5 +147,5 @@ Partial Class sendTAB
    Friend WithEvents pic As System.Windows.Forms.PictureBox
    Friend WithEvents cntxt As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents SendungDuplizierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-
+    Public WithEvents lblColliWeight As Label
 End Class
--- a/Aviso/Benutzerdefinierte
+++ b/Aviso/Benutzerdefinierte
@@ -165,16 +165,15 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAAAdtJREFUSEu91b8vX1Ec
-        xnG/F8IiUWksTSr+Af+AoQYGtYrFJoLBn/BFLDaJRBNiYrAZDZams6QpdpWIVjo1EcL1PnKOfM65z/3e
-        izC8kt7PeT7nSVSOhizL3pUcOrVarUnNX0sOHQq70KPOXkMOKRrAJn5VLSXX6Pe21HmQG7DwGYfIvEql
-        ZJqw4Xe2VcaJPgi2Yx03frFSKWe9WMYfhB1ZGn0QOjULKVnK7CN2fCaVK40+CIQfSZFcKd+L+O/PlX2b
-        f/pHQGAlWUg9lsL9guziDirn3OOvvT8qCwhVKV1LZsoVxu3dUZFFsKzUXabmwRlm0WnvjUpShMtKi5xg
-        WN2ZG6RYfEnpDBrVfbmBwvKeuayeA4yg8B2WwxQXLPgLy8yrfUsOAy7oxzf88xeW+Y26z6AcOiy2wZWp
-        i+uRL1Ighyx0Ywn2bXyOwtLcgGAf3AuiLrKOxMySpdGHQ2gV136pnilUeZE+2PujMidZUH5iEh0+X1Z6
-        bu+PyhwCE8mCdYkxsVNU6v6u/rDZaDEg9NUsBReYQ/Q2mh1VeoxBm4uWLIK21P1ffFE5i0wovYV7dYbQ
-        YjPRQopwKJ1W5wpZV/odn9R5bpBicQyt6qwI+VE0q7Pc4K3J4dvJGh4AKs9H2nJin04AAAAASUVORK5C
-        YII=
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAa1JREFUSEu91U2rTlEY
+        xvHj4EyIieIkE0W+gC9gwIABpicTMwkDH+GHTMyUosiIgZmhgYmMlbzMUfKSkRLxaNfatbvXvZ+1T+dl
+        8J9ca133v/Z+9v0szGazhc2kCnqwGLP1oAp6sBt7Y75WqqADR3Afb6ZKsaX0HsSzIVWAQ3iOWWGStHsF
+        uFs6D+N5TyztwB38HgibUizjBr4OOqk0Ft8HUVOK/XiU3E+lsdw/kjEqKa7hZ3K35+mosAy4mZQqafmB
+        PMbf5E7PP3ybK1yF9HaSR77jbFM4UdoNi9mQD7iEXZOEE6VjvMOJOK8pXIP0YrcI4qxJwiJ9kgzNeIaT
+        8/ZwFWTgajI840rsRqogiA7jHn4kwzM+xu80UgUD2VKRxaEtquXQFGIProfduBpGpVWAA2WDxCGRV0nW
+        lGbCW/iVDIicn/DJdNJ9LWEsRV7jHHaW+y3pp5ZwJSn1fMHppDMm7f5XX84VlgFnkvJnXI67sSF9i6NN
+        YSLt3sXxeCcykP4pW+cYtg3vVKUwoJdeiGdjFOkLHIxnHVUQ6d4Ztsd8HjiFrTHvqIKNpgo2mv8qz0fa
+        BPXDKgAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Aviso/Benutzerdefinierte
+++ b/Aviso/Benutzerdefinierte
@@ -7,12 +7,12 @@

    Dim list As List(Of MyListItem)

-    Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click
+    Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click, lblColliWeight.Click

        RaiseEvent MECLICK(Me)
    End Sub

-    Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click
+    Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click, lblColliWeight.Click
        If e.Button = MouseButtons.Right Then
            Me.ContextMenuStrip = cntxt
            cntxt.Show(MousePosition)
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("4.2.5.0")>
-<Assembly: AssemblyFileVersion("4.2.5.0")>
+<Assembly: AssemblyVersion("4.2.7.5")>
+<Assembly: AssemblyFileVersion("4.2.7.5")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -169,6 +169,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property aktualisieren_40() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("aktualisieren_40", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -378,6 +388,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property AVISO_DCS() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("AVISO_DCS", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -858,6 +878,466 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_add() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_add", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_declarantAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_declarantAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_logicust() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_logicust", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_tariffAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_tariffAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_transitAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_transitAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_ATR() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_ATR", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_checklist() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_checklist", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_CMR() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_CMR", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_dienstplan() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_dienstplan", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_DocEdit() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_DocEdit", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docFin() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docFin", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docSave() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docSave", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docSearch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docSearch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_fakturierung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_fakturierung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_handshake() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_handshake", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_ImportAssistant() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_ImportAssistant", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_importaviso() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_importaviso", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_inventor() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_inventor", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kasse() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kasse", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kassenbuch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kassenbuch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kunden() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kunden", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_loupe() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_loupe", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_mail() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_mail", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_mitarbeiter() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_mitarbeiter", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_Options() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_Options", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_organigram() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_organigram", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_parkzeit() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_parkzeit", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_persDocument() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_persDocument", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_rechnungen() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_rechnungen", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_security() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_security", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_settings() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_settings", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_speditionsbuch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_speditionsbuch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_statistic() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_statistic", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_support() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_support", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_truck() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_truck", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_verknuepfung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_verknuepfung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_verzeichnis() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_verzeichnis", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_vorkasse() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_vorkasse", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webSearch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webSearch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webSecurity() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webSecurity", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webWww() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webWww", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_weel() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_weel", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_weitereForm() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_weitereForm", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_www() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_www", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_zeiterfassung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_zeiterfassung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_zertifikate() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_zertifikate", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1498,6 +1978,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property SND_loesen() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("SND_loesen", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property SND_verbinden() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("SND_verbinden", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -724,4 +724,154 @@
  <data name="ambar_boarder_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="aktualisieren_40" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aktualisieren-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AVISO_DCS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AVISO_DCS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SND_loesen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SND_loesen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SND_verbinden" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SND_verbinden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_checklist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_dienstplan" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_dienstplan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_DocEdit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_DocEdit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docFin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docFin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docSearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docSearch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_fakturierung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_fakturierung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_handshake" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_handshake.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_inventor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_inventor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kassenbuch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kassenbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kunden" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kunden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_loupe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_loupe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_mail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_parkzeit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_parkzeit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_persDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_persDocument.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_rechnungen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_rechnungen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_security" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_security.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_truck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_truck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_verzeichnis" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_verzeichnis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_weel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_weel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_zeiterfassung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_zeiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_organigram" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_organigram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_speditionsbuch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_speditionsbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_statistic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_statistic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_support" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_support.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_verknuepfung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_verknuepfung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webSearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webSearch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webSecurity" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webSecurity.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webWww" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webWww.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_www" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_www.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_zertifikate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_zertifikate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_ATR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_ATR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_CMR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_CMR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_ImportAssistant" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_ImportAssistant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_Options" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_Options.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_declarantAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_declarantAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_logicust" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_logicust.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_tariffAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_tariffAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_transitAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_transitAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_importaviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_importaviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_vorkasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_vorkasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_weitereForm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_weitereForm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/Aviso/Resources/AVISO_DCS.png
+++ b/Aviso/Resources/AVISO_DCS.png
--- a/Aviso/Resources/SND_loesen.png
+++ b/Aviso/Resources/SND_loesen.png
--- a/Aviso/Resources/SND_verbinden.png
+++ b/Aviso/Resources/SND_verbinden.png
--- a/Aviso/Resources/aktualisieren-40.png
+++ b/Aviso/Resources/aktualisieren-40.png
--- a/Aviso/Resources/ico_ATR.png
+++ b/Aviso/Resources/ico_ATR.png
--- a/Aviso/Resources/ico_CMR.png
+++ b/Aviso/Resources/ico_CMR.png
--- a/Aviso/Resources/ico_DocEdit.png
+++ b/Aviso/Resources/ico_DocEdit.png
--- a/Aviso/Resources/ico_ImportAssistant.png
+++ b/Aviso/Resources/ico_ImportAssistant.png
--- a/Aviso/Resources/ico_Options.png
+++ b/Aviso/Resources/ico_Options.png
--- a/Aviso/Resources/ico_add.png
+++ b/Aviso/Resources/ico_add.png
--- a/Aviso/Resources/ico_atez_declarantAI.png
+++ b/Aviso/Resources/ico_atez_declarantAI.png
--- a/Aviso/Resources/ico_atez_logicust.png
+++ b/Aviso/Resources/ico_atez_logicust.png
--- a/Aviso/Resources/ico_atez_tariffAI.png
+++ b/Aviso/Resources/ico_atez_tariffAI.png
--- a/Aviso/Resources/ico_atez_transitAI.png
+++ b/Aviso/Resources/ico_atez_transitAI.png
--- a/Aviso/Resources/ico_checklist.png
+++ b/Aviso/Resources/ico_checklist.png
--- a/Aviso/Resources/ico_dienstplan.png
+++ b/Aviso/Resources/ico_dienstplan.png
--- a/Aviso/Resources/ico_docFin.png
+++ b/Aviso/Resources/ico_docFin.png
--- a/Aviso/Resources/ico_docSave.png
+++ b/Aviso/Resources/ico_docSave.png
--- a/Aviso/Resources/ico_docSearch.png
+++ b/Aviso/Resources/ico_docSearch.png
--- a/Aviso/Resources/ico_fakturierung.png
+++ b/Aviso/Resources/ico_fakturierung.png
--- a/Aviso/Resources/ico_handshake.png
+++ b/Aviso/Resources/ico_handshake.png
--- a/Aviso/Resources/ico_importaviso.png
+++ b/Aviso/Resources/ico_importaviso.png
--- a/Aviso/Resources/ico_inventor.png
+++ b/Aviso/Resources/ico_inventor.png
--- a/Aviso/Resources/ico_kasse.png
+++ b/Aviso/Resources/ico_kasse.png
--- a/Aviso/Resources/ico_kassenbuch.png
+++ b/Aviso/Resources/ico_kassenbuch.png
--- a/Aviso/Resources/ico_kunden.png
+++ b/Aviso/Resources/ico_kunden.png
--- a/Aviso/Resources/ico_loupe.png
+++ b/Aviso/Resources/ico_loupe.png
--- a/Aviso/Resources/ico_mail.png
+++ b/Aviso/Resources/ico_mail.png
--- a/Aviso/Resources/ico_mitarbeiter.png
+++ b/Aviso/Resources/ico_mitarbeiter.png
--- a/Aviso/Resources/ico_organigram.png
+++ b/Aviso/Resources/ico_organigram.png
--- a/Aviso/Resources/ico_parkzeit.png
+++ b/Aviso/Resources/ico_parkzeit.png
--- a/Aviso/Resources/ico_persDocument.png
+++ b/Aviso/Resources/ico_persDocument.png
--- a/Aviso/Resources/ico_rechnungen.png
+++ b/Aviso/Resources/ico_rechnungen.png
--- a/Aviso/Resources/ico_security.png
+++ b/Aviso/Resources/ico_security.png
--- a/Aviso/Resources/ico_settings.png
+++ b/Aviso/Resources/ico_settings.png
--- a/Aviso/Resources/ico_speditionsbuch.png
+++ b/Aviso/Resources/ico_speditionsbuch.png
--- a/Aviso/Resources/ico_statistic.png
+++ b/Aviso/Resources/ico_statistic.png
--- a/Aviso/Resources/ico_support.png
+++ b/Aviso/Resources/ico_support.png
--- a/Aviso/Resources/ico_truck.png
+++ b/Aviso/Resources/ico_truck.png
--- a/Aviso/Resources/ico_verknuepfung.png
+++ b/Aviso/Resources/ico_verknuepfung.png
--- a/Aviso/Resources/ico_verzeichnis.png
+++ b/Aviso/Resources/ico_verzeichnis.png
--- a/Aviso/Resources/ico_vorkasse.png
+++ b/Aviso/Resources/ico_vorkasse.png
--- a/Aviso/Resources/ico_webSearch.png
+++ b/Aviso/Resources/ico_webSearch.png
--- a/Aviso/Resources/ico_webSecurity.png
+++ b/Aviso/Resources/ico_webSecurity.png
--- a/Aviso/Resources/ico_webWww.png
+++ b/Aviso/Resources/ico_webWww.png
--- a/Aviso/Resources/ico_weel.png
+++ b/Aviso/Resources/ico_weel.png
--- a/Aviso/Resources/ico_weitereForm.png
+++ b/Aviso/Resources/ico_weitereForm.png
--- a/Aviso/Resources/ico_www.png
+++ b/Aviso/Resources/ico_www.png
--- a/Aviso/Resources/ico_zeiterfassung.png
+++ b/Aviso/Resources/ico_zeiterfassung.png
--- a/Aviso/Resources/ico_zertifikate.png
+++ b/Aviso/Resources/ico_zertifikate.png
--- a/Aviso/frmAddSendungsvermerkShort.Designer.vb
+++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb
@@ -27,16 +27,15 @@ 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.Label5 = New System.Windows.Forms.Label()
-        Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox()
+        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.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()
@@ -46,34 +45,18 @@ Partial Class frmAddSendungsvermerkShort
        Me.Label3 = New System.Windows.Forms.Label()
        Me.lblErr240Zeichen = New System.Windows.Forms.Label()
        Me.txtDetail = New System.Windows.Forms.TextBox()
-        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.txtCustomerUploadEmailText = New System.Windows.Forms.TextBox()
-        Me.lblCustomerUploadEmailText = New System.Windows.Forms.Label()
-        Me.pnlCustomerUploadSeparator = New System.Windows.Forms.Panel()
        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.Label17 = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
        Me.txtFreierText = New System.Windows.Forms.TextBox()
-        Me.Label20 = New System.Windows.Forms.Label()
-        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.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -89,23 +72,22 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlMain.Location = New System.Drawing.Point(0, 0)
        Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(474, 868)
+        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.Label5)
-        Me.pnlSendungsVermker.Controls.Add(Me.txtSonstigesDokumentFehlt)
+        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.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)
@@ -115,62 +97,37 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlSendungsVermker.Controls.Add(Me.Label3)
        Me.pnlSendungsVermker.Controls.Add(Me.lblErr240Zeichen)
        Me.pnlSendungsVermker.Controls.Add(Me.txtDetail)
-        Me.pnlSendungsVermker.Controls.Add(Me.btnCustomerUploadLink)
-        Me.pnlSendungsVermker.Controls.Add(Me.btnCustomerUploadEmail)
-        Me.pnlSendungsVermker.Controls.Add(Me.txtCustomerUploadEmail)
-        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadEmail)
-        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadValidityHours)
-        Me.pnlSendungsVermker.Controls.Add(Me.nudCustomerUploadValidityHours)
-        Me.pnlSendungsVermker.Controls.Add(Me.cmbCustomerUploadLanguage)
-        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadLanguage)
-        Me.pnlSendungsVermker.Controls.Add(Me.txtCustomerUploadEmailText)
-        Me.pnlSendungsVermker.Controls.Add(Me.lblCustomerUploadEmailText)
-        Me.pnlSendungsVermker.Controls.Add(Me.pnlCustomerUploadSeparator)
        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.Label17)
        Me.pnlSendungsVermker.Controls.Add(Me.Label13)
        Me.pnlSendungsVermker.Controls.Add(Me.txtFreierText)
-        Me.pnlSendungsVermker.Controls.Add(Me.Label20)
-        Me.pnlSendungsVermker.Controls.Add(Me.PictureBox1)
        Me.pnlSendungsVermker.Controls.Add(Me.PictureBox4)
        Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0)
        Me.pnlSendungsVermker.Name = "pnlSendungsVermker"
-        Me.pnlSendungsVermker.Size = New System.Drawing.Size(474, 868)
+        Me.pnlSendungsVermker.Size = New System.Drawing.Size(474, 400)
        Me.pnlSendungsVermker.TabIndex = 0
        '
-        'Label5
+        'flpAngefordert
        '
-        Me.Label5.AutoSize = True
-        Me.Label5.BackColor = System.Drawing.Color.WhiteSmoke
-        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(2, 642)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(202, 17)
-        Me.Label5.TabIndex = 118
-        Me.Label5.Text = "Kundenportal Upload-Link:"
-        '
-        '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(96, 214)
-        Me.txtSonstigesDokumentFehlt.MaxLength = 80
-        Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt"
-        Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(198, 20)
-        Me.txtSonstigesDokumentFehlt.TabIndex = 10
+        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, 563)
+        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
@@ -180,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, 610)
+        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
@@ -191,7 +148,7 @@ 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, 587)
+        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
@@ -203,19 +160,32 @@ Partial Class frmAddSendungsvermerkShort
        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, 468)
+        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, 468)
+        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
@@ -226,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, 537)
+        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
@@ -250,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(93, 233)
-        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
@@ -277,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, 484)
+        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
@@ -298,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, 486)
+        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
@@ -309,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, 513)
+        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
@@ -320,7 +278,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.optATAangefordert.AutoSize = True
        Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optATAangefordert.Location = New System.Drawing.Point(164, 610)
+        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
@@ -331,7 +289,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.Label3.AutoSize = True
        Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label3.Location = New System.Drawing.Point(308, 487)
+        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
@@ -341,7 +299,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.lblErr240Zeichen.AutoSize = True
        Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
-        Me.lblErr240Zeichen.Location = New System.Drawing.Point(212, 785)
+        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
@@ -353,127 +311,20 @@ 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(5, 801)
+        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
        '
-        'btnCustomerUploadLink
-        '
-        Me.btnCustomerUploadLink.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCustomerUploadLink.Location = New System.Drawing.Point(340, 668)
-        Me.btnCustomerUploadLink.Name = "btnCustomerUploadLink"
-        Me.btnCustomerUploadLink.Size = New System.Drawing.Size(124, 23)
-        Me.btnCustomerUploadLink.TabIndex = 108
-        Me.btnCustomerUploadLink.Text = "Link kopieren"
-        Me.btnCustomerUploadLink.UseVisualStyleBackColor = True
-        '
-        'btnCustomerUploadEmail
-        '
-        Me.btnCustomerUploadEmail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCustomerUploadEmail.Location = New System.Drawing.Point(340, 694)
-        Me.btnCustomerUploadEmail.Name = "btnCustomerUploadEmail"
-        Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(124, 23)
-        Me.btnCustomerUploadEmail.TabIndex = 109
-        Me.btnCustomerUploadEmail.Text = "E-Mail senden"
-        Me.btnCustomerUploadEmail.UseVisualStyleBackColor = True
-        '
-        'txtCustomerUploadEmail
-        '
-        Me.txtCustomerUploadEmail.BackColor = System.Drawing.Color.White
-        Me.txtCustomerUploadEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtCustomerUploadEmail.Location = New System.Drawing.Point(80, 696)
-        Me.txtCustomerUploadEmail.MaxLength = 255
-        Me.txtCustomerUploadEmail.Name = "txtCustomerUploadEmail"
-        Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(254, 20)
-        Me.txtCustomerUploadEmail.TabIndex = 107
-        '
-        'lblCustomerUploadEmail
-        '
-        Me.lblCustomerUploadEmail.AutoSize = True
-        Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(2, 699)
-        Me.lblCustomerUploadEmail.Name = "lblCustomerUploadEmail"
-        Me.lblCustomerUploadEmail.Size = New System.Drawing.Size(54, 13)
-        Me.lblCustomerUploadEmail.TabIndex = 110
-        Me.lblCustomerUploadEmail.Text = "E-Mail an:"
-        '
-        'lblCustomerUploadValidityHours
-        '
-        Me.lblCustomerUploadValidityHours.AutoSize = True
-        Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(176, 672)
-        Me.lblCustomerUploadValidityHours.Name = "lblCustomerUploadValidityHours"
-        Me.lblCustomerUploadValidityHours.Size = New System.Drawing.Size(66, 13)
-        Me.lblCustomerUploadValidityHours.TabIndex = 111
-        Me.lblCustomerUploadValidityHours.Text = "Gültigkeit(h):"
-        '
-        'nudCustomerUploadValidityHours
-        '
-        Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(260, 670)
-        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(74, 20)
-        Me.nudCustomerUploadValidityHours.TabIndex = 112
-        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(80, 670)
-        Me.cmbCustomerUploadLanguage.Name = "cmbCustomerUploadLanguage"
-        Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(80, 21)
-        Me.cmbCustomerUploadLanguage.TabIndex = 116
-        '
-        'lblCustomerUploadLanguage
-        '
-        Me.lblCustomerUploadLanguage.AutoSize = True
-        Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(2, 673)
-        Me.lblCustomerUploadLanguage.Name = "lblCustomerUploadLanguage"
-        Me.lblCustomerUploadLanguage.Size = New System.Drawing.Size(72, 13)
-        Me.lblCustomerUploadLanguage.TabIndex = 117
-        Me.lblCustomerUploadLanguage.Text = "Mail Sprache:"
-        '
-        'txtCustomerUploadEmailText
-        '
-        Me.txtCustomerUploadEmailText.BackColor = System.Drawing.Color.White
-        Me.txtCustomerUploadEmailText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtCustomerUploadEmailText.Location = New System.Drawing.Point(80, 718)
-        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(254, 54)
-        Me.txtCustomerUploadEmailText.TabIndex = 113
-        Me.txtCustomerUploadEmailText.Text = "Bitte laden Sie die angeforderten Dokumente über den Link hoch."
-        '
-        'lblCustomerUploadEmailText
-        '
-        Me.lblCustomerUploadEmailText.AutoSize = True
-        Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(2, 721)
-        Me.lblCustomerUploadEmailText.Name = "lblCustomerUploadEmailText"
-        Me.lblCustomerUploadEmailText.Size = New System.Drawing.Size(63, 13)
-        Me.lblCustomerUploadEmailText.TabIndex = 114
-        Me.lblCustomerUploadEmailText.Text = "E-Mail Text:"
-        '
-        'pnlCustomerUploadSeparator
-        '
-        Me.pnlCustomerUploadSeparator.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnlCustomerUploadSeparator.Location = New System.Drawing.Point(-8, 779)
-        Me.pnlCustomerUploadSeparator.Name = "pnlCustomerUploadSeparator"
-        Me.pnlCustomerUploadSeparator.Size = New System.Drawing.Size(474, 1)
-        Me.pnlCustomerUploadSeparator.TabIndex = 115
-        '
        'lblZustzlFreitext
        '
        Me.lblZustzlFreitext.AutoSize = True
-        Me.lblZustzlFreitext.Location = New System.Drawing.Point(2, 785)
+        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
@@ -483,51 +334,39 @@ 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, 484)
+        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(310, 216)
-        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(313, 801)
+        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(14, 216)
-        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, 537)
+        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
@@ -538,7 +377,7 @@ Partial Class frmAddSendungsvermerkShort
        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, 537)
+        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
@@ -549,7 +388,7 @@ 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, 459)
+        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
@@ -559,38 +398,19 @@ Partial Class frmAddSendungsvermerkShort
        '
        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, 511)
+        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
        '
-        'Label20
-        '
-        Me.Label20.AutoSize = True
-        Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label20.Location = New System.Drawing.Point(267, 487)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(0, 13)
-        Me.Label20.TabIndex = 21
-        '
-        '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(474, 250)
-        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, 450)
+        Me.PictureBox4.Location = New System.Drawing.Point(-1, 190)
        Me.PictureBox4.Name = "PictureBox4"
-        Me.PictureBox4.Size = New System.Drawing.Size(481, 189)
+        Me.PictureBox4.Size = New System.Drawing.Size(474, 139)
        Me.PictureBox4.TabIndex = 78
        Me.PictureBox4.TabStop = False
        '
@@ -608,7 +428,7 @@ Partial Class frmAddSendungsvermerkShort
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(474, 868)
+        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)
@@ -620,8 +440,6 @@ Partial Class frmAddSendungsvermerkShort
        Me.pnlMain.ResumeLayout(False)
        Me.pnlSendungsVermker.ResumeLayout(False)
        Me.pnlSendungsVermker.PerformLayout()
-        CType(Me.nudCustomerUploadValidityHours, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

@@ -630,7 +448,6 @@ 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
@@ -638,9 +455,8 @@ Partial Class frmAddSendungsvermerkShort
    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 lblErrSpedition As System.Windows.Forms.Label
    Friend WithEvents lblErrGrund As System.Windows.Forms.Label
@@ -648,28 +464,15 @@ Partial Class frmAddSendungsvermerkShort
    Friend WithEvents Label13 As System.Windows.Forms.Label
    Friend WithEvents txtFreierText As System.Windows.Forms.TextBox
    Friend WithEvents txtSpedition As System.Windows.Forms.TextBox
-    Friend WithEvents Label20 As System.Windows.Forms.Label
    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 Label4 As Label
    Friend WithEvents optFremd_ATB As CheckBox
    Friend WithEvents optFremd_SendungAvisiert As CheckBox
    Public WithEvents txtDetail As TextBox
-    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 pnlCustomerUploadSeparator As Panel
-    Friend WithEvents Label5 As Label
+    Friend WithEvents flpAngefordert As FlowLayoutPanel
 End Class
--- a/Aviso/frmAddSendungsvermerkShort.vb
+++ b/Aviso/frmAddSendungsvermerkShort.vb
--- a/Aviso/frmGesamtsicherheiten.vb
+++ b/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()
--- a/Aviso/frmGesamtsicherheitenMenu.vb
+++ b/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

--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -68,6 +68,7 @@ Public Class frmGesamtsicherheitenMenuNEU

    Public Function LoadDGV()
        Dim sqladdon As String = ""
+        Dim sqlWhere As String = ""
        Dim sqlSicherheitssaldo As String = ""
        If chkOffen.Checked Then sqlSicherheitssaldo &= " HAVING
                                                            (   COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + 
@@ -77,6 +78,24 @@ Public Class frmGesamtsicherheitenMenuNEU
        If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"
        If cbxAUTO.Checked Then sqladdon &= " AND CAST(gs_dakoyimport AS INT) = 1"

+
+        If txtSuchbegriff.Text <> "" Then
+
+            sqlWhere = " AND ( gs.gs_freitext LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_avisoId LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_ATBNr LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_VeralteteWeitereRegistriernummer LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_MRNNr LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
+                                        gs.gs_warenort LIKE '%" & txtSuchbegriff.Text.Trim() & "%'
+                                    )"
+
+
+
+
+        End If
+
        'Dim sqlstring As String =
        '    " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
        '             max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
@@ -145,17 +164,10 @@ Public Class frmGesamtsicherheitenMenuNEU
                                    tblGesamtsicherheit gs
                                LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr
                                LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr
-                                WHERE
+                                WHERE gs.gs_gsnr <> 2030 AND
                                    gs.gs_standort = '" & Standort & "' " & sqladdon & "
-                                    AND gs.gs_datum BETWEEN '" & Date.Parse(txtDatVon.Text) & "' AND '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'
-                                    AND (
-                                        gs.gs_freitext LIKE '%" & txtSuchbegriff.Text & "%' OR
-                                        gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text & "%' OR
-                                        gs.gs_avisoId LIKE '%" & txtSuchbegriff.Text & "%' OR
-                                        gs.gs_ATBNr LIKE '%" & txtSuchbegriff.Text & "%' OR
-                                        gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text & "%' OR
-                                        gs.gs_warenort LIKE '%" & txtSuchbegriff.Text & "%'
-                                    )
+                                    AND gs.gs_datum BETWEEN '" & Date.Parse(txtDatVon.Text) & "' AND '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'" & sqlWhere & " 
+                                    
                                GROUP BY
                                    gs.gs_gsnr " & sqlSicherheitssaldo &
                                "ORDER BY
@@ -252,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()
@@ -472,7 +484,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                                    WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag
                                    WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag
                                END) AS gs_SicherheitsSaldo
-                            FROM tblGesamtsicherheit
+                            FROM tblGesamtsicherheit WHERE gs_gsnr <> 2030
                            GROUP BY gs_gsnr
                        ),
                        PositionenSaldo AS (
@@ -482,7 +494,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                                    WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag
                                    WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag
                                END) AS gsp_SicherheitsSaldo
-                            FROM tblGesamtsicherheitsPositionen
+                            FROM tblGesamtsicherheitsPositionen WHERE gsp_gsnr <> 2030
                            GROUP BY gsp_gsnr
                        )
                        SELECT 
@@ -497,7 +509,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                            FROM tblGesamtsicherheit gs
                            LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr
                            LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr
-                            WHERE gs.gs_standort = '" & Standort & "'
+                            WHERE gs.gs_standort = '" & Standort & "' AND gs.gs_gsnr <> 2030
                            AND gs.gs_datum < '" & Date.Now().AddDays(-85) & "'
                            GROUP BY gs.gs_gsnr
                        ) AS meh2
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
--- a/Aviso/frmGesamtsicherheitenNEU.resx
+++ b/Aviso/frmGesamtsicherheitenNEU.resx
@@ -241,7 +241,7 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -298,7 +298,7 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -80,12 +80,7 @@ Public Class frmGesamtsicherheitenNEU

            cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)

-            If warenortPrefix <> "" Then
-                cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1  AND wo_ze = 1 AND LEFT([wo_warenort],2) = " & warenortPrefix & " ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
-            Else
-                cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1  AND wo_ze = 1 AND [wo_firma] = " & firmaId & " ORDER BY [wo_reihenfolge]  ", True, "AVISO", True) '
-            End If
-
+            setcboWarenort(True)


            If datum = Nothing Then datum = Date.Now
@@ -94,28 +89,6 @@ Public Class frmGesamtsicherheitenNEU

            txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)

-            If Standort = "AMBAR GmbH" Then
-                For i As Integer = 0 To cboFiliale.Items.Count - 1
-                    If cboFiliale.Items(i).ToString().Contains("5701") Then
-                        cboFiliale.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-                For i As Integer = 0 To cboWarenort.Items.Count - 1
-                    If cboWarenort.Items(i).ToString().Contains("AMBAR") Then
-                        cboWarenort.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-            ElseIf grenzstelle <> "" Then
-
-                For i As Integer = 0 To cboWarenort.Items.Count - 1
-                    If cboWarenort.Items(i).ToString().Contains(grenzstelle) Then
-                        cboWarenort.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-            End If

        Else
            LoadDGVSicherheiten(True)
@@ -127,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)
@@ -384,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
@@ -757,7 +738,7 @@ Public Class frmGesamtsicherheitenNEU
        End Select
    End Sub

-    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress
+    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress, txtAnzahl.KeyPress
        Select Case Asc(e.KeyChar)
            Case 48 To 57, 8, 44, 46, 58
                'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226
@@ -829,12 +810,15 @@ Public Class frmGesamtsicherheitenNEU
                attachPosNrToExistingATB = False
                Dim warenwert As Double
                Dim sicherheitsbetrag As Double
+                Dim AnzahlEH As Integer
                If count > 1 Then
                    warenwert = 0
                    sicherheitsbetrag = 0
+                    AnzahlEH = 0
                Else
                    warenwert = Double.Parse(txtSicherheitWarenwert.Text)
                    sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
+                    AnzahlEH = Integer.Parse(setNullToZero(txtAnzahl.Text))
                End If

                Dim OPEN As New cSicherheiten()
@@ -856,6 +840,7 @@ Public Class frmGesamtsicherheitenNEU
                    .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                    .gs_zollsatz = Me.Zollsatz
                    .gs_avisoId = Me.avisoID
+                    .gs_EH_Anzahl = AnzahlEH
                    setEnviromentDataToObject(OPEN, Me)
                End With

@@ -961,6 +946,7 @@ Public Class frmGesamtsicherheitenNEU
                .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                .gs_zollsatz = Me.Zollsatz
                .gs_avisoId = Me.avisoID
+                .gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
                setEnviromentDataToObject(OPEN, Me)
            End With

@@ -1146,6 +1132,7 @@ Public Class frmGesamtsicherheitenNEU
        cboSicherheitATR.SelectedItem = Sicherh.gs_atr
        txtSicherheitDat.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy")
        txtSicherheitTime.Text = Sicherh.gs_datum.ToString("HH:mm")
+        txtAnzahl.Text = Sicherh.gs_EH_Anzahl

        currentSicherheit = Sicherh
        txtAnzahlPos.Enabled = False
@@ -1187,7 +1174,7 @@ Public Class frmGesamtsicherheitenNEU
            .gs_gsNr = Me.gessicherheitID
            '.MakeDate = Me.MakeDate
            .gs_freitext = Me.txtSicherheitFreitext.Text
-            '.saldo = currentGesSichRef.Saldo
+            .gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
            .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
        End With

@@ -1389,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
@@ -1719,20 +1706,14 @@ Public Class frmGesamtsicherheitenNEU


            txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
-
            txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)

            Dim countSicherheitsbetrag As Double = 0
            Dim countWarenwert As Double = 0

            For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
-
-
-
                countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
                countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
-
-
            Next

            txtSicherheitsbGes._value = countSicherheitsbetrag.ToString
@@ -2339,4 +2320,58 @@ Public Class frmGesamtsicherheitenNEU

    End Sub

+    Private Sub setcboWarenort(setDefaultValue As Boolean)
+
+        Dim whereWarenort As String = " WHERE [wo_aktiv] = 1  AND wo_ze = 1"
+
+
+        If Standort = "Atilla GmbH" Then
+
+            '----'nicht unisped und cs und ambar aber alle anderen - laut j.Siener am 23.03.2026
+
+            whereWarenort &= " AND [wo_firma] not in (24, 21,22,23, 11)"
+
+        Else
+            If warenortPrefix <> "" Then
+                whereWarenort &= " AND LEFT([wo_warenort],2) = " & warenortPrefix & ""
+            Else
+                whereWarenort &= " AND [wo_firma] = " & firmaId
+            End If
+
+        End If
+
+        cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] " & whereWarenort, True, "AVISO", True)
+
+
+        If setDefaultValue AndAlso cboWarenort.Items.Count > 0 Then
+
+            If Standort = "AMBAR GmbH" Then
+                For i As Integer = 0 To cboFiliale.Items.Count - 1
+                    If cboFiliale.Items(i).ToString().Contains("5701") Then
+                        cboFiliale.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+                For i As Integer = 0 To cboWarenort.Items.Count - 1
+                    If cboWarenort.Items(i).ToString().Contains("AMBAR") Then
+                        cboWarenort.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+            ElseIf grenzstelle <> "" Then
+
+                For i As Integer = 0 To cboWarenort.Items.Count - 1
+                    If cboWarenort.Items(i).ToString().Contains(grenzstelle) Then
+                        cboWarenort.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+            End If
+
+        End If
+
+
+
+    End Sub
+
 End Class
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim 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.components)
@@ -81,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()
@@ -98,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()
@@ -132,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()
@@ -306,6 +309,7 @@ Partial Class frmHauptfenster
        Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
+        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.components)
@@ -418,10 +422,12 @@ Partial Class frmHauptfenster
        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.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
-        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
+        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()
@@ -655,7 +661,7 @@ Partial Class frmHauptfenster
        '
        'AdministrationToolStripMenuItem
        '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem, Me.PrüfeBilderAufBase64ToolStripMenuItem})
        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -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
@@ -2658,6 +2682,15 @@ Partial Class frmHauptfenster
        Me.SplitContainer3.SplitterDistance = 99
        Me.SplitContainer3.TabIndex = 3
        '
+        'UsrCntlBenachrichtigungen1
+        '
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
        'pnl
        '
        Me.pnl.Controls.Add(Me.Button10)
@@ -2690,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)
@@ -3148,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
@@ -4013,6 +4046,15 @@ Partial Class frmHauptfenster
        Me.pnlLeft.TabIndex = 88
        Me.pnlLeft.Visible = False
        '
+        'UsrCntlBenachrichtigungen2
+        '
+        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
        'Panel5
        '
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -4030,23 +4072,24 @@ Partial Class frmHauptfenster
        Me.Panel7.Size = New System.Drawing.Size(252, 51)
        Me.Panel7.TabIndex = 4
        '
-        'UsrCntlBenachrichtigungen1
+        'ToolStripMenuItem3
        '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        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"
        '
-        'UsrCntlBenachrichtigungen2
+        'ToolStripMenuItem23
        '
-        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
-        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
-        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        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
        '
@@ -4510,4 +4553,10 @@ Partial Class frmHauptfenster
    Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
    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
--- a/Aviso/frmHauptfenster.resx
+++ b/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>
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
--- a/Aviso/frmHauptfensterNew.Designer.vb
+++ b/Aviso/frmHauptfensterNew.Designer.vb
--- a/Aviso/frmHauptfensterNew.resx
+++ b/Aviso/frmHauptfensterNew.resx
@@ -123,67 +123,13 @@
  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>249, 17</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnFakturierung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAG9JREFUSEvt
-        lTEOgDAMA52PV3wM9WmgMGSIAkNpaolg6ZamzQ0eCgAQkWMF6rriB1nwhQA6gG2A7pdHREJ9PJLml0fY
-        7TrCbAoKX3T4FOvXTmjCbAoKl3fIEOpv0Saz3wqz4QsZHX5cmM0vnA5FeAJTug01ZzKXygAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="btnRg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAG9JREFUSEvt
-        lTEOgDAMA52PV3wM9WmgMGSIAkNpaolg6ZamzQ0eCgAQkWMF6rriB1nwhQA6gG2A7pdHREJ9PJLml0fY
-        7TrCbAoKX3T4FOvXTmjCbAoKl3fIEOpv0Saz3wqz4QsZHX5cmM0vnA5FeAJTug01ZzKXygAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="btnKunden.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAP1JREFUSEvt
-        k0sKwkAQRLsRL+BOj+XevQtdeAY9ozv1FgYEP0wYZXjpnoxJBBd5UGCqq6slEJGRkX9BVZ+WmBsMHvLE
-        vV6wvE3c7wyL28T9EmYsGUqhm8feLI3wjl6pRGRteCseNV+n55fI2+VdN0SvVN4u73qhLb1SiciGXvSb
-        h+kFVPXkzSzigTP9gNmjqg9zkLwN+iSXi7M7/RpVvRmvpv4MkucD90Rkj6NT9qjqFTvlGGX8k9/DEiqX
-        zc2oNJsNJ7FJ8tvjk2FPo5Nmoip2zI1Z0DGKfihexO6KsyTjw/C3Yl8R4VtkUQdd2NuKUdJJ7M3C5b5i
-        /8jIT3kBe5JJfQp6Jq0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnZollwebseiten.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAgBJREFUSEvt
-        1suLzXEYx/HXSVggt7LzH8jWzm0t8geQXFaU3DfEwshfoFzK2kLMTimFYkURcisjNhOxcmk06DN9z/Q7
-        3845M+PMRs1TT33P8/08n/c5M79znge+YBk24A2+4TMuYC2WYiFaekfuook2PemNR7xeY2O5S81vvCjC
-        NTiMUfzCeKvV+oMr5Q0tx7wGKOfU1uNy0Y6X3ngcKZ7xfjbBiqgIf2AYW3AGd/EBPxvgIazDopI5DzVA
-        0X7EveIRr5v4PslpH0pTGh7jBLbiJG6Vd9uGPsDBkg8bsGiiPYVtOI5H8exgNF80wGm+hr3Yjqt4iU/4
-        WmVquYsm2vSkd7T27QlsgEdwuhjtwHlcxKWSOaeWu2iifVf7TBvYgO7DEmzCTuwqmfNmLC6fbKTur3NK
-        4ISIc1iJs7iD+yVzzoO0Ind1X7ecKfA6xhr1MdyYA3Z41YVuOQecA3Z41YVu+X8DM/PqYp2zBSzz1f6s
-        FvVlJRwYiLc4EOD88kv/vBbNFrCsMJk4C9q7ScbLbjypxYMC8RR7CqMjsgxlkN7OFB8UWDaBeGVmxrtr
-        ZJXLBpYZ9+pfgektHvGKZ9/I33k1DrUfppkAy8ORVTMek/+zqSKL7SocLSvGtIB4j2Olt9/i3DOykWfd
-        y1dnKmA0WS/TM1Bkhc9XJ9ELmIgm2r7xF+xPKXpoDa+RAAAAAElFTkSuQmCC
-</value>
-  </data>
  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>364, 17</value>
  </metadata>
-  <data name="btnZertifikate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAgBJREFUSEvt
-        1suLzXEYx/HXSVggt7LzH8jWzm0t8geQXFaU3DfEwshfoFzK2kLMTimFYkURcisjNhOxcmk06DN9z/Q7
-        3845M+PMRs1TT33P8/08n/c5M79znge+YBk24A2+4TMuYC2WYiFaekfuook2PemNR7xeY2O5S81vvCjC
-        NTiMUfzCeKvV+oMr5Q0tx7wGKOfU1uNy0Y6X3ngcKZ7xfjbBiqgIf2AYW3AGd/EBPxvgIazDopI5DzVA
-        0X7EveIRr5v4PslpH0pTGh7jBLbiJG6Vd9uGPsDBkg8bsGiiPYVtOI5H8exgNF80wGm+hr3Yjqt4iU/4
-        WmVquYsm2vSkd7T27QlsgEdwuhjtwHlcxKWSOaeWu2iifVf7TBvYgO7DEmzCTuwqmfNmLC6fbKTur3NK
-        4ISIc1iJs7iD+yVzzoO0Ind1X7ecKfA6xhr1MdyYA3Z41YVuOQecA3Z41YVu+X8DM/PqYp2zBSzz1f6s
-        FvVlJRwYiLc4EOD88kv/vBbNFrCsMJk4C9q7ScbLbjypxYMC8RR7CqMjsgxlkN7OFB8UWDaBeGVmxrtr
-        ZJXLBpYZ9+pfgektHvGKZ9/I33k1DrUfppkAy8ORVTMek/+zqSKL7SocLSvGtIB4j2Olt9/i3DOykWfd
-        y1dnKmA0WS/TM1Bkhc9XJ9ELmIgm2r7xF+xPKXpoDa+RAAAAAElFTkSuQmCC
-</value>
-  </data>
  <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1158, 17</value>
  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Button8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -246,6 +192,9 @@
        AAAAAElFTkSuQmCC
 </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>
--- a/Aviso/frmHauptfensterNew.vb
+++ b/Aviso/frmHauptfensterNew.vb
@@ -20,8 +20,6 @@ Public Class frmHauptfensterNew



-    Public AVISO_TYP = "LKW"
-    Public aktiv = False
    Private AvisoDAL As New cAvisoDAL
    Private VermerkeDAL As New cVermerkeDAL
    Private Standorte As New cStandorteDAL
@@ -49,11 +47,13 @@ Public Class frmHauptfensterNew
    Public gridFont As New Font(Me.Font.FontFamily, 8)
    Dim cFormularManager As New VERAG_PROG_ALLGEMEIN.cFormularManager
    ' Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER
-    Dim sd = 0
-    Dim closeOK = False
-    Dim Fullscreen = False
-    Dim rowHeight = 20
+
    Dim chkFarben = True
+    Dim closeOK = False
+
+    Dim sd = 0
+
+    Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr

    Private VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL

@@ -65,6 +65,7 @@ Public Class frmHauptfensterNew


    Dim SEARCH_AVISO As usrCntlHauptfenster_Suche_AVISO = Nothing
+    Dim SEARCH_SND As usrCntlHauptfenster_Suche_SND = Nothing
    Dim SEARCH_AVISO_AKTIV As String = "AVISO"

    Public Sub New()
@@ -101,41 +102,124 @@ Public Class frmHauptfensterNew
    End Sub
    Sub SWITCH_SEARCH(switchTO)
        pnlMain.Controls.Clear()
+        pnlMain_Bottom.Controls.Clear()
        SEARCH_AVISO_AKTIV = switchTO

+
+        ' toggle_Buttons_Main(sender)
+        For Each button As Control In FlowLayoutPanel1.Controls
+            With button
+                If Not .Name.ToString.Contains("DEFAULT") Then
+                    .BackColor = btnDEFAULT_UnSelected.BackColor
+                    .ForeColor = btnDEFAULT_UnSelected.ForeColor
+                    .Font = btnDEFAULT_UnSelected.Font
+                End If
+            End With
+        Next
+
+        Dim SelectedBtn As Button = Nothing
+
+
+
        Select Case SEARCH_AVISO_AKTIV
            Case "SND"
-                Dim aaaaa As New usrCntlSND_Ausfuhr
-                pnlMain.Controls.Add(aaaaa)
-                initsearch("", False) ': Aviso_anzeigen("")
-
+                splitMainWorkingView.Panel2Collapsed = True
+                SelectedBtn = btnVIEW_SND
+                If SEARCH_SND Is Nothing Then SEARCH_SND = New usrCntlHauptfenster_Suche_SND
+                SEARCH_SND.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain.Controls.Add(SEARCH_SND)
+                SEARCH_SND.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_SND.PerformLayout()
+                Application.DoEvents()
            Case "AVISO"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_LKW)
                If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
-
+                SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
                pnlMain.Controls.Add(SEARCH_AVISO)
-
-                'SEARCH_AVISO.Dock = DockStyle.Fill
-                SEARCH_AVISO.Visible = True
-                SEARCH_AVISO.BringToFront()
-                SEARCH_AVISO.Width = pnlMain.Width
-                SEARCH_AVISO.Height = pnlMain.Height
-
+                SEARCH_AVISO.Dock = DockStyle.Fill
                pnlMain.PerformLayout()
                SEARCH_AVISO.PerformLayout()
                Application.DoEvents()

+            Case "AVISO_SND_KOMBI"
+                splitMainWorkingView.Panel2Collapsed = False
+                SetBtnSelectedolor(btnVIEW_KOMBI)
+                If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain.Controls.Add(SEARCH_AVISO)
+                SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+                '--------------------------------------------------------------
+                If SEARCH_SND Is Nothing Then SEARCH_SND = New usrCntlHauptfenster_Suche_SND
+                SEARCH_SND.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain_Bottom.Controls.Add(SEARCH_SND)
+                SEARCH_SND.Dock = DockStyle.Fill
+                pnlMain_Bottom.PerformLayout()
+                SEARCH_SND.PerformLayout()
+                Application.DoEvents()
+
+            Case "COMPLIANCE"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_Compliance)
+                'If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                'SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                'pnlMain.Controls.Add(SEARCH_AVISO)
+                'SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+
+            Case "CUSTOMS_CONTROLLING"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_CustControling)
+                'If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                'SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                'pnlMain.Controls.Add(SEARCH_AVISO)
+                'SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()

-                MsgBox(pnlMain.Width & " / " & pnlMain.Height)
-                MsgBox(SEARCH_AVISO.Width & " / " & SEARCH_AVISO.Height)
        End Select

+        initsearch(SEARCH_AVISO_AKTIV, False) ': Aviso_anzeigen("")
+
+
+
    End Sub

+    Sub SetBtnSelectedolor(SelectedBtn)
+        With SelectedBtn
+            .BackColor = btnDEFAULT_Selected.BackColor
+            .ForeColor = btnDEFAULT_Selected.ForeColor
+            .Font = btnDEFAULT_Selected.Font
+        End With
+    End Sub
    Sub initsearch(hSort As String, Optional showDetails As Boolean = True)
+        If SEARCH_AVISO IsNot Nothing Then
+
+            Select Case SEARCH_AVISO_AKTIV
+                Case "AVISO" : SEARCH_AVISO.Aviso_anzeigen(hSort, showDetails) ': Aviso_anzeigen("") 
+            End Select
+        End If
+    End Sub
+
+    Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click

        Select Case SEARCH_AVISO_AKTIV
-            Case "AVISO" : SEARCH_AVISO.Aviso_anzeigen(hSort, showDetails) ': Aviso_anzeigen("") 
+            Case "SND"
+                If SEARCH_SND IsNot Nothing Then SEARCH_SND.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID, True)
+            Case "AVISO"
+                If SEARCH_AVISO IsNot Nothing Then SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+            Case "AVISO_SND_KOMBI"
+                If SEARCH_AVISO IsNot Nothing Then SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+                If SEARCH_SND IsNot Nothing Then SEARCH_SND.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID, True)
        End Select
+        UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
    End Sub

    Private Sub frmMain_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown
@@ -506,7 +590,7 @@ Public Class frmHauptfensterNew
        'Grid jetzt aktivieren und befüllen - Standardanzeige ident mit Button Wichtig
        Grid_aktiv = True
        SucheStandort = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim
-        If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper
+        ' If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper
        initsearch(" ORDER BY Ankunft")

        UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
@@ -1441,35 +1525,31 @@ ELSE_ATILLA:
        End If
    End Sub

-    Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click
-        SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
-        UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
-
-    End Sub


-    Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
-        Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cF = Color.Black Then cF = Color.Gray
-            DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception

-        End Try
-    End Sub
-    Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
-        Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cB = Color.Gray Then cB = Color.Black
-            DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception
+    'Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
+    '    Try
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        If cF = Color.Black Then cF = Color.Gray
+    '        DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).BackColor = cF
+    '    Catch ex As Exception

-        End Try
-    End Sub
+    '    End Try
+    'End Sub
+    'Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
+    '    Try
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        If cB = Color.Gray Then cB = Color.Black
+    '        DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).BackColor = cF
+    '    Catch ex As Exception
+
+    '    End Try
+    'End Sub



@@ -1733,7 +1813,7 @@ ELSE_ATILLA:
            'btnGenerelleGestellungen.Visible = False
            Button6.Visible = False

-            btnWichtigeStandort.Visible = False
+            'btnWichtigeStandort.Visible = False
            Panel2.Visible = False

        ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
@@ -1800,6 +1880,8 @@ ELSE_ATILLA:
            End If
        End If

+        'Evtl abhängign vom User machen:
+        SWITCH_SEARCH("AVISO")

    End Sub

@@ -1817,8 +1899,9 @@ ELSE_ATILLA:
    WithEvents timerStart As New Timer

    Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
-        Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
-
+        If SEARCH_AVISO IsNot Nothing Then
+            Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
+        End If
        Try
            VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath()
        Catch ex As Exception
@@ -2389,6 +2472,8 @@ ELSE_ATILLA:
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX"
                pnlOptionen.Visible = Not pnlOptionen.Visible
+
+                pnlOptionen.Location = Cursor.Position
            Case Else
                Dim s As New SDL.frmSecureLoginKassenbuch
                s.openKB = True
@@ -3049,7 +3134,9 @@ ELSE_ATILLA:
                                End If
                            End If
                        Next
-                        If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
+                        If cbxInfoChat.Checked Then '# 'Anzeicge Infobox Neuer Chat Ein/Aus
+                            If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
+                        End If
                    Else
                        Me.Icon = My.Resources.Aviso
                    End If
@@ -3791,7 +3878,7 @@ ELSE_ATILLA:

        Dim f As New frmSendungsdetailsNEU

-        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
+        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(-1, f.SENDUNG_LIST.Count + 1,  , Nothing, 0, 0) 'Neue Sendung erstellen
        NEW_SND.SAVE(False) 'Insert neue Sendung
        f.SENDUNG_LIST.Add(NEW_SND)

@@ -3813,7 +3900,7 @@ ELSE_ATILLA:
        detailForm.Show()
    End Sub

-    Private Sub btnWichtigeStandort_Click(sender As Object, e As EventArgs) Handles btnWichtigeStandort.Click
+    Private Sub btnWichtigeStandort_Click(sender As Object, e As EventArgs) Handles btnVIEW_LKW.Click
        Grid_aktiv = False
        SWITCH_SEARCH("AVISO")

@@ -3821,11 +3908,66 @@ ELSE_ATILLA:
        Grid_aktiv = True
    End Sub

-    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
+    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles btnVIEW_SND.Click
        Grid_aktiv = False
        SWITCH_SEARCH("SND")

        ' SEARCH_AVISO.RESET()
        Grid_aktiv = True
    End Sub
+
+    Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click
+
+
+        Me.Cursor = Cursors.WaitCursor
+        'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing
+        If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then
+            Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront()
+            Me.Cursor = Cursors.Default : Exit Sub
+        End If
+        '  Next
+        Try
+            Dim zoll As New SDL.frmKundenUebersichtZOLL
+            zoll.Show()
+            Me.Cursor = Cursors.Default
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Private Sub Button7_Click_2(sender As Object, e As EventArgs) Handles btnVIEW_KOMBI.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("AVISO_SND_KOMBI")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles btnVIEW_Compliance.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("COMPLIANCE")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnVIEW_CustControling.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("CUSTOMS_CONTROLLING")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    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
--- a/Aviso/frmLaufzettel.vb
+++ b/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
--- a/Aviso/frmNotify.Designer.vb
+++ b/Aviso/frmNotify.Designer.vb
@@ -47,7 +47,7 @@ Partial Class frmNotify
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(300, 70)
+        Me.pnl.Size = New System.Drawing.Size(227, 70)
        Me.pnl.TabIndex = 1
        '
        'lblText
@@ -57,7 +57,7 @@ Partial Class frmNotify
        Me.lblText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblText.Location = New System.Drawing.Point(0, 25)
        Me.lblText.Name = "lblText"
-        Me.lblText.Size = New System.Drawing.Size(298, 43)
+        Me.lblText.Size = New System.Drawing.Size(225, 43)
        Me.lblText.TabIndex = 0
        Me.lblText.Text = "Der LKW SD 13 AS steht bereits seit über 2 Stunden! "
        Me.lblText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -65,12 +65,12 @@ Partial Class frmNotify
        'Header
        '
        Me.Header.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Header.Controls.Add(Me.lblTitle)
        Me.Header.Controls.Add(Me.btnClose)
+        Me.Header.Controls.Add(Me.lblTitle)
        Me.Header.Dock = System.Windows.Forms.DockStyle.Top
        Me.Header.Location = New System.Drawing.Point(0, 0)
        Me.Header.Name = "Header"
-        Me.Header.Size = New System.Drawing.Size(298, 25)
+        Me.Header.Size = New System.Drawing.Size(225, 25)
        Me.Header.TabIndex = 87
        '
        'lblTitle
@@ -79,7 +79,7 @@ Partial Class frmNotify
        Me.lblTitle.ForeColor = System.Drawing.Color.White
        Me.lblTitle.Location = New System.Drawing.Point(3, 0)
        Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(241, 24)
+        Me.lblTitle.Size = New System.Drawing.Size(194, 24)
        Me.lblTitle.TabIndex = 88
        Me.lblTitle.Text = "LKW Standzeit Benachrichtigung"
        Me.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -93,7 +93,7 @@ Partial Class frmNotify
        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(264, -1)
+        Me.btnClose.Location = New System.Drawing.Point(191, -1)
        Me.btnClose.Name = "btnClose"
        Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
        Me.btnClose.Size = New System.Drawing.Size(35, 25)
@@ -106,7 +106,7 @@ Partial Class frmNotify
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(300, 70)
+        Me.ClientSize = New System.Drawing.Size(227, 70)
        Me.Controls.Add(Me.pnl)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
        Me.MaximumSize = New System.Drawing.Size(300, 300)
--- a/Aviso/frmReferenzenSicherheiten.Designer.vb
+++ b/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
--- a/Aviso/frmReferenzenSicherheiten.resx
+++ b/Aviso/frmReferenzenSicherheiten.resx
--- a/Aviso/frmReferenzenSicherheiten.vb
+++ b/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
--- a/Aviso/frmSendungsDokumentanforderung.Designer.vb
+++ b/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
--- a/Aviso/frmSendungsDokumentanforderung.resx
+++ b/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>
--- a/Aviso/frmSendungsDokumentanforderung.vb
+++ b/Aviso/frmSendungsDokumentanforderung.vb
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1386,25 +1386,6 @@
        nRA+F3D8f7cAkA4zZGm9AAAAAElFTkSuQmCC
 </value>
  </data>
-  <data name="btnOptionen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnImportAssi.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
  <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
@@ -1683,14 +1664,6 @@
        E90MFIBuGJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiu
        nDhg32vfHn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOm
        TTNGxhMmTFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnSpedBuch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
 </value>
  </data>
  <metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -1923,9 +1896,6 @@
  <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>174, 17</value>
  </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
  <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>596, 17</value>
  </metadata>
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -17,6 +17,7 @@ Public Class frmSendungsdetailsNEU
    Public AvisoId As Integer
    Public SendungID As Integer = -1
    Dim FUNC As New SDL.cProgramFunctions
+
    Dim AVISOFUNC As New AvisoStatusFunctions
    Dim ADMIN As New cADMIN
    Dim AvisoDAL As New cAvisoDAL
@@ -601,6 +602,22 @@ Public Class frmSendungsdetailsNEU
                Button19.Visible = True
            End If

+
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_Statusoptions") Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then
+                lblStatusOptionen.Visible = True
+                pnlStatus.Visible = True
+                flpnlStatus.Visible = True
+            Else
+                lblStatusOptionen.Visible = False
+                pnlStatus.Visible = False
+                flpnlStatus.Visible = False
+            End If
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_Zuteilung") Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then
+                pnlSND_Zuteilung.Visible = True
+            Else
+                pnlSND_Zuteilung.Visible = False
+            End If
+
            ContextMenuStrip3.Items.Clear()
            Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO")
            If dt IsNot Nothing Then
@@ -1082,12 +1099,21 @@ Public Class frmSendungsdetailsNEU
                        b.lblAbfBez.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                        b.lblAuftr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                        b.lblNr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
+                        b.lblColliWeight.BackColor = IIf(b.value = pos, Color.FromArgb(0, 34, 98), Color.DarkGray)
+                        b.lblColliWeight.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)

                        '    Dim r As DataRow = AVISO_newDataSet.tblSendungen.Rows(b.value)
                        '   MsgBox(da("tblSnd_PosUnterNr") & ".  ")
                        b.lblNr.Text = SENDUNG_LIST(b.value).tblSnd_PosUnterNr & ".  "
                        b.lblAbfBez.Text = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & SENDUNG_LIST(b.value).tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
                        b.lblAuftr.Text = loadValue(SENDUNG_LIST(b.value).tblSnd_Empfaenger, "")
+                        b.lblColliWeight.Text = ""
+
+                        If SENDUNG_LIST(b.value).tblSnd_Colli IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Colli) Then b.lblColliWeight.Text = CDbl(SENDUNG_LIST(b.value).tblSnd_Colli).ToString("N0") & " Pk"
+                        If SENDUNG_LIST(b.value).tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Gewicht) Then
+                            b.lblColliWeight.Text &= If(b.lblColliWeight.Text <> "", "/", "") & CDbl(SENDUNG_LIST(b.value).tblSnd_Gewicht).ToString("N0") & " kg"
+                        End If
+

                        'End If
                    End If
@@ -1202,11 +1228,57 @@ Public Class frmSendungsdetailsNEU
        '  Me.ResumeLayout(False)

        changeSelectedButton()
+
+
+        ' Layout beenden, Größe an Inhalte anpassen und Parent-Panels synchronisieren
+        'AdjustFlowPanelHeight()
+
+        ' MsgBox(FlowLayoutPanel.DisplayRectangle.Height)
        FlowLayoutPanel.ResumeLayout(True)
        '   Panel3.Height = FlowLayoutPanel.Height

    End Sub

+    ' Passt FlowLayoutPanel sowie Panel2 / Panel1 an die beinhalteten Controls an.
+    Private Sub AdjustFlowPanelHeight()
+        Try
+            ' Sicherer Layout-Block
+            FlowLayoutPanel.SuspendLayout()
+
+            FlowLayoutPanel.MaximumSize = New Size(500, 55)
+            ' Ermittle benötigte Höhe (PreferredSize berücksichtigt WrapContents)
+            FlowLayoutPanel.AutoSize = True
+            FlowLayoutPanel.WrapContents = True
+            FlowLayoutPanel.PerformLayout()
+            Application.DoEvents()
+            Dim neededHeight As Integer = FlowLayoutPanel.PreferredSize.Height
+            MsgBox(FlowLayoutPanel.Controls.Count & " _ " & FlowLayoutPanel.PreferredSize.Height)
+            ' Behalte minimale Höhe (1) um Nullhöhe zu vermeiden
+            If neededHeight < 1 Then neededHeight = 1
+
+            ' Deaktiviere AutoSize wieder und setze die ermittelte Höhe
+            FlowLayoutPanel.AutoSize = False
+            FlowLayoutPanel.Height = neededHeight
+
+            ' Panel2 und Panel1 oberhalb anpassen, falls vorhanden
+            If Panel2 IsNot Nothing Then
+                Panel2.Height = neededHeight
+                Panel2.MinimumSize = New Size(0, neededHeight)
+            End If
+            If Panel1 IsNot Nothing Then
+                Panel1.Height = neededHeight
+                Panel1.MinimumSize = New Size(0, neededHeight)
+            End If
+
+            ' Falls Form-Layout betroffen ist, erzwinge Neuberechnung
+            Me.PerformLayout()
+            Application.DoEvents()
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        Finally
+            FlowLayoutPanel.ResumeLayout()
+        End Try
+    End Sub

    Public Sub ADD_SND(Optional initAfter = True)
        If AVISO.Abgeschlossen Then Exit Sub
@@ -1244,13 +1316,13 @@ Public Class frmSendungsdetailsNEU
        ' Dim abfnr_tmp As Integer = IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0)

        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
-            '  SENDUNG_LIST.Add(NEW_SND)
+        '  SENDUNG_LIST.Add(NEW_SND)

-            NEW_SND.SAVE(False) 'Insert neue Sendung
-            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
-            ' initDataBinding()
-            If initAfter Then LAST_SENDUNG(False) 'letzte Sendung
-            initButtons()
+        NEW_SND.SAVE(False) 'Insert neue Sendung
+        VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
+        ' initDataBinding()
+        If initAfter Then LAST_SENDUNG(False) 'letzte Sendung
+        initButtons()
        'End If

    End Sub
@@ -1393,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
@@ -1469,7 +1541,7 @@ Public Class frmSendungsdetailsNEU
            txtColli.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, "").ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen
            txtGewicht.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "").ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen
            rtbWarenbezeichnung.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, "")
-            cbxSpedBuch.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen, False)
+            'cbxSpedBuch.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen, False)

            '  cntlBar.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_bar, False)
            '  txtBarBelegNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_barBeleg, "")
@@ -1554,6 +1626,7 @@ Public Class frmSendungsdetailsNEU

            setVorpapiere()

+
            doVeranlagungsValidation()

            initFraechterAvisererFromAkt()
@@ -1604,6 +1677,9 @@ Public Class frmSendungsdetailsNEU
            '                                      End Sub

            '   txtT1Verzollungsadresse.Text = ""
+
+            btnWWberechnen.Visible = False
+
            Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID
                Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                    If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
@@ -1710,6 +1786,10 @@ Public Class frmSendungsdetailsNEU
            initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
            checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)

+            lblSendungsId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID
+
+            initSendungs_Status()
+            initZuteilung()

            SENDUNG_LIST(CURRENT_INDEX).LOAD_VORKOSTEN()
            If tbcntr.SelectedTab Is tbBAR Then
@@ -1772,11 +1852,32 @@ Public Class frmSendungsdetailsNEU
                    If cntlAuftr_Abf IsNot Nothing Then cntlAuftr_Abf.lbl.Text = "X"
                End If
            End If
+            'panel2.Controls. Remove(   Panel1 )
            '-------------------------
+            'FlowLayoutPanel.AutoSize = True
+            'FlowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'FlowLayoutPanel.WrapContents = True   ' oder False je nach Layout

-            Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
-
+            'Panel2.AutoSize = True
+            'Panel2.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'Panel1.AutoSize = True
+            'Panel1.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'FlowLayoutPanel.Dock = DockStyle.Fill
+            'Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'Panel1.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'FlowLayoutPanel.WrapContents = True
+            'FlowLayoutPanel.AutoScroll = False
+            'FlowLayoutPanel.Dock = DockStyle.Top
+            'FlowLayoutPanel.AutoSize = True
+            'FlowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink

+            'FlowLayoutPanel.AutoSize = True
+            'MsgBox(FlowLayoutPanel.PreferredSize.Height)
+            'FlowLayoutPanel.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel2.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel1.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'Panel1.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...

            'SAVE_ME ??????!!!!!!!
        Catch ex As Exception
@@ -1812,6 +1913,125 @@ Public Class frmSendungsdetailsNEU
        End If
    End Sub

+    Sub initSendungs_Status()
+
+
+
+        btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Inaktiv
+        btnStatusVorbereitetQS.BackgroundImage = My.Resources.statusBtn_vorbereitet_InAktiv
+        btnStatusVorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_InAktiv
+        btnStatusAbfertigungTR.BackgroundImage = My.Resources.abfetigungTR_inaktiv
+        btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchInaktiv
+        btnSendungFakturiert.BackgroundImage = My.Resources.fakturiertInaktiv
+        btnStatusAbgeschlossen.BackgroundImage = My.Resources.ok '-> Logik einbauen
+        setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abklärung TR' eintragen")
+        setTooltioBtn(btnStatusVorbereitetQS, "Status 'Vorbereitet-QS' eintragen")
+        setTooltioBtn(btnStatusVorgeschrieben, "Status 'Vorgeschrieben' eintragen")
+        setTooltioBtn(btnStatusAbfertigungTR, "Status 'Abfertigung TR' eintragen")
+        setTooltioBtn(btnSpeditionsbuchEintragen, "Status 'Speditionsbuch Eintragen' eintragen")
+        setTooltioBtn(btnSendungFakturiert, "Status 'Fakturiert' eintragen")
+        setTooltioBtn(btnStatusAbgeschlossen, "Status 'Abgeschlossen' eintragen")
+
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusAbklaerungTR", "AVISO") Then
+            btnStatusAbklaerungTR.Visible = True
+        End If
+        btnStatusVorbereitetQS.Visible = True
+        btnStatusVorgeschrieben.Visible = True
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusAbfertigungTR", "AVISO") Then
+            btnStatusAbfertigungTR.Visible = True
+        End If
+
+        btnSpeditionsbuchEintragen.Visible = True
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusFakturiert", "AVISO") Then
+            btnSendungFakturiert.Visible = True
+        End If
+
+        btnStatusAbgeschlossen.Visible = False
+
+        '---------
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR IsNot Nothing Then
+            btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abklärung TR' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorbereitet IsNot Nothing Then
+            btnStatusVorbereitetQS.BackgroundImage = My.Resources.statusBtn_vorbereitet_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusVorbereitetQS, "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorbereitet).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorgeschrieben IsNot Nothing Then
+            btnStatusVorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_VG_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusVorgeschrieben, "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorgeschrieben).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR IsNot Nothing Then
+            btnStatusAbfertigungTR.BackgroundImage = My.Resources.abfetigungTR_aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusAbfertigungTR, "Status 'Abklärung TR' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
+            btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
+            setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")
+        End If
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fakturiert Then
+            btnSendungFakturiert.BackgroundImage = My.Resources.fakturiertAktiv
+            setTooltioBtn(btnSendungFakturiert, "Status 'Fakturiert' entfernen")
+        End If
+
+
+        'If SENDUNG_LIST(CURRENT_INDEX).abgeschlossen Then
+        '    btnStatusAbgeschlossen.BackgroundImage = My.Resources.ok '-> Logik einbauen
+        '    setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abgeschlossen' aufheben")
+        'End If
+
+
+        lblStatus.Text = VERAG_PROG_ALLGEMEIN.cGlobal.getSNDStatusText(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Status)
+
+
+
+        Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Status
+            'Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ankunft
+            '    pnlStatus.BackColor = usrcntlAktDetails.btnAnkunft.BackColor
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Erfasst : pnlStatus.BackColor = Color.Red
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_InBearbeitung : pnlStatus.BackColor = Color.Orange
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Eingereicht : pnlStatus.BackColor = Color.LightSeaGreen
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ueberlassen : pnlStatus.BackColor = Color.Green
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_NichtEingetroffen : pnlStatus.BackColor = Color.FromArgb(64, 64, 64)
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ankunft : pnlStatus.BackColor = Color.Blue
+
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen
+                lblStatus.Text = "NICHT EINGETR." : pnlStatus.BackColor = Color.Gray 'btnNichtEingetroffen.BackColor
+
+        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
+
+    Sub setTooltioBtn(btn As Button, tooltiptext As String)
+        Dim tt As New ToolTip() : tt.SetToolTip(btn, tooltiptext)
+    End Sub
+
    Sub setVorpapiere()

        cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
@@ -1874,17 +2094,37 @@ Public Class frmSendungsdetailsNEU
            Dim gesGewicht As Double = 0

            For Each s In SENDUNG_LIST
-                If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
-                If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
+                If s.tblSnd_Abfertigungsart_ID <> 45 Then
+                    If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
+                    If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
+                End If
            Next

-            lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
-            lblgesGewicht.Text = If(gesGewicht = 0, "-", gesGewicht.ToString("N1")) & " kg"
+            'lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
+            'lblgesGewicht.Text = If(gesGewicht = 0, "-", gesGewicht.ToString("N1")) & " kg"
+
+            lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk" & If(gesGewicht = 0, "-", ", " & gesGewicht.ToString("N1")) & " kg"

        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub
+
+    Sub initZuteilung()
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisoID >= 0 Then
+            lblSND_Zuteilg.Text = "LKW zugeteilt:"
+            lblSND_ZuteilgAvisoId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisoID.ToString
+            picSND_Zuteilg.BackgroundImage = My.Resources.SND_verbinden
+            btnSND_Zuteilg.Text = "Von LKW lösen"
+        Else
+            lblSND_Zuteilg.Text = "Sendung gelöst"
+            lblSND_ZuteilgAvisoId.Text = "-"
+            picSND_Zuteilg.BackgroundImage = My.Resources.SND_loesen
+            btnSND_Zuteilg.Text = "LKW zuordnen"
+        End If
+
+
+    End Sub
    Sub binddata(o As Object, bindingParam As String, bindingSource As BindingSource, dataName As String, Optional bindingNullValue As Object = Nothing, Optional formatString As String = "")
        o.DataBindings.Clear()
        '    If bindingNullValue = Nothing Then bindingNullValue = DBNull.Value
@@ -1997,7 +2237,7 @@ Public Class frmSendungsdetailsNEU
        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli = txtColli.Text
        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht = txtGewicht.Text
        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung = rtbWarenbezeichnung.Text
-        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = cbxSpedBuch.Checked
+        '     SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = cbxSpedBuch.Checked

        '  SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = cboAufschub._value
        '  MsgBox(CURRENT_INDEX & " _ " & txtColli.Text)
@@ -2357,7 +2597,7 @@ Public Class frmSendungsdetailsNEU
        Return b
    End Function

-    Private Sub btn_Click_1(sender As Object, e As EventArgs) Handles btnSpedBuch.Click
+    Private Sub btn_Click_1(sender As Object, e As EventArgs)

        'loadDataInLIST()
        If Not SAVE_ME() Then
@@ -2378,8 +2618,8 @@ Public Class frmSendungsdetailsNEU
            txtUnterNr.Text = posnr.UnterNr
            'cbxSpedBuch.Checked = (posnr.Filiale > 0 And posnr.Abfertigungsnummer > 0 And posnr.UnterNr >= 0) ' Wenn Sped Eintrag gelöscht-> - 1, dann ist der Eintrag nicht mehr vorhanden
            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)
-
+            'cbxSpedBuch.Checked = (vorhanden > 0)
+            SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)

        End If

@@ -2607,6 +2847,12 @@ Public Class frmSendungsdetailsNEU
            Case "44"
                pnlT1.Controls.Add(usrcntl_ATB)

+                cboVorpapier._value = ""
+                cboVorpapier2._value = ""
+                cboVorpapier3._value = ""
+                txtVorpapierPos.Text = ""
+                txtVorpapier2Pos.Text = ""
+                txtVorpapier3Pos.Text = ""
                cboVorpapier.Enabled = False
                cboVorpapier2.Enabled = False
                cboVorpapier3.Enabled = False
@@ -2641,36 +2887,36 @@ Public Class frmSendungsdetailsNEU
    End Function


-    Sub initOfferteDGV()
-        Try
-            SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
-            Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
-            With MyDatagridview1
-                .Columns.Clear()
-                Dim tmpKdnr = -1
-                For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
-                    If a.sndabr_abrArt = "ABFKOST" Then
-                        Select Case a.sndabr_beteiligter
-                            Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
-                            Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
-                            Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
-                            Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
-                            Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
-                        End Select
-                    End If
-                Next
-                If cboAbfertigungsart._value <> "" Then
-                    If tmpKdnr > 0 Then
-                        .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
-                    End If
-                End If
-            End With
+    'Sub initOfferteDGV()
+    '    Try
+    '        SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
+    '        Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
+    '        With MyDatagridview1
+    '            .Columns.Clear()
+    '            Dim tmpKdnr = -1
+    '            For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
+    '                If a.sndabr_abrArt = "ABFKOST" Then
+    '                    Select Case a.sndabr_beteiligter
+    '                        Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
+    '                        Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
+    '                        Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
+    '                        Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
+    '                        Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
+    '                    End Select
+    '                End If
+    '            Next
+    '            If cboAbfertigungsart._value <> "" Then
+    '                If tmpKdnr > 0 Then
+    '                    .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
+    '                End If
+    '            End If
+    '        End With

-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
+    '    Catch ex As Exception
+    '        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+    '    End Try

-    End Sub
+    'End Sub


    Sub initDGVBelege()
@@ -2774,7 +3020,7 @@ Public Class frmSendungsdetailsNEU

    End Sub

-    Private Sub cbxSpedBuch_CheckedChanged(sender As Object, e As EventArgs) Handles cbxSpedBuch.CheckedChanged
+    Private Sub cbxSpedBuch_CheckedChanged(sender As Object, e As EventArgs)
        cboFiliale.Enabled = Not sender.checked
        txtAbfertigungsnummer.Enabled = Not sender.checked
        txtUnterNr.Enabled = Not sender.checked
@@ -3245,7 +3491,7 @@ Public Class frmSendungsdetailsNEU
        Dim AbfertigungsNr = txtAbfertigungsnummer.Text
        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then Return False
        If Filiale Is Nothing Or AbfertigungsNr Is Nothing Then Return False
-        If cbxSpedBuch.Checked Then Return False
+        'If cbxSpedBuch.Checked Then Return False
        If IsNumeric(Filiale) And IsNumeric(AbfertigungsNr) Then
            If SDL.cRKSV.SpedBuchExists(Filiale, AbfertigungsNr) Then
                Return True
@@ -3338,7 +3584,7 @@ Public Class frmSendungsdetailsNEU
        ' TabControl1.Enabled = Not sperren
        Panel6.Enabled = Not sperren
        Panel16.Enabled = Not sperren
-        btnSpedBuch.Enabled = Not sperren
+        'btnSpedBuch.Enabled = Not sperren
        '  Panel5.Enabled = Not sperren
        '  cboAbfertigungsart.Enabled = Not sperren
        txtAnzahl.Enabled = Not sperren
@@ -4712,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)

@@ -5106,12 +5353,12 @@ Public Class frmSendungsdetailsNEU
            If ABR_ID >= 0 Then
                Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG(ABR_ID)
                ABR.sndabr_LeistungsNr = cboAbrLeistungen._value
-                abr.sndabr_abrArt = ""
+                ABR.sndabr_abrArt = ""
                ABR.sndabr_bezeichnung = txtAbrLeistungsBez.Text.Trim
                ABR.sndabr_beteiligter = cboAbrAn._value.Trim
-                abr.sndabr_preis = CDbl(txtAbrPreis._value)
-                abr.sndabr_einzelPreis = CDbl(txtAbrPreis._value)
-                abr.sndabr_anzahl = 1
+                ABR.sndabr_preis = CDbl(txtAbrPreis._value)
+                ABR.sndabr_einzelPreis = CDbl(txtAbrPreis._value)
+                ABR.sndabr_anzahl = 1
                'SENDUNG_LIST(CURRENT_INDEX).SAVE()
                btnAddAbr.BackgroundImage = My.Resources.plus
            Else
@@ -5131,7 +5378,7 @@ Public Class frmSendungsdetailsNEU
            txtVK_Leistung.Text = ""
            txtVK_Firma.Text = ""
            txtVK_Preis.Text = ""
-            initdgvAbrechnung()
+            initDGVAbrechnung()

        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -5147,7 +5394,7 @@ Public Class frmSendungsdetailsNEU
                Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Find(Function(x) x.sndabr_id = dgvAbrechnung.SelectedRows(0).Cells("clmnAbrID").Value)
                SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Remove(ABR)
                SENDUNG_LIST(CURRENT_INDEX).SAVE(False)
-                initdgvAbrechnung()
+                initDGVAbrechnung()
            End If
        End If
    End Sub
@@ -7257,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)
@@ -7704,7 +7951,7 @@ Public Class frmSendungsdetailsNEU
        Dim vorpT1 = usrcntl_ATB.txtATBT1.Text
        Try

-            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then
+            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then 'GESTELLUNG
                txtWarenwertWaehrung.SET_VALUE("EUR")
                SAVE_ME()
            End If
@@ -7716,24 +7963,26 @@ Public Class frmSendungsdetailsNEU
            End If

            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
-                MsgBox("Warenwert darf nur in EUR angegeben werden")
+                MsgBox("Warenwert der Gestellung darf nur in EUR angegeben werden")
                Exit Sub
            End If

-
-
            For Each s As cSendungen In SENDUNG_LIST
-                'nur Betrag EUR
-                If s.tblSnd_Vorpapier = vorpT1 Then
-                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
-                        If Not s.tblSnd_Abfertigungsart_ID = 44 Then calcWarenwerte += s.tblSnd_Warenwert
-                    Else
-                        MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
-                        Exit Sub
-                    End If
+                If s.tblSnd_Vorpapier = vorpT1 AndAlso Not s.tblSnd_Abfertigungsart_ID = 44 Then

+                    If s.tblSnd_WarenwertWaehrung = "EUR" Then
+                        calcWarenwerte += s.tblSnd_Warenwert
+                    ElseIf s.tblSnd_WarenwertWaehrung <> "" Then
+                        Dim kurs As New cFremdwaehrungskurse(s.tblSnd_WarenwertWaehrung)
+                        If kurs.hasEntry Then
+                            calcWarenwerte += Math.Round(kurs.EXCHANGE_CURTOEUR(s.tblSnd_Warenwert, s.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
+                        Else
+                            MsgBox("Es kann keine Umrechnungskurs zum heutigen Datum für " & s.tblSnd_WarenwertWaehrung & " ermittelt werden!")
+                        End If
+                    End If
                End If

+
            Next

            If txtWarenwert.Text = "" OrElse txtWarenwert.Text = "0,00" Then
@@ -7744,7 +7993,7 @@ Public Class frmSendungsdetailsNEU


            If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert <> 0 AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
-                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
+                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechneter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)

            Else

@@ -7899,4 +8148,86 @@ Public Class frmSendungsdetailsNEU
            initAnhang()
        End If
    End Sub
+
+    Private Sub btnSND_Zuteilg_Click(sender As Object, e As EventArgs) Handles btnSND_Zuteilg.Click
+        MsgBox("TODO")
+    End Sub
+
+    Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If Not cbxFremdspedition.Checked Then
+            If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then
+                initDataBinding()
+            End If
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusAbgeschlossen_Click(sender As Object, e As EventArgs) Handles btnStatusAbgeschlossen.Click
+        '''
+    End Sub
+
+    Private Sub txtVorpapierPos_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtVorpapierPos.KeyPress, txtVorpapier2Pos.KeyPress, txtVorpapier3Pos.KeyPress
+        If Char.IsControl(e.KeyChar) Then
+            Return
+        End If
+
+        If Char.IsDigit(e.KeyChar) OrElse e.KeyChar = ","c OrElse e.KeyChar = "+"c OrElse e.KeyChar = " "c Then
+            Return
+        End If
+
+        e.Handled = True
+    End Sub
+
+    Private Sub txtVorpapierPos_KeyDown(sender As Object, e As KeyEventArgs) Handles txtVorpapierPos.KeyDown, txtVorpapier2Pos.KeyDown, txtVorpapier3Pos.KeyDown
+        If e.Control AndAlso e.KeyCode = Keys.V Then
+            e.SuppressKeyPress = True
+        End If
+    End Sub
 End Class
--- a/Aviso/packages.config
+++ b/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" />
@@ -10,32 +11,48 @@
  <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
  <package id="EAGetMail" version="5.3.5" targetFramework="net47" requireReinstallation="true" />
  <package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
+  <package id="fiskaltrust.interface" version="1.3.45" targetFramework="net48" />
  <package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
  <package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
-  <package id="itext7" version="7.1.11" targetFramework="net47" />
+  <package id="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" />
  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
+  <package id="System.Linq.Async" version="4.0.0" targetFramework="net48" />
  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
  <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
  <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>
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
@@ -118,14 +118,6 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
-        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
-        zULyAAAAAElFTkSuQmCC
-</value>
-  </data>
  <data name="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
@@ -7,13 +7,28 @@ Imports VERAG_PROG_ALLGEMEIN.cGlobal
 Public Class usrCntlHauptfenster_Suche_AVISO


+    Public AVISO_TYP = "LKW"
+    Public aktiv = False
    Dim cProgramFunctions As New cProgramFunctions
-    Dim PARENT_FRMHAUPTFENSTER As frmHauptfensterNew
-
+    Public PARENT_FRMHAUPTFENSTER As frmHauptfensterNew
+    Dim Grid_aktiv As Boolean = False
    Private AvisoDAL As New cAvisoDAL
    Private FUNC As New AvisoStatusFunctions
    Dim OptionenDAL As New VERAG_PROG_ALLGEMEIN.cOptionenDAL

+    Dim sd = 0
+    Dim closeOK = False
+    Dim Fullscreen = False
+    Dim rowHeight = 20
+    Dim chkFarben = True
+
+    Dim lkwbackcolor As Color = Color.FromArgb(220, 220, 220)
+    Dim lkwbackcolorSel As Color = Color.FromArgb(200, 200, 200)
+
+    Public gridFont As New Font(Me.Font.FontFamily, 8)
+
+    Private VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
+

    Public Sub RESET()
        cboGrenzstelle.SelectedIndex = 0
@@ -27,8 +42,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        Aviso_anzeigen("")
    End Sub

-    Private Sub usrCntlHauptfenster_Suche_AVISO_Load(sender As Object, e As EventArgs) Handles Me.Load

+    Private Sub usrCntlHauptfenster_Suche_AVISO_Load(sender As Object, e As EventArgs) Handles Me.Load
+        pnlSearch.Height = 145
        PARENT_FRMHAUPTFENSTER = PARENT_FRMHAUPTFENSTER

        If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -56,62 +72,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            gridAviso.Rows(0).Selected = True
        End If

-        If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
-            cboMy_Grenzstelle.Items.Clear()
-            cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "'  AND  grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'   AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
-            cboMy_Grenzstelle.changeItem("")
-        Else
-            cboMy_Grenzstelle.Items.Clear()
-            ''''If Not VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then ' Nicht, wenn Front-Office
-            ''''    cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE (BACKOFFICE)", "ALLE_BACK"))
-            ''''End If

-            cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True, False, "ALLE")
-            '   cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG+AMB", "SBG+AMB"))
-            cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE WARENORTE", "ALLE_WO"))
-            cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
-            cboMy_Grenzstelle.changeItem("")
-            ''''cboMy_Grenzstelle.changeItem("ALLE_BACK") 'greift nur wenn verfügbar..
-        End If
-
-
-
-        cboMyAvisoAnzeige.Items.Clear()
-        cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
-        cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer"))
-        cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False)
-        cboMyAvisoAnzeige.changeItem("Benutzer")
-
-
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-            cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1-Sendungen", "T1"))
-            cboMy_QS.CheckState = CheckState.Checked
-            cboMy_VB.CheckState = CheckState.Unchecked
-            cboMyAvisoAnzeige.changeItem("T1")
-        Else
-
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then
-                cboMy_QS.CheckState = CheckState.Unchecked
-                cboMy_VB.CheckState = CheckState.Indeterminate
-            Else
-                cboMy_QS.CheckState = CheckState.Checked
-                cboMy_VB.CheckState = CheckState.Unchecked
-            End If
-
-            Dim myLKW As Boolean = False
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId Is Nothing Then
-                myLKW = True
-            End If
-
-            If myLKW Then
-                cbx_My_LKW.Checked = True
-                cboMy_QS.CheckState = CheckState.Indeterminate
-                cboMy_VB.CheckState = CheckState.Indeterminate
-            ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then
-                cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
-
-            End If
-        End If

        MyComboBox1.Items.Clear()
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("<keine Einschr.>", UStatus_none))
@@ -159,6 +120,8 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            initEAviso()
        End If

+        SucheStandort = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim
+        If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "ATILLA" ' Case "VERAG", "IMEX"
@@ -173,8 +136,8 @@ Public Class usrCntlHauptfenster_Suche_AVISO

                Select Case zeilen
                    Case 0 : lblAkte.Visible = False
-                    Case 1 : lblAkte.Text = zeilen & " Akt vom Arbeitsplatz übernommen"
-                    Case Else : lblAkte.Text = zeilen & " Akte vom Arbeitsplatz übernommen"
+                    Case 1 : lblAkte.Text = zeilen & " Akt vom " & vbNewLine & "Arbeitsplatz übernommen" : lblAkte.BringToFront()
+                    Case Else : lblAkte.Text = zeilen & " Akte vom " & vbNewLine & "Arbeitsplatz übernommen" : lblAkte.BringToFront()
                End Select

                If Not (VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "SUB") Then
@@ -183,18 +146,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO

        End Select

-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
-            cbx_My_Brexit.Checked = True
-        End If
-

        tbcntrAvisoLKW.Width = Panel1.Width

-        'tbcntrAvisoSND.Location = New Point(tbcntrAvisoLKW.Location.X + getTbControlWidth(tbcntrAvisoLKW) + 80, tbcntrAvisoSND.Location.Y)
-        tbcntrAvisoSND.Location = New Point(tbcntrAvisoLKW.Location.X, tbcntrAvisoLKW.Location.Y)
-        tbcntrAvisoSND.SelectedIndex = 1
-        tbcntrAvisoSND.Width = tbcntrAvisoLKW.Width
-        tbcntrAvisoSND.Height = tbcntrAvisoLKW.Height

        If cboTeams.Items.Count = 0 Then cboTeams.Visible = False
        dtpVon.Value = Now.AddMonths(-1) 'Now.AddDays(-15)
@@ -203,6 +157,10 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        tbcntrAvisoLKW.SelectedTab = tabAnkunft

        TimerAkte.Enabled = True
+
+        pnlSearch.Visible = False
+        'initPnlSearch()
+        '  Grid_aktiv = True
    End Sub


@@ -365,7 +323,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            '-------------------------------------------------------------


-
+            Dim sqlStr = ""

            Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
@@ -541,40 +499,40 @@ Public Class usrCntlHauptfenster_Suche_AVISO
                'Dauer berechnen:
                For Each r As DataGridViewRow In .Rows
                    r.DefaultCellStyle.Font = nfont
-                    If Not cbx_My_LKW.Checked Then
-                        If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
-                            r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
-                            ' r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
-                            ' r.Cells("Abfertigungsart").Value = "FREMD"
-                            r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
-                        Else 'Nomal
-                            Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value
-                            If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] "
+                    'If False Then
+                    '    If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
+                    '        r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
+                    '        ' r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
+                    '        ' r.Cells("Abfertigungsart").Value = "FREMD"
+                    '        r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
+                    '    Else 'Nomal
+                    '        Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value
+                    '        If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] "

-                            r.Cells("Abfertigungsart").Value = VERAGSQL.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
-                            r.Cells("Abfertigungsart").Value = Abfertigungsland & r.Cells("Abfertigungsart").Value
+                    '        r.Cells("Abfertigungsart").Value = VERAGSQL.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
+                    '        r.Cells("Abfertigungsart").Value = Abfertigungsland & r.Cells("Abfertigungsart").Value

-                            If r.Cells("Abfertigungsart").Value.ToString.Length > 20 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 20) & ".."
-                        End If
+                    '        If r.Cells("Abfertigungsart").Value.ToString.Length > 20 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 20) & ".."
+                    '    End If

-                        If .Columns("StatusVorbereitetQS") IsNot Nothing Then
-                            If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
-                                DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv
-                                DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
-                            Else
-                                DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' eintragen"
-                            End If
-                        End If
-                        If .Columns("StatusVorgeschrieben") IsNot Nothing Then
-                            If r.Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
-                                DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorgeschrieben_Aktiv
-                                DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
-                            Else
-                                DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' eintragen"
-                            End If
-                        End If
+                    '    If .Columns("StatusVorbereitetQS") IsNot Nothing Then
+                    '        If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
+                    '            DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv
+                    '            DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
+                    '        Else
+                    '            DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' eintragen"
+                    '        End If
+                    '    End If
+                    '    If .Columns("StatusVorgeschrieben") IsNot Nothing Then
+                    '        If r.Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
+                    '            DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorgeschrieben_Aktiv
+                    '            DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
+                    '        Else
+                    '            DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' eintragen"
+                    '        End If
+                    '    End If

-                    End If
+                    'End If

                    ' MsgBox(r.Cells(1).Value)
                    ' MsgBox(r.Cells(6).Value)
@@ -613,7 +571,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
                    'Farbkennung

                    If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
-                        If Not cbx_My_LKW.Checked Then
+                        If True Then
                            Select Case r.Cells("Status").Value
                                Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben '"1", "2"
                                ' Freigabe, N.Eingetr.
@@ -727,13 +685,14 @@ Public Class usrCntlHauptfenster_Suche_AVISO
    Public Sub Aviso_anzeigen(hSort As String, Optional showDetails As Boolean = True)
        'Paint wieder reaktivieren
        locZeilen = -1
+
+
        If Not Grid_aktiv Then Exit Sub
        ' Grid_aktiv = False
        Dim hStart As Integer = My.Computer.Clock.TickCount
        Details_aktiv = False
        gridAviso.GetOrder()

-
        Dim datumseinschr = ""
        Dim top = "TOP 1000 "

@@ -867,92 +826,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"


-        Else
-
-
-            '----------------------------------------------------------------------------------------------------------------------------------
-            '--- Sendung ---
-            '----------------------------------------------------------------------------------------------------------------------------------
-            Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
-            If cboMyAvisoAnzeige._value <> "" Then
-                If cboMyAvisoAnzeige._value = "ALLE" Then
-                    '  inBearbeitungSQL = " 1=1 " 'ALLE
-                    inBearbeitungSQL = " (  (tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id]  FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'))       OR      (Aviso.[TeamId] IN (SELECT [team_id]  FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND tblSendungen.[tblSnd_TeamId] is null))       OR        [tblSendungen].tblSnd_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'       OR        tblSendungen.LetzterMitarbeiterId=@maId) "
-                ElseIf cboMyAvisoAnzeige._value = "T1" Then
-                    inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
-                    'NUR VERAG/IMEX:
-                    inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE  Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
-                ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
-                    If cboMyAvisoAnzeige._value = "27" Then ' TEAM SALZBURG
-                        inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & "  AND tblSendungen.[tblSnd_TeamId] is null)  OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId 
-                                                    OR Grenzstelle IN('SBG') OR (tblSendungen.FilialenNr  IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) )  "
-                    Else
-                        inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & "  AND tblSendungen.[tblSnd_TeamId] is null)  OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
-
-                    End If
-                End If
-            End If
-
-            hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis  " &
-                                     " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " &
-                                     " FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " &
-                                     " WHERE   (  Status IN (0, 3, 4, 5)  OR ( Status = 1 AND [Abgeschlossen] = 0 ))  " &
-                                            hSQLFirma & " AND  ( " & inBearbeitungSQL & ") "
-
-            Select Case cboMy_VB.CheckState
-                Case CheckState.Checked : hSQL &= " AND tblSnd_Vorgeschrieben is not null	 "
-                Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorgeschrieben is null	 "
-                    ' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null	 "
-            End Select
-            Select Case cboMy_QS.CheckState
-                Case CheckState.Checked : hSQL &= " AND tblSnd_Vorbereitet is not null	 "
-                Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorbereitet is null	 "
-                    ' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null	 "
-            End Select
-            If cboMy_Grenzstelle._value = "ALLE_WO" Then
-                hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) "
-
-            Else
-
-                If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then hSQL &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
-                If cboMy_Grenzstelle._value = "ALLE_BACK" Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
-
-            End If
-
-            If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
-
-            'Farbe
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
-                Select Case btnColor.BackColor
-                    Case Color.Red
-                        hSQL &= " AND (Status = 3 ) "
-                    Case Color.Orange
-                        ' hSQL &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
-                        hSQL &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) "
-                    Case Color.Yellow
-                        hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND  cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",GETDATE()) AS DATE) ) ) "
-                End Select
-            End If
-            ''Farbe
-            'If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
-            '    Select Case btnColor.BackColor
-            '        Case Color.Red
-            '            hSQL &= " AND (Status = 3 OR (Status IN (0, 3, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE)<= cast(GETDATE() AS DATE) ) or VoraussichtlichesEintreffen is null) "
-            '        Case Color.Orange
-            '            hSQL &= " AND (  (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
-            '        Case Color.Yellow
-            '            hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 2,GETDATE()) AS DATE) AND  cast(DATEADD(DAY, 3,GETDATE()) AS DATE) ) ) "
-            '    End Select
-            'End If
-
-            'hSQL &= " AND (Grenzstelle ='???' OR  Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
-            ' Funktioniert nciht, wg. WO
-
-            hSQL &= " ORDER BY case	 " & " when [Status] =3 then 0 " & " when [Status] =1 then 5 " & " else 1 " & " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
-
        End If

-        ' MsgBox(hSQL)
+        '  MsgBox(hSQL)
        'If hSort = "" Then
        'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC"
        ' Else
@@ -972,12 +848,11 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        'gridAviso.DataSource = AVISOBinding.bindingSource

        'MsgBox(DirectCast(gridAviso.DataSource, DataTable).Rows.Count)
+
        'Grid neu designen
+        gridAviso_SpaltenFestlegen()


-        If CheckBox1.Checked Then
-            gridAviso_SpaltenFestlegen()
-        End If

        'Tabelle Kommt/Geht bereinigen
        If gridAviso.RowCount = 0 Then
@@ -992,7 +867,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        '   lblAnzahl.Text = "Einträge: " & Format(VERAG_PROG_ALLGEMEIN.cGlobal.AnzahlAuswahl, "#,##0") & " ausgewählt" ' / " & Format(AnzahlAlle, "#,##0") & " gesamt"

        hMerkZeit = Now
-        lblZeit_aktuell.Text = "letzte Aktualisierung: " & Format(Now, "HH:mm")
+        lblZeit_aktuell.Text = "Refresh: " & Format(Now, "HH:mm")



@@ -1035,6 +910,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
    '    initPnlSearch()
    'End Sub
    Sub initPnlSearch()
+
        If pnlSearch.Visible Then
            pnlSearch.Visible = False
            Panel1.Height -= pnlSearch.Height
@@ -1080,31 +956,32 @@ Public Class usrCntlHauptfenster_Suche_AVISO
    End Sub


-    Private Sub Button4_Click_1(sender As Object, e As EventArgs)
-        If CheckBox1.Checked Then
-            toggle_LKW_SND("LKW")
-        Else
-            toggle_LKW_SND("SND")
-        End If
-    End Sub
-
-    Private Sub toggle_LKW_SND(typ)
-        AVISO_TYP = typ
-        If AVISO_TYP = "LKW" Then
-            tbcntrAvisoLKW.Visible = True
-            tbcntrAvisoSND.Visible = False
-            pblSNDOptions.Visible = False
-
-        ElseIf AVISO_TYP = "SND" Then
-            tbcntrAvisoLKW.Visible = False
-            tbcntrAvisoSND.Visible = True
-            pblSNDOptions.Visible = True
-        End If
-
+    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
+        'If CheckBox1.Checked Then
+        '    toggle_LKW_SND("LKW")
+        'Else
+        '    toggle_LKW_SND("SND")
+        'End If
        Aviso_anzeigen("")
-
    End Sub

+    'Private Sub toggle_LKW_SND(typ)
+    '    AVISO_TYP = typ
+    '    If AVISO_TYP = "LKW" Then
+    '        tbcntrAvisoLKW.Visible = True
+    '        tbcntrAvisoSND.Visible = False
+    '        pblSNDOptions.Visible = False
+
+    '    ElseIf AVISO_TYP = "SND" Then
+    '        tbcntrAvisoLKW.Visible = False
+    '        tbcntrAvisoSND.Visible = True
+    '        pblSNDOptions.Visible = True
+    '    End If
+
+    '    Aviso_anzeigen("")
+
+    'End Sub
+
    Private Sub txtSuche_KeyDown1(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSuche.PreviewKeyDown
        If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Tab Then
            Aviso_anzeigen("")
@@ -1141,7 +1018,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO

    End Sub

-    Private Sub btnAlleAnzeigen_Click(sender As System.Object, e As System.EventArgs) Handles btnAlleAnzeigen.Click
+    Private Sub btnAlleAnzeigen_Click(sender As System.Object, e As System.EventArgs)

        If sender Is btnAlleAnzeigen Then
            'Auswahl wird zurückgesetzt, alle Einträge werden angezeigt
@@ -1289,6 +1166,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        End If

        Grid_aktiv = True
+
        Aviso_anzeigen(hSort)
    End Sub

@@ -1351,7 +1229,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            Exit Sub
        End If

-        If cbx_My_LKW.Checked Then
+        If True Then


            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
@@ -1361,19 +1239,6 @@ Public Class usrCntlHauptfenster_Suche_AVISO

            PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick() 'Aviso_anzeigen("")

-        Else
-
-            If gridAviso.SelectedRows(0).Cells("tblSnd_SendungID").Value Is DBNull.Value Then Exit Sub
-
-            Dim SendungsId = gridAviso.SelectedRows(0).Cells("tblSnd_SendungID").Value
-            Dim AvisoID = gridAviso.SelectedRows(0).Cells("AvisoID").Value
-
-            Dim f = Func.openSnd(SendungsId, AvisoID)
-            If f IsNot Nothing Then
-                AddHandler f.FormClosed, Sub()
-                                             PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick()
-                                         End Sub
-            End If
        End If

        If gridAviso.SelectedRows.Count = 0 Then Exit Sub
@@ -1396,46 +1261,6 @@ Public Class usrCntlHauptfenster_Suche_AVISO



-    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged
-        If Grid_aktiv Then
-            'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
-            If sender Is cboMyAvisoAnzeige Then
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-                    Grid_aktiv = False
-                    If cboMyAvisoAnzeige._value = "T1" Then
-                        cboMy_QS.CheckState = CheckState.Checked
-                        cboMy_VB.CheckState = CheckState.Unchecked
-                    Else
-                        cboMy_QS.CheckState = CheckState.Indeterminate
-                        cboMy_VB.CheckState = CheckState.Indeterminate
-                    End If
-                    Grid_aktiv = True
-                End If
-            End If
-
-            'DGV anzeigen: 
-            Aviso_anzeigen("")
-        End If
-        cboMy_QS.Visible = Not cbx_My_LKW.Checked
-        cboMy_VB.Visible = Not cbx_My_LKW.Checked
-        cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked
-        lblMySND_Anzeige.Visible = Not cbx_My_LKW.Checked
-
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
-            btnColor.Visible = Not cbx_My_LKW.Checked
-        Else
-            btnColor.Visible = False
-        End If
-        If cbx_My_LKW.Checked Then
-            '  lblMeineAviso.Text = "Meine Aviso:"
-            cbx_My_Brexit.Visible = False
-        Else
-            ' lblMeineAviso.Text = "Meine Sendungen:"
-            cbx_My_Brexit.Visible = True
-        End If
-    End Sub
-
-
    Private Sub cboImEx_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboImEx.SelectedIndexChanged
        If Grid_aktiv Then
            Aviso_anzeigen("")
@@ -1448,31 +1273,11 @@ Public Class usrCntlHauptfenster_Suche_AVISO
        End If
    End Sub

-    Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnColor.Click
+    Private Sub Button13_Click(sender As Object, e As EventArgs)
        ctxtFarben.Show(Cursor.Position)

    End Sub

-    Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click
-        btnColor.BackColor = Color.Red
-        '   meineAviso_anzeigen()
-    End Sub
-
-    Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click
-        btnColor.BackColor = Color.Orange
-        ' meineAviso_anzeigen()
-    End Sub
-
-    Private Sub ToolStripMenuItem21_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem21.Click
-        btnColor.BackColor = Color.Yellow
-        ' meineAviso_anzeigen()
-    End Sub
-
-
-    Private Sub ALLEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ALLEToolStripMenuItem.Click
-        btnColor.BackColor = Color.White
-        '  meineAviso_anzeigen()
-    End Sub


    Function getDateVorschreiben(addDays) As Date
@@ -1502,9 +1307,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
            Dim f As New frmEintragAviso

-            If sender Is ToolStripMenuItem17 Then
-                f.FIRMA_TMP = "ATILLA"
-            End If
+            'If sender Is ToolStripMenuItem17 Then
+            '    f.FIRMA_TMP = "ATILLA"
+            'End If

            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
            '  f.frmHilf = Me
@@ -1626,7 +1431,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO



-            If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)
+            '  If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)


            If AVISO_TYP = "LKW" Then
@@ -1930,5 +1735,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO

    End Sub

+    Private Sub btnDetailsuche_Click(sender As Object, e As EventArgs) Handles btnDetailsuche.Click
+        'pnlSearch.Visible = Not pnlSearch.Visible
+        initPnlSearch()
+    End Sub

 End Class
--- a/Aviso/usrCntlHauptfenster_Suche_SND.Designer.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_SND.Designer.vb
@@ -0,0 +1,696 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class usrCntlHauptfenster_Suche_SND
+    Inherits System.Windows.Forms.UserControl
+
+    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlHauptfenster_Suche_SND))
+        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.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxLoseSnd = New System.Windows.Forms.CheckBox()
+        Me.txtAvisierer = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblErwLKWID = New System.Windows.Forms.Label()
+        Me.lblAbsender = New System.Windows.Forms.Label()
+        Me.txtlkwId = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtAbsender = New System.Windows.Forms.TextBox()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.lblZeit_aktuell = New System.Windows.Forms.Label()
+        Me.tbcntrAvisoSND = New System.Windows.Forms.TabControl()
+        Me.tbSndAlle = New System.Windows.Forms.TabPage()
+        Me.tbSndOffen = New System.Windows.Forms.TabPage()
+        Me.tbSndFreigegeben = New System.Windows.Forms.TabPage()
+        Me.btnColor = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.lblDauer = New System.Windows.Forms.Label()
+        Me.lblMySND_Anzeige = New System.Windows.Forms.Label()
+        Me.txtKdAuftragsnr = New System.Windows.Forms.TextBox()
+        Me.lblErwKdAtrNr = New System.Windows.Forms.Label()
+        Me.cboMyAvisoAnzeige = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnNeu = New System.Windows.Forms.Button()
+        Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtEmpfänger = New System.Windows.Forms.TextBox()
+        Me.txtAbfertigungsnummer = New System.Windows.Forms.TextBox()
+        Me.lblErwFilialePos = New System.Windows.Forms.Label()
+        Me.lblErwEmpfänger = New System.Windows.Forms.Label()
+        Me.lblEintraege = New System.Windows.Forms.Label()
+        Me.cboMy_QS = New System.Windows.Forms.CheckBox()
+        Me.txtAuftraggeber = New System.Windows.Forms.TextBox()
+        Me.cboMy_VB = New System.Windows.Forms.CheckBox()
+        Me.lblMySnd_Grenzstelle = New System.Windows.Forms.Label()
+        Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
+        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.TimerAkte = New System.Windows.Forms.Timer(Me.components)
+        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.tbNichtEingetroffen = New System.Windows.Forms.TabPage()
+        Me.Panel1.SuspendLayout()
+        Me.tbcntrAvisoSND.SuspendLayout()
+        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ctxtFarben.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.cbxLoseSnd)
+        Me.Panel1.Controls.Add(Me.txtAvisierer)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.lblErwLKWID)
+        Me.Panel1.Controls.Add(Me.lblAbsender)
+        Me.Panel1.Controls.Add(Me.txtlkwId)
+        Me.Panel1.Controls.Add(Me.Label1)
+        Me.Panel1.Controls.Add(Me.txtAbsender)
+        Me.Panel1.Controls.Add(Me.Button2)
+        Me.Panel1.Controls.Add(Me.Button1)
+        Me.Panel1.Controls.Add(Me.lblZeit_aktuell)
+        Me.Panel1.Controls.Add(Me.tbcntrAvisoSND)
+        Me.Panel1.Controls.Add(Me.btnColor)
+        Me.Panel1.Controls.Add(Me.Button4)
+        Me.Panel1.Controls.Add(Me.lblDauer)
+        Me.Panel1.Controls.Add(Me.lblMySND_Anzeige)
+        Me.Panel1.Controls.Add(Me.txtKdAuftragsnr)
+        Me.Panel1.Controls.Add(Me.lblErwKdAtrNr)
+        Me.Panel1.Controls.Add(Me.cboMyAvisoAnzeige)
+        Me.Panel1.Controls.Add(Me.btnNeu)
+        Me.Panel1.Controls.Add(Me.cboMy_Grenzstelle)
+        Me.Panel1.Controls.Add(Me.cboFiliale)
+        Me.Panel1.Controls.Add(Me.txtEmpfänger)
+        Me.Panel1.Controls.Add(Me.txtAbfertigungsnummer)
+        Me.Panel1.Controls.Add(Me.lblErwFilialePos)
+        Me.Panel1.Controls.Add(Me.lblErwEmpfänger)
+        Me.Panel1.Controls.Add(Me.lblEintraege)
+        Me.Panel1.Controls.Add(Me.cboMy_QS)
+        Me.Panel1.Controls.Add(Me.txtAuftraggeber)
+        Me.Panel1.Controls.Add(Me.cboMy_VB)
+        Me.Panel1.Controls.Add(Me.lblMySnd_Grenzstelle)
+        Me.Panel1.Controls.Add(Me.lblErwAuftraggeber)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.Panel1.Location = New System.Drawing.Point(0, 0)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(1243, 115)
+        Me.Panel1.TabIndex = 3
+        '
+        'cbxLoseSnd
+        '
+        Me.cbxLoseSnd.AutoSize = True
+        Me.cbxLoseSnd.ForeColor = System.Drawing.Color.White
+        Me.cbxLoseSnd.Location = New System.Drawing.Point(832, 53)
+        Me.cbxLoseSnd.Name = "cbxLoseSnd"
+        Me.cbxLoseSnd.Size = New System.Drawing.Size(181, 19)
+        Me.cbxLoseSnd.TabIndex = 46
+        Me.cbxLoseSnd.Text = "nur lose Sendungen anzeigen"
+        Me.cbxLoseSnd.UseVisualStyleBackColor = True
+        Me.cbxLoseSnd.Visible = False
+        '
+        'txtAvisierer
+        '
+        Me.txtAvisierer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAvisierer.Location = New System.Drawing.Point(622, 50)
+        Me.txtAvisierer.MaxLength = 100
+        Me.txtAvisierer.Name = "txtAvisierer"
+        Me.txtAvisierer.Size = New System.Drawing.Size(199, 23)
+        Me.txtAvisierer.TabIndex = 44
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.ForeColor = System.Drawing.Color.White
+        Me.Label2.Location = New System.Drawing.Point(619, 32)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(55, 15)
+        Me.Label2.TabIndex = 45
+        Me.Label2.Text = "Avisierer:"
+        '
+        'lblErwLKWID
+        '
+        Me.lblErwLKWID.AutoSize = True
+        Me.lblErwLKWID.ForeColor = System.Drawing.Color.White
+        Me.lblErwLKWID.Location = New System.Drawing.Point(619, 9)
+        Me.lblErwLKWID.Name = "lblErwLKWID"
+        Me.lblErwLKWID.Size = New System.Drawing.Size(49, 15)
+        Me.lblErwLKWID.TabIndex = 19
+        Me.lblErwLKWID.Text = "LKW-Id:"
+        '
+        'lblAbsender
+        '
+        Me.lblAbsender.AutoSize = True
+        Me.lblAbsender.ForeColor = System.Drawing.Color.White
+        Me.lblAbsender.Location = New System.Drawing.Point(209, 32)
+        Me.lblAbsender.Name = "lblAbsender"
+        Me.lblAbsender.Size = New System.Drawing.Size(60, 15)
+        Me.lblAbsender.TabIndex = 23
+        Me.lblAbsender.Text = "Absender:"
+        '
+        'txtlkwId
+        '
+        Me.txtlkwId.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtlkwId.Location = New System.Drawing.Point(674, 5)
+        Me.txtlkwId.MaxLength = 100
+        Me.txtlkwId.Name = "txtlkwId"
+        Me.txtlkwId.Size = New System.Drawing.Size(147, 23)
+        Me.txtlkwId.TabIndex = 10
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.ForeColor = System.Drawing.Color.White
+        Me.Label1.Location = New System.Drawing.Point(892, 89)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(63, 15)
+        Me.Label1.TabIndex = 43
+        Me.Label1.Text = "Prio/Stufe:"
+        '
+        'txtAbsender
+        '
+        Me.txtAbsender.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAbsender.Location = New System.Drawing.Point(212, 50)
+        Me.txtAbsender.MaxLength = 100
+        Me.txtAbsender.Name = "txtAbsender"
+        Me.txtAbsender.Size = New System.Drawing.Size(199, 23)
+        Me.txtAbsender.TabIndex = 2
+        '
+        'Button2
+        '
+        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Button2.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.Button2.ForeColor = System.Drawing.Color.White
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button2.Location = New System.Drawing.Point(1015, 86)
+        Me.Button2.MaximumSize = New System.Drawing.Size(121, 35)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(88, 24)
+        Me.Button2.TabIndex = 42
+        Me.Button2.Text = "Abklärung"
+        Me.Button2.UseVisualStyleBackColor = False
+        '
+        'Button1
+        '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button1.BackColor = System.Drawing.Color.Purple
+        Me.Button1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.Button1.ForeColor = System.Drawing.Color.White
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button1.Location = New System.Drawing.Point(1109, 86)
+        Me.Button1.MaximumSize = New System.Drawing.Size(121, 35)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(88, 24)
+        Me.Button1.TabIndex = 41
+        Me.Button1.Text = "Vorschreiben"
+        Me.Button1.UseVisualStyleBackColor = False
+        '
+        'lblZeit_aktuell
+        '
+        Me.lblZeit_aktuell.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblZeit_aktuell.AutoSize = True
+        Me.lblZeit_aktuell.ForeColor = System.Drawing.Color.White
+        Me.lblZeit_aktuell.Location = New System.Drawing.Point(1012, 38)
+        Me.lblZeit_aktuell.Name = "lblZeit_aktuell"
+        Me.lblZeit_aktuell.Size = New System.Drawing.Size(101, 15)
+        Me.lblZeit_aktuell.TabIndex = 40
+        Me.lblZeit_aktuell.Text = "Refresh: 11:22 Uhr"
+        Me.lblZeit_aktuell.Visible = False
+        '
+        'tbcntrAvisoSND
+        '
+        Me.tbcntrAvisoSND.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.tbcntrAvisoSND.Controls.Add(Me.tbSndAlle)
+        Me.tbcntrAvisoSND.Controls.Add(Me.tbSndOffen)
+        Me.tbcntrAvisoSND.Controls.Add(Me.tbSndFreigegeben)
+        Me.tbcntrAvisoSND.Controls.Add(Me.tbNichtEingetroffen)
+        Me.tbcntrAvisoSND.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tbcntrAvisoSND.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.tbcntrAvisoSND.ItemSize = New System.Drawing.Size(60, 30)
+        Me.tbcntrAvisoSND.Location = New System.Drawing.Point(3, 84)
+        Me.tbcntrAvisoSND.Name = "tbcntrAvisoSND"
+        Me.tbcntrAvisoSND.Padding = New System.Drawing.Point(12, 3)
+        Me.tbcntrAvisoSND.SelectedIndex = 0
+        Me.tbcntrAvisoSND.Size = New System.Drawing.Size(486, 31)
+        Me.tbcntrAvisoSND.TabIndex = 27
+        Me.tbcntrAvisoSND.Visible = False
+        '
+        'tbSndAlle
+        '
+        Me.tbSndAlle.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.tbSndAlle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tbSndAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tbSndAlle.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndAlle.Name = "tbSndAlle"
+        Me.tbSndAlle.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbSndAlle.Size = New System.Drawing.Size(478, 0)
+        Me.tbSndAlle.TabIndex = 0
+        Me.tbSndAlle.Text = "Alle Sendungen"
+        '
+        'tbSndOffen
+        '
+        Me.tbSndOffen.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.tbSndOffen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tbSndOffen.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndOffen.Name = "tbSndOffen"
+        Me.tbSndOffen.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbSndOffen.Size = New System.Drawing.Size(478, 0)
+        Me.tbSndOffen.TabIndex = 1
+        Me.tbSndOffen.Text = "In Bearbeitung"
+        '
+        'tbSndFreigegeben
+        '
+        Me.tbSndFreigegeben.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndFreigegeben.Name = "tbSndFreigegeben"
+        Me.tbSndFreigegeben.Size = New System.Drawing.Size(478, 0)
+        Me.tbSndFreigegeben.TabIndex = 2
+        Me.tbSndFreigegeben.Text = "Überlassen"
+        Me.tbSndFreigegeben.UseVisualStyleBackColor = True
+        '
+        'btnColor
+        '
+        Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnColor.BackColor = System.Drawing.Color.White
+        Me.btnColor.Location = New System.Drawing.Point(961, 87)
+        Me.btnColor.Name = "btnColor"
+        Me.btnColor.Size = New System.Drawing.Size(36, 23)
+        Me.btnColor.TabIndex = 37
+        Me.btnColor.UseVisualStyleBackColor = False
+        '
+        'Button4
+        '
+        Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.ForeColor = System.Drawing.Color.White
+        Me.Button4.Image = Global.AVISO.My.Resources.Resources.search
+        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button4.Location = New System.Drawing.Point(916, 5)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(92, 44)
+        Me.Button4.TabIndex = 17
+        Me.Button4.TabStop = False
+        Me.Button4.Text = "Suche"
+        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'lblDauer
+        '
+        Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblDauer.BackColor = System.Drawing.Color.Transparent
+        Me.lblDauer.ForeColor = System.Drawing.Color.White
+        Me.lblDauer.Location = New System.Drawing.Point(1005, 21)
+        Me.lblDauer.Name = "lblDauer"
+        Me.lblDauer.Size = New System.Drawing.Size(105, 17)
+        Me.lblDauer.TabIndex = 27
+        Me.lblDauer.Text = "1111123 ms"
+        Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'lblMySND_Anzeige
+        '
+        Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblMySND_Anzeige.AutoSize = True
+        Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White
+        Me.lblMySND_Anzeige.Location = New System.Drawing.Point(710, 89)
+        Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige"
+        Me.lblMySND_Anzeige.Size = New System.Drawing.Size(52, 15)
+        Me.lblMySND_Anzeige.TabIndex = 20
+        Me.lblMySND_Anzeige.Text = "Anzeige:"
+        '
+        'txtKdAuftragsnr
+        '
+        Me.txtKdAuftragsnr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtKdAuftragsnr.Location = New System.Drawing.Point(495, 5)
+        Me.txtKdAuftragsnr.MaxLength = 100
+        Me.txtKdAuftragsnr.Name = "txtKdAuftragsnr"
+        Me.txtKdAuftragsnr.Size = New System.Drawing.Size(121, 23)
+        Me.txtKdAuftragsnr.TabIndex = 9
+        '
+        'lblErwKdAtrNr
+        '
+        Me.lblErwKdAtrNr.AutoSize = True
+        Me.lblErwKdAtrNr.ForeColor = System.Drawing.Color.White
+        Me.lblErwKdAtrNr.Location = New System.Drawing.Point(414, 9)
+        Me.lblErwKdAtrNr.Name = "lblErwKdAtrNr"
+        Me.lblErwKdAtrNr.Size = New System.Drawing.Size(75, 15)
+        Me.lblErwKdAtrNr.TabIndex = 0
+        Me.lblErwKdAtrNr.Text = "Kd-Auftr.Nr.:"
+        '
+        'cboMyAvisoAnzeige
+        '
+        Me.cboMyAvisoAnzeige._allowedValuesFreiText = Nothing
+        Me.cboMyAvisoAnzeige._allowFreiText = False
+        Me.cboMyAvisoAnzeige._value = ""
+        Me.cboMyAvisoAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboMyAvisoAnzeige.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.cboMyAvisoAnzeige.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.cboMyAvisoAnzeige.FormattingEnabled = True
+        Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(768, 87)
+        Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige"
+        Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(118, 21)
+        Me.cboMyAvisoAnzeige.TabIndex = 21
+        '
+        'btnNeu
+        '
+        Me.btnNeu.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnNeu.Font = New System.Drawing.Font("Segoe UI", 11.0!)
+        Me.btnNeu.ForeColor = System.Drawing.Color.Black
+        Me.btnNeu.Image = CType(resources.GetObject("btnNeu.Image"), System.Drawing.Image)
+        Me.btnNeu.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnNeu.Location = New System.Drawing.Point(1116, 6)
+        Me.btnNeu.MaximumSize = New System.Drawing.Size(121, 35)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(121, 35)
+        Me.btnNeu.TabIndex = 32
+        Me.btnNeu.Text = "Sendung"
+        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnNeu.UseVisualStyleBackColor = True
+        '
+        'cboMy_Grenzstelle
+        '
+        Me.cboMy_Grenzstelle._allowedValuesFreiText = Nothing
+        Me.cboMy_Grenzstelle._allowFreiText = False
+        Me.cboMy_Grenzstelle._value = ""
+        Me.cboMy_Grenzstelle.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.cboMy_Grenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboMy_Grenzstelle.DropDownWidth = 120
+        Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.cboMy_Grenzstelle.FormattingEnabled = True
+        Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(72, 5)
+        Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle"
+        Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 24)
+        Me.cboMy_Grenzstelle.TabIndex = 26
+        '
+        'cboFiliale
+        '
+        Me.cboFiliale._allowedValuesFreiText = Nothing
+        Me.cboFiliale._allowFreiText = False
+        Me.cboFiliale._value = ""
+        Me.cboFiliale.DropDownWidth = 300
+        Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFiliale.FormattingEnabled = True
+        Me.cboFiliale.Location = New System.Drawing.Point(212, 4)
+        Me.cboFiliale.MaxLength = 4
+        Me.cboFiliale.Name = "cboFiliale"
+        Me.cboFiliale.Size = New System.Drawing.Size(70, 24)
+        Me.cboFiliale.TabIndex = 3
+        '
+        'txtEmpfänger
+        '
+        Me.txtEmpfänger.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtEmpfänger.Location = New System.Drawing.Point(417, 50)
+        Me.txtEmpfänger.MaxLength = 100
+        Me.txtEmpfänger.Name = "txtEmpfänger"
+        Me.txtEmpfänger.Size = New System.Drawing.Size(199, 23)
+        Me.txtEmpfänger.TabIndex = 3
+        '
+        'txtAbfertigungsnummer
+        '
+        Me.txtAbfertigungsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAbfertigungsnummer.Location = New System.Drawing.Point(281, 5)
+        Me.txtAbfertigungsnummer.MaxLength = 8
+        Me.txtAbfertigungsnummer.Name = "txtAbfertigungsnummer"
+        Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(130, 23)
+        Me.txtAbfertigungsnummer.TabIndex = 5
+        '
+        'lblErwFilialePos
+        '
+        Me.lblErwFilialePos.AutoSize = True
+        Me.lblErwFilialePos.ForeColor = System.Drawing.Color.White
+        Me.lblErwFilialePos.Location = New System.Drawing.Point(142, 9)
+        Me.lblErwFilialePos.Name = "lblErwFilialePos"
+        Me.lblErwFilialePos.Size = New System.Drawing.Size(64, 15)
+        Me.lblErwFilialePos.TabIndex = 2
+        Me.lblErwFilialePos.Text = "Filiale/Pos:"
+        '
+        'lblErwEmpfänger
+        '
+        Me.lblErwEmpfänger.AutoSize = True
+        Me.lblErwEmpfänger.ForeColor = System.Drawing.Color.White
+        Me.lblErwEmpfänger.Location = New System.Drawing.Point(414, 34)
+        Me.lblErwEmpfänger.Name = "lblErwEmpfänger"
+        Me.lblErwEmpfänger.Size = New System.Drawing.Size(68, 15)
+        Me.lblErwEmpfänger.TabIndex = 6
+        Me.lblErwEmpfänger.Text = "Empfänger:"
+        '
+        'lblEintraege
+        '
+        Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblEintraege.BackColor = System.Drawing.Color.Transparent
+        Me.lblEintraege.ForeColor = System.Drawing.Color.White
+        Me.lblEintraege.Location = New System.Drawing.Point(971, 8)
+        Me.lblEintraege.Name = "lblEintraege"
+        Me.lblEintraege.Size = New System.Drawing.Size(139, 15)
+        Me.lblEintraege.TabIndex = 14
+        Me.lblEintraege.Text = "0 Einträge"
+        Me.lblEintraege.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'cboMy_QS
+        '
+        Me.cboMy_QS.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboMy_QS.AutoSize = True
+        Me.cboMy_QS.Checked = True
+        Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cboMy_QS.FlatAppearance.CheckedBackColor = System.Drawing.Color.Yellow
+        Me.cboMy_QS.ForeColor = System.Drawing.Color.White
+        Me.cboMy_QS.Location = New System.Drawing.Point(1203, 92)
+        Me.cboMy_QS.Name = "cboMy_QS"
+        Me.cboMy_QS.Size = New System.Drawing.Size(15, 14)
+        Me.cboMy_QS.TabIndex = 33
+        Me.cboMy_QS.ThreeState = True
+        Me.cboMy_QS.UseVisualStyleBackColor = True
+        '
+        'txtAuftraggeber
+        '
+        Me.txtAuftraggeber.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAuftraggeber.Location = New System.Drawing.Point(7, 50)
+        Me.txtAuftraggeber.MaxLength = 100
+        Me.txtAuftraggeber.Name = "txtAuftraggeber"
+        Me.txtAuftraggeber.Size = New System.Drawing.Size(199, 23)
+        Me.txtAuftraggeber.TabIndex = 1
+        '
+        'cboMy_VB
+        '
+        Me.cboMy_VB.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboMy_VB.AutoSize = True
+        Me.cboMy_VB.Checked = True
+        Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cboMy_VB.FlatAppearance.CheckedBackColor = System.Drawing.Color.Yellow
+        Me.cboMy_VB.ForeColor = System.Drawing.Color.White
+        Me.cboMy_VB.Location = New System.Drawing.Point(1222, 92)
+        Me.cboMy_VB.Name = "cboMy_VB"
+        Me.cboMy_VB.Size = New System.Drawing.Size(15, 14)
+        Me.cboMy_VB.TabIndex = 32
+        Me.cboMy_VB.ThreeState = True
+        Me.cboMy_VB.UseVisualStyleBackColor = True
+        '
+        'lblMySnd_Grenzstelle
+        '
+        Me.lblMySnd_Grenzstelle.AutoSize = True
+        Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White
+        Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(4, 9)
+        Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle"
+        Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(67, 15)
+        Me.lblMySnd_Grenzstelle.TabIndex = 25
+        Me.lblMySnd_Grenzstelle.Text = "Grenzstelle:"
+        '
+        'lblErwAuftraggeber
+        '
+        Me.lblErwAuftraggeber.AutoSize = True
+        Me.lblErwAuftraggeber.ForeColor = System.Drawing.Color.White
+        Me.lblErwAuftraggeber.Location = New System.Drawing.Point(4, 32)
+        Me.lblErwAuftraggeber.Name = "lblErwAuftraggeber"
+        Me.lblErwAuftraggeber.Size = New System.Drawing.Size(80, 15)
+        Me.lblErwAuftraggeber.TabIndex = 7
+        Me.lblErwAuftraggeber.Text = "Auftraggeber:"
+        '
+        'gridAviso
+        '
+        Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1
+        Me.gridAviso.AllowUserToAddRows = False
+        Me.gridAviso.AllowUserToDeleteRows = False
+        Me.gridAviso.AllowUserToResizeRows = False
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
+        Me.gridAviso.CausesValidation = False
+        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        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.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        Me.gridAviso.ColumnHeadersHeight = 25
+        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle3
+        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.gridAviso.Location = New System.Drawing.Point(0, 115)
+        Me.gridAviso.MultiSelect = False
+        Me.gridAviso.Name = "gridAviso"
+        Me.gridAviso.ReadOnly = True
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.gridAviso.RowHeadersVisible = False
+        Me.gridAviso.RowHeadersWidth = 62
+        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle5
+        Me.gridAviso.RowTemplate.ReadOnly = True
+        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.gridAviso.Size = New System.Drawing.Size(1243, 517)
+        Me.gridAviso.TabIndex = 4
+        Me.gridAviso.TabStop = False
+        '
+        'TimerAkte
+        '
+        Me.TimerAkte.Interval = 5000
+        '
+        'ctxtFarben
+        '
+        Me.ctxtFarben.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.ctxtFarben.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ALLEToolStripMenuItem, Me.ToolStripMenuItem19, Me.ToolStripMenuItem20, Me.ToolStripMenuItem21})
+        Me.ctxtFarben.Name = "cntxt"
+        Me.ctxtFarben.Size = New System.Drawing.Size(122, 92)
+        '
+        'ALLEToolStripMenuItem
+        '
+        Me.ALLEToolStripMenuItem.Name = "ALLEToolStripMenuItem"
+        Me.ALLEToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
+        Me.ALLEToolStripMenuItem.Text = "ALLE"
+        '
+        'ToolStripMenuItem19
+        '
+        Me.ToolStripMenuItem19.BackColor = System.Drawing.Color.Red
+        Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19"
+        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(121, 22)
+        Me.ToolStripMenuItem19.Text = "ROT"
+        '
+        'ToolStripMenuItem20
+        '
+        Me.ToolStripMenuItem20.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20"
+        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(121, 22)
+        Me.ToolStripMenuItem20.Text = "ORANGE"
+        '
+        'ToolStripMenuItem21
+        '
+        Me.ToolStripMenuItem21.BackColor = System.Drawing.Color.Yellow
+        Me.ToolStripMenuItem21.Name = "ToolStripMenuItem21"
+        Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22)
+        Me.ToolStripMenuItem21.Text = "GELB"
+        '
+        'tbNichtEingetroffen
+        '
+        Me.tbNichtEingetroffen.Location = New System.Drawing.Point(4, 34)
+        Me.tbNichtEingetroffen.Name = "tbNichtEingetroffen"
+        Me.tbNichtEingetroffen.Size = New System.Drawing.Size(478, 0)
+        Me.tbNichtEingetroffen.TabIndex = 3
+        Me.tbNichtEingetroffen.Text = "Nicht Eingetroffen"
+        Me.tbNichtEingetroffen.UseVisualStyleBackColor = True
+        '
+        'usrCntlHauptfenster_Suche_SND
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.gridAviso)
+        Me.Controls.Add(Me.Panel1)
+        Me.Name = "usrCntlHauptfenster_Suche_SND"
+        Me.Size = New System.Drawing.Size(1243, 632)
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        Me.tbcntrAvisoSND.ResumeLayout(False)
+        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ctxtFarben.ResumeLayout(False)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents btnColor As Button
+    Friend WithEvents lblMySND_Anzeige As Label
+    Friend WithEvents cboMyAvisoAnzeige As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboMy_Grenzstelle As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboMy_QS As CheckBox
+    Friend WithEvents cboMy_VB As CheckBox
+    Friend WithEvents lblMySnd_Grenzstelle As Label
+    Friend WithEvents tbcntrAvisoSND As TabControl
+    Friend WithEvents tbSndAlle As TabPage
+    Friend WithEvents tbSndOffen As TabPage
+    Friend WithEvents tbSndFreigegeben As TabPage
+    Friend WithEvents lblEintraege As Label
+    Friend WithEvents gridAviso As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents TimerAkte As Timer
+    Friend WithEvents ctxtFarben As ContextMenuStrip
+    Friend WithEvents ALLEToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem19 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem20 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem
+    Friend WithEvents lblDauer As Label
+    Friend WithEvents btnNeu As Button
+    Friend WithEvents lblZeit_aktuell As Label
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents lblAbsender As Label
+    Friend WithEvents txtAbsender As TextBox
+    Friend WithEvents txtKdAuftragsnr As TextBox
+    Friend WithEvents lblErwKdAtrNr As Label
+    Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents txtEmpfänger As TextBox
+    Friend WithEvents txtAbfertigungsnummer As TextBox
+    Friend WithEvents lblErwFilialePos As Label
+    Friend WithEvents lblErwEmpfänger As Label
+    Friend WithEvents txtAuftraggeber As TextBox
+    Friend WithEvents lblErwAuftraggeber As Label
+    Friend WithEvents lblErwLKWID As Label
+    Friend WithEvents txtlkwId As TextBox
+    Friend WithEvents Button4 As Button
+    Friend WithEvents txtAvisierer As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents cbxLoseSnd As CheckBox
+    Friend WithEvents tbNichtEingetroffen As TabPage
+End Class
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
d.breimaier	55e5302f31	merge	2026-04-30 09:36:52 +02:00
m.ilhan	222153f19e	update vermerke	2026-04-30 09:26:04 +02:00
m.ilhan	e6df74906b	vermerke	2026-04-30 09:18:46 +02:00
murad	542f1fb144	vermerke update	2026-04-30 09:18:46 +02:00
m.ilhan	df3c94aa95	vermerke	2026-04-30 09:18:45 +02:00
m.ilhan	750ed3fbee	vermerke	2026-04-30 09:18:45 +02:00
murad	cb1a47f5f2	update	2026-04-30 09:18:45 +02:00
murad	0bce92847c	vermerke update	2026-04-30 09:18:45 +02:00
m.ilhan	220eee8641	vermerke	2026-04-30 09:18:45 +02:00
m.ilhan	8cc3bd9906	vermerke	2026-04-30 09:18:45 +02:00
m.ilhan	9460d070d1	update	2026-04-30 09:18:02 +02:00
d.breimaier	7c9cc1007a	merge	2026-04-29 15:50:47 +02:00
d.breimaier	352bafc618	version	2026-04-29 15:48:48 +02:00
Andreas Luxbauer	dd8e11fe74	aa	2026-04-29 15:41:39 +02:00
d.breimaier	448d72ed23	Version	2026-04-28 08:17:00 +02:00
d.breimaier	44e7070c74	mergee	2026-04-27 17:09:22 +02:00
d.breimaier	e118d47b5e	Update, etc.	2026-04-27 17:09:00 +02:00
Andreas Luxbauer	75f98ec51d	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-27 16:56:15 +02:00
Andreas Luxbauer	e85d7ec574	exg	2026-04-27 16:56:08 +02:00
murad	2e8734f475	vermerke update	2026-04-27 15:31:27 +02:00
m.ilhan	e09ff21729	vermerke	2026-04-27 15:31:27 +02:00
m.ilhan	67c4546094	vermerke	2026-04-27 15:31:22 +02:00
murad	0748dabc3f	update	2026-04-27 15:30:33 +02:00
murad	4aeebee057	vermerke update	2026-04-27 15:25:43 +02:00
m.ilhan	fb288cf67c	vermerke	2026-04-27 15:25:43 +02:00
m.ilhan	e4398c5a34	vermerke	2026-04-27 15:25:36 +02:00
m.ilhan	0349685cfd	update	2026-04-27 15:24:29 +02:00
d.breimaier	2e9b3b0f6b	Laufzettel fix	2026-04-27 09:04:29 +02:00
d.breimaier	553847cb63	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-27 08:34:46 +02:00
d.breimaier	5e1f0cdceb	version	2026-04-27 08:34:39 +02:00
Andreas Luxbauer	c7c4e0efa0	merge	2026-04-27 08:14:19 +02:00
Andreas Luxbauer	9d125e3a87	vers	2026-04-27 08:13:35 +02:00
d.breimaier	475ea4e425	Laufzettel, sendungsdetails	2026-04-23 16:01:03 +02:00
d.breimaier	dbde7e8c13	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-21 16:04:14 +02:00
d.breimaier	5165fdb3af	Version	2026-04-21 16:04:11 +02:00
Andreas Luxbauer	f0411fde3d	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-21 14:33:19 +02:00
Andreas Luxbauer	08e67e45cf	Filiale Klipp SND	2026-04-21 14:33:16 +02:00
d.breimaier	93c7eb8d60	versoin	2026-04-21 11:03:28 +02:00
d.breimaier	c797202613	div.	2026-04-21 10:57:56 +02:00
d.breimaier	3ab69cadd3	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-20 16:48:54 +02:00
d.breimaier	6950e7e507	SDL, etc.	2026-04-20 16:48:32 +02:00
Andreas Luxbauer	866b4ef83a	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-20 14:35:15 +02:00
Andreas Luxbauer	0f34964c57	dw	2026-04-20 14:35:13 +02:00
d.breimaier	6f7b6cbd9e	MDM Datenverarbeitung, etc.	2026-04-20 10:26:39 +02:00
Andreas Luxbauer	d9cae0a796	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-20 09:14:51 +02:00
Andreas Luxbauer	5787f3aa6a	Klipphausen	2026-04-20 09:14:48 +02:00
d.breimaier	10f0b9a5ef	Kundenuebersicht, interne Mailbenachrichtigungen, Creditsafe-Mails, etc.	2026-04-17 17:00:51 +02:00
d.breimaier	50ee758d3e	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-16 16:03:53 +02:00
d.breimaier	b40019b328	mitarbeiter, sendungsdet. Sammeldruck, etc.	2026-04-16 16:01:39 +02:00
d.breimaier	0ab177dc99	Sammelrechnugsdruck, etc.	2026-04-16 10:56:21 +02:00
Andreas Luxbauer	dc6907820c	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-16 10:31:50 +02:00
Andreas Luxbauer	44691ccfea	Warenort_ Anhang	2026-04-16 10:31:47 +02:00
d.breimaier	f53691f47e	Version, Mialbenachrichtungen, etc.	2026-04-15 16:27:02 +02:00
Andreas Luxbauer	101b33759b	Paper Verwahrunf QR	2026-04-13 13:16:01 +02:00
d.breimaier	5bd9241016	trdinvoice, etc.	2026-04-10 11:27:57 +02:00
d.breimaier	ae8231c9a3	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-09 13:02:02 +02:00
d.breimaier	ed9bb82597	gesamtsicherheiten, Ref, Mail, etc.	2026-04-09 13:01:46 +02:00
Andreas Luxbauer	6b2e60a3a2	SND	2026-04-09 10:59:04 +02:00
Andreas Luxbauer	0ca273c006	eza	2026-04-08 13:57:07 +02:00
Andreas Luxbauer	e545a16bfd	ATEZ EZA, Vermerke	2026-04-08 13:45:46 +02:00
Andreas Luxbauer	a981d01414	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-07 10:01:11 +02:00
Andreas Luxbauer	35661788bd	stat verimex	2026-04-07 10:01:08 +02:00
d.breimaier	47c24423b7	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-02 17:16:45 +02:00
d.breimaier	f5f6b61365	div. Änderungen, Verson	2026-04-02 17:16:42 +02:00
Andreas Luxbauer	b9478b5f9b	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-01 16:41:08 +02:00
Andreas Luxbauer	c1cf86d8a9	snd status fix	2026-04-01 16:41:05 +02:00
d.breimaier	8a6ba55721	version	2026-04-01 10:38:08 +02:00
d.breimaier	f778b32809	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-04-01 09:44:15 +02:00
d.breimaier	cffd0804ce	Pruefung ATB-GEstellung	2026-04-01 09:41:47 +02:00
Andreas Luxbauer	ea0df065a3	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-31 14:33:06 +02:00
Andreas Luxbauer	5167696aca	EZA to ATEZ	2026-03-31 14:32:58 +02:00
d.breimaier	83aef7192d	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-31 14:13:23 +02:00
d.breimaier	457265b739	gesamtsicherheiten, etc.	2026-03-31 14:13:17 +02:00
Andreas Luxbauer	5461ccea63	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-31 10:20:40 +02:00
Andreas Luxbauer	fea2340e8b	SndDetails	2026-03-31 10:20:37 +02:00
d.breimaier	ee2f39d9a8	Version, etc.	2026-03-30 16:55:03 +02:00
Andreas Luxbauer	455477f60c	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-30 15:47:21 +02:00
Andreas Luxbauer	6ae696756e	flpnl	2026-03-30 15:47:15 +02:00
d.breimaier	c3be64712c	version	2026-03-30 14:34:30 +02:00
d.breimaier	e464e3cd20	ATB, etc.	2026-03-30 14:27:49 +02:00
d.breimaier	2d80c93710	Aktweiterleitung WO, etc.	2026-03-30 11:02:06 +02:00
d.breimaier	974e223d4a	Version	2026-03-27 13:02:07 +01:00
Andreas Luxbauer	6fec27a7b9	merge problem behoben teil 2	2026-03-27 10:41:31 +01:00
Andreas Luxbauer	9c8f91b3fa	verscuh merge probleme zu beheben	2026-03-27 10:24:57 +01:00
Andreas Luxbauer	fe469f9741	merge	2026-03-27 10:18:40 +01:00
Andreas Luxbauer	a166e48d4a	merge	2026-03-27 10:11:33 +01:00
Andreas Luxbauer	d134027977	Aviso Redesign	2026-03-27 10:08:20 +01:00
d.breimaier	67924af34e	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-25 15:58:29 +01:00
d.breimaier	783f574363	Sendungsdetails	2026-03-25 15:58:22 +01:00
d.breimaier	e6f22a2e5d	Sendungsdetails, etc.	2026-03-25 15:51:50 +01:00
Andreas Luxbauer	0e00ec3a2a	Reset Vermerke	2026-03-20 10:37:26 +01:00
Andreas Luxbauer	2bce928b98	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-20 09:38:50 +01:00
Andreas Luxbauer	411d25417d	AVISO New Layout	2026-03-20 09:38:42 +01:00
d.breimaier	73f867c7e4	version	2026-03-19 17:35:00 +01:00
d.breimaier	c55c4f97fb	merge	2026-03-19 15:48:46 +01:00
d.breimaier	316d052460	atez	2026-03-19 15:47:08 +01:00
Andreas Luxbauer	3e92ac3a05	TRips2	2026-03-19 14:08:01 +01:00
Andreas Luxbauer	068fd8f460	Avisorips	2026-03-19 14:00:07 +01:00
Andreas Luxbauer	4139d18c77	PROCEDURE	2026-03-19 13:58:05 +01:00
d.breimaier	279f5e1782	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-19 13:42:51 +01:00
d.breimaier	b4741bf77c	version	2026-03-19 13:38:39 +01:00
Andreas Luxbauer	b5496eeef4	Merge branch 'master' of https://git.it.verag.ag/edv/AVISO	2026-03-19 13:13:30 +01:00
Andreas Luxbauer	77e83a464a	Aviso_Trips; NewLayout HF	2026-03-19 13:13:23 +01:00