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

@@ -72,7 +72,7 @@ Public Class frmATEZ_NCTS
 
     End Sub
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click, Button2.Click
         Try
 
 
@@ -148,6 +148,11 @@ Public Class frmATEZ_NCTS
             saveRoute(atez_data)
             setDurchgangszolstellen()
             setRoute()
+
+            If sender Is Button2 Then
+                MsgBox(getJSONAtezData(atez_data, atez))
+                Exit Sub
+            End If
             If sendAtezData(atez_data, atez) Then
                 AvisoStatusFunctions.insertSendungsVermerk(SENDUNG.tblSnd_SendungID, SENDUNG.tblSnd_AvisoID, "An ATEZ gesendet", 109)
                 Me.Close()
@@ -165,6 +170,10 @@ Public Class frmATEZ_NCTS
 
     End Sub
 
+    Private Function getJSONAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As String
+        Dim jsonData = atez.setJsonPDF(atezData, dgvAnhaenge)
+        Return (jsonData.Emit())
+    End Function
     Private Function sendAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As Boolean
 
         Dim failreDesc As String
@@ -446,7 +455,7 @@ Public Class frmATEZ_NCTS
                                                 when [anh_Art] = 'Sonstiges' then 'OTHER'
                                                 when [anh_Art] ='' then 'OTHER' End
                                                 [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] 
-                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ = 'PDF'
+                                        WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ NOT IN ('MSG', 'SONSTIGES')
                                            ORDER BY  anh_SendungsId desc,
 										  case	  
                                                 when [anh_Art] = 'ATR-EUR1' then 0

Aviso/AktenErfassung/frmEintragAviso.vb

@@ -11,7 +11,7 @@ Public Class frmEintragAviso
     Dim ATILLA_NEUERAKTENDECKEL = True
     Dim Firmen As New cFirmenDAL
     Dim AvisoDAL As New cAvisoDAL
-    Dim myAviso As New cAviso
+    Public myAviso As New cAviso
     Dim AVISOFUNC As New AvisoStatusFunctions
     Dim ADMIN As New cADMIN
     Dim hÄnderung As Boolean = False
@@ -34,6 +34,7 @@ Public Class frmEintragAviso
 
     Dim INFO As String = ""
 
+    Public getFromAVISO_Trip As cAviso = Nothing
 
     Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
@@ -351,6 +352,60 @@ Public Class frmEintragAviso
             If FIRMA_TMP = "AMBAR" Then
                 cboGrenzstelle.changeItem("AMB")
             End If
+
+
+
+            If getFromAVISO_Trip IsNot Nothing Then
+                myAviso.AvisoTripId = getFromAVISO_Trip.AvisoTripId ' --> Trip gespeichert!
+
+                myAviso.Frächter = getFromAVISO_Trip.Frächter
+                myAviso.Frächter_KdNr = getFromAVISO_Trip.Frächter_KdNr
+                myAviso.Auftraggeber = getFromAVISO_Trip.Auftraggeber
+                myAviso.Auftraggeber_KdNr = getFromAVISO_Trip.Auftraggeber_KdNr
+
+                myAviso.Zugmaschine = getFromAVISO_Trip.Zugmaschine
+                myAviso.LKW_Nr = getFromAVISO_Trip.LKW_Nr
+                myAviso.LKW_Nationalitaet = getFromAVISO_Trip.LKW_Nationalitaet
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                myAviso.AvisoEingang = getFromAVISO_Trip.AvisoEingang
+                myAviso.FahrerHandy = getFromAVISO_Trip.FahrerHandy
+                myAviso.KdAuftragsNr_Avisierer = getFromAVISO_Trip.KdAuftragsNr_Avisierer
+                myAviso.Telefonisch = getFromAVISO_Trip.Telefonisch
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                '---------ANZEIGE----------------------------------
+                If myAviso.Frächter_KdNr > 0 Then
+                    kdFrächter.KdNr = myAviso.Frächter_KdNr
+                Else
+                    kdFrächter.Text = myAviso.Frächter
+                End If
+
+                If myAviso.Auftraggeber_KdNr > 0 Then
+                    kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr
+                Else
+                    kdAvisierer.Text = myAviso.Auftraggeber
+                End If
+
+
+                txtLKW_Nr.Text = myAviso.LKW_Nr
+                sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet)
+                txtFahrerHandy.Text = If(myAviso.FahrerHandy, "")
+                txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "")
+
+
+                optAvisoEingang.Checked = True  'bei Änderung kann kein Eingang ohne Aviso erfolgen...
+
+                If myAviso.Telefonisch = "Telefon" Then
+                    optTelefonisch.Checked = True
+                ElseIf myAviso.Telefonisch = "Schriftl." Then
+                    optSchriftlich.Checked = True
+                Else
+                    optUnbekannt.Checked = True
+                End If
+                cboTransportmittelart.changeItem(myAviso.Transportmittelart)
+            End If
+
         Else
             If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
                 Me.Close()
@@ -376,9 +431,9 @@ Public Class frmEintragAviso
                 kdFrächter.KdNr = myAviso.Frächter_KdNr
             Else
                 kdFrächter.Text = myAviso.Frächter
-                End If
+            End If
 
-                If myAviso.Auftraggeber_KdNr > 0 Then
+            If myAviso.Auftraggeber_KdNr > 0 Then
                     kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr
                 Else
                     kdAvisierer.Text = myAviso.Auftraggeber
@@ -755,35 +810,63 @@ Public Class frmEintragAviso
                 Dim ListOfLKWNr = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkLKWNr(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
 
 
+                If getFromAVISO_Trip Is Nothing Then 'wenn Trip -> Prüfung überspringen 
 
-                For Each LKWNr In ListOfLKWNr
 
-                    Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(LKWNr)
-                    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
-                        Else
-                            EintragMehrfach = True
-                        End If
-                    End If
-
-                    If hLKWCheck2 = "" Then
-                        'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
-                        Dim hLKWCheck As String = AvisoDAL.Suche_LKW(LKWNr)
-                        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")
+                    For Each LKWNr In ListOfLKWNr
+                        Dim temp_avisoID As Integer = -1
+                        Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(LKWNr, temp_avisoID)
+                        If hLKWCheck2 <> "" Then
+                            Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                                   "Aviso-Eintrag")
                             If antwort = vbNo Then
+                                If temp_avisoID > 0 Then
+                                    Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                                    Dim FRM As New frmSendungsdetailsNEU(temp_avisoID, -1)
+                                    FRM.ShowDialog(frmGrayOut)
+                                    frmGrayOut.Close()
+
+                                    Exit Sub
+                                Else
+                                    MsgBox("AVISO-ID konnte nicht ermittelt werden")
+                                    Exit Sub
+                                End If
+
+                            ElseIf antwort = vbCancel Then
                                 Exit Sub
                             Else
                                 EintragMehrfach = True
                             End If
                         End If
-                    End If
 
-                Next
+                        If hLKWCheck2 = "" Then
+                            'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
+                            Dim hLKWCheck As String = AvisoDAL.Suche_LKW(LKWNr, temp_avisoID)
+                            If hLKWCheck <> "" Then
+                                Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?" & vbNewLine & "NEIN -> Springe zu existierendem Eintrag!", CType(MsgBoxStyle.YesNoCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                                       "Aviso-Eintrag")
+                                If antwort = vbNo Then
+                                    If temp_avisoID > 0 Then
+                                        Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                                        Dim FRM As New frmSendungsdetailsNEU(temp_avisoID, -1)
+                                        FRM.ShowDialog(frmGrayOut)
+                                        frmGrayOut.Close()
+                                        Exit Sub
+                                    Else
+                                        MsgBox("AVISO-ID konnte nicht ermittelt werden")
+                                        Exit Sub
+                                    End If
+                                ElseIf antwort = vbCancel Then
+                                    Exit Sub
+                                Else
+
+                                    EintragMehrfach = True
+                                End If
+                            End If
+                        End If
+
+                    Next
+                End If
 
             End If
 

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

Aviso/Aviso.vbproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props" Condition="Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" />
   <Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" />
@@ -148,8 +148,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="BouncyCastle.Cryptography">
-      <HintPath>F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll</HintPath>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
@@ -195,35 +195,50 @@
     <Reference Include="EAGetMail, Version=5.3.5.0, Culture=neutral, PublicKeyToken=e10a0812eb29cf94, processorArchitecture=MSIL">
       <HintPath>..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll</HintPath>
     </Reference>
+    <Reference Include="fiskaltrust.interface, Version=1.3.45.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\fiskaltrust.interface.1.3.45\lib\net461\fiskaltrust.interface.dll</HintPath>
+    </Reference>
     <Reference Include="Gemeinsames">
       <HintPath>..\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath>
     </Reference>
-    <Reference Include="itext.barcodes, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll</HintPath>
+    <Reference Include="itext.barcodes, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.barcodes.dll</HintPath>
     </Reference>
-    <Reference Include="itext.forms, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.forms.dll</HintPath>
+    <Reference Include="itext.bouncy-castle-adapter, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.bouncy-castle-adapter.9.6.0\lib\net461\itext.bouncy-castle-adapter.dll</HintPath>
     </Reference>
-    <Reference Include="itext.io, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.io.dll</HintPath>
+    <Reference Include="itext.bouncy-castle-connector, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath>
     </Reference>
-    <Reference Include="itext.kernel, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.kernel.dll</HintPath>
+    <Reference Include="itext.commons, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.commons.9.6.0\lib\net461\itext.commons.dll</HintPath>
     </Reference>
-    <Reference Include="itext.layout, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.layout.dll</HintPath>
+    <Reference Include="itext.forms, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.forms.dll</HintPath>
     </Reference>
-    <Reference Include="itext.pdfa, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.pdfa.dll</HintPath>
+    <Reference Include="itext.io, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.io.dll</HintPath>
     </Reference>
-    <Reference Include="itext.sign, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.sign.dll</HintPath>
+    <Reference Include="itext.kernel, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.kernel.dll</HintPath>
     </Reference>
-    <Reference Include="itext.styledxmlparser, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.styledxmlparser.dll</HintPath>
+    <Reference Include="itext.layout, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.layout.dll</HintPath>
     </Reference>
-    <Reference Include="itext.svg, Version=7.1.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\itext7.7.1.11\lib\net40\itext.svg.dll</HintPath>
+    <Reference Include="itext.pdfa, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfa.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.pdfua, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.pdfua.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.sign, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.sign.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.styledxmlparser, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.styledxmlparser.dll</HintPath>
+    </Reference>
+    <Reference Include="itext.svg, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\itext.9.6.0\lib\net461\itext.svg.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -394,8 +409,8 @@
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Configuration">
@@ -404,15 +419,27 @@
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
-      <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Hosting">
       <HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Hosting.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
@@ -452,9 +479,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
       <Private>True</Private>
@@ -468,6 +501,9 @@
     <Reference Include="System.IO.Packaging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath>
     </Reference>
+    <Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
@@ -489,8 +525,12 @@
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -514,11 +554,19 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Xml, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Xml.6.0.2\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
@@ -755,6 +803,12 @@
     <Compile Include="frmAddSendungsvermerkShort.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.Designer.vb">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSendungsDokumentanforderung.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmAnkunftAendern.Designer.vb">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </Compile>
@@ -1140,6 +1194,12 @@
     <Compile Include="frmWarenbezeichnungBegriffeEdit.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmReferenzenSicherheiten.Designer.vb">
+      <DependentUpon>frmReferenzenSicherheiten.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmReferenzenSicherheiten.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmWarenorte.Designer.vb">
       <DependentUpon>frmWarenorte.vb</DependentUpon>
     </Compile>
@@ -1271,6 +1331,12 @@
     <Compile Include="usrcntlFrachtkostenberechnung.vb">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_SND.Designer.vb">
+      <DependentUpon>usrCntlHauptfenster_Suche_SND.vb</DependentUpon>
+    </Compile>
+    <Compile Include="usrCntlHauptfenster_Suche_SND.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="usrCntlHauptfenster_Suche_AVISO.Designer.vb">
       <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
     </Compile>
@@ -1413,6 +1479,9 @@
     <EmbeddedResource Include="frmAddSendungsvermerkShort.resx">
       <DependentUpon>frmAddSendungsvermerkShort.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmSendungsDokumentanforderung.resx">
+      <DependentUpon>frmSendungsDokumentanforderung.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAnkunftAendern.resx">
       <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
     </EmbeddedResource>
@@ -1521,6 +1590,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmLogin.resx">
       <DependentUpon>frmLogin.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAuswahl_Aviso.resx">
       <DependentUpon>frmAuswahl_Aviso.vb</DependentUpon>
@@ -1609,6 +1679,9 @@
     <EmbeddedResource Include="frmWarenbezeichnungBegriffeEdit.resx">
       <DependentUpon>frmWarenbezeichnungBegriffeEdit.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmReferenzenSicherheiten.resx">
+      <DependentUpon>frmReferenzenSicherheiten.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmWarenorte.resx">
       <DependentUpon>frmWarenorte.vb</DependentUpon>
     </EmbeddedResource>
@@ -1673,6 +1746,9 @@
     <EmbeddedResource Include="usrcntlFrachtkostenberechnung.resx">
       <DependentUpon>usrcntlFrachtkostenberechnung.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="usrCntlHauptfenster_Suche_SND.resx">
+      <DependentUpon>usrCntlHauptfenster_Suche_SND.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="usrCntlHauptfenster_Suche_AVISO.resx">
       <DependentUpon>usrCntlHauptfenster_Suche_AVISO.vb</DependentUpon>
     </EmbeddedResource>
@@ -1873,6 +1949,8 @@
     <None Include="Resources\ambar_boarder_new.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Resources\AVISO_DCS.png" />
+    <None Include="Resources\aktualisieren-40.png" />
     <Content Include="Resources\FO.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1894,6 +1972,54 @@
     <None Include="Resources\qr.png" />
     <None Include="Resources\qr_s.png" />
     <None Include="Resources\Transcode.png" />
