neu

2019-10-28 09:30:39 +01:00
parent d29dc72b22
commit 6ae299259e
38 changed files with 2570 additions and 1168 deletions
--- a/AVISOUPDATER/AVISOUPDATER.vbproj
+++ b/AVISOUPDATER/AVISOUPDATER.vbproj
@@ -11,7 +11,7 @@
    <AssemblyName>AVISOUPDATER</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
  </PropertyGroup>
@@ -75,7 +75,8 @@
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Update.vb" />
+    <Compile Include="cProgrammeUpdate.vb" />
+    <Compile Include="OLDUpdate.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
--- a/AVISOUPDATER/AVISOUPDATER_Settings.txt
+++ b/AVISOUPDATER/AVISOUPDATER_Settings.txt
@@ -1 +1,9 @@
 F:\Programme\AVISO\
+192.168.0.**|\\share01.verag.ost.dmn\Programme\AVISO
+172.16.0.**|\\172.16.0.99\Daten\PROGRAMME\AVISO
+192.168.1.**|\\192.168.1.20\daten\VERAG Programme\AVISO
+192.168.133.**|\\192.168.133.98\f\Programme\AVISO
+172.16.1.**|\\172.16.1.100\f\PROGRAMME\AVISO
+192.168.32.**|\\192.168.32.253\Files\Programme\AVISO
+192.168.100.**|\\192.168.100.11\Daten\Programme\AVISO
+10.4.3.**|\\10.4.3.17\VERAG gemeinsam\AVISO
--- a/AVISOUPDATER/AVISOUPDATER_Version.txt
+++ b/AVISOUPDATER/AVISOUPDATER_Version.txt
@@ -1 +1 @@
-4.0
+6.0
--- a/AVISOUPDATER/App.config
+++ b/AVISOUPDATER/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
    </startup>
 </configuration>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -14,8 +14,8 @@ Option Explicit On

 Namespace My
    
-    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
-    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
+    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
+    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
    '
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,21 +15,21 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
        
        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
        
-#Region "Funktion zum automatischen Speichern von My.Settings"
+#Region "Automatische My.Settings-Speicherfunktion"
 #If _MyType = "WindowsForms" Then
    Private Shared addedHandler As Boolean

    Private Shared addedHandlerLockObject As New Object

    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
        If My.Application.SaveMySettingsOnExit Then
            My.Settings.Save()
        End If
--- a/AVISOUPDATER/OLDUpdate.vb
+++ b/AVISOUPDATER/OLDUpdate.vb
@@ -6,6 +6,7 @@
    Sub Main()
        'Falls Settings existiert, wird der Pfad daraus verwendet.
        F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "AVISOUPDATER_Settings.txt")
+
        If Not System.IO.Directory.Exists(F) Then
            MsgBox("ERROR_UPDATE_05: Es konnte keine Verbindung mit dem F:\ Laufwerk hergestellt werden." & vbNewLine & "Wenn Sie eine Remote-Sitzung verwenden, melden Sie sich mit dieser erneut an.", MsgBoxStyle.Critical, "ERROR")
            Environment.Exit(0)
@@ -13,6 +14,7 @@
        System.Console.WriteLine("3 Sekunden warten, um sicherzustellen, dass das Programm beendet wurde...")
        Threading.Thread.Sleep(3000) 'Falls Programm gerade am Beenden
        System.Console.WriteLine("Starte Update...")
+        System.Console.WriteLine("UPDATEPFAD: " & F)
        ' If Not My.Computer.FileSystem.DirectoryExists(F) Then
        'MsgBox("ERROR_UPDATE_02: Update-Daten existieren nicht.", MsgBoxStyle.Critical, "ERROR")
        ' Else
@@ -47,6 +49,8 @@
        'End If
        Environment.Exit(0)
    End Sub
+
+
    Private Sub FileCopier()
        For Each file As String In IO.Directory.GetFiles(F) ' Ermittelt alle Dateien des Ordners 
            IO.File.Copy(file, AppDomain.CurrentDomain.BaseDirectory & cut_file(file), True) ' Kopiert die Dateien Next 
--- a/AVISOUPDATER/UPDATERfrm.vb
+++ b/AVISOUPDATER/UPDATERfrm.vb
@@ -3,7 +3,7 @@ Imports System.Security.Cryptography

 Public Class UPDATERfrm

-    Dim CopyIdentical = False ' selbe Dateien nicht kopieren
+    Dim CopyIncremental = True ' selbe Dateien nicht kopieren

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

@@ -23,6 +23,19 @@ Public Class UPDATERfrm
    Dim F_ATILLA As String = "\\172.16.0.99\Daten\Programme\AVISO\" ' ATILLA
    Public Sub Main()

+        'STARTPARAMETER - DP
+        Dim PARAM = ""
+        Dim parameter() As String = Environment.GetCommandLineArgs().ToArray
+        If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist
+            PARAM = parameter(1)
+        End If
+
+        If PARAM = "full" Then
+            CopyIncremental = False
+
+        End If
+
+
        Dim FIRMA = "VERAG"
        Dim pfadDatei As String = System.AppDomain.CurrentDomain.BaseDirectory & "\Standort.txt"
        FIRMA = "VERAG"
@@ -39,22 +52,31 @@ Public Class UPDATERfrm


        'Falls Settings existiert, wird der Pfad daraus verwendet.
-        F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "AVISOUPDATER_Settings.txt")
+        ' F = System.IO.File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory & "AVISOUPDATER_Settings.txt")(0)
+        '   F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "AVISOUPDATER_Settings.txt")
+
        If Not System.IO.Directory.Exists(F) Then
+            F = getFByIP()

-            If FIRMA = "ATILLA" Then
-                F = F_ATILLA 'Sichere Verbindung
-            Else
-                F = F_PROD
-            End If
-
-            writeLine(RichTextBox, "F-Pfad nicht gefunden, verbinde mit '" & F & "' ...")
+            writeLine(RichTextBox, "Verbinde mit '" & F & "' ...")
            If Not System.IO.Directory.Exists(F) Then
-                MsgBox("ERROR_UPDATE_05: Es konnte keine Verbindung mit dem F:\ Laufwerk hergestellt werden." & vbNewLine & "Wenn Sie eine Remote-Sitzung verwenden, melden Sie sich mit dieser erneut an.", MsgBoxStyle.Critical, "ERROR")
-                Environment.Exit(0)
+                If FIRMA = "ATILLA" Then
+                    F = F_ATILLA 'Sichere Verbindung
+                Else
+                    F = F_PROD
+                End If
+                writeLine(RichTextBox, "Standard-Freigabelaufwerk nicht gefunden. Verbinde mit '" & F & "' ...")
+
+                If Not System.IO.Directory.Exists(F) Then
+                    MsgBox("ERROR_UPDATE_05: Es konnte keine Verbindung mit dem Freigabe-Laufwerk hergestellt werden." & vbNewLine & "Wenn Sie eine Remote-Sitzung verwenden, melden Sie sich mit dieser erneut an.", MsgBoxStyle.Critical, "ERROR")
+                    Environment.Exit(0)
+                End If
            End If

            writeLine(RichTextBox, "Verbindung erfolgreich...")
+            'Else
+            '  System.Console.WriteLine("UPDATEPFAD: " & F)
+
        End If

        writeLine(RichTextBox, "3 Sekunden warten, um sicherzustellen, dass das Programm beendet wurde...")
@@ -73,14 +95,22 @@ Public Class UPDATERfrm
                    End If

                    '---------------------------
-                    delFiles()
-                    FileCopier()
                    '---------------------------
                    'Alternative: 
-                    '---------------------------
+                    '-------
                    'copyAndDelFilesAndDir()
                    '---------------------------

+                    '     If Not cut_file(File).Contains("AVISOUPDATER") And Not cut_file(File).Contains("NOT_DEL_") Then
+
+
+                    If CopyIncremental Then
+                        cProgrammeUpdate.copyProgramLIST(F, AppDomain.CurrentDomain.BaseDirectory, {"AVISOUPDATER", "NOT_DEL_"})
+                    Else
+                        delFiles()
+                        FileCopier()
+                    End If
+


                    If Not System.IO.File.Exists(AppDomain.CurrentDomain.BaseDirectory & "AVISO.exe") Then
@@ -105,6 +135,57 @@ Public Class UPDATERfrm
        Environment.Exit(0)
    End Sub

+    Function getFByIP() As String
+        Dim default_F = ""
+        getFByIP = ""
+        Try
+            Dim IPADDR As System.Net.IPAddress
+            IPADDR = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0)
+            'MsgBox(IPADDR.ToString())
+
+            For Each l In System.IO.File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory & "AVISOUPDATER_Settings.txt")
+                If l.Contains("|") Then
+                    Dim sp = l.Split("|")
+                    If IPADDR.ToString.Contains(sp(0).Replace("**", "")) Then
+                        getFByIP = sp(1)
+                    End If
+                Else
+                    default_F = l
+                End If
+            Next
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        If getFByIP = "" Then
+            If default_F <> "" Then
+                getFByIP = default_F
+            Else
+                getFByIP = F
+            End If
+        End If
+        If F.Contains("10.4.3.17") Then buildConnectionUNISPED()
+    End Function
+
+
+    Sub buildConnectionUNISPED()
+        Try
+
+            writeLine(RichTextBox, "UNISPED Netzwerkzugriff einrichten...")
+            Dim netuse As New System.Diagnostics.ProcessStartInfo()
+
+            netuse.FileName = "C:\Windows\system32\net"
+            netuse.Arguments = "use \\10.4.3.17 /User:VERAG 1VerSub9#"
+            netuse.CreateNoWindow = True
+            netuse.WindowStyle = ProcessWindowStyle.Hidden
+            System.Diagnostics.Process.Start(netuse)
+
+        Catch ex As Exception
+            writeLine(RichTextBox, "ERR: UNISPED Netzwerkzugriff fehlgeschlagen...")
+
+        End Try
+    End Sub
+
+
    Delegate Sub writeLineCallback(rtb As System.Windows.Forms.RichTextBox, text As String)
    Private Sub writeLine(rtb As System.Windows.Forms.RichTextBox, text As String)
        If Me.InvokeRequired Then
