Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

2024-03-15 11:21:49 +01:00
parent c5e549d309 fb978b760b
commit 2a28f7e827
15 changed files with 2434 additions and 2007 deletions
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -3,6 +3,7 @@
 'Imports iTextSharp.text
 Imports System.IO
 Imports Spire.Pdf
+Imports VERAG_PROG_ALLGEMEIN
 'Imports GrapeCity.Documents.Pdf

 'Imports Spire.Pdf
@@ -72,7 +73,7 @@ Public Class frmSendungAnhangImport
    Sub initElement(USRCNTL As usrCntlSendungAnhangElement)
        AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED)
                                         '  If BrowserLoaded Then
-                                 
+

                                         If Not STRG_PRESSED Then

@@ -637,11 +638,11 @@ Public Class frmSendungAnhangImport

    Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean 'ITEXTSHARP
        Try
-            Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing
-            Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile)
+            Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing
+            Dim Reader As New itextsharp.text.pdf.PdfReader(SourceFile)
            If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf"
-            Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0))
-            Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create))
+            Dim srcDoc As New itextsharp.text.Document() 'Reader.GetPageSizeWithRotation(0))
+            Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create))
            PdfCopyProvider.SetFullCompression()
            srcDoc.Open()
            For Each p In pagesToExtract
@@ -652,7 +653,7 @@ Public Class frmSendungAnhangImport
                End If
                impPage = PdfCopyProvider.GetImportedPage(Reader, p)
                ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite
-                PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p)))
+                PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p)))
                ' ----- PDF Seite in das neue Dokument einfügen
                PdfCopyProvider.AddPage(impPage)

@@ -888,7 +889,7 @@ Public Class frmSendungAnhangImport

        Try
            PagesLeft = 0
-            Dim r As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(sourceFile)
+            Dim r As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(sourceFile)
            Dim pagesToKeep As New List(Of Integer)
            For p = 1 To r.NumberOfPages
                Dim del = False
@@ -910,9 +911,9 @@ Public Class frmSendungAnhangImport

                    Using fs As FileStream = New FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None)

-                        Using doc As iTextSharp.text.Document = New iTextSharp.text.Document()
+                        Using doc As itextsharp.text.Document = New itextsharp.text.Document()

-                            Dim w As iTextSharp.text.pdf.PdfWriter = iTextSharp.text.pdf.PdfWriter.GetInstance(doc, fs)
+                            Dim w As itextsharp.text.pdf.PdfWriter = itextsharp.text.pdf.PdfWriter.GetInstance(doc, fs)
                            doc.Open()
                            For Each page As Integer In pagesToKeep
                                doc.NewPage()
@@ -1060,53 +1061,55 @@ Public Class frmSendungAnhangImport
        flpnlAviso.Controls.Clear()
        flpnlSendungen.Controls.Clear()

+
        cboArt.Items.Clear()
+        Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE)
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ursprungszeugnis", "CoO"))
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88"))
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2"))
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
-        End If
-
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM"))
-
-
-
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
-        End If
-
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
+        For Each r In list.LIST
+            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung))
+        Next

+        'cboArt.Items.Clear()
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))++++++
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ursprungszeugnis", "CoO"))
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88"))
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2"))
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
+        'End If
+
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM"))



+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
+        'End If

+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))

        cboArt._TRANSLATE()

@@ -1134,7 +1137,7 @@ Public Class frmSendungAnhangImport
        Dim cnt = 1
        For Each s In SENDUNG_LIST
            Dim abfertigungsArt = SQL.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
-        Dim empfTmp = ""
+            Dim empfTmp = ""
            If s.tblSnd_Empfaenger IsNot Nothing Then
                empfTmp = If(s.tblSnd_Empfaenger.Length > 15, s.tblSnd_Empfaenger.Substring(0, 15), s.tblSnd_Empfaenger)
            End If
--- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb
+++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb
@@ -1,4 +1,6 @@
-Public Class frmSendungAnhangUmbenennenUmkateg
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmSendungAnhangUmbenennenUmkateg
    Dim nameOLD = ""
    Dim artOLD = ""
    Sub New(nameOLD As String, artOLD As String)
@@ -13,45 +15,51 @@
    Private Sub frmSendungAnhangImport_Load(sender As Object, e As EventArgs) Handles Me.Load

        cboArt.Items.Clear()
