merge

.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

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

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -26,30 +26,39 @@ 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()
+        Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label3 = New System.Windows.Forms.Label()
         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()
         Me.btnAgg_Unit = New System.Windows.Forms.Button()
         Me.btnAgg_desc = New System.Windows.Forms.Button()
-        Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.sbAdressierteZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        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
@@ -57,23 +66,27 @@ 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)
         Me.pnlHead.Controls.Add(Me.cboStammreferenz)
@@ -82,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)
@@ -90,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))
@@ -103,161 +153,13 @@ 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
         '
-        'Label3
-        '
-        Me.Label3.Location = New System.Drawing.Point(10, 91)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(103, 17)
-        Me.Label3.TabIndex = 113
-        Me.Label3.Text = "LKW-KZ:"
-        '
-        'Label9
-        '
-        Me.Label9.Location = New System.Drawing.Point(10, 117)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(103, 17)
-        Me.Label9.TabIndex = 110
-        Me.Label9.Text = "Adressierte-Zollstelle:"
-        '
-        'txtDyMandant
-        '
-        Me.txtDyMandant.BackColor = System.Drawing.Color.White
-        Me.txtDyMandant.Location = New System.Drawing.Point(2, 7)
-        Me.txtDyMandant.Name = "txtDyMandant"
-        Me.txtDyMandant.Size = New System.Drawing.Size(44, 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.Name = "txtDyNiederlassung"
-        Me.txtDyNiederlassung.Size = New System.Drawing.Size(45, 12)
-        Me.txtDyNiederlassung.TabIndex = 108
-        Me.txtDyNiederlassung.Text = "SUB"
-        '
-        'lblBezugsnummer
-        '
-        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.Name = "lblBezugsnummer"
-        Me.lblBezugsnummer.Size = New System.Drawing.Size(193, 23)
-        Me.lblBezugsnummer.TabIndex = 107
-        Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
-        Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'Button3
-        '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(473, 159)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(205, 23)
-        Me.Button3.TabIndex = 152
-        Me.Button3.Text = "alle Anhänge auswählen"
-        Me.Button3.UseVisualStyleBackColor = True
-        '
-        'Label6
-        '
-        Me.Label6.Location = New System.Drawing.Point(9, 168)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(135, 13)
-        Me.Label6.TabIndex = 147
-        Me.Label6.Text = "Dokumente:"
-        '
-        'lblAnh
-        '
-        Me.lblAnh.Location = New System.Drawing.Point(332, 168)
-        Me.lblAnh.Name = "lblAnh"
-        Me.lblAnh.Size = New System.Drawing.Size(135, 13)
-        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.Name = "btnAgg_Tnr"
-        Me.btnAgg_Tnr.Size = New System.Drawing.Size(83, 23)
-        Me.btnAgg_Tnr.TabIndex = 154
-        Me.btnAgg_Tnr.Tag = "1"
-        Me.btnAgg_Tnr.Text = "Tarifnummer"
-        Me.btnAgg_Tnr.UseVisualStyleBackColor = False
-        '
-        'Label2
-        '
-        Me.Label2.Location = New System.Drawing.Point(6, 350)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(103, 17)
-        Me.Label2.TabIndex = 149
-        Me.Label2.Text = "Aggregieren:"
-        '
-        '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.Name = "btnAgg_Origin"
-        Me.btnAgg_Origin.Size = New System.Drawing.Size(90, 23)
-        Me.btnAgg_Origin.TabIndex = 155
-        Me.btnAgg_Origin.Tag = "1"
-        Me.btnAgg_Origin.Text = "Ursprungsland"
-        Me.btnAgg_Origin.UseVisualStyleBackColor = False
-        '
-        'btnAgg_Unit
-        '
-        Me.btnAgg_Unit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_Unit.Location = New System.Drawing.Point(255, 344)
-        Me.btnAgg_Unit.Name = "btnAgg_Unit"
-        Me.btnAgg_Unit.Size = New System.Drawing.Size(79, 23)
-        Me.btnAgg_Unit.TabIndex = 156
-        Me.btnAgg_Unit.Tag = "0"
-        Me.btnAgg_Unit.Text = "Maßeinheit"
-        Me.btnAgg_Unit.UseVisualStyleBackColor = True
-        '
-        'btnAgg_desc
-        '
-        Me.btnAgg_desc.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAgg_desc.Location = New System.Drawing.Point(340, 344)
-        Me.btnAgg_desc.Name = "btnAgg_desc"
-        Me.btnAgg_desc.Size = New System.Drawing.Size(126, 23)
-        Me.btnAgg_desc.TabIndex = 157
-        Me.btnAgg_desc.Tag = "0"
-        Me.btnAgg_desc.Text = "Warenbeschreibung"
-        Me.btnAgg_desc.UseVisualStyleBackColor = True
-        '
         'cboStammreferenz
         '
         Me.cboStammreferenz._allowedValuesFreiText = Nothing
@@ -297,6 +199,24 @@ Partial Class frmATEZ_EZA
         Me.txtLKWId.Size = New System.Drawing.Size(255, 23)
         Me.txtLKWId.TabIndex = 144
         '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(6, 91)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(48, 13)
+        Me.Label3.TabIndex = 113
+        Me.Label3.Text = "LKW-KZ:"
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(6, 117)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(117, 13)
+        Me.Label9.TabIndex = 110
+        Me.Label9.Text = "Adressierte-Zollstelle:"
+        '
         'sbAdressierteZollstelle
         '
         Me.sbAdressierteZollstelle._allowFreitext = False
@@ -323,6 +243,114 @@ Partial Class frmATEZ_EZA
         Me.sbAdressierteZollstelle.TabIndex = 111
         Me.sbAdressierteZollstelle.usrcntl = Nothing
         '
+        'txtDyMandant
+        '
+        Me.txtDyMandant.AutoSize = True
+        Me.txtDyMandant.BackColor = System.Drawing.Color.White
+        Me.txtDyMandant.Location = New System.Drawing.Point(6, 13)
+        Me.txtDyMandant.Name = "txtDyMandant"
+        Me.txtDyMandant.Size = New System.Drawing.Size(35, 13)
+        Me.txtDyMandant.TabIndex = 109
+        Me.txtDyMandant.Text = "VERG"
+        Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'txtDyNiederlassung
+        '
+        Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White
+        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
+        Me.txtDyNiederlassung.Text = "SUB"
+        '
+        'lblBezugsnummer
+        '
+        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, 8)
+        Me.lblBezugsnummer.Name = "lblBezugsnummer"
+        Me.lblBezugsnummer.Size = New System.Drawing.Size(193, 23)
+        Me.lblBezugsnummer.TabIndex = 107
+        Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
+        Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(473, 157)
+        Me.Button3.Name = "Button3"
+        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
+        '
+        'Label6
+        '
+        Me.Label6.Location = New System.Drawing.Point(9, 168)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(135, 13)
+        Me.Label6.TabIndex = 147
+        Me.Label6.Text = "Dokumente:"
+        '
+        'lblAnh
+        '
+        Me.lblAnh.Location = New System.Drawing.Point(332, 168)
+        Me.lblAnh.Name = "lblAnh"
+        Me.lblAnh.Size = New System.Drawing.Size(135, 13)
+        Me.lblAnh.TabIndex = 151
+        Me.lblAnh.Visible = False
+        '
+        'btnAgg_Tnr
+        '
+        Me.btnAgg_Tnr.BackColor = System.Drawing.Color.DeepSkyBlue
+        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
+        Me.btnAgg_Tnr.Tag = "1"
+        Me.btnAgg_Tnr.Text = "Tarifnummer"
+        Me.btnAgg_Tnr.UseVisualStyleBackColor = False
+        '
+        'Label2
+        '
+        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
+        Me.Label2.Text = "Aggregieren:"
+        '
+        'btnAgg_Origin
+        '
+        Me.btnAgg_Origin.BackColor = System.Drawing.Color.DeepSkyBlue
+        Me.btnAgg_Origin.Location = New System.Drawing.Point(162, 3)
+        Me.btnAgg_Origin.Name = "btnAgg_Origin"
+        Me.btnAgg_Origin.Size = New System.Drawing.Size(92, 23)
+        Me.btnAgg_Origin.TabIndex = 155
+        Me.btnAgg_Origin.Tag = "1"
+        Me.btnAgg_Origin.Text = "Ursprungsland"
+        Me.btnAgg_Origin.UseVisualStyleBackColor = False
+        '
+        'btnAgg_Unit
+        '
+        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
+        Me.btnAgg_Unit.Tag = "0"
+        Me.btnAgg_Unit.Text = "Maßeinheit"
+        Me.btnAgg_Unit.UseVisualStyleBackColor = True
+        '
+        'btnAgg_desc
+        '
+        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
+        Me.btnAgg_desc.Tag = "0"
+        Me.btnAgg_desc.Text = "Warenbeschreibung"
+        Me.btnAgg_desc.UseVisualStyleBackColor = True
+        '
         'dgvAnhaenge
         '
         Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
@@ -348,24 +376,92 @@ Partial Class frmATEZ_EZA
         Me.columnName.Name = "columnName"
         Me.columnName.ReadOnly = True
         '
+        'btnPrio_CommInv
+        '
+        Me.btnPrio_CommInv.BackColor = System.Drawing.Color.White
+        Me.btnPrio_CommInv.Location = New System.Drawing.Point(76, 28)
+        Me.btnPrio_CommInv.Name = "btnPrio_CommInv"
+        Me.btnPrio_CommInv.Size = New System.Drawing.Size(116, 23)
+        Me.btnPrio_CommInv.TabIndex = 159
+        Me.btnPrio_CommInv.Tag = "0"
+        Me.btnPrio_CommInv.Text = "Handelsrechnung"
+        Me.btnPrio_CommInv.UseVisualStyleBackColor = False
+        '
+        'Label5
+        '
+        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.0!)
+        Me.Label5.Location = New System.Drawing.Point(3, 33)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(103, 17)
+        Me.Label5.TabIndex = 160
+        Me.Label5.Text = "Priorität:"
+        '
+        'btnPrio_eFatura
+        '
+        Me.btnPrio_eFatura.BackColor = System.Drawing.Color.White
+        Me.btnPrio_eFatura.Location = New System.Drawing.Point(195, 28)
+        Me.btnPrio_eFatura.Name = "btnPrio_eFatura"
+        Me.btnPrio_eFatura.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_eFatura.TabIndex = 161
+        Me.btnPrio_eFatura.Tag = "0"
+        Me.btnPrio_eFatura.Text = "eFatura"
+        Me.btnPrio_eFatura.UseVisualStyleBackColor = False
+        '
+        'btnPrio_Export
+        '
+        Me.btnPrio_Export.BackColor = System.Drawing.Color.White
+        Me.btnPrio_Export.Location = New System.Drawing.Point(267, 28)
+        Me.btnPrio_Export.Name = "btnPrio_Export"
+        Me.btnPrio_Export.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_Export.TabIndex = 162
+        Me.btnPrio_Export.Tag = "0"
+        Me.btnPrio_Export.Text = "Ausfuhr"
+        Me.btnPrio_Export.UseVisualStyleBackColor = False
+        '
+        'btnPrio_ftz
+        '
+        Me.btnPrio_ftz.BackColor = System.Drawing.Color.White
+        Me.btnPrio_ftz.Location = New System.Drawing.Point(339, 28)
+        Me.btnPrio_ftz.Name = "btnPrio_ftz"
+        Me.btnPrio_ftz.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_ftz.TabIndex = 163
+        Me.btnPrio_ftz.Tag = "0"
+        Me.btnPrio_ftz.Text = "FTZ"
+        Me.btnPrio_ftz.UseVisualStyleBackColor = False
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.SystemColors.InactiveBorder
+        Me.Panel1.Controls.Add(Me.btnPrio_CommInv)
+        Me.Panel1.Controls.Add(Me.btnAgg_Tnr)
+        Me.Panel1.Controls.Add(Me.btnPrio_ftz)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.btnPrio_Export)
+        Me.Panel1.Controls.Add(Me.btnAgg_Origin)
+        Me.Panel1.Controls.Add(Me.btnPrio_eFatura)
+        Me.Panel1.Controls.Add(Me.btnAgg_Unit)
+        Me.Panel1.Controls.Add(Me.Label5)
+        Me.Panel1.Controls.Add(Me.btnAgg_desc)
+        Me.Panel1.Location = New System.Drawing.Point(0, 343)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(470, 54)
+        Me.Panel1.TabIndex = 164
+        '
         'frmATEZ_EZA
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ClientSize = New System.Drawing.Size(680, 413)
-        Me.Controls.Add(Me.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
@@ -373,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
@@ -400,4 +497,12 @@ Partial Class frmATEZ_EZA
     Friend WithEvents btnAgg_Origin As Button
     Friend WithEvents btnAgg_Unit As Button
     Friend WithEvents btnAgg_desc As Button
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Button2 As Button
+    Friend WithEvents btnPrio_CommInv As Button
+    Friend WithEvents Label5 As Label
+    Friend WithEvents btnPrio_eFatura As Button
+    Friend WithEvents btnPrio_Export As Button
+    Friend WithEvents btnPrio_ftz As Button
+    Friend WithEvents Panel1 As Panel
 End Class

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -1,5 +1,6 @@
 
 Imports com.esendex.sdk.optouts.models
+Imports DAKOSY_Worker
 Imports DAKOSY_Worker.eZollTypes
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
@@ -28,7 +29,7 @@ Public Class frmATEZ_EZA
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    ' Dim atez = New cATEZ_NCTS_IN("ATEZ")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
@@ -75,7 +76,7 @@ Public Class frmATEZ_EZA
 
     End Sub
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnSend.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnSend.Click, Button2.Click
         Try
 
 
@@ -112,7 +113,7 @@ Public Class frmATEZ_EZA
 
 
             'txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            txtDyMandant.Text = "VERG"
+            'txtDyMandant.Text = "VERG"
 
             '    atez.setJsonPDF(atez_data, dgvAnhaenge)
 
@@ -145,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",
@@ -167,8 +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 = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr, "+43 7711/2777 0"),
-                                        .contactPersonPosition = "Zolldeklarant/in"
+                                        .contactPersonPhoneNumber = getTelefon(),
+                                        .contactPersonPosition = "Zolldeklarant/in",
+                                        .contactPersonEmail = If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email), getDefaultMail_FIRMA(), VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email)
                                     },
                                     .declarantIsConsignee = True,
                                     .representationRelationshipCode = "",'-1, '??????????????????????????????????????????????????????????????
