zauberst.

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -28,20 +28,26 @@ Partial Class frmATEZ_EZA
         Me.pnlHead = New System.Windows.Forms.Panel()
         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.lblAnh = New System.Windows.Forms.Label()
         Me.pnlHead.SuspendLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -55,7 +61,7 @@ Partial Class frmATEZ_EZA
         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(395, 348)
+        Me.btnSend.Location = New System.Drawing.Point(486, 348)
         Me.btnSend.Margin = New System.Windows.Forms.Padding(2)
         Me.btnSend.Name = "btnSend"
         Me.btnSend.Size = New System.Drawing.Size(192, 58)
@@ -81,7 +87,7 @@ Partial Class frmATEZ_EZA
         Me.pnlHead.Controls.Add(Me.lblBezugsnummer)
         Me.pnlHead.Location = New System.Drawing.Point(3, 2)
         Me.pnlHead.Name = "pnlHead"
-        Me.pnlHead.Size = New System.Drawing.Size(584, 151)
+        Me.pnlHead.Size = New System.Drawing.Size(675, 151)
         Me.pnlHead.TabIndex = 112
         '
         'lblInfo
@@ -97,13 +103,161 @@ 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(9, 61)
+        Me.Label8.Location = New System.Drawing.Point(10, 61)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(80, 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
@@ -143,22 +297,6 @@ Partial Class frmATEZ_EZA
         Me.txtLKWId.Size = New System.Drawing.Size(255, 23)
         Me.txtLKWId.TabIndex = 144
         '
-        '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:"
-        '
         'sbAdressierteZollstelle
         '
         Me.sbAdressierteZollstelle._allowFreitext = False
@@ -185,66 +323,6 @@ Partial Class frmATEZ_EZA
         Me.sbAdressierteZollstelle.TabIndex = 111
         Me.sbAdressierteZollstelle.usrcntl = Nothing
         '
-        '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(296, 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(384, 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(409, 159)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(178, 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:"
-        '
         'dgvAnhaenge
         '
         Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
@@ -260,7 +338,7 @@ Partial Class frmATEZ_EZA
         Me.dgvAnhaenge.ReadOnly = True
         Me.dgvAnhaenge.RowHeadersVisible = False
         Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvAnhaenge.Size = New System.Drawing.Size(584, 158)
+        Me.dgvAnhaenge.Size = New System.Drawing.Size(675, 158)
         Me.dgvAnhaenge.TabIndex = 112
         '
         'columnName
@@ -270,20 +348,18 @@ Partial Class frmATEZ_EZA
         Me.columnName.Name = "columnName"
         Me.columnName.ReadOnly = True
         '
-        'lblAnh
-        '
-        Me.lblAnh.Location = New System.Drawing.Point(0, 345)
-        Me.lblAnh.Name = "lblAnh"
-        Me.lblAnh.Size = New System.Drawing.Size(135, 13)
-        Me.lblAnh.TabIndex = 151
-        Me.lblAnh.Visible = False
-        '
         '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(589, 409)
+        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.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.lblAnh)
         Me.Controls.Add(Me.pnlHead)
@@ -318,4 +394,10 @@ Partial Class frmATEZ_EZA
     Friend WithEvents lblBezugsnummer As Label
     Friend WithEvents lblAnh As Label
     Friend WithEvents Button3 As Button
+    Friend WithEvents Button1 As Button
+    Friend WithEvents btnAgg_Tnr As Button
+    Friend WithEvents Label2 As Label
+    Friend WithEvents btnAgg_Origin As Button
+    Friend WithEvents btnAgg_Unit As Button
+    Friend WithEvents btnAgg_desc As Button
 End Class

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -3,6 +3,7 @@ Imports com.esendex.sdk.optouts.models
 Imports DAKOSY_Worker.eZollTypes
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cRelayHub
 
 
 Public Class frmATEZ_EZA
@@ -27,7 +28,7 @@ Public Class frmATEZ_EZA
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    'Dim atez = New cATEZ_NCTS_IN("atez_ncts")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
@@ -110,8 +111,8 @@ Public Class frmATEZ_EZA
             lblInfo.Text = ""
 
 
-            txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            'txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            '  txtDyMandant.Text = "VERG" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            txtDyMandant.Text = "VERG"
 
             '    atez.setJsonPDF(atez_data, dgvAnhaenge)
 