+        Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE)
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein"))
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88"))
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2"))
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
-        End If
+        For Each r In list.LIST
+            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung))
+        Next

-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO"))
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein"))
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88"))
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2"))
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG"))
+        'End If
+
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM"))


-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
-        End If
-        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+        '    cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS"))
+        'End If
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
        txtBezeichnung.Text = nameOLD
        cboArt.changeItem(artOLD)
    End Sub
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -553,6 +553,12 @@
    <Compile Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmAvisoAnhangsarten.Designer.vb">
+      <DependentUpon>frmAvisoAnhangsarten.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAvisoAnhangsarten.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmDigicust.Designer.vb">
      <DependentUpon>frmDigicust.vb</DependentUpon>
    </Compile>
@@ -1141,6 +1147,9 @@
    <EmbeddedResource Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.resx">
      <DependentUpon>frmAvisoBenachrichtigungReminderBestaetigen.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmAvisoAnhangsarten.resx">
+      <DependentUpon>frmAvisoAnhangsarten.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmDigicust.resx">
      <DependentUpon>frmDigicust.vb</DependentUpon>
    </EmbeddedResource>
--- a/Aviso/frmAvisoAnhangsarten.Designer.vb
+++ b/Aviso/frmAvisoAnhangsarten.Designer.vb
@@ -0,0 +1,88 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmAvisoAnhangsarten
+    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.DataGridView = New System.Windows.Forms.DataGridView()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtSuche = New System.Windows.Forms.TextBox()
+        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'DataGridView
+        '
+        Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.DataGridView.Location = New System.Drawing.Point(12, 45)
+        Me.DataGridView.MultiSelect = False
+        Me.DataGridView.Name = "DataGridView"
+        Me.DataGridView.Size = New System.Drawing.Size(786, 399)
+        Me.DataGridView.TabIndex = 15
+        '
+        'btnOK
+        '
+        Me.btnOK.Location = New System.Drawing.Point(689, 446)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(109, 23)
+        Me.btnOK.TabIndex = 16
+        Me.btnOK.Text = "Speichern"
+        Me.btnOK.UseVisualStyleBackColor = True
+        Me.btnOK.Visible = False
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(9, 3)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(41, 13)
+        Me.Label2.TabIndex = 17
+        Me.Label2.Text = "Suche:"
+        '
+        'txtSuche
+        '
+        Me.txtSuche.Location = New System.Drawing.Point(12, 19)
+        Me.txtSuche.Name = "txtSuche"
+        Me.txtSuche.Size = New System.Drawing.Size(150, 20)
+        Me.txtSuche.TabIndex = 18
+        '
+        'frmAvisoAnhangsarten
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(810, 481)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txtSuche)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.DataGridView)
+        Me.Name = "frmAvisoAnhangsarten"
+        Me.Text = "frmAvisoAnhangsarten"
+        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents DataGridView As DataGridView
+    Friend WithEvents btnOK As Button
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtSuche As TextBox
+End Class
--- a/Aviso/frmAvisoAnhangsarten.resx
+++ b/Aviso/frmAvisoAnhangsarten.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Aviso/frmAvisoAnhangsarten.vb
+++ b/Aviso/frmAvisoAnhangsarten.vb
@@ -0,0 +1,130 @@
+Imports iText.Forms.Xfdf
+Imports iText.Kernel.Pdf
+Imports System.Web.UI
+
+Public Class frmAvisoAnhangsarten
+
+
+    Dim SPRACHENBind As cEasyBinding
+    Public table
+    Public BIND_DB
+    Private EditRow As Integer = -1
+    Sub New(table, BIND_DB)
+        Me.table = table
+        Me.BIND_DB = BIND_DB
+        InitializeComponent()
+    End Sub
+
+    Private Sub frmSprachen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        loadDGV()
+        ' btnOK.Visible = True
+
+
+    End Sub
+
+
+
+    Private Sub loadDGV(Optional sqlwhere As String = "")
+
+        Try
+            SPRACHENBind = New cEasyBinding(BIND_DB)
+
+
+            If sqlwhere = "" Then
+
+                SPRACHENBind.initBinding("SELECT *  FROM " & table, table)
+            Else
+
+                SPRACHENBind.initBinding("SELECT *  FROM " & table & " WHERE " & sqlwhere, table)
+
+            End If
+
+            DataGridView.DataSource = SPRACHENBind.bindingdataTable
+
+            With DataGridView
+
+                If .Columns.Count > 0 Then
+                    .Columns("aa_id").Visible = False
+                    .Columns("aa_name").HeaderText = "Name"
+                    .Columns("aa_name").Width = 150
+                    .Columns("aa_sort").HeaderText = "Sort."
+                    .Columns("aa_sort").Width = 40
+                    .Columns("aa_isBrexti").HeaderText = "Brexit"
+                    .Columns("aa_isBrexti").Width = 40
+                    .Columns("aa_aktiv").HeaderText = "Aktiv"
+                    .Columns("aa_aktiv").Width = 40
+                    .Columns("aa_bezeichnung").HeaderText = "Bezeichnung"
+                    .Columns("aa_bezeichnung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                    .Columns("aa_firma").HeaderText = "nur für Firma"
+                    .Columns("aa_firma").Width = 100
+                    .Columns("aa_filiale").HeaderText = "nur für Filiale"
+                    .Columns("aa_filiale").Width = 100
+                End If
+
+            End With
+
+
+
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+
+    End Sub
+
+    Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSuche.PreviewKeyDown
+
+        Dim sqladdon As String = ""
+
+        If e.KeyCode = Keys.Enter Then
+            If txtSuche.Text <> "" Then
+                sqladdon &= " [aa_name] like '%" & txtSuche.Text & "%' or  [aa_bezeichnung] like '%" & txtSuche.Text & "%'"
+            End If
+            loadDGV(sqladdon)
+        End If
+
+
+
+    End Sub
+
+
+    Private Sub DataGridView_DefaultValuesNeeded(sender As Object, e As DataGridViewRowEventArgs) Handles DataGridView.DefaultValuesNeeded
+        Try
+
+            e.Row.Cells("aa_aktiv").Value = True
+
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+
+        If DataGridView.Columns.Count = 0 Or DataGridView.SelectedRows.Count = 0 Then 'alles gelöscht oder markierte Zeile gelöscht
+            SPRACHENBind.updateBinding()
+            Exit Sub
+        End If
+
+        If DataGridView.CurrentRow.Cells("aa_name").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("aa_sort").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("aa_bezeichnung").ToString <> "" AndAlso EditRow >= 0 Then
+            SPRACHENBind.updateBinding()
+        End If
+
+    End Sub
+
+
+    Private Sub DataGridView_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles DataGridView.EditingControlShowing
+        EditRow = DataGridView.CurrentRow.Index
+    End Sub
+
+    Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged
+        If EditRow >= 0 Then
+            Dim new_row As Integer = EditRow
+            EditRow = -1
+            DataGridView.CurrentCell = DataGridView.Rows(new_row).Cells(
+                DataGridView.CurrentCell.ColumnIndex)
+        End If
+    End Sub
+
+
+End Class
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -392,6 +392,7 @@ Partial Class frmHauptfenster
        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AnhangsartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -611,7 +612,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.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.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -873,26 +874,26 @@ Partial Class frmHauptfenster
        'GenerelleGestellungenDurchsuchenToolStripMenuItem
        '
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
        '
        'KundenVonFremdenSpeditionenToolStripMenuItem
        '
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
        '
        'KundenverwaltungToolStripMenuItem
        '
        Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
        '
        'MDMParkplatzkartenToolStripMenuItem
        '
        Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
        '
        'SMSSendenToolStripMenuItem
@@ -900,7 +901,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(391, 30)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SMSSendenToolStripMenuItem.Text = "SMS"
        '
        'NeueSMSSendenToolStripMenuItem
@@ -918,51 +919,51 @@ Partial Class frmHauptfenster
        'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
        '
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
        'MRNBarcodedruckToolStripMenuItem
        '
        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
        '
        'tool_BRGXLS
        '
        Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
        Me.tool_BRGXLS.Text = "Bürgschaften Excel"
        '
        'ToolStripMenuItem4
        '
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
        Me.ToolStripMenuItem4.Visible = False
        '
        'ToolStripMenuItem5
        '
        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
        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(391, 30)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        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(391, 30)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
        Me.ToolStripMenuItem6.Visible = False
        '
@@ -970,7 +971,7 @@ Partial Class frmHauptfenster
        '
        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem})
        Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
        Me.GesamtsicherheitenToolStripMenuItem.Visible = False
        '