@@ -181,14 +191,18 @@ Public Class frmATEZ_EZA
                             }
                     },
                  .additionalSettings = New cRelayHubAdditionalSettings With {
-                        .combineOptions = AdditionalSettings
+                        .combineOptions = AdditionalSettings,
+                        .combineItemsPriorityDocumentType = combineItemsPriorityDocumentType
                     }
             }
 
 
-            If If(AVISO.Zollstelle, "").length >= 4 Then
-                ATEZ_RH_EZA.additionalData.declaration(0).headerData.addressedCustomsOffice = AVISO.Zollstelle.ToString.Substring(AVISO.Zollstelle.ToString.Length - 4)
-                'MsgBox(ATEZ_RH_EZA.additionalData.declaration(0).headerData.addressedCustomsOffice)
+            'If If(AVISO.Zollstelle, "").Length >= 4 Then
+            'ATEZ_RH_EZA.additionalData.declaration(0).headerData.addressedCustomsOffice = AVISO.Zollstelle.ToString.Substring(AVISO.Zollstelle.ToString.Length - 4)
+            '    'MsgBox(ATEZ_RH_EZA.additionalData.declaration(0).headerData.addressedCustomsOffice)
+            'End If
+            If If(sbAdressierteZollstelle._value, "").Length >= 4 Then
+                ATEZ_RH_EZA.additionalData.declaration(0).headerData.addressedCustomsOffice = sbAdressierteZollstelle._value
             End If
 
             ATEZ_RH_EZA.additionalData.declaration(0).objectIdentification.username = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "ANDREAS")
@@ -298,6 +312,13 @@ Public Class frmATEZ_EZA
             ATEZ_RH_EZA.dispatchCountry = If(ATEZ_RH_EZA.dispatchCountry, "") ' not null
             ATEZ_RH_EZA.destinationCountry = If(ATEZ_RH_EZA.destinationCountry, "") ' not null
 
+
+            '-------------------JSON AUSGEBEN-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+            If sender Is Button2 Then
+                MsgBox(VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHub_sendToRelayHub_JobOrderRequest.getJSON(ATEZ_RH_EZA))
+                Exit Sub ' --> Json uns raus...
+
+            End If
             '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
             '-------------------SENDEN-----------------------------------------------------------------------------------------------------------------------------------------------------------------
             '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -323,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
@@ -447,21 +491,26 @@ Public Class frmATEZ_EZA
 
     Private Sub frmATEZNCTS_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
-        Select Case FIRMA_DY
-            Case "VERAG" : txtDyMandant.Text = "VERG"
-                txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+        'Select Case FIRMA_DY
+        '    Case "VERAG" : txtDyMandant.Text = "VERG"
+        '        txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
 
-                Select Case FilialenNr
-                    Case "5103" : txtDyNiederlassung.Text = "WAI"
+        '        Select Case FilialenNr
+        '            Case "5103" : txtDyNiederlassung.Text = "WAI"
 
-                End Select
+        '        End Select
 
 
-            Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
-            Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
-            Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
-            Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
-        End Select
+        '    Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
+        '    Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
+        '    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, "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
 
         initSeachboxes()
         lblAnh.Visible = True
@@ -481,7 +530,7 @@ Public Class frmATEZ_EZA
 
                 lblBezugsnummer.Text = atez_data.VERAG_LRN
 
-                cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+                cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "' " & If(txtDyMandant.Text = "UNAT", ", 'ATSPED' ", "") & ")  and dySr_visible=1", False, "FMZOLL", True)
                 cboStammreferenz.changeItem(atez_data.DAKOSY_TemplateCode)
                 'cboProzedur.changeItem(atez_data.DAKOSY_Procedure)
 
@@ -519,7 +568,7 @@ Public Class frmATEZ_EZA
             'Button1.Text = "An ATEZ senden -->"
             pnlHead.Enabled = True
 
-            cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+            cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "' " & If(txtDyMandant.Text = "UNAT", ", 'ATSPED' ", "") & ")  and dySr_visible=1", False, "FMZOLL", True)
             cboStammreferenz.changeItem("")
 
             getBezugsnr(BezugsNr)
@@ -549,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
@@ -774,4 +823,20 @@ Public Class frmATEZ_EZA
             sender.BackColor = SystemColors.Control
         End If
     End Sub
-End Class
+    Private Sub Buttonprio_Click(sender As Object, e As EventArgs) Handles btnPrio_CommInv.Click, btnPrio_ftz.Click, btnPrio_eFatura.Click, btnPrio_Export.Click
+
+        If sender IsNot btnPrio_CommInv Then btnPrio_CommInv.Tag = 0 : btnPrio_CommInv.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_eFatura Then btnPrio_eFatura.Tag = 0 : btnPrio_eFatura.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_Export Then btnPrio_Export.Tag = 0 : btnPrio_Export.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_ftz Then btnPrio_ftz.Tag = 0 : btnPrio_ftz.BackColor = SystemColors.Control
+
+
+        If sender.Tag = 0 Then
+            sender.Tag = 1
+            sender.BackColor = Color.DeepSkyBlue
+        Else
+            sender.Tag = 0
+            sender.BackColor = SystemColors.Control
+        End If
+        End Sub
+        End Class

Aviso/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

Aviso/ATEZ/frmATEZ_NCTS.vb

@@ -25,7 +25,7 @@ Public Class frmATEZ_NCTS
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    Dim atez As cATEZ_NCTS_IN = New cATEZ_NCTS_IN("ATEZ")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
@@ -72,12 +72,12 @@ 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
 
 
             If Button1.Text = "JSON" Then
-                If Not atez.setJson(atez_data) Then MsgBox("Fehler beim Erstellen der Daten")
+                If Not atez.setJsonNCTS(atez_data) Then MsgBox("Fehler beim Erstellen der Daten")
                 atez.setJsonPDF(atez_data, dgvAnhaenge)
 
                 Dim data As New DataObject()
@@ -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

Aviso/AktenErfassung/frmEintragAviso.designer.vb

@@ -152,9 +152,10 @@ Partial Class frmEintragAviso
         Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
+        Me.lblAnhaenge = New System.Windows.Forms.Label()
         Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere()
         Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla()
-        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
         Me.panAdmin.SuspendLayout()
         Me.grpAviso.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1826,6 +1827,28 @@ Partial Class frmEintragAviso
         Me.Label2.TabIndex = 5
         Me.Label2.Text = "FIRMA:"
         '
+        'lblErrErfasstDat
+        '
+        Me.lblErrErfasstDat.AutoSize = True
+        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
+        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
+        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
+        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
+        Me.lblErrErfasstDat.TabIndex = 52
+        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
+        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErrErfasstDat.Visible = False
+        '
+        'lblAnhaenge
+        '
+        Me.lblAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.lblAnhaenge.AutoSize = True
+        Me.lblAnhaenge.Location = New System.Drawing.Point(699, 641)
+        Me.lblAnhaenge.Name = "lblAnhaenge"
+        Me.lblAnhaenge.Size = New System.Drawing.Size(56, 13)
+        Me.lblAnhaenge.TabIndex = 56
+        Me.lblAnhaenge.Text = "Anhänge: "
+        '
         'UsrCntlAviso_Vorpapiere1
         '
         Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
@@ -1843,18 +1866,6 @@ Partial Class frmEintragAviso
         Me.UsrCntlEintragAvisoAtilla.TabIndex = 8
         Me.UsrCntlEintragAvisoAtilla.Visible = False
         '
-        'lblErrErfasstDat
-        '
-        Me.lblErrErfasstDat.AutoSize = True
-        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
-        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
-        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
-        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
-        Me.lblErrErfasstDat.TabIndex = 52
-        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
-        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
-        Me.lblErrErfasstDat.Visible = False
-        '
         'frmEintragAviso
         '
         Me.AcceptButton = Me.btnOK
@@ -1862,6 +1873,7 @@ Partial Class frmEintragAviso
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(792, 765)
+        Me.Controls.Add(Me.lblAnhaenge)
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.cboFirma)
         Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
@@ -1925,12 +1937,10 @@ Partial Class frmEintragAviso
     Friend WithEvents btnOK As System.Windows.Forms.Button
     Friend WithEvents lblErfAm As System.Windows.Forms.Label
     Friend WithEvents btnAbbruch As System.Windows.Forms.Button
-    Friend WithEvents txtInfo As System.Windows.Forms.TextBox
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents lblFraecher As System.Windows.Forms.Label
     Friend WithEvents lblAvisierer As System.Windows.Forms.Label
     Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label
-    Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox
     Friend WithEvents lblAenderungen As System.Windows.Forms.Label
     Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox
     Friend WithEvents txtDatum As System.Windows.Forms.TextBox
@@ -2054,4 +2064,7 @@ Partial Class frmEintragAviso
     Friend WithEvents lblTeamAvisierer As Label
     Friend WithEvents cbxEintreffenAus As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents lblErrErfasstDat As Label
+    Public WithEvents lblAnhaenge As Label
+    Public WithEvents txtInfo As TextBox
+    Public WithEvents txtÄnderungen As TextBox
 End Class

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
@@ -32,6 +32,9 @@ Public Class frmEintragAviso
     Dim PROG As New cProgramFunctions
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
+    Dim INFO As String = ""
+
+    Public getFromAVISO_Trip As cAviso = Nothing
 
     Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
@@ -40,6 +43,14 @@ Public Class frmEintragAviso
         Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
     End Sub
 
+
+    Public Sub New(INFO As String)
+        InitializeComponent()
+        Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
+
+        Me.INFO = INFO
+    End Sub
+
     Private Sub frmEintragAviso_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         If FIRMA_TMP = "ATILLA" And myAviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then
             If myAviso.Frächter = "" Then
@@ -325,6 +336,9 @@ Public Class frmEintragAviso
             dtpAvisoEingangDatum.Value = Now.Date
             dtpAvisoEingangZeit.Value = LeerDatum
             txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter
+            If INFO <> "" Then txtÄnderungen.Text &= vbNewLine & vbNewLine & INFO
+
+
             lblStatus.Text = "Neuanlage"
             optAvisoEingang.Checked = True
             kdAvisierer.Text = ""
@@ -338,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()
@@ -363,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
@@ -666,18 +734,18 @@ Public Class frmEintragAviso
             'If Neuanlage Then
             '  If optAvisoEingang.Checked Then
             '  If optAvisoEingang.Checked Thensend
-            '    If dtpAvisoEingangDatum.Value < Now.Date Then
+            '    If dtpAvisoEingangDatum.Value <Now.Date Then
             '         Dim antwort As MsgBoxResult = MsgBox("Das Aviso-Eingangsdatum liegt in der Vergangenheit. Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
-            '                                 "Aviso speichern")
-            '        If antwort = vbNo Then
-            '          dtpAvisoEingangDatum.Focus()
-            '          Exit Sub
-            '      End If
-            '    End If
-            '  End If
-            'End If
+                                        '                                 "Aviso speichern")
+                                        '        If antwort = vbNo Then
+                                        '          dtpAvisoEingangDatum.Focus()
+                                        '          Exit Sub
+                                        '      End If
+                                        '    End If
+                                        '  End If
+                                        'End If
 
-            If txtLKW_Nr.Text.Trim = "" Then
+                                        If txtLKW_Nr.Text.Trim = "" Then
                 ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
                 lblErr_LKW.Visible = True
                 txtLKW_Nr.Focus()
@@ -734,28 +802,70 @@ Public Class frmEintragAviso
                 End If
             End If
 
+            Dim EintragMehrfach As Boolean = False
 
             If Neuanlage Then
                 'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
-                Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
-                If hLKWCheck2 <> "" Then
-                    Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
-                                           "Aviso-Eintrag")
-                    If antwort = vbNo Then
-                        Exit Sub
-                    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(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
-                    If hLKWCheck <> "" Then
-                        Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
-                                               "Aviso-Eintrag")
-                        If antwort = vbNo Then
-                            Exit Sub
+                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
-                    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")
+                                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
@@ -881,6 +991,7 @@ Public Class frmEintragAviso
             ' myAviso.Auftraggeber_KdNr = IIf(kdAvisierer.KdNr_value > 0, kdAvisierer.KdNr_value, "")
 
             myAviso.Handling = cbxHandling.Checked
+            myAviso.EintragMehrfach = EintragMehrfach
 
 
 
@@ -1079,6 +1190,10 @@ Public Class frmEintragAviso
                 End If
             End If
 
+            If INFO <> "" Then
+                AvisoStatusFunctions.insertVermerkAllg(tmpId, INFO, 123)
+            End If
+
             If myAviso.Warenort Then
                 AvisoStatusFunctions.insertVermerkAllg(tmpId, "ATB-Nr. folgt", 80)
             End If

Aviso/AktenErfassung/frmEintragSammelakt.designer.vb