--- a/AVISOUPDATER/cProgrammeUpdate.vb
+++ b/AVISOUPDATER/cProgrammeUpdate.vb
@@ -0,0 +1,215 @@
+
+Imports System.Data.SqlClient
+Imports System.Reflection
+
+Public Class cProgrammeUpdate
+    Property pud_progId As Object = Nothing
+    Property pud_codename As String
+    Property pud_version As String
+    Property pud_fileName As String
+    Property pud_filePathFolder As Object = Nothing
+    Property pud_datum As Date = Now
+
+    Property pud_file_Verion As String
+    Property pud_file_Date As Date
+    Property pud_file_Size As Integer
+
+
+    Shared Function getParameterList(UD As cProgrammeUpdate) As List(Of SQLVariable)
+        Dim list As New List(Of SQLVariable)
+        list.Add(New SQLVariable("pud_progId", UD.pud_progId))
+        list.Add(New SQLVariable("pud_codename", UD.pud_codename))
+        list.Add(New SQLVariable("pud_version", UD.pud_version))
+        list.Add(New SQLVariable("pud_fileName", UD.pud_fileName))
+        list.Add(New SQLVariable("pud_filePathFolder", UD.pud_filePathFolder))
+        list.Add(New SQLVariable("pud_datum", UD.pud_datum))
+        list.Add(New SQLVariable("pud_file_Verion", UD.pud_file_Verion))
+        list.Add(New SQLVariable("pud_file_Date", UD.pud_file_Date))
+        list.Add(New SQLVariable("pud_file_Size", UD.pud_file_Size))
+        Return list
+    End Function
+
+
+
+
+    Public Shared Function isNewFile(ByRef file As cProgrammeUpdate, LIST_DEST As List(Of cProgrammeUpdate)) As Boolean
+        For Each l In LIST_DEST
+            If l.pud_filePathFolder = file.pud_filePathFolder And l.pud_fileName = file.pud_fileName And l.pud_file_Size = file.pud_file_Size And l.pud_file_Date = file.pud_file_Date Then
+                Return False
+            End If
+        Next
+        Return True
+    End Function
+
+    Public Shared Function isOldFile(ByRef file As cProgrammeUpdate, LIST_SOURCE As List(Of cProgrammeUpdate)) As Boolean
+        For Each l In LIST_SOURCE
+            If l.pud_filePathFolder = file.pud_filePathFolder And l.pud_fileName = file.pud_fileName And l.pud_file_Size = file.pud_file_Size And l.pud_file_Date = file.pud_file_Date Then
+                Return False
+            End If
+        Next
+        Return True
+    End Function
+
+
+    Public Shared Function copyProgramLIST(ByRef sourcePfad As String, ByVal destPfad As String, ignoreFilesBeginWith As String()) As Boolean
+        Try
+
+            If destPfad.Trim = "" Then Return False
+            If sourcePfad.Trim = "" Then Return False
+
+            If Not My.Computer.FileSystem.DirectoryExists(sourcePfad) Then
+                MsgBox("ERROR_COPY_01: Quell-Ordner existiert nicht.", MsgBoxStyle.Critical, "ERROR") : Return False
+            End If
+            If Not My.Computer.FileSystem.DirectoryExists(destPfad) Then
+                MsgBox("ERROR_COPY_02: Ziel-Ordner existiert nicht.", MsgBoxStyle.Critical, "ERROR") : Return False
+            End If
+
+            Dim LIST_SOURCE As New List(Of cProgrammeUpdate)
+            Dim dirNameReplace_SOURCE = ""
+            Dim DI_SOURCE As New IO.DirectoryInfo(sourcePfad)
+            RekursivGetFiles(DI_SOURCE, dirNameReplace_SOURCE, LIST_SOURCE, {})
+
+            Dim LIST_DEST As New List(Of cProgrammeUpdate)
+            Dim dirNameReplace_DEST = ""
+            Dim DI_DEST As New IO.DirectoryInfo(destPfad)
+            RekursivGetFiles(DI_DEST, dirNameReplace_DEST, LIST_DEST, ignoreFilesBeginWith)
+
+            If LIST_SOURCE.Count = 0 Then
+                MsgBox("ERROR_COPY_01: Quell-Daten existiert nicht.", MsgBoxStyle.Critical, "ERROR") : Return False
+            End If
+            If LIST_DEST.Count = 0 Then
+                MsgBox("ERROR_COPY_02: Ziel-Daten existiert nicht.", MsgBoxStyle.Critical, "ERROR") : Return False
+            End If
+
+            'ORDNER erstellen:
+            For Each f In LIST_SOURCE
+                If If(f.pud_filePathFolder, "") <> "" Then
+                    If Not IO.Directory.Exists(dirNameReplace_DEST & "\" & f.pud_filePathFolder.Replace("\\", "\")) Then
+                        IO.Directory.CreateDirectory(dirNameReplace_DEST & "\" & f.pud_filePathFolder.Replace("\\", "\"))
+                    End If
+                End If
+            Next
+
+            'Löschen der unbenötigten Files:
+            For Each f In LIST_DEST
+                If isOldFile(f, LIST_SOURCE) Then
+                    IO.File.Delete(dirNameReplace_DEST & "\" & If(f.pud_filePathFolder, "") & "\" & f.pud_fileName.Replace("\\", "\"))
+                End If
+            Next
+
+            'Kopieren/Überschreiben der neuen Files:
+            For Each f In LIST_SOURCE
+                If isNewFile(f, LIST_DEST) Then
+                    Dim s_path = dirNameReplace_SOURCE & "\" & If(f.pud_filePathFolder, "") & "\" & f.pud_fileName.Replace("\\", "\")
+                    Dim d_path = dirNameReplace_DEST & "\" & If(f.pud_filePathFolder, "") & "\" & f.pud_fileName.Replace("\\", "\")
+                    IO.File.Copy(s_path, d_path)
+                End If
+            Next
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Return False
+        End Try
+        '  If isNewFile(destPfad) Then Return FileCopier(sourcePfad, destPfad)
+        Return True
+    End Function
+
+    Public Shared Function fileStartsWith(fileName As String, ignoreFilesBeginWith As String())
+        For Each s In ignoreFilesBeginWith
+            If fileName.StartsWith(s) Then Return True
+        Next
+        Return False
+    End Function
+    Public Shared Sub RekursivGetFiles(ByVal oDir As IO.DirectoryInfo, ByRef dirNameReplace As String, ByRef LIST As List(Of cProgrammeUpdate), ignoreFilesBeginWith As String())
+        Dim oSubDir As IO.DirectoryInfo
+        Dim FI As IO.FileInfo
+
+        ' zunächst alle Dateien des Ordners aufspüren
+        For Each FI In oDir.GetFiles()
+            If Not fileStartsWith(FI.Name, ignoreFilesBeginWith) Then 'DATEIEN beginnen mit betimmten Namen, z.B. UPDATER
+
+
+                ' Dim FI As New IO.FileInfo(oFile)
+                If dirNameReplace = "" Then
+                    dirNameReplace = FI.DirectoryName
+                End If
+
+                Dim UD As New cProgrammeUpdate
+                UD.pud_fileName = FI.Name
+                UD.pud_filePathFolder = FI.DirectoryName.Replace(dirNameReplace, "")
+                If UD.pud_filePathFolder = "" Then UD.pud_filePathFolder = Nothing
+                UD.pud_file_Size = FI.Length
+                UD.pud_file_Date = FI.LastWriteTime
+                UD.pud_file_Verion = "" 'FI.
+                LIST.Add(UD)
+
+            End If
+            'With oFile
+            '    ListBox1.Items.Add(.DirectoryName & "\" & .Name & vbTab &
+            '      .Length & vbTab & .LastWriteTime)
+            'End With
+        Next
+
+        ' Jetzt alle Unterverzeichnis durchlaufen
+        ' und die Prozedur rekursiv selbst aufrufen
+        For Each oSubDir In oDir.GetDirectories()
+            RekursivGetFiles(oSubDir, dirNameReplace, LIST, {})
+        Next
+    End Sub
+
+End Class
+
+Public Class SQLVariable
+    Private TextSQLName As String
+    Private ValueSQLVALUE As Object
+    Private Scalarvariablename As String
+    Private primaryParam As Boolean
+    Private onlyForLoad As Boolean
+
+    Public Sub New(ByVal Text As String, ByVal Value As Object, Optional Scalarvariablename As String = "", Optional primaryParam As Boolean = False, Optional onlyForLoad As Boolean = False)
+        Me.TextSQLName = Text
+        Me.ValueSQLVALUE = Value
+        Me.primaryParam = primaryParam
+        Me.onlyForLoad = onlyForLoad
+
+        If Scalarvariablename <> "" Then Me.Scalarvariablename = Scalarvariablename Else Me.Scalarvariablename = Text
+    End Sub
+
+    Public ReadOnly Property Text() As String
+        Get
+            Return TextSQLName
+        End Get
+    End Property
+
+    Public ReadOnly Property Value() As Object
+        Get
+            Return ValueSQLVALUE
+        End Get
+    End Property
+
+    Public ReadOnly Property Scalarvariable() As Object
+        Get
+            Return Scalarvariablename
+        End Get
+    End Property
+
+    Public ReadOnly Property isPrimaryParam() As Boolean
+        Get
+            Return primaryParam
+        End Get
+    End Property
+
+    Public ReadOnly Property isonlyForLoad() As Boolean
+        Get
+            Return onlyForLoad
+        End Get
+    End Property
+
+
+    '  Public Overrides Function ToString() As Object
+    '      Return mText
+    '  End Function
+
+
+
+End Class
--- a/Aviso/Anhänge/frmAddSendnung.vb
+++ b/Aviso/Anhänge/frmAddSendnung.vb
@@ -19,20 +19,26 @@
    End Sub

    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+        Try

-        Sendung = New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SQL.getValueTxtBySql("SELECT Count(*)+1 FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & "", "AVISO"),,,, 0)
-        Sendung.tblSnd_Abfertigungsart_ID = cboAbfertigungsart._value
-        Sendung.tblSnd_Empfaenger = txtEmpfaenger.Text
-        Sendung.tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr
-        Sendung.tblSnd_Colli = txtColli.Text
-        Sendung.tblSnd_Gewicht = txtGewicht.Text
-        Sendung.tblSnd_Warenbezeichnung = rtbWarenbezeichnung.Text
+            Sendung = New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, SQL.getValueTxtBySql("SELECT Count(*)+1 FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & "", "AVISO"),,,, 0)
+            Sendung.tblSnd_Abfertigungsart_ID = If(cboAbfertigungsart._value <> "", cboAbfertigungsart._value, -1)
+            Sendung.tblSnd_Empfaenger = txtEmpfaenger.Text
+            Sendung.tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr
+            Sendung.tblSnd_Colli = txtColli.Text
+            Sendung.tblSnd_Gewicht = txtGewicht.Text
+            Sendung.tblSnd_Warenbezeichnung = rtbWarenbezeichnung.Text
+
+            If Sendung.SAVE Then
+                Me.DialogResult = DialogResult.OK
+            Else
+                Me.DialogResult = DialogResult.None
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try

-        If Sendung.SAVE Then
-            Me.DialogResult = DialogResult.OK
-        Else
-            Me.DialogResult = DialogResult.None
-        End If
    End Sub

 End Class
--- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
@@ -26,16 +26,24 @@ Partial Class frmSendungAnhangImport
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport))
        Me.lbl = New System.Windows.Forms.Label()
        Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel()
+        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
+        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel()
-        Me.Label1 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.pnlAnfuegen = New System.Windows.Forms.Panel()
+        Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button6 = New System.Windows.Forms.Button()
        Me.btnAnfuegenAll = New System.Windows.Forms.Button()
+        Me.txtDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label7 = New System.Windows.Forms.Label()
+        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.Label5 = New System.Windows.Forms.Label()
+        Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.btnAnfuegen = New System.Windows.Forms.Button()
+        Me.txtSeiten = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.cbxDelPDF = New System.Windows.Forms.CheckBox()
        Me.btn = New System.Windows.Forms.Button()
@@ -51,14 +59,8 @@ Partial Class frmSendungAnhangImport
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnAddSnd = New System.Windows.Forms.Button()
        Me.cboSendungen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.txtDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.txtSeiten = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
-        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlAviso.SuspendLayout()
        Me.pnlAnfuegen.SuspendLayout()
        Me.cntxt.SuspendLayout()
@@ -88,6 +90,36 @@ Partial Class frmSendungAnhangImport
        Me.flpnlAviso.Size = New System.Drawing.Size(200, 825)
        Me.flpnlAviso.TabIndex = 7
        '
+        'UsrCntlSendungAnhangElement1
+        '
+        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
+        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
+        '
+        'UsrCntlSendungAnhangElement2
+        '
+        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
+        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
+        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
+        '
        'flpnlSendungen
        '
        Me.flpnlSendungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -97,16 +129,7 @@ Partial Class frmSendungAnhangImport
        Me.flpnlSendungen.Location = New System.Drawing.Point(1073, 62)
        Me.flpnlSendungen.Name = "flpnlSendungen"
        Me.flpnlSendungen.Size = New System.Drawing.Size(230, 731)
-        Me.flpnlSendungen.TabIndex = 11
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(221, 182)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(55, 13)
-        Me.Label1.TabIndex = 10
-        Me.Label1.Text = "Vorschau:"
+        Me.flpnlSendungen.TabIndex = 10
        '
        'Label2
        '
@@ -133,6 +156,9 @@ Partial Class frmSendungAnhangImport
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pnlAnfuegen.BackColor = System.Drawing.Color.FloralWhite
        Me.pnlAnfuegen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlAnfuegen.Controls.Add(Me.txtBezeichnung)
+        Me.pnlAnfuegen.Controls.Add(Me.Label1)
+        Me.pnlAnfuegen.Controls.Add(Me.Button6)
        Me.pnlAnfuegen.Controls.Add(Me.btnAnfuegenAll)
        Me.pnlAnfuegen.Controls.Add(Me.txtDateiname)
        Me.pnlAnfuegen.Controls.Add(Me.Label7)
@@ -146,20 +172,85 @@ Partial Class frmSendungAnhangImport
        Me.pnlAnfuegen.Controls.Add(Me.cbxDelPDF)
        Me.pnlAnfuegen.Location = New System.Drawing.Point(221, 30)
        Me.pnlAnfuegen.Name = "pnlAnfuegen"
-        Me.pnlAnfuegen.Size = New System.Drawing.Size(846, 142)
+        Me.pnlAnfuegen.Size = New System.Drawing.Size(846, 162)
        Me.pnlAnfuegen.TabIndex = 8
        '
+        'txtBezeichnung
+        '
+        Me.txtBezeichnung._DateTimeOnly = False
+        Me.txtBezeichnung._numbersOnly = False
+        Me.txtBezeichnung._numbersOnlyKommastellen = ""
+        Me.txtBezeichnung._Prozent = False
+        Me.txtBezeichnung._ShortDateNew = False
+        Me.txtBezeichnung._ShortDateOnly = False
+        Me.txtBezeichnung._TimeOnly = False
+        Me.txtBezeichnung._value = ""
+        Me.txtBezeichnung._Waehrung = False
+        Me.txtBezeichnung._WaehrungZeichen = True
+        Me.txtBezeichnung.BackColor = System.Drawing.Color.White
+        Me.txtBezeichnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtBezeichnung.ForeColor = System.Drawing.Color.Black
+        Me.txtBezeichnung.Location = New System.Drawing.Point(68, 105)
+        Me.txtBezeichnung.MaxLineLength = -1
+        Me.txtBezeichnung.MaxLines_Warning = ""
+        Me.txtBezeichnung.MaxLines_Warning_Label = Nothing
+        Me.txtBezeichnung.Name = "txtBezeichnung"
+        Me.txtBezeichnung.Size = New System.Drawing.Size(453, 26)
+        Me.txtBezeichnung.TabIndex = 7
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(3, 113)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(63, 13)
+        Me.Label1.TabIndex = 10
+        Me.Label1.Text = "Bezeichng.:"
+        '
+        'Button6
+        '
+        Me.Button6.BackColor = System.Drawing.Color.Wheat
+        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button6.Location = New System.Drawing.Point(523, 105)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(277, 28)
+        Me.Button6.TabIndex = 11
+        Me.Button6.Text = "Seiten löschen"
+        Me.Button6.UseVisualStyleBackColor = False
+        '
        'btnAnfuegenAll
        '
        Me.btnAnfuegenAll.BackColor = System.Drawing.Color.Wheat
        Me.btnAnfuegenAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAnfuegenAll.Location = New System.Drawing.Point(527, 47)
+        Me.btnAnfuegenAll.Location = New System.Drawing.Point(523, 47)
        Me.btnAnfuegenAll.Name = "btnAnfuegenAll"
-        Me.btnAnfuegenAll.Size = New System.Drawing.Size(273, 56)
-        Me.btnAnfuegenAll.TabIndex = 8
+        Me.btnAnfuegenAll.Size = New System.Drawing.Size(277, 56)
+        Me.btnAnfuegenAll.TabIndex = 9
        Me.btnAnfuegenAll.Text = ">>   Ganzes Dokument anfügen   >>"
        Me.btnAnfuegenAll.UseVisualStyleBackColor = False
        '
+        'txtDateiname
+        '
+        Me.txtDateiname._DateTimeOnly = False
+        Me.txtDateiname._numbersOnly = False
+        Me.txtDateiname._numbersOnlyKommastellen = ""
+        Me.txtDateiname._Prozent = False
+        Me.txtDateiname._ShortDateNew = False
+        Me.txtDateiname._ShortDateOnly = False
+        Me.txtDateiname._TimeOnly = False
+        Me.txtDateiname._value = ""
+        Me.txtDateiname._Waehrung = False
+        Me.txtDateiname._WaehrungZeichen = True
+        Me.txtDateiname.ForeColor = System.Drawing.Color.Black
+        Me.txtDateiname.Location = New System.Drawing.Point(68, 11)
+        Me.txtDateiname.MaxLineLength = -1
+        Me.txtDateiname.MaxLines_Warning = ""
+        Me.txtDateiname.MaxLines_Warning_Label = Nothing
+        Me.txtDateiname.Name = "txtDateiname"
+        Me.txtDateiname.ReadOnly = True
+        Me.txtDateiname.Size = New System.Drawing.Size(732, 20)
+        Me.txtDateiname.TabIndex = 1
+        '
        'Label7
        '
        Me.Label7.AutoSize = True
@@ -169,13 +260,35 @@ Partial Class frmSendungAnhangImport
        Me.Label7.TabIndex = 0
        Me.Label7.Text = "Datei:"
        '
+        'MyTextBox2
+        '
+        Me.MyTextBox2._DateTimeOnly = False
+        Me.MyTextBox2._numbersOnly = False
+        Me.MyTextBox2._numbersOnlyKommastellen = ""
+        Me.MyTextBox2._Prozent = False
+        Me.MyTextBox2._ShortDateNew = False
+        Me.MyTextBox2._ShortDateOnly = False
+        Me.MyTextBox2._TimeOnly = False
+        Me.MyTextBox2._value = ""
+        Me.MyTextBox2._Waehrung = False
+        Me.MyTextBox2._WaehrungZeichen = True
+        Me.MyTextBox2.ForeColor = System.Drawing.Color.Black
+        Me.MyTextBox2.Location = New System.Drawing.Point(68, 137)
+        Me.MyTextBox2.MaxLineLength = -1
+        Me.MyTextBox2.MaxLines_Warning = ""
+        Me.MyTextBox2.MaxLines_Warning_Label = Nothing
+        Me.MyTextBox2.Name = "MyTextBox2"
+        Me.MyTextBox2.ReadOnly = True
+        Me.MyTextBox2.Size = New System.Drawing.Size(453, 20)
+        Me.MyTextBox2.TabIndex = 13
+        '
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(3, 112)
+        Me.Label6.Location = New System.Drawing.Point(3, 140)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(53, 13)
-        Me.Label6.TabIndex = 9
+        Me.Label6.TabIndex = 12
        Me.Label6.Text = "Sendung:"
        '
        'Label5
@@ -187,6 +300,18 @@ Partial Class frmSendungAnhangImport
        Me.Label5.TabIndex = 5
        Me.Label5.Text = "Art:"
        '
+        'cboArt
+        '
+        Me.cboArt._allowedValuesFreiText = Nothing
+        Me.cboArt._allowFreiText = False
+        Me.cboArt._value = ""
+        Me.cboArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboArt.FormattingEnabled = True
+        Me.cboArt.Location = New System.Drawing.Point(68, 75)
+        Me.cboArt.Name = "cboArt"
+        Me.cboArt.Size = New System.Drawing.Size(242, 28)
+        Me.cboArt.TabIndex = 6
+        '
        'btnAnfuegen
        '
        Me.btnAnfuegen.BackColor = System.Drawing.Color.Wheat
@@ -194,10 +319,33 @@ Partial Class frmSendungAnhangImport
        Me.btnAnfuegen.Location = New System.Drawing.Point(316, 47)
        Me.btnAnfuegen.Name = "btnAnfuegen"
        Me.btnAnfuegen.Size = New System.Drawing.Size(205, 56)
-        Me.btnAnfuegen.TabIndex = 7
+        Me.btnAnfuegen.TabIndex = 8
        Me.btnAnfuegen.Text = ">>   Anfügen   >>"
        Me.btnAnfuegen.UseVisualStyleBackColor = False
        '
+        'txtSeiten
+        '
+        Me.txtSeiten._DateTimeOnly = False
+        Me.txtSeiten._numbersOnly = False
+        Me.txtSeiten._numbersOnlyKommastellen = ""
+        Me.txtSeiten._Prozent = False
+        Me.txtSeiten._ShortDateNew = False
+        Me.txtSeiten._ShortDateOnly = False
+        Me.txtSeiten._TimeOnly = False
+        Me.txtSeiten._value = ""
+        Me.txtSeiten._Waehrung = False
+        Me.txtSeiten._WaehrungZeichen = True
+        Me.txtSeiten.BackColor = System.Drawing.Color.White
+        Me.txtSeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSeiten.ForeColor = System.Drawing.Color.Black
+        Me.txtSeiten.Location = New System.Drawing.Point(68, 47)
+        Me.txtSeiten.MaxLineLength = -1
+        Me.txtSeiten.MaxLines_Warning = ""
+        Me.txtSeiten.MaxLines_Warning_Label = Nothing
+        Me.txtSeiten.Name = "txtSeiten"
+        Me.txtSeiten.Size = New System.Drawing.Size(242, 26)
+        Me.txtSeiten.TabIndex = 4
+        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -279,16 +427,17 @@ Partial Class frmSendungAnhangImport
        Me.pnl.Location = New System.Drawing.Point(221, 198)
        Me.pnl.Name = "pnl"
        Me.pnl.Size = New System.Drawing.Size(846, 657)
-        Me.pnl.TabIndex = 12
+        Me.pnl.TabIndex = 11
        '
        'Button5
        '
-        Me.Button5.Location = New System.Drawing.Point(766, 3)
+        Me.Button5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button5.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.Button5.Location = New System.Drawing.Point(793, 1)
        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(75, 23)
+        Me.Button5.Size = New System.Drawing.Size(48, 34)
        Me.Button5.TabIndex = 2
        Me.Button5.UseVisualStyleBackColor = True
-        Me.Button5.Visible = False
        '
        'PdfViewer
        '
@@ -321,7 +470,7 @@ Partial Class frmSendungAnhangImport
        Me.Button3.Location = New System.Drawing.Point(1073, 799)
        Me.Button3.Name = "Button3"
        Me.Button3.Size = New System.Drawing.Size(230, 56)
-        Me.Button3.TabIndex = 13
+        Me.Button3.TabIndex = 12
        Me.Button3.Text = "<<   zurück   <<"
        Me.Button3.UseVisualStyleBackColor = False
        '
@@ -336,16 +485,16 @@ Partial Class frmSendungAnhangImport
        Me.Button4.Text = "Löschen"
        Me.Button4.UseVisualStyleBackColor = True
        '
-        'Button1
+        'btnAddSnd
        '
-        Me.Button1.ContextMenuStrip = Me.cntxt
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(1125, 2)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 25)
-        Me.Button1.TabIndex = 1
-        Me.Button1.Text = "Hinzufügen"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.btnAddSnd.ContextMenuStrip = Me.cntxt
+        Me.btnAddSnd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAddSnd.Location = New System.Drawing.Point(1159, 2)
+        Me.btnAddSnd.Name = "btnAddSnd"
+        Me.btnAddSnd.Size = New System.Drawing.Size(75, 25)
+        Me.btnAddSnd.TabIndex = 1
+        Me.btnAddSnd.Text = "+ Sendung"
+        Me.btnAddSnd.UseVisualStyleBackColor = True
        '
        'cboSendungen
        '
@@ -361,122 +510,13 @@ Partial Class frmSendungAnhangImport
        Me.cboSendungen.Size = New System.Drawing.Size(230, 28)
        Me.cboSendungen.TabIndex = 9
        '
-        'txtDateiname
-        '
-        Me.txtDateiname._DateTimeOnly = False
-        Me.txtDateiname._numbersOnly = False
-        Me.txtDateiname._numbersOnlyKommastellen = ""
-        Me.txtDateiname._Prozent = False
-        Me.txtDateiname._ShortDateNew = False
-        Me.txtDateiname._ShortDateOnly = False
-        Me.txtDateiname._TimeOnly = False
-        Me.txtDateiname._value = ""
-        Me.txtDateiname._Waehrung = False
-        Me.txtDateiname._WaehrungZeichen = True
-        Me.txtDateiname.ForeColor = System.Drawing.Color.Black
-        Me.txtDateiname.Location = New System.Drawing.Point(62, 11)
-        Me.txtDateiname.MaxLineLength = -1
-        Me.txtDateiname.MaxLines_Warning = ""
-        Me.txtDateiname.MaxLines_Warning_Label = Nothing
-        Me.txtDateiname.Name = "txtDateiname"
-        Me.txtDateiname.ReadOnly = True
-        Me.txtDateiname.Size = New System.Drawing.Size(738, 20)
-        Me.txtDateiname.TabIndex = 1
-        '
-        'MyTextBox2
-        '
-        Me.MyTextBox2._DateTimeOnly = False
-        Me.MyTextBox2._numbersOnly = False
-        Me.MyTextBox2._numbersOnlyKommastellen = ""
-        Me.MyTextBox2._Prozent = False
-        Me.MyTextBox2._ShortDateNew = False
-        Me.MyTextBox2._ShortDateOnly = False
-        Me.MyTextBox2._TimeOnly = False
-        Me.MyTextBox2._value = ""
-        Me.MyTextBox2._Waehrung = False
-        Me.MyTextBox2._WaehrungZeichen = True
-        Me.MyTextBox2.ForeColor = System.Drawing.Color.Black
-        Me.MyTextBox2.Location = New System.Drawing.Point(62, 109)
-        Me.MyTextBox2.MaxLineLength = -1
-        Me.MyTextBox2.MaxLines_Warning = ""
-        Me.MyTextBox2.MaxLines_Warning_Label = Nothing
-        Me.MyTextBox2.Name = "MyTextBox2"
-        Me.MyTextBox2.ReadOnly = True
-        Me.MyTextBox2.Size = New System.Drawing.Size(738, 20)
-        Me.MyTextBox2.TabIndex = 10
-        '
-        'cboArt
-        '
-        Me.cboArt._allowedValuesFreiText = Nothing
-        Me.cboArt._allowFreiText = False
-        Me.cboArt._value = ""
-        Me.cboArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboArt.FormattingEnabled = True
-        Me.cboArt.Location = New System.Drawing.Point(62, 75)
-        Me.cboArt.Name = "cboArt"
-        Me.cboArt.Size = New System.Drawing.Size(248, 28)
-        Me.cboArt.TabIndex = 6
-        '
-        'txtSeiten
-        '
-        Me.txtSeiten._DateTimeOnly = False
-        Me.txtSeiten._numbersOnly = False
-        Me.txtSeiten._numbersOnlyKommastellen = ""
-        Me.txtSeiten._Prozent = False
-        Me.txtSeiten._ShortDateNew = False
-        Me.txtSeiten._ShortDateOnly = False
-        Me.txtSeiten._TimeOnly = False
-        Me.txtSeiten._value = ""
-        Me.txtSeiten._Waehrung = False
-        Me.txtSeiten._WaehrungZeichen = True
-        Me.txtSeiten.BackColor = System.Drawing.Color.White
-        Me.txtSeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSeiten.ForeColor = System.Drawing.Color.Black
-        Me.txtSeiten.Location = New System.Drawing.Point(62, 47)
-        Me.txtSeiten.MaxLineLength = -1
-        Me.txtSeiten.MaxLines_Warning = ""
-        Me.txtSeiten.MaxLines_Warning_Label = Nothing
-        Me.txtSeiten.Name = "txtSeiten"
-        Me.txtSeiten.Size = New System.Drawing.Size(248, 26)
-        Me.txtSeiten.TabIndex = 4
-        '
-        'UsrCntlSendungAnhangElement1
-        '
-        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
-        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
-        '
-        'UsrCntlSendungAnhangElement2
-        '
-        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
-        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
-        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
-        '
        'frmSendungAnhangImport
        '
        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(1309, 860)
-        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.btnAddSnd)
        Me.Controls.Add(Me.Button4)
        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.cboSendungen)