@@ -1007,25 +1008,25 @@ Partial Class frmHauptfenster
        'ToolStripMenuItem10
        '
        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
        '
        'TICKETWaidhausToolStripMenuItem
        '
        Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
        '
        'ToolStripSeparator10
        '
        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
        '
        'DAKOSYToolStripMenuItem
        '
        Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
        Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
        '
        'StammreferenzenVerwaltenToolStripMenuItem
@@ -1037,75 +1038,75 @@ Partial Class frmHauptfenster
        'ToolStripSeparator23
        '
        Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
        '
        'toolOriginalATR
        '
        Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
        Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
        Me.toolOriginalATR.Text = "Original-ATR"
        '
        'SDLAbholaufträgeToolStripMenuItem
        '
        Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
        'ToolStripMenuItem13
        '
        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
        '
        'ToolStripSeparator11
        '
        Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
        '
        'EssensbestellungenToolStripMenuItem
        '
        Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
        Me.EssensbestellungenToolStripMenuItem.Visible = False
        '
        'AdministrationEssensbestellungenToolStripMenuItem
        '
        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
        Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
        '
        'ToolStripSeparator24
        '
        Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
        '
        'WarenorteToolStripMenuItem
        '
        Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.WarenorteToolStripMenuItem.Text = "Warenorte"
        '
        'DatevBuchungsexportToolStripMenuItem
        '
        Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
        Me.DatevBuchungsexportToolStripMenuItem.Visible = False
        '
        'APIToolStripMenuItem
        '
        Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.APIToolStripMenuItem.Text = "API"
        '
        'StatistikToolStripMenuItem