+    <None Include="Resources\SND_verbinden.png" />
+    <None Include="Resources\SND_loesen.png" />
+    <None Include="Resources\ico_settings.png" />
+    <None Include="Resources\ico_kunden.png" />
+    <None Include="Resources\ico_fakturierung.png" />
+    <None Include="Resources\ico_rechnungen.png" />
+    <None Include="Resources\ico_mitarbeiter.png" />
+    <None Include="Resources\ico_kassenbuch.png" />
+    <None Include="Resources\ico_dienstplan.png" />
+    <None Include="Resources\ico_zeiterfassung.png" />
+    <None Include="Resources\ico_parkzeit.png" />
+    <None Include="Resources\ico_truck.png" />
+    <None Include="Resources\ico_docSearch.png" />
+    <None Include="Resources\ico_checklist.png" />
+    <None Include="Resources\ico_persDocument.png" />
+    <None Include="Resources\ico_security.png" />
+    <None Include="Resources\ico_handshake.png" />
+    <None Include="Resources\ico_docSave.png" />
+    <None Include="Resources\ico_DocEdit.png" />
+    <None Include="Resources\ico_docFin.png" />
+    <None Include="Resources\ico_mail.png" />
+    <None Include="Resources\ico_add.png" />
+    <None Include="Resources\ico_weel.png" />
+    <None Include="Resources\ico_loupe.png" />
+    <None Include="Resources\ico_inventor.png" />
+    <None Include="Resources\ico_verzeichnis.png" />
+    <None Include="Resources\ico_webWww.png" />
+    <None Include="Resources\ico_www.png" />
+    <None Include="Resources\ico_verknuepfung.png" />
+    <None Include="Resources\ico_webSearch.png" />
+    <None Include="Resources\ico_webSecurity.png" />
+    <None Include="Resources\ico_organigram.png" />
+    <None Include="Resources\ico_support.png" />
+    <None Include="Resources\ico_speditionsbuch.png" />
+    <None Include="Resources\ico_statistic.png" />
+    <None Include="Resources\ico_zertifikate.png" />
+    <None Include="Resources\ico_Options.png" />
+    <None Include="Resources\ico_ATR.png" />
+    <None Include="Resources\ico_CMR.png" />
+    <None Include="Resources\ico_ImportAssistant.png" />
+    <None Include="Resources\ico_kasse.png" />
+    <None Include="Resources\ico_importaviso.png" />
+    <None Include="Resources\ico_vorkasse.png" />
+    <None Include="Resources\ico_weitereForm.png" />
+    <None Include="Resources\ico_atez_transitAI.png" />
+    <None Include="Resources\ico_atez_declarantAI.png" />
+    <None Include="Resources\ico_atez_tariffAI.png" />
+    <None Include="Resources\ico_atez_logicust.png" />
     <Content Include="Resources\WLAN\RunNHide.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

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
@@ -302,7 +305,10 @@ Public Class frmAvisoWeiterleiten
                 Next
             End If
         ElseIf sender Is btnFrontoffice Then
-            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True)
+            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE SUBEN", True)
+            'addBtn(flpFirma, "F", "FRONTOFFICE_KLIPP", "FRONT-OFFICE KLIPPHAUSEN", True) -> Wenn Firma gegründet
+
+
         ElseIf sender Is btnATILLA Then
             addBtn(flpFirma, "F", "ATILLA", "ATILLA", True)
             Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='ATILLA' order by team_id", "ADMIN")
@@ -330,8 +336,15 @@ Public Class frmAvisoWeiterleiten
                 Next
             End If
         ElseIf sender Is Button2 Then
-            addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG")
-            addBtn(flpFirma, "W", "WO_MERIS", "MERIS", True, "VERAG")
+
+
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT grz_Grenzstelle, grz_Bezeichnung, grz_Firma  FROM tblGrenzstelle WHERE grz_FreigabeWeb = 1 and grz_Firma is not null order by grz_Grenzstelle", "AVISO")
+            If dt IsNot Nothing Then
+                For Each t In dt.Rows
+                    addBtn(flpFirma, "W", t("grz_Grenzstelle"), t("grz_Bezeichnung"), True, t("grz_Firma"))
+                Next
+            End If
+
 
         End If
 

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

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.3.3")>
-<Assembly: AssemblyFileVersion("4.2.3.3")>
+<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>
@@ -378,6 +388,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property AVISO_DCS() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("AVISO_DCS", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -858,6 +878,466 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_add() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_add", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_declarantAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_declarantAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_logicust() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_logicust", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_tariffAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_tariffAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_atez_transitAI() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_atez_transitAI", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_ATR() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_ATR", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_checklist() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_checklist", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_CMR() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_CMR", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_dienstplan() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_dienstplan", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_DocEdit() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_DocEdit", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docFin() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docFin", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docSave() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docSave", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_docSearch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_docSearch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_fakturierung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_fakturierung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_handshake() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_handshake", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_ImportAssistant() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_ImportAssistant", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_importaviso() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_importaviso", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_inventor() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_inventor", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kasse() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kasse", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kassenbuch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kassenbuch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_kunden() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_kunden", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_loupe() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_loupe", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_mail() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_mail", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_mitarbeiter() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_mitarbeiter", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_Options() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_Options", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_organigram() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_organigram", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_parkzeit() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_parkzeit", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_persDocument() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_persDocument", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_rechnungen() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_rechnungen", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_security() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_security", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_settings() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_settings", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_speditionsbuch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_speditionsbuch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_statistic() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_statistic", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_support() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_support", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_truck() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_truck", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_verknuepfung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_verknuepfung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_verzeichnis() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_verzeichnis", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_vorkasse() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_vorkasse", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webSearch() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webSearch", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webSecurity() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webSecurity", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_webWww() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_webWww", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_weel() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_weel", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_weitereForm() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_weitereForm", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_www() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_www", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_zeiterfassung() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_zeiterfassung", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ico_zertifikate() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ico_zertifikate", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1498,6 +1978,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property SND_loesen() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("SND_loesen", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property SND_verbinden() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("SND_verbinden", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

Aviso/My Project/Resources.resx

@@ -724,4 +724,154 @@
   <data name="ambar_boarder_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="aktualisieren_40" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aktualisieren-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AVISO_DCS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AVISO_DCS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SND_loesen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SND_loesen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SND_verbinden" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SND_verbinden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_checklist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_dienstplan" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_dienstplan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_DocEdit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_DocEdit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docFin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docFin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_docSearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_docSearch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_fakturierung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_fakturierung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_handshake" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_handshake.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_inventor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_inventor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kassenbuch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kassenbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kunden" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kunden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_loupe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_loupe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_mail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_mitarbeiter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_parkzeit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_parkzeit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_persDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_persDocument.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_rechnungen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_rechnungen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_security" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_security.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_truck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_truck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_verzeichnis" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_verzeichnis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_weel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_weel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_zeiterfassung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_zeiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_organigram" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_organigram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_speditionsbuch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_speditionsbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_statistic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_statistic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_support" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_support.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_verknuepfung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_verknuepfung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webSearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webSearch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webSecurity" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webSecurity.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_webWww" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_webWww.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_www" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_www.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_zertifikate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_zertifikate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_ATR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_ATR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_CMR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_CMR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_ImportAssistant" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_ImportAssistant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_Options" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_Options.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_declarantAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_declarantAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_logicust" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_logicust.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_tariffAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_tariffAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_atez_transitAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_atez_transitAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_importaviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_importaviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_kasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_vorkasse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_vorkasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ico_weitereForm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_weitereForm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

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

Aviso/frmAddSendungsvermerkShort.vb

@@ -1,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

@@ -35,6 +35,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         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()
@@ -69,7 +70,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblReferenzwert = New System.Windows.Forms.Label()
         Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbxAUTO = New System.Windows.Forms.CheckBox()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -80,7 +81,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         '
         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(202, 114)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 92)
         '
         'ExportCSVToolStripMenuItem
         '
@@ -135,18 +136,25 @@ Partial Class frmGesamtsicherheitenMenuNEU
         'AusgangEingangToolStripMenuItem
         '
         Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem"
-        Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        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(180, 22)
+        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)
@@ -181,7 +189,7 @@ 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
@@ -567,7 +575,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         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.Location = New System.Drawing.Point(619, 253)
         Me.btnNeu.Name = "btnNeu"
         Me.btnNeu.Size = New System.Drawing.Size(75, 23)
         Me.btnNeu.TabIndex = 34
@@ -580,7 +588,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         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
@@ -592,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
@@ -604,7 +612,7 @@ 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
@@ -618,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
@@ -637,20 +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
         '
-        'MehrfacheATBNrToolStripMenuItem
+        'cbxAUTO
         '
-        Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
-        Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
+        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)
@@ -715,4 +730,5 @@ Partial Class frmGesamtsicherheitenMenuNEU
     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
@@ -446,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 (
@@ -456,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 
@@ -471,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

Aviso/frmGesamtsicherheitenNEU.resx

@@ -120,10 +120,52 @@
   <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
@@ -199,7 +241,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
         BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
         Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
         lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -256,7 +298,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
         BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
         Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
         lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -280,48 +322,6 @@
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
         BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
         zULyAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <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>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Aviso/frmGesamtsicherheitenNEU.vb

@@ -1,5 +1,4 @@
-Imports GrapeCity.Enterprise.Data.Expressions.Tools
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
 
@@ -52,6 +51,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Public warenortPrefix As String = ""
 
+    Public DAKOSY_AUTO As Boolean = False
+
 
 
     Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -79,12 +80,7 @@ Public Class frmGesamtsicherheitenNEU
 
             cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
 
-            If warenortPrefix <> "" Then
-                cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1  AND wo_ze = 1 AND LEFT([wo_warenort],2) = " & warenortPrefix & " ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
-            Else
-                cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1  AND wo_ze = 1 AND [wo_firma] = " & firmaId & " ORDER BY [wo_reihenfolge]  ", True, "AVISO", True) '
-            End If
-
+            setcboWarenort(True)
 
 
             If datum = Nothing Then datum = Date.Now
@@ -93,28 +89,6 @@ Public Class frmGesamtsicherheitenNEU
 
             txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)
 
-            If Standort = "AMBAR GmbH" Then
-                For i As Integer = 0 To cboFiliale.Items.Count - 1
-                    If cboFiliale.Items(i).ToString().Contains("5701") Then
-                        cboFiliale.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-                For i As Integer = 0 To cboWarenort.Items.Count - 1
-                    If cboWarenort.Items(i).ToString().Contains("AMBAR") Then
-                        cboWarenort.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-            ElseIf grenzstelle <> "" Then
-
-                For i As Integer = 0 To cboWarenort.Items.Count - 1
-                    If cboWarenort.Items(i).ToString().Contains(grenzstelle) Then
-                        cboWarenort.SelectedIndex = i
-                        Exit For
-                    End If
-                Next
-            End If
 
         Else
             LoadDGVSicherheiten(True)
@@ -126,6 +100,17 @@ Public Class frmGesamtsicherheitenNEU
         initPrevNextButtons()
         changeLabel()
 
+        Select Case Standort
+            Case "Verag GmbH" : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
+            Case "AMBAR GmbH" : btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO
+            Case "Atilla GmbH" : btnDAKOSY_AUTO.Enabled = False
+            Case "VERAG AG" : btnDAKOSY_AUTO.Enabled = False
+            Case "IMEX" : btnDAKOSY_AUTO.Enabled = False
+            Case "Verag CS" : btnDAKOSY_AUTO.Enabled = False
+            Case "Unisped GmbH" : btnDAKOSY_AUTO.Enabled = False
+            Case Else : btnDAKOSY_AUTO.Enabled = False
+
+        End Select
 
         Me.Text = "Gesamtsicherheit " & Standort
         frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
@@ -144,9 +129,10 @@ Public Class frmGesamtsicherheitenNEU
         If withFilterParam = True Then
             If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
             If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
+            If Not cbxHeader.Checked Then sqlSearchSting &= "AND gs_posNr <> 0 "
         End If
 
-        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
+        Dim SQLStringSicherheit As String = "select [gs_gsId],[gs_dakoyimport] ,[gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " ,[gs_EH_Anzahl], [gs_gewicht] , [gs_freitext], [gs_DK_laufnr] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
 
         dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
         dgvGesamtsicherheit.LOAD()
@@ -157,6 +143,13 @@ Public Class frmGesamtsicherheitenNEU
                 .RowHeadersWidth = 10
                 .Columns("gs_gsId").Visible = False
                 .Columns("gs_gsnr").Visible = False
+                .Columns("gs_dakoyimport").Visible = False
+                If Not cbxHeader.Checked Then
+                    .Columns("gs_DK_laufnr").Visible = False
+                Else
+                    .Columns("gs_DK_laufnr").Visible = True
+                End If
+
                 .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
                 .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").DefaultCellStyle.Format = "c"
@@ -196,6 +189,17 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gs_datum").HeaderText = "Datum"
                 .Columns("gs_warenwert").Width = 85
                 .Columns("gs_warenwert").HeaderText = "Warenwert"