@@ -137,10 +138,20 @@ Public Class frmATEZ_EZA
             '    New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDocument With {.type = "base64", .base64String = "SGVsbG8sIHRoaXMgaXMgYSBzYW1wbGUgYmFzZTY0IHN0cmluZy4=", .filename = "test3.txt", .fileType = "cmr"}
             '},
 
+            Dim AdditionalSettings As New List(Of String)
+            If btnAgg_desc.Tag = 1 Then AdditionalSettings.Add("description")
+            If btnAgg_Tnr.Tag = 1 Then AdditionalSettings.Add("commodity_code")
+            If btnAgg_Origin.Tag = 1 Then AdditionalSettings.Add("country_of_origin")
+            If btnAgg_Unit.Tag = 1 Then AdditionalSettings.Add("unit_type")
+
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
                 .referenceNo = ioReference,
-                .regimeType = "IM",'                .customer = "AVISO",
+                .outputApplication = "dakosy/sftp/verg",'.outputApplication = "dakosy/sftp/vera",
-                   .additionalData = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAdditionalData With {
+                .regimeType = "IMPORT",'                .customer = "AVISO",
+               .dispatchCountry = "TR",'"TR",
+               .destinationCountry = "DE", 'Default, wird später überschrieben!! (Pflichtfeld)
+               .additionalData = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAdditionalData With {
                     .transaction = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubTransaction With {
                         .ioPartner = txtDyMandant.Text,
                         .ioDivision3 = txtDyNiederlassung.Text,
@@ -149,7 +160,7 @@ Public Class frmATEZ_EZA
                     .declaration = New List(Of VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDeclaration) From {
                         New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDeclaration With {
                             .objectIdentification = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubObjectIdentification With {
-                                .objectName = lblBezugsnummer.Text & "_TEST",
+                                .objectName = lblBezugsnummer.Text,'& "_TEST"
                                     .objectAlias = ioReference,
                                     .declarationType = "EZA-D"
                                 },
@@ -160,16 +171,21 @@ Public Class frmATEZ_EZA
                                         .contactPersonPosition = "Zolldeklarant/in"
                                     },
                                     .declarantIsConsignee = True,
-                                    .representationRelationshipCode = "",
+                                    .representationRelationshipCode = "",'-1, '??????????????????????????????????????????????????????????????
-                                    .inputTaxDeduction = "",'"true",
+                                    .inputTaxDeduction = True,'"",'"true",
                                     .procedureCodeRequested = procedureCodeRequested.ToString,'                                    .goodsStatus = "",'"EU",
                                      .transportMeansArrivalIdentity = txtLKWId.Text,
                                     .transportMeansNationalityCode = If(AVISO.LKW_Nationalitaet, "")
                                    }
                                 }
                             }
+                    },
+                 .additionalSettings = New cRelayHubAdditionalSettings With {
+                        .combineOptions = AdditionalSettings
                     }
-                }
+            }
+
+
             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)
@@ -211,18 +227,7 @@ Public Class frmATEZ_EZA
 
                     Dim bd As New Chilkat.BinData
                     Dim DOC As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDocument
-                    If r.Cells("anh_Art").Value IsNot DBNull.Value Then
+                    DOC.fileType = VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHub_sendToRelayHub_JobOrderRequest.getRelayHub_AnhDesc(r.Cells("anh_Art").Value)
-                        Select Case r.Cells("anh_Art").Value
-                            Case "Rechnung", "Konsi-Rechnung", "eFatura", "INVOICE" : DOC.fileType = "invoice"
-                            Case "CMR" : DOC.fileType = "cmr"
-                            Case "Ausfuhr", "EXPORT" : DOC.fileType = "tr_export_declaration"
-                            Case "ATR" : DOC.fileType = "atr"
-                            Case "Vorpapier", "T1" : DOC.fileType = "transit_declaration"
-                            Case Else : DOC.fileType = "invoice"
-                                '  Case Else : DOC.fileType = "additional_data" --> DARF NCIHT  -_> additional_data ist das verwednete Datenformat
-                        End Select
-                    End If
-                    'invoice' | 'atr' | 'cmr' | 'transit_declaration' | 'tr_export_declaration' | 'additional_data', received 'PDF'
 
                     DOC.type = "base64"
                     DOC.filename = r.Cells("anh_Name").Value
@@ -465,7 +470,7 @@ Public Class frmATEZ_EZA
         If openExisting Then
 
             If id > 0 Then