@@ -485,7 +525,6 @@ Partial Class frmSendungAnhangImport
        Me.Controls.Add(Me.pnlAnfuegen)
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.flpnlSendungen)
        Me.Controls.Add(Me.flpnlAviso)
        Me.Controls.Add(Me.lbl)
@@ -508,7 +547,6 @@ Partial Class frmSendungAnhangImport
    Friend WithEvents lbl As Label
    Friend WithEvents flpnlAviso As FlowLayoutPanel
    Friend WithEvents flpnlSendungen As FlowLayoutPanel
-    Friend WithEvents Label1 As Label
    Friend WithEvents Label2 As Label
    Friend WithEvents Label3 As Label
    Friend WithEvents pnlAnfuegen As Panel
@@ -537,7 +575,10 @@ Partial Class frmSendungAnhangImport
    Friend WithEvents PrintDocument1 As Printing.PrintDocument
    Friend WithEvents PdfViewer As Spire.PdfViewer.Forms.PdfViewer
    Friend WithEvents WebBrowser As WebBrowser
-    Friend WithEvents Button1 As Button
+    Friend WithEvents btnAddSnd As Button
    Friend WithEvents Button5 As Button
    Friend WithEvents AusZwischenablageeinfügenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents Button6 As Button
+    Friend WithEvents txtBezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label1 As Label
 End Class
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -61,7 +61,7 @@ Public Class frmSendungAnhangImport
                                         ' PdfViewer.DocumentLoaded += New EventHandler(AddressOf radPdfViewer1_DocumentLoaded)

                                         txtDateiname.Text = USRCNTL.FILE_NAME
-
+                                         txtSeiten.Focus()
                                         '  End If
                                     End Sub

@@ -135,6 +135,13 @@ Public Class frmSendungAnhangImport
    '    End Try
    'End Function

+    Function getPDFSplitName(FILE_NAME)
+        If txtBezeichnung.Text <> "" Then
+            Return txtBezeichnung.Text
+        End If
+
+        Return FILE_NAME
+    End Function
    Dim tmpPageMove = 0
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAnfuegen.Click
        If txtSeiten.Text = "" Then Exit Sub
@@ -142,8 +149,14 @@ Public Class frmSendungAnhangImport
        If cboSendungen._value = "" Then Exit Sub
        If Not checkSeiten() Then Exit Sub

+        Dim CurrentPageNumber = PdfViewer.CurrentPageNumber
+        Dim pages = getPagesFromText()
+        Dim cntl = getAcitveCntl()
+        Dim cntlID = If(cntl IsNot Nothing, getAcitveCntl().FILE_ANHID, -1)
+
        For Each u As usrCntlSendungAnhangElement In flpnlAviso.Controls
            If u.ACTIVE Then
+                If u.FILE_TYPE <> "PDF" Then Exit Sub
                Dim fi As New FileInfo(u.FILE_PATH)
                '------------- 
                '------------- PDFs extrahieren und auf den Datenserver laden + Eintrag in tblAvisoAnhaenger
@@ -154,12 +167,13 @@ Public Class frmSendungAnhangImport
                If Not extractPagesFromPdf_Spire(u.FILE_PATH, TMP_Path_New, getPagesFromText()) Then Exit Sub

                'Hochladen in den Datenserver und anfügen in die Tbl Anhänge mit der SendungsId
-                saveToDS(AvisoId, u.FILE_NAME, TMP_Path_New, cboArt._value, u.FILE_TYPE,,,, SendngsId)
+
+                saveToDS(AvisoId, getPDFSplitName(u.FILE_NAME), TMP_Path_New, cboArt._value, u.FILE_TYPE,,,, SendngsId)

                '------------- 
                '------------- PDFs aus der original Datei löschen
                '------------- 
-                '   tryDelete(TMP_Path_New)
+                'tryDelete(TMP_Path_New)

                If cbxDelPDF.Checked Then
                    If cbxDelPDF.Checked Then
@@ -189,33 +203,55 @@ Public Class frmSendungAnhangImport
        clearPnlAnfuegen()
        '   initSendungen()

-        Dim CurrentPageNumber = PdfViewer.CurrentPageNumber
-        Dim pages = getPagesFromText()
-        Dim cntl = getAcitveCntl()
        initFlpANH_LIST()

        If flpnlAviso.Controls.Count > 0 Then
-            If Not setAvtive(flpnlAviso, CurrentPageNumber, pages, cntl) Then
+            If Not setAvtiveById(flpnlAviso, CurrentPageNumber, pages, cntlID) Then
                DirectCast(flpnlAviso.Controls(0), usrCntlSendungAnhangElement).CLICK_Me()
            End If
        End If
    End Sub

-    Function setAvtive(pnl, CurrentPageNumber, listDelPages, u) As Boolean
-        For Each p As usrCntlSendungAnhangElement In flpnlAviso.Controls
-            If p Is u Then
-                p.ACTIVE = True
-                Dim newCurrentPageNumber = CurrentPageNumber
-                For Each s In getPagesFromText() ' vorheirge Seiten, die gelöscht wurden werden abgezogen
-                    If s < CurrentPageNumber Then CurrentPageNumber -= 1
-                Next
-                If newCurrentPageNumber > 0 Then PdfViewer.GoToPage(newCurrentPageNumber)
-                Return True
-            End If
-        Next
+    Function setAvtiveById(pnl As FlowLayoutPanel, CurrentPageNumber As Integer, listDelPages As List(Of Integer), anhId As Integer) As Boolean
+        Try
+            For Each p As usrCntlSendungAnhangElement In flpnlAviso.Controls
+                If p.FILE_ANHID = anhId Then
+                    'p.ACTIVE = True
+                    p.CLICK_Me()
+                    Dim newCurrentPageNumber = CurrentPageNumber
+                    For Each s In getPagesFromText() ' vorheirge Seiten, die gelöscht wurden werden abgezogen
+                        If s < CurrentPageNumber Then CurrentPageNumber -= 1
+                    Next
+                    If PdfViewer.IsDocumentLoaded Then
+                        If newCurrentPageNumber > 0 Then PdfViewer.GoToPage(newCurrentPageNumber)
+                    End If
+                    Return True
+                End If
+            Next
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
        Return False
    End Function

+    Function setAvtive(pnl As FlowLayoutPanel, CurrentPageNumber As Integer, listDelPages As List(Of Integer), u As usrCntlSendungAnhangElement) As Boolean
+        Try
+            For Each p As usrCntlSendungAnhangElement In flpnlAviso.Controls
+                If p Is u Then
+                    p.ACTIVE = True
+                    Dim newCurrentPageNumber = CurrentPageNumber
+                    For Each s In getPagesFromText() ' vorheirge Seiten, die gelöscht wurden werden abgezogen
+                        If s < CurrentPageNumber Then CurrentPageNumber -= 1
+                    Next
+                    If newCurrentPageNumber > 0 Then PdfViewer.GoToPage(newCurrentPageNumber)
+                    Return True
+                End If
+            Next
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+        Return False
+    End Function

    Private Sub Button1_ClickALL(sender As Object, e As EventArgs) Handles btnAnfuegenAll.Click
        If cboSendungen._value = "" Then Exit Sub
@@ -243,10 +279,11 @@ Public Class frmSendungAnhangImport
                    End If
                Else
                    ANH.anh_SendungsId = SendngsId
+                    If cboArt._value <> "" Then ANH.anh_Art = cboArt._value
                    ANH.anh_id = -1 'neuer Eintrag
-                    ANH.SAVE()
+                        ANH.SAVE()
+                    End If
                End If
-            End If
        Next
        clearPnlAnfuegen()
        '   initSendungen()
@@ -257,6 +294,7 @@ Public Class frmSendungAnhangImport
        txtDateiname.Text = ""
        txtSeiten.Text = ""
        cboArt.Text = ""
+        txtBezeichnung.Text = ""
        txtSeiten.Focus()

        Dim u As usrCntlSendungAnhangElement = getAcitveCntl()
@@ -400,8 +438,22 @@ Public Class frmSendungAnhangImport
                '  Dim pageInt = p - 1 ' Nciht SeitenNr. sonder Aufzählung
                Dim pageInt = p
                If pageInt >= 0 And pageInt < pdf.Pages.Count Then
-                    page = pdf1.Pages.Add(pdf.Pages(p).Size, New Graphics.PdfMargins(0))
-                    pdf.Pages(p).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0))
+                    Dim pageOLD As PdfPageBase = pdf.Pages(pageInt)
+                    If pageOLD.Rotation = PdfPageRotateAngle.RotateAngle90 Then
+                        page = pdf1.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Graphics.PdfMargins(0))
+                    ElseIf pageOLD.Rotation = PdfPageRotateAngle.RotateAngle270 Then
+                        page = pdf1.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Graphics.PdfMargins(0))
+                    Else
+                        page = pdf1.Pages.Add(pageOLD.Size, New Graphics.PdfMargins(0))
+                    End If
+                    pdf.Pages(pageInt).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0))
+
+
+                    'alter Kot:
+                    'page = pdf1.Pages.Add(pdf.Pages(p).Size, New Graphics.PdfMargins(0))
+                    'pdf.Pages(p).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0))
+
+
                    PagesLeft += 1
                End If
            Next
@@ -422,6 +474,31 @@ Public Class frmSendungAnhangImport

        Try

+
+            ''Load the original PDF 
+            'Dim pdf As New PdfDocument()
+            'pdf.LoadFromFile("20191017092932604.pdf")
+            ''Get the first page
+            'Dim page As PdfPageBase = pdf.Pages(0)
+            ''Create a new PDF file
+            'Dim pdf1 As New PdfDocument()
+            'Dim newPage As PdfPageBase
+            ''Judge if the page is rotated and rotate it back 
+            'If page.Rotation = PdfPageRotateAngle.RotateAngle90 Then
+            '    newPage = pdf1.Pages.Add(New SizeF(page.Size.Height, page.Size.Width), New PdfMargins(0))
+            'End If
+            'If page.Rotation = PdfPageRotateAngle.RotateAngle270 Then
+            '    newPage = pdf1.Pages.Add(New SizeF(page.Size.Height, page.Size.Width), New PdfMargins(0))
+            'Else
+            '    newPage = pdf1.Pages.Add(page.Size, New PdfMargins(0))
+            'End If
+            ''Draw template on new page
+            'page.CreateTemplate().Draw(newPage, New PointF(0, 0))
+            ''Save the file
+            'pdf1.SaveToFile("result.pdf", Spire.Pdf.FileFormat.PDF)
+
+
+
            Dim pdf As New PdfDocument()
            pdf.LoadFromFile(sourceFile)

@@ -431,8 +508,20 @@ Public Class frmSendungAnhangImport
            For Each p In pagesToExtract
                Dim pageInt = p - 1 ' Nciht SeitenNr. sonder Aufzählung
                If pageInt >= 0 And pageInt < pdf.Pages.Count Then
-                    page = pdf1.Pages.Add(pdf.Pages(pageInt).Size, New Graphics.PdfMargins(0))
+                    Dim pageOLD As PdfPageBase = pdf.Pages(pageInt)
+                    If pageOLD.Rotation = PdfPageRotateAngle.RotateAngle90 Then
+                        page = pdf1.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Graphics.PdfMargins(0))
+                    ElseIf pageOLD.Rotation = PdfPageRotateAngle.RotateAngle270 Then
+                        page = pdf1.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Graphics.PdfMargins(0))
+                    Else
+                        page = pdf1.Pages.Add(pageOLD.Size, New Graphics.PdfMargins(0))
+                    End If
                    pdf.Pages(pageInt).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0))
+
+                    'alter Kot:
+                    '  page = pdf1.Pages.Add(pdf.Pages(pageInt).Size, New Graphics.PdfMargins(0))
+                    'pdf.Pages(pageInt).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0))
+
                End If
            Next
            pdf1.SaveToFile(destinationFile)