+                .Columns("gs_EH_Anzahl").HeaderText = "Anz."
+                .Columns("gs_EH_Anzahl").Width = 50
+                .Columns("gs_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+                .Columns("gs_gewicht").HeaderText = "Gewicht"
+                .Columns("gs_gewicht").Width = 50
+                .Columns("gs_gewicht").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+                .Columns("gs_DK_laufnr").HeaderText = "DK_ID."
+                .Columns("gs_DK_laufnr").Width = 40
+
                 .Columns("gs_saldo").Width = 100
                 .Columns("gs_saldo").HeaderText = "Saldo"
                 .Columns("gs_sicherheitsbetrag").Width = 85
@@ -217,6 +221,12 @@ Public Class frmGesamtsicherheitenNEU
                     Me.dgvGesamtsicherheit.Rows(i).DefaultCellStyle.BackColor = Color.White
                 End If
 
+                If dgvGesamtsicherheit.Rows(i).Cells("gs_dakoyimport").Value Then
+                    btnDAKOSY_AUTO.Enabled = False
+                Else
+                    btnDAKOSY_AUTO.Enabled = True
+                End If
+
 
             Next
 
@@ -355,9 +365,9 @@ Public Class frmGesamtsicherheitenNEU
 
 
                             indexOflastEntry = dtSicherheiten.Rows.IndexOf(r)
-                                endSaldo = r.Item("Saldo")
+                            endSaldo = r.Item("Saldo")
 
-                            End If
+                        End If
 
 
                     End If
@@ -426,7 +436,7 @@ Public Class frmGesamtsicherheitenNEU
         Next
 
         Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', gs_art,  
-                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" &
+                                            [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" &
                                             IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
                                             "from [tblGesamtsicherheit]
                                             left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
@@ -437,7 +447,7 @@ Public Class frmGesamtsicherheitenNEU
 
 
         Dim SQLStringSicherheit_new As String = "	select  [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',  
-                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" &
+                                            [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" &
                                             IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am',  gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
                                             "From tblGesamtsicherheit
                                             Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
@@ -527,12 +537,13 @@ Public Class frmGesamtsicherheitenNEU
             sqlSearch &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'"
             If txtSuche.Text <> "" Then sqlSearch &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
             If cbxRundPosanzeigen.Checked = False Then sqlSearch &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0"
+            If Not cbxHeader.Checked Then sqlSearch &= " AND gs_posNr <> 0 "
             sqlSearch &= ")"
         End If
 
 
         Dim SQLStringCRN As String =
-            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
+            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_MRNNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag], [gsp_EH_Anzahl], [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
                 "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearch & " order by [gs_ATBNr], [gs_posNr]"
 
         dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
@@ -545,38 +556,35 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gsp_gspPosId").HeaderText = "Pos#"
                 .Columns("gsp_gsId").Visible = False
                 .Columns("gsp_gsnr").Visible = False
+                .Columns("gsp_ATCNr").Visible = False
                 .Columns("gsp_warenwert").DefaultCellStyle.Format = "c"
                 .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 Select Case currentGesSichRef.brgakto_gs_ATR
                     Case True
                         If Standort = "Verag GmbH" Then
-                            .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN"
+                            .Columns("gsp_MRNNr").HeaderText = "ATC. / MRN"
                         ElseIf Standort = "VERAG AG" Then
-                            .Columns("gsp_ATCNr").HeaderText = "T1 CRN"
+                            .Columns("gsp_MRNNr").HeaderText = "T1 CRN"
                         Else
-                            .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN"
-                        End If
-
-                    Case Else
-                        If Standort = "Verag GmbH" Then
-                            .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN"
-                        ElseIf Standort = "VERAG AG" Then
-                            .Columns("gsp_ATCNr").HeaderText = "T1 CRN"
-                        Else
-                            .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN"
+                            .Columns("gsp_MRNNr").HeaderText = "EZA / T1 CRN"
                         End If
 
                 End Select
-                .Columns("gsp_ATCNr").Width = 140
+                .Columns("gsp_MRNNr").Width = 140
                 .Columns("gsp_datum").Width = 100
                 .Columns("gsp_datum").HeaderText = "Datum"
                 .Columns("gsp_warenwert").Width = 100
                 .Columns("gsp_warenwert").HeaderText = "Warenwert"
                 .Columns("gsp_sicherheitsbetrag").Width = 85
                 .Columns("gsp_sicherheitsbetrag").HeaderText = "S-Betrag"
+                .Columns("gsp_EH_Anzahl").HeaderText = "Anz."
+                .Columns("gsp_EH_Anzahl").Width = 50
+                .Columns("gsp_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
                 .Columns("gsp_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                 .Columns("gsp_freitext").HeaderText = "Freitext"
 
+
             End With
 
             Dim changeColor = True
@@ -603,30 +611,35 @@ Public Class frmGesamtsicherheitenNEU
 
     Sub loadTitle()
 
-        txtGestellInfo.Text = ""
-        lblId.Text = ""
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & indexGsNr & "'"
+        Try
 
 
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
-
-        If dt.Rows.Count > 0 Then
-            Me.avisoID = setNullToZero(dt.Rows(0).Item("gs_avisoId"))
-            Me.LKWKZ = setNullToZero(dt.Rows(0).Item("gs_LKWKZ"))
-            Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
-            Me.Abfertigungsnummer = dt.Rows(0).Item("gs_abfertigungsNr")
-            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
-        End If
-
-        If Me.avisoID.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-ID: " & Me.avisoID & " "
-        If Me.LKWKZ.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-KZ: " & Me.LKWKZ & " "
-        If Me.FilialNummer.ToString.Length > 0 Then txtGestellInfo.Text &= "FilialNr: " & Me.FilialNummer & " "
-        If Me.Abfertigungsnummer.Length > 0 Then txtGestellInfo.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
-        If Me.warenortID.Length > 0 Then txtGestellInfo.Text &= "Warenort: " & Me.warenortID & " "
-        If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr
+            txtGestellInfo.Text = ""
+            lblId.Text = ""
+            Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & indexGsNr & "'"
 
 
+            Dim dt As New DataTable
+            dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
+
+            If dt.Rows.Count > 0 Then
+                Me.avisoID = setNullToZero(dt.Rows(0).Item("gs_avisoId"))
+                Me.LKWKZ = IIf(IsDBNull(dt.Rows(0).Item("gs_LKWKZ")), "", dt.Rows(0).Item("gs_LKWKZ"))
+                Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
+                Me.Abfertigungsnummer = dt.Rows(0).Item("gs_abfertigungsNr")
+                Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
+            End If
+
+            If Me.avisoID.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-ID: " & Me.avisoID & " "
+            If Me.LKWKZ.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-KZ: " & Me.LKWKZ & " "
+            If Me.FilialNummer.ToString.Length > 0 Then txtGestellInfo.Text &= "FilialNr: " & Me.FilialNummer & " "
+            If Me.Abfertigungsnummer.Length > 0 Then txtGestellInfo.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
+            If Me.warenortID.Length > 0 Then txtGestellInfo.Text &= "Warenort: " & Me.warenortID & " "
+            If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
 
     End Sub
 
@@ -725,7 +738,7 @@ Public Class frmGesamtsicherheitenNEU
         End Select
     End Sub
 
-    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress
+    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress, txtAnzahl.KeyPress
         Select Case Asc(e.KeyChar)
             Case 48 To 57, 8, 44, 46, 58
                 'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226
@@ -797,12 +810,15 @@ Public Class frmGesamtsicherheitenNEU
                 attachPosNrToExistingATB = False
                 Dim warenwert As Double
                 Dim sicherheitsbetrag As Double
+                Dim AnzahlEH As Integer
                 If count > 1 Then
                     warenwert = 0
                     sicherheitsbetrag = 0
+                    AnzahlEH = 0
                 Else
                     warenwert = Double.Parse(txtSicherheitWarenwert.Text)
                     sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
+                    AnzahlEH = Integer.Parse(setNullToZero(txtAnzahl.Text))
                 End If
 
                 Dim OPEN As New cSicherheiten()
@@ -824,6 +840,7 @@ Public Class frmGesamtsicherheitenNEU
                     .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                     .gs_zollsatz = Me.Zollsatz
                     .gs_avisoId = Me.avisoID
+                    .gs_EH_Anzahl = AnzahlEH
                     setEnviromentDataToObject(OPEN, Me)
                 End With
 
@@ -838,10 +855,10 @@ Public Class frmGesamtsicherheitenNEU
 
                     Case Else
                         With OPEN
-                            .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
+                            .gs_posNr = OPEN.getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
 
                             If .gs_MRNNr <> "" Then
-                                .gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
+                                .gs_posSubNr = OPEN.getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
                             Else
                                 .gs_posSubNr = Nothing
                             End If
@@ -913,11 +930,11 @@ Public Class frmGesamtsicherheitenNEU
                 .gs_ATBNr = ""
                 .gs_MRNNr = ""
                 If .gs_MRNNr <> "" Then
-                    .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                    .gs_posSubNr = OPEN.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
                 Else
                     .gs_posSubNr = Nothing
                 End If
-                .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
+                .gs_posNr = OPEN.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
                 .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gs_warenwert = 0
                 .gs_sicherheitsbetrag = 0
@@ -929,6 +946,7 @@ Public Class frmGesamtsicherheitenNEU
                 .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
                 .gs_zollsatz = Me.Zollsatz
                 .gs_avisoId = Me.avisoID
+                .gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
                 setEnviromentDataToObject(OPEN, Me)
             End With
 
@@ -949,7 +967,7 @@ Public Class frmGesamtsicherheitenNEU
                 .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
                 .gsp_erstellungsdatum = DateTime.Now
                 .gsp_ust = currentSicherheit.gs_ust
-                .gsp_ATCNr = txtPositionenCRN.Text
+                .gsp_MRNNr = txtPositionenCRN.Text
                 .gsp_avisoId = Me.avisoID
                 .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
             End With
@@ -975,7 +993,7 @@ Public Class frmGesamtsicherheitenNEU
     Sub AfterButton()
         'currentGesSichRef.CalcSaldo()
         lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N")
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
         EmptyTXT()
     End Sub
 
@@ -1114,6 +1132,7 @@ Public Class frmGesamtsicherheitenNEU
         cboSicherheitATR.SelectedItem = Sicherh.gs_atr
         txtSicherheitDat.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy")
         txtSicherheitTime.Text = Sicherh.gs_datum.ToString("HH:mm")
+        txtAnzahl.Text = Sicherh.gs_EH_Anzahl
 
         currentSicherheit = Sicherh
         txtAnzahlPos.Enabled = False
@@ -1143,7 +1162,7 @@ Public Class frmGesamtsicherheitenNEU
             .gs_MRNNr = txtMRNNr.Text
             .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
             If .gs_MRNNr <> "" Then
-                .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
+                .gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), currentSicherheit.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
             Else
                 .gs_posSubNr = Nothing
             End If
@@ -1155,7 +1174,7 @@ Public Class frmGesamtsicherheitenNEU
             .gs_gsNr = Me.gessicherheitID
             '.MakeDate = Me.MakeDate
             .gs_freitext = Me.txtSicherheitFreitext.Text
-            '.saldo = currentGesSichRef.Saldo
+            .gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
             .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
         End With
 
@@ -1186,13 +1205,13 @@ Public Class frmGesamtsicherheitenNEU
             .gsp_freitext = txtPosFreitext.Text
             .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text)
             .gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
-            .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
+            .gsp_MRNNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)
 
             If txtPosDat.Text <> "" AndAlso txtPosTime.Text <> "" Then
                 currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
             Else
                 currentSPos.gsp_datum = Nothing
-                If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
+                If .gsp_MRNNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
                     MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!")
                     Exit Sub
                 End If
@@ -1219,7 +1238,7 @@ Public Class frmGesamtsicherheitenNEU
         txtPosFreitext.Text = sPos.gsp_freitext
         txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag
         txtPosWarenwert.Text = sPos.gsp_warenwert
-        txtPositionenCRN.Text = CStr(sPos.gsp_ATCNr)
+        txtPositionenCRN.Text = CStr(sPos.gsp_MRNNr)
 
         Try
             If sPos.gsp_datum IsNot Nothing Then
@@ -1246,7 +1265,7 @@ Public Class frmGesamtsicherheitenNEU
             Dim gsNr = currentSicherheit.gs_gsNr
             Dim subPosNr = currentSicherheit.gs_posSubNr
             currentSicherheit.Delete()
-            rearangePosNr(gsNr, ATBNr, posNr)
+            currentSicherheit.rearangePosNr(gsNr, ATBNr, posNr)
             'rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
             btnUpdateSicherheit.Visible = False
             btnAddSicherheit.Visible = True
@@ -1319,40 +1338,6 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
 
 
-    Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer
-        Dim posNr As Integer = 0
-        'Dim sqlq As String = "Select MAX([gsp_gspPosId]) As MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsnr = " & gs_gsnr
-        Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
-
-            posNr = dt.Rows(0).Item(0)
-
-        End If
-
-        Return posNr
-
-    End Function
-
-
-    Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_ATBNr As String, gs_MRNNr As String) As Integer
-        Dim posNr As Integer = 0
-        Dim sqlq As String = "Select MAX([gs_posSubNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_MRNNr is not null and gs_MRNNr = '" & gs_MRNNr & "'  And gs_ATBNR = '" & gs_ATBNr & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
-
-            posNr = dt.Rows(0).Item(0)
-
-        End If
-
-        Return posNr
-
-    End Function
-
     Private Sub btnSuche_Click(sender As Object, e As EventArgs)
         Try
             If Me.Visible Then LoadDGVSicherheiten(True)
@@ -1391,7 +1376,7 @@ Public Class frmGesamtsicherheitenNEU
             '    Return False
             'End If
 
-            If (offenerSicherheitsbetrag <0 Or offenerSicherheitsbetrag <offenerSicherheitsbetragPos) Then
+            If (offenerSicherheitsbetrag < 0 Or offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then
                 If vbYes = MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!" & vbCrLf & "Trotzdem speichen?", vbYesNo) Then
                     Return True
                 Else
@@ -1648,7 +1633,7 @@ Public Class frmGesamtsicherheitenNEU
         End If
 
 
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
     End Sub
 
     Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click
@@ -1668,7 +1653,7 @@ Public Class frmGesamtsicherheitenNEU
             Me.gessicherheitID = Me.nextGessicherheitID
         End If
 
-        LoadDGVSicherheiten()
+        LoadDGVSicherheiten(True)
     End Sub
 
     Private Sub initPrevNextButtons()
@@ -1717,101 +1702,105 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
     Private Sub calcGesamtsummen()
 
-        txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
-
-        txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)
-
-        Dim countSicherheitsbetrag As Double = 0
-        Dim countWarenwert As Double = 0
-
-        For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
-            countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
-            countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
+        Try
 
 
-        Next
+            txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
+            txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)
 
-        txtSicherheitsbGes._value = countSicherheitsbetrag.ToString
-        txtWarenwertGes._value = countWarenwert.ToString
+            Dim countSicherheitsbetrag As Double = 0
+            Dim countWarenwert As Double = 0
 