-                atez_data = New cATEZ_NCTS_DATA(id)
+                '  atez_data = New cATEZ_NCTS_DATA(id)
                 initAttachment()
                 If atez_data.atezId <> "" Then
                     lblInfo.Text = "Atez-ID " & atez_data.atezId
@@ -509,7 +514,7 @@ Public Class frmATEZ_EZA
             End If
 
         Else
-            atez_data = New cATEZ_NCTS_DATA()
+            ' atez_data = New cATEZ_NCTS_DATA()
             initAttachment()
             'Button1.Text = "An ATEZ senden -->"
             pnlHead.Enabled = True
@@ -543,25 +548,7 @@ Public Class frmATEZ_EZA
         Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],
 
                                                 case WHEN [anh_size] > 0 Then ROUND([anh_size] / 1000000,2) End as anh_size,
-
+                                                   [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] 
-                                                CASE WHEN  [anh_Art] = 'ATR-EUR1' then 'EUR'
-                                                when [anh_Art] = 'Rechnung' then 'INVOICE'
-                                                when [anh_Art] = 'eFatura' then 'INVOICE'
-                                                when [anh_Art] = 'CMR' then 'CMR'
-                                                when [anh_Art] = 'Ausfuhr' then 'OTHER'
-                                                when [anh_Art] = 'Vorpapier' then 'OTHER'
-                                                when [anh_Art] = 'Packliste' then 'PACK'
-                                                when [anh_Art] = 'Auftrag' then 'OTHER'
-                                                when [anh_Art] = 'Auftrag' then 'OTHER'
-                                                when [anh_Art] = 'Dispoliste' then 'OTHER'
-                                                when [anh_Art] = 'Vorkasse' then 'OTHER'
-                                                when [anh_Art] = 'Überweisungsbeleg' then 'OTHER'
-                                                when [anh_Art] = 'Vollmacht' then 'OTHER'
-                                                when [anh_Art] = 'ATB' then 'OTHER'
-                                                when [anh_Art] = 'ATA' then 'CarnetATA'
-                                                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'
                                            ORDER BY  anh_SendungsId desc,
 										  case	  
@@ -603,6 +590,7 @@ Public Class frmATEZ_EZA
             .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
             .Columns("anh_id").Visible = False     'VermerkID nicht anzeigenconMenuVermerke
             .Columns("anh_docId").Visible = False     'AvisoID nicht anzeigen
+            '  .Columns("anh_Art").Visible = False     'AvisoID nicht anzeigen
 
             .Columns("anh_selekt").Width = 25
             .Columns("anh_selekt").HeaderText = ""
@@ -772,4 +760,18 @@ Public Class frmATEZ_EZA
             lblAnh.Text = "Anhang in MB: " & countAnh.ToString
         End If
     End Sub
+
+    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
+        cRelayHubToken.DeleteStore()
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnAgg_Tnr.Click, btnAgg_desc.Click, btnAgg_Origin.Click, btnAgg_Unit.Click
+        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/Anhänge/frmSendungAnhangImport.vb

@@ -205,15 +205,23 @@ Public Class frmSendungAnhangImport
                     PdfViewer.Visible = (loc <> "")
                     If loc <> "" Then
                         Dim data = File.ReadAllBytes(loc)
-                        Dim pdfStream = New MemoryStream(data)
+
-                        PdfViewer.LoadFromStream(pdfStream)
+                        Dim header As String = System.Text.Encoding.ASCII.GetString(data, 0, Math.Min(4, data.Length))
-                        pdfStream.Close()
+
+                        If header = "%PDF" Then
+
+                            Dim pdfStream = New MemoryStream(data)
+                            PdfViewer.LoadFromStream(pdfStream)
+                            pdfStream.Close()
+
+                        End If
+
                     End If
 
 
-                    'NOT WORKING
+                        'NOT WORKING
-                    'PdfViewer.LoadFromFile(loc) NOT WORKING
+                        'PdfViewer.LoadFromFile(loc) NOT WORKING
-                End If
+                    End If
             ElseIf typ = "BILD" Or typ = ".jpg" Then
                 PdfViewer.Visible = False
                 WebBrowser.Visible = (loc <> "")

Aviso/App.config

@@ -69,19 +69,19 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

Aviso/Aviso.vbproj

@@ -1,5 +1,6 @@
 <?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')" />
   <Import Project="..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.props')" />
   <Import Project="..\packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props')" />