@@ -0,0 +1,532 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEintragSammelakt
+    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(frmEintragSammelakt))
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.lblErfAm = New System.Windows.Forms.Label()
+        Me.btnAbbruch = New System.Windows.Forms.Button()
+        Me.txtInfo = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.lblLkwKennzeichen = New System.Windows.Forms.Label()
+        Me.txtÄnderungen = New System.Windows.Forms.TextBox()
+        Me.lblAenderungen = New System.Windows.Forms.Label()
+        Me.dtpDatum = New System.Windows.Forms.DateTimePicker()
+        Me.txtLKW_Nr = New System.Windows.Forms.TextBox()
+        Me.lblStatus = New System.Windows.Forms.Label()
+        Me.lblStatus2 = New System.Windows.Forms.Label()
+        Me.lblAktenuebersicht = New System.Windows.Forms.Label()
+        Me.grpAviso = New System.Windows.Forms.GroupBox()
+        Me.lblErr_Kunde = New System.Windows.Forms.Label()
+        Me.lblErr_Aktentyp = New System.Windows.Forms.Label()
+        Me.lblErr_LKW = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.kdAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.btnAuftraggeber = New System.Windows.Forms.Button()
+        Me.lblErrFmZollKdNr = New System.Windows.Forms.Label()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.grpAviso.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'btnOK
+        '
+        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnOK.Location = New System.Drawing.Point(21, 489)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(271, 45)
+        Me.btnOK.TabIndex = 24
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'lblErfAm
+        '
+        Me.lblErfAm.AutoSize = True
+        Me.lblErfAm.Location = New System.Drawing.Point(220, 12)
+        Me.lblErfAm.Name = "lblErfAm"
+        Me.lblErfAm.Size = New System.Drawing.Size(59, 13)
+        Me.lblErfAm.TabIndex = 2
+        Me.lblErfAm.Text = "Erfasst am:"
+        '
+        'btnAbbruch
+        '
+        Me.btnAbbruch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAbbruch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnAbbruch.Location = New System.Drawing.Point(298, 489)
+        Me.btnAbbruch.Name = "btnAbbruch"
+        Me.btnAbbruch.Size = New System.Drawing.Size(111, 45)
+        Me.btnAbbruch.TabIndex = 27
+        Me.btnAbbruch.Text = "Abbruch"
+        Me.btnAbbruch.UseVisualStyleBackColor = True
+        '
+        'txtInfo
+        '
+        Me.txtInfo.AcceptsReturn = True
+        Me.txtInfo.Location = New System.Drawing.Point(424, 356)
+        Me.txtInfo.MaxLength = 240
+        Me.txtInfo.Multiline = True
+        Me.txtInfo.Name = "txtInfo"
+        Me.txtInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtInfo.Size = New System.Drawing.Size(360, 75)
+        Me.txtInfo.TabIndex = 25
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(421, 340)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(25, 13)
+        Me.Label3.TabIndex = 21
+        Me.Label3.Text = "Info"
+        '
+        'lblLkwKennzeichen
+        '
+        Me.lblLkwKennzeichen.AutoSize = True
+        Me.lblLkwKennzeichen.Location = New System.Drawing.Point(6, 77)
+        Me.lblLkwKennzeichen.Name = "lblLkwKennzeichen"
+        Me.lblLkwKennzeichen.Size = New System.Drawing.Size(96, 13)
+        Me.lblLkwKennzeichen.TabIndex = 11
+        Me.lblLkwKennzeichen.Text = "Aktenbezeichnung"
+        '
+        'txtÄnderungen
+        '
+        Me.txtÄnderungen.AcceptsReturn = True
+        Me.txtÄnderungen.BackColor = System.Drawing.SystemColors.Info
+        Me.txtÄnderungen.ForeColor = System.Drawing.SystemColors.InfoText
+        Me.txtÄnderungen.Location = New System.Drawing.Point(424, 466)
+        Me.txtÄnderungen.MaxLength = 0
+        Me.txtÄnderungen.Multiline = True
+        Me.txtÄnderungen.Name = "txtÄnderungen"
+        Me.txtÄnderungen.ReadOnly = True
+        Me.txtÄnderungen.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtÄnderungen.Size = New System.Drawing.Size(360, 68)
+        Me.txtÄnderungen.TabIndex = 13
+        Me.txtÄnderungen.TabStop = False
+        '
+        'lblAenderungen
+        '
+        Me.lblAenderungen.AutoSize = True
+        Me.lblAenderungen.Location = New System.Drawing.Point(421, 450)
+        Me.lblAenderungen.Name = "lblAenderungen"
+        Me.lblAenderungen.Size = New System.Drawing.Size(65, 13)
+        Me.lblAenderungen.TabIndex = 12
+        Me.lblAenderungen.Text = "Änderungen"
+        '
+        'dtpDatum
+        '
+        Me.dtpDatum.CustomFormat = "dd.MM.yyyy HH:mm"
+        Me.dtpDatum.Format = System.Windows.Forms.DateTimePickerFormat.Custom
+        Me.dtpDatum.Location = New System.Drawing.Point(285, 7)
+        Me.dtpDatum.Name = "dtpDatum"
+        Me.dtpDatum.Size = New System.Drawing.Size(130, 20)
+        Me.dtpDatum.TabIndex = 0
+        '
+        'txtLKW_Nr
+        '
+        Me.txtLKW_Nr.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtLKW_Nr.Location = New System.Drawing.Point(108, 69)
+        Me.txtLKW_Nr.MaxLength = 30
+        Me.txtLKW_Nr.Name = "txtLKW_Nr"
+        Me.txtLKW_Nr.Size = New System.Drawing.Size(289, 26)
+        Me.txtLKW_Nr.TabIndex = 15
+        '
+        'lblStatus
+        '
+        Me.lblStatus.BackColor = System.Drawing.Color.LemonChiffon
+        Me.lblStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblStatus.ForeColor = System.Drawing.Color.Green
+        Me.lblStatus.Location = New System.Drawing.Point(516, 7)
+        Me.lblStatus.Name = "lblStatus"
+        Me.lblStatus.Size = New System.Drawing.Size(268, 20)
+        Me.lblStatus.TabIndex = 4
+        Me.lblStatus.Text = "freigegeben"
+        '
+        'lblStatus2
+        '
+        Me.lblStatus2.AutoSize = True
+        Me.lblStatus2.Location = New System.Drawing.Point(430, 12)
+        Me.lblStatus2.Name = "lblStatus2"
+        Me.lblStatus2.Size = New System.Drawing.Size(80, 13)
+        Me.lblStatus2.TabIndex = 3
+        Me.lblStatus2.Text = "aktueller Status"
+        '
+        'lblAktenuebersicht
+        '
+        Me.lblAktenuebersicht.AutoSize = True
+        Me.lblAktenuebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAktenuebersicht.Location = New System.Drawing.Point(12, 11)
+        Me.lblAktenuebersicht.Name = "lblAktenuebersicht"
+        Me.lblAktenuebersicht.Size = New System.Drawing.Size(130, 20)
+        Me.lblAktenuebersicht.TabIndex = 1
+        Me.lblAktenuebersicht.Text = "Aktenübersicht"
+        '
+        'grpAviso
+        '
+        Me.grpAviso.Controls.Add(Me.lblErr_Kunde)
+        Me.grpAviso.Controls.Add(Me.lblErr_Aktentyp)
+        Me.grpAviso.Controls.Add(Me.lblErr_LKW)
+        Me.grpAviso.Controls.Add(Me.Label5)
+        Me.grpAviso.Controls.Add(Me.Label4)
+        Me.grpAviso.Controls.Add(Me.Label1)
+        Me.grpAviso.Controls.Add(Me.MyComboBox1)
+        Me.grpAviso.Controls.Add(Me.PictureBox1)
+        Me.grpAviso.Controls.Add(Me.kdAuftraggeber)
+        Me.grpAviso.Controls.Add(Me.dgvAnhaenge)
+        Me.grpAviso.Controls.Add(Me.txtLKW_Nr)
+        Me.grpAviso.Controls.Add(Me.btnAuftraggeber)
+        Me.grpAviso.Controls.Add(Me.lblLkwKennzeichen)
+        Me.grpAviso.Location = New System.Drawing.Point(12, 49)
+        Me.grpAviso.Name = "grpAviso"
+        Me.grpAviso.Size = New System.Drawing.Size(403, 434)
+        Me.grpAviso.TabIndex = 7
+        Me.grpAviso.TabStop = False
+        Me.grpAviso.Text = "CBAM"
+        '
+        'lblErr_Kunde
+        '
+        Me.lblErr_Kunde.AutoSize = True
+        Me.lblErr_Kunde.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_Kunde.Location = New System.Drawing.Point(105, 124)
+        Me.lblErr_Kunde.Name = "lblErr_Kunde"
+        Me.lblErr_Kunde.Size = New System.Drawing.Size(130, 13)
+        Me.lblErr_Kunde.TabIndex = 61
+        Me.lblErr_Kunde.Text = "Kunde darf nicht leer sein!"
+        Me.lblErr_Kunde.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_Kunde.Visible = False
+        '
+        'lblErr_Aktentyp
+        '
+        Me.lblErr_Aktentyp.AutoSize = True
+        Me.lblErr_Aktentyp.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_Aktentyp.Location = New System.Drawing.Point(105, 13)
+        Me.lblErr_Aktentyp.Name = "lblErr_Aktentyp"
+        Me.lblErr_Aktentyp.Size = New System.Drawing.Size(141, 13)
+        Me.lblErr_Aktentyp.TabIndex = 60
+        Me.lblErr_Aktentyp.Text = "Aktentyp darf nicht leer sein!"
+        Me.lblErr_Aktentyp.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_Aktentyp.Visible = False
+        '
+        'lblErr_LKW
+        '
+        Me.lblErr_LKW.AutoSize = True
+        Me.lblErr_LKW.ForeColor = System.Drawing.Color.Red
+        Me.lblErr_LKW.Location = New System.Drawing.Point(105, 58)
+        Me.lblErr_LKW.Name = "lblErr_LKW"
+        Me.lblErr_LKW.Size = New System.Drawing.Size(188, 13)
+        Me.lblErr_LKW.TabIndex = 54
+        Me.lblErr_LKW.Text = "Aktenbezeichnung darf nicht leer sein!"
+        Me.lblErr_LKW.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErr_LKW.Visible = False
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(6, 132)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(53, 13)
+        Me.Label5.TabIndex = 59
+        Me.Label5.Text = "Anhänge:"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(6, 35)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(59, 13)
+        Me.Label4.TabIndex = 58
+        Me.Label4.Text = "Akten-Typ:"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(6, 104)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(41, 13)
+        Me.Label1.TabIndex = 57
+        Me.Label1.Text = "Kunde:"
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(108, 27)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(198, 28)
+        Me.MyComboBox1.TabIndex = 56
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.cbam_s
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox1.Location = New System.Drawing.Point(312, 9)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(85, 58)
+        Me.PictureBox1.TabIndex = 48
+        Me.PictureBox1.TabStop = False
+        '
+        'kdAuftraggeber
+        '
+        Me.kdAuftraggeber._AlleFirmenCLUSTER = False
+        Me.kdAuftraggeber._AllowSetValue = True
+        Me.kdAuftraggeber._autoSizeGross = False
+        Me.kdAuftraggeber._display_Name1 = False
+        Me.kdAuftraggeber._displayAVISO_Email = True
+        Me.kdAuftraggeber._displayFullName = False
+        Me.kdAuftraggeber._displayWoelflKd = False
+        Me.kdAuftraggeber._hideIfListEmpty = True
+        Me.kdAuftraggeber._loadKdData = False
+        Me.kdAuftraggeber._searchName1 = True
+        Me.kdAuftraggeber._UseFIRMA = ""
+        Me.kdAuftraggeber._ValueKdAndName = True
+        Me.kdAuftraggeber.dgvpos = "LEFT"
+        Me.kdAuftraggeber.KdName = ""
+        Me.kdAuftraggeber.KdNr = "-1"
+        Me.kdAuftraggeber.kdNrField = Nothing
+        Me.kdAuftraggeber.KdNrNullInt = Nothing
+        Me.kdAuftraggeber.Location = New System.Drawing.Point(108, 101)
+        Me.kdAuftraggeber.Name = "kdAuftraggeber"
+        Me.kdAuftraggeber.nurAktive = False
+        Me.kdAuftraggeber.searchActive = True
+        Me.kdAuftraggeber.Size = New System.Drawing.Size(258, 20)
+        Me.kdAuftraggeber.TabIndex = 42
+        Me.kdAuftraggeber.TIMER_SEARCH = True
+        Me.kdAuftraggeber.usrcntl = Nothing
+        '
+        'dgvAnhaenge
+        '
+        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvAnhaenge.AllowUserToAddRows = False
+        Me.dgvAnhaenge.AllowUserToDeleteRows = False
+        Me.dgvAnhaenge.AllowUserToResizeColumns = False
+        Me.dgvAnhaenge.AllowUserToResizeRows = False
+        Me.dgvAnhaenge.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
+        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvAnhaenge.ColumnHeadersVisible = False
+        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.clmnPfad})
+        Me.dgvAnhaenge.Location = New System.Drawing.Point(9, 148)
+        Me.dgvAnhaenge.Name = "dgvAnhaenge"
+        Me.dgvAnhaenge.ReadOnly = True
+        Me.dgvAnhaenge.RowHeadersVisible = False
+        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvAnhaenge.Size = New System.Drawing.Size(388, 286)
+        Me.dgvAnhaenge.TabIndex = 17
+        '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'clmnPfad
+        '
+        Me.clmnPfad.HeaderText = "Pfad"
+        Me.clmnPfad.Name = "clmnPfad"
+        Me.clmnPfad.ReadOnly = True
+        Me.clmnPfad.Visible = False
+        '
+        'btnAuftraggeber
+        '
+        Me.btnAuftraggeber.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAuftraggeber.Enabled = False
+        Me.btnAuftraggeber.FlatAppearance.BorderSize = 0
+        Me.btnAuftraggeber.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAuftraggeber.Image = CType(resources.GetObject("btnAuftraggeber.Image"), System.Drawing.Image)
+        Me.btnAuftraggeber.Location = New System.Drawing.Point(372, 97)
+        Me.btnAuftraggeber.Name = "btnAuftraggeber"
+        Me.btnAuftraggeber.Size = New System.Drawing.Size(25, 24)
+        Me.btnAuftraggeber.TabIndex = 43
+        Me.btnAuftraggeber.TabStop = False
+        Me.btnAuftraggeber.Tag = "Kunde hinzufügen"
+        Me.btnAuftraggeber.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnAuftraggeber.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        Me.btnAuftraggeber.UseVisualStyleBackColor = True
+        '
+        'lblErrFmZollKdNr
+        '
+        Me.lblErrFmZollKdNr.AutoSize = True
+        Me.lblErrFmZollKdNr.ForeColor = System.Drawing.Color.Red
+        Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(591, 372)
+        Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr"
+        Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26)
+        Me.lblErrFmZollKdNr.TabIndex = 26
+        Me.lblErrFmZollKdNr.Text = "Wenn möglich bitte die FM-Zoll " & Global.Microsoft.VisualBasic.ChrW(10) & "Zuordnung mit KdNr eintragen!"
+        Me.lblErrFmZollKdNr.Visible = False
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button3.Location = New System.Drawing.Point(424, 49)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(359, 37)
+        Me.Button3.TabIndex = 11
+        Me.Button3.Text = "Weiter zu den Unterakten"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'cboFirma
+        '
+        Me.cboFirma._allowedValuesFreiText = Nothing
+        Me.cboFirma._allowFreiText = False
+        Me.cboFirma._value = ""
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Location = New System.Drawing.Point(285, 28)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(130, 21)
+        Me.cboFirma.TabIndex = 6
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(220, 31)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(43, 13)
+        Me.Label2.TabIndex = 5
+        Me.Label2.Text = "FIRMA:"
+        '
+        'lblErrErfasstDat
+        '
+        Me.lblErrErfasstDat.AutoSize = True
+        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
+        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
+        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
+        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
+        Me.lblErrErfasstDat.TabIndex = 52
+        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
+        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErrErfasstDat.Visible = False
+        '
+        'Label12
+        '
+        Me.Label12.BackColor = System.Drawing.Color.Transparent
+        Me.Label12.Location = New System.Drawing.Point(421, 432)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(372, 18)
+        Me.Label12.TabIndex = 29
+        Me.Label12.Text = "Achtung: im Feld Info nur allgemeine Infos erfassen. "
+        '
+        'Panel1
+        '
+        Me.Panel1.Location = New System.Drawing.Point(424, 92)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(358, 245)
+        Me.Panel1.TabIndex = 53
+        '
+        'frmEintragAvisoCBAM
+        '
+        Me.AcceptButton = Me.btnOK
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(792, 564)
+        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.cboFirma)
+        Me.Controls.Add(Me.Button3)
+        Me.Controls.Add(Me.grpAviso)
+        Me.Controls.Add(Me.lblAktenuebersicht)
+        Me.Controls.Add(Me.lblStatus)
+        Me.Controls.Add(Me.lblStatus2)
+        Me.Controls.Add(Me.lblErfAm)
+        Me.Controls.Add(Me.txtÄnderungen)
+        Me.Controls.Add(Me.dtpDatum)
+        Me.Controls.Add(Me.btnAbbruch)
+        Me.Controls.Add(Me.lblAenderungen)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.txtInfo)
+        Me.Controls.Add(Me.lblErrFmZollKdNr)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label12)
+        Me.Controls.Add(Me.lblErrErfasstDat)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.KeyPreview = True
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmEintragAvisoCBAM"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Sammelaktakt erfassen/bearbeiten"
+        Me.grpAviso.ResumeLayout(False)
+        Me.grpAviso.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents btnOK As System.Windows.Forms.Button
+    Friend WithEvents lblErfAm As System.Windows.Forms.Label
+    Friend WithEvents btnAbbruch As System.Windows.Forms.Button
+    Friend WithEvents txtInfo As System.Windows.Forms.TextBox
+    Friend WithEvents Label3 As System.Windows.Forms.Label
+    Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label
+    Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox
+    Friend WithEvents lblAenderungen As System.Windows.Forms.Label
+    Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox
+    Friend WithEvents txtDatum As System.Windows.Forms.TextBox
+    Friend WithEvents lblStatus As System.Windows.Forms.Label
+    Friend WithEvents lblStatus2 As System.Windows.Forms.Label
+    Friend WithEvents dtpDatum As System.Windows.Forms.DateTimePicker
+    Friend WithEvents lblAktenuebersicht As System.Windows.Forms.Label
+    Friend WithEvents grpAviso As System.Windows.Forms.GroupBox
+    Friend WithEvents lblErrFmZollKdNr As System.Windows.Forms.Label
+    Friend WithEvents Button3 As System.Windows.Forms.Button
+    Friend WithEvents btnAuftraggeber As System.Windows.Forms.Button
+    Friend WithEvents kdAuftraggeber As VERAG_PROG_ALLGEMEIN.KdSearchBox
+    Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents columnName As DataGridViewTextBoxColumn
+    Friend WithEvents clmnPfad As DataGridViewTextBoxColumn
+    Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents lblErrErfasstDat As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents Label12 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents lblErr_Kunde As Label
+    Friend WithEvents lblErr_Aktentyp As Label
+    Friend WithEvents lblErr_LKW As Label
+End Class