-        Dim countSicherheitsbetragPos As Double = 0
-        Dim countWarenwertPos As Double = 0
+            For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
+                countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
+                countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
+            Next
 
-        For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1
+            txtSicherheitsbGes._value = countSicherheitsbetrag.ToString
+            txtWarenwertGes._value = countWarenwert.ToString
 
-            countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value)
-            countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value)
+            Dim countSicherheitsbetragPos As Double = 0
+            Dim countWarenwertPos As Double = 0
 
-        Next
+            For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1
 
-        txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString
-        txtPosWarenwertGes._value = countWarenwertPos.ToString
+                countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value)
+                countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value)
 
-        lbloffenerWarenwert.Text = "offener Warenwert: €"
-        lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2)
+            Next
 
-        If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then
-            btnRundungsdifAusgl.Enabled = True
-            rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2)
-        Else
-            btnRundungsdifAusgl.Enabled = False
-        End If
+            txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString
+            txtPosWarenwertGes._value = countWarenwertPos.ToString
 
+            lbloffenerWarenwert.Text = "offener Warenwert: €"
+            lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2)
 
-
-    End Sub
-
-    Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer)
-
-        If posNr = -1 Or posNr = 1 Then Exit Sub
-
-        Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
-
-        If (dt.Rows.Count = 0) Then Exit Sub
-
-
-        For i As Integer = 0 To dt.Rows.Count - 1
-            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
-            Dim currentPos = sicherheit.gs_posNr
-
-            If sicherheit.gs_posSubNr IsNot Nothing Then
-                rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
+            If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then
+                btnRundungsdifAusgl.Enabled = True
+                rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2)
+            Else
+                btnRundungsdifAusgl.Enabled = False
             End If
 
-            sicherheit.gs_posNr = currentPos - 1
-
-            sicherheit.UPDATEWithNewPosNr(True)
-
-        Next
 
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
 
     End Sub
 
+    '-------------- AUSGELAGERT IN KLASSE
 
-    Private Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer)
+    'Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer)
 
-        If subposNr = -1 Or subposNr = 1 Then Exit Sub
+    '    If posNr = -1 Or posNr = 1 Then Exit Sub
 
-        'Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr & " AND gs_posSubNr >= " & subposNr
-        Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+    '    Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr
+    '    Dim dt As New DataTable
+    '    dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
 
-        If (dt.Rows.Count = 0) Then Exit Sub
+    '    If (dt.Rows.Count = 0) Then Exit Sub
 
 
-        For i As Integer = 0 To dt.Rows.Count - 1
-            Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr"))
-            Dim currentPos = sicherheit.gs_posSubNr
-            sicherheit.gs_posSubNr = currentPos - 1
-            sicherheit.UPDATEWithNewPosNr()
+    '    For i As Integer = 0 To dt.Rows.Count - 1
+    '        Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
+    '        Dim currentPos = sicherheit.gs_posNr
 
-        Next
+    '        If sicherheit.gs_posSubNr IsNot Nothing Then
+    '            rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
+    '        End If
+
+    '        sicherheit.gs_posNr = currentPos - 1
+
+    '        sicherheit.UPDATEWithNewPosNr(True)
+
+    '    Next
 
 
-    End Sub
+    'End Sub
+
+
+    'Private Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer)
+
+    '    If subposNr = -1 Or subposNr = 1 Then Exit Sub
+
+    '    Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr
+    '    Dim dt As New DataTable
+    '    dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+
+    '    If (dt.Rows.Count = 0) Then Exit Sub
+
+
+    '    For i As Integer = 0 To dt.Rows.Count - 1
+    '        Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr"))
+    '        Dim currentPos = sicherheit.gs_posSubNr
+    '        sicherheit.gs_posSubNr = currentPos - 1
+    '        sicherheit.UPDATEWithNewPosNr()
+
+    '    Next
+
+
+    'End Sub
 
     Private Sub txtlkwIdSearch_VALUE_CHANGED() Handles txtlkwIdSearch.VALUE_CHANGED
         If (txtlkwIdSearch._value <> "") Then
@@ -1857,7 +1846,7 @@ Public Class frmGesamtsicherheitenNEU
         Dim mutlitpleATCNr As Boolean = False
         Dim Warenwert As Double
 
-        ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_ATCNr").Value.ToString
+        ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_MRNNr").Value.ToString
         tempDatum = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "")
         TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("HH:mm"), "")
         Warenwert = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value IsNot DBNull.Value, CDbl(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value), "")
@@ -1866,7 +1855,7 @@ Public Class frmGesamtsicherheitenNEU
         If dgvSicherheitsPos.SelectedRows.Count > 0 Then
 
             For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows
-                If row.Cells("gsp_ATCNr").Value.ToString <> ATCNr Then
+                If row.Cells("gsp_MRNNr").Value.ToString <> ATCNr Then
                     mutlitpleATCNr = True
                 End If
             Next
@@ -1915,7 +1904,7 @@ Public Class frmGesamtsicherheitenNEU
                         Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
                         sicherh.gs_MRNNr = txtATBNraendern.Text
                         If sicherh.gs_MRNNr <> "" Then
-                            sicherh.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(sicherh.gs_gsNr, sicherh.gs_ATBNr, sicherh.gs_MRNNr) + 1)
+                            sicherh.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), sicherh.getLatestSubPosNr(sicherh.gs_gsNr, sicherh.gs_ATBNr, sicherh.gs_MRNNr) + 1)
                         Else
                             sicherh.gs_posSubNr = Nothing
                         End If
@@ -2003,7 +1992,7 @@ Public Class frmGesamtsicherheitenNEU
                     End If
                 End If
 
-                SicherhPos.gsp_ATCNr = txtATCaendern.Text
+                SicherhPos.gsp_MRNNr = txtATCaendern.Text
                 SicherhPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtDatumaendern.Text, txtUhrzeitaendern.Text)
                 SicherhPos.SAVE()
             Next
@@ -2127,10 +2116,10 @@ Public Class frmGesamtsicherheitenNEU
                     .gs_gsNr = gessicherheitID
                     .gs_ATBNr = "Korrekt. Rundungsdiff. " & gessicherheitID
                     .gs_MRNNr = ""
-                    .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
+                    .gs_posNr = OPEN.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
 
                     If .gs_MRNNr <> "" Then
-                        .gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
+                        .gs_posSubNr = OPEN.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
                     Else
                         .gs_posSubNr = Nothing
                     End If
@@ -2166,7 +2155,7 @@ Public Class frmGesamtsicherheitenNEU
                     .gsp_datum = DateTime.Now
                     .gsp_erstellungsdatum = DateTime.Now
                     .gsp_ust = currentSicherheit.gs_ust
-                    .gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID
+                    .gsp_MRNNr = "Korrekt. Rundungsdiff. " & gessicherheitID
                     .gsp_isPosRundungsdiff = True
                     .gsp_avisoId = Me.avisoID
                     .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
@@ -2297,7 +2286,7 @@ Public Class frmGesamtsicherheitenNEU
 
                     If currentSicherheit.hasEntry Then
                         currentSicherheit.Delete()
-                        rearangePosNr(gsNr, ATBNr, posNr)
+                        currentSicherheit.rearangePosNr(gsNr, ATBNr, posNr)
                         ' If subPosNr IsNot Nothing Then rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
                     End If
 
@@ -2316,4 +2305,73 @@ Public Class frmGesamtsicherheitenNEU
 
 
     End Sub
+
+    Private Sub btnDAKOSY_AUTO_Click(sender As Object, e As EventArgs) Handles btnDAKOSY_AUTO.Click
+        If Me.gessicherheitID > 0 Then
+            Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_dakoyimport] = 1 WHERE [gs_gsNr] = " & Me.gessicherheitID
+            If SQL.doSQL(sqlstring, "AVISO") Then btnDAKOSY_AUTO.Enabled = False
+        End If
+
+    End Sub
+
+    Private Sub cbxHeader_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHeader.CheckedChanged
+
+        LoadDGVSicherheiten(True)
+
+    End Sub
+
+    Private Sub setcboWarenort(setDefaultValue As Boolean)
+
+        Dim whereWarenort As String = " WHERE [wo_aktiv] = 1  AND wo_ze = 1"
+
+
+        If Standort = "Atilla GmbH" Then
+
+            '----'nicht unisped und cs und ambar aber alle anderen - laut j.Siener am 23.03.2026
+
+            whereWarenort &= " AND [wo_firma] not in (24, 21,22,23, 11)"
+
+        Else
+            If warenortPrefix <> "" Then
+                whereWarenort &= " AND LEFT([wo_warenort],2) = " & warenortPrefix & ""
+            Else
+                whereWarenort &= " AND [wo_firma] = " & firmaId
+            End If
+
+        End If
+
+        cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] " & whereWarenort, True, "AVISO", True)
+
+
+        If setDefaultValue AndAlso cboWarenort.Items.Count > 0 Then
+
+            If Standort = "AMBAR GmbH" Then
+                For i As Integer = 0 To cboFiliale.Items.Count - 1
+                    If cboFiliale.Items(i).ToString().Contains("5701") Then
+                        cboFiliale.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+                For i As Integer = 0 To cboWarenort.Items.Count - 1
+                    If cboWarenort.Items(i).ToString().Contains("AMBAR") Then
+                        cboWarenort.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+            ElseIf grenzstelle <> "" Then
+
+                For i As Integer = 0 To cboWarenort.Items.Count - 1
+                    If cboWarenort.Items(i).ToString().Contains(grenzstelle) Then
+                        cboWarenort.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+            End If
+
+        End If
+
+
+
+    End Sub
+
 End Class

Aviso/frmHauptfenster.Designer.vb

@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -81,6 +81,7 @@ Partial Class frmHauptfenster
         Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PrüfeBilderAufBase64ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -98,6 +99,7 @@ Partial Class frmHauptfenster
         Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DTBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.KLIPPHAUSENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EnglishToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -132,6 +134,7 @@ Partial Class frmHauptfenster
         Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DEAmbarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ATAtillaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ReferenzwerteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
         Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
@@ -306,6 +309,7 @@ Partial Class frmHauptfenster
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -418,10 +422,12 @@ Partial Class frmHauptfenster
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
+        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
-        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
+        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -655,7 +661,7 @@ Partial Class frmHauptfenster
         '
         'AdministrationToolStripMenuItem
         '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem, Me.PrüfeBilderAufBase64ToolStripMenuItem})
         Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
         Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
         Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -769,6 +775,12 @@ Partial Class frmHauptfenster
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
         '
+        'PrüfeBilderAufBase64ToolStripMenuItem
+        '
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Name = "PrüfeBilderAufBase64ToolStripMenuItem"
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
+        '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -825,7 +837,7 @@ Partial Class frmHauptfenster
         '
         'StandortWechselnToolStripMenuItem
         '
-        Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem})
+        Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem, Me.KLIPPHAUSENToolStripMenuItem})
         Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem"
         Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
         Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln"
@@ -834,46 +846,52 @@ Partial Class frmHauptfenster
         'SUBToolStripMenuItem
         '
         Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem"
-        Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.SUBToolStripMenuItem.Text = "SUB"
         '
         'SBGToolStripMenuItem
         '
         Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem"
-        Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.SBGToolStripMenuItem.Text = "SBG"
         '
         'WAIToolStripMenuItem
         '
         Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem"
-        Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.WAIToolStripMenuItem.Text = "WAI"
         '
         'NKDToolStripMenuItem
         '
         Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem"
-        Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.NKDToolStripMenuItem.Text = "NKD"
         '
         'NEUToolStripMenuItem
         '
         Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem"
-        Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.NEUToolStripMenuItem.Text = "NEU"
         '
         'AMBToolStripMenuItem
         '
         Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem"
-        Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.AMBToolStripMenuItem.Text = "AMB"
         Me.AMBToolStripMenuItem.Visible = False
         '
         'DTBToolStripMenuItem
         '
         Me.DTBToolStripMenuItem.Name = "DTBToolStripMenuItem"
-        Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(100, 22)
+        Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.DTBToolStripMenuItem.Text = "DTB"
         '
+        'KLIPPHAUSENToolStripMenuItem
+        '
+        Me.KLIPPHAUSENToolStripMenuItem.Name = "KLIPPHAUSENToolStripMenuItem"
+        Me.KLIPPHAUSENToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
+        Me.KLIPPHAUSENToolStripMenuItem.Text = "KLIPPHAUSEN"
+        '
         'SpracheWechselnToolStripMenuItem
         '
         Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.EnglishToolStripMenuItem, Me.TürkischToolStripMenuItem})
@@ -1042,7 +1060,7 @@ Partial Class frmHauptfenster
         '
         'GesamtsicherheitenToolStripMenuItem
         '
-        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem})
+        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem, Me.ReferenzwerteToolStripMenuItem})
         Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
         Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
@@ -1091,6 +1109,12 @@ Partial Class frmHauptfenster
         Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
         Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
         '
+        'ReferenzwerteToolStripMenuItem
+        '
+        Me.ReferenzwerteToolStripMenuItem.Name = "ReferenzwerteToolStripMenuItem"
+        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.ReferenzwerteToolStripMenuItem.Text = "Referenzwerte"
+        '
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
@@ -1279,7 +1303,7 @@ Partial Class frmHauptfenster
         'ToolStripFormulare
         '
         Me.ToolStripFormulare.BackColor = System.Drawing.Color.White
-        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
+        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripMenuItem3, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem})
         Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black
         Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight
@@ -1293,20 +1317,20 @@ Partial Class frmHauptfenster
         Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note
         Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem"
-        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MANAGERToolStripMenuItem.Text = "Formular - Manager"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6)
         '
         'MailvorlagenToolStripMenuItem
         '
         Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
         Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift
         Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem"
-        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen"
         Me.MailvorlagenToolStripMenuItem.Visible = False
         '
@@ -1314,7 +1338,7 @@ Partial Class frmHauptfenster
         '
         Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem})
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem2.Text = "Vollmachten"
         '
         'toolStrVM_de
@@ -1350,38 +1374,38 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem7.Text = "Gestellungsgarantien"
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem12.Text = "Importaviso"
         '
         'ToolStripMenuItem15
         '
         Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