@@ -171,6 +172,9 @@
     <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Confluent.Kafka, Version=2.11.1.0, Culture=neutral, PublicKeyToken=12c514ca49093d1e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Confluent.Kafka.2.11.1\lib\net462\Confluent.Kafka.dll</HintPath>
+    </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.7.2.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
@@ -440,8 +444,8 @@
       <HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\Spire.PdfViewer.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
@@ -465,8 +469,8 @@
       <HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
@@ -474,16 +478,16 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
@@ -2062,6 +2066,7 @@
     <Error Condition="!Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets'))" />
     <Error Condition="!Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props'))" />
     <Error Condition="!Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props'))" />
   </Target>
   <Import Project="..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets')" />
   <Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets')" />

Aviso/AvisoStatusFunctions.vb

@@ -2017,6 +2017,59 @@ ELSE_ATILLA:
 
         hText = hText.Replace("%LKW%", hLKW)
 
+
+        '-------------- SIGNATUR -------------- 
+        Dim signatur = ""
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX"
+                       '       signatur = "                     
+                '               Freundliche Grüße / Saygılarımızla / Best Regards<br>
+                '               <b style=""color:#003680;"">IMEX Customs Service GmbH</b><br>
+                'Abteilung: EU Zollabfertigung<br>
+                'Tel.: +43 7711 2777 DW 200<br>
+                'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
+                '               "
+            Case "UNISPED"
+
+              '       signatur = "                     
+                '               Freundliche Grüße / Saygılarımızla / Best Regards<br>
+                '               <b style=""color:#003680;"">UNISPED Speditions GmbH</b><br>
+                'Abteilung: EU Zollabfertigung<br>
+                'Tel.: +43 7711 2777 DW 200<br>
+                'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
+                '               "
+            Case "ATILLA"
+
+                '       signatur = "                     
+                '               Freundliche Grüße / Saygılarımızla / Best Regards<br>
+                '               <b style=""color:#003680;"">ATILLA Spedition GmbH</b><br>
+                'Abteilung: EU Zollabfertigung<br>
+                'Tel.: +43 7711 2777 DW 200<br>
+                'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
+                '               "
+
+            Case "AMBAR"
+                '       signatur = "                     
+                '               Freundliche Grüße / Saygılarımızla / Best Regards<br>
+                '               <b style=""color:#003680;"">AMBAR</b><br>
+                'Abteilung: EU Zollabfertigung<br>
+                'Tel.: +43 7711 2777 DW 200<br>
+                'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
+                '               "
+            Case Else
+                signatur = "                     
+                        Freundliche Grüße / Saygılarımızla / Best Regards<br>
+                        <b style=""color:#003680;"">VERAG Spedition AG</b><br>
+					    Abteilung: EU Zollabfertigung<br>
+					    Tel.: +43 7711 2777 DW 200<br>
+					    Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
+                        "
+        End Select
+
+        hText = hText.Replace("%Signatur%", signatur)
+
+        '--------------------------------------------------------    
+
         Select Case art
             Case "5"
                 Dim linkAviso = "https://status.app.verag.ag/aviso-status/" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)
@@ -2028,6 +2081,7 @@ ELSE_ATILLA:
                 'hier werden alle möglichen Platzhalter ersetzt
 
 
+
                 hText = hText.Replace("%Standort%", getGrenzstelleZollstelle(hGrenzstelle, AVISO))
                 hText = hText.Replace("%Uhrzeit%", Format(Now, "dd.MM.yyyy HH:mm"))
                 hText = hText.Replace("&", "und")
@@ -2066,6 +2120,7 @@ ELSE_ATILLA:
 
                         hText = hText.Replace("%Firma_simple%", "VERAG")
                         hText = hText.Replace("%Firma%", "VERAG Spedition AG")
+                        signatur = ""
                 End Select
 
                 hText = hText.Replace("%AbfertigungsNr%", abfertigungsNr)

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmHauptfenster.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmHauptfenster
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -34,7 +35,7 @@ Partial Class frmHauptfenster
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
-        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip()
+        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.conFertig = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@@ -137,6 +138,7 @@ Partial Class frmHauptfenster
         Me.toolOriginalATR = New System.Windows.Forms.ToolStripMenuItem()
         Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VerträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
         Me.EssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -207,6 +209,8 @@ Partial Class frmHauptfenster
         Me.WOCECKLISTEZEWDHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HandbuchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGWIKIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WikiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MitarbeiterverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -272,7 +276,7 @@ Partial Class frmHauptfenster
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.Timer1 = New System.Windows.Forms.Timer()
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.btnWichtige = New System.Windows.Forms.Button()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
         Me.btnMinimieren = New System.Windows.Forms.Button()