@@ -610,17 +699,19 @@ Public Class frmSendungAnhangImport
        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("Vorpapier", "Vorpapier"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
        initSendungen()

-        cboSendungen.changeItem(-1)
+        '   cboSendungen.changeItem(-1)
+        initFlpANH_LIST(flpnlAviso)
    End Sub

    Private Sub frmSendungAnhangImport_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        txtSeiten.Focus()
    End Sub

-    Private Sub txtSeiten_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSeiten.KeyDown, cboArt.KeyDown
+    Private Sub txtSeiten_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSeiten.KeyDown, cboArt.KeyDown, txtBezeichnung.KeyDown
        If e.KeyCode = Keys.Return Then
            btnAnfuegen.PerformClick()
        End If
@@ -645,11 +736,11 @@ Public Class frmSendungAnhangImport
        MyTextBox2.Text = cboSendungen.Text
        flpnlSendungen.Controls.Clear()

-        initFlpANH_LIST()
+        initFlpANH_LIST(flpnlSendungen)

    End Sub

-    Sub initFlpANH_LIST()
+    Sub initFlpANH_LIST(Optional pnl As FlowLayoutPanel = Nothing)
        Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
        'If cboSendungen._value > 0 Then
        '    VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST, cboSendungen._value) 'LÄDT alle Aviso-Anhänge
@@ -657,8 +748,8 @@ Public Class frmSendungAnhangImport
        '    VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Sendungs-Anhänge
        'End If
        VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Aviso-Anhänge
-        flpnlSendungen.Controls.Clear()
-        flpnlAviso.Controls.Clear()
+        If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.Clear()
+        If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.Clear()

        For Each a In ANH_LIST

@@ -675,13 +766,13 @@ Public Class frmSendungAnhangImport

            If If(a.anh_SendungsId, 0) > 0 Then
                If cboSendungen._value <> "" AndAlso cboSendungen._value = a.anh_SendungsId Then
-                    flpnlSendungen.Controls.Add(USRCNTL)
+                    If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.Add(USRCNTL)
                End If
            Else
-                flpnlAviso.Controls.Add(USRCNTL)
+                If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.Add(USRCNTL)
            End If
        Next
-        initLocationViewer("", "PDF")
+        'If act  Is Nothing Then initLocationViewer("", "PDF")
    End Sub

    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnAnfuegenAll.Click
@@ -859,7 +950,7 @@ Public Class frmSendungAnhangImport
        BrowserLoaded = True
    End Sub

-    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnAddSnd.Click
        Dim f As New frmAddSendnung(AvisoId)
        f.ShowDialog(Me)
        initSendungen()
@@ -900,24 +991,125 @@ Public Class frmSendungAnhangImport
    End Sub

    Private Sub txtSeiten_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSeiten.PreviewKeyDown, cboArt.PreviewKeyDown
-        If e.Modifiers = Keys.Control Then
-            If e.KeyCode = Keys.PageDown Then
-                cboSendungen.SelectedIndex = cboSendungen.SelectedIndex + 1
+        Try
+            If e.Modifiers = Keys.Alt Then ' Sendungen durchlaufen
+                If e.KeyCode = Keys.PageDown Then
+                    cboSendungen.SelectedIndex = cboSendungen.SelectedIndex + 1
+                End If
+                If e.KeyCode = Keys.PageUp Then
+                    cboSendungen.SelectedIndex = cboSendungen.SelectedIndex - 1
+                End If
+            ElseIf e.Modifiers = Keys.Control Then ' PDFs durchlaufen
+                If e.KeyCode = Keys.PageDown Then
+                    nextPDF()
+                End If
+                If e.KeyCode = Keys.PageUp Then
+                    prevPDF()
+                End If
+                If e.KeyCode = Keys.Add Then
+                    btnAddSnd.PerformClick()
+                End If
+            Else
+                If e.KeyCode = Keys.PageDown Then
+                    PdfViewer.GoToPage(PdfViewer.CurrentPageNumber + 1)
+                End If
+                If e.KeyCode = Keys.PageUp Then
+                    PdfViewer.GoToPage(PdfViewer.CurrentPageNumber - 1)
+                End If
            End If
-            If e.KeyCode = Keys.PageUp Then
-                cboSendungen.SelectedIndex = cboSendungen.SelectedIndex - 1
+        Catch ex As ArgumentOutOfRangeException
+            'out of range
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
+
+    Sub nextPDF()
+        Dim bool_next = False
+        For Each c As usrCntlSendungAnhangElement In flpnlAviso.Controls
+            If bool_next Then c.CLICK_Me() : Exit Sub
+            If c.ACTIVE Then
+                bool_next = True
            End If
-        Else
-            If e.KeyCode = Keys.PageDown Then
-                PdfViewer.GoToPage(PdfViewer.CurrentPageNumber + 1)
+        Next
+    End Sub
+
+    Sub prevPDF()
+        Dim ctmp As usrCntlSendungAnhangElement = Nothing
+        For Each c As usrCntlSendungAnhangElement In flpnlAviso.Controls
+            If c.ACTIVE Then
+                If ctmp IsNot Nothing Then ctmp.CLICK_Me()
+                Exit Sub
            End If
-            If e.KeyCode = Keys.PageUp Then
-                PdfViewer.GoToPage(PdfViewer.CurrentPageNumber - 1)
+            ctmp = c
+        Next
+    End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+        If txtSeiten.Text = "" Then Exit Sub
+        '   If cboArt._value = "" Then Exit Sub
+        If cboSendungen._value = "" Then Exit Sub
+        If Not checkSeiten() Then Exit Sub
+
+        Dim CurrentPageNumber = PdfViewer.CurrentPageNumber
+        Dim pages = getPagesFromText()
+        Dim cntl = getAcitveCntl()
+        Dim cntlID = If(cntl IsNot Nothing, getAcitveCntl().FILE_ANHID, -1)
+
+        For Each u As usrCntlSendungAnhangElement In flpnlAviso.Controls
+            If u.ACTIVE Then
+                If u.FILE_TYPE <> "PDF" Then Exit Sub
+                Dim fi As New FileInfo(u.FILE_PATH)
+                Dim SendngsId As Integer = cboSendungen._value
+                Dim TMP_Path_Old = u.FILE_PATH
+                Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(u.FILE_NAME, fi.Extension,, True, "SendungsAnhaenge")
+                Dim PagesLeft = 0
+                If vbYes = MsgBox("Möchten Sie die Seiten wirklich auf dem Dokument löschen?", vbYesNoCancel) Then
+
+                    If removePagesFromPdf_Spire(u.FILE_PATH, TMP_Path_New, getPagesFromText(), PagesLeft, False) Then
+                        If PagesLeft = 0 Then
+                            'delFromDS(u.FILE_DOCID)
+                            deleteElement(u.FILE_DOCID, u.FILE_ANHID, False)
+                            flpnlAviso.Controls.Remove(u)
+                        Else
+                            Dim destPath = ""
+                            If saveChangeToDS_daId(u.FILE_DOCID, TMP_Path_New, destPath) Then
+                                tryDelete(TMP_Path_Old)
+                                u.FILE_PATH = destPath
+                            End If
+                        End If
+                    End If
+                End If
+
+                '------------- 
+            End If
+        Next
+        clearPnlAnfuegen()
+        '   initSendungen()
+
+        initFlpANH_LIST()
+
+        If flpnlAviso.Controls.Count > 0 Then
+            If Not setAvtiveById(flpnlAviso, CurrentPageNumber, pages, cntlID) Then
+                DirectCast(flpnlAviso.Controls(0), usrCntlSendungAnhangElement).CLICK_Me()
            End If
        End If
-
    End Sub

+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+        PdfViewer.Rotate(Spire.PdfViewer.Forms.RotateAngle.RotateAngle90)
+    End Sub
+
+    Private Sub cboArt_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboArt.SelectedIndexChanged
+        If cboArt.Text.Replace("Sonstige", "") <> "" Then
+            txtBezeichnung.Text = cboArt.Text.Replace("Rechnung", "Handelsrechnung") & ".pdf"
+        End If
+    End Sub
+
+    'Private Sub txtBezeichnung_GotFocus(sender As Object, e As EventArgs) Handles txtBezeichnung.GotFocus
+    '    txtBezeichnung.SelectAll()
+    'End Sub
+

    'Dim angle = 0
    'Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -74,10 +74,11 @@
    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestCertificateThumbprint>DB2542C115DA3E498155CF646D0289A3872A3B3D</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>2508FAE878AAAD6136689CC8171DC8A749727DD4</ManifestCertificateThumbprint>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestKeyFile>Aviso_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
    <GenerateManifests>true</GenerateManifests>
@@ -86,16 +87,22 @@
    <TargetZone>LocalIntranet</TargetZone>
  </PropertyGroup>
  <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DelaySign>false</DelaySign>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Accessibility" />
    <Reference Include="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
      <HintPath>..\packages\Portable.BouncyCastle.1.8.2\lib\net40\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
-    <Reference Include="com.esendex.sdk, Version=3.4.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
+    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\esendex-dotnet-sdk.3.4.0\lib\net35\com.esendex.sdk.dll</HintPath>
-      <Private>True</Private>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -158,13 +165,14 @@
      <HintPath>..\..\..\dll\NumericBox.dll</HintPath>
    </Reference>
    <Reference Include="Spire.License, Version=1.3.7.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Spire.PDFViewer.4.5.1\lib\net46\Spire.License.dll</HintPath>
+      <HintPath>..\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.License.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.Pdf, Version=5.5.2.2046, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Spire.PDFViewer.4.5.1\lib\net46\Spire.Pdf.dll</HintPath>
+    <Reference Include="Spire.Pdf, Version=5.10.2.2046, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.Pdf.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.PdfViewer.Forms, Version=4.5.1.3046, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Spire.PDFViewer.4.5.1\lib\net46\Spire.PdfViewer.Forms.dll</HintPath>
+    <Reference Include="Spire.PdfViewer.Forms, Version=4.9.5.3046, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+      <HintPath>..\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -701,6 +709,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="Dokumentenbeschriftung\rptSUBWESTIIAktNEU.resx">
      <DependentUpon>rptSUBWESTIIAktNEU.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="Dokumentenbeschriftung\rptSUBWESTIIAkt.resx">
      <DependentUpon>rptSUBWESTIIAkt.vb</DependentUpon>
@@ -886,12 +895,14 @@
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+      <SubType>Designer</SubType>
    </None>
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="Zert_20092019.pfx" />
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
@@ -956,6 +967,12 @@
  <ItemGroup>
    <Content Include="aviso.ico" />
    <Content Include="My Project\aktAlt.jpg" />
+    <None Include="Resources\dakosy.png" />
+    <None Include="Resources\dakosy_dy.png" />
+    <Content Include="Resources\UNISPED.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <None Include="Resources\email_big1.png" />
    <None Include="Resources\email.png" />
    <None Include="Resources\pdfprint1.png" />
    <None Include="Resources\pdfprint.png" />
@@ -1129,6 +1146,13 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>D:\Andreas\Programmierung\VB\Zertifikate\signtool.exe sign /f D:\Andreas\Programmierung\VB\Zertifikate\Zert_20092019.pfx /p BmWr501956 "Aviso.exe"</PostBuildEvent>
+  </PropertyGroup>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -132,7 +132,8 @@ Public Class SendungOptions
    End Sub


-    Shared Sub PrintSendung(art As String, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, AVISO As cAviso, Optional Printername As String = "")
+    Shared Sub PrintSendung(art As String, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, AVISO As cAviso, Optional Printername As String = "", Optional TYP As String = "AKT")
+        'TYP --> LAUFZETTEL
        Dim ADMIN As New cADMIN

        If IsNumeric(SENDUNG.AbfertigungsNr) AndAlso CInt(SENDUNG.AbfertigungsNr) > 100000 Then
@@ -263,6 +264,7 @@ Public Class SendungOptions
        Try

            '  VALUES.BAR = "X"
+            ' Dim dt As DataTable = VERAGSQL.loadDgvBySql("SELECT  rksv_BelegId, rksv_umsatz , isnull((Select Name from Personal where ID=Benutzer),'') as Benutzer FROM [tblEABelegnummer]  where ((FilialenNr='" & SENDUNG.FilialenNr & "' and AbfertigungsNr='" & SENDUNG.AbfertigungsNr & "') OR LKW_id='" & AVISO.AvisoID & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
            Dim dt As DataTable = VERAGSQL.loadDgvBySql("SELECT  rksv_BelegId, rksv_umsatz , isnull((Select Name from Personal where ID=Benutzer),'') as Benutzer FROM [tblEABelegnummer]  where ((FilialenNr='" & SENDUNG.FilialenNr & "' and AbfertigungsNr='" & SENDUNG.AbfertigungsNr & "') OR LKW_id='" & AVISO.AvisoID & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
            If dt.Rows.Count > 0 Then
                VALUES.Frachtfuehrer_Bar_BelegNr = getBenutzerShort(dt.Rows(0)("Benutzer").ToString) & " / " & dt.Rows(0)("rksv_BelegId").ToString
@@ -387,6 +389,10 @@ Public Class SendungOptions
                imgpath = resPath & "LEX.png"
            ElseIf SENDUNG.FilialenNr = "5501" Then
                imgpath = resPath & "IMEX.png"
+            ElseIf SENDUNG.FilialenNr = "5601" Then
+                imgpath = resPath & "UNISPED.png"
+            ElseIf SENDUNG.FilialenNr = "5701" Then
+                imgpath = resPath & "AMBAR.png"
            Else
                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
                    Case "SUB"
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.3.2.5")>
-<Assembly: AssemblyFileVersion("3.3.2.5")>
+<Assembly: AssemblyVersion("3.3.5.1")>
+<Assembly: AssemblyFileVersion("3.3.5.1")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -309,6 +309,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property dakosy() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("dakosy", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property dakosy_dy() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("dakosy_dy", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -399,6 +419,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property email_big1() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("email_big1", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -459,15 +489,6 @@ Namespace My.Resources
            End Get
        End Property
        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
-        '''</summary>
-        Friend ReadOnly Property hdfesdfsdfsdfsdaf2() As String
-            Get
-                Return ResourceManager.GetString("hdfesdfsdfsdfsdaf2", resourceCulture)
-            End Get
-        End Property
-        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1079,7 +1100,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 4.0 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 6.0 ähnelt.
        '''</summary>
        Friend ReadOnly Property UpdaterVersion() As String
            Get
@@ -1128,7 +1149,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 3.3.2.5 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.3.5.1 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -127,9 +127,6 @@
  <data name="spedbuch1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="belegEUR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="QS" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\QS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -178,8 +175,8 @@
  <data name="noAviso_s1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\noAviso_s1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="igl" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="uid" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="abgeklaertAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\abgeklaertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -193,15 +190,15 @@
  <data name="vorauszahlung1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="android-add-contact" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="word1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="android_note" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-note.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="zeus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zeus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -211,27 +208,30 @@
  <data name="searchGG" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="igl" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="NDK" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="sanduhr" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="tranparent30Perc" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tranparent30Perc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="tts" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="email" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="android_clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="parkplatz" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="personInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -256,8 +256,8 @@
  <data name="android_clock_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="android-add-contact" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="del1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -280,8 +280,8 @@
  <data name="scanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="pdfprint1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pdfprint1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="handy1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\handy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -292,6 +292,9 @@
  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="bundesanzeiger" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bundesanzeiger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -313,11 +316,8 @@
  <data name="speditionsbuchInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\speditionsbuchInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="auftrag3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\auftrag3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sanduhr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="abgeklaertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -337,11 +337,14 @@
  <data name="docAllgemein" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\docAllgemein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="akt_ATILLA" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>3.3.2.5</value>
+    <value>3.3.5.1</value>
  </data>
  <data name="Verag_AG_Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -370,8 +373,8 @@
  <data name="zoll_mmm" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoll_mmm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="_SUB" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="auftrag3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\auftrag3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pdf1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -385,8 +388,8 @@
  <data name="LEX" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="soenmez" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\soenmez.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -394,6 +397,9 @@
  <data name="nellenquack" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\nellenquack.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="_SUB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -412,11 +418,11 @@
  <data name="disconnect" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="pdfprint1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pdfprint1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="UpdaterVersion" xml:space="preserve">
-    <value>4.0</value>
+    <value>6.0</value>
+  </data>
+  <data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="stift1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -445,14 +451,14 @@
  <data name="evolog" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="belegEUR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="tarife" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tarife.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="uid" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="speditionsbuchAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vorauszahlung3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -469,8 +475,8 @@
  <data name="stift2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\stift.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="vorauszahlung2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\vorauszahlung2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -484,10 +490,10 @@
  <data name="ambar_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="email" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="dakosy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="hdfesdfsdfsdfsdaf2" xml:space="preserve">
-    <value />
+  <data name="dakosy_dy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dakosy_dy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Aviso/Resources/UNISPED.png
+++ b/Aviso/Resources/UNISPED.png
--- a/Aviso/Resources/dakosy.png
+++ b/Aviso/Resources/dakosy.png
--- a/Aviso/Resources/dakosy_dy.png
+++ b/Aviso/Resources/dakosy_dy.png
--- a/Aviso/Resources/email_big1.png
+++ b/Aviso/Resources/email_big1.png
--- a/Aviso/cEasyBinding.vb
+++ b/Aviso/cEasyBinding.vb
@@ -10,7 +10,7 @@ Public Class cEasyBinding
    Dim connection As SqlConnection
    Dim initialized = False

-    '  Public updateImmediately = False
+    Public updateImmediately = False

    Sub New(Optional conn As String = "AVISO")
        Select Case conn
@@ -58,7 +58,7 @@ Public Class cEasyBinding


    Public Function updateBinding(Optional tablename As String = "", Optional ContinueUpdateOnError As Boolean = False) As Boolean
-        MsgBox("UPD")
+
        If Not initialized Then Return True
        Try
            bindingSource.EndEdit()
@@ -89,7 +89,7 @@ Public Class cEasyBinding
    End Sub


-    ' Private Sub bindingdataTable_ColumnChanged(sender As Object, e As DataColumnChangeEventArgs) Handles bindingdataTable.ColumnChanged
-    '    If updateImmediately Then updateBinding()
-    ' End Sub
+    Private Sub bindingdataTable_ColumnChanged(sender As Object, e As DataColumnChangeEventArgs) Handles bindingdataTable.ColumnChanged
+        If updateImmediately Then updateBinding()
+    End Sub
 End Class
--- a/Aviso/cProgramFunctions.vb
+++ b/Aviso/cProgramFunctions.vb
@@ -7,6 +7,19 @@ Public Class cProgramFunctions
        Try
            Dim aktVersion = My.Resources.UpdaterVersion ' Aktuelle Updater Version
            Dim F = "F:\Programme\AVISO_install\"
+
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                Case "IMEX"
+                    F = "\\192.168.1.20\daten\VERAG Programme\AVISO_INSTALL\"
+                Case "UNISPED"
+                    F = "\\10.4.3.17\VERAG gemeinsam\AVISO_INSTALL\"
+                    buildConnectionUNISPED()
+                Case "AMBAR"
+                Case Else
+            End Select
+
+
+
            Dim doUpdaterUpdate = False
            If IO.File.Exists(AppDomain.CurrentDomain.BaseDirectory & "\AVISOUPDATER_Version.txt") Then 'Updater muss auch existieren, sonst wird er auch beim Developer Rechner eingefügt...
                Dim fs As New FileStream(AppDomain.CurrentDomain.BaseDirectory & "\AVISOUPDATER_Version.txt", FileMode.Open, FileAccess.Read)
@@ -39,6 +52,23 @@ Public Class cProgramFunctions
        End Try
    End Function

+    Shared Sub buildConnectionUNISPED()
+        Try
+
+            Dim netuse As New System.Diagnostics.ProcessStartInfo()
+
+            netuse.FileName = "C:\Windows\system32\net"
+            netuse.Arguments = "use \\10.4.3.17 /User:VERAG 1VerSub9#"
+            netuse.CreateNoWindow = True
+            netuse.WindowStyle = ProcessWindowStyle.Hidden
+            System.Diagnostics.Process.Start(netuse)
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+
+        End Try
+    End Sub
+
    Shared Function cut_file(ByVal file As String) As String ' Funktion zum Entfernen der Backslashs / Ordner While file.Contains("\") file = file.Remove(0, 1) End While Return file End Function 
        While file.Contains("\")
            file = file.Remove(0, 1)
--- a/Aviso/frmEintragAviso.designer.vb
+++ b/Aviso/frmEintragAviso.designer.vb
@@ -74,6 +74,13 @@ Partial Class frmEintragAviso
        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
        Me.Label15 = New System.Windows.Forms.Label()
        Me.grpAviso = New System.Windows.Forms.GroupBox()
+        Me.Label22 = New System.Windows.Forms.Label()
+        Me.txtDyRef = New System.Windows.Forms.TextBox()
+        Me.picDy = New System.Windows.Forms.PictureBox()
+        Me.lblDy = New System.Windows.Forms.Label()
+        Me.kdAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.kdAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.kdFrächter = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.lblZA = New System.Windows.Forms.Label()
        Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.Button4 = New System.Windows.Forms.Button()
@@ -85,7 +92,6 @@ Partial Class frmEintragAviso
        Me.Label16 = New System.Windows.Forms.Label()
        Me.cbxFrächterUnbekannt = New System.Windows.Forms.CheckBox()
        Me.btnAuftraggeber = New System.Windows.Forms.Button()
-        Me.kdAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
        Me.btnAvisiererKd = New System.Windows.Forms.Button()
        Me.btnFraechterKd = New System.Windows.Forms.Button()
@@ -97,8 +103,6 @@ Partial Class frmEintragAviso
        Me.lblErr_Frächter = New System.Windows.Forms.Label()
        Me.lblErr_LKW = New System.Windows.Forms.Label()
        Me.lblErr_Grenzstelle = New System.Windows.Forms.Label()
-        Me.kdAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
-        Me.kdFrächter = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.lblErrFmZollKdNr = New System.Windows.Forms.Label()
        Me.grp = New System.Windows.Forms.GroupBox()
        Me.Button1 = New System.Windows.Forms.Button()
@@ -130,6 +134,7 @@ Partial Class frmEintragAviso
        Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla()
        Me.panAdmin.SuspendLayout()
        Me.grpAviso.SuspendLayout()
+        CType(Me.picDy, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.grp.SuspendLayout()
        Me.grpAktVerzollung.SuspendLayout()
@@ -138,9 +143,10 @@ Partial Class frmEintragAviso
        '
        'btnOK
        '
+        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnOK.Location = New System.Drawing.Point(12, 513)
+        Me.btnOK.Location = New System.Drawing.Point(12, 558)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(306, 45)
        Me.btnOK.TabIndex = 13
@@ -158,9 +164,10 @@ Partial Class frmEintragAviso
        '
        'btnAbbruch
        '
+        Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnAbbruch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAbbruch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnAbbruch.Location = New System.Drawing.Point(324, 513)
+        Me.btnAbbruch.Location = New System.Drawing.Point(324, 558)
        Me.btnAbbruch.Name = "btnAbbruch"
        Me.btnAbbruch.Size = New System.Drawing.Size(91, 45)
        Me.btnAbbruch.TabIndex = 14
@@ -170,7 +177,8 @@ Partial Class frmEintragAviso
        'txtInfo
        '
        Me.txtInfo.AcceptsReturn = True
-        Me.txtInfo.Location = New System.Drawing.Point(9, 339)
+        Me.txtInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.txtInfo.Location = New System.Drawing.Point(9, 383)
        Me.txtInfo.MaxLength = 240
        Me.txtInfo.Multiline = True
        Me.txtInfo.Name = "txtInfo"
@@ -180,8 +188,9 @@ Partial Class frmEintragAviso
        '
        'Label3
        '
+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(6, 325)
+        Me.Label3.Location = New System.Drawing.Point(6, 369)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(25, 13)
        Me.Label3.TabIndex = 40
@@ -227,7 +236,7 @@ Partial Class frmEintragAviso
        Me.txtÄnderungen.Name = "txtÄnderungen"
        Me.txtÄnderungen.ReadOnly = True
        Me.txtÄnderungen.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.txtÄnderungen.Size = New System.Drawing.Size(360, 312)
+        Me.txtÄnderungen.Size = New System.Drawing.Size(360, 357)
        Me.txtÄnderungen.TabIndex = 15
        Me.txtÄnderungen.TabStop = False
        '
@@ -306,7 +315,7 @@ Partial Class frmEintragAviso
        Me.panAdmin.Controls.Add(Me.Label8)
        Me.panAdmin.Controls.Add(Me.lblFreigabe)
        Me.panAdmin.Controls.Add(Me.lblAnkunft)
-        Me.panAdmin.Location = New System.Drawing.Point(543, 373)
+        Me.panAdmin.Location = New System.Drawing.Point(543, 418)
        Me.panAdmin.Name = "panAdmin"
        Me.panAdmin.Size = New System.Drawing.Size(253, 187)
        Me.panAdmin.TabIndex = 16
@@ -645,8 +654,9 @@ Partial Class frmEintragAviso
        '
        'Label12
        '
+        Me.Label12.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Label12.BackColor = System.Drawing.Color.Transparent
-        Me.Label12.Location = New System.Drawing.Point(6, 410)
+        Me.Label12.Location = New System.Drawing.Point(6, 454)
        Me.Label12.Name = "Label12"
        Me.Label12.Size = New System.Drawing.Size(372, 32)
        Me.Label12.TabIndex = 44
@@ -690,6 +700,9 @@ Partial Class frmEintragAviso
        '
        'grpAviso
        '
+        Me.grpAviso.Controls.Add(Me.txtDyRef)
+        Me.grpAviso.Controls.Add(Me.picDy)
+        Me.grpAviso.Controls.Add(Me.lblDy)
        Me.grpAviso.Controls.Add(Me.kdAuftraggeber)
        Me.grpAviso.Controls.Add(Me.kdAvisierer)
        Me.grpAviso.Controls.Add(Me.kdFrächter)
@@ -738,13 +751,130 @@ Partial Class frmEintragAviso
        Me.grpAviso.Controls.Add(Me.Label5)
        Me.grpAviso.Controls.Add(Me.cbxAuftraggeberfurAlleSendungen)
        Me.grpAviso.Controls.Add(Me.Label6)
+        Me.grpAviso.Controls.Add(Me.Label22)
        Me.grpAviso.Location = New System.Drawing.Point(12, 45)
        Me.grpAviso.Name = "grpAviso"
-        Me.grpAviso.Size = New System.Drawing.Size(403, 439)
+        Me.grpAviso.Size = New System.Drawing.Size(403, 483)
        Me.grpAviso.TabIndex = 5
        Me.grpAviso.TabStop = False
        Me.grpAviso.Text = "Aviso"
        '
+        'Label22
+        '
+        Me.Label22.AutoSize = True
+        Me.Label22.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Label22.Location = New System.Drawing.Point(296, 169)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(56, 13)
+        Me.Label22.TabIndex = 50
+        Me.Label22.Text = "= Avisierer"
+        '
+        'txtDyRef
+        '
+        Me.txtDyRef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        Me.txtDyRef.Location = New System.Drawing.Point(24, 342)
+        Me.txtDyRef.MaxLength = 30
+        Me.txtDyRef.Name = "txtDyRef"
+        Me.txtDyRef.Size = New System.Drawing.Size(234, 20)
+        Me.txtDyRef.TabIndex = 48
+        Me.txtDyRef.Visible = False
+        '
+        'picDy
+        '
+        Me.picDy.BackgroundImage = Global.AVISO.My.Resources.Resources.dakosy_dy
+        Me.picDy.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.picDy.Location = New System.Drawing.Point(5, 342)
+        Me.picDy.Name = "picDy"
+        Me.picDy.Size = New System.Drawing.Size(20, 20)
+        Me.picDy.TabIndex = 49
+        Me.picDy.TabStop = False
+        Me.picDy.Visible = False
+        '
+        'lblDy
+        '
+        Me.lblDy.AutoSize = True
+        Me.lblDy.Location = New System.Drawing.Point(6, 328)
+        Me.lblDy.Name = "lblDy"
+        Me.lblDy.Size = New System.Drawing.Size(109, 13)
+        Me.lblDy.TabIndex = 47
+        Me.lblDy.Text = "Dakosy-Referenz-Nr.:"
+        Me.lblDy.Visible = False
+        '
+        'kdAuftraggeber
+        '
+        Me.kdAuftraggeber._AllowSetValue = True
+        Me.kdAuftraggeber._autoSizeGross = False
+        Me.kdAuftraggeber._display_Name1 = False
+        Me.kdAuftraggeber._displayAVISO_Email = True
+        Me.kdAuftraggeber._displayFullName = False
+        Me.kdAuftraggeber._displayWoelflKd = False
+        Me.kdAuftraggeber._hideIfListEmpty = True
+        Me.kdAuftraggeber._loadKdData = False
+        Me.kdAuftraggeber._ValueKdAndName = True
+        Me.kdAuftraggeber.dgvpos = "LEFT"
+        Me.kdAuftraggeber.KdName = ""
+        Me.kdAuftraggeber.KdNr = "-1"
+        Me.kdAuftraggeber.kdNrField = Nothing
+        Me.kdAuftraggeber.KdNrNullInt = Nothing
+        Me.kdAuftraggeber.Location = New System.Drawing.Point(9, 263)
+        Me.kdAuftraggeber.Name = "kdAuftraggeber"
+        Me.kdAuftraggeber.nurAktive = False
+        Me.kdAuftraggeber.searchActive = True
+        Me.kdAuftraggeber.Size = New System.Drawing.Size(343, 20)
+        Me.kdAuftraggeber.TabIndex = 35
+        Me.kdAuftraggeber.usrcntl = Nothing
+        Me.kdAuftraggeber.Visible = False
+        '
+        'kdAvisierer
+        '
+        Me.kdAvisierer._AllowSetValue = True
+        Me.kdAvisierer._autoSizeGross = False
+        Me.kdAvisierer._display_Name1 = False
+        Me.kdAvisierer._displayAVISO_Email = True
+        Me.kdAvisierer._displayFullName = False
+        Me.kdAvisierer._displayWoelflKd = False
+        Me.kdAvisierer._hideIfListEmpty = True
+        Me.kdAvisierer._loadKdData = False
+        Me.kdAvisierer._ValueKdAndName = True
+        Me.kdAvisierer.dgvpos = "LEFT"
+        Me.kdAvisierer.KdName = ""
+        Me.kdAvisierer.KdNr = "-1"
+        Me.kdAvisierer.kdNrField = Nothing
+        Me.kdAvisierer.KdNrNullInt = Nothing
+        Me.kdAvisierer.Location = New System.Drawing.Point(9, 224)
+        Me.kdAvisierer.Name = "kdAvisierer"
+        Me.kdAvisierer.nurAktive = False
+        Me.kdAvisierer.searchActive = True
+        Me.kdAvisierer.Size = New System.Drawing.Size(343, 20)
+        Me.kdAvisierer.TabIndex = 30
+        Me.kdAvisierer.usrcntl = Nothing
+        '
+        'kdFrächter
+        '
+        Me.kdFrächter._AllowSetValue = True
+        Me.kdFrächter._autoSizeGross = False
+        Me.kdFrächter._display_Name1 = False
+        Me.kdFrächter._displayAVISO_Email = True
+        Me.kdFrächter._displayFullName = False
+        Me.kdFrächter._displayWoelflKd = False
+        Me.kdFrächter._hideIfListEmpty = True
+        Me.kdFrächter._loadKdData = False
+        Me.kdFrächter._ValueKdAndName = True
+        Me.kdFrächter.dgvpos = "LEFT"
+        Me.kdFrächter.KdName = ""
+        Me.kdFrächter.KdNr = "-1"
+        Me.kdFrächter.kdNrField = Nothing
+        Me.kdFrächter.KdNrNullInt = Nothing
+        Me.kdFrächter.Location = New System.Drawing.Point(9, 185)
+        Me.kdFrächter.Name = "kdFrächter"
+        Me.kdFrächter.nurAktive = False
+        Me.kdFrächter.searchActive = True
+        Me.kdFrächter.Size = New System.Drawing.Size(343, 20)
+        Me.kdFrächter.TabIndex = 25
+        Me.kdFrächter.usrcntl = Nothing
+        '
        'lblZA
        '
        Me.lblZA.AutoSize = True
@@ -905,37 +1035,13 @@ Partial Class frmEintragAviso
        Me.btnAuftraggeber.UseVisualStyleBackColor = True
        Me.btnAuftraggeber.Visible = False
        '
-        'kdAuftraggeber
-        '
-        Me.kdAuftraggeber._AllowSetValue = True
-        Me.kdAuftraggeber._autoSizeGross = False
-        Me.kdAuftraggeber._display_Name1 = False
-        Me.kdAuftraggeber._displayAVISO_Email = True
-        Me.kdAuftraggeber._displayFullName = False
-        Me.kdAuftraggeber._displayWoelflKd = False
-        Me.kdAuftraggeber._hideIfListEmpty = True
-        Me.kdAuftraggeber._loadKdData = False
-        Me.kdAuftraggeber._ValueKdAndName = True
-        Me.kdAuftraggeber.dgvpos = "LEFT"
-        Me.kdAuftraggeber.KdName = ""
-        Me.kdAuftraggeber.KdNr = "-1"
-        Me.kdAuftraggeber.kdNrField = Nothing
-        Me.kdAuftraggeber.KdNrNullInt = Nothing
-        Me.kdAuftraggeber.Location = New System.Drawing.Point(9, 263)
-        Me.kdAuftraggeber.Name = "kdAuftraggeber"
-        Me.kdAuftraggeber.nurAktive = False
-        Me.kdAuftraggeber.searchActive = True
-        Me.kdAuftraggeber.Size = New System.Drawing.Size(343, 20)
-        Me.kdAuftraggeber.TabIndex = 35
-        Me.kdAuftraggeber.usrcntl = Nothing
-        Me.kdAuftraggeber.Visible = False
-        '
        'UsrCntlTestsystem1
        '
+        Me.UsrCntlTestsystem1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.Transparent
        Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red
-        Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(49, 372)
+        Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(49, 416)
        Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
        Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1"
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
@@ -1066,59 +1172,12 @@ Partial Class frmEintragAviso
        Me.lblErr_Grenzstelle.Text = "Grenzstelle eingeben!"
        Me.lblErr_Grenzstelle.Visible = False
        '
-        'kdAvisierer
-        '
-        Me.kdAvisierer._AllowSetValue = True
-        Me.kdAvisierer._autoSizeGross = False
-        Me.kdAvisierer._display_Name1 = False
-        Me.kdAvisierer._displayAVISO_Email = True
-        Me.kdAvisierer._displayFullName = False
-        Me.kdAvisierer._displayWoelflKd = False
-        Me.kdAvisierer._hideIfListEmpty = True
-        Me.kdAvisierer._loadKdData = False
-        Me.kdAvisierer._ValueKdAndName = True
-        Me.kdAvisierer.dgvpos = "LEFT"
-        Me.kdAvisierer.KdName = ""
-        Me.kdAvisierer.KdNr = "-1"
-        Me.kdAvisierer.kdNrField = Nothing
-        Me.kdAvisierer.KdNrNullInt = Nothing
-        Me.kdAvisierer.Location = New System.Drawing.Point(9, 224)
-        Me.kdAvisierer.Name = "kdAvisierer"
-        Me.kdAvisierer.nurAktive = False
-        Me.kdAvisierer.searchActive = True
-        Me.kdAvisierer.Size = New System.Drawing.Size(343, 20)
-        Me.kdAvisierer.TabIndex = 30
-        Me.kdAvisierer.usrcntl = Nothing
-        '
-        'kdFrächter
-        '
-        Me.kdFrächter._AllowSetValue = True
-        Me.kdFrächter._autoSizeGross = False
-        Me.kdFrächter._display_Name1 = False
-        Me.kdFrächter._displayAVISO_Email = True
-        Me.kdFrächter._displayFullName = False
-        Me.kdFrächter._displayWoelflKd = False
-        Me.kdFrächter._hideIfListEmpty = True
-        Me.kdFrächter._loadKdData = False
-        Me.kdFrächter._ValueKdAndName = True
-        Me.kdFrächter.dgvpos = "LEFT"
-        Me.kdFrächter.KdName = ""
-        Me.kdFrächter.KdNr = "-1"
-        Me.kdFrächter.kdNrField = Nothing
-        Me.kdFrächter.KdNrNullInt = Nothing
-        Me.kdFrächter.Location = New System.Drawing.Point(9, 185)
-        Me.kdFrächter.Name = "kdFrächter"
-        Me.kdFrächter.nurAktive = False
-        Me.kdFrächter.searchActive = True
-        Me.kdFrächter.Size = New System.Drawing.Size(343, 20)
-        Me.kdFrächter.TabIndex = 25
-        Me.kdFrächter.usrcntl = Nothing
-        '
        'lblErrFmZollKdNr
        '
+        Me.lblErrFmZollKdNr.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.lblErrFmZollKdNr.AutoSize = True
        Me.lblErrFmZollKdNr.ForeColor = System.Drawing.Color.Red
-        Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(176, 350)
+        Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(176, 394)
        Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr"
        Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26)
        Me.lblErrFmZollKdNr.TabIndex = 42
@@ -1461,9 +1520,10 @@ Partial Class frmEintragAviso
        '
        'cbxAktenzettelDrucken
        '
+        Me.cbxAktenzettelDrucken.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxAktenzettelDrucken.BackColor = System.Drawing.Color.WhiteSmoke
        Me.cbxAktenzettelDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAktenzettelDrucken.Location = New System.Drawing.Point(12, 483)
+        Me.cbxAktenzettelDrucken.Location = New System.Drawing.Point(12, 528)
        Me.cbxAktenzettelDrucken.Name = "cbxAktenzettelDrucken"
        Me.cbxAktenzettelDrucken.Size = New System.Drawing.Size(403, 33)
        Me.cbxAktenzettelDrucken.TabIndex = 10
@@ -1476,9 +1536,10 @@ Partial Class frmEintragAviso
        Me.cboPrinter._allowedValuesFreiText = Nothing
        Me.cboPrinter._allowFreiText = False
        Me.cboPrinter._value = ""
+        Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(209, 488)
+        Me.cboPrinter.Location = New System.Drawing.Point(209, 533)
        Me.cboPrinter.Name = "cboPrinter"
        Me.cboPrinter.Size = New System.Drawing.Size(206, 21)
        Me.cboPrinter.TabIndex = 11
@@ -1499,7 +1560,7 @@ Partial Class frmEintragAviso
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(792, 566)
+        Me.ClientSize = New System.Drawing.Size(792, 611)
        Me.Controls.Add(Me.cboPrinter)
        Me.Controls.Add(Me.cbxSendungsvorlagen)
        Me.Controls.Add(Me.Button3)
@@ -1529,6 +1590,7 @@ Partial Class frmEintragAviso
        Me.panAdmin.PerformLayout()
        Me.grpAviso.ResumeLayout(False)
        Me.grpAviso.PerformLayout()
+        CType(Me.picDy, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.grp.ResumeLayout(False)
        Me.grp.PerformLayout()
@@ -1646,4 +1708,8 @@ Partial Class frmEintragAviso
    Friend WithEvents lblZA As Label
    Friend WithEvents txtBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
    Public WithEvents kdAvisierer As VERAG_PROG_ALLGEMEIN.KdSearchBox
+    Friend WithEvents txtDyRef As TextBox
+    Friend WithEvents picDy As PictureBox
+    Friend WithEvents lblDy As Label
+    Friend WithEvents Label22 As Label
 End Class
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -81,17 +81,27 @@ Public Class frmEintragAviso
        End If


-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
-            txtSndFiskalAT.Visible = False
-            lblFiskAT.Visible = False
-            txtSndFiskalDE.Visible = False
-            lblFiskDE.Visible = False
-            cboImEx.Visible = True
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX"
+
+                txtSndFiskalAT.Visible = False
+                lblFiskAT.Visible = False
+                txtSndFiskalDE.Visible = False
+                lblFiskDE.Visible = False
+                cboImEx.Visible = True
+
+                txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
+                txtBestimmungszollstelle.Visible = True
+                lblZA.Visible = True
+            Case "UNISPED"
+                lblDy.Visible = True
+                txtDyRef.Visible = True
+                picDy.Visible = True
+        End Select
+
+
+

-            txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
-            txtBestimmungszollstelle.Visible = True
-            lblZA.Visible = True
-        End If

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
            Case "WAI"
@@ -195,6 +205,7 @@ Public Class frmEintragAviso
        Else
            Me.Text = "Änderung LKW-Aviso"
            txtInfo.Visible = False
+            Label3.Visible = False
            'ausgewählter Datensatz wird geladen
            grpAktVerzollung.Visible = False
            cbxSendungsvorlagen.Visible = False
@@ -609,6 +620,7 @@ Public Class frmEintragAviso
            myAviso.Datum = dtpDatum.Value
            myAviso.LKW_Nr = txtLKW_Nr.Text.Trim.Replace(" ", "")
            myAviso.LKW_Nationalitaet = sbLkwNationalitaet._value
+            myAviso.DakosyRef = SQL.isNullNothing(txtDyRef.Text.Trim)

            myAviso.FahrerHandy = If(txtFahrerHandy.Text.Trim <> "", txtFahrerHandy.Text.Trim, Nothing)

@@ -1531,4 +1543,12 @@ Public Class frmEintragAviso
    Private Sub dtpAvisoEingangZeit_ValueChanged(sender As Object, e As EventArgs) Handles dtpAvisoEingangZeit.ValueChanged

    End Sub
+
+    Private Sub Label22_Click(sender As Object, e As EventArgs) Handles Label22.Click
+        If kdAvisierer.KdNr_value > 0 Then
+            kdFrächter.KdNr = kdAvisierer.KdNr
+        ElseIf kdAvisierer.Text <> "" Then
+            kdFrächter.Text = kdAvisierer.Text
+        End If
+    End Sub
 End Class
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,12 +24,12 @@ Partial Class frmHauptfenster
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
        Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -68,6 +68,8 @@ Partial Class frmHauptfenster
        Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ATILLAToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.IMEXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UNISPEDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.NacherfassungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LogoutToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -93,6 +95,7 @@ Partial Class frmHauptfenster
        Me.StammreferenzenVerwaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
        Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
        Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LKWBerichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -184,6 +187,7 @@ Partial Class frmHauptfenster
        Me.lblVersion = New System.Windows.Forms.Label()
        Me.pnlLinksOben = New System.Windows.Forms.Panel()
        Me.btnNeu = New System.Windows.Forms.Button()
+        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel6 = New System.Windows.Forms.Panel()
        Me.lblMeineAviso = New System.Windows.Forms.Label()
        Me.lblAkte = New System.Windows.Forms.Label()
@@ -203,6 +207,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.components)
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.lklErweitereSuche = New System.Windows.Forms.LinkLabel()
        Me.Label8 = New System.Windows.Forms.Label()
@@ -210,6 +215,7 @@ Partial Class frmHauptfenster
        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.pnlTime = New System.Windows.Forms.Panel()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.pnlSearch = New System.Windows.Forms.Panel()
        Me.Label15 = New System.Windows.Forms.Label()
        Me.txtlkwId = New System.Windows.Forms.TextBox()
@@ -226,6 +232,7 @@ Partial Class frmHauptfenster
        Me.Button4 = New System.Windows.Forms.Button()
        Me.Label12 = New System.Windows.Forms.Label()
        Me.txtEmpfänger = New System.Windows.Forms.TextBox()
+        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtAbfertigungsnummer = New System.Windows.Forms.TextBox()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
@@ -246,10 +253,7 @@ Partial Class frmHauptfenster
        Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.VollständigesUpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.Top.SuspendLayout()
@@ -260,6 +264,7 @@ Partial Class frmHauptfenster
        Me.pnlLinks.SuspendLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlLinksOben.SuspendLayout()
+        CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel6.SuspendLayout()
        Me.tbcntrAviso.SuspendLayout()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -271,13 +276,12 @@ Partial Class frmHauptfenster
        Me.splitMain.Panel1.SuspendLayout()
        Me.splitMain.Panel2.SuspendLayout()
        Me.splitMain.SuspendLayout()
+        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.pnlTime.SuspendLayout()
        Me.pnlSearch.SuspendLayout()
        Me.pnlOptionen.SuspendLayout()
        Me.cntxt.SuspendLayout()
-        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'mnuInfo
@@ -371,7 +375,7 @@ Partial Class frmHauptfenster
        'mnuProgramm
        '
        Me.mnuProgramm.BackColor = System.Drawing.Color.Transparent
-        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
+        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
        Me.mnuProgramm.ForeColor = System.Drawing.Color.Black
        Me.mnuProgramm.Name = "mnuProgramm"
        Me.mnuProgramm.Size = New System.Drawing.Size(78, 20)
@@ -380,21 +384,21 @@ Partial Class frmHauptfenster
        'mnuFirmen
        '
        Me.mnuFirmen.Name = "mnuFirmen"
-        Me.mnuFirmen.Size = New System.Drawing.Size(157, 22)
+        Me.mnuFirmen.Size = New System.Drawing.Size(184, 22)
        Me.mnuFirmen.Text = "Firmen"
        Me.mnuFirmen.Visible = False
        '
        'NeuesPasswortToolStripMenuItem
        '
        Me.NeuesPasswortToolStripMenuItem.Name = "NeuesPasswortToolStripMenuItem"
-        Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.NeuesPasswortToolStripMenuItem.Text = "Neues Passwort"
        '
        'OptionenToolStripMenuItem
        '
        Me.OptionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZeilenInFarbeEinausToolStripMenuItem, Me.BerechtigungenNeuLadenToolStripMenuItem})
        Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem"
-        Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.OptionenToolStripMenuItem.Text = "Optionen"
        '
        'ZeilenInFarbeEinausToolStripMenuItem
@@ -412,7 +416,7 @@ Partial Class frmHauptfenster
        'StandorteToolStripMenuItem
        '
        Me.StandorteToolStripMenuItem.Name = "StandorteToolStripMenuItem"
-        Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.StandorteToolStripMenuItem.Text = "Standorte"
        Me.StandorteToolStripMenuItem.Visible = False
        '
@@ -420,7 +424,7 @@ Partial Class frmHauptfenster
        '
        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.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
-        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
        Me.AdministrationToolStripMenuItem.Visible = False
        '
@@ -493,56 +497,68 @@ Partial Class frmHauptfenster
        'ToolStripSeparator4
        '
        Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
-        Me.ToolStripSeparator4.Size = New System.Drawing.Size(154, 6)
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(181, 6)
        '
        'FirmaWechselnToolStripMenuItem
        '
-        Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem})
+        Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem})
        Me.FirmaWechselnToolStripMenuItem.Name = "FirmaWechselnToolStripMenuItem"
-        Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.FirmaWechselnToolStripMenuItem.Text = "Firma wechseln"
        '
        'VERAGToolStripMenuItem
        '
        Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem"
-        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(111, 22)
+        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
        Me.VERAGToolStripMenuItem.Text = "VERAG"
        '
        'ATILLAToolStripMenuItem
        '
        Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem"
-        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(111, 22)
+        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
        Me.ATILLAToolStripMenuItem.Text = "ATILLA"
        '
        'IMEXToolStripMenuItem
        '
        Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem"
-        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(111, 22)
+        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
        Me.IMEXToolStripMenuItem.Text = "IMEX"
        '
+        'UNISPEDToolStripMenuItem
+        '
+        Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem"
+        Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
+        Me.UNISPEDToolStripMenuItem.Text = "UNISPED"
+        '
+        'AMBARToolStripMenuItem
+        '
+        Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem"
+        Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
+        Me.AMBARToolStripMenuItem.Text = "AMBAR"
+        '
        'NacherfassungToolStripMenuItem
        '
        Me.NacherfassungToolStripMenuItem.Name = "NacherfassungToolStripMenuItem"
-        Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.NacherfassungToolStripMenuItem.Text = "Nacherfassung"
        Me.NacherfassungToolStripMenuItem.Visible = False
        '
        'UpdateToolStripMenuItem
        '
        Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem"
-        Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.UpdateToolStripMenuItem.Text = "Update"
        '
        'LogoutToolStripMenuItem
        '
        Me.LogoutToolStripMenuItem.Name = "LogoutToolStripMenuItem"
-        Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(157, 22)
+        Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
        Me.LogoutToolStripMenuItem.Text = "Logout"
        Me.LogoutToolStripMenuItem.Visible = False
        '
        'FunktionenToolStripMenuItem
        '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripMenuItem6, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripMenuItem6, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem})
        Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
        Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20)
        Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -676,6 +692,12 @@ Partial Class frmHauptfenster
        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(354, 22)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
+        'ToolStripMenuItem13
+        '
+        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(354, 22)
+        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
+        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
@@ -1565,6 +1587,25 @@ Partial Class frmHauptfenster
        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnNeu.UseVisualStyleBackColor = True
        '
+        'gridMyAviso
+        '
+        Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1
+        Me.gridMyAviso.AllowUserToAddRows = False
+        Me.gridMyAviso.AllowUserToDeleteRows = False
+        Me.gridMyAviso.AllowUserToOrderColumns = True
+        Me.gridMyAviso.AllowUserToResizeRows = False
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
+        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
+        Me.gridMyAviso.Name = "gridMyAviso"
+        Me.gridMyAviso.ReadOnly = True
+        Me.gridMyAviso.RowHeadersVisible = False
+        Me.gridMyAviso.Size = New System.Drawing.Size(650, 207)
+        Me.gridMyAviso.TabIndex = 0
+        '
        'Panel6
        '
        Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -1817,6 +1858,58 @@ Partial Class frmHauptfenster
        Me.splitMain.SplitterDistance = 360
        Me.splitMain.TabIndex = 0
        '
+        'gridAviso
+        '
+        Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1
+        Me.gridAviso.AllowUserToAddRows = False
+        Me.gridAviso.AllowUserToDeleteRows = False
+        Me.gridAviso.AllowUserToResizeRows = False
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
+        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
+        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle4
+        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.gridAviso.Location = New System.Drawing.Point(0, 208)
+        Me.gridAviso.MultiSelect = False
+        Me.gridAviso.Name = "gridAviso"
+        Me.gridAviso.ReadOnly = True
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
+        Me.gridAviso.RowHeadersVisible = False
+        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle6
+        Me.gridAviso.RowTemplate.ReadOnly = True
+        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.gridAviso.Size = New System.Drawing.Size(720, 152)
+        Me.gridAviso.TabIndex = 1
+        Me.gridAviso.TabStop = False
+        '
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -1916,6 +2009,22 @@ Partial Class frmHauptfenster
        Me.pnlTime.Size = New System.Drawing.Size(274, 57)
        Me.pnlTime.TabIndex = 12
        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.MyComboBox1.ForeColor = System.Drawing.Color.White
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(3, 3)
+        Me.MyComboBox1.MaxLength = 4
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(98, 21)
+        Me.MyComboBox1.TabIndex = 7
+        '
        'pnlSearch
        '
        Me.pnlSearch.Controls.Add(Me.Label15)
@@ -2102,6 +2211,20 @@ Partial Class frmHauptfenster
        Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23)
        Me.txtEmpfänger.TabIndex = 5
        '
+        'cboFiliale
+        '
+        Me.cboFiliale._allowedValuesFreiText = Nothing
+        Me.cboFiliale._allowFreiText = False
+        Me.cboFiliale._value = ""
+        Me.cboFiliale.DropDownWidth = 300
+        Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFiliale.FormattingEnabled = True
+        Me.cboFiliale.Location = New System.Drawing.Point(389, 11)
+        Me.cboFiliale.MaxLength = 4
+        Me.cboFiliale.Name = "cboFiliale"
+        Me.cboFiliale.Size = New System.Drawing.Size(70, 24)
+        Me.cboFiliale.TabIndex = 3
+        '
        'txtAbfertigungsnummer
        '
        Me.txtAbfertigungsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -2290,106 +2413,11 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'gridAviso
+        'VollständigesUpdateToolStripMenuItem
        '
-        Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1
-        Me.gridAviso.AllowUserToAddRows = False
-        Me.gridAviso.AllowUserToDeleteRows = False
-        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
-        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
-        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
-        Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle4
-        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.gridAviso.Location = New System.Drawing.Point(0, 208)
-        Me.gridAviso.MultiSelect = False
-        Me.gridAviso.Name = "gridAviso"
-        Me.gridAviso.ReadOnly = True
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
-        Me.gridAviso.RowHeadersVisible = False
-        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle6
-        Me.gridAviso.RowTemplate.ReadOnly = True
-        Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.gridAviso.Size = New System.Drawing.Size(720, 152)
-        Me.gridAviso.TabIndex = 1
-        Me.gridAviso.TabStop = False
-        '
-        'MyComboBox1
-        '
-        Me.MyComboBox1._allowedValuesFreiText = Nothing
-        Me.MyComboBox1._allowFreiText = False
-        Me.MyComboBox1._value = ""
-        Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.MyComboBox1.ForeColor = System.Drawing.Color.White
-        Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(3, 3)
-        Me.MyComboBox1.MaxLength = 4
-        Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(98, 21)
-        Me.MyComboBox1.TabIndex = 7
-        '
-        'cboFiliale
-        '
-        Me.cboFiliale._allowedValuesFreiText = Nothing
-        Me.cboFiliale._allowFreiText = False
-        Me.cboFiliale._value = ""
-        Me.cboFiliale.DropDownWidth = 300
-        Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboFiliale.FormattingEnabled = True
-        Me.cboFiliale.Location = New System.Drawing.Point(389, 11)
-        Me.cboFiliale.MaxLength = 4
-        Me.cboFiliale.Name = "cboFiliale"
-        Me.cboFiliale.Size = New System.Drawing.Size(70, 24)
-        Me.cboFiliale.TabIndex = 3
-        '
-        'gridMyAviso
-        '
-        Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1
-        Me.gridMyAviso.AllowUserToAddRows = False
-        Me.gridMyAviso.AllowUserToDeleteRows = False
-        Me.gridMyAviso.AllowUserToOrderColumns = True
-        Me.gridMyAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
-        Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
-        Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
-        Me.gridMyAviso.Name = "gridMyAviso"
-        Me.gridMyAviso.ReadOnly = True
-        Me.gridMyAviso.RowHeadersVisible = False
-        Me.gridMyAviso.Size = New System.Drawing.Size(650, 207)
-        Me.gridMyAviso.TabIndex = 0
+        Me.VollständigesUpdateToolStripMenuItem.Name = "VollständigesUpdateToolStripMenuItem"
+        Me.VollständigesUpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
+        Me.VollständigesUpdateToolStripMenuItem.Text = "Vollständiges Update"
        '
        'frmHauptfenster
        '
@@ -2427,6 +2455,7 @@ Partial Class frmHauptfenster
        Me.pnlLinks.PerformLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlLinksOben.ResumeLayout(False)
+        CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel6.ResumeLayout(False)
        Me.Panel6.PerformLayout()
        Me.tbcntrAviso.ResumeLayout(False)
@@ -2441,6 +2470,7 @@ Partial Class frmHauptfenster
        Me.splitMain.Panel2.ResumeLayout(False)
        CType(Me.splitMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.splitMain.ResumeLayout(False)
+        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        Me.pnlTime.ResumeLayout(False)
@@ -2449,8 +2479,6 @@ Partial Class frmHauptfenster
        Me.pnlSearch.PerformLayout()
        Me.pnlOptionen.ResumeLayout(False)
        Me.cntxt.ResumeLayout(False)
-        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -2675,4 +2703,8 @@ Partial Class frmHauptfenster
    Friend WithEvents VERAGToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ATILLAToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents IMEXToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem13 As ToolStripMenuItem
+    Friend WithEvents UNISPEDToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AMBARToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VollständigesUpdateToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -661,8 +661,7 @@ Public Class frmHauptfenster

        Dim search = txtSuche.Text.Trim
        If search <> "" Then
-            hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search &
-                           "%' OR Frächter LIKE '%" & search & "%')"
+            hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )"
        End If

        hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