-        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem15.Text = "Dispoliste"
         '
         'ToolStripMenuItem18
         '
         Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem18.Text = "Verzollungspreise"
         '
         'AuftragÜberwachungsdokumentToolStripMenuItem
         '
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem"
-        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument"
         '
         'toolVUB
         '
         Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem})
         Me.toolVUB.Name = "toolVUB"
-        Me.toolVUB.Size = New System.Drawing.Size(277, 22)
+        Me.toolVUB.Size = New System.Drawing.Size(285, 30)
         Me.toolVUB.Text = "VUB"
         '
         'VUBVERAGSpeditionAGToolStripMenuItem
@@ -1399,37 +1423,37 @@ Partial Class frmHauptfenster
         'toolVPCreditreform
         '
         Me.toolVPCreditreform.Name = "toolVPCreditreform"
-        Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22)
+        Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30)
         Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)"
         Me.toolVPCreditreform.Visible = False
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6)
         '
         'VerzollungsunterlagenToolStripMenuItem
         '
         Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem"
-        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen"
         '
         'ToolStripMenuItem11
         '
         Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22)
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30)
         Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6)
         '
         'WAIDHAUSToolStripMenuItem
         '
         Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem})
         Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem"
-        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS"
         '
         'ToolStripMenuItem8
@@ -1465,36 +1489,36 @@ Partial Class frmHauptfenster
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6)
         '
         'EinheitspapierToolStripMenuItem
         '
         Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem"
-        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)"
         '
         'CMRToolStripMenuItem
         '
         Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem"
-        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CMRToolStripMenuItem.Text = "CMR"
         '
         'Einheitspapier0735VersandverfahrenToolStripMenuItem
         '
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem"
-        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)"
         '
         'CarnetTIRToolStripMenuItem
         '
         Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem"
-        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR"
         '
         'CarnetTIRALTToolStripMenuItem
         '
         Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem"
-        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22)
+        Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30)
         Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)"
         '
         'mnuFragezeichen
@@ -2658,6 +2682,15 @@ Partial Class frmHauptfenster
         Me.SplitContainer3.SplitterDistance = 99
         Me.SplitContainer3.TabIndex = 3
         '
+        'UsrCntlBenachrichtigungen1
+        '
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
         'pnl
         '
         Me.pnl.Controls.Add(Me.Button10)
@@ -2690,38 +2723,38 @@ Partial Class frmHauptfenster
         Me.gridMyAviso.AllowUserToDeleteRows = False
         Me.gridMyAviso.AllowUserToOrderColumns = True
         Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle28.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28
         Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle29
         Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle30
         Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
         Me.gridMyAviso.Name = "gridMyAviso"
         Me.gridMyAviso.ReadOnly = True
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle31
         Me.gridMyAviso.RowHeadersVisible = False
         Me.gridMyAviso.RowHeadersWidth = 62
         Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
@@ -3148,47 +3181,47 @@ Partial Class frmHauptfenster
         Me.gridAviso.AllowUserToAddRows = False
         Me.gridAviso.AllowUserToDeleteRows = False
         Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle32.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
         Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
         Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle33.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle33.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle33
         Me.gridAviso.ColumnHeadersHeight = 25
         Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle34
         Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridAviso.Location = New System.Drawing.Point(0, 248)
         Me.gridAviso.MultiSelect = False
         Me.gridAviso.Name = "gridAviso"
         Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle35
         Me.gridAviso.RowHeadersVisible = False
         Me.gridAviso.RowHeadersWidth = 62
         Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle36
         Me.gridAviso.RowTemplate.ReadOnly = True
         Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
         Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -4013,6 +4046,15 @@ Partial Class frmHauptfenster
         Me.pnlLeft.TabIndex = 88
         Me.pnlLeft.Visible = False
         '
+        'UsrCntlBenachrichtigungen2
+        '
+        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
         'Panel5
         '
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -4030,23 +4072,24 @@ Partial Class frmHauptfenster
         Me.Panel7.Size = New System.Drawing.Size(252, 51)
         Me.Panel7.TabIndex = 4
         '
-        'UsrCntlBenachrichtigungen1
+        'ToolStripMenuItem3
         '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25})
+        Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30)
+        Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN"
         '
-        'UsrCntlBenachrichtigungen2
+        'ToolStripMenuItem23
         '
-        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
-        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
-        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
+        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR"
+        '
+        'ToolStripMenuItem25
+        '
+        Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25"
+        Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB"
         '
         'frmHauptfenster
         '
@@ -4510,4 +4553,10 @@ Partial Class frmHauptfenster
     Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ServicesToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents cbx_My_CBAM As CheckBox
+    Friend WithEvents PrüfeBilderAufBase64ToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ReferenzwerteToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents KLIPPHAUSENToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.resx

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

Aviso/frmHauptfensterNew.resx

@@ -123,67 +123,13 @@
   <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>249, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnFakturierung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAG9JREFUSEvt
-        lTEOgDAMA52PV3wM9WmgMGSIAkNpaolg6ZamzQ0eCgAQkWMF6rriB1nwhQA6gG2A7pdHREJ9PJLml0fY
-        7TrCbAoKX3T4FOvXTmjCbAoKl3fIEOpv0Saz3wqz4QsZHX5cmM0vnA5FeAJTug01ZzKXygAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="btnRg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAG9JREFUSEvt
-        lTEOgDAMA52PV3wM9WmgMGSIAkNpaolg6ZamzQ0eCgAQkWMF6rriB1nwhQA6gG2A7pdHREJ9PJLml0fY
-        7TrCbAoKX3T4FOvXTmjCbAoKl3fIEOpv0Saz3wqz4QsZHX5cmM0vnA5FeAJTug01ZzKXygAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="btnKunden.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAP1JREFUSEvt
-        k0sKwkAQRLsRL+BOj+XevQtdeAY9ozv1FgYEP0wYZXjpnoxJBBd5UGCqq6slEJGRkX9BVZ+WmBsMHvLE
-        vV6wvE3c7wyL28T9EmYsGUqhm8feLI3wjl6pRGRteCseNV+n55fI2+VdN0SvVN4u73qhLb1SiciGXvSb
-        h+kFVPXkzSzigTP9gNmjqg9zkLwN+iSXi7M7/RpVvRmvpv4MkucD90Rkj6NT9qjqFTvlGGX8k9/DEiqX
-        zc2oNJsNJ7FJ8tvjk2FPo5Nmoip2zI1Z0DGKfihexO6KsyTjw/C3Yl8R4VtkUQdd2NuKUdJJ7M3C5b5i
-        /8jIT3kBe5JJfQp6Jq0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnZollwebseiten.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAgBJREFUSEvt
-        1suLzXEYx/HXSVggt7LzH8jWzm0t8geQXFaU3DfEwshfoFzK2kLMTimFYkURcisjNhOxcmk06DN9z/Q7
-        3845M+PMRs1TT33P8/08n/c5M79znge+YBk24A2+4TMuYC2WYiFaekfuook2PemNR7xeY2O5S81vvCjC
-        NTiMUfzCeKvV+oMr5Q0tx7wGKOfU1uNy0Y6X3ngcKZ7xfjbBiqgIf2AYW3AGd/EBPxvgIazDopI5DzVA
-        0X7EveIRr5v4PslpH0pTGh7jBLbiJG6Vd9uGPsDBkg8bsGiiPYVtOI5H8exgNF80wGm+hr3Yjqt4iU/4
-        WmVquYsm2vSkd7T27QlsgEdwuhjtwHlcxKWSOaeWu2iifVf7TBvYgO7DEmzCTuwqmfNmLC6fbKTur3NK
-        4ISIc1iJs7iD+yVzzoO0Ind1X7ecKfA6xhr1MdyYA3Z41YVuOQecA3Z41YVu+X8DM/PqYp2zBSzz1f6s
-        FvVlJRwYiLc4EOD88kv/vBbNFrCsMJk4C9q7ScbLbjypxYMC8RR7CqMjsgxlkN7OFB8UWDaBeGVmxrtr
-        ZJXLBpYZ9+pfgektHvGKZ9/I33k1DrUfppkAy8ORVTMek/+zqSKL7SocLSvGtIB4j2Olt9/i3DOykWfd
-        y1dnKmA0WS/TM1Bkhc9XJ9ELmIgm2r7xF+xPKXpoDa+RAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>364, 17</value>
   </metadata>
-  <data name="btnZertifikate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAgBJREFUSEvt
-        1suLzXEYx/HXSVggt7LzH8jWzm0t8geQXFaU3DfEwshfoFzK2kLMTimFYkURcisjNhOxcmk06DN9z/Q7
-        3845M+PMRs1TT33P8/08n/c5M79znge+YBk24A2+4TMuYC2WYiFaekfuook2PemNR7xeY2O5S81vvCjC
-        NTiMUfzCeKvV+oMr5Q0tx7wGKOfU1uNy0Y6X3ngcKZ7xfjbBiqgIf2AYW3AGd/EBPxvgIazDopI5DzVA
-        0X7EveIRr5v4PslpH0pTGh7jBLbiJG6Vd9uGPsDBkg8bsGiiPYVtOI5H8exgNF80wGm+hr3Yjqt4iU/4
-        WmVquYsm2vSkd7T27QlsgEdwuhjtwHlcxKWSOaeWu2iifVf7TBvYgO7DEmzCTuwqmfNmLC6fbKTur3NK
-        4ISIc1iJs7iD+yVzzoO0Ind1X7ecKfA6xhr1MdyYA3Z41YVuOQecA3Z41YVu+X8DM/PqYp2zBSzz1f6s
-        FvVlJRwYiLc4EOD88kv/vBbNFrCsMJk4C9q7ScbLbjypxYMC8RR7CqMjsgxlkN7OFB8UWDaBeGVmxrtr
-        ZJXLBpYZ9+pfgektHvGKZ9/I33k1DrUfppkAy8ORVTMek/+zqSKL7SocLSvGtIB4j2Olt9/i3DOykWfd
-        y1dnKmA0WS/TM1Bkhc9XJ9ELmIgm2r7xF+xPKXpoDa+RAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1158, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Button8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -246,6 +192,9 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>560, 17</value>
+  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>659, 17</value>
   </metadata>

Aviso/frmHauptfensterNew.vb

@@ -20,8 +20,6 @@ Public Class frmHauptfensterNew
 
 
 
-    Public AVISO_TYP = "LKW"
-    Public aktiv = False
     Private AvisoDAL As New cAvisoDAL
     Private VermerkeDAL As New cVermerkeDAL
     Private Standorte As New cStandorteDAL
@@ -49,11 +47,13 @@ Public Class frmHauptfensterNew
     Public gridFont As New Font(Me.Font.FontFamily, 8)
     Dim cFormularManager As New VERAG_PROG_ALLGEMEIN.cFormularManager
     ' Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER
-    Dim sd = 0
-    Dim closeOK = False
-    Dim Fullscreen = False
-    Dim rowHeight = 20
+
     Dim chkFarben = True
+    Dim closeOK = False
+
+    Dim sd = 0
+
+    Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr
 
     Private VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -64,7 +64,8 @@ Public Class frmHauptfensterNew
 
 
 
-    Dim SEARCH_AVISO As New usrCntlHauptfenster_Suche_AVISO
+    Dim SEARCH_AVISO As usrCntlHauptfenster_Suche_AVISO = Nothing
+    Dim SEARCH_SND As usrCntlHauptfenster_Suche_SND = Nothing
     Dim SEARCH_AVISO_AKTIV As String = "AVISO"
 
     Public Sub New()
@@ -101,23 +102,124 @@ Public Class frmHauptfensterNew
     End Sub
     Sub SWITCH_SEARCH(switchTO)
         pnlMain.Controls.Clear()
+        pnlMain_Bottom.Controls.Clear()
         SEARCH_AVISO_AKTIV = switchTO
 
+
+        ' toggle_Buttons_Main(sender)
+        For Each button As Control In FlowLayoutPanel1.Controls
+            With button
+                If Not .Name.ToString.Contains("DEFAULT") Then
+                    .BackColor = btnDEFAULT_UnSelected.BackColor
+                    .ForeColor = btnDEFAULT_UnSelected.ForeColor
+                    .Font = btnDEFAULT_UnSelected.Font
+                End If
+            End With
+        Next
+
+        Dim SelectedBtn As Button = Nothing
+
+
+
         Select Case SEARCH_AVISO_AKTIV
+            Case "SND"
+                splitMainWorkingView.Panel2Collapsed = True
+                SelectedBtn = btnVIEW_SND
+                If SEARCH_SND Is Nothing Then SEARCH_SND = New usrCntlHauptfenster_Suche_SND
+                SEARCH_SND.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain.Controls.Add(SEARCH_SND)
+                SEARCH_SND.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_SND.PerformLayout()
+                Application.DoEvents()
             Case "AVISO"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_LKW)
+                If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
                 pnlMain.Controls.Add(SEARCH_AVISO)
                 SEARCH_AVISO.Dock = DockStyle.Fill
-                '  SEARCH_AVISO.init(Me)
-                initsearch("", False) ': Aviso_anzeigen("")
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+
+            Case "AVISO_SND_KOMBI"
+                splitMainWorkingView.Panel2Collapsed = False
+                SetBtnSelectedolor(btnVIEW_KOMBI)
+                If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain.Controls.Add(SEARCH_AVISO)
+                SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+                '--------------------------------------------------------------
+                If SEARCH_SND Is Nothing Then SEARCH_SND = New usrCntlHauptfenster_Suche_SND
+                SEARCH_SND.PARENT_FRMHAUPTFENSTER = Me
+                pnlMain_Bottom.Controls.Add(SEARCH_SND)
+                SEARCH_SND.Dock = DockStyle.Fill
+                pnlMain_Bottom.PerformLayout()
+                SEARCH_SND.PerformLayout()
+                Application.DoEvents()
+
+            Case "COMPLIANCE"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_Compliance)
+                'If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                'SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                'pnlMain.Controls.Add(SEARCH_AVISO)
+                'SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+
+            Case "CUSTOMS_CONTROLLING"
+                splitMainWorkingView.Panel2Collapsed = True
+                SetBtnSelectedolor(btnVIEW_CustControling)
+                'If SEARCH_AVISO Is Nothing Then SEARCH_AVISO = New usrCntlHauptfenster_Suche_AVISO
+                'SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
+                'pnlMain.Controls.Add(SEARCH_AVISO)
+                'SEARCH_AVISO.Dock = DockStyle.Fill
+                pnlMain.PerformLayout()
+                SEARCH_AVISO.PerformLayout()
+                Application.DoEvents()
+
         End Select
 