@@ -289,7 +293,7 @@ Partial Class frmHauptfenster
         Me.Label22 = New System.Windows.Forms.Label()
         Me.btnE_Aviso = New System.Windows.Forms.Button()
         Me.btnNeu = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
@@ -298,7 +302,7 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel6 = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.btnColor = New System.Windows.Forms.Button()
@@ -312,7 +316,7 @@ Partial Class frmHauptfenster
         Me.lblMySND_Anzeige = New System.Windows.Forms.Label()
         Me.lblAkte = New System.Windows.Forms.Label()
         Me.btnClose = New System.Windows.Forms.Button()
-        Me.TimerAkte = New System.Windows.Forms.Timer()
+        Me.TimerAkte = New System.Windows.Forms.Timer(Me.components)
         Me.tabVorgeschrieben = New System.Windows.Forms.TabPage()
         Me.tabFreigegeben = New System.Windows.Forms.TabPage()
         Me.tabNichtEingetroffen = New System.Windows.Forms.TabPage()
@@ -329,7 +333,7 @@ Partial Class frmHauptfenster
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlDetailsLinks = New System.Windows.Forms.Panel()
         Me.splitMain = New System.Windows.Forms.SplitContainer()
-        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.tbcntrAvisoSND = New System.Windows.Forms.TabControl()
@@ -376,17 +380,17 @@ Partial Class frmHauptfenster
         Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
         Me.cbxAlle = New System.Windows.Forms.CheckBox()
         Me.btnSmall = New System.Windows.Forms.Button()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip()
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
-        Me.timerStandzeit = New System.Windows.Forms.Timer()
+        Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
         Me.Label9 = New System.Windows.Forms.Label()
-        Me.TimerUPDATE = New System.Windows.Forms.Timer()
+        Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.btnKasse_User = New System.Windows.Forms.Button()
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -395,16 +399,16 @@ Partial Class frmHauptfenster
         Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
         Me.ColorDialog = New System.Windows.Forms.ColorDialog()
-        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip()
+        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
@@ -412,6 +416,7 @@ Partial Class frmHauptfenster
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
         Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
+        Me.NewsletterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -911,7 +916,7 @@ Partial Class frmHauptfenster
         '
         'FunktionenToolStripMenuItem
         '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.NewsletterToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VerträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
         Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
         Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 16)
         Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -919,26 +924,26 @@ Partial Class frmHauptfenster
         'GenerelleGestellungenDurchsuchenToolStripMenuItem
         '
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
         '
         'KundenVonFremdenSpeditionenToolStripMenuItem
         '
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
         '
         'KundenverwaltungToolStripMenuItem
         '
         Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
         '
         'MDMParkplatzkartenToolStripMenuItem
         '
         Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
         '
         'SMSSendenToolStripMenuItem
@@ -946,7 +951,7 @@ Partial Class frmHauptfenster
         Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
         Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
         Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.SMSSendenToolStripMenuItem.Text = "SMS"
         '
         'NeueSMSSendenToolStripMenuItem
@@ -964,51 +969,51 @@ Partial Class frmHauptfenster
         'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
         '
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
         '
         'MRNBarcodedruckToolStripMenuItem
         '
         Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
         '
         'tool_BRGXLS
         '
         Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
         Me.tool_BRGXLS.Text = "Bürgschaften Excel"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
         Me.ToolStripMenuItem4.Visible = False
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
         Me.ToolStripMenuItem5.Visible = False
         '
         'BürgschaftenExcelToolStripMenuItem
         '
         Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
         Me.BürgschaftenExcelToolStripMenuItem.Visible = False
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
         Me.ToolStripMenuItem6.Visible = False
         '
@@ -1016,7 +1021,7 @@ Partial Class frmHauptfenster
         '
         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.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
         Me.GesamtsicherheitenToolStripMenuItem.Visible = False
         '
@@ -1060,31 +1065,31 @@ Partial Class frmHauptfenster
         'ATAtillaToolStripMenuItem
         '
         Me.ATAtillaToolStripMenuItem.Name = "ATAtillaToolStripMenuItem"
-        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
         Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
         '
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
         '
         'TICKETWaidhausToolStripMenuItem
         '
         Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
         '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
         '
         'DAKOSYToolStripMenuItem
         '
         Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
         Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
         '
         'StammreferenzenVerwaltenToolStripMenuItem