@@ -815,13 +814,25 @@ Public Class frmHauptfenster
                                             " AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
                                      "ORDER BY case	 " &
                                             " when [Status] =3 then 0 " &
-                                             " when [Status] =1 then 1 " &
+                                             " when [Status] =0 then 1 " &
                                             " when [Status] =99 then 2 " &
                                             " when [Status] =4 then 3 " &
+                                             " when [Status] =1 then 4 " &
                                             " when [Status] =5 then 4 " &
                                             " when [Status] =0 then 5 " &
                                     " END, Ankunft"

+
+
+            'Public Const Status_Erfasst = 0
+            'Public Const Status_Vorbereitet = 4
+            'Public Const Status_Vorgeschrieben = 5
+            'Public Const Status_Freigegeben = 1
+            'Public Const Status_NichtEingetroffen = 2
+            'Public Const Status_Ankunft = 3
+
+
+
            Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
            If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...
@@ -2382,7 +2393,6 @@ Public Class frmHauptfenster


    Private Sub VerzollungsunterlagenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerzollungsunterlagenToolStripMenuItem.Click
-
        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen)
    End Sub

@@ -2663,8 +2673,30 @@ Public Class frmHauptfenster
        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.VerzollungsunterlagenBAR)
    End Sub

+    Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
+        Dim f As New SDL.frmPostEinschreiben
+        f.Show(Me)
+    End Sub

+    Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED")) Then
+            showMeNew()
+        Else
+            MsgBox("Keine Berechtigung!")
+        End If
+    End Sub

+    Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click
+        If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR")) Then
+            showMeNew()
+        Else
+            MsgBox("Keine Berechtigung!")
+        End If
+    End Sub
+
+    Private Sub VollständigesUpdateToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VollständigesUpdateToolStripMenuItem.Click
+        frmLogin.UpdateAVISO(True)
+    End Sub
 End Class

 Public Class AvisoStatusFunctions
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -220,12 +220,14 @@ Public Class frmLogin
        'ADMIN-Login
        If txtSachbear.Text.Trim = "ADMIN" And txtKennwort.Text = My.Resources.ADMIN_pwd Then
            AdminLoginOK()
+            VERAG_PROG_ALLGEMEIN.cAllgemein.buildConnectionDATENARCHIV()
            Exit Sub
        End If

        ' normaler Login
        If CBool(ADMIN.checkLogin(txtSachbear.Text.Trim, txtKennwort.Text, firma)) Then
            loginOK()
+            VERAG_PROG_ALLGEMEIN.cAllgemein.buildConnectionDATENARCHIV()
        Else
            '  MsgBox("Benutzername oder Kennwort ist falsch!", MsgBoxStyle.Exclamation, "Fehler bei Anmeldung")
            lblAlertTxt.Visible = True
@@ -366,7 +368,7 @@ Public Class frmLogin
        UpdateAVISO()
    End Sub

-    Public Sub UpdateAVISO()
+    Public Sub UpdateAVISO(Optional full As Boolean = False)
        'Zuerst den Updater Prüfen:
        cProgramFunctions.updateUpdater()

@@ -374,7 +376,10 @@ Public Class frmLogin
            MsgBox("ERROR_UPDATE: Update konnte nicht fortgesetzt werden." & vbNewLine & vbNewLine & "Update-Datei existiert nicht.", vbCritical)
        Else
            Application.Exit()
-            Process.Start("AVISOUPDATER.exe")
+            '  Process.Start("AVISOUPDATER.exe" & If(full, " full", ""))
+            Dim startInfo = New ProcessStartInfo("AVISOUPDATER.exe")
+            If full Then startInfo.Arguments = "full"
+            Process.Start(startInfo)
        End If
    End Sub

@@ -475,7 +480,7 @@ Public Class frmLogin
    End Sub

    Private Sub UpdateToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles UpdateToolStripMenuItem1.Click
-        UpdateAVISO()
+        UpdateAVISO(True)
    End Sub


--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>296, 17</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -335,6 +338,9 @@
  <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
@@ -478,6 +484,152 @@
  <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>174, 17</value>
  </metadata>
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>404, 17</value>
+  </metadata>
+  <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>596, 17</value>
+  </metadata>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>843, 17</value>
+  </metadata>
+  <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1000, 17</value>
+  </metadata>
+  <data name="ToolStripMenuItem14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="NurÖffnenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
  <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
@@ -105,7 +105,12 @@ Public Class frmSendungsdetailsNEU

        SAVE_ABRECHUNG()

+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "UNISPED"
+                SQL.doSQL("UPDATE Aviso SET DakosyRef='" & txtDyRef.Text & "' WHERE AvisoId='" & AvisoId & "'", "AVISO")
+        End Select
    End Function
+
    Sub NEXT_SENDUNG()
        loadDataInLIST()
        If CURRENT_INDEX + 1 < SENDUNG_LIST.Count Then
@@ -210,6 +215,8 @@ Public Class frmSendungsdetailsNEU

        AVISO = AvisoDAL.LesenAviso(AvisoId, "")

+        txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)
+
        If AVISO.Grenzstelle.Replace("???", "") = "" Then
            lblGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
        Else
@@ -261,6 +268,10 @@ Public Class frmSendungsdetailsNEU
 'rtbAnmerkungDispoliste.Visible = False

            Case "ATILLA" : sbWhere = " AND Niederlassung = 'SUA' "
+            Case "UNISPED"
+                txtDyRef.Visible = True
+                picDy.Visible = True
+                If AVISO IsNot Nothing Then txtDyRef.Text = If(AVISO.DakosyRef, "")
            Case Else

                cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -893,6 +904,10 @@ Public Class frmSendungsdetailsNEU



+            txtWarenwert.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, "")
+            txtWarenwertWaehrung.SET_VALUE(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung, ""))
+
+
            'MsgBox(loadValue(SENDUNG_LIST(CURRENT_INDEX).FilialenNr(), -1))

            cboFiliale._value = loadValue(SENDUNG_LIST(CURRENT_INDEX).FilialenNr, -1)
@@ -1030,6 +1045,7 @@ Public Class frmSendungsdetailsNEU
            lblAbfNrExists.Visible = checkDoppelAbfNr()
            '   initSpeditionbuch()
            initTab()
+            initGesColliGewicht()

            If tbcntr.SelectedTab Is TabPage5 Then
                initDGVBelege()
@@ -1064,6 +1080,24 @@ Public Class frmSendungsdetailsNEU
    End Sub


+    Sub initGesColliGewicht()
+        Try
+
+            Dim gesColli As Double = 0
+            Dim gesGewicht As Double = 0
+
+            For Each s In SENDUNG_LIST
+                If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
+                If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
+            Next
+
+            lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
+            lblgesGewicht.Text = If(gesGewicht = 0, "-", gesGewicht.ToString("N1")) & " kg"
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+    End Sub
    Sub binddata(o As Object, bindingParam As String, bindingSource As BindingSource, dataName As String, Optional bindingNullValue As Object = Nothing, Optional formatString As String = "")
        o.DataBindings.Clear()
        '    If bindingNullValue = Nothing Then bindingNullValue = DBNull.Value
@@ -1237,6 +1271,8 @@ Public Class frmSendungsdetailsNEU
        End Select


+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = SQL.isNullNothingDbl(txtWarenwert.Text)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = SQL.isNullNothing(txtWarenwertWaehrung._value)

        '   SENDUNG_LIST(CURRENT_INDEX).tblSnd_betrag = IIf(IsNumeric(txtBarBelegBetrag._value), txtBarBelegBetrag._value, Nothing)

@@ -1304,7 +1340,7 @@ Public Class frmSendungsdetailsNEU



-    Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click, Button8.Click
+    Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click, Button8.Click, LaufzettelDruckenToolStripMenuItem.Click
        Me.Cursor = Cursors.WaitCursor
        loadDataInLIST()
        SAVE_ME()
@@ -1315,10 +1351,10 @@ Public Class frmSendungsdetailsNEU
                Exit Sub
            End If
        End If
-        If sender Is Button3 Then
+        If sender Is Button3 Or sender Is LaufzettelDruckenToolStripMenuItem Then

            'Dim trd = New Threading.Thread(Sub()
-            SendungOptions.PrintSendung("PRINT", Me.SENDUNG_LIST(CURRENT_INDEX), Me.AVISO, Printername)
+            SendungOptions.PrintSendung("PRINT", Me.SENDUNG_LIST(CURRENT_INDEX), Me.AVISO, Printername, If(sender Is LaufzettelDruckenToolStripMenuItem, "LAUFZETTEL", "AKT"))
            '       End Sub)
            '  trd.IsBackground = True : trd.Start()

@@ -1561,7 +1597,7 @@ Public Class frmSendungsdetailsNEU
            'lblErgebnis.Text = "Ergebnise: " & .RowCount
        End With
    End Sub
-    Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentClick
+    Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentDoubleClick
        If DataGridView.SelectedRows.Count = 0 Then Exit Sub

        Dim frmNacherfassung As New SDL.frmNacherfassungNEU
@@ -2193,7 +2229,7 @@ Public Class frmSendungsdetailsNEU

    End Sub

-    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles GelangensbestätigungToolStripMenuItem.Click
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles GelangensbestätigungToolStripMenuItem.Click, toolGelangensbestätigung.Click
        loadDataInLIST()
        SAVE_ME()
        Dim SND_TMP = SENDUNG_LIST(CURRENT_INDEX)
@@ -2258,8 +2294,9 @@ Public Class frmSendungsdetailsNEU
    End Function

    Private Sub cbxFremdspedition_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFremdspedition.CheckedChanged
-        TabControl1.Enabled = Not sender.checked
+        ' TabControl1.Enabled = Not sender.checked
        Panel6.Enabled = Not sender.checked
+        Panel16.Enabled = Not sender.checked
        btn.Enabled = Not sender.checked
        '  Panel5.Enabled = Not sender.checked
        '  cboAbfertigungsart.Enabled = Not sender.checked
@@ -2430,7 +2467,7 @@ Public Class frmSendungsdetailsNEU
    End Sub

    Sub initAnhang()
-        Dim hSQL As String = "  SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN anh_SendungsId is null THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ] ,anh_SendungsId  FROM [tblAvisoAnhaenge] 
+        Dim hSQL As String = "  SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN anh_SendungsId is null THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ]  FROM [tblAvisoAnhaenge] 
                                         WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ")
                                       ORDER BY  anh_SendungsId desc,
 										  case	  
@@ -2451,7 +2488,7 @@ Public Class frmSendungsdetailsNEU
        If dgvAnhang.RowCount = 0 Then dgvAnhang.Columns.Clear() : Exit Sub

        With dgvAnhang
-            .RowTemplate.Height = 30
+            .RowTemplate.Height = 35
            '.RowTemplate.MinimumHeight = 30
            .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
            .Columns("anh_id").Visible = False     'VermerkID nicht anzeigen
@@ -2899,7 +2936,13 @@ Public Class frmSendungsdetailsNEU
        End If
        Select Case FormularArt
            Case SDL.FormularManagerArten.Importaviso_VK : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso_VK, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
-            Case SDL.FormularManagerArten.Importaviso : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
+            Case SDL.FormularManagerArten.Importaviso
+                Dim f As SDL.frmFormulare = Nothing
+                SDL.FormularManagerNEU.OPEN_FORM_Byref(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE},, f)
+                AddHandler f.FormClosing, Sub()
+                                              If f.printed Then AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Auftrag fehlt - angefordert", 1)
+                                          End Sub
+
        End Select

    End Sub
@@ -2991,7 +3034,7 @@ Public Class frmSendungsdetailsNEU

                    Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
                    If SENDUNG_LIST IsNot Nothing Then
-                        SND = SENDUNG_LIST(0)
+                        SND = SENDUNG_LIST(CURRENT_INDEX)
                    End If

                    '    Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, SENDUNG_LIST(0), Now.ToString("yy"))
@@ -3028,8 +3071,10 @@ Public Class frmSendungsdetailsNEU
        Dim frMZA As New SDL.frmZollanmeldung("EZA", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
        ' Dim u As New SDL.usrCntlATLAS_EZA(DAKOSY_Worker.cDakosy_ZollanmeldungenArten.EZA, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, Now.ToString("yy"), "")
        ' u.Dock = DockStyle.Fill
-        frMZA.Show(Me)
-        initdgvZollAnmeldungen()
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
        'tbZollabfertigung.Controls.Clear()
        ' tbZollabfertigung.Controls.Add(u)
    End Sub
@@ -3038,24 +3083,30 @@ Public Class frmSendungsdetailsNEU
        Me.loadDataInLIST() : SAVE_ME()
        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
        Dim frMZA As New SDL.frmZollanmeldung("T1", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
-        frMZA.Show(Me)
-        initdgvZollAnmeldungen()
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
    End Sub

    Private Sub NCTST2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem9.Click
        Me.loadDataInLIST() : SAVE_ME()
        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
        Dim frMZA As New SDL.frmZollanmeldung("T2", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
-        frMZA.Show(Me)
-        initdgvZollAnmeldungen()
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
    End Sub

    Private Sub AESToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem11.Click
        Me.loadDataInLIST() : SAVE_ME()
        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
        Dim frMZA As New SDL.frmZollanmeldung("AES", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
-        frMZA.Show(Me)
-        initdgvZollAnmeldungen()
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
    End Sub


@@ -3069,8 +3120,10 @@ Public Class frmSendungsdetailsNEU
        Me.loadDataInLIST() : SAVE_ME()
        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
        Dim frMZA As New SDL.frmZollanmeldung("ÜT", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
-        frMZA.Show(Me)
-        initdgvZollAnmeldungen()
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
    End Sub


@@ -3201,7 +3254,8 @@ Public Class frmSendungsdetailsNEU
        End If
    End Sub

-    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click
+    Private Sub EMailAnfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMailAnfügenToolStripMenuItem.Click, ToolStripMenuItem15.Click
+
        Try
            VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
            If dgvAnhang.SelectedRows.Count >= 1 Then
@@ -3222,10 +3276,34 @@ Public Class frmSendungsdetailsNEU
                    'Next

                    For Each r As DataGridViewRow In dgvAnhang.SelectedRows
+                        ' Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.copyToTmp_KeepFilenameByDS(ii.coll_pfad, ii.coll_bezeichnung), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                        Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                    Next
                    Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr
+
+
+                    'ATA FREMD!!!
+                    If sender Is ToolStripMenuItem15 Then
+                        Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & "  |  Grenze: " & lblGrenze.Text
+
+                        Dim TextHTML = ""
+                        TextHTML &= "Sehr geehrte Damen und Herren,<br>"
+                        TextHTML &= "<br>"
+                        TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.<br>"
+                        TextHTML &= "<br>"
+
+                        TextHTML &= "Mit freundlichen Grüßen<br>"
+                        TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+                        TextHTML &= "<br>"
+
+                        Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE", 1) & "</div>"
+
+                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
+
+                    End If
+
                    Mail.Display()
+
                Catch ex As Exception
                    MsgBox("Fehler beim Öffnen der Mail!")
                End Try
@@ -3235,10 +3313,76 @@ Public Class frmSendungsdetailsNEU
        End Try
    End Sub

+    Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click
+        FormularArt = SDL.FormularManagerArten.Importaviso_VK
+        ctxtWeitereFormulare.Show(Windows.Forms.Cursor.Position)
+    End Sub
+
+    Private Sub EmpfängerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EmpfängerToolStripMenuItem.Click
+        loadDataInLIST()
+        Dim ROLLE = "EMPFAENGER" : Dim FirmaFrm = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger : Dim kdnrFrm = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
+        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE, -1, True})
+    End Sub
+
+    Private Sub AuftraggeberToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuftraggeberToolStripMenuItem.Click
+        loadDataInLIST()
+        Dim ROLLE = "AUFTRAGGEBER" : Dim FirmaFrm = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber : Dim kdnrFrm = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
+        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE, -1, True})
+    End Sub
+
+    Private Sub KdAuftragsNrInAlleSendungenÜbernehmenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KdAuftragsNrInAlleSendungenÜbernehmenToolStripMenuItem.Click
+        Dim Atrnr = txtKdAuftragsNrAvisierer.Text
+        loadDataInLIST()
+
+        For Each s In SENDUNG_LIST
+            s.tblSnd_KdAuftragsNrAvisierer = Atrnr
+            s.SAVE()
+        Next
+    End Sub
+
+    Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click
+        ContextMenuStrip1.Show(Cursor.Position)
+    End Sub
+
+
+    Private Sub txtColli_Leave(sender As Object, e As EventArgs) Handles txtColli.Leave, txtGewicht.Leave
+        loadDataInLIST()
+        initGesColliGewicht()
+    End Sub
+
+    Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click
+        ' ContextMenuStrip2.Show(Cursor.Position)
+        If dgvAnhang.SelectedRows.Count >= 1 Then
+            Try
+                Dim files As New List(Of String) ' String() = New String() {"Sample1.pdf", "Sample2.pdf", "Sample3.pdf"}
+                Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
+
+                Dim outl As New Outlook.Application
+                Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                Mail = outl.CreateItem(0)
+
+                For Each r As DataGridViewRow In dgvAnhang.SelectedRows
+                    files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                Next
+
+                Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray)
+                doc.Save(outputFile, Spire.Pdf.FileFormat.PDF)
+                Process.Start(outputFile)
+                ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.OPEN_PATH()
+            Catch ex As Exception
+                MsgBox(ex.Message & ex.StackTrace)
+            End Try
+        End If
+    End Sub
+
+    Private Sub ToolStripMenuItem14_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem14.Click
+        'deleteElement(docId, anhId)
+
+
+    End Sub
+
+    Private Sub NurÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NurÖffnenToolStripMenuItem.Click
+
+    End Sub

-    'Private Sub dgvAnhang_MouseClick(sender As Object, e As MouseEventArgs) Handles dgvAnhang.MouseClick
-    '    If e.Button = MouseButtons.Right Then
-    '        e.
-    '    End If
-    'End Sub
 End Class