+        initsearch(SEARCH_AVISO_AKTIV, False) ': Aviso_anzeigen("")
+
+
+
     End Sub
 
+    Sub SetBtnSelectedolor(SelectedBtn)
+        With SelectedBtn
+            .BackColor = btnDEFAULT_Selected.BackColor
+            .ForeColor = btnDEFAULT_Selected.ForeColor
+            .Font = btnDEFAULT_Selected.Font
+        End With
+    End Sub
     Sub initsearch(hSort As String, Optional showDetails As Boolean = True)
+        If SEARCH_AVISO IsNot Nothing Then
+
+            Select Case SEARCH_AVISO_AKTIV
+                Case "AVISO" : SEARCH_AVISO.Aviso_anzeigen(hSort, showDetails) ': Aviso_anzeigen("") 
+            End Select
+        End If
+    End Sub
+
+    Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click
 
         Select Case SEARCH_AVISO_AKTIV
-            Case "AVISO" : SEARCH_AVISO.Aviso_anzeigen(hSort, showDetails) ': Aviso_anzeigen("") 
+            Case "SND"
+                If SEARCH_SND IsNot Nothing Then SEARCH_SND.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID, True)
+            Case "AVISO"
+                If SEARCH_AVISO IsNot Nothing Then SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+            Case "AVISO_SND_KOMBI"
+                If SEARCH_AVISO IsNot Nothing Then SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+                If SEARCH_SND IsNot Nothing Then SEARCH_SND.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID, True)
         End Select
+        UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
     End Sub
 
     Private Sub frmMain_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown
@@ -322,30 +424,6 @@ Public Class frmHauptfensterNew
                 ' lblErweitereSuche.Visible = False
                 MDMParkplatzkartenToolStripMenuItem.Visible = False
 
-                '  SplitContainer3.Panel1Collapsed = True
-                '  Button10.Visible = False
-
-                'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Weiterleiten", "AVISO") Then
-                '    Button10.Visible = True
-                '    SplitContainer3.Panel1Collapsed = True
-                'End If
-            Case Else
-
-                'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Weiterleiten", "AVISO") Then
-                '    SplitContainer3.Panel1Collapsed = True
-                'End If
-
-                'AVISO vom PC übernehmen
-                Dim zeilen As Integer = OptionenDAL.setAVISOFromPcName()
-                Select Case zeilen
-                    Case 0 : SEARCH_AVISO.lblAkte.Visible = False
-                    Case 1 : SEARCH_AVISO.lblAkte.Text = zeilen & " Akt vom Arbeitsplatz übernommen"
-                    Case Else : SEARCH_AVISO.lblAkte.Text = zeilen & " Akte vom Arbeitsplatz übernommen"
-                End Select
-
-                If Not (VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "SUB") Then
-                    SEARCH_AVISO.cboGrenzstelle._value = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
-                End If
         End Select
 
 
@@ -393,7 +471,6 @@ Public Class frmHauptfensterNew
         End If
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
             BREXITToolStripMenuItem.Visible = True
-            SEARCH_AVISO.cbx_My_Brexit.Checked = True
         End If
 
         'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
@@ -513,7 +590,7 @@ Public Class frmHauptfensterNew
         'Grid jetzt aktivieren und befüllen - Standardanzeige ident mit Button Wichtig
         Grid_aktiv = True
         SucheStandort = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim
-        If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper
+        ' If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper
         initsearch(" ORDER BY Ankunft")
 
         UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
@@ -1448,35 +1525,31 @@ ELSE_ATILLA:
         End If
     End Sub
 
-    Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click
-        SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
-        UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
-
-    End Sub
 
 
-    Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
-        Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cF = Color.Black Then cF = Color.Gray
-            DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception
 
-        End Try
-    End Sub
-    Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
-        Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cB = Color.Gray Then cB = Color.Black
-            DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception
+    'Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
+    '    Try
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        If cF = Color.Black Then cF = Color.Gray
+    '        DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).BackColor = cF
+    '    Catch ex As Exception
 
-        End Try
-    End Sub
+    '    End Try
+    'End Sub
+    'Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
+    '    Try
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        If cB = Color.Gray Then cB = Color.Black
+    '        DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).BackColor = cF
+    '    Catch ex As Exception
+
+    '    End Try
+    'End Sub
 
 
 
@@ -1740,7 +1813,7 @@ ELSE_ATILLA:
             'btnGenerelleGestellungen.Visible = False
             Button6.Visible = False
 
-            btnWichtigeStandort.Visible = False
+            'btnWichtigeStandort.Visible = False
             Panel2.Visible = False
 
         ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
@@ -1807,6 +1880,8 @@ ELSE_ATILLA:
             End If
         End If
 
+        'Evtl abhängign vom User machen:
+        SWITCH_SEARCH("AVISO")
 
     End Sub
 
@@ -1824,8 +1899,9 @@ ELSE_ATILLA:
     WithEvents timerStart As New Timer
 
     Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
-        Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
-
+        If SEARCH_AVISO IsNot Nothing Then
+            Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
+        End If
         Try
             VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath()
         Catch ex As Exception
@@ -2396,6 +2472,8 @@ ELSE_ATILLA:
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX"
                 pnlOptionen.Visible = Not pnlOptionen.Visible
+
+                pnlOptionen.Location = Cursor.Position
             Case Else
                 Dim s As New SDL.frmSecureLoginKassenbuch
                 s.openKB = True
@@ -3056,7 +3134,9 @@ ELSE_ATILLA:
                                 End If
                             End If
                         Next
-                        If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
+                        If cbxInfoChat.Checked Then '# 'Anzeicge Infobox Neuer Chat Ein/Aus
+                            If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
+                        End If
                     Else
                         Me.Icon = My.Resources.Aviso
                     End If
@@ -3798,7 +3878,7 @@ ELSE_ATILLA:
 
         Dim f As New frmSendungsdetailsNEU
 
-        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
+        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(-1, f.SENDUNG_LIST.Count + 1,  , Nothing, 0, 0) 'Neue Sendung erstellen
         NEW_SND.SAVE(False) 'Insert neue Sendung
         f.SENDUNG_LIST.Add(NEW_SND)
 
@@ -3820,11 +3900,74 @@ ELSE_ATILLA:
         detailForm.Show()
     End Sub
 
-    Private Sub btnWichtigeStandort_Click(sender As Object, e As EventArgs) Handles btnWichtigeStandort.Click
+    Private Sub btnWichtigeStandort_Click(sender As Object, e As EventArgs) Handles btnVIEW_LKW.Click
         Grid_aktiv = False
         SWITCH_SEARCH("AVISO")
 
         SEARCH_AVISO.RESET()
         Grid_aktiv = True
     End Sub
+
+    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles btnVIEW_SND.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("SND")
+
+        ' SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click
+
+
+        Me.Cursor = Cursors.WaitCursor
+        'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing
+        If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then
+            Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront()
+            Me.Cursor = Cursors.Default : Exit Sub
+        End If
+        '  Next
+        Try
+            Dim zoll As New SDL.frmKundenUebersichtZOLL
+            zoll.Show()
+            Me.Cursor = Cursors.Default
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Private Sub Button7_Click_2(sender As Object, e As EventArgs) Handles btnVIEW_KOMBI.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("AVISO_SND_KOMBI")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles btnVIEW_Compliance.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("COMPLIANCE")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnVIEW_CustControling.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("CUSTOMS_CONTROLLING")
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
+
+    Private Sub Button4_Click_2(sender As Object, e As EventArgs) Handles Button4.Click
+
+    End Sub
+
+    Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
+
+
+    Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU")
+        DS.OPEN_SINGLE_ORIG()
+    End Sub
 End Class

Aviso/frmLaufzettel.vb

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

Aviso/frmLogin.vb

@@ -29,18 +29,18 @@ Public Class frmLogin
             End If
             e.Handled = True
         End If
-        If e.Modifiers = Keys.Control And e.KeyCode = Keys.G Then
-            VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED
-            VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER = "[SQLGUIDE01.verag.ost.dmn]"
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
-                Panel1.BackColor = Color.Red
-                Panel1.ForeColor = Color.White
-            Else
-                Panel1.BackColor = Color.White
-                Panel1.ForeColor = Color.FromArgb(0, 54, 128)
-            End If
-            e.Handled = True
-        End If
+        'If e.Modifiers = Keys.Control And e.KeyCode = Keys.G Then
+        '    VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED
+        '    VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER = "[SQLGUIDE01.verag.ost.dmn]"
+        '    If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+        '        Panel1.BackColor = Color.Red
+        '        Panel1.ForeColor = Color.White
+        '    Else
+        '        Panel1.BackColor = Color.White
+        '        Panel1.ForeColor = Color.FromArgb(0, 54, 128)
+        '    End If
+        '    e.Handled = True
+        'End If
         If e.Modifiers = Keys.Control And e.KeyCode = Keys.N Then
             VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN = Not VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN
             If VERAG_PROG_ALLGEMEIN.cAllgemein.NEWLOGIN Then

Aviso/frmNotify.Designer.vb

@@ -47,7 +47,7 @@ Partial Class frmNotify
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(300, 70)
+        Me.pnl.Size = New System.Drawing.Size(227, 70)
         Me.pnl.TabIndex = 1
         '
         'lblText
@@ -57,7 +57,7 @@ Partial Class frmNotify
         Me.lblText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblText.Location = New System.Drawing.Point(0, 25)
         Me.lblText.Name = "lblText"
-        Me.lblText.Size = New System.Drawing.Size(298, 43)
+        Me.lblText.Size = New System.Drawing.Size(225, 43)
         Me.lblText.TabIndex = 0
         Me.lblText.Text = "Der LKW SD 13 AS steht bereits seit über 2 Stunden! "
         Me.lblText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -65,12 +65,12 @@ Partial Class frmNotify
         'Header
         '
         Me.Header.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Header.Controls.Add(Me.lblTitle)
         Me.Header.Controls.Add(Me.btnClose)
+        Me.Header.Controls.Add(Me.lblTitle)
         Me.Header.Dock = System.Windows.Forms.DockStyle.Top
         Me.Header.Location = New System.Drawing.Point(0, 0)
         Me.Header.Name = "Header"
-        Me.Header.Size = New System.Drawing.Size(298, 25)
+        Me.Header.Size = New System.Drawing.Size(225, 25)
         Me.Header.TabIndex = 87
         '
         'lblTitle
@@ -79,7 +79,7 @@ Partial Class frmNotify
         Me.lblTitle.ForeColor = System.Drawing.Color.White
         Me.lblTitle.Location = New System.Drawing.Point(3, 0)
         Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(241, 24)
+        Me.lblTitle.Size = New System.Drawing.Size(194, 24)
         Me.lblTitle.TabIndex = 88
         Me.lblTitle.Text = "LKW Standzeit Benachrichtigung"
         Me.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -93,7 +93,7 @@ Partial Class frmNotify
         Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnClose.ForeColor = System.Drawing.Color.White
-        Me.btnClose.Location = New System.Drawing.Point(264, -1)
+        Me.btnClose.Location = New System.Drawing.Point(191, -1)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.btnClose.Size = New System.Drawing.Size(35, 25)
@@ -106,7 +106,7 @@ Partial Class frmNotify
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(300, 70)
+        Me.ClientSize = New System.Drawing.Size(227, 70)
         Me.Controls.Add(Me.pnl)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.MaximumSize = New System.Drawing.Size(300, 300)

Aviso/frmReferenzenSicherheiten.Designer.vb

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

Aviso/frmReferenzenSicherheiten.vb

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

Aviso/frmSendungsDokumentanforderung.Designer.vb

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

Aviso/frmSendungsDokumentanforderung.resx

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

Aviso/frmSendungsdetailsNEU.resx

@@ -1386,25 +1386,6 @@
         nRA+F3D8f7cAkA4zZGm9AAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="btnOptionen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnImportAssi.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
   <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
@@ -1683,14 +1664,6 @@
         E90MFIBuGJJmH2QDYy/ETpW0lEQJDpxAVE9UM/5S/BV0Q5GxRqRGDro+gsAwz7AV3SAQtqi1mMzIwoiu
         nDhg32vfHn8p/ivMsLiLcWdMK0w10dWRDGLOxPyIuxj30Xm6cya6HNkgeEfwA3SxgQUqKipM1dXVytOm
         TTNGxhMmTFCztLTEn/6gAACeTwgqe9wYrQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnSpedBuch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        BXidk8YAAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -1923,9 +1896,6 @@
   <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 17</value>
   </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
   <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>596, 17</value>
   </metadata>

Aviso/frmSendungsdetailsNEU.vb

@@ -17,6 +17,7 @@ Public Class frmSendungsdetailsNEU
     Public AvisoId As Integer
     Public SendungID As Integer = -1
     Dim FUNC As New SDL.cProgramFunctions
+
     Dim AVISOFUNC As New AvisoStatusFunctions
     Dim ADMIN As New cADMIN
     Dim AvisoDAL As New cAvisoDAL
@@ -601,8 +602,24 @@ Public Class frmSendungsdetailsNEU
                 Button19.Visible = True
             End If
 
+
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_Statusoptions") Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then
+                lblStatusOptionen.Visible = True
+                pnlStatus.Visible = True
+                flpnlStatus.Visible = True
+            Else
+                lblStatusOptionen.Visible = False
+                pnlStatus.Visible = False
+                flpnlStatus.Visible = False
+            End If
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_Zuteilung") Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then
+                pnlSND_Zuteilung.Visible = True
+            Else
+                pnlSND_Zuteilung.Visible = False
+            End If
+
             ContextMenuStrip3.Items.Clear()