@@ -1096,69 +1101,76 @@ Partial Class frmHauptfenster
         'ToolStripSeparator23
         '
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
         '
         'toolOriginalATR
         '
         Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
         Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
         Me.toolOriginalATR.Text = "Original-ATR"
         '
         'SDLAbholaufträgeToolStripMenuItem
         '
         Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
         '
         'ToolStripMenuItem13
         '
         Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
         Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
         '
+        'VerträgeToolStripMenuItem
+        '
+        Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
+        Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
+        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VerträgeToolStripMenuItem.Text = "Verträge"
+        '
         'VorauskassenToolStripMenuItem
         '
         Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
         Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
         '
         'ToolStripSeparator11
         '
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
         '
         'EssensbestellungenToolStripMenuItem
         '
         Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
         Me.EssensbestellungenToolStripMenuItem.Visible = False
         '
         'AdministrationEssensbestellungenToolStripMenuItem
         '
         Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
         Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
         '
         'WarenorteToolStripMenuItem
         '
         Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.WarenorteToolStripMenuItem.Text = "Warenorte"
         '
         'DatevBuchungsexportToolStripMenuItem
         '
         Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
         Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
         Me.DatevBuchungsexportToolStripMenuItem.Visible = False
         '
@@ -1177,13 +1189,13 @@ Partial Class frmHauptfenster
         'APIToolStripMenuItem
         '
         Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.APIToolStripMenuItem.Text = "API"
         '
         'FIBUSachkontenToolStripMenuItem
         '
         Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
-        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
         Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
         Me.FIBUSachkontenToolStripMenuItem.Visible = False
         '
@@ -1551,11 +1563,24 @@ Partial Class frmHauptfenster
         '
         'VERAGWIKIToolStripMenuItem
         '
+        Me.VERAGWIKIToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WikiToolStripMenuItem, Me.MitarbeiterverzeichnisToolStripMenuItem})
         Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
         Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
         Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
         Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
         '
+        'WikiToolStripMenuItem
+        '
+        Me.WikiToolStripMenuItem.Name = "WikiToolStripMenuItem"
+        Me.WikiToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.WikiToolStripMenuItem.Text = "Wiki"
+        '
+        'MitarbeiterverzeichnisToolStripMenuItem
+        '
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Name = "MitarbeiterverzeichnisToolStripMenuItem"
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.MitarbeiterverzeichnisToolStripMenuItem.Text = "Mitarbeiterverzeichnis"
+        '
         'BREXITToolStripMenuItem
         '
         Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem})
@@ -3960,6 +3985,12 @@ Partial Class frmHauptfenster
         Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
         Me.UsrCntlTestsystem1.TabIndex = 8
         '
+        'NewsletterToolStripMenuItem
+        '
+        Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
+        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.NewsletterToolStripMenuItem.Text = "Newsletter"
+        '
         'frmHauptfenster
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4416,4 +4447,8 @@ Partial Class frmHauptfenster
     Friend WithEvents TVEditorNewToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ATILLASENDUNGToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ATAtillaToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents WikiToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents MitarbeiterverzeichnisToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VerträgeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents NewsletterToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.vb

@@ -164,6 +164,7 @@ Public Class frmHauptfenster
     Private listenerThread As System.Threading.Thread
 
     Private Sub StartPipeListener()
+
         listenerThread = New System.Threading.Thread(Sub()
                                                          Try
 
@@ -173,22 +174,23 @@ Public Class frmHauptfenster
 
                                                              Console.WriteLine($"Waiting for messages on pipe {pipeName}...")
 
+                                                             Dim server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity) ' ← einmalig außerhalb While
+
                                                              While True
-                                                                 Using server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity)
-                                                                     Try
-                                                                         server.WaitForConnection()
 
-                                                                         Using reader = New StreamReader(server, Encoding.UTF8)
+                                                                 Try
-                                                                             Dim message = reader.ReadLine()
+                                                                     server.WaitForConnection()
 
-                                                                             ProcessMessage(message)
+                                                                     Using reader = New StreamReader(server, Encoding.UTF8)
-                                                                         End Using
+                                                                         Dim message = reader.ReadLine()
 