Aviso/AktenErfassung/frmEintragSammelakt.vb

@@ -0,0 +1,597 @@
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
+
+Public Class frmEintragSammelakt
+    '   Public frmHilf As frmMain
+
+    Dim Firmen As New cFirmenDAL
+    Dim AvisoDAL As New cAvisoDAL
+    Dim myAviso As New cAviso
+    Dim AVISOFUNC As New AvisoStatusFunctions
+    Dim ADMIN As New cADMIN
+    Dim hÄnderung As Boolean = False
+    Dim Neuanlage As Boolean = False
+    Public EingangsDatum As Date = CDate("01.01.1990")
+
+    Dim hStatus As Integer
+    Dim showSendungsdetails As Boolean = False
+    Dim hAdresse As String = ""
+    Dim hCC As String = ""
+    Public aktiv As Boolean = False
+
+    Public ATT As List(Of String)
+    Dim PROG As New cProgramFunctions
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+
+    Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+    Public Sub New()
+        InitializeComponent()
+        Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
+    End Sub
+
+
+
+    Private Sub frmEintragAviso_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles Me.KeyDown
+        'Escape händisch abfangen und auf Abbruch-Taste legen
+        If e.KeyCode = Keys.Escape Then
+            btnAbbruch.PerformClick()
+        End If
+        If e.KeyCode = Keys.Return Then
+            e.Handled = True
+        End If
+    End Sub
+
+    Sub initAttachment()
+        If ATT Is Nothing Then dgvAnhaenge.Visible = False : Exit Sub
+        dgvAnhaenge.Rows.Clear()
+        If ATT.Count = 0 Then
+            '    btnSaveAttachments.Enabled = False
+        Else
+            dgvAnhaenge.Visible = True
+
+            For Each a In ATT
+                Dim display = a
+                If a.Contains("\") Then
+                    Dim sp = a.Split("\")
+                    display = sp(sp.Count - 1)
+                End If
+                dgvAnhaenge.Rows.Add({display, a})
+            Next
+        End If
+        dgvAnhaenge.ClearSelection()
+    End Sub
+
+
+    Private Sub frmEintragAviso_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
+        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
+        '    MsgBox("Keine Berechtigung!")
+        '    Me.Close()
+        'End If
+
+
+        Me.CenterToParent()
+        btnOK.Enabled = False
+        kdAuftraggeber.initKdBox(Me)
+
+        MyComboBox1.Items.Clear()
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM", "CBAM"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUDR", "EUDR"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FGAS", "FGAS"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLLBERATUNG", "COMPLIANCE"))
+        MyComboBox1.changeItem("")
+
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            ATILLA_NEUERAKTENDECKEL = True
+        End If
+
+        ' SDL.cProgramFunctions.initDrucker(cboPrinter)
+
+
+        cboFirma.Items.Clear()
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        cboFirma.changeItem(FIRMA_TMP)
+        cboFirma.Enabled = False
+
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
+            cboFirma.Enabled = True
+        End If
+
+
+
+        AddHandler kdAuftraggeber.PropertyChanged, Sub()
+                                                       If kdAuftraggeber.KdNr_value > 0 Then
+                                                           btnAuftraggeber.Enabled = True
+                                                       Else
+                                                           btnAuftraggeber.Enabled = False
+                                                       End If
+                                                   End Sub
+
+
+
+        btnOK.Enabled = True
+
+
+
+        Dim bearb As Boolean = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me.FindForm)
+
+        If cGlobal.Aktive_ID = 0 Then
+            'es erfolgt eine Neuanlage
+            Neuanlage = True
+            Me.Text = "Neuanlage LKW-Aviso"
+            dtpDatum.Value = Now
+            If Not bearb Then dtpDatum.Enabled = False
+
+            txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter
+            lblStatus.Text = "Neuanlage"
+
+            kdAuftraggeber.Text = ""
+
+
+        Else
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
+                Me.Close()
+            End If
+
+
+            Me.Text = "Änderung LKW-Aviso"
+            'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False
+
+            'txtInfo.Visible = False
+            'Label3.Visible = False
+            ''ausgewählter Datensatz wird geladen
+            'Button3.Visible = False
+
+            myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "")
+
+            'Werte(zuweisen)
+            dtpDatum.Value = myAviso.Datum
+            If Not bearb Then dtpDatum.Enabled = False
+
+            If myAviso.Auftraggeber_KdNr > 0 Then
+                kdAuftraggeber.KdNr = myAviso.Auftraggeber_KdNr
+            Else
+                kdAuftraggeber.Text = myAviso.Auftraggeber
+            End If
+
+            txtInfo.Text = myAviso.Info.Trim
+            txtLKW_Nr.Text = myAviso.LKW_Nr
+
+
+            txtÄnderungen.Text = myAviso.Änderungen.Trim
+
+            hStatus = myAviso.Status
+
+            If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False
+
+            'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso")
+
+            'Status anzeigen
+
+            Select Case hStatus
+                Case cGlobal.Status_Ankunft
+                    lblStatus.Text = "Ankunft"
+                    If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm")
+                    lblStatus.ForeColor = Color.Blue
+                Case cGlobal.Status_Erfasst
+                    lblStatus.Text = "erfasst"
+                    lblStatus.ForeColor = Color.Red
+                Case cGlobal.Status_Freigegeben
+                    lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm")
+                    lblStatus.ForeColor = Color.Green
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_NichtEingetroffen
+                    lblStatus.Text = "LKW nicht eingetroffen"
+                    lblStatus.ForeColor = Color.DarkGray
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_Vorbereitet
+                    lblStatus.Text = "Vorbereitet"
+                    lblStatus.ForeColor = Color.Brown
+                    btnOK.Enabled = bearb
+                Case cGlobal.Status_Vorgeschrieben
+                    lblStatus.Text = "Vorgeschrieben"
+                    lblStatus.ForeColor = Color.Purple
+                    btnOK.Enabled = bearb
+                Case Else
+                    lblStatus.Text = ""
+            End Select
+            lblStatus.Text = " " & lblStatus.Text & " "   'für bessere farbliche Hervorhebung
+            cboFirma.changeItem("")
+            cboFirma.changeItem(myAviso.FIRMA)
+
+
+
+
+        End If
+
+        If bearb Then Me.Text += " (Verwaltung)"
+
+        hÄnderung = False
+
+        dtpDatum.Enabled = bearb   'nur Administrator darf Erfassungsdatum ändern/bearbeiten
+        'If Neuanlage Then
+        '    dtpAvisoEingangDatum.Value = Now.Date
+        '    dtpAvisoEingangZeit.Value = LeerDatum
+        'Else
+        '    dtpAvisoEingangDatum.Enabled = bearb
+        '    dtpAvisoEingangZeit.Enabled = bearb
+        'End If
+
+
+        initAttachment()
+
+    End Sub
+
+    Private Sub dgvAnhaenge_KeyDown(sender As Object, e As KeyEventArgs) Handles dgvAnhaenge.KeyDown
+        If e.KeyCode = Keys.Delete Then
+
+            If dgvAnhaenge.SelectedRows.Count > 0 Then
+                For Each row In dgvAnhaenge.SelectedRows.Cast(Of DataGridViewRow)().OrderByDescending(Function(dgvr) dgvr.Index)
+                    ATT.RemoveAt(row.Index)
+                Next
+
+                'ATT.RemoveAt(dgvAnhaenge.SelectedRows(0).Index) 'Inex-Rows = Index-Att
+                initAttachment()
+            End If
+        End If
+    End Sub
+
+    Private Sub btnAbbruch_Click(sender As System.Object, e As System.EventArgs) Handles btnAbbruch.Click
+        Me.Close()
+    End Sub
+
+    Private Sub txtFeld_GotFocus(sender As Object, e As System.EventArgs) Handles txtLKW_Nr.GotFocus
+        CType(sender, TextBox).SelectAll()
+    End Sub
+
+    Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
+        Try
+
+
+            If Not aktiv Then Exit Sub
+
+
+            lblErrErfasstDat.Visible = False
+            lblErr_Aktentyp.Visible = False
+            lblErr_Kunde.Visible = False
+            lblErr_LKW.Visible = False
+
+            If FIRMA_TMP = "VERIMEX" Then
+                If cboFirma._value = "" Then
+                    MsgBox("Firma auswählen!", vbInformation)
+                    cboFirma.Focus()
+                    Exit Sub
+
+                End If
+            End If
+
+
+            If dtpDatum.Enabled AndAlso CDate(dtpDatum.Value) > Now Then
+                lblErrErfasstDat.Visible = True
+                dtpDatum.Focus()
+                Exit Sub
+            End If
+
+            If MyComboBox1._value.Trim = "" Then
+                ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
+                lblErr_Aktentyp.Visible = True
+                MyComboBox1.Focus()
+                Exit Sub
+            End If
+
+            If txtLKW_Nr.Text.Trim = "" Then
+                ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
+                lblErr_LKW.Visible = True
+                txtLKW_Nr.Focus()
+                Exit Sub
+            End If
+
+            If kdAuftraggeber.KdNr_value <= 0 Then
+                lblErr_Kunde.Visible = True
+                kdAuftraggeber.Focus()
+                Exit Sub
+            End If
+
+
+
+            If Neuanlage Then
+                'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
+                Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
+                If hLKWCheck2 <> "" Then
+                    Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                           "Aviso-Eintrag")
+                    If antwort = vbNo Then
+                        Exit Sub
+                    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(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
+                    If hLKWCheck <> "" Then
+                        Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                               "Aviso-Eintrag")
+                        If antwort = vbNo Then
+                            Exit Sub
+                        End If
+                    End If
+                End If
+
+            End If
+
+
+
+            Me.Cursor = Cursors.WaitCursor
+
+            Dim aendart As String = ""
+            Dim aendText As String = ""
+
+            'Werte zuweisen
+            myAviso.Telefonisch = ""
+            myAviso.Datum = dtpDatum.Value
+            myAviso.LKW_Nr = txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", "")
+
+
+            If kdAuftraggeber.KdNr_value > 0 Then
+                myAviso.Auftraggeber = IIf(kdAuftraggeber.KdName <> "", kdAuftraggeber.KdName, kdAuftraggeber.Text)
+                myAviso.Auftraggeber_KdNr = kdAuftraggeber.KdNr_value
+            Else
+                myAviso.Auftraggeber = kdAuftraggeber.Text
+                myAviso.Auftraggeber_KdNr = -1
+            End If
+
+            If myAviso.Auftraggeber.Length > 50 Then myAviso.Auftraggeber = myAviso.Auftraggeber.Substring(0, 50)
+
+            myAviso.Frächter = myAviso.Auftraggeber
+            myAviso.Frächter_KdNr = myAviso.Auftraggeber_KdNr
+
+
+            myAviso.Grenzstelle = ""
+            myAviso.Info = ""
+
+            If Neuanlage Then
+                myAviso.letzterMitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter
+                myAviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+            End If
+
+            If Neuanlage Then
+                myAviso.Änderungen = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+                aendart = "Neuanlage"
+                aendText = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+
+            Else
+                myAviso.Änderungen = "Änderung per Eingabefenster von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & myAviso.Änderungen
+                aendart = "Änderung per Eingabefenster"
+                aendText = "Änderung per Eingabefenster von " & cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")
+            End If
+
+            Dim DatAnkunftNow = AVISOFUNC.getAnkunftDateNow()
+
+
+            myAviso.Status = cGlobal.Status_Ankunft
+
+
+            myAviso.Status = cGlobal.Status_Erfasst
+            myAviso.Ankunft = LeerDatum
+            myAviso.Freigabe = LeerDatum
+            myAviso.Vorbereitet = LeerDatum
+            myAviso.Vorgeschrieben = LeerDatum
+            myAviso.Dauer = 0
+
+
+
+
+            myAviso.FIRMA = If(cboFirma._value <> "", cboFirma._value, FIRMA_TMP)
+            myAviso.Cluster = If(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, "")
+
+
+
+
+            Dim tmpId = AvisoDAL.SpeichernAviso(myAviso)
+
+
+            myAviso.AvisoID = tmpId
+            AvisoDAL.addAenderung(tmpId, aendart, aendText)
+
+
+            'Infotext als Vermerk:
+            If txtInfo.Text.Trim <> "" Then
+                If txtInfo.Text.Length <= 80 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Trim, 46)
+                ElseIf txtInfo.Text.Length <= 160 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(0, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(80, 80), 46)
+                ElseIf txtInfo.Text.Length <= 240 Then
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(0, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(80, 80), 46)
+                    AvisoStatusFunctions.insertVermerkAllg(tmpId, txtInfo.Text.Substring(160, 80), 46)
+                End If
+            End If
+
+            Me.Cursor = Cursors.Default
+            'Jetzt wird Fenster geschlossen
+            Me.Close()
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
+            frmHauptfenster.setAktDetails(tmpId, showSendungsdetails)
+            If showSendungsdetails Then
+
+            End If
+
+        Catch ex As Exception
+            Me.Cursor = Cursors.Default
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+
+
+    ''threadsicherer Aufruf
+    'Delegate Sub setCboEntryCallback(i As String)
+    'Private Sub setCboEntry(i As String)
+    '    Try
+    '        If Me.InvokeRequired Then
+    '            Dim d As New setCboEntryCallback(AddressOf setCboEntry)
+    '            Me.Invoke(d, New Object() {i})
+    '        Else
+    '            cboPrinter.Items.Add(i)
+    '        End If
+
+    '    Catch ex As Exception
+
+    '    End Try
+    'End Sub
+
+    ''threadsicherer Aufruf
+    'Delegate Sub setCboSelectedCallback(standardDrucker As String)
+    'Private Sub setCboSelected(standardDrucker As String)
+    '    If Me.InvokeRequired Then
+    '        Dim d As New setCboSelectedCallback(AddressOf setCboSelected)
+    '        Me.Invoke(d, New Object() {standardDrucker})
+    '    Else
+    '        Dim found As Boolean = False
+    '        '  For Each i In cboPrinter.Items
+    '        'If i.ToString.ToUpper.Contains("TALLY") Then
+    '        'found = True
+    '        ' cboPrinter.SelectedItem = i : Exit For
+    '        ' End If
+    '        '   Next
+
+    '        If found = False Then 'Falls kein TALLY, Standarddrucker
+    '            cboPrinter.SelectedIndex = 0
+    '            For Each i In cboPrinter.Items
+    '                If i.ToString = standardDrucker Then
+    '                    cboPrinter.SelectedItem = i
+    '                    Exit For
+    '                End If
+    '            Next
+    '        End If
+    '    End If
+
+    'End Sub
+
+
+
+
+    Private Function Platzhalter_ersetzen(hText As String, hLKW As String, hGrenzstelle As String) As String
+        If hText = "" Then
+            Platzhalter_ersetzen = hText
+            Exit Function
+        End If
+
+        'hier werden alle möglichen Platzhalter ersetzt
+        hText = hText.Replace("%LKW%", hLKW)
+        If hGrenzstelle <> "" Then
+            Dim Standorte As New cStandorteDAL
+            Dim Standort As New cStandort
+            Standort = Standorte.LesenStandort(0, hGrenzstelle, "")
+            If Not IsNothing(Standort) Then
+                hGrenzstelle = Standort.Standort_Text.Trim
+            End If
+        End If
+        hText = hText.Replace("%Standort%", hGrenzstelle)
+        hText = hText.Replace("%Uhrzeit%", Format(Now, "HH:mm"))
+        hText = hText.Replace("&", "und")
+
+        Platzhalter_ersetzen = hText
+    End Function
+
+
+
+    Private Sub txtLKW_Nr_TextChanged(sender As Object, e As EventArgs) Handles txtLKW_Nr.Leave
+        txtLKW_Nr.Text = txtLKW_Nr.Text.ToUpper
+    End Sub
+
+
+
+    Private Sub frmEintragAviso_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        'dtpAvisoEingangZeit.Focus()
+        aktiv = True
+        'If EingangsDatum > CDate("01.01.1990") Then
+        '    dtpAvisoEingangDatum.Value = EingangsDatum
+        '    dtpAvisoEingangZeit.Value = EingangsDatum
+        'End If
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
+    End Sub
+
+
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        If StartFromOUTLOOK Then
+            MsgBox("Diese Funktion ist im Outlook Addin nicht verfügbar!")
+            Exit Sub
+        End If
+        ' Me.showSendungsdetails = True
+        btnOK.PerformClick()
+
+
+        'If dgvSendungen.SelectedRows.Count > 0 Then
+        'sendId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+        'End If
+        If myAviso.AvisoID > 0 Then
+
+            If Process.GetCurrentProcess().ProcessName.ToUpper() = "AVISO" Then
+                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                Dim frmSendungsdetails As New frmSendungsdetailsNEU(myAviso.AvisoID, -1)
+                frmSendungsdetails.ShowDialog(frmGrayOut)
+
+
+                frmGrayOut.Close()
+            Else
+                VERAG_PROG_ALLGEMEIN.cProgramFunctions.SendMessageToAviso("OpenAvisoSnd_" & myAviso.AvisoID)
+            End If
+
+
+        End If
+        'initDgvSendungen()
+    End Sub
+
+
+
+    Private Sub btnAuftraggeber_Click(sender As Object, e As EventArgs) Handles btnAuftraggeber.Click
+        If kdAuftraggeber.KdNr > 0 Then
+            Me.Cursor = Cursors.WaitCursor
+            AVISOFUNC.showKd(kdAuftraggeber.KdNr)
+            Me.Cursor = Cursors.Default
+        End If
+    End Sub
+
+
+    Private Sub dgvAnhaenge_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick, dgvAnhaenge.CellContentDoubleClick
+        Try
+            If dgvAnhaenge.SelectedRows.Count > 0 Then
+                If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then
+                    Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)
+                End If
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBox1.SelectedIndexChanged
+        Select Case MyComboBox1._value
+            Case "CBAM"
+                PictureBox1.BackgroundImage = My.Resources.cbam_s
+            Case "EUDR"
+                PictureBox1.BackgroundImage = My.Resources.eudr
+            Case "FGAS"
+                PictureBox1.BackgroundImage = My.Resources.fgas_s
+            Case "COMPLIANCE"
+                PictureBox1.BackgroundImage = My.Resources.compliance_s
+            Case Else
+                PictureBox1.BackgroundImage = Nothing
+        End Select
+
+    End Sub
+End Class

Aviso/AktenErfassung/usrCntlHauptakt_CBAM.Designer.vb

@@ -0,0 +1,37 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class usrCntlHauptakt_CBAM
+    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.SuspendLayout()
+        '
+        'usrCntlHauptakt_CBAM
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Name = "usrCntlHauptakt_CBAM"
+        Me.Size = New System.Drawing.Size(358, 245)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

Aviso/AktenErfassung/usrCntlHauptakt_CBAM.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Aviso/AktenErfassung/usrCntlHauptakt_CBAM.vb

@@ -0,0 +1,3 @@
+Public Class usrCntlHauptakt_CBAM
+
+End Class

Aviso/App.config

@@ -1,30 +1,35 @@
 <?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">
-            <section name="AVISO.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <connectionStrings>
-        <add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
-    </connectionStrings>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
-     
-    <userSettings>
-        <AVISO.My.MySettings>
-            <setting name="frmMainSize" serializeAs="String">
-                <value>600, 800</value>
-            </setting>
-            <setting name="frmMainPosition" serializeAs="String">
-                <value>200, 200</value>
-            </setting>
-            <setting name="s" serializeAs="String">
-                <value />
-            </setting>
-        </AVISO.My.MySettings>
-    </userSettings>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="AVISO.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <connectionStrings>
+    <add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
+  </connectionStrings>
+  <appSettings>
+    <add key="CustomerPortalApiBaseUrl" value="https://login.server.verag.ag" />
+    <add key="CustomerPortalApiUsername" value="admin" />
+    <add key="CustomerPortalApiPassword" value="veragadmin" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+  </appSettings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+  </startup>
+  <userSettings>
+    <AVISO.My.MySettings>
+      <setting name="frmMainSize" serializeAs="String">
+        <value>600, 800</value>
+      </setting>
+      <setting name="frmMainPosition" serializeAs="String">
+        <value>200, 200</value>
+      </setting>
+      <setting name="s" serializeAs="String">
+        <value />
+      </setting>
+    </AVISO.My.MySettings>
+  </userSettings>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
@@ -85,12 +90,28 @@
       </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>
-</configuration>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>

Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb

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

Aviso/Auswertung/usrctlStatVERIMEX.vb

@@ -45,12 +45,15 @@ Public Class usrctlStatVERIMEX
                 innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
         End Select
 
+
+
         With dgvAbfertigungTR
             Dim sqlstr = "SELECT  mit_vname + ' ' + mit_nname as Mitarbeiter ,sum(tblSnd_AbfertigungTRAnzahl) as Versandscheine ,sum(tblSnd_AbfertigungTRAnzahlPos) as Positionen ,count(distinct(avisoid)) as LKW
                   FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
                   " & innerJoinFiliale & "
                   where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "'  and tblSnd_AbfertigungTR_MA is not null 
                   " & whereFiliale & "
+                  " & If(cboAbfArt._value <> "", " AND tblSnd_Abfertigungsart_ID IN(" & cboAbfArt._value & ")", "") & "
                   group by mit_vname,mit_nname"
             'früher: Datum statt tblSnd_AbfertigungTR
             '           MsgBox(sqlstr)
@@ -138,6 +141,12 @@ Public Class usrctlStatVERIMEX
         cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*Nicht zugeordnet", "0"))
         cboFirma.changeItem("")
 
+        cboAbfArt.Items.Clear()
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "'5','18','32'"))
+        cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T2", "'6','33','34','37','40','42'"))
+
+
         cboAbfFirma.Items.Clear()
         cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
         cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
@@ -182,7 +191,7 @@ Public Class usrctlStatVERIMEX
             End Select
 
 
-            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
+            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
                         mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
                         FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
                         " & innerJoinFiliale & "

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>
@@ -559,6 +607,12 @@
     <Compile Include="ADMIN\frmZuordnungKd.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="AktenErfassung\usrCntlHauptakt_CBAM.Designer.vb">
+      <DependentUpon>usrCntlHauptakt_CBAM.vb</DependentUpon>
+    </Compile>
+    <Compile Include="AktenErfassung\usrCntlHauptakt_CBAM.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Anhänge\frmAddSendnung.Designer.vb">
       <DependentUpon>frmAddSendnung.vb</DependentUpon>
     </Compile>
@@ -749,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>
@@ -797,6 +857,12 @@
     <Compile Include="frmATZollEingereichtSetzen.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="AktenErfassung\frmEintragSammelakt.designer.vb">
+      <DependentUpon>frmEintragSammelakt.vb</DependentUpon>
+    </Compile>
+    <Compile Include="AktenErfassung\frmEintragSammelakt.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmEintragTvNew.Designer.vb">
       <DependentUpon>frmEintragTvNew.vb</DependentUpon>
     </Compile>
@@ -989,16 +1055,16 @@
     <Compile Include="frmDruck.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmEintragAviso.designer.vb">
+    <Compile Include="AktenErfassung\frmEintragAviso.designer.vb">
       <DependentUpon>frmEintragAviso.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmEintragAviso.vb">
+    <Compile Include="AktenErfassung\frmEintragAviso.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmEintragAvisoInfo.designer.vb">
+    <Compile Include="AktenErfassung\frmEintragAvisoInfo.designer.vb">
       <DependentUpon>frmEintragAvisoInfo.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmEintragAvisoInfo.vb">
+    <Compile Include="AktenErfassung\frmEintragAvisoInfo.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmEintragKW.designer.vb">
@@ -1006,6 +1072,7 @@
     </Compile>
     <Compile Include="frmEintragKW.vb">
       <SubType>Form</SubType>
+      <Generator>v</Generator>
     </Compile>
     <Compile Include="frmEintragOptionen.designer.vb">
       <DependentUpon>frmEintragOptionen.vb</DependentUpon>
@@ -1127,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>
@@ -1258,6 +1331,18 @@
     <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>
+    <Compile Include="usrCntlHauptfenster_Suche_AVISO.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="usrcntlSendungDetailsAbrechnung.Designer.vb">
       <DependentUpon>usrcntlSendungDetailsAbrechnung.vb</DependentUpon>
     </Compile>
@@ -1312,6 +1397,9 @@
     <EmbeddedResource Include="ADMIN\frmZuordnungKd.resx">
       <DependentUpon>frmZuordnungKd.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="AktenErfassung\usrCntlHauptakt_CBAM.resx">
+      <DependentUpon>usrCntlHauptakt_CBAM.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Anhänge\frmAddSendnung.resx">
       <DependentUpon>frmAddSendnung.vb</DependentUpon>
     </EmbeddedResource>
@@ -1391,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>
@@ -1415,6 +1506,9 @@
     <EmbeddedResource Include="frmATZollEingereichtSetzen.resx">
       <DependentUpon>frmATZollEingereichtSetzen.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="AktenErfassung\frmEintragSammelakt.resx">
+      <DependentUpon>frmEintragSammelakt.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmEintragTvNew.resx">
       <DependentUpon>frmEintragTvNew.vb</DependentUpon>
     </EmbeddedResource>
@@ -1496,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>
@@ -1514,10 +1609,10 @@
     <EmbeddedResource Include="frmDruck.resx">
       <DependentUpon>frmDruck.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmEintragAviso.resx">
+    <EmbeddedResource Include="AktenErfassung\frmEintragAviso.resx">
       <DependentUpon>frmEintragAviso.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmEintragAvisoInfo.resx">
+    <EmbeddedResource Include="AktenErfassung\frmEintragAvisoInfo.resx">
       <DependentUpon>frmEintragAvisoInfo.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmEintragKW.resx">
@@ -1584,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>
@@ -1648,6 +1746,12 @@
     <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>
     <EmbeddedResource Include="usrcntlSendungDetailsAbrechnung.resx">
       <DependentUpon>usrcntlSendungDetailsAbrechnung.vb</DependentUpon>
     </EmbeddedResource>
@@ -1783,6 +1887,7 @@
   <ItemGroup>
     <Content Include="aviso.ico" />
     <Content Include="My Project\aktAlt.jpg" />
+    <None Include="Resources\zollberatung_s.png" />
     <None Include="Resources\ZwAbEinfuegen.png" />
     <None Include="Resources\unisped_aeo_DE.jpg" />
     <None Include="Resources\Unisped_DE_logo.jpg" />
@@ -1837,6 +1942,15 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Resources\Declarant.png" />
+    <None Include="Resources\cbam_s.png" />
+    <None Include="Resources\compliance_s.png" />
+    <None Include="Resources\eudr.png" />
+    <None Include="Resources\fgas_s.png" />
+    <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>
@@ -1858,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>

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

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
@@ -298,11 +301,14 @@ Public Class frmAvisoWeiterleiten
             Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='UNISPED' order by team_id", "ADMIN")
             If dt IsNot Nothing Then
                 For Each t In dt.Rows
-                    addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "IMEX")
+                    addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "UNISPED")
                 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,7 +336,15 @@ Public Class frmAvisoWeiterleiten
                 Next
             End If
         ElseIf sender Is Button2 Then
-            addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", 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
 

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb

@@ -23,16 +23,16 @@ Partial Class usrCntlBenachrichtigungen
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.cbxTaskForce = New System.Windows.Forms.CheckBox()
         Me.cbxVerwarung = New System.Windows.Forms.CheckBox()
-        Me.txtVermerk = New System.Windows.Forms.TextBox()
         Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
         Me.Button10 = New System.Windows.Forms.Button()
+        Me.txtVermerk = New System.Windows.Forms.TextBox()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.cbxCluster = New System.Windows.Forms.CheckBox()
         Me.cbxTeams = New System.Windows.Forms.CheckBox()
@@ -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
@@ -80,8 +80,8 @@ Partial Class usrCntlBenachrichtigungen
         Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
         Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
         Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
         Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -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
@@ -130,21 +130,11 @@ Partial Class usrCntlBenachrichtigungen
         Me.cbxVerwarung.UseVisualStyleBackColor = True
         Me.cbxVerwarung.Visible = False
         '
-        'txtVermerk
-        '
-        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.Name = "txtVermerk"
-        Me.txtVermerk.ReadOnly = True
-        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
-        Me.txtVermerk.TabIndex = 31
-        '
         'cbxNeukunden
         '
         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
@@ -156,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
@@ -169,6 +158,16 @@ Partial Class usrCntlBenachrichtigungen
         Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button10.UseVisualStyleBackColor = True
         '
+        'txtVermerk
+        '
+        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, 3)
+        Me.txtVermerk.Name = "txtVermerk"
+        Me.txtVermerk.ReadOnly = True
+        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
+        Me.txtVermerk.TabIndex = 31
+        '
         'Panel3
         '
         Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -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)

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb

@@ -4,7 +4,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class usrCntlBenachrichtigungen
     Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim ASF As New AvisoStatusFunctions
-
+    Dim See_Cbam As Boolean = False
 
     Public Event SelectionChanged()
 
@@ -71,6 +71,14 @@ Public Class usrCntlBenachrichtigungen
                         End Select
                     End If
 
+                    If See_Cbam Then
+                        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                            Case "VERIMEX", "AMBAR"
+                            Case Else
+                                whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='33') " 'TEAM_CBAM --> VERAG
+                        End Select
+                    End If
+
                     If cbxTeams.Checked Then
                         whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
                     Else
@@ -256,6 +264,10 @@ Public Class usrCntlBenachrichtigungen
             cbxNeukunden.Visible = True
             'cbxNeukunden.Checked = True
         End If
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeCBAM", "AVISO") Then
+            See_Cbam = True
+
+        End If
 
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeVerwahrung", "AVISO") Then
             cbxVerwarung.Visible = True

Aviso/Benutzerdefinierte 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

Aviso/Benutzerdefinierte Elemente/SendTAB.resx

@@ -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">

Aviso/Benutzerdefinierte Elemente/SendTAB.vb

@@ -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)

Aviso/My Project/Application.myapp

@@ -6,6 +6,7 @@
   <ShutdownMode>1</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
+  <MinimumSplashScreenDisplayTime>0</MinimumSplashScreenDisplayTime>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-  <HighDpiMpde>false</HighDpiMpde>
+  <HighDpiMode>0</HighDpiMode>
 </MyApplicationData>

Aviso/My Project/AssemblyInfo.vb

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

Aviso/My 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>
@@ -189,6 +199,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ambar_boarder_new() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ambar_boarder_new", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -368,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>
@@ -458,6 +488,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property cbam_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("cbam_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -468,6 +508,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property compliance_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("compliance_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -648,6 +698,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property eudr() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("eudr", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -688,6 +748,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property fgas_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("fgas_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -808,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>
@@ -1448,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>
@@ -2024,6 +2574,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property zollberatung_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("zollberatung_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

Aviso/My Project/Resources.resx

@@ -118,9 +118,15 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="memories2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\memories2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="personInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Transcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Transcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -193,18 +199,21 @@
   <data name="VZ_HINDERNISS___ZOLLBESCHAU___PROTOKOLL" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\vz hinderniss - zollbeschau - protokoll.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="abfetigungTR_aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\Diverses\miniButtons\abfetigungTR_aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="digitalerAkt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="qr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -241,15 +250,15 @@
   <data name="mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="parkplatz" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="rhenus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\rhenus.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -298,6 +307,9 @@
   <data name="vorauszahlung11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vorauszahlung11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -328,8 +340,8 @@
   <data name="gear2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="qr" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\qr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="GVMS-image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\Diverses\GVMS-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -358,9 +370,6 @@
   <data name="personCheck_gray_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\personCheck_gray_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ge_transport" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ge_transport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -388,6 +397,12 @@
   <data name="IMEX_LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="kasse1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="weiterleiten_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -409,6 +424,9 @@
   <data name="DGS_Instructions_Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\dgs_instructions_export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -421,9 +439,6 @@
   <data name="fragezeichen1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fragezeichen1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="zoll_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -433,9 +448,6 @@
   <data name="digitalerAkt_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="personCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -448,6 +460,9 @@
   <data name="vorauszahlung2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vorauszahlung2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="dakosy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -466,6 +481,9 @@
   <data name="Unisped_DE_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Unisped_DE_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="passport" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="memories0" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\memories0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -493,15 +511,9 @@
   <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="scanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="fakturiertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -556,29 +568,29 @@
   <data name="vorauszahlung1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="kasse1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ImageIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sprinter_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sprinter_white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Declarant" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Declarant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="_3s" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="zeus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zeus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="qr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="igl" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -619,8 +631,8 @@
   <data name="NDK" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AMB" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="vorauszahlung" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -649,23 +661,23 @@
   <data name="beleg" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="vermerkBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="statusBtn_vorbereitet_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="memories2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\memories2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="image_443x282" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="statusBtn_vorgeschrieben_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="truck_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="passport" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="scanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="word1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -673,11 +685,14 @@
   <data name="evolog" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="asdadasda5sd" xml:space="preserve">
+    <value />
+  </data>
   <data name="abklaerungTR_Inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\abklaerungTR_Inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="atr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\atr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -691,19 +706,172 @@
   <data name="abfetigungTR_inaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\Diverses\miniButtons\abfetigungTR_inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="qr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\qr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="cbam_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="asdadasda5sd" xml:space="preserve">
-    <value />
+  <data name="compliance_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\compliance_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Declarant" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Declarant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="eudr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\eudr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="fgas_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fgas_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Transcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Transcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="zollberatung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zollberatung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <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>

Aviso/frmAddSendungsvermerkShort.Designer.vb

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

Aviso/frmAddSendungsvermerkShort.vb

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

Aviso/frmGesamtsicherheiten.vb

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

Aviso/frmGesamtsicherheitenMenu.vb

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

Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb

@@ -29,12 +29,22 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.RLZollamtBereinigtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label26 = New System.Windows.Forms.Label()
         Me.btnBisTag = New System.Windows.Forms.Button()
         Me.btnVonTag = New System.Windows.Forms.Button()
         Me.btnTag = New System.Windows.Forms.Button()
+        Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label24 = New System.Windows.Forms.Label()
         Me.btnJahr = New System.Windows.Forms.Button()
         Me.btnBisJahr = New System.Windows.Forms.Button()
@@ -45,25 +55,22 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
         Me.Label25 = New System.Windows.Forms.Label()
         Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
+        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label4 = New System.Windows.Forms.Label()
+        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblFiliale = New System.Windows.Forms.Label()
+        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.Label1 = New System.Windows.Forms.Label()
+        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.txtSuchbegriff = New System.Windows.Forms.TextBox()
         Me.chkOffen = New System.Windows.Forms.CheckBox()
+        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.lblSaldo = New System.Windows.Forms.Label()
         Me.lblZollsatz = New System.Windows.Forms.Label()
         Me.lblReferenzwert = New System.Windows.Forms.Label()
-        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.cbxAUTO = New System.Windows.Forms.CheckBox()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -72,44 +79,82 @@ Partial Class frmGesamtsicherheitenMenuNEU
         '
         'ContextMenuStrip1
         '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 92)
         '
         'ExportCSVToolStripMenuItem
         '
-        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem})
+        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem, Me.RLZollamtBereinigtToolStripMenuItem})
         Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
-        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
         Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
         '
         'ListeToolStripMenuItem
         '
         Me.ListeToolStripMenuItem.Name = "ListeToolStripMenuItem"
-        Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
         Me.ListeToolStripMenuItem.Text = "Liste"
         '
         'DetaillisteToolStripMenuItem
         '
         Me.DetaillisteToolStripMenuItem.Name = "DetaillisteToolStripMenuItem"
-        Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
         Me.DetaillisteToolStripMenuItem.Text = "Detailliste"
         '
         'ReferenzlisteZollamtToolStripMenuItem
         '
         Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem"
-        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
-        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt"
+        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
+        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "RL-Zollamt"
+        '
+        'RLZollamtBereinigtToolStripMenuItem
+        '
+        Me.RLZollamtBereinigtToolStripMenuItem.Name = "RLZollamtBereinigtToolStripMenuItem"
+        Me.RLZollamtBereinigtToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
+        Me.RLZollamtBereinigtToolStripMenuItem.Text = "RL-Zollamt bereinigt"
         '
         'SaldenNeuBerechnenToolStripMenuItem
         '
         Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem"
-        Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
         Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen"
         '
+        'SaldoZumStichtagToolStripMenuItem
+        '
+        Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem"
+        Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
+        Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag"
+        '
+        'PrüfungAusPlausibilitätToolStripMenuItem
+        '
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem})
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem"
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
+        Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung auf Plausibilität"
+        '
+        'AusgangEingangToolStripMenuItem
+        '
+        Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem"
+        Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
+        Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang"
+        '
+        'SicherheitsbetragToolStripMenuItem
+        '
+        Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem"
+        Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
+        Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag"
+        '
+        'MehrfacheATBNrToolStripMenuItem
+        '
+        Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
+        Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
+        Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
+        '
         '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.cbxAUTO)
         Me.Panel1.Controls.Add(Me.PictureBox5)
         Me.Panel1.Controls.Add(Me.btnOpenOver85Days)
         Me.Panel1.Controls.Add(Me.txtDatBis)
@@ -144,9 +189,60 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(658, 288)
+        Me.Panel1.Size = New System.Drawing.Size(706, 288)
         Me.Panel1.TabIndex = 0
         '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackColor = System.Drawing.Color.White
+        Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
+        Me.PictureBox5.TabIndex = 132
+        Me.PictureBox5.TabStop = False
+        '
+        'btnOpenOver85Days
+        '
+        Me.btnOpenOver85Days.allowBorder = False
+        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
+        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
+        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
+        Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210)
+        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
+        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
+        Me.btnOpenOver85Days.TabIndex = 32
+        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
+        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
+        Me.btnOpenOver85Days.Visible = False
+        '
+        'txtDatBis
+        '
+        Me.txtDatBis._DateTimeOnly = False
+        Me.txtDatBis._numbersOnly = False
+        Me.txtDatBis._numbersOnlyKommastellen = ""
+        Me.txtDatBis._numbersOnlyTrennzeichen = True
+        Me.txtDatBis._Prozent = False
+        Me.txtDatBis._ShortDateNew = False
+        Me.txtDatBis._ShortDateOnly = True
+        Me.txtDatBis._TimeOnly = False
+        Me.txtDatBis._TimeOnly_Seconds = False
+        Me.txtDatBis._value = ""
+        Me.txtDatBis._Waehrung = False
+        Me.txtDatBis._WaehrungZeichen = True
+        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
+        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
+        Me.txtDatBis.MaxLength = 10
+        Me.txtDatBis.MaxLineLength = -1
+        Me.txtDatBis.MaxLines_Warning = ""
+        Me.txtDatBis.MaxLines_Warning_Label = Nothing
+        Me.txtDatBis.Name = "txtDatBis"
+        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatBis.TabIndex = 25
+        '
         'Label26
         '
         Me.Label26.AutoSize = True
@@ -205,6 +301,31 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.btnTag.Text = "Heute"
         Me.btnTag.UseVisualStyleBackColor = False
         '
+        'txtDatVon
+        '
+        Me.txtDatVon._DateTimeOnly = False
+        Me.txtDatVon._numbersOnly = False
+        Me.txtDatVon._numbersOnlyKommastellen = ""
+        Me.txtDatVon._numbersOnlyTrennzeichen = True
+        Me.txtDatVon._Prozent = False
+        Me.txtDatVon._ShortDateNew = False
+        Me.txtDatVon._ShortDateOnly = True
+        Me.txtDatVon._TimeOnly = False
+        Me.txtDatVon._TimeOnly_Seconds = False
+        Me.txtDatVon._value = ""
+        Me.txtDatVon._Waehrung = False
+        Me.txtDatVon._WaehrungZeichen = True
+        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
+        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
+        Me.txtDatVon.MaxLength = 10
+        Me.txtDatVon.MaxLineLength = -1
+        Me.txtDatVon.MaxLines_Warning = ""
+        Me.txtDatVon.MaxLines_Warning_Label = Nothing
+        Me.txtDatVon.Name = "txtDatVon"
+        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
+        Me.txtDatVon.TabIndex = 18
+        '
         'Label24
         '
         Me.Label24.AutoSize = True
@@ -341,6 +462,18 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20)
         Me.DateTimePicker1.TabIndex = 17
         '
+        'cbxWarenort
+        '
+        Me.cbxWarenort._allowedValuesFreiText = Nothing
+        Me.cbxWarenort._allowFreiText = False
+        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.DropDownWidth = 500
+        Me.cbxWarenort.FormattingEnabled = True
+        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
+        Me.cbxWarenort.Name = "cbxWarenort"
+        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxWarenort.TabIndex = 8
+        '
         'Label4
         '
         Me.Label4.AutoSize = True
@@ -352,6 +485,18 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.Label4.TabIndex = 5
         Me.Label4.Text = "Warenort:"
         '
+        'cbxStandort
+        '
+        Me.cbxStandort._allowedValuesFreiText = Nothing
+        Me.cbxStandort._allowFreiText = False
+        Me.cbxStandort._value = ""
+        Me.cbxStandort.DropDownWidth = 200
+        Me.cbxStandort.FormattingEnabled = True
+        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
+        Me.cbxStandort.Name = "cbxStandort"
+        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
+        Me.cbxStandort.TabIndex = 7
+        '
         'lblFiliale
         '
         Me.lblFiliale.AutoSize = True
@@ -363,6 +508,20 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblFiliale.TabIndex = 4
         Me.lblFiliale.Text = "Filiale:"
         '
+        'btnSucheStarten
+        '
+        Me.btnSucheStarten.allowBorder = False
+        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
+        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
+        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
+        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254)
+        Me.btnSucheStarten.Name = "btnSucheStarten"
+        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
+        Me.btnSucheStarten.TabIndex = 33
+        Me.btnSucheStarten.Text = "Suche starten"
+        Me.btnSucheStarten.UseVisualStyleBackColor = False
+        '
         'Label1
         '
         Me.Label1.AutoSize = True
@@ -374,6 +533,20 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Suche:"
         '
+        'btnResetFilter
+        '
+        Me.btnResetFilter.allowBorder = False
+        Me.btnResetFilter.BackColor = System.Drawing.Color.White
+        Me.btnResetFilter.FlatAppearance.BorderSize = 0
+        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
+        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btnResetFilter.Location = New System.Drawing.Point(283, 21)
+        Me.btnResetFilter.Name = "btnResetFilter"
+        Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
+        Me.btnResetFilter.TabIndex = 3
+        Me.btnResetFilter.UseVisualStyleBackColor = False
+        '
         'txtSuchbegriff
         '
         Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28)
@@ -394,13 +567,28 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.chkOffen.Text = "nur offene anzeigen"
         Me.chkOffen.UseVisualStyleBackColor = True
         '
+        'btnNeu
+        '
+        Me.btnNeu.allowBorder = False
+        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnNeu.BackColor = System.Drawing.Color.White
+        Me.btnNeu.FlatAppearance.BorderSize = 0
+        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeu.ForeColor = System.Drawing.Color.Black
+        Me.btnNeu.Location = New System.Drawing.Point(619, 253)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
+        Me.btnNeu.TabIndex = 34
+        Me.btnNeu.Text = "Neu"
+        Me.btnNeu.UseVisualStyleBackColor = False
+        '
         'lblSaldo
         '
         Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.lblSaldo.AutoSize = True
         Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblSaldo.ForeColor = System.Drawing.Color.Red
-        Me.lblSaldo.Location = New System.Drawing.Point(450, 11)
+        Me.lblSaldo.Location = New System.Drawing.Point(447, 10)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(82, 24)
         Me.lblSaldo.TabIndex = 1
@@ -412,7 +600,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblZollsatz.AutoSize = True
         Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblZollsatz.Location = New System.Drawing.Point(451, 116)
+        Me.lblZollsatz.Location = New System.Drawing.Point(448, 115)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(63, 16)
         Me.lblZollsatz.TabIndex = 9
@@ -424,23 +612,12 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblReferenzwert.AutoSize = True
         Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblReferenzwert.Location = New System.Drawing.Point(451, 89)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(448, 88)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(95, 16)
         Me.lblReferenzwert.TabIndex = 6
         Me.lblReferenzwert.Text = "Referenzwert: -"
         '
-        'PictureBox5
-        '
-        Me.PictureBox5.BackColor = System.Drawing.Color.White
-        Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
-        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
-        Me.PictureBox5.Name = "PictureBox5"
-        Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
-        Me.PictureBox5.TabIndex = 132
-        Me.PictureBox5.TabStop = False
-        '
         'btnExcel
         '
         Me.btnExcel.allowBorder = False
@@ -449,7 +626,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.btnExcel.FlatAppearance.BorderSize = 0
         Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnExcel.ForeColor = System.Drawing.Color.Black
-        Me.btnExcel.Location = New System.Drawing.Point(249, 688)
+        Me.btnExcel.Location = New System.Drawing.Point(297, 688)
         Me.btnExcel.Name = "btnExcel"
         Me.btnExcel.Size = New System.Drawing.Size(105, 23)
         Me.btnExcel.TabIndex = 35
@@ -468,147 +645,27 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.dgvListe.Location = New System.Drawing.Point(-3, 288)
         Me.dgvListe.Name = "dgvListe"
         Me.dgvListe.ReadOnly = True
-        Me.dgvListe.Size = New System.Drawing.Size(658, 394)
+        Me.dgvListe.Size = New System.Drawing.Size(706, 394)
         Me.dgvListe.TabIndex = 1
         '
-        'btnOpenOver85Days
+        'cbxAUTO
         '
-        Me.btnOpenOver85Days.allowBorder = False
-        Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White
-        Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0
-        Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black
-        Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210)
-        Me.btnOpenOver85Days.Name = "btnOpenOver85Days"
-        Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20)
-        Me.btnOpenOver85Days.TabIndex = 32
-        Me.btnOpenOver85Days.Text = "Über 85 Tage offen"
-        Me.btnOpenOver85Days.UseVisualStyleBackColor = False
-        Me.btnOpenOver85Days.Visible = False
-        '
-        'txtDatBis
-        '
-        Me.txtDatBis._DateTimeOnly = False
-        Me.txtDatBis._numbersOnly = False
-        Me.txtDatBis._numbersOnlyKommastellen = ""
-        Me.txtDatBis._numbersOnlyTrennzeichen = True
-        Me.txtDatBis._Prozent = False
-        Me.txtDatBis._ShortDateNew = False
-        Me.txtDatBis._ShortDateOnly = True
-        Me.txtDatBis._TimeOnly = False
-        Me.txtDatBis._TimeOnly_Seconds = False
-        Me.txtDatBis._value = ""
-        Me.txtDatBis._Waehrung = False
-        Me.txtDatBis._WaehrungZeichen = True
-        Me.txtDatBis.Enabled = False
-        Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatBis.ForeColor = System.Drawing.Color.Black
-        Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
-        Me.txtDatBis.MaxLength = 10
-        Me.txtDatBis.MaxLineLength = -1
-        Me.txtDatBis.MaxLines_Warning = ""
-        Me.txtDatBis.MaxLines_Warning_Label = Nothing
-        Me.txtDatBis.Name = "txtDatBis"
-        Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatBis.TabIndex = 25
-        '
-        'txtDatVon
-        '
-        Me.txtDatVon._DateTimeOnly = False
-        Me.txtDatVon._numbersOnly = False
-        Me.txtDatVon._numbersOnlyKommastellen = ""
-        Me.txtDatVon._numbersOnlyTrennzeichen = True
-        Me.txtDatVon._Prozent = False
-        Me.txtDatVon._ShortDateNew = False
-        Me.txtDatVon._ShortDateOnly = True
-        Me.txtDatVon._TimeOnly = False
-        Me.txtDatVon._TimeOnly_Seconds = False
-        Me.txtDatVon._value = ""
-        Me.txtDatVon._Waehrung = False
-        Me.txtDatVon._WaehrungZeichen = True
-        Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatVon.ForeColor = System.Drawing.Color.Black
-        Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
-        Me.txtDatVon.MaxLength = 10
-        Me.txtDatVon.MaxLineLength = -1
-        Me.txtDatVon.MaxLines_Warning = ""
-        Me.txtDatVon.MaxLines_Warning_Label = Nothing
-        Me.txtDatVon.Name = "txtDatVon"
-        Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
-        Me.txtDatVon.TabIndex = 18
-        '
-        'cbxWarenort
-        '
-        Me.cbxWarenort._allowedValuesFreiText = Nothing
-        Me.cbxWarenort._allowFreiText = False
-        Me.cbxWarenort._value = ""
-        Me.cbxWarenort.DropDownWidth = 500
-        Me.cbxWarenort.FormattingEnabled = True
-        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
-        Me.cbxWarenort.Name = "cbxWarenort"
-        Me.cbxWarenort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxWarenort.TabIndex = 8
-        '
-        'cbxStandort
-        '
-        Me.cbxStandort._allowedValuesFreiText = Nothing
-        Me.cbxStandort._allowFreiText = False
-        Me.cbxStandort._value = ""
-        Me.cbxStandort.DropDownWidth = 200
-        Me.cbxStandort.FormattingEnabled = True
-        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
-        Me.cbxStandort.Name = "cbxStandort"
-        Me.cbxStandort.Size = New System.Drawing.Size(81, 21)
-        Me.cbxStandort.TabIndex = 7
-        '
-        'btnSucheStarten
-        '
-        Me.btnSucheStarten.allowBorder = False
-        Me.btnSucheStarten.BackColor = System.Drawing.Color.White
-        Me.btnSucheStarten.FlatAppearance.BorderSize = 0
-        Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black
-        Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254)
-        Me.btnSucheStarten.Name = "btnSucheStarten"
-        Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
-        Me.btnSucheStarten.TabIndex = 33
-        Me.btnSucheStarten.Text = "Suche starten"
-        Me.btnSucheStarten.UseVisualStyleBackColor = False
-        '
-        'btnResetFilter
-        '
-        Me.btnResetFilter.allowBorder = False
-        Me.btnResetFilter.BackColor = System.Drawing.Color.White
-        Me.btnResetFilter.FlatAppearance.BorderSize = 0
-        Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
-        Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.btnResetFilter.Location = New System.Drawing.Point(283, 21)
-        Me.btnResetFilter.Name = "btnResetFilter"
-        Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
-        Me.btnResetFilter.TabIndex = 3
-        Me.btnResetFilter.UseVisualStyleBackColor = False
-        '
-        'btnNeu
-        '
-        Me.btnNeu.allowBorder = False
-        Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.btnNeu.BackColor = System.Drawing.Color.White
-        Me.btnNeu.FlatAppearance.BorderSize = 0
-        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNeu.ForeColor = System.Drawing.Color.Black
-        Me.btnNeu.Location = New System.Drawing.Point(571, 253)
-        Me.btnNeu.Name = "btnNeu"
-        Me.btnNeu.Size = New System.Drawing.Size(75, 23)
-        Me.btnNeu.TabIndex = 34
-        Me.btnNeu.Text = "Neu"
-        Me.btnNeu.UseVisualStyleBackColor = False
+        Me.cbxAUTO.AutoSize = True
+        Me.cbxAUTO.Checked = True
+        Me.cbxAUTO.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxAUTO.ForeColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.cbxAUTO.Location = New System.Drawing.Point(36, 233)
+        Me.cbxAUTO.Name = "cbxAUTO"
+        Me.cbxAUTO.Size = New System.Drawing.Size(56, 17)
+        Me.cbxAUTO.TabIndex = 133
+        Me.cbxAUTO.Text = "AUTO"
+        Me.cbxAUTO.UseVisualStyleBackColor = True
         '
         'frmGesamtsicherheitenMenuNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(658, 721)