-            Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [AVISO].[dbo].[tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO")
+            Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO")
             If dt IsNot Nothing Then
                 dt.Rows.Add({"???", "??? - andere"})
                 For Each r As DataRow In dt.Rows
@@ -1082,12 +1099,21 @@ Public Class frmSendungsdetailsNEU
                         b.lblAbfBez.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                         b.lblAuftr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                         b.lblNr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
+                        b.lblColliWeight.BackColor = IIf(b.value = pos, Color.FromArgb(0, 34, 98), Color.DarkGray)
+                        b.lblColliWeight.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
 
                         '    Dim r As DataRow = AVISO_newDataSet.tblSendungen.Rows(b.value)
                         '   MsgBox(da("tblSnd_PosUnterNr") & ".  ")
                         b.lblNr.Text = SENDUNG_LIST(b.value).tblSnd_PosUnterNr & ".  "
                         b.lblAbfBez.Text = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & SENDUNG_LIST(b.value).tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
                         b.lblAuftr.Text = loadValue(SENDUNG_LIST(b.value).tblSnd_Empfaenger, "")
+                        b.lblColliWeight.Text = ""
+
+                        If SENDUNG_LIST(b.value).tblSnd_Colli IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Colli) Then b.lblColliWeight.Text = CDbl(SENDUNG_LIST(b.value).tblSnd_Colli).ToString("N0") & " Pk"
+                        If SENDUNG_LIST(b.value).tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Gewicht) Then
+                            b.lblColliWeight.Text &= If(b.lblColliWeight.Text <> "", "/", "") & CDbl(SENDUNG_LIST(b.value).tblSnd_Gewicht).ToString("N0") & " kg"
+                        End If
+
 
                         'End If
                     End If
@@ -1202,11 +1228,57 @@ Public Class frmSendungsdetailsNEU
         '  Me.ResumeLayout(False)
 
         changeSelectedButton()
+
+
+        ' Layout beenden, Größe an Inhalte anpassen und Parent-Panels synchronisieren
+        'AdjustFlowPanelHeight()
+
+        ' MsgBox(FlowLayoutPanel.DisplayRectangle.Height)
         FlowLayoutPanel.ResumeLayout(True)
         '   Panel3.Height = FlowLayoutPanel.Height
 
     End Sub
 
+    ' Passt FlowLayoutPanel sowie Panel2 / Panel1 an die beinhalteten Controls an.
+    Private Sub AdjustFlowPanelHeight()
+        Try
+            ' Sicherer Layout-Block
+            FlowLayoutPanel.SuspendLayout()
+
+            FlowLayoutPanel.MaximumSize = New Size(500, 55)
+            ' Ermittle benötigte Höhe (PreferredSize berücksichtigt WrapContents)
+            FlowLayoutPanel.AutoSize = True
+            FlowLayoutPanel.WrapContents = True
+            FlowLayoutPanel.PerformLayout()
+            Application.DoEvents()
+            Dim neededHeight As Integer = FlowLayoutPanel.PreferredSize.Height
+            MsgBox(FlowLayoutPanel.Controls.Count & " _ " & FlowLayoutPanel.PreferredSize.Height)
+            ' Behalte minimale Höhe (1) um Nullhöhe zu vermeiden
+            If neededHeight < 1 Then neededHeight = 1
+
+            ' Deaktiviere AutoSize wieder und setze die ermittelte Höhe
+            FlowLayoutPanel.AutoSize = False
+            FlowLayoutPanel.Height = neededHeight
+
+            ' Panel2 und Panel1 oberhalb anpassen, falls vorhanden
+            If Panel2 IsNot Nothing Then
+                Panel2.Height = neededHeight
+                Panel2.MinimumSize = New Size(0, neededHeight)
+            End If
+            If Panel1 IsNot Nothing Then
+                Panel1.Height = neededHeight
+                Panel1.MinimumSize = New Size(0, neededHeight)
+            End If
+
+            ' Falls Form-Layout betroffen ist, erzwinge Neuberechnung
+            Me.PerformLayout()
+            Application.DoEvents()
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        Finally
+            FlowLayoutPanel.ResumeLayout()
+        End Try
+    End Sub
 
     Public Sub ADD_SND(Optional initAfter = True)
         If AVISO.Abgeschlossen Then Exit Sub
@@ -1244,13 +1316,13 @@ Public Class frmSendungsdetailsNEU
         ' Dim abfnr_tmp As Integer = IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0)
 
         Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
-            '  SENDUNG_LIST.Add(NEW_SND)
+        '  SENDUNG_LIST.Add(NEW_SND)
 
-            NEW_SND.SAVE(False) 'Insert neue Sendung
-            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
-            ' initDataBinding()
-            If initAfter Then LAST_SENDUNG(False) 'letzte Sendung
-            initButtons()
+        NEW_SND.SAVE(False) 'Insert neue Sendung
+        VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId, False) 'Alle Sendungen neu laden
+        ' initDataBinding()
+        If initAfter Then LAST_SENDUNG(False) 'letzte Sendung
+        initButtons()
         'End If
 
     End Sub
@@ -1393,11 +1465,11 @@ Public Class frmSendungsdetailsNEU
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
                 Case "FRONTOFFICE"
-                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,7001) "
+                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,5802,7001) "
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
-                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
+                        whereFiliale = " AND FilialenNr IN (4801,4802,4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5802,5701,7001) "
                     End If
 
                 Case Else
@@ -1469,7 +1541,7 @@ Public Class frmSendungsdetailsNEU
             txtColli.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, "").ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen
             txtGewicht.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "").ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen
             rtbWarenbezeichnung.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, "")
-            cbxSpedBuch.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen, False)
+            'cbxSpedBuch.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen, False)
 
             '  cntlBar.Checked = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_bar, False)
             '  txtBarBelegNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_barBeleg, "")
@@ -1554,6 +1626,7 @@ Public Class frmSendungsdetailsNEU
 
             setVorpapiere()
 
+
             doVeranlagungsValidation()
 
             initFraechterAvisererFromAkt()
@@ -1604,6 +1677,9 @@ Public Class frmSendungsdetailsNEU
             '                                      End Sub
 
             '   txtT1Verzollungsadresse.Text = ""
+
+            btnWWberechnen.Visible = False
+
             Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID
                 Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                     If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
@@ -1654,6 +1730,7 @@ Public Class frmSendungsdetailsNEU
                 Case 44
                     usrcntl_ATB.txtATBT1.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1, "")
                     usrcntl_ATB.txtATBNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr, "")
+                    usrcntl_ATB.txtT1Datum._value = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist, "")
 
                     If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
                         usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Indeterminate
@@ -1709,6 +1786,10 @@ Public Class frmSendungsdetailsNEU
             initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
             checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)
 
+            lblSendungsId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID
+
+            initSendungs_Status()
+            initZuteilung()
 
             SENDUNG_LIST(CURRENT_INDEX).LOAD_VORKOSTEN()
             If tbcntr.SelectedTab Is tbBAR Then
@@ -1771,11 +1852,32 @@ Public Class frmSendungsdetailsNEU
                     If cntlAuftr_Abf IsNot Nothing Then cntlAuftr_Abf.lbl.Text = "X"
                 End If
             End If
+            'panel2.Controls. Remove(   Panel1 )
             '-------------------------
+            'FlowLayoutPanel.AutoSize = True
+            'FlowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'FlowLayoutPanel.WrapContents = True   ' oder False je nach Layout
 
-            Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
-
+            'Panel2.AutoSize = True
+            'Panel2.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'Panel1.AutoSize = True
+            'Panel1.AutoSizeMode = AutoSizeMode.GrowAndShrink
+            'FlowLayoutPanel.Dock = DockStyle.Fill
+            'Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'Panel1.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'FlowLayoutPanel.WrapContents = True
+            'FlowLayoutPanel.AutoScroll = False
+            'FlowLayoutPanel.Dock = DockStyle.Top
+            'FlowLayoutPanel.AutoSize = True
+            'FlowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink
 
+            'FlowLayoutPanel.AutoSize = True
+            'MsgBox(FlowLayoutPanel.PreferredSize.Height)
+            'FlowLayoutPanel.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel2.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel1.Height = FlowLayoutPanel.PreferredSize.Height
+            'Panel2.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
+            'Panel1.MinimumSize = New Size(0, FlowLayoutPanel.Height) '+ pnlheader.Height) ' damit das S***** Flowlayoutpanel nicht abgeschnitten wird...
 
             'SAVE_ME ??????!!!!!!!
         Catch ex As Exception
@@ -1811,6 +1913,125 @@ Public Class frmSendungsdetailsNEU
         End If
     End Sub
 
+    Sub initSendungs_Status()
+
+
+
+        btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Inaktiv
+        btnStatusVorbereitetQS.BackgroundImage = My.Resources.statusBtn_vorbereitet_InAktiv
+        btnStatusVorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_InAktiv
+        btnStatusAbfertigungTR.BackgroundImage = My.Resources.abfetigungTR_inaktiv
+        btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchInaktiv
+        btnSendungFakturiert.BackgroundImage = My.Resources.fakturiertInaktiv
+        btnStatusAbgeschlossen.BackgroundImage = My.Resources.ok '-> Logik einbauen
+        setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abklärung TR' eintragen")
+        setTooltioBtn(btnStatusVorbereitetQS, "Status 'Vorbereitet-QS' eintragen")
+        setTooltioBtn(btnStatusVorgeschrieben, "Status 'Vorgeschrieben' eintragen")
+        setTooltioBtn(btnStatusAbfertigungTR, "Status 'Abfertigung TR' eintragen")
+        setTooltioBtn(btnSpeditionsbuchEintragen, "Status 'Speditionsbuch Eintragen' eintragen")
+        setTooltioBtn(btnSendungFakturiert, "Status 'Fakturiert' eintragen")
+        setTooltioBtn(btnStatusAbgeschlossen, "Status 'Abgeschlossen' eintragen")
+
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusAbklaerungTR", "AVISO") Then
+            btnStatusAbklaerungTR.Visible = True
+        End If
+        btnStatusVorbereitetQS.Visible = True
+        btnStatusVorgeschrieben.Visible = True
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusAbfertigungTR", "AVISO") Then
+            btnStatusAbfertigungTR.Visible = True
+        End If
+
+        btnSpeditionsbuchEintragen.Visible = True
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusFakturiert", "AVISO") Then
+            btnSendungFakturiert.Visible = True
+        End If
+
+        btnStatusAbgeschlossen.Visible = False
+
+        '---------
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR IsNot Nothing Then
+            btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abklärung TR' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbklaerungTR).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorbereitet IsNot Nothing Then
+            btnStatusVorbereitetQS.BackgroundImage = My.Resources.statusBtn_vorbereitet_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusVorbereitetQS, "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorbereitet).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorgeschrieben IsNot Nothing Then
+            btnStatusVorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_Aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_VG_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusVorgeschrieben, "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorgeschrieben).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR IsNot Nothing Then
+            btnStatusAbfertigungTR.BackgroundImage = My.Resources.abfetigungTR_aktiv
+            Dim username = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR_MA, -1) & "'", "ADMIN", "-")
+            setTooltioBtn(btnStatusAbfertigungTR, "Status 'Abklärung TR' entfernen" & vbNewLine & "(" & CDate(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbfertigungTR).ToString("dd.MM.yyyy HH:mm") & "," & username & ")")
+        End If
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
+            btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
+            setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")
+        End If
+
+
+
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fakturiert Then
+            btnSendungFakturiert.BackgroundImage = My.Resources.fakturiertAktiv
+            setTooltioBtn(btnSendungFakturiert, "Status 'Fakturiert' entfernen")
+        End If
+
+
+        'If SENDUNG_LIST(CURRENT_INDEX).abgeschlossen Then
+        '    btnStatusAbgeschlossen.BackgroundImage = My.Resources.ok '-> Logik einbauen
+        '    setTooltioBtn(btnStatusAbklaerungTR, "Status 'Abgeschlossen' aufheben")
+        'End If
+
+
+        lblStatus.Text = VERAG_PROG_ALLGEMEIN.cGlobal.getSNDStatusText(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Status)
+
+
+
+        Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Status
+            'Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ankunft
+            '    pnlStatus.BackColor = usrcntlAktDetails.btnAnkunft.BackColor
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Erfasst : pnlStatus.BackColor = Color.Red
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_InBearbeitung : pnlStatus.BackColor = Color.Orange
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Eingereicht : pnlStatus.BackColor = Color.LightSeaGreen
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ueberlassen : pnlStatus.BackColor = Color.Green
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_NichtEingetroffen : pnlStatus.BackColor = Color.FromArgb(64, 64, 64)
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ankunft : pnlStatus.BackColor = Color.Blue
+
+            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen
+                lblStatus.Text = "NICHT EINGETR." : pnlStatus.BackColor = Color.Gray 'btnNichtEingetroffen.BackColor
+
+        End Select
+
+
+        Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "' AND AbfertigungsNr='" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
+        'cbxSpedBuch.Checked = (vorhanden > 0)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
+
+
+    End Sub
+
+    Sub setTooltioBtn(btn As Button, tooltiptext As String)
+        Dim tt As New ToolTip() : tt.SetToolTip(btn, tooltiptext)
+    End Sub
+
     Sub setVorpapiere()
 
         cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
@@ -1873,17 +2094,37 @@ Public Class frmSendungsdetailsNEU
             Dim gesGewicht As Double = 0
 
             For Each s In SENDUNG_LIST
-                If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
-                If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
+                If s.tblSnd_Abfertigungsart_ID <> 45 Then
+                    If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
+                    If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
+                End If
             Next
 
-            lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
-            lblgesGewicht.Text = If(gesGewicht = 0, "-", gesGewicht.ToString("N1")) & " kg"
+            'lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
+            'lblgesGewicht.Text = If(gesGewicht = 0, "-", gesGewicht.ToString("N1")) & " kg"
+
+            lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk" & If(gesGewicht = 0, "-", ", " & gesGewicht.ToString("N1")) & " kg"
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
     End Sub