-                                                                         server.Disconnect()
+                                                                         ProcessMessage(message)
-                                                                     Catch ex As Exception
+                                                                     End Using
-                                                                         Console.WriteLine("Fehler im Listener: " & ex.Message)
+
-                                                                     End Try
+                                                                     server.Disconnect()
-                                                                 End Using
+                                                                 Catch ex As Exception
+                                                                     Console.WriteLine("Fehler im Listener: " & ex.Message)
+                                                                 End Try
                                                              End While
 
                                                          Catch ex As Exception
@@ -217,6 +219,18 @@ Public Class frmHauptfenster
                        End If
                    End Sub)
 
+        ElseIf message.StartsWith("OpenAviso_") Then
+            Invoke(Sub()
+                       Dim split = message.ToString.Split("_")
+                       If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
+
+                           If IsNumeric(split(1)) AndAlso split(1) > 0 Then
+                               VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = split(1)
+                           End If
+                           Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                       End If
+                   End Sub)
+
         End If
     End Sub
 
@@ -3474,7 +3488,7 @@ ELSE_ATILLA:
 
         Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
         If path <> "" Then
-            Process.Start(path)
+            process.Start(path)
         End If
         'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then
         '    MsgBox("HURRA2" & vbNewLine & firma)
@@ -3748,7 +3762,7 @@ ELSE_ATILLA:
 
     Private Sub btnKassenbuch_Click(sender As Object, e As EventArgs) Handles btnKassenbuch.Click
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+            Case "IMEX" ', "ATILLA" erst freischalten, wenn alles implementiert ist!
                 pnlOptionen.Visible = Not pnlOptionen.Visible
             Case Else
                 Dim s As New SDL.frmSecureLoginKassenbuch
@@ -5041,9 +5055,7 @@ ELSE_ATILLA:
 
     End Sub
 
-    Private Sub VERAGWIKIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGWIKIToolStripMenuItem.Click
+
-        Process.Start("https://wiki.verag.ag/")
-    End Sub
 
     Private Sub AnhangsartenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnhangsartenToolStripMenuItem.Click
         Dim f = New frmAvisoAnhangsarten("tblAvisoAnhangsArten", "AVISO")
@@ -5242,5 +5254,25 @@ ELSE_ATILLA:
         detailForm.Show()
     End Sub
 
+    Private Sub WikiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WikiToolStripMenuItem.Click, MitarbeiterverzeichnisToolStripMenuItem.Click
 
+        Select Case sender.Name
+            Case "WikiToolStripMenuItem" : Process.Start("https://wiki.verag.ag/")
+            Case "MitarbeiterverzeichnisToolStripMenuItem" : Process.Start("https://wiki.verag.ag/de/mitarbeiter/verzeichnis")
+
+        End Select
+
+    End Sub
+
+
+
+    Private Sub VerträgeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerträgeToolStripMenuItem.Click
+        Dim f As New SDL.cKundenSearchVertrag
+        f.Show(Me)
+    End Sub
+
+    Private Sub NewsletterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NewsletterToolStripMenuItem.Click
+        Dim f As New SDL.frmNewsletter
+        f.Show(Me)
+    End Sub
 End Class

Aviso/frmSendungsdetailsNEU.vb

@@ -11,6 +11,7 @@ Imports SDL
 Imports System.IO
 Imports EAGetMail
 Imports System.Globalization
+Imports iText.Layout.Element
 
 Public Class frmSendungsdetailsNEU
     Public AvisoId As Integer
@@ -316,6 +317,22 @@ Public Class frmSendungsdetailsNEU
                 End If
             End If
 
+
+            If cntlAvisierer_Abf.Visible = False And
+                cntlAuftr_Abf.Visible = False And
+                cntlEmpf_Abf.Visible = False And
+                cntlAbsender_Abf.Visible = False And
+                cntlFrachtf_Abf.Visible = False Then
+
+                Dim err = "- Abfertigungskosten: Es ist kein Kunde mit passendem Offert ausgewählt."
+                rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+
+            End If
+
+
+
+
+
             ' pnlValidation.Visible = rtbValidierung.Text <> ""
             Return True
 
@@ -1536,7 +1553,7 @@ Public Class frmSendungsdetailsNEU
                 Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                     If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
                         usrcntl_NCTS.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId)
-                        usrcntl_NCTS.setValues()
+                        usrcntl_NCTS.setValues(False)
                     End If
                     'trotzdem überschreiben:
                     usrcntl_NCTS.txtT1Verzollungsadresse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse, "")