@@ -3736,6 +3737,12 @@ Partial Class frmHauptfenster
        Me.HomepageToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
        Me.HomepageToolStripMenuItem.Text = "Homepage"
        '
+        'AnhangsartenToolStripMenuItem
+        '
+        Me.AnhangsartenToolStripMenuItem.Name = "AnhangsartenToolStripMenuItem"
+        Me.AnhangsartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22)
+        Me.AnhangsartenToolStripMenuItem.Text = "Anhangsarten"
+        '
        'frmHauptfenster
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4168,4 +4175,5 @@ Partial Class frmHauptfenster
    Friend WithEvents ATVeragCSToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents DEVeragGmbHToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ATUnispedGmbHToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AnhangsartenToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -308,7 +308,6 @@ Public Class frmHauptfenster
            ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then
                cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
                '  MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
-
            End If
        End If

@@ -562,7 +561,7 @@ Public Class frmHauptfenster

        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ESSENSBESTELLUNGEN", "SDL") Then
            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                Case "FRONTOFFICE", "VERAG", "IMEX"
+                Case "FRONTOFFICE", "VERAG", "IMEX", "UNISPED"
                    EssensbestellungenToolStripMenuItem.Visible = True
            End Select
        End If
@@ -4545,10 +4544,13 @@ Public Class frmHauptfenster
    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")
+        f.Show()
+    End Sub
 End Class

 Public Class AvisoStatusFunctions
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1764,44 +1764,9 @@
        eWpiMRXkm9o//9k=
 </value>
  </data>
-  <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="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>765, 17</value>
  </metadata>
-  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
-</value>
-  </data>
-  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
-</value>
-  </data>
  <data name="btnDelQS.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -2532,6 +2497,41 @@
  <metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>129, 56</value>
  </metadata>
+  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>404, 17</value>
+  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -4802,7 +4802,7 @@ Public Class frmSendungsdetailsNEU
    Private Sub ZollstoppAMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZollstoppAMBARToolStripMenuItem.Click
        Me.Cursor = Cursors.WaitCursor
        SAVE_ME()
-        Dim f As New frmZollstopp(SENDUNG_LIST(CURRENT_INDEX))
+        Dim f As New frmZollstopp(SENDUNG_LIST(CURRENT_INDEX), usrcntl_NCTS.NCTS_GA)
        f.ShowDialog(Me)
        Me.Cursor = DefaultCursor
    End Sub
--- a/Aviso/frmZollstopp.Designer.vb
+++ b/Aviso/frmZollstopp.Designer.vb
@@ -33,6 +33,7 @@ Partial Class frmZollstopp
        Me.Label3 = New System.Windows.Forms.Label()
        Me.rtbAbsender = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
        Me.lklEmpfangerUbernehmen = New System.Windows.Forms.LinkLabel()