--- a/Aviso/packages.config
+++ b/Aviso/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="esendex-dotnet-sdk" version="3.4.0" targetFramework="net45" />
+  <package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
  <package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
  <package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
  <package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
  <package id="Portable.BouncyCastle" version="1.8.2" targetFramework="net461" />
-  <package id="Spire.PDFViewer" version="4.5.1" targetFramework="net47" />
+  <package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
  <package id="System.Buffers" version="4.4.0" targetFramework="net461" />
  <package id="System.Memory" version="4.5.0" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -23,17 +23,17 @@ Partial Class usrcntlAktDetails
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails))
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.pnlDetailsRechts = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
@@ -64,6 +64,7 @@ Partial Class usrcntlAktDetails
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.Button18 = New System.Windows.Forms.Button()
        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
        Me.btnKasse_User = New System.Windows.Forms.Button()
        Me.btnKasse_LG = New System.Windows.Forms.Button()
        Me.gridVermerke = New System.Windows.Forms.DataGridView()
@@ -132,7 +133,6 @@ Partial Class usrcntlAktDetails
        Me.btnLöschen = New System.Windows.Forms.Button()
        Me.btnÄndern = New System.Windows.Forms.Button()
        Me.btnTV = New System.Windows.Forms.Button()
-        Me.Button9 = New System.Windows.Forms.Button()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -544,44 +544,44 @@ Partial Class usrcntlAktDetails
        Me.dgvSendungen.AllowUserToAddRows = False
        Me.dgvSendungen.AllowUserToDeleteRows = False
        Me.dgvSendungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3
        Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill
        Me.dgvSendungen.Location = New System.Drawing.Point(0, 0)
        Me.dgvSendungen.MultiSelect = False
        Me.dgvSendungen.Name = "dgvSendungen"
        Me.dgvSendungen.ReadOnly = True
-        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
        Me.dgvSendungen.RowHeadersVisible = False
        Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5
        Me.dgvSendungen.RowTemplate.Height = 20
        Me.dgvSendungen.RowTemplate.ReadOnly = True
        Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -632,6 +632,20 @@ Partial Class usrcntlAktDetails
        Me.Panel4.TabIndex = 102
        Me.Panel4.Visible = False
        '
+        'Button9
+        '
+        Me.Button9.BackColor = System.Drawing.Color.White
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.ForeColor = System.Drawing.Color.Black
+        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button9.Location = New System.Drawing.Point(2, 66)
+        Me.Button9.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(88, 36)
+        Me.Button9.TabIndex = 5
+        Me.Button9.Text = "alle Sendg. Mail"
+        Me.Button9.UseVisualStyleBackColor = False
+        '
        'btnKasse_User
        '
        Me.btnKasse_User.BackColor = System.Drawing.Color.White
@@ -658,7 +672,7 @@ Partial Class usrcntlAktDetails
        Me.btnKasse_LG.Name = "btnKasse_LG"
        Me.btnKasse_LG.Size = New System.Drawing.Size(88, 36)
        Me.btnKasse_LG.TabIndex = 3
-        Me.btnKasse_LG.Text = "Standard" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)"
+        Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)"
        Me.btnKasse_LG.UseVisualStyleBackColor = False
        '
        'gridVermerke
@@ -666,44 +680,44 @@ Partial Class usrcntlAktDetails
        Me.gridVermerke.AllowUserToAddRows = False
        Me.gridVermerke.AllowUserToDeleteRows = False
        Me.gridVermerke.AllowUserToResizeRows = False
-        DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
        Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
        Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8
        Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridVermerke.Location = New System.Drawing.Point(0, 30)
        Me.gridVermerke.MultiSelect = False
        Me.gridVermerke.Name = "gridVermerke"
        Me.gridVermerke.ReadOnly = True
-        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
        Me.gridVermerke.RowHeadersVisible = False
        Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10
        Me.gridVermerke.RowTemplate.Height = 20
        Me.gridVermerke.RowTemplate.ReadOnly = True
        Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -781,7 +795,7 @@ Partial Class usrcntlAktDetails
        Me.btnFormulare.Name = "btnFormulare"
        Me.btnFormulare.Size = New System.Drawing.Size(93, 25)
        Me.btnFormulare.TabIndex = 104
-        Me.btnFormulare.Text = "Dispo Haft."
+        Me.btnFormulare.Text = "Snd.Liste"
        Me.btnFormulare.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnFormulare.UseVisualStyleBackColor = True
        '
@@ -1571,20 +1585,6 @@ Partial Class usrcntlAktDetails
        Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnTV.UseVisualStyleBackColor = False
        '
-        'Button9
-        '
-        Me.Button9.BackColor = System.Drawing.Color.White
-        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button9.ForeColor = System.Drawing.Color.Black
-        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button9.Location = New System.Drawing.Point(2, 66)
-        Me.Button9.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button9.Name = "Button9"
-        Me.Button9.Size = New System.Drawing.Size(88, 36)
-        Me.Button9.TabIndex = 5
-        Me.Button9.Text = "alle Sendg. Mail"
-        Me.Button9.UseVisualStyleBackColor = False
-        '
        'usrcntlAktDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -991,12 +991,11 @@ Public Class usrcntlAktDetails
        '    Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
        '    frmSendungsdetails.Show(Me)
        'End If
+        openSnd(sendId)
+        'Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
+        'frmSendungsdetails.ShowDialog() 'Me)

-        Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
-        frmSendungsdetails.ShowDialog(Me)
-
-        initDgvSendungen()
-
+        'initDgvSendungen()

    End Sub

@@ -1015,12 +1014,19 @@ Public Class usrcntlAktDetails

    Public Sub openSnd(sendId)

-        Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
-        Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
-        frmSendungsdetails.ShowDialog(frmGrayOut)
-        frmGrayOut.Close()
-        initDgvSendungen()
+        For Each openForm In Application.OpenForms()
+            If TypeOf (openForm) Is frmSendungsdetailsNEU Then
+                MsgBox("Sendungsfenster bereits geöffnet!")
+                CType(openForm, frmSendungsdetailsNEU).BringToFront()
+                Exit Sub
+            End If
+        Next

+        ' Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+        Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
+        frmSendungsdetails.Show() 'Dialog() '     frmSendungsdetails.ShowDialog(frmGrayOut)
+        ' frmGrayOut.Close()
+        initDgvSendungen()

    End Sub

@@ -1182,16 +1188,16 @@ Public Class usrcntlAktDetails
                End If
                'Dim frmSendungsdetails As New frmSendungsdetails(AvisoID, sendId)
                'frmSendungsdetails.ShowDialog(Me)
-                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                ' Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+
+
+                openSnd(sendId)
+                'Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
+                'frmSendungsdetails.ShowDialog() '(frmGrayOut)



-                Dim frmSendungsdetails As New frmSendungsdetailsNEU(AvisoID, sendId)
-                frmSendungsdetails.ShowDialog(frmGrayOut)
-
-
-
-                frmGrayOut.Close()
+                'frmGrayOut.Close()
                initDgvSendungen()
                Me.Cursor = Cursors.Default
            Case "KundeAnzeigen"
@@ -1305,6 +1311,7 @@ Public Class usrcntlAktDetails
            Else
                tbcntlVermerke.TabPages(2).Text = "Sendungsvermerke"
            End If
+            tbcntlVermerke.TabPages(3).Text = "Anhang (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [tblAvisoAnhaenge] WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 ", "AVISO") & ")"
        Catch ex As Exception
        End Try

@@ -1320,18 +1327,23 @@ Public Class usrcntlAktDetails
    'End Sub

    Private Sub timerSendRows_Tick(sender As Object, e As EventArgs) Handles timerSendRows.Tick
-        For Each r As DataGridViewRow In dgvSendungen.Rows
-            If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
-                r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
-                r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
-                ' r.Cells("Abfertigungsart").Value = "FREMD"
-                r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
-            Else 'Nomal
-                r.Cells("Abfertigungsart").Value = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
-                If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".."
-            End If
-        Next
-        timerSendRows.Enabled = False
+        Try
+
+            For Each r As DataGridViewRow In dgvSendungen.Rows
+                If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
+                    r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
+                    r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
+                    ' r.Cells("Abfertigungsart").Value = "FREMD"
+                    r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
+                Else 'Nomal
+                    r.Cells("Abfertigungsart").Value = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
+                    If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".."
+                End If
+            Next
+            timerSendRows.Enabled = False
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
    End Sub

    Private Sub lblStatus_Click(sender As Object, e As EventArgs) Handles lblStatus.Click
@@ -1923,7 +1935,6 @@ Public Class usrcntlAktDetails

    Private Sub Button8_Click_2(sender As Object, e As EventArgs) Handles Button8.Click
        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.SA_Gestellung, FraechterKdNr, {AvisoID})
-
    End Sub

    Private Sub btnKasse_LG_Click(sender As Object, e As EventArgs) Handles btnKasse_LG.Click
@@ -1931,7 +1942,7 @@ Public Class usrcntlAktDetails
        Panel4.Visible = False
    End Sub

-    Private Sub btnKasse_User_Click(sender As Object, e As EventArgs) Handles btnKasse_User.Click
+    Private Sub btnKasse_User_Click(sender As Object, e As EventArgs) Handles Button9.Click
        Dim path = SDL.FormularManagerNEU.DispSendungslisteoListe(AvisoID, False)
        If path <> "" Then

@@ -1940,10 +1951,8 @@ Public Class usrcntlAktDetails
                Case "IMEX"
                    Process.Start(path)
                Case Else
-                    If sender Is Button9 Then
-                        Process.Start(path)
-                    Else
-                        Try
+
+                    Try
                            Dim outl As New Outlook.Application
                            Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                            Mail = outl.CreateItem(0)
@@ -1956,7 +1965,7 @@ Public Class usrcntlAktDetails
                            MsgBox("Fehler beim Öffnen des Mail-Programmes. PDF wird geladen!")
                            Process.Start(path)
                        End Try
-                    End If
+
            End Select
        End If
        Panel4.Visible = False
@@ -1967,5 +1976,8 @@ Public Class usrcntlAktDetails
        f.Show(Me)
    End Sub

-
+    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnKasse_User.Click
+        Dim path = SDL.FormularManagerNEU.DispSendungslisteoListe(AvisoID, False)
+        If path <> "" Then Process.Start(path)
+    End Sub
 End Class
--- a/Diverses/dakosy.png
+++ b/Diverses/dakosy.png
--- a/Diverses/dakosy_dy.png
+++ b/Diverses/dakosy_dy.png
--- a/Gemeinsames/rptSendungen.Designer.vb
+++ b/Gemeinsames/rptSendungen.Designer.vb
@@ -18,9 +18,8 @@ Partial Public Class rptSendungen
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(rptSendungen))
        Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
        Me.Picture = New GrapeCity.ActiveReports.SectionReportModel.Picture()
-        Me.shGrenze = New GrapeCity.ActiveReports.SectionReportModel.Shape()
-        Me.lblGrenze = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtGrenze = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.lblGrenze = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtAnmerkungen = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtAbfertigungsart = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtTarifposanzahl = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
@@ -103,7 +102,6 @@ Partial Public Class rptSendungen
        Me.txtDokZuSend_Ueberschrift = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtDokZuSend_Text = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtBARzuKassieren = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        Me.barcodeLKW = New GrapeCity.ActiveReports.SectionReportModel.Picture()
        Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.barcodeSendung = New GrapeCity.ActiveReports.SectionReportModel.Picture()
        Me.TextBox2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
@@ -120,9 +118,11 @@ Partial Public Class rptSendungen
        Me.txtEmpfaenger_ZOLLKto = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtKdAuftrNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.cbxDyUebermittelt = New GrapeCity.ActiveReports.SectionReportModel.CheckBox()
+        Me.shGrenze = New GrapeCity.ActiveReports.SectionReportModel.Shape()
+        Me.barcodeLKW = New GrapeCity.ActiveReports.SectionReportModel.Picture()
        CType(Me.Picture, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblGrenze, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtGrenze, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblGrenze, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtAnmerkungen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtAbfertigungsart, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtTarifposanzahl, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -205,7 +205,6 @@ Partial Public Class rptSendungen
        CType(Me.txtDokZuSend_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtDokZuSend_Text, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtBARzuKassieren, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.barcodeLKW, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.barcodeSendung, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -221,6 +220,7 @@ Partial Public Class rptSendungen
        CType(Me.txtEmpfaenger_ZOLLKto, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtKdAuftrNr, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.cbxDyUebermittelt, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.barcodeLKW, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
        '
        'Detail
@@ -241,28 +241,6 @@ Partial Public Class rptSendungen
        Me.Picture.Top = 0!
        Me.Picture.Width = 8.26378!
        '
-        'shGrenze
-        '
-        Me.shGrenze.Height = 0.3645669!
-        Me.shGrenze.Left = 2.893307!
-        Me.shGrenze.Name = "shGrenze"
-        Me.shGrenze.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing)
-        Me.shGrenze.Top = 0.8212599!
-        Me.shGrenze.Visible = False
-        Me.shGrenze.Width = 1.914962!
-        '
-        'lblGrenze
-        '
-        Me.lblGrenze.CanGrow = False
-        Me.lblGrenze.Height = 0.1795275!
-        Me.lblGrenze.Left = 2.90315!
-        Me.lblGrenze.Name = "lblGrenze"
-        Me.lblGrenze.Style = "font-size: 6pt; ddo-char-set: 1"
-        Me.lblGrenze.Text = "Grenze:"
-        Me.lblGrenze.Top = 0.8173229!
-        Me.lblGrenze.Visible = False
-        Me.lblGrenze.Width = 0.5181108!
-        '
        'txtGrenze
        '
        Me.txtGrenze.CanGrow = False
@@ -277,6 +255,18 @@ Partial Public Class rptSendungen
        Me.txtGrenze.Visible = False
        Me.txtGrenze.Width = 1.914961!
        '
+        'lblGrenze
+        '
+        Me.lblGrenze.CanGrow = False
+        Me.lblGrenze.Height = 0.1795275!
+        Me.lblGrenze.Left = 2.90315!
+        Me.lblGrenze.Name = "lblGrenze"
+        Me.lblGrenze.Style = "font-size: 6pt; ddo-char-set: 1"
+        Me.lblGrenze.Text = "Grenze:"
+        Me.lblGrenze.Top = 0.8173229!
+        Me.lblGrenze.Visible = False
+        Me.lblGrenze.Width = 0.5181108!
+        '
        'txtAnmerkungen
        '
        Me.txtAnmerkungen.CanGrow = False
@@ -1407,18 +1397,6 @@ Partial Public Class rptSendungen
        Me.txtBARzuKassieren.Top = 5.497638!
        Me.txtBARzuKassieren.Width = 0.9358268!
        '
-        'barcodeLKW
-        '
-        Me.barcodeLKW.Height = 0.2889763!
-        Me.barcodeLKW.HyperLink = Nothing
-        Me.barcodeLKW.ImageData = Nothing
-        Me.barcodeLKW.Left = 0.6421265!
-        Me.barcodeLKW.Name = "barcodeLKW"
-        Me.barcodeLKW.PictureAlignment = GrapeCity.ActiveReports.SectionReportModel.PictureAlignment.TopLeft
-        Me.barcodeLKW.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
-        Me.barcodeLKW.Top = 0.8212597!
-        Me.barcodeLKW.Width = 2.739763!
-        '
        'TextBox1
        '
        Me.TextBox1.CanGrow = False
@@ -1453,6 +1431,7 @@ Partial Public Class rptSendungen
    "ddo-char-set: 1"
        Me.TextBox2.Text = "Barcode-Scan links: Akt <20>bernehmen & Sendung <20>ffnen"
        Me.TextBox2.Top = 10.78504!
+        Me.TextBox2.Visible = False
        Me.TextBox2.Width = 2.864567!
        '
        'txtNCTSVZAdr
@@ -1610,6 +1589,28 @@ Partial Public Class rptSendungen
        Me.cbxDyUebermittelt.Visible = False
        Me.cbxDyUebermittelt.Width = 2.634252!
        '
+        'shGrenze
+        '
+        Me.shGrenze.Height = 0.3645669!
+        Me.shGrenze.Left = 2.893307!
+        Me.shGrenze.Name = "shGrenze"
+        Me.shGrenze.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing)
+        Me.shGrenze.Top = 0.8212599!
+        Me.shGrenze.Visible = False
+        Me.shGrenze.Width = 1.914962!
+        '
+        'barcodeLKW
+        '
+        Me.barcodeLKW.Height = 0.2889763!
+        Me.barcodeLKW.HyperLink = Nothing
+        Me.barcodeLKW.ImageData = Nothing
+        Me.barcodeLKW.Left = 0.6421265!
+        Me.barcodeLKW.Name = "barcodeLKW"
+        Me.barcodeLKW.PictureAlignment = GrapeCity.ActiveReports.SectionReportModel.PictureAlignment.TopLeft
+        Me.barcodeLKW.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
+        Me.barcodeLKW.Top = 0.8212597!
+        Me.barcodeLKW.Width = 2.739763!
+        '
        'rptSendungen
        '
        Me.MasterReport = False
@@ -1628,8 +1629,8 @@ Partial Public Class rptSendungen
            "lic", "Heading2", "Normal"))
        Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal"))
        CType(Me.Picture, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblGrenze, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtGrenze, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblGrenze, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtAnmerkungen, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtAbfertigungsart, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtTarifposanzahl, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1712,7 +1713,6 @@ Partial Public Class rptSendungen
        CType(Me.txtDokZuSend_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtDokZuSend_Text, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtBARzuKassieren, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.barcodeLKW, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.barcodeSendung, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1728,6 +1728,7 @@ Partial Public Class rptSendungen
        CType(Me.txtEmpfaenger_ZOLLKto, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtKdAuftrNr, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.cbxDyUebermittelt, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.barcodeLKW, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me, System.ComponentModel.ISupportInitialize).EndInit()

    End Sub
@@ -1 +1 @@
 .0
 .0