@@ -2542,11 +2559,31 @@ Public Class frmSendungsdetailsNEU
         End Select
 
 
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+
+
+            cntlAvisierer_Abf.Visible = checkOfferteExistFromAbfArt(txtAvisierer.KdNr_value, cboAbfertigungsart._value)
+            cntlAuftr_Abf.Visible = checkOfferteExistFromAbfArt(txtAuftraggeber.KdNr_value, cboAbfertigungsart._value)
+            cntlEmpf_Abf.Visible = checkOfferteExistFromAbfArt(txtEmpfaenger.KdNr_value, cboAbfertigungsart._value)
+            cntlAbsender_Abf.Visible = checkOfferteExistFromAbfArt(txtAbsender.KdNr_value, cboAbfertigungsart._value)
+            cntlFrachtf_Abf.Visible = checkOfferteExistFromAbfArt(txtFrachtfuehrer.KdNr_value, cboAbfertigungsart._value)
+
+        End If
+
+
         If Not isFailureShown Then VALIDATE_ME(False)
         sperrePanel()
         '  initOfferteDGV()
     End Sub
 
+    Function checkOfferteExistFromAbfArt(Kdnr, AbfArt) As Boolean
+        If Kdnr <= 0 Then Return False
+        If AbfArt = "" Then Return False
+        If AbfArt <= 0 Then Return False
+        Return (SQL.DLookup(" count(*) ", "offerten inner join [tblAbfertigungsartOffertenstamm] on ao_OffertenNr=OffertenNr", "KundenNr=" & Kdnr & " AND ao_Abfertigungsart='" & AbfArt & "'", "FMZOLL", "0") > 0)
+    End Function
+
+
     Sub initOfferteDGV()
         Try
             SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()

Aviso/packages.config

@@ -6,6 +6,7 @@
   <package id="CefSharp.WinForms" version="75.1.143" targetFramework="net47" />
   <package id="Common.Logging" version="3.4.1" targetFramework="net47" />
   <package id="Common.Logging.Core" version="3.4.1" targetFramework="net47" />
+  <package id="Confluent.Kafka" version="2.11.1" targetFramework="net48" />
   <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" />
@@ -14,20 +15,21 @@
   <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="librdkafka.redist" version="2.11.1" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
   <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
   <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.5.1" targetFramework="net47" />
+  <package id="System.Buffers" version="4.6.1" 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.Memory" version="4.5.5" targetFramework="net47" />
+  <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.5.0" targetFramework="net47" />
+  <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.0.0" targetFramework="net47" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" 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" />

Aviso/usrCntlSND_NCTSGestellungsadresse.vb

@@ -23,7 +23,7 @@
     End Sub
 
 
-    Public Sub setValues()
+    Public Sub setValues(customsOfficeSet)
         txtT1Verzollungsadresse.Text = If(NCTS_GA.nga_name, "")
         txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "")
         txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "")
@@ -34,8 +34,9 @@
         txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "")
         txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "")
         txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, ""))
-        txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
+        'If Not customsOfficeSet Then
-
+        '    txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
+        ' End If
 
         lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
         picDel.Visible = (NCTS_GA.nga_id > 0)
@@ -53,7 +54,7 @@
         NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text)
         NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text)
         NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value)
-        NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
+        ' NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
     End Sub
 
     Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked
@@ -84,7 +85,7 @@
 
     Private Sub usrCntlSND_NCTSGestellungsadresse_Load(sender As Object, e As EventArgs) Handles Me.Load
         If NCTS_GA Is Nothing Then : NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
-        Else : setValues() : End If
+        Else : setValues(False) : End If
 
 
         '   txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
@@ -97,7 +98,7 @@
 
     Sub reset()
         NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
-        setValues()
+        setValues(False)
     End Sub
 
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
@@ -116,7 +117,7 @@
     Private Sub txtT1Verzollungsadresse_VALUE_CHANGED() Handles txtT1Verzollungsadresse.VALUE_CHANGED
         If txtT1Verzollungsadresse._value <> "" Then
             NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(txtT1Verzollungsadresse._value)
-            setValues()
+            setValues(True)
         End If
 
     End Sub
@@ -129,7 +130,7 @@
         If vbYes = MsgBox("Möchten Sie die NCTS-Gestellungsadresse wirklich löschen?", vbYesNoCancel + MsgBoxStyle.DefaultButton2) Then
             NCTS_GA.DELETE()
             NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
-            setValues()
+            setValues(False)
         End If
     End Sub
 

Gemeinsames/App.config

@@ -19,7 +19,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.0.7.2" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>