+        Me.rtbATANr = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
        Me.SuspendLayout()
        '
        'rtbZollstop
@@ -44,7 +45,7 @@ Partial Class frmZollstopp
        Me.rtbZollstop.MaxLines_Warning = ""
        Me.rtbZollstop.MaxLines_Warning_Label = Nothing
        Me.rtbZollstop.Name = "rtbZollstop"
-        Me.rtbZollstop.Size = New System.Drawing.Size(526, 121)
+        Me.rtbZollstop.Size = New System.Drawing.Size(526, 96)
        Me.rtbZollstop.TabIndex = 3
        Me.rtbZollstop.Text = ""
        '
@@ -150,12 +151,26 @@ Partial Class frmZollstopp
        Me.lklEmpfangerUbernehmen.TabStop = True
        Me.lklEmpfangerUbernehmen.Text = "Empfänger übernehmen"
        '
+        'rtbATANr
+        '
+        Me.rtbATANr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.rtbATANr.Location = New System.Drawing.Point(12, 216)
+        Me.rtbATANr.MaxLineLength = -1
+        Me.rtbATANr.MaxLines_Warning = ""
+        Me.rtbATANr.MaxLines_Warning_Label = Nothing
+        Me.rtbATANr.Name = "rtbATANr"
+        Me.rtbATANr.Size = New System.Drawing.Size(526, 35)
+        Me.rtbATANr.TabIndex = 10
+        Me.rtbATANr.Text = ""
+        '
        'frmZollstopp
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(551, 626)
+        Me.Controls.Add(Me.rtbATANr)
        Me.Controls.Add(Me.lklEmpfangerUbernehmen)
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.rtbAbsender)
@@ -185,4 +200,5 @@ Partial Class frmZollstopp
    Friend WithEvents Label3 As Label
    Friend WithEvents rtbAbsender As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Friend WithEvents lklEmpfangerUbernehmen As LinkLabel
+    Friend WithEvents rtbATANr As VERAG_PROG_ALLGEMEIN.MyRichTextBox
 End Class
--- a/Aviso/frmZollstopp.vb
+++ b/Aviso/frmZollstopp.vb
@@ -1,18 +1,21 @@
 Public Class frmZollstopp

    Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen
+    Dim gestellungsadresse As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen

-    Sub New(SND As VERAG_PROG_ALLGEMEIN.cSendungen)
+    Sub New(SND As VERAG_PROG_ALLGEMEIN.cSendungen, Optional gestellungsadresse As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen = Nothing)

        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
        Me.SND = SND
+        Me.gestellungsadresse = gestellungsadresse
    End Sub

    Private Sub frmZollstopp_Load(sender As Object, e As EventArgs) Handles Me.Load
        If SND Is Nothing Then Me.Close()
        rtbAbsender.Text = SND.tblSnd_Absender
+        rtbATANr.Text = IIf(gestellungsadresse IsNot Nothing, gestellungsadresse.nga_ATANr, "")
        rtbZollstop.Text = SND.getNCTSAdress()
    End Sub

@@ -20,7 +23,7 @@
        Me.Cursor = Cursors.WaitCursor

        Try
-            Dim path = SDL.FormularManagerNEU.Zollstopp(rtbZollstop.Text, rtbEntladestelle.Text, rtbKommentare.Text, rtbAbsender.Text)
+            Dim path = SDL.FormularManagerNEU.Zollstopp(rtbZollstop.Text, rtbEntladestelle.Text, rtbKommentare.Text, rtbAbsender.Text, rtbATANr.Text)
            If path <> "" Then
                    Process.Start(path)
                End If
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
@@ -23,6 +23,8 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.pnlT1 = New System.Windows.Forms.Panel()
+        Me.txtT1VerzollungsadresseATANr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
        Me.cbxNCTSAufDispo = New System.Windows.Forms.CheckBox()
        Me.picDel = New System.Windows.Forms.PictureBox()
        Me.txtT1Verzollungsadresse = New VERAG_PROG_ALLGEMEIN.MySearchBox()
@@ -49,6 +51,8 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        '
        'pnlT1
        '