+
+    Sub initZuteilung()
+        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisoID >= 0 Then
+            lblSND_Zuteilg.Text = "LKW zugeteilt:"
+            lblSND_ZuteilgAvisoId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisoID.ToString
+            picSND_Zuteilg.BackgroundImage = My.Resources.SND_verbinden
+            btnSND_Zuteilg.Text = "Von LKW lösen"
+        Else
+            lblSND_Zuteilg.Text = "Sendung gelöst"
+            lblSND_ZuteilgAvisoId.Text = "-"
+            picSND_Zuteilg.BackgroundImage = My.Resources.SND_loesen
+            btnSND_Zuteilg.Text = "LKW zuordnen"
+        End If
+
+
+    End Sub
     Sub binddata(o As Object, bindingParam As String, bindingSource As BindingSource, dataName As String, Optional bindingNullValue As Object = Nothing, Optional formatString As String = "")
         o.DataBindings.Clear()
         '    If bindingNullValue = Nothing Then bindingNullValue = DBNull.Value
@@ -1996,7 +2237,7 @@ Public Class frmSendungsdetailsNEU
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli = txtColli.Text
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht = txtGewicht.Text
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung = rtbWarenbezeichnung.Text
-        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = cbxSpedBuch.Checked
+        '     SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = cbxSpedBuch.Checked
 
         '  SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = cboAufschub._value
         '  MsgBox(CURRENT_INDEX & " _ " & txtColli.Text)
@@ -2099,6 +2340,7 @@ Public Class frmSendungsdetailsNEU
                 If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_ATBGestellung) Then
                     SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1 = usrcntl_ATB.txtATBT1.Text
                     SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr = usrcntl_ATB.txtATBNr.Text
+                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist = usrcntl_ATB.txtT1Datum._value
 
                     Select Case usrcntl_ATB.cbxATBFakturieren.CheckState
                         Case CheckState.Indeterminate : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = Nothing
@@ -2355,7 +2597,7 @@ Public Class frmSendungsdetailsNEU
         Return b
     End Function
 
-    Private Sub btn_Click_1(sender As Object, e As EventArgs) Handles btnSpedBuch.Click
+    Private Sub btn_Click_1(sender As Object, e As EventArgs)
 
         'loadDataInLIST()
         If Not SAVE_ME() Then
@@ -2376,8 +2618,8 @@ Public Class frmSendungsdetailsNEU
             txtUnterNr.Text = posnr.UnterNr
             'cbxSpedBuch.Checked = (posnr.Filiale > 0 And posnr.Abfertigungsnummer > 0 And posnr.UnterNr >= 0) ' Wenn Sped Eintrag gelöscht-> - 1, dann ist der Eintrag nicht mehr vorhanden
             Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & cboFiliale._value & "' AND AbfertigungsNr='" & txtAbfertigungsnummer.Text & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
-            cbxSpedBuch.Checked = (vorhanden > 0)
-
+            'cbxSpedBuch.Checked = (vorhanden > 0)
+            SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
 
         End If
 
@@ -2605,6 +2847,12 @@ Public Class frmSendungsdetailsNEU
             Case "44"
                 pnlT1.Controls.Add(usrcntl_ATB)
 
+                cboVorpapier._value = ""
+                cboVorpapier2._value = ""
+                cboVorpapier3._value = ""
+                txtVorpapierPos.Text = ""
+                txtVorpapier2Pos.Text = ""
+                txtVorpapier3Pos.Text = ""
                 cboVorpapier.Enabled = False
                 cboVorpapier2.Enabled = False
                 cboVorpapier3.Enabled = False
@@ -2639,36 +2887,36 @@ Public Class frmSendungsdetailsNEU
     End Function
 
 
-    Sub initOfferteDGV()
-        Try
-            SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
-            Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
-            With MyDatagridview1
-                .Columns.Clear()
-                Dim tmpKdnr = -1
-                For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
-                    If a.sndabr_abrArt = "ABFKOST" Then
-                        Select Case a.sndabr_beteiligter
-                            Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
-                            Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
-                            Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
-                            Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
-                            Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
-                        End Select
-                    End If
-                Next
-                If cboAbfertigungsart._value <> "" Then
-                    If tmpKdnr > 0 Then
-                        .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
-                    End If
-                End If
-            End With
+    'Sub initOfferteDGV()
+    '    Try
+    '        SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
+    '        Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
+    '        With MyDatagridview1
+    '            .Columns.Clear()
+    '            Dim tmpKdnr = -1
+    '            For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
+    '                If a.sndabr_abrArt = "ABFKOST" Then
+    '                    Select Case a.sndabr_beteiligter
+    '                        Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
+    '                        Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
+    '                        Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
+    '                        Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
+    '                        Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
+    '                    End Select
+    '                End If
+    '            Next
+    '            If cboAbfertigungsart._value <> "" Then
+    '                If tmpKdnr > 0 Then
+    '                    .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
+    '                End If
+    '            End If
+    '        End With
 
-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
+    '    Catch ex As Exception
+    '        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+    '    End Try
 
-    End Sub
+    'End Sub
 
 
     Sub initDGVBelege()
@@ -2772,7 +3020,7 @@ Public Class frmSendungsdetailsNEU
 
     End Sub
 
-    Private Sub cbxSpedBuch_CheckedChanged(sender As Object, e As EventArgs) Handles cbxSpedBuch.CheckedChanged
+    Private Sub cbxSpedBuch_CheckedChanged(sender As Object, e As EventArgs)
         cboFiliale.Enabled = Not sender.checked
         txtAbfertigungsnummer.Enabled = Not sender.checked
         txtUnterNr.Enabled = Not sender.checked
@@ -3243,7 +3491,7 @@ Public Class frmSendungsdetailsNEU
         Dim AbfertigungsNr = txtAbfertigungsnummer.Text
         If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then Return False
         If Filiale Is Nothing Or AbfertigungsNr Is Nothing Then Return False
-        If cbxSpedBuch.Checked Then Return False
+        'If cbxSpedBuch.Checked Then Return False
         If IsNumeric(Filiale) And IsNumeric(AbfertigungsNr) Then
             If SDL.cRKSV.SpedBuchExists(Filiale, AbfertigungsNr) Then
                 Return True
@@ -3336,7 +3584,7 @@ Public Class frmSendungsdetailsNEU
         ' TabControl1.Enabled = Not sperren
         Panel6.Enabled = Not sperren
         Panel16.Enabled = Not sperren
-        btnSpedBuch.Enabled = Not sperren
+        'btnSpedBuch.Enabled = Not sperren
         '  Panel5.Enabled = Not sperren
         '  cboAbfertigungsart.Enabled = Not sperren
         txtAnzahl.Enabled = Not sperren
@@ -4710,7 +4958,8 @@ Public Class frmSendungsdetailsNEU
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
-                    files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+
+                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
                 Next
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
@@ -5104,12 +5353,12 @@ Public Class frmSendungsdetailsNEU
             If ABR_ID >= 0 Then
                 Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG(ABR_ID)
                 ABR.sndabr_LeistungsNr = cboAbrLeistungen._value
-                abr.sndabr_abrArt = ""
+                ABR.sndabr_abrArt = ""
                 ABR.sndabr_bezeichnung = txtAbrLeistungsBez.Text.Trim
                 ABR.sndabr_beteiligter = cboAbrAn._value.Trim
-                abr.sndabr_preis = CDbl(txtAbrPreis._value)
-                abr.sndabr_einzelPreis = CDbl(txtAbrPreis._value)
-                abr.sndabr_anzahl = 1
+                ABR.sndabr_preis = CDbl(txtAbrPreis._value)
+                ABR.sndabr_einzelPreis = CDbl(txtAbrPreis._value)
+                ABR.sndabr_anzahl = 1
                 'SENDUNG_LIST(CURRENT_INDEX).SAVE()
                 btnAddAbr.BackgroundImage = My.Resources.plus
             Else
@@ -5129,7 +5378,7 @@ Public Class frmSendungsdetailsNEU
             txtVK_Leistung.Text = ""
             txtVK_Firma.Text = ""
             txtVK_Preis.Text = ""
-            initdgvAbrechnung()
+            initDGVAbrechnung()
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -5145,7 +5394,7 @@ Public Class frmSendungsdetailsNEU
                 Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Find(Function(x) x.sndabr_id = dgvAbrechnung.SelectedRows(0).Cells("clmnAbrID").Value)
                 SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Remove(ABR)
                 SENDUNG_LIST(CURRENT_INDEX).SAVE(False)
-                initdgvAbrechnung()
+                initDGVAbrechnung()
             End If
         End If
     End Sub
@@ -7255,7 +7504,7 @@ Public Class frmSendungsdetailsNEU
 
             If item IsNot Nothing Then
 
-                listOfTextconserven = New cTextkonserve_LIST("FRM_MNGR_MailText", item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                listOfTextconserven = New cTextkonserve_LIST(8, item.Name, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
 
                 If listOfTextconserven.LIST.Count = 0 Then
                     'ContextMenuStrip1.Show(Cursor.Position)
@@ -7702,7 +7951,7 @@ Public Class frmSendungsdetailsNEU
         Dim vorpT1 = usrcntl_ATB.txtATBT1.Text
         Try
 
-            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then
+            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then 'GESTELLUNG
                 txtWarenwertWaehrung.SET_VALUE("EUR")
                 SAVE_ME()
             End If
@@ -7714,24 +7963,26 @@ Public Class frmSendungsdetailsNEU
             End If
 
             If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
-                MsgBox("Warenwert darf nur in EUR angegeben werden")
+                MsgBox("Warenwert der Gestellung darf nur in EUR angegeben werden")
                 Exit Sub
             End If
 
-
-
             For Each s As cSendungen In SENDUNG_LIST
-                'nur Betrag EUR
-                If s.tblSnd_Vorpapier = vorpT1 Then
-                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
-                        If Not s.tblSnd_Abfertigungsart_ID = 44 Then calcWarenwerte += s.tblSnd_Warenwert
-                    Else
-                        MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
-                        Exit Sub
-                    End If
+                If s.tblSnd_Vorpapier = vorpT1 AndAlso Not s.tblSnd_Abfertigungsart_ID = 44 Then
 
+                    If s.tblSnd_WarenwertWaehrung = "EUR" Then
+                        calcWarenwerte += s.tblSnd_Warenwert
+                    ElseIf s.tblSnd_WarenwertWaehrung <> "" Then
+                        Dim kurs As New cFremdwaehrungskurse(s.tblSnd_WarenwertWaehrung)
+                        If kurs.hasEntry Then
+                            calcWarenwerte += Math.Round(kurs.EXCHANGE_CURTOEUR(s.tblSnd_Warenwert, s.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
+                        Else
+                            MsgBox("Es kann keine Umrechnungskurs zum heutigen Datum für " & s.tblSnd_WarenwertWaehrung & " ermittelt werden!")
+                        End If
+                    End If
                 End If
 
+
             Next
 
             If txtWarenwert.Text = "" OrElse txtWarenwert.Text = "0,00" Then
@@ -7742,7 +7993,7 @@ Public Class frmSendungsdetailsNEU
 
 
             If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert <> 0 AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
-                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
+                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechneter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
 
             Else
 
@@ -7897,4 +8148,86 @@ Public Class frmSendungsdetailsNEU
             initAnhang()
         End If
     End Sub
+
+    Private Sub btnSND_Zuteilg_Click(sender As Object, e As EventArgs) Handles btnSND_Zuteilg.Click
+        MsgBox("TODO")
+    End Sub
+
+    Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If Not cbxFremdspedition.Checked Then
+            If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then
+                initDataBinding()
+            End If
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click
+        Me.Cursor = Cursors.WaitCursor
+        SAVE_ME()
+        If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then
+            initDataBinding()
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub btnStatusAbgeschlossen_Click(sender As Object, e As EventArgs) Handles btnStatusAbgeschlossen.Click
+        '''
+    End Sub
+
+    Private Sub txtVorpapierPos_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtVorpapierPos.KeyPress, txtVorpapier2Pos.KeyPress, txtVorpapier3Pos.KeyPress
+        If Char.IsControl(e.KeyChar) Then
+            Return
+        End If
+
+        If Char.IsDigit(e.KeyChar) OrElse e.KeyChar = ","c OrElse e.KeyChar = "+"c OrElse e.KeyChar = " "c Then
+            Return
+        End If
+
+        e.Handled = True
+    End Sub
+
+    Private Sub txtVorpapierPos_KeyDown(sender As Object, e As KeyEventArgs) Handles txtVorpapierPos.KeyDown, txtVorpapier2Pos.KeyDown, txtVorpapier3Pos.KeyDown
+        If e.Control AndAlso e.KeyCode = Keys.V Then
+            e.SuppressKeyPress = True
+        End If
+    End Sub
 End Class

Aviso/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net48" />
   <package id="cef.redist.x64" version="75.1.14" targetFramework="net47" />
   <package id="cef.redist.x86" version="75.1.14" targetFramework="net47" />
   <package id="CefSharp.Common" version="75.1.143" targetFramework="net47" />
@@ -10,32 +11,48 @@
   <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
   <package id="EAGetMail" version="5.3.5" targetFramework="net47" requireReinstallation="true" />
   <package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
+  <package id="fiskaltrust.interface" version="1.3.45" targetFramework="net48" />
   <package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
   <package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
   <package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
   <package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
-  <package id="itext7" version="7.1.11" targetFramework="net47" />
+  <package id="itext" version="9.6.0" targetFramework="net48" />
+  <package id="itext.bouncy-castle-adapter" version="9.6.0" targetFramework="net48" />
+  <package id="itext.commons" version="9.6.0" targetFramework="net48" />
+  <package id="itext7" version="9.6.0" targetFramework="net48" />
   <package id="librdkafka.redist" version="2.11.1" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
   <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
   <package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="5.0.0" targetFramework="net48" />
+  <package id="System.Interactive.Async" version="4.0.0" targetFramework="net48" />
   <package id="System.IO" version="4.3.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
+  <package id="System.Linq.Async" version="4.0.0" targetFramework="net48" />
   <package id="System.Memory" version="4.6.3" targetFramework="net48" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net48" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net47" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Xml" version="6.0.2" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
   <package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net47" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net47" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
 </packages>