+        Me.ClientSize = New System.Drawing.Size(706, 721)
         Me.Controls.Add(Me.btnExcel)
         Me.Controls.Add(Me.dgvListe)
         Me.Controls.Add(Me.Panel1)
@@ -667,4 +724,11 @@ Partial Class frmGesamtsicherheitenMenuNEU
     Friend WithEvents ReferenzlisteZollamtToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents DetaillisteToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents PictureBox5 As PictureBox
+    Friend WithEvents SaldoZumStichtagToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PrüfungAusPlausibilitätToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AusgangEingangToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents cbxAUTO As CheckBox
 End Class

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) + 
@@ -75,6 +76,25 @@ Public Class frmGesamtsicherheitenMenuNEU
                                                             ) <> 0 "
         If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString
         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,
@@ -127,12 +147,14 @@ Public Class frmGesamtsicherheitenMenuNEU
                                 )
                                 SELECT
                                     gs.gs_gsnr,
+                                    MAX(CAST(gs_dakoyimport AS INT)) AS gs_DAKOSYAUTO,                                    
                                     MIN(gs.gs_standort) AS gs_standort,
                                     MIN(gs.gs_warenort) AS gs_warenort,
                                     MIN(gs.gs_filialenNr) AS gs_filialenNr,
                                     MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr,
                                     MIN(gs.gs_avisoId) AS gs_avisoId,
                                     MAX(gs.gs_LKWKZ) AS gs_LKWKZ,
+                                   
                                     MIN(gs.gs_datum) AS gs_datum,
                                     (
                                        COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + 
@@ -142,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
@@ -166,7 +181,7 @@ Public Class frmGesamtsicherheitenMenuNEU
             .RowHeadersWidth = 6
             .Columns("gs_standort").Visible = False
             .Columns("gs_gsnr").HeaderText = "#"
-            .Columns("gs_gsnr").Width = 36
+            .Columns("gs_gsnr").Width = 45
             .Columns("gs_filialenNr").HeaderText = "Filiale"
             .Columns("gs_filialenNr").Width = 43
             .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr."
@@ -181,6 +196,21 @@ Public Class frmGesamtsicherheitenMenuNEU
             .Columns("gs_avisoId").Width = 96
             .Columns("gs_avisoId").HeaderText = "LKW-ID"
             .Columns("gs_LKWKZ").HeaderText = "LKW-KZ"
+            .Columns("gs_DAKOSYAUTO").HeaderText = "AUTO"
+
+            .Columns("gs_DAKOSYAUTO").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+            If TypeOf .Columns("gs_DAKOSYAUTO") Is DataGridViewCheckBoxColumn = False Then
+                Dim colIndex As Integer = dgvListe.Columns("gs_DAKOSYAUTO").Index
+                .Columns.Remove("gs_DAKOSYAUTO")
+                Dim chkCol As New DataGridViewCheckBoxColumn()
+                chkCol.Name = "gs_DAKOSYAUTO"
+                chkCol.HeaderText = "AUTO"
+                chkCol.Width = 40
+                chkCol.DataPropertyName = "gs_DAKOSYAUTO"
+                .Columns.Insert(colIndex, chkCol)
+            End If
+
 
         End With
 
@@ -218,28 +248,36 @@ Public Class frmGesamtsicherheitenMenuNEU
 
 
     Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick
-        Dim frm As New frmGesamtsicherheitenNEU
-        With frm
-            .currentGesSichRef = GesSichRef
-            .gessicherheitID = dgvListe.CurrentRow.Cells("gs_gsnr").Value
-            .Standort = Me.Standort
-            .datum = dgvListe.CurrentRow.Cells("gs_datum").Value
-            .LKWKZ = dgvListe.CurrentRow.Cells("gs_LKWKZ").Value
-            .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value
-            .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value
-            .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
-            .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value
-            .dataTable = Me.dataTable
-            .firmaId = Me.firmaId
-        End With
+        Try
 
-        AddHandler frm.FormClosing, Function()
-                                        GesSichRef.CalcSaldo()
-                                        ShowStandort()
-                                        LoadDGV()
-                                        Me.BringToFront()
-                                    End Function
-        frm.Show()
+
+            Dim frm As New frmGesamtsicherheitenNEU
+            With frm
+                .currentGesSichRef = GesSichRef
+                .gessicherheitID = dgvListe.CurrentRow.Cells("gs_gsnr").Value
+                .Standort = Me.Standort
+                .datum = dgvListe.CurrentRow.Cells("gs_datum").Value
+                .LKWKZ = dgvListe.CurrentRow.Cells("gs_LKWKZ").Value
+                .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value
+                .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value
+                .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
+                .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()
+                                            GesSichRef.CalcSaldo()
+                                            ShowStandort()
+                                            LoadDGV()
+                                            Me.BringToFront()
+                                        End Function
+            frm.Show()
+
+        Catch ex As Exception
+
+        End Try
     End Sub
 
     Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
@@ -317,6 +355,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                 DateTimePicker1.Value = JAHR
                 DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1)
                 'End If
+            Case "Tag"
             Case "Tag"
 
                 DateTimePicker1.Value = TAG
@@ -445,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 (
@@ -455,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 
@@ -470,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
@@ -499,7 +538,7 @@ Public Class frmGesamtsicherheitenMenuNEU
 
     End Sub
 
-    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click
+    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click, RLZollamtBereinigtToolStripMenuItem.Click
 
         If dgvListe.Rows.Count = 0 Then
             MsgBox("keine Daten vorhanden!")
@@ -516,16 +555,32 @@ Public Class frmGesamtsicherheitenMenuNEU
         Dim datumVon As Date = CDate(txtDatVon.Text)
         datumVon = datumVon.AddDays(-1)
 
+        Dim detailINfo As Boolean = True
+
+        Dim zollliste_bereinigt As Boolean = False
+
+
+        'Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False
+        'If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then
+        '    nurErstellungsdatumNotAenderungsdatum = True
+        'End If
+
         If sender.ToString = "Detailliste" Then
-            frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text)
-        ElseIf sender.ToString = "Referenzliste-Zollamt" Then
-            frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort)
+            frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum)
+        ElseIf sender.ToString = "RL-Zollamt" OrElse sender.ToString = "RL-Zollamt bereinigt" Then
+
+            zollliste_bereinigt = IIf(sender.ToString = "RL-Zollamt bereinigt", True, False)
+            If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then
+                detailINfo = False
+            End If
+
+            frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, zollliste_bereinigt)
         Else
             MsgBox("Funktion nicht definiert!")
             Exit Sub
         End If
 
-        SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+        If Not zollliste_bereinigt Then SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
 
     End Sub
 
@@ -536,7 +591,7 @@ Public Class frmGesamtsicherheitenMenuNEU
     Private Sub SaldenNeuBerechnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaldenNeuBerechnenToolStripMenuItem.Click
 
         lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
-        MsgBox("Salden wurden neu berechnet")
+        MsgBox("Salden wurden aktualisiert!")
 
     End Sub
 
@@ -567,4 +622,118 @@ Public Class frmGesamtsicherheitenMenuNEU
         Dim webAddress As String = "https://wiki.verag.ag/e/de/software/aviso/howtos/Gesamtsicherheiten"
         Process.Start(webAddress)
     End Sub
+
+    Private Sub SaldoZumStichtagToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaldoZumStichtagToolStripMenuItem.Click
+
+        Dim f As New frmDatumsabfrage("Saldo zum Stichtag", False)
+        f.ShowDialog()
+        If f.DialogResult = DialogResult.OK Then
+            GesSichRef.CalcSaldo(, f.Datum, True)
+        End If
+
+
+    End Sub
+
+    Private Sub AusgangEingangToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusgangEingangToolStripMenuItem.Click
+
+
+
+        Dim SQLPlausPruefung = "select gs_gsnr as Nr,gs_ATBNr as ATBNr, gs_Sicherheitsbetrag as Sicherheitsbetrag ,gsp_ATCNr as ATCNr , cast(gs_datum as Date) as Ausgangsdatum, cast(gsp_datum as Date) as Eingangsdatum,  [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer from tblGesamtsicherheit
+											inner join tblGesamtsicherheitsPositionen on gs_gsId = gsp_gsId
+											where cast(gsp_datum as Date) < cast(gs_datum as Date) and not ( [gs_sicherheitsbetrag] = 0.00 and [gsp_sicherheitsbetrag] = 0.00) and gs_standort = '" & Standort & "'"
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (Datum/Uhrzeit des Gestellungsausganges muss zeitlich NACH dem Gestellungseingang liegen)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+
+    End Sub
+
+
+    Private Sub SicherheitsbetragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SicherheitsbetragToolStripMenuItem.Click
+
+
+        Dim SQLPlausPruefung = "SELECT 
+    gs.gs_gsnr,
+    gs.Sicherheitbetrag_Ausgang,
+    gsp.Sicherheitbetrag_Eingang,
+	gs.gs_standort
+FROM
+(
+    SELECT 
+        gs_gsnr,
+		gs_standort,
+        SUM(gs_sicherheitsbetrag) AS Sicherheitbetrag_Ausgang
+    FROM tblGesamtsicherheit
+    GROUP BY gs_standort, gs_gsnr
+) gs
+JOIN
+(
+    SELECT 
+        gsp_gsnr,
+        SUM(gsp_sicherheitsbetrag) AS Sicherheitbetrag_Eingang
+    FROM tblGesamtsicherheitsPositionen
+    GROUP BY gsp_gsnr
+) gsp
+    ON gs.gs_gsnr = gsp.gsp_gsnr WHERE gs.Sicherheitbetrag_Ausgang < gsp.Sicherheitbetrag_Eingang and gs_standort = '" & Standort & "' and gs_gsnr <> 2030  order by gs.gs_gsnr"
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (S-Betrag des Gestellungseinganges darf nicht größer als der des dem Gestellungsausganges)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+    End Sub
+
+    Private Sub MehrfacheATBNrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MehrfacheATBNrToolStripMenuItem.Click
+
+
+        Dim SQLPlausPruefung = " select Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum from (select gs_ATBNr, gs_standort, cast(MIN(gs_datum) as Date) as Datum from tblGesamtsicherheit 
+		where  gs_standort = '" & Standort & "' AND cast(gs_datum as Date) <=   '" & Date.Parse(txtDatBis.Text) & "'
+		group by gs_ATBNr, gs_posNr, gs_standort
+		Having count(*) > 1
+		) as Temp
+		group by Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum
+		order by temp.Datum"
+
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
+
+
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (mehrfache ATB-Einträge pro ATB-Nr)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+        Else
+
+            MsgBox("keine fehlerhaften Eingaben vorhanden!")
+
+        End If
+
+    End Sub
 End Class

Aviso/frmGesamtsicherheitenNEU.resx

@@ -120,10 +120,210 @@
   <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>268, 15</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnDeletePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnDeleteSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnUpdatePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
+        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
+        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
+        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
+        gIieiEXcpTiw4tgLsc0CKgJwDegGxlyIiUbVjQbY+dmF0F0QeyG2hImViYlbklsOTbyKW4qbE90MFIBu
+        GJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiunDhg32vf
+        Hn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOmTTNGxhMm
+        TFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnUpdateSicherheit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
+        BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
+        Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
+        lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
+        gIieiEXcpTiw4tgLsc0CKgJwDegGxlyIiUbVjQbY+dmF0F0QeyG2hImViYlbklsOTbyKW4qbE90MFIBu
+        GJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiunDhg32vf
+        Hn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOmTTNGxhMm
+        TFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnAddPos.BackgroundImage" 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="btnAddSicherheit.BackgroundImage" 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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA

Aviso/frmHauptfenster.resx

@@ -187,6 +187,14 @@
   <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1158, 17</value>
   </metadata>
+  <data name="Button9.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
@@ -293,7 +301,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>172</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>