+        Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseATANr)
+        Me.pnlT1.Controls.Add(Me.Label4)
        Me.pnlT1.Controls.Add(Me.cbxNCTSAufDispo)
        Me.pnlT1.Controls.Add(Me.picDel)
        Me.pnlT1.Controls.Add(Me.txtT1Verzollungsadresse)
@@ -71,9 +75,42 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.pnlT1.Controls.Add(Me.LinkLabel4)
        Me.pnlT1.Location = New System.Drawing.Point(0, 0)
        Me.pnlT1.Name = "pnlT1"
-        Me.pnlT1.Size = New System.Drawing.Size(549, 101)
+        Me.pnlT1.Size = New System.Drawing.Size(549, 115)
        Me.pnlT1.TabIndex = 0
        '
+        'txtT1VerzollungsadresseATANr
+        '
+        Me.txtT1VerzollungsadresseATANr._DateTimeOnly = False
+        Me.txtT1VerzollungsadresseATANr._numbersOnly = False
+        Me.txtT1VerzollungsadresseATANr._numbersOnlyKommastellen = ""
+        Me.txtT1VerzollungsadresseATANr._numbersOnlyTrennzeichen = False
+        Me.txtT1VerzollungsadresseATANr._Prozent = False
+        Me.txtT1VerzollungsadresseATANr._ShortDateNew = False
+        Me.txtT1VerzollungsadresseATANr._ShortDateOnly = False
+        Me.txtT1VerzollungsadresseATANr._TimeOnly = False
+        Me.txtT1VerzollungsadresseATANr._TimeOnly_Seconds = False
+        Me.txtT1VerzollungsadresseATANr._value = Nothing
+        Me.txtT1VerzollungsadresseATANr._Waehrung = False
+        Me.txtT1VerzollungsadresseATANr._WaehrungZeichen = True
+        Me.txtT1VerzollungsadresseATANr.ForeColor = System.Drawing.Color.Black
+        Me.txtT1VerzollungsadresseATANr.Location = New System.Drawing.Point(121, 93)
+        Me.txtT1VerzollungsadresseATANr.MaxLength = 256
+        Me.txtT1VerzollungsadresseATANr.MaxLineLength = -1
+        Me.txtT1VerzollungsadresseATANr.MaxLines_Warning = ""
+        Me.txtT1VerzollungsadresseATANr.MaxLines_Warning_Label = Nothing
+        Me.txtT1VerzollungsadresseATANr.Name = "txtT1VerzollungsadresseATANr"
+        Me.txtT1VerzollungsadresseATANr.Size = New System.Drawing.Size(269, 20)
+        Me.txtT1VerzollungsadresseATANr.TabIndex = 17
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(23, 96)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(45, 13)
+        Me.Label4.TabIndex = 20
+        Me.Label4.Text = "ATA-Nr:"
+        '
        'cbxNCTSAufDispo
        '
        Me.cbxNCTSAufDispo.AutoSize = True
@@ -113,7 +150,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.txtT1Verzollungsadresse.key_visible = False
        Me.txtT1Verzollungsadresse.KEYPARAM = Nothing
        Me.txtT1Verzollungsadresse.Location = New System.Drawing.Point(121, 11)
-        Me.txtT1Verzollungsadresse.MaxLength = 35
+        Me.txtT1Verzollungsadresse.MaxLength = 50
        Me.txtT1Verzollungsadresse.Name = "txtT1Verzollungsadresse"
        Me.txtT1Verzollungsadresse.searchActive = True
        Me.txtT1Verzollungsadresse.Size = New System.Drawing.Size(269, 20)
@@ -424,7 +461,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.pnlT1)
        Me.Name = "usrCntlSND_NCTSGestellungsadresse"
-        Me.Size = New System.Drawing.Size(549, 94)
+        Me.Size = New System.Drawing.Size(549, 115)
        Me.pnlT1.ResumeLayout(False)
        Me.pnlT1.PerformLayout()
        CType(Me.picDel, System.ComponentModel.ISupportInitialize).EndInit()
@@ -452,4 +489,6 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
    Friend WithEvents cbxNCTSAufDispo As CheckBox
    Public WithEvents txtT1Verzollungsadresse As VERAG_PROG_ALLGEMEIN.MySearchBox
    Public WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents txtT1VerzollungsadresseATANr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label4 As Label
 End Class
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
@@ -34,6 +34,7 @@
        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, "")


        lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
@@ -52,6 +53,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)
    End Sub

    Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked