diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.vb b/Aviso/Auswertung/usrctlStatVERIMEX.vb
index 4f32c27..d34d31a 100644
--- a/Aviso/Auswertung/usrctlStatVERIMEX.vb
+++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb
@@ -182,7 +182,7 @@ Public Class usrctlStatVERIMEX
             End Select
 
 
-            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
+            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
                         mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
                         FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
                         " & innerJoinFiliale & "
diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 02e7766..e6a656d 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.0.4")>
-<Assembly: AssemblyFileVersion("4.2.0.4")>
+<Assembly: AssemblyVersion("4.2.1.5")>
+<Assembly: AssemblyFileVersion("4.2.1.5")>
diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb
index eb563f5..b98e9d4 100644
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -292,15 +292,17 @@ Partial Class frmHauptfenster
         Me.lblHinweis = New System.Windows.Forms.Label()
         Me.Label20 = New System.Windows.Forms.Label()
         Me.pnlLinksOben = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.btnE_Aviso = New System.Windows.Forms.Button()
         Me.btnNeu = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -413,12 +415,11 @@ Partial Class frmHauptfenster
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
+        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
         Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.Button9 = New System.Windows.Forms.Button()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
-        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -652,7 +653,7 @@ Partial Class frmHauptfenster
         '
         'AdministrationToolStripMenuItem
         '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem})
         Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
         Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
         Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -2481,6 +2482,36 @@ Partial Class frmHauptfenster
         Me.pnlLinksOben.Size = New System.Drawing.Size(164, 91)
         Me.pnlLinksOben.TabIndex = 1
         '
+        'Button9
+        '
+        Me.Button9.ContextMenuStrip = Me.cntxtAtilla
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button9.ForeColor = System.Drawing.Color.Black
+        Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image)
+        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button9.Location = New System.Drawing.Point(127, 4)
+        Me.Button9.MaximumSize = New System.Drawing.Size(121, 34)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(40, 34)
+        Me.Button9.TabIndex = 12
+        Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button9.UseVisualStyleBackColor = True
+        Me.Button9.Visible = False
+        '
+        'cntxtAtilla
+        '
+        Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17})
+        Me.cntxtAtilla.Name = "cntxt"
+        Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26)
+        '
+        'ToolStripMenuItem17
+        '
+        Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17"
+        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22)
+        Me.ToolStripMenuItem17.Text = "ATILLA"
+        '
         'Label22
         '
         Me.Label22.BackColor = System.Drawing.Color.Red
@@ -2527,19 +2558,6 @@ Partial Class frmHauptfenster
         Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnNeu.UseVisualStyleBackColor = True
         '
-        'cntxtAtilla
-        '
-        Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17})
-        Me.cntxtAtilla.Name = "cntxt"
-        Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26)
-        '
-        'ToolStripMenuItem17
-        '
-        Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17"
-        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22)
-        Me.ToolStripMenuItem17.Text = "ATILLA"
-        '
         'Button7
         '
         Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2598,6 +2616,15 @@ Partial Class frmHauptfenster
         Me.SplitContainer3.SplitterDistance = 99
         Me.SplitContainer3.TabIndex = 3
         '
+        'UsrCntlBenachrichtigungen1
+        '
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
         'pnl
         '
         Me.pnl.Controls.Add(Me.Button10)
@@ -3954,6 +3981,15 @@ Partial Class frmHauptfenster
         Me.pnlLeft.TabIndex = 88
         Me.pnlLeft.Visible = False
         '
+        'UsrCntlBenachrichtigungen2
+        '
+        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
         'Panel5
         '
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -3982,40 +4018,11 @@ Partial Class frmHauptfenster
         Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
         Me.UsrCntlTestsystem1.TabIndex = 8
         '
-        'Button9
+        'FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem
         '
-        Me.Button9.ContextMenuStrip = Me.cntxtAtilla
-        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Button9.ForeColor = System.Drawing.Color.Black
-        Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image)
-        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button9.Location = New System.Drawing.Point(127, 4)
-        Me.Button9.MaximumSize = New System.Drawing.Size(121, 34)
-        Me.Button9.Name = "Button9"
-        Me.Button9.Size = New System.Drawing.Size(40, 34)
-        Me.Button9.TabIndex = 12
-        Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button9.UseVisualStyleBackColor = True
-        Me.Button9.Visible = False
-        '
-        'UsrCntlBenachrichtigungen1
-        '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
-        '
-        'UsrCntlBenachrichtigungen2
-        '
-        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
-        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
-        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Name = "FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem"
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
         '
         'frmHauptfenster
         '
@@ -4479,4 +4486,5 @@ Partial Class frmHauptfenster
     Friend WithEvents NewsletterToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents UNBescheinigungAusTFEinlesenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents Button9 As Button
+    Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
 End Class
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index 8efb534..4cb66e4 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -5328,4 +5328,79 @@ ELSE_ATILLA:
         End Try
         Me.Cursor = Cursors.Default
     End Sub
+
+    Private Sub FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Click
+        If Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+            MsgBox("Dieses Skript darf nur unter SQLGUIDE01 ausgeführt werden.", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        Using ofd As New OpenFileDialog()
+
+            ofd.Title = "SQL-Trigger-Skript auswählen"
+            ofd.Filter = "SQL Dateien (*.sql)|*.sql|Alle Dateien (*.*)|*.*"
+            ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
+            ofd.Multiselect = False
+
+            If ofd.ShowDialog() <> DialogResult.OK Then
+                Exit Sub
+            End If
+
+            Dim filePath As String = ofd.FileName
+
+            Try
+                RunTriggerFixScript(filePath)
+                MessageBox.Show(
+                "SQL-Trigger-Skript wurde erfolgreich ausgeführt.",
+                "Fertig",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information
+            )
+
+            Catch ex As Exception
+                MessageBox.Show(
+                "Fehler beim Ausführen des Skripts:" & vbCrLf & ex.Message,
+                "Fehler",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Error
+            )
+            End Try
+        End Using
+
+    End Sub
+    Public Sub RunTriggerFixScript(ByVal filePath As String)
+
+
+        If Not File.Exists(filePath) Then
+            Throw New FileNotFoundException("SQL-Datei nicht gefunden", filePath)
+        End If
+
+        Dim lines() As String = File.ReadAllLines(filePath, Encoding.UTF8)
+
+        Dim lineNo As Integer = 0
+
+        For Each rawLine As String In lines
+            lineNo += 1
+
+            Dim sql As String = rawLine.Trim()
+
+            ' Leere Zeilen oder Kommentare überspringen
+            If sql = "" Then Continue For
+
+            Try
+                MsgBox(sql)
+                Dim ok As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sql, "SQLGUIDE_ADMIN")
+
+                If Not ok Then
+                    Throw New ApplicationException($"doSQL() lieferte False (Zeile {lineNo})" & vbNewLine & sql)
+                End If
+
+            Catch ex As Exception
+                ' Exaktes Logging inkl. Zeilennummer
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, sql, $"RunTriggerFixScript_LineByLine – Zeile {lineNo}")
+                Throw
+            End Try
+        Next
+
+    End Sub
+
 End Class
diff --git a/Aviso/frmHauptfensterNew.Designer.vb b/Aviso/frmHauptfensterNew.Designer.vb
index 2300abc..afbca60 100644
--- a/Aviso/frmHauptfensterNew.Designer.vb
+++ b/Aviso/frmHauptfensterNew.Designer.vb
@@ -24,11 +24,6 @@ Partial Class frmHauptfensterNew
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfensterNew))
-        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()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -261,15 +256,9 @@ Partial Class frmHauptfensterNew
         Me.btnZertifikate = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.lblErrVermerk = New System.Windows.Forms.Label()
-        Me.lblHinweis = New System.Windows.Forms.Label()
         Me.Label20 = New System.Windows.Forms.Label()
-        Me.pnlLinksOben = New System.Windows.Forms.Panel()
-        Me.Label22 = New System.Windows.Forms.Label()
-        Me.btnE_Aviso = New System.Windows.Forms.Button()
-        Me.btnNeu = New System.Windows.Forms.Button()
         Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Button7 = New System.Windows.Forms.Button()
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.btnClose = New System.Windows.Forms.Button()
@@ -279,10 +268,16 @@ Partial Class frmHauptfensterNew
         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.pnlMain = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.Button7 = New System.Windows.Forms.Button()
+        Me.pnlOptionen = New System.Windows.Forms.Panel()
+        Me.btnKasse_User = New System.Windows.Forms.Button()
+        Me.btnKasse_LG = New System.Windows.Forms.Button()
+        Me.btnTV = New System.Windows.Forms.Button()
         Me.btnSmall = New System.Windows.Forms.Button()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
@@ -290,10 +285,6 @@ Partial Class frmHauptfensterNew
         Me.Label9 = New System.Windows.Forms.Label()
         Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.pnlOptionen = New System.Windows.Forms.Panel()
-        Me.btnKasse_User = New System.Windows.Forms.Button()
-        Me.btnKasse_LG = New System.Windows.Forms.Button()
-        Me.btnTV = New System.Windows.Forms.Button()
         Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -313,15 +304,16 @@ Partial Class frmHauptfensterNew
         Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
         Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.TabPage2 = New System.Windows.Forms.TabPage()
         Me.Panel7 = New System.Windows.Forms.Panel()
         Me.UidAbfrageService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService()
         Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
-        Me.Top.SuspendLayout()
         Me.Panel2.SuspendLayout()
-        Me.pnlLinksOben.SuspendLayout()
         Me.cntxtAtilla.SuspendLayout()
         CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -334,7 +326,6 @@ Partial Class frmHauptfensterNew
         Me.splitMain.Panel1.SuspendLayout()
         Me.splitMain.Panel2.SuspendLayout()
         Me.splitMain.SuspendLayout()
-        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.FlowLayoutPanel1.SuspendLayout()
         Me.pnlOptionen.SuspendLayout()
@@ -344,6 +335,7 @@ Partial Class frmHauptfensterNew
         Me.cntVerag.SuspendLayout()
         Me.pnlLeft.SuspendLayout()
         Me.Panel5.SuspendLayout()
+        Me.TabControl1.SuspendLayout()
         Me.SuspendLayout()
         '
         'mnuInfo
@@ -442,7 +434,7 @@ Partial Class frmHauptfensterNew
         Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.mnuFragezeichen, Me.BREXITToolStripMenuItem})
         Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
         Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.Size = New System.Drawing.Size(1487, 20)
+        Me.MenuStrip1.Size = New System.Drawing.Size(1451, 20)
         Me.MenuStrip1.TabIndex = 3
         Me.MenuStrip1.Text = "MenuStrip1"
         '
@@ -1603,7 +1595,7 @@ Partial Class frmHauptfensterNew
         Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0)
         Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0)
         Me.pnlDetailsRechts.Name = "pnlDetailsRechts"
-        Me.pnlDetailsRechts.Size = New System.Drawing.Size(306, 686)
+        Me.pnlDetailsRechts.Size = New System.Drawing.Size(306, 739)
         Me.pnlDetailsRechts.TabIndex = 0
         '
         'lblMitarbeiter
@@ -1613,7 +1605,7 @@ Partial Class frmHauptfensterNew
         Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control
         Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblMitarbeiter.Location = New System.Drawing.Point(366, 27)
+        Me.lblMitarbeiter.Location = New System.Drawing.Point(366, 80)
         Me.lblMitarbeiter.Name = "lblMitarbeiter"
         Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13)
         Me.lblMitarbeiter.TabIndex = 1
@@ -1623,34 +1615,15 @@ Partial Class frmHauptfensterNew
         'Top
         '
         Me.Top.BackColor = System.Drawing.Color.White
-        Me.Top.Controls.Add(Me.Button1)
-        Me.Top.Controls.Add(Me.lblUsrname)
-        Me.Top.Controls.Add(Me.lblFimaAviso)
-        Me.Top.Controls.Add(Me.Button11)
-        Me.Top.Controls.Add(Me.btnMAVerzeichnis)
-        Me.Top.Controls.Add(Me.btnMitarbeiterKonto)
-        Me.Top.Controls.Add(Me.btnKontakt)
-        Me.Top.Controls.Add(Me.Button2)
-        Me.Top.Controls.Add(Me.Button5)
-        Me.Top.Controls.Add(Me.lblGrenzstelle)
-        Me.Top.Controls.Add(Me.lblVersion)
-        Me.Top.Controls.Add(Me.btnFakturierung)
-        Me.Top.Controls.Add(Me.btnDienstplan)
-        Me.Top.Controls.Add(Me.btnRg)
-        Me.Top.Controls.Add(Me.btnKassenbuch)
-        Me.Top.Controls.Add(Me.btnRefresh)
-        Me.Top.Controls.Add(Me.Button3)
-        Me.Top.Controls.Add(Me.btnKunden)
-        Me.Top.Controls.Add(Me.btnSpedBuch)
         Me.Top.Dock = System.Windows.Forms.DockStyle.Top
         Me.Top.Location = New System.Drawing.Point(0, 20)
         Me.Top.Name = "Top"
-        Me.Top.Size = New System.Drawing.Size(1657, 63)
+        Me.Top.Size = New System.Drawing.Size(1657, 10)
         Me.Top.TabIndex = 6
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(1028, 7)
+        Me.Button1.Location = New System.Drawing.Point(1005, -1)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(75, 23)
         Me.Button1.TabIndex = 87
@@ -1660,11 +1633,11 @@ Partial Class frmHauptfensterNew
         '
         'lblUsrname
         '
-        Me.lblUsrname.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblUsrname.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblUsrname.BackColor = System.Drawing.Color.White
         Me.lblUsrname.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.lblUsrname.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblUsrname.Location = New System.Drawing.Point(1537, 34)
+        Me.lblUsrname.Location = New System.Drawing.Point(242, 384)
         Me.lblUsrname.Name = "lblUsrname"
         Me.lblUsrname.Size = New System.Drawing.Size(75, 13)
         Me.lblUsrname.TabIndex = 86
@@ -1673,10 +1646,10 @@ Partial Class frmHauptfensterNew
         '
         'lblFimaAviso
         '
-        Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblFimaAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black
-        Me.lblFimaAviso.Location = New System.Drawing.Point(1593, 20)
+        Me.lblFimaAviso.Location = New System.Drawing.Point(298, 371)
         Me.lblFimaAviso.Name = "lblFimaAviso"
         Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13)
         Me.lblFimaAviso.TabIndex = 11
@@ -1685,7 +1658,7 @@ Partial Class frmHauptfensterNew
         '
         'Button11
         '
-        Me.Button11.Location = New System.Drawing.Point(1081, 15)
+        Me.Button11.Location = New System.Drawing.Point(1118, -1)
         Me.Button11.Name = "Button11"
         Me.Button11.Size = New System.Drawing.Size(75, 23)
         Me.Button11.TabIndex = 14
@@ -1701,9 +1674,9 @@ Partial Class frmHauptfensterNew
         Me.btnMAVerzeichnis.ForeColor = System.Drawing.Color.Black
         Me.btnMAVerzeichnis.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s
         Me.btnMAVerzeichnis.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnMAVerzeichnis.Location = New System.Drawing.Point(1043, 6)
+        Me.btnMAVerzeichnis.Location = New System.Drawing.Point(367, 65)
         Me.btnMAVerzeichnis.Name = "btnMAVerzeichnis"
-        Me.btnMAVerzeichnis.Size = New System.Drawing.Size(107, 39)
+        Me.btnMAVerzeichnis.Size = New System.Drawing.Size(102, 39)
         Me.btnMAVerzeichnis.TabIndex = 13
         Me.btnMAVerzeichnis.TabStop = False
         Me.btnMAVerzeichnis.Text = "Mitarbeiter Verzeichnis"
@@ -1714,14 +1687,14 @@ Partial Class frmHauptfensterNew
         'btnMitarbeiterKonto
         '
         Me.btnMitarbeiterKonto.allowBorder = False
-        Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White
         Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0
         Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black
         Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s
         Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1394, -6)
+        Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(227, 307)
         Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto"
         Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61)
         Me.btnMitarbeiterKonto.TabIndex = 86
@@ -1737,7 +1710,7 @@ Partial Class frmHauptfensterNew
         Me.btnKontakt.ForeColor = System.Drawing.Color.Black
         Me.btnKontakt.Image = Global.AVISO.My.Resources.Resources.Telefonliste_small
         Me.btnKontakt.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKontakt.Location = New System.Drawing.Point(1154, 6)
+        Me.btnKontakt.Location = New System.Drawing.Point(581, 65)
         Me.btnKontakt.Name = "btnKontakt"
         Me.btnKontakt.Size = New System.Drawing.Size(119, 39)
         Me.btnKontakt.TabIndex = 12
@@ -1755,7 +1728,7 @@ Partial Class frmHauptfensterNew
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Button2.ForeColor = System.Drawing.Color.White
-        Me.Button2.Location = New System.Drawing.Point(1535, 3)
+        Me.Button2.Location = New System.Drawing.Point(33, 0)
         Me.Button2.Name = "Button2"
         Me.Button2.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.Button2.Size = New System.Drawing.Size(45, 20)
@@ -1770,9 +1743,9 @@ Partial Class frmHauptfensterNew
         Me.Button5.ForeColor = System.Drawing.Color.Black
         Me.Button5.Image = Global.AVISO.My.Resources.Resources.parkplatz
         Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button5.Location = New System.Drawing.Point(609, 6)
+        Me.Button5.Location = New System.Drawing.Point(820, 65)
         Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(98, 39)
+        Me.Button5.Size = New System.Drawing.Size(116, 39)
         Me.Button5.TabIndex = 8
         Me.Button5.TabStop = False
         Me.Button5.Text = "Parkticket"
@@ -1782,11 +1755,11 @@ Partial Class frmHauptfensterNew
         '
         'lblGrenzstelle
         '
-        Me.lblGrenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblGrenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblGrenzstelle.BackColor = System.Drawing.Color.White
         Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblGrenzstelle.Location = New System.Drawing.Point(1596, 34)
+        Me.lblGrenzstelle.Location = New System.Drawing.Point(301, 384)
         Me.lblGrenzstelle.Name = "lblGrenzstelle"
         Me.lblGrenzstelle.Size = New System.Drawing.Size(60, 13)
         Me.lblGrenzstelle.TabIndex = 0
@@ -1795,10 +1768,10 @@ Partial Class frmHauptfensterNew
         '
         'lblVersion
         '
-        Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblVersion.ForeColor = System.Drawing.Color.Black
-        Me.lblVersion.Location = New System.Drawing.Point(1588, 6)
+        Me.lblVersion.Location = New System.Drawing.Point(293, 399)
         Me.lblVersion.Name = "lblVersion"
         Me.lblVersion.Size = New System.Drawing.Size(68, 13)
         Me.lblVersion.TabIndex = 6
@@ -1812,7 +1785,7 @@ Partial Class frmHauptfensterNew
         Me.btnFakturierung.ForeColor = System.Drawing.Color.Black
         Me.btnFakturierung.Image = CType(resources.GetObject("btnFakturierung.Image"), System.Drawing.Image)
         Me.btnFakturierung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFakturierung.Location = New System.Drawing.Point(474, 6)
+        Me.btnFakturierung.Location = New System.Drawing.Point(820, 16)
         Me.btnFakturierung.Name = "btnFakturierung"
         Me.btnFakturierung.Size = New System.Drawing.Size(116, 39)
         Me.btnFakturierung.TabIndex = 11
@@ -1830,10 +1803,10 @@ Partial Class frmHauptfensterNew
         Me.btnDienstplan.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnDienstplan.ForeColor = System.Drawing.Color.Black
         Me.btnDienstplan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnDienstplan.Location = New System.Drawing.Point(1276, 6)
+        Me.btnDienstplan.Location = New System.Drawing.Point(475, 65)
         Me.btnDienstplan.Margin = New System.Windows.Forms.Padding(0)
         Me.btnDienstplan.Name = "btnDienstplan"
-        Me.btnDienstplan.Size = New System.Drawing.Size(87, 39)
+        Me.btnDienstplan.Size = New System.Drawing.Size(103, 39)
         Me.btnDienstplan.TabIndex = 10
         Me.btnDienstplan.Text = "Dienstplan"
         Me.btnDienstplan.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -1846,7 +1819,7 @@ Partial Class frmHauptfensterNew
         Me.btnRg.ForeColor = System.Drawing.Color.Black
         Me.btnRg.Image = CType(resources.GetObject("btnRg.Image"), System.Drawing.Image)
         Me.btnRg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRg.Location = New System.Drawing.Point(367, 6)
+        Me.btnRg.Location = New System.Drawing.Point(713, 16)
         Me.btnRg.Name = "btnRg"
         Me.btnRg.Size = New System.Drawing.Size(101, 39)
         Me.btnRg.TabIndex = 9
@@ -1863,7 +1836,7 @@ Partial Class frmHauptfensterNew
         Me.btnKassenbuch.ForeColor = System.Drawing.Color.Black
         Me.btnKassenbuch.Image = Global.AVISO.My.Resources.Resources.kasse_sw_small
         Me.btnKassenbuch.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKassenbuch.Location = New System.Drawing.Point(249, 6)
+        Me.btnKassenbuch.Location = New System.Drawing.Point(595, 16)
         Me.btnKassenbuch.Name = "btnKassenbuch"
         Me.btnKassenbuch.Size = New System.Drawing.Size(112, 39)
         Me.btnKassenbuch.TabIndex = 8
@@ -1881,7 +1854,7 @@ Partial Class frmHauptfensterNew
         Me.btnRefresh.ForeColor = System.Drawing.Color.Black
         Me.btnRefresh.Image = Global.AVISO.My.Resources.Resources.refresh
         Me.btnRefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRefresh.Location = New System.Drawing.Point(710, 6)
+        Me.btnRefresh.Location = New System.Drawing.Point(774, 120)
         Me.btnRefresh.Margin = New System.Windows.Forms.Padding(0)
         Me.btnRefresh.Name = "btnRefresh"
         Me.btnRefresh.Size = New System.Drawing.Size(135, 39)
@@ -1892,7 +1865,7 @@ Partial Class frmHauptfensterNew
         '
         'Button3
         '
-        Me.Button3.Location = New System.Drawing.Point(642, 14)
+        Me.Button3.Location = New System.Drawing.Point(1227, -1)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(75, 23)
         Me.Button3.TabIndex = 5
@@ -1907,7 +1880,7 @@ Partial Class frmHauptfensterNew
         Me.btnKunden.ForeColor = System.Drawing.Color.Black
         Me.btnKunden.Image = CType(resources.GetObject("btnKunden.Image"), System.Drawing.Image)
         Me.btnKunden.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKunden.Location = New System.Drawing.Point(8, 6)
+        Me.btnKunden.Location = New System.Drawing.Point(367, 16)
         Me.btnKunden.Name = "btnKunden"
         Me.btnKunden.Size = New System.Drawing.Size(102, 39)
         Me.btnKunden.TabIndex = 2
@@ -1923,7 +1896,7 @@ Partial Class frmHauptfensterNew
         Me.btnSpedBuch.ForeColor = System.Drawing.Color.Black
         Me.btnSpedBuch.Image = Global.AVISO.My.Resources.Resources.spedbuch1
         Me.btnSpedBuch.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnSpedBuch.Location = New System.Drawing.Point(129, 6)
+        Me.btnSpedBuch.Location = New System.Drawing.Point(475, 16)
         Me.btnSpedBuch.Name = "btnSpedBuch"
         Me.btnSpedBuch.Size = New System.Drawing.Size(114, 39)
         Me.btnSpedBuch.TabIndex = 3
@@ -1937,7 +1910,7 @@ Partial Class frmHauptfensterNew
         Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblDauer.BackColor = System.Drawing.Color.Transparent
         Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblDauer.Location = New System.Drawing.Point(3, 298)
+        Me.lblDauer.Location = New System.Drawing.Point(3, 397)
         Me.lblDauer.Name = "lblDauer"
         Me.lblDauer.Size = New System.Drawing.Size(155, 17)
         Me.lblDauer.TabIndex = 2
@@ -1950,7 +1923,7 @@ Partial Class frmHauptfensterNew
         Me.btnDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.btnDrucken.ForeColor = System.Drawing.Color.Black
-        Me.btnDrucken.Location = New System.Drawing.Point(812, 248)
+        Me.btnDrucken.Location = New System.Drawing.Point(773, 293)
         Me.btnDrucken.Name = "btnDrucken"
         Me.btnDrucken.Size = New System.Drawing.Size(79, 39)
         Me.btnDrucken.TabIndex = 0
@@ -2018,7 +1991,7 @@ Partial Class frmHauptfensterNew
         Me.btnMinimieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnMinimieren.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnMinimieren.ForeColor = System.Drawing.Color.White
-        Me.btnMinimieren.Location = New System.Drawing.Point(48, 0)
+        Me.btnMinimieren.Location = New System.Drawing.Point(84, 0)
         Me.btnMinimieren.Name = "btnMinimieren"
         Me.btnMinimieren.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.btnMinimieren.Size = New System.Drawing.Size(63, 25)
@@ -2033,8 +2006,7 @@ Partial Class frmHauptfensterNew
         Me.Panel2.Controls.Add(Me.lblErrVermerk)
         Me.Panel2.Controls.Add(Me.btnUmrechnungskurse)
         Me.Panel2.Controls.Add(Me.btnZollwebseiten)
-        Me.Panel2.Controls.Add(Me.lblHinweis)
-        Me.Panel2.Location = New System.Drawing.Point(6, 87)
+        Me.Panel2.Location = New System.Drawing.Point(2, 3)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(243, 129)
         Me.Panel2.TabIndex = 10
@@ -2079,24 +2051,13 @@ Partial Class frmHauptfensterNew
         Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft
         Me.lblErrVermerk.Visible = False
         '
-        'lblHinweis
-        '
-        Me.lblHinweis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblHinweis.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.lblHinweis.Location = New System.Drawing.Point(5, 93)
-        Me.lblHinweis.Name = "lblHinweis"
-        Me.lblHinweis.Size = New System.Drawing.Size(129, 16)
-        Me.lblHinweis.TabIndex = 4
-        Me.lblHinweis.Text = "Hinweis eingetragen"
-        Me.lblHinweis.Visible = False
-        '
         'Label20
         '
         Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label20.BackColor = System.Drawing.Color.Red
         Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label20.ForeColor = System.Drawing.Color.White
-        Me.Label20.Location = New System.Drawing.Point(52, 270)
+        Me.Label20.Location = New System.Drawing.Point(52, 369)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(28, 19)
         Me.Label20.TabIndex = 9
@@ -2104,63 +2065,6 @@ Partial Class frmHauptfensterNew
         Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         Me.Label20.Visible = False
         '
-        'pnlLinksOben
-        '
-        Me.pnlLinksOben.Controls.Add(Me.Label22)
-        Me.pnlLinksOben.Controls.Add(Me.btnE_Aviso)
-        Me.pnlLinksOben.Controls.Add(Me.btnNeu)
-        Me.pnlLinksOben.Controls.Add(Me.Button7)
-        Me.pnlLinksOben.Location = New System.Drawing.Point(3, 11)
-        Me.pnlLinksOben.Name = "pnlLinksOben"
-        Me.pnlLinksOben.Size = New System.Drawing.Size(235, 182)
-        Me.pnlLinksOben.TabIndex = 1
-        '
-        'Label22
-        '
-        Me.Label22.BackColor = System.Drawing.Color.Red
-        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label22.ForeColor = System.Drawing.Color.White
-        Me.Label22.Location = New System.Drawing.Point(92, 99)
-        Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(28, 19)
-        Me.Label22.TabIndex = 10
-        Me.Label22.Text = "99"
-        Me.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.Label22.Visible = False
-        '
-        'btnE_Aviso
-        '
-        Me.btnE_Aviso.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnE_Aviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnE_Aviso.ForeColor = System.Drawing.Color.Black
-        Me.btnE_Aviso.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnE_Aviso.Location = New System.Drawing.Point(5, 90)
-        Me.btnE_Aviso.MaximumSize = New System.Drawing.Size(121, 34)
-        Me.btnE_Aviso.Name = "btnE_Aviso"
-        Me.btnE_Aviso.Size = New System.Drawing.Size(121, 34)
-        Me.btnE_Aviso.TabIndex = 1
-        Me.btnE_Aviso.Text = "eAVISO"
-        Me.btnE_Aviso.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnE_Aviso.UseVisualStyleBackColor = True
-        Me.btnE_Aviso.Visible = False
-        '
-        'btnNeu
-        '
-        Me.btnNeu.ContextMenuStrip = Me.cntxtAtilla
-        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNeu.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnNeu.ForeColor = System.Drawing.Color.Black
-        Me.btnNeu.Image = CType(resources.GetObject("btnNeu.Image"), System.Drawing.Image)
-        Me.btnNeu.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnNeu.Location = New System.Drawing.Point(5, 4)
-        Me.btnNeu.MaximumSize = New System.Drawing.Size(121, 34)
-        Me.btnNeu.Name = "btnNeu"
-        Me.btnNeu.Size = New System.Drawing.Size(121, 34)
-        Me.btnNeu.TabIndex = 0
-        Me.btnNeu.Text = "    LKW"
-        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNeu.UseVisualStyleBackColor = True
-        '
         'cntxtAtilla
         '
         Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -2174,30 +2078,13 @@ Partial Class frmHauptfensterNew
         Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22)
         Me.ToolStripMenuItem17.Text = "ATILLA"
         '
-        'Button7
-        '
-        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.Button7.ForeColor = System.Drawing.Color.Black
-        Me.Button7.Image = CType(resources.GetObject("Button7.Image"), System.Drawing.Image)
-        Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button7.Location = New System.Drawing.Point(5, 39)
-        Me.Button7.MaximumSize = New System.Drawing.Size(121, 35)
-        Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(121, 35)
-        Me.Button7.TabIndex = 11
-        Me.Button7.Text = "Sendung"
-        Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button7.UseVisualStyleBackColor = True
-        Me.Button7.Visible = False
-        '
         'picAVISOMessenger
         '
         Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger
         Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.picAVISOMessenger.Location = New System.Drawing.Point(4, 222)
+        Me.picAVISOMessenger.Location = New System.Drawing.Point(4, 321)
         Me.picAVISOMessenger.Name = "picAVISOMessenger"
         Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55)
         Me.picAVISOMessenger.TabIndex = 7
@@ -2206,9 +2093,10 @@ Partial Class frmHauptfensterNew
         '
         'pic
         '
+        Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect
         Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.pic.Location = New System.Drawing.Point(184, 239)
+        Me.pic.Location = New System.Drawing.Point(131, 362)
         Me.pic.Name = "pic"
         Me.pic.Size = New System.Drawing.Size(59, 50)
         Me.pic.TabIndex = 5
@@ -2224,7 +2112,7 @@ Partial Class frmHauptfensterNew
         Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnClose.ForeColor = System.Drawing.Color.White
-        Me.btnClose.Location = New System.Drawing.Point(109, 0)
+        Me.btnClose.Location = New System.Drawing.Point(145, 0)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.btnClose.Size = New System.Drawing.Size(63, 25)
@@ -2278,7 +2166,7 @@ Partial Class frmHauptfensterNew
         Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SplitContainer1.IsSplitterFixed = True
-        Me.SplitContainer1.Location = New System.Drawing.Point(367, 83)
+        Me.SplitContainer1.Location = New System.Drawing.Point(367, 30)
         Me.SplitContainer1.Name = "SplitContainer1"
         '
         'SplitContainer1.Panel1
@@ -2291,7 +2179,7 @@ Partial Class frmHauptfensterNew
         Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall)
         Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts)
         Me.SplitContainer1.Panel2MinSize = 200
-        Me.SplitContainer1.Size = New System.Drawing.Size(1290, 688)
+        Me.SplitContainer1.Size = New System.Drawing.Size(1290, 741)
         Me.SplitContainer1.SplitterDistance = 981
         Me.SplitContainer1.SplitterWidth = 1
         Me.SplitContainer1.TabIndex = 7
@@ -2305,7 +2193,7 @@ Partial Class frmHauptfensterNew
         Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0)
         Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564)
         Me.pnlDetailsLinks.Name = "pnlDetailsLinks"
-        Me.pnlDetailsLinks.Size = New System.Drawing.Size(979, 686)
+        Me.pnlDetailsLinks.Size = New System.Drawing.Size(979, 739)
         Me.pnlDetailsLinks.TabIndex = 0
         '
         'splitMain
@@ -2318,74 +2206,40 @@ Partial Class frmHauptfensterNew
         '
         'splitMain.Panel1
         '
+        Me.splitMain.Panel1.Controls.Add(Me.pnlMain)
         Me.splitMain.Panel1.Controls.Add(Me.btnDrucken)
         Me.splitMain.Panel1.Controls.Add(Me.Button6)
         Me.splitMain.Panel1.Controls.Add(Me.Button8)
         Me.splitMain.Panel1.Controls.Add(Me.btnFertig)
-        Me.splitMain.Panel1.Controls.Add(Me.gridAviso)
         Me.splitMain.Panel1.Controls.Add(Me.Panel1)
         '
         'splitMain.Panel2
         '
-        Me.splitMain.Panel2.Controls.Add(Me.pnlLinksOben)
+        Me.splitMain.Panel2.BackColor = System.Drawing.Color.White
+        Me.splitMain.Panel2.Controls.Add(Me.Panel2)
         Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption)
-        Me.splitMain.Size = New System.Drawing.Size(977, 684)
-        Me.splitMain.SplitterDistance = 477
+        Me.splitMain.Panel2.Controls.Add(Me.pnlOptionen)
+        Me.splitMain.Panel2.Controls.Add(Me.btnKunden)
+        Me.splitMain.Panel2.Controls.Add(Me.btnSpedBuch)
+        Me.splitMain.Panel2.Controls.Add(Me.btnMAVerzeichnis)
+        Me.splitMain.Panel2.Controls.Add(Me.btnKassenbuch)
+        Me.splitMain.Panel2.Controls.Add(Me.btnRg)
+        Me.splitMain.Panel2.Controls.Add(Me.btnKontakt)
+        Me.splitMain.Panel2.Controls.Add(Me.btnRefresh)
+        Me.splitMain.Panel2.Controls.Add(Me.btnFakturierung)
+        Me.splitMain.Panel2.Controls.Add(Me.Button5)
+        Me.splitMain.Panel2.Controls.Add(Me.btnDienstplan)
+        Me.splitMain.Size = New System.Drawing.Size(977, 737)
+        Me.splitMain.SplitterDistance = 576
         Me.splitMain.TabIndex = 0
         '
-        'gridAviso
+        'pnlMain
         '
-        Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1
-        Me.gridAviso.AllowUserToAddRows = False
-        Me.gridAviso.AllowUserToDeleteRows = False
-        Me.gridAviso.AllowUserToResizeRows = False
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
-        Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
-        Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
-        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.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
-        Me.gridAviso.ColumnHeadersHeight = 25
-        Me.gridAviso.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.gridAviso.DefaultCellStyle = DataGridViewCellStyle13
-        Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.gridAviso.Location = New System.Drawing.Point(0, 280)
-        Me.gridAviso.MultiSelect = False
-        Me.gridAviso.Name = "gridAviso"
-        Me.gridAviso.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.[False]
-        Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle14
-        Me.gridAviso.RowHeadersVisible = False
-        Me.gridAviso.RowHeadersWidth = 62
-        Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle15
-        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(977, 197)
-        Me.gridAviso.TabIndex = 1
-        Me.gridAviso.TabStop = False
+        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlMain.Location = New System.Drawing.Point(0, 54)
+        Me.pnlMain.Name = "pnlMain"
+        Me.pnlMain.Size = New System.Drawing.Size(977, 522)
+        Me.pnlMain.TabIndex = 8
         '
         'Panel1
         '
@@ -2394,13 +2248,15 @@ Partial Class frmHauptfensterNew
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(977, 280)
+        Me.Panel1.Size = New System.Drawing.Size(977, 54)
         Me.Panel1.TabIndex = 2
         '
         'FlowLayoutPanel1
         '
         Me.FlowLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(44, Byte), Integer), CType(CType(108, Byte), Integer))
         Me.FlowLayoutPanel1.Controls.Add(Me.btnWichtigeStandort)
+        Me.FlowLayoutPanel1.Controls.Add(Me.Button4)
+        Me.FlowLayoutPanel1.Controls.Add(Me.Button7)
         Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
         Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
@@ -2409,64 +2265,46 @@ Partial Class frmHauptfensterNew
         '
         'btnWichtigeStandort
         '
+        Me.btnWichtigeStandort.BackColor = System.Drawing.Color.White
         Me.btnWichtigeStandort.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnWichtigeStandort.ForeColor = System.Drawing.Color.White
+        Me.btnWichtigeStandort.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(44, Byte), Integer), CType(CType(108, Byte), Integer))
         Me.btnWichtigeStandort.Location = New System.Drawing.Point(3, 3)
         Me.btnWichtigeStandort.Name = "btnWichtigeStandort"
         Me.btnWichtigeStandort.Size = New System.Drawing.Size(158, 47)
         Me.btnWichtigeStandort.TabIndex = 4
         Me.btnWichtigeStandort.TabStop = False
-        Me.btnWichtigeStandort.Text = "Wichtig-Standort"
+        Me.btnWichtigeStandort.Text = "LKW/AVISO"
         Me.ToolTip1.SetToolTip(Me.btnWichtigeStandort, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" &
         "d sortiert nach Dauer")
-        Me.btnWichtigeStandort.UseVisualStyleBackColor = True
+        Me.btnWichtigeStandort.UseVisualStyleBackColor = False
         '
-        'btnSmall
+        'Button4
         '
-        Me.btnSmall.BackColor = System.Drawing.Color.White
-        Me.btnSmall.FlatAppearance.BorderColor = System.Drawing.Color.Black
-        Me.btnSmall.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSmall.ForeColor = System.Drawing.Color.Black
-        Me.btnSmall.Location = New System.Drawing.Point(0, 0)
-        Me.btnSmall.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnSmall.Name = "btnSmall"
-        Me.btnSmall.Size = New System.Drawing.Size(17, 37)
-        Me.btnSmall.TabIndex = 1
-        Me.btnSmall.Text = ">"
-        Me.btnSmall.UseVisualStyleBackColor = False
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.ForeColor = System.Drawing.Color.White
+        Me.Button4.Location = New System.Drawing.Point(167, 3)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(158, 47)
+        Me.Button4.TabIndex = 5
+        Me.Button4.TabStop = False
+        Me.Button4.Text = "SENDUNGEN"
+        Me.ToolTip1.SetToolTip(Me.Button4, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" &
+        "d sortiert nach Dauer")
+        Me.Button4.UseVisualStyleBackColor = True
         '
-        'BackgroundWorker1
+        'Button7
         '
-        '
-        'timerStandzeit
-        '
-        Me.timerStandzeit.Interval = 300000
-        '
-        'Label9
-        '
-        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label9.AutoSize = True
-        Me.Label9.BackColor = System.Drawing.Color.White
-        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
-        Me.Label9.ForeColor = System.Drawing.Color.Red
-        Me.Label9.Location = New System.Drawing.Point(370, 5)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(438, 15)
-        Me.Label9.TabIndex = 9
-        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
-        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Label9.Visible = False
-        '
-        'TimerUPDATE
-        '
-        Me.TimerUPDATE.Interval = 900000
-        '
-        'ToolStripMenuItem1
-        '
-        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(234, 22)
-        Me.ToolStripMenuItem1.Text = "SDL-Auswertungen"
+        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button7.ForeColor = System.Drawing.Color.White
+        Me.Button7.Location = New System.Drawing.Point(331, 3)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(158, 47)
+        Me.Button7.TabIndex = 6
+        Me.Button7.TabStop = False
+        Me.Button7.Text = "BACKOFFICE"
+        Me.ToolTip1.SetToolTip(Me.Button7, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" &
+        "d sortiert nach Dauer")
+        Me.Button7.UseVisualStyleBackColor = True
         '
         'pnlOptionen
         '
@@ -2475,7 +2313,7 @@ Partial Class frmHauptfensterNew
         Me.pnlOptionen.Controls.Add(Me.btnKasse_User)
         Me.pnlOptionen.Controls.Add(Me.btnKasse_LG)
         Me.pnlOptionen.Controls.Add(Me.btnTV)
-        Me.pnlOptionen.Location = New System.Drawing.Point(249, 69)
+        Me.pnlOptionen.Location = New System.Drawing.Point(595, 56)
         Me.pnlOptionen.Name = "pnlOptionen"
         Me.pnlOptionen.Size = New System.Drawing.Size(116, 66)
         Me.pnlOptionen.TabIndex = 84
@@ -2525,6 +2363,53 @@ Partial Class frmHauptfensterNew
         Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnTV.UseVisualStyleBackColor = False
         '
+        'btnSmall
+        '
+        Me.btnSmall.BackColor = System.Drawing.Color.White
+        Me.btnSmall.FlatAppearance.BorderColor = System.Drawing.Color.Black
+        Me.btnSmall.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSmall.ForeColor = System.Drawing.Color.Black
+        Me.btnSmall.Location = New System.Drawing.Point(0, 0)
+        Me.btnSmall.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSmall.Name = "btnSmall"
+        Me.btnSmall.Size = New System.Drawing.Size(17, 37)
+        Me.btnSmall.TabIndex = 1
+        Me.btnSmall.Text = ">"
+        Me.btnSmall.UseVisualStyleBackColor = False
+        '
+        'BackgroundWorker1
+        '
+        '
+        'timerStandzeit
+        '
+        Me.timerStandzeit.Interval = 300000
+        '
+        'Label9
+        '
+        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label9.AutoSize = True
+        Me.Label9.BackColor = System.Drawing.Color.White
+        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.Label9.ForeColor = System.Drawing.Color.Red
+        Me.Label9.Location = New System.Drawing.Point(520, 5)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(438, 15)
+        Me.Label9.TabIndex = 9
+        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
+        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Label9.Visible = False
+        '
+        'TimerUPDATE
+        '
+        Me.TimerUPDATE.Interval = 900000
+        '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(234, 22)
+        Me.ToolStripMenuItem1.Text = "SDL-Auswertungen"
+        '
         'cntxt
         '
         Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -2594,7 +2479,10 @@ Partial Class frmHauptfensterNew
         '
         'Panel3
         '
+        Me.Panel3.Controls.Add(Me.Button1)
         Me.Panel3.Controls.Add(Me.MenuStrip1)
+        Me.Panel3.Controls.Add(Me.Button11)
+        Me.Panel3.Controls.Add(Me.Button3)
         Me.Panel3.Controls.Add(Me.Panel4)
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel3.Location = New System.Drawing.Point(0, 0)
@@ -2607,10 +2495,11 @@ Partial Class frmHauptfensterNew
         Me.Panel4.BackColor = System.Drawing.Color.White
         Me.Panel4.Controls.Add(Me.btnClose)
         Me.Panel4.Controls.Add(Me.btnMinimieren)
+        Me.Panel4.Controls.Add(Me.Button2)
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel4.Location = New System.Drawing.Point(1487, 0)
+        Me.Panel4.Location = New System.Drawing.Point(1451, 0)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(170, 20)
+        Me.Panel4.Size = New System.Drawing.Size(206, 20)
         Me.Panel4.TabIndex = 4
         '
         'cntVerag
@@ -2649,31 +2538,68 @@ Partial Class frmHauptfensterNew
         Me.pnlLeft.Controls.Add(Me.Panel5)
         Me.pnlLeft.Controls.Add(Me.Panel7)
         Me.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left
-        Me.pnlLeft.Location = New System.Drawing.Point(0, 83)
+        Me.pnlLeft.Location = New System.Drawing.Point(0, 30)
         Me.pnlLeft.Name = "pnlLeft"
-        Me.pnlLeft.Size = New System.Drawing.Size(367, 688)
+        Me.pnlLeft.Size = New System.Drawing.Size(367, 741)
         Me.pnlLeft.TabIndex = 88
         '
         'Panel5
         '
-        Me.Panel5.Controls.Add(Me.Panel2)
+        Me.Panel5.BackColor = System.Drawing.Color.White
+        Me.Panel5.Controls.Add(Me.TabControl1)
+        Me.Panel5.Controls.Add(Me.lblFimaAviso)
         Me.Panel5.Controls.Add(Me.lblDauer)
+        Me.Panel5.Controls.Add(Me.lblUsrname)
+        Me.Panel5.Controls.Add(Me.lblVersion)
         Me.Panel5.Controls.Add(Me.Label20)
         Me.Panel5.Controls.Add(Me.pic)
         Me.Panel5.Controls.Add(Me.picAVISOMessenger)
+        Me.Panel5.Controls.Add(Me.btnMitarbeiterKonto)
+        Me.Panel5.Controls.Add(Me.lblGrenzstelle)
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(0, 371)
+        Me.Panel5.Location = New System.Drawing.Point(0, 325)
         Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(367, 317)
+        Me.Panel5.Size = New System.Drawing.Size(367, 416)
         Me.Panel5.TabIndex = 3
         '
+        'TabControl1
+        '
+        Me.TabControl1.Controls.Add(Me.TabPage1)
+        Me.TabControl1.Controls.Add(Me.TabPage2)
+        Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.TabControl1.Location = New System.Drawing.Point(0, 0)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(367, 301)
+        Me.TabControl1.TabIndex = 85
+        '
+        'TabPage1
+        '
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Name = "TabPage1"
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(359, 275)
+        Me.TabPage1.TabIndex = 0
+        Me.TabPage1.Text = "TabPage1"
+        Me.TabPage1.UseVisualStyleBackColor = True
+        '
+        'TabPage2
+        '
+        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage2.Name = "TabPage2"
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage2.Size = New System.Drawing.Size(359, 275)
+        Me.TabPage2.TabIndex = 1
+        Me.TabPage2.Text = "TabPage2"
+        Me.TabPage2.UseVisualStyleBackColor = True
+        '
         'Panel7
         '
         Me.Panel7.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Panel7.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel7.Location = New System.Drawing.Point(0, 0)
         Me.Panel7.Name = "Panel7"
-        Me.Panel7.Size = New System.Drawing.Size(367, 51)
+        Me.Panel7.Size = New System.Drawing.Size(367, 10)
         Me.Panel7.TabIndex = 4
         '
         'UidAbfrageService1
@@ -2685,9 +2611,9 @@ Partial Class frmHauptfensterNew
         'UsrCntlBenachrichtigungen2
         '
         Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 10)
         Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(367, 320)
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(367, 315)
         Me.UsrCntlBenachrichtigungen2.TabIndex = 5
         '
         'frmHauptfensterNew
@@ -2695,7 +2621,6 @@ Partial Class frmHauptfensterNew
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1657, 771)
-        Me.Controls.Add(Me.pnlOptionen)
         Me.Controls.Add(Me.Label9)
         Me.Controls.Add(Me.UsrCntlTestsystem1)
         Me.Controls.Add(Me.SplitContainer1)
@@ -2714,10 +2639,8 @@ Partial Class frmHauptfensterNew
         Me.MenuStrip1.PerformLayout()
         Me.pnlDetailsRechts.ResumeLayout(False)
         Me.pnlDetailsRechts.PerformLayout()
-        Me.Top.ResumeLayout(False)
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
-        Me.pnlLinksOben.ResumeLayout(False)
         Me.cntxtAtilla.ResumeLayout(False)
         CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2732,7 +2655,6 @@ Partial Class frmHauptfensterNew
         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.FlowLayoutPanel1.ResumeLayout(False)
         Me.pnlOptionen.ResumeLayout(False)
@@ -2743,6 +2665,7 @@ Partial Class frmHauptfensterNew
         Me.cntVerag.ResumeLayout(False)
         Me.pnlLeft.ResumeLayout(False)
         Me.Panel5.ResumeLayout(False)
+        Me.TabControl1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -2792,7 +2715,6 @@ Partial Class frmHauptfensterNew
     Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
     Friend WithEvents btnMinimieren As System.Windows.Forms.Button
     Friend WithEvents btnClose As System.Windows.Forms.Button
-    Friend WithEvents gridAviso As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents pnlAktOption As System.Windows.Forms.Panel
     Friend WithEvents btnFertig As System.Windows.Forms.Button
     Public WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
@@ -2815,7 +2737,6 @@ Partial Class frmHauptfensterNew
     Friend WithEvents toolVPCreditreform As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents lblErrVermerk As System.Windows.Forms.Label
     Friend WithEvents Button8 As System.Windows.Forms.Button
-    Friend WithEvents lblHinweis As System.Windows.Forms.Label
     Friend WithEvents btnSmall As System.Windows.Forms.Button
     Friend WithEvents OptionenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ZeilenInFarbeEinausToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
@@ -2830,8 +2751,6 @@ Partial Class frmHauptfensterNew
     Friend WithEvents EinheitspapierToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents CMRToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents btnRg As System.Windows.Forms.Button
-    Friend WithEvents pnlLinksOben As System.Windows.Forms.Panel
-    Friend WithEvents btnNeu As System.Windows.Forms.Button
     Friend WithEvents Label9 As System.Windows.Forms.Label
     Friend WithEvents TimerUPDATE As System.Windows.Forms.Timer
     Friend WithEvents MANAGERToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
@@ -2915,8 +2834,6 @@ Partial Class frmHauptfensterNew
     Friend WithEvents btnKontakt As Button
     Friend WithEvents ToolStripMenuItem6 As ToolStripMenuItem
     Friend WithEvents btnMAVerzeichnis As Button
-    Friend WithEvents Label22 As Label
-    Friend WithEvents btnE_Aviso As Button
     Friend WithEvents FRONTOFFICEToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents StandortWechselnToolStripMenuItem As ToolStripMenuItem
@@ -3025,13 +2942,18 @@ Partial Class frmHauptfensterNew
     Friend WithEvents pnlLeft As Panel
     Friend WithEvents Panel5 As Panel
     Friend WithEvents Panel7 As Panel
-    Friend WithEvents Button7 As Button
     Friend WithEvents TVEditorNewToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ATILLASENDUNGToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents Panel2 As Panel
+    Friend WithEvents UidAbfrageService1 As VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService
+    Friend WithEvents UsrCntlBenachrichtigungen2 As usrCntlBenachrichtigungen
+    Friend WithEvents TabControl1 As TabControl
+    Friend WithEvents TabPage1 As TabPage
+    Friend WithEvents TabPage2 As TabPage
     Friend WithEvents Panel1 As Panel
     Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents btnWichtigeStandort As Button
-    Friend WithEvents UidAbfrageService1 As VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService
-    Friend WithEvents UsrCntlBenachrichtigungen2 As usrCntlBenachrichtigungen
+    Friend WithEvents Button4 As Button
+    Friend WithEvents Button7 As Button
+    Friend WithEvents pnlMain As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
 End Class
diff --git a/Aviso/frmHauptfensterNew.resx b/Aviso/frmHauptfensterNew.resx
index 3cebd0d..616b874 100644
--- a/Aviso/frmHauptfensterNew.resx
+++ b/Aviso/frmHauptfensterNew.resx
@@ -184,22 +184,6 @@
   <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1158, 17</value>
   </metadata>
-  <data name="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
-        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
-        zULyAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
-        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
-        zULyAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="Button8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -246,18 +230,6 @@
   <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>560, 17</value>
   </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>560, 17</value>
-  </metadata>
-  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>659, 17</value>
-  </metadata>
-  <metadata name="timerStandzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>822, 17</value>
-  </metadata>
-  <metadata name="TimerUPDATE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>953, 17</value>
-  </metadata>
   <data name="btnTV.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -274,6 +246,15 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>659, 17</value>
+  </metadata>
+  <metadata name="timerStandzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>822, 17</value>
+  </metadata>
+  <metadata name="TimerUPDATE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>953, 17</value>
+  </metadata>
   <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1080, 17</value>
   </metadata>
diff --git a/Aviso/frmHauptfensterNew.vb b/Aviso/frmHauptfensterNew.vb
index 03d6c1b..12d6a26 100644
--- a/Aviso/frmHauptfensterNew.vb
+++ b/Aviso/frmHauptfensterNew.vb
@@ -100,12 +100,12 @@ Public Class frmHauptfensterNew
         End If
     End Sub
     Sub SWITCH_SEARCH(switchTO)
-        'Panel1.Controls.Clear()
+        pnlMain.Controls.Clear()
         SEARCH_AVISO_AKTIV = switchTO
 
         Select Case SEARCH_AVISO_AKTIV
             Case "AVISO"
-                Panel1.Controls.Add(SEARCH_AVISO)
+                pnlMain.Controls.Add(SEARCH_AVISO)
                 SEARCH_AVISO.Dock = DockStyle.Fill
                 '  SEARCH_AVISO.init(Me)
                 initsearch("", False) ': Aviso_anzeigen("")
@@ -128,30 +128,27 @@ Public Class frmHauptfensterNew
 
         'If e.KeyCode = Keys.F5 Then
         '    FUNC.setAnkunft(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-        '    avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+        '     SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
         'End If
 
         'If e.KeyCode = Keys.F9 Then
         '    FUNC.setFreigabe(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, Me)
-        '    avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+        '     SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
         'End If
 
         If e.KeyCode = Keys.F11 Then
             FUNC.AktUebernehmen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-            avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+            SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
         End If
 
         If e.KeyCode = Keys.Escape Then
             Grid_aktiv = False
             SWITCH_SEARCH("AVISO")
 
-            SEARCH_AVISO.reset()
+            SEARCH_AVISO.RESET()
             Grid_aktiv = True
 
         End If
-        If (e.KeyCode) = Keys.Add AndAlso e.Control Then
-            btnNeu.PerformClick()
-        End If
 
         If (e.KeyCode) = Keys.K AndAlso e.Control Then
             If btnKunden.Visible Then btnKunden.PerformClick()
@@ -372,11 +369,7 @@ Public Class frmHauptfensterNew
             Button1.Visible = True
 
         End If
-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
-            btnE_Aviso.Visible = True
-            Label22.Visible = True
-            initEAviso()
-        End If
+
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MESSENGER", "AVISO") Then
             picAVISOMessenger.Visible = True
         End If
@@ -531,9 +524,7 @@ Public Class frmHauptfensterNew
         Timer1.Enabled = True
         Timer_REFRESH_Tick(Timer_REFRESH, New EventArgs)
 
-        If gridAviso.RowCount > 0 Then
-            gridAviso.Rows(0).Selected = True
-        End If
+
         '  MsgBox(gridVermerke.Rows(0).Cells(5).Value)
 
         'If Me.Height * 0.4 < 220 Then
@@ -633,15 +624,7 @@ Public Class frmHauptfensterNew
 
     End Sub
 
-    Sub initEAviso()
-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
-            If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '??
-            Label22.Text = VERAGSQL.getValueTxtBySql("SELECT count(*) FROM [tblNCTS_TR] where ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ'", "FMZOLL") '"XX"
-            If Label22.Text = "0" Then Label22.Text = ""
-            Label22.Visible = Label22.Text <> ""
-            Label22.BringToFront()
-        End If
-    End Sub
+
 
 
     Public Sub setAktDetails(id, showSendungsdetails)
@@ -778,28 +761,6 @@ ELSE_ATILLA:
 
     End Sub
 
-    Function setAkive_AuswahlID() As Integer
-        If gridAviso.SelectedRows.Count > 0 Then
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridAviso.Rows(gridAviso.SelectedRows(0).Index).Cells("AvisoID").Value)
-        Else
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = -1
-        End If
-
-        'If gridMyAviso.SelectedRows.Count > 0 Then
-        '    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridMyAviso.Rows(gridMyAviso.SelectedRows(0).Index).Cells("AvisoID").Value)
-        '    If Not cbx_My_LKW.Checked Then
-        '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = CInt(gridMyAviso.Rows(gridMyAviso.SelectedRows(0).Index).Cells("tblSnd_SendungID").Value)
-        '    Else
-        '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
-
-        '    End If
-        'Else
-        '    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
-        'End If
-
-        Return VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID
-    End Function
-
 
 
     Function formatdate(s) As String
@@ -1346,13 +1307,13 @@ ELSE_ATILLA:
     '                            Case "StatusVorgeschrieben"
     '                                Me.Cursor = Cursors.WaitCursor
     '                                If FUNC.setSendungVorgeschrieben(SendungsId, AvisoID) Then
-    '                                    avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
+    '                                     SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
     '                                End If
     '                                Me.Cursor = Cursors.Default
     '                            Case "StatusVorbereitetQS"
     '                                Me.Cursor = Cursors.WaitCursor
     '                                If FUNC.setSendungVorbereitetQS(SendungsId, AvisoID) Then
-    '                                    avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
+    '                                     SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
     '                                End If
 
     '                                Me.Cursor = Cursors.Default
@@ -1435,175 +1396,8 @@ ELSE_ATILLA:
     '    End Try
     'End Sub
 
-    Private Sub gridAviso_CellFormatting(sender As Object, e As System.Windows.Forms.DataGridViewCellFormattingEventArgs) Handles gridAviso.CellFormatting
-        'Anzahl Minuten als verständlichen Text anzeigen
-
-        If AVISO_TYP = "LKW" Then
-            Select Case gridAviso.Columns(e.ColumnIndex).Name
-                Case "Status"  'Status
-                    Select Case VarToInt(e.Value)
-                        Case 0 : e.Value = "Erfasst"
-                        Case 1 : e.Value = "Freigegeben"
-                        Case 2 : e.Value = "LKW n.e."
-                        Case 3 : e.Value = "Ankunft"
-                        Case 4 : e.Value = "Vorbereitet"
-                        Case 5 : e.Value = "Vorgeschrieben"
-                        Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien"
-                        Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex"
-                        Case Else : e.Value = "unbekannt"
-                    End Select
-
-                Case "AvisoEingang" 'Aviso-Eingang
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Datum" 'Aviso-Eingang
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Erfasst" 'Aviso-Eingang
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Vorbereitet" 'Vorbereitet
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Vorgeschrieben" 'Vorgeschrieben
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Ankunft" 'Ankunft
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Freigabe" 'Abfahrt
-                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                Case "Dauer" 'Dauer
-
-                    If VarToInt(e.Value) > 120 Then
-                        gridAviso.Rows(e.RowIndex).Cells("Dauer").Style.ForeColor = Color.Red
-                    End If
-                    If VarToInt(e.Value) = 0 Then
-                        e.Value = ""
-                    Else
-                        e.Value = Minuten_auf_Text(VarToLng(e.Value))
-                    End If
-                Case "VoraussichtlichesEintreffen"
-                    '  "Der Operator = ist für Typ DBNull und Typ Date nicht definiert."
-
-                    If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then
-                        'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red
-                        gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
-                    End If
-            End Select
-
-        Else
-            Try
 
 
-                If gridAviso Is Nothing Then Exit Sub
-                If gridAviso.Columns Is Nothing Then Exit Sub
-                If gridAviso.ColumnCount = 0 Then Exit Sub
-
-
-                'Anzahl Minuten als verständlichen Text anzeigen
-                Select Case gridAviso.Columns(e.ColumnIndex).Name
-                    Case "Status"  'Status
-
-                        'Dim vb As Boolean = gridAviso.Rows(e.RowIndex).Cells("statVorb").Value
-                        'Select Case VarToInt(e.Value)
-                        '    Case 0 : e.Value = IIf(vb, "Erfasst (in VB)", "Erfasst") : gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.FromArgb(60, 60, 60)
-                        '    Case 1 : e.Value = IIf(vb, "Freigegeben (in VB)", "Freigegeben")
-                        '    Case 2 : e.Value = IIf(vb, "LKW n.e. (in VB)", "LKW n.e.")
-                        '    Case 3 : e.Value = IIf(vb, "Ankunft (in VB)", "Ankunft") : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                        '    Case 4 : e.Value = IIf(vb, "Vorber. (in VB)", "Vorbereitet")
-                        '    Case 5 : e.Value = IIf(vb, "Vorg. (in VB)", "Vorgeschrieben")
-                        '        '     Case 99 : e.Value = "in Vorbereitung" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                        '        'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Brown
-                        '        ' gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                        '    Case Else : e.Value = "unbekannt"
-                        'End Select
-
-                        Select Case VarToInt(e.Value)
-                            Case 0 : e.Value = "Erfasst" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.FromArgb(60, 60, 60)
-                            Case 1 : e.Value = "Freigegeben"
-                            Case 2 : e.Value = "LKW n.e."
-                            Case 3 : e.Value = "Ankunft" : gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                            Case 4 : e.Value = "Vorbereitet"
-                            Case 5 : e.Value = "Vorgeschrieben"
-                            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien"
-                            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex"
-                                '     Case 99 : e.Value = "in Vorbereitung" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                                'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Brown
-                                ' gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
-                            Case Else : e.Value = "unbekannt"
-                        End Select
-
-                    ' If gridAviso.Rows(e.RowIndex).Cells("statVorb").Value = "1" Then
-                    'e.Value &= " (VB)"
-                    ' End If
-
-                    Case "AvisoEingang" 'Aviso-Eingang
-                        If VarToDate(e.Value) = LeerDatum Then e.Value = ""
-
-                    Case "Ankunft" 'Ankunft
-                        If VarToDate(e.Value) = LeerDatum Then
-                            e.Value = ""
-                        Else
-                            '  If DateDiff(DateInterval.Minute, CDate(VarToDate(e.Value)), Now) > 120 Then
-                            ' 'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Red
-                            ' gridAviso.Rows(e.RowIndex).Cells("Dauer").Style.ForeColor = Color.Red
-                            '     gridAviso.Rows(e.RowIndex).Cells("Ankunft").Style.ForeColor = Color.Red
-                            ' End If
-                        End If
-                End Select
-
-
-            Catch ex As Exception
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-            End Try
-        End If
-
-
-
-    End Sub
-
-    Public Sub GridZeichnenAviso()
-        'hier wird der Grid speziell designed
-        If gridAviso.RowCount = 0 Then Exit Sub
-        'Falls Kunde auf inaktiv steht, dann wird Zeile ausgegraut angezeigt
-        For Each dr As DataGridViewRow In gridAviso.Rows
-            Select Case VarToInt(dr.Cells("Status").Value)
-                Case 0  'erfasst
-                    dr.DefaultCellStyle.SelectionBackColor = Color.FromArgb(230, 0, 0)
-                    dr.DefaultCellStyle.ForeColor = Color.FromArgb(230, 0, 0)
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-                Case 1  'freigegeben
-                    dr.DefaultCellStyle.SelectionBackColor = Color.Green
-                    dr.DefaultCellStyle.ForeColor = Color.Green
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-                Case 2  'LKW nicht eingetroffen
-                    dr.DefaultCellStyle.SelectionBackColor = Color.Gray
-                    dr.DefaultCellStyle.ForeColor = Color.Gray
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-                Case 3  'Ankunft
-                    dr.DefaultCellStyle.SelectionBackColor = Color.Blue
-                    dr.DefaultCellStyle.ForeColor = Color.Blue
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-                Case 4  'Vorbereitet
-                    dr.DefaultCellStyle.SelectionBackColor = Color.Brown
-                    dr.DefaultCellStyle.ForeColor = Color.Brown
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-                Case 5  'Vorbereitet
-                    dr.DefaultCellStyle.SelectionBackColor = Color.Purple
-                    dr.DefaultCellStyle.ForeColor = Color.Purple
-                    dr.DefaultCellStyle.SelectionForeColor = Color.White
-            End Select
-            dr.Cells("Status").Style.BackColor = dr.DefaultCellStyle.ForeColor
-            dr.Cells("Status").Style.SelectionForeColor = dr.DefaultCellStyle.ForeColor
-            dr.Cells("LKW_Nr").Style.BackColor = lkwbackcolor
-            'dr.Cells("LKW_Nr").Style.SelectionBackColor = lkwbackcolorSel
-            ' dr.Cells("LKW_Nr").Style.SelectionForeColor = Color.Black
-        Next
-
-
-    End Sub
 
     Private Sub mnuPunkt_Click(sender As Object, e As System.EventArgs) Handles mnuInfo.Click, mnuFirmen.Click
         'Hier werden alle Menüpunkte abgearbeitet
@@ -1620,7 +1414,7 @@ ELSE_ATILLA:
 
             Try
                 If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
-                    avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
+                    SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
                     UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
 
                 End If
@@ -1634,7 +1428,7 @@ ELSE_ATILLA:
 
             '            If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
             '                ' System.Threading.Thread.Sleep(1000) '? warum??
-            '                avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
+            '                 SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
             '                UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
             '            End If
             '        Else
@@ -1655,18 +1449,13 @@ ELSE_ATILLA:
     End Sub
 
     Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click
-        avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+        SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
         UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
 
     End Sub
 
 
-
-    Private Sub gridAviso_ColumnHeaderMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridAviso.ColumnHeaderMouseClick
-        GridZeichnenAviso()
-    End Sub
-
-    Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnNeu.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
+    Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
         Try
             Dim cF As Color = DirectCast(sender, Button).ForeColor
             Dim cB As Color = DirectCast(sender, Button).BackColor
@@ -1677,7 +1466,7 @@ ELSE_ATILLA:
 
         End Try
     End Sub
-    Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnNeu.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
+    Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
         Try
             Dim cF As Color = DirectCast(sender, Button).ForeColor
             Dim cB As Color = DirectCast(sender, Button).BackColor
@@ -1691,64 +1480,6 @@ ELSE_ATILLA:
 
 
 
-
-    Private Sub btnNeu_Click(sender As System.Object, e As System.EventArgs) Handles btnNeu.Click, ToolStripMenuItem17.Click
-        Try
-
-            Me.Cursor = Cursors.WaitCursor
-            gridAviso.ClearSelection()
-            'gridMyAviso.ClearSelection()
-            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
-            Dim f As New frmEintragAviso
-
-            If sender Is ToolStripMenuItem17 Then
-                f.FIRMA_TMP = "ATILLA"
-            End If
-
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
-            '  f.frmHilf = Me
-            If Not f.IsDisposed And f IsNot Nothing And Not frmGrayOut.IsDisposed And frmGrayOut IsNot Nothing Then
-                f.ShowDialog(frmGrayOut)
-            End If
-            frmGrayOut.Close()
-            btnRefresh.PerformClick() 'Aviso_anzeigen("")
-
-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
-        End Try
-        Me.Cursor = Cursors.Default
-    End Sub
-
-    Private Sub btnLöschen_Click(sender As System.Object, e As System.EventArgs)
-
-    End Sub
-
-    Private Sub btnDrucken_Click(sender As System.Object, e As System.EventArgs) Handles btnDrucken.Click
-
-        'MsgBox("Druck steht derzeit noch nicht zur Verfügung.", vbInformation)
-        Dim f As New frmAuswahl_Aviso
-        f.Show()
-    End Sub
-
-    Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click
-
-
-        Me.Cursor = Cursors.WaitCursor
-        'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing
-        If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then
-            Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront()
-            Me.Cursor = Cursors.Default : Exit Sub
-        End If
-        '  Next
-        Try
-            Dim zoll As New SDL.frmKundenUebersichtZOLL
-            zoll.Show()
-            Me.Cursor = Cursors.Default
-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
-    End Sub
-
     Private Sub btnSpedBuch_Click(sender As Object, e As EventArgs) Handles btnSpedBuch.Click
         If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
             Return
@@ -1826,14 +1557,14 @@ ELSE_ATILLA:
         End Try
 
     End Sub
-    Private Sub kexdown(sender As Object, e As KeyEventArgs) Handles gridAviso.KeyUp
+    Private Sub kexdown(sender As Object, e As KeyEventArgs)
         Try
 
             If e.KeyCode = Keys.Up Or e.KeyCode = Keys.Down Or e.KeyCode = Keys.PageUp Or e.KeyCode = Keys.PageDown Or e.KeyCode = Keys.Return Or e.KeyCode = Keys.Enter Then
                 If sender.selectedRows.count = 0 Then Exit Sub
                 Dim tmpId = CInt(sender.selectedRows(0).Cells("AvisoId").Value)
                 VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
-                avisoAktualisierenAktiveIdBehalten(tmpId, , False)
+                SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(tmpId, , False)
 
             End If
 
@@ -1852,7 +1583,7 @@ ELSE_ATILLA:
                 Dim tmpSndId = CInt(sender.selectedRows(0).Cells("tblSnd_SendungID").Value)
                 VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
                 VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = tmpSndId
-                avisoAktualisierenAktiveIdBehalten(tmpId, False)
+                SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(tmpId, False)
 
             End If
 
@@ -1864,77 +1595,6 @@ ELSE_ATILLA:
 
 
 
-    Public Sub lblHinweiseVisible()
-        ' If gridMyAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridMyAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
-        If gridAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
-    End Sub
-    Public Sub avisoAktualisierenAktiveIdBehalten(tmpid As Integer, Optional aktWithoutCheckTime As Boolean = False, Optional Aviso_anzeigenBool As Boolean = True)
-
-        pic.Visible = False
-        Try
-
-
-            If Not Grid_aktiv Then Exit Sub
-            Details_aktiv = False
-
-            initEAviso()
-
-            If Aviso_anzeigenBool Then initsearch("", False)
-
-
-            If AVISO_TYP = "LKW" Then
-                gridAviso.ClearSelection()
-                For Each r As DataGridViewRow In gridAviso.Rows
-                    If CInt(r.Cells("AvisoId").Value) = tmpid Then
-                        ' gridMyAviso.ClearSelection()
-                        gridAviso.CurrentCell = r.Cells("Status")
-                        r.Selected = True : Exit For
-                    End If
-                Next
-            Else
-                gridAviso.ClearSelection()
-                If gridAviso.Rows.Count > 0 Then
-                    For Each r As DataGridViewRow In gridAviso.Rows
-                        If CInt(r.Cells("tblSnd_SendungID").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID Then
-                            gridAviso.CurrentCell = r.Cells("Status")
-                            r.Selected = True : Exit For
-                        End If
-                    Next
-                End If
-            End If
-
-
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpid
-            Details_aktiv = True
-
-            If pnlDetailsRechts.Controls.Count > 0 Then
-
-                Dim usrcntlAvisoID = -1
-                Dim usrcntlAktiv As DateTime
-                If Not pnlDetailsRechts.Controls(0).GetType = GetType(System.Windows.Forms.Label) Then
-                    If pnlDetailsRechts.Controls(0).Name = "usrcntlAktDetailsATILLANeu" Then
-                        usrcntlAvisoID = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).AvisoID
-                        usrcntlAktiv = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).aktiv
-                    Else
-                        usrcntlAvisoID = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails).AvisoID
-                        usrcntlAktiv = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails).aktiv
-                    End If
-
-                    If aktWithoutCheckTime Or usrcntlAvisoID <> tmpid Then
-                        Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                    Else
-                        If DateDiff(DateInterval.Second, usrcntlAktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
-                            Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-                        End If
-                    End If
-                End If
-
-            End If
-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
-        End Try
-    End Sub
-
 
 
     Private Sub dgvSendungen_CellContentClick() Handles UsrCntlBenachrichtigungen2.SelectionChanged
@@ -1942,7 +1602,7 @@ ELSE_ATILLA:
 
             If UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.SelectedRows.Count = 1 Then
 
-                gridAviso.ClearSelection()
+                SEARCH_AVISO.gridAviso.ClearSelection()
                 ' MsgBox(Grid_aktiv) 
 
                 Dim tmpId = UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.SelectedRows(0).Cells("ab_AvisoID").Value
@@ -1955,7 +1615,7 @@ ELSE_ATILLA:
 
                 VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
 
-                avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
+                SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
             End If
 
 
@@ -1965,61 +1625,6 @@ ELSE_ATILLA:
         End Try
     End Sub
 
-    Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridAviso.CellMouseClick
-
-        If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
-        'If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
-        'gridMyAviso.ClearSelection() 'WARUM?
-        '   If sender Is gridAviso Then gridMyAviso.ClearSelection() : UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.ClearSelection()
-        '  If sender Is gridMyAviso Then gridAviso.ClearSelection() : UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.ClearSelection()
-        ' MsgBox(Grid_aktiv)
-        DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
-
-        Dim tmpId = CInt(sender.Rows(e.RowIndex).Cells("AvisoId").Value)
-
-        If AVISO_TYP = "SND" Then
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = CInt(gridAviso.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value)
-        Else
-
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
-        End If
-
-
-        If e.Button = MouseButtons.Right Then
-            If True Then
-                'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
-                '    If sender Is gridAviso Then
-                '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
-                '        sender.CurrentCell = sender.Rows(e.RowIndex).Cells(e.ColumnIndex)
-                '        conMenuAviso.Show(Cursor.Position)
-                '    End If
-                'Else
-                setAkive_AuswahlID()
-                avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
-                Dim hStatus = AvisoDAL.LesenAviso(tmpId, "").Status
-                If hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Then
-                    'MsgBox("Ein Vermerk kann nur erfasst werden, wenn der Status des Aviso auf 'Erfasst', 'Vorbereitet', 'Vorgeschrieben' oder 'Ankunft' steht.", vbInformation)
-                    lblErrVermerk.Width = 300
-                    lblErrVermerk.Visible = True
-                    hideErr.Enabled = True
-                    Exit Sub
-                End If
-
-                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
-                Dim sv As New frmAddAktenvermerkShort(tmpId)
-                sv.Location = Me.PointToClient(Cursor.Position)
-                ' sv.ShowDialog()
-                sv.ShowDialog(frmGrayOut)
-                frmGrayOut.Close()
-
-            End If
-        ElseIf e.Button = MouseButtons.Left Then
-            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
-            avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
-        End If
-    End Sub
-
-
     Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVorgeschrieben.Click, conVorbereitet.Click, conÜbernehmen.Click, conNichtEingetroffen.Click, conFreigabe.Click, conFertig.Click, conAnkunft.Click, conAnVerimex.Click, conAnIndonesien.Click ',conVermerkLöschen.Click,
 
         Timer1.Enabled = False
@@ -2086,7 +1691,7 @@ ELSE_ATILLA:
             FUNC.AktUebernehmen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
             'btnÜbernehmen.PerformClick()
         End If
-        avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
+        SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
         Timer1.Enabled = True
     End Sub
 
@@ -2219,7 +1824,7 @@ ELSE_ATILLA:
     WithEvents timerStart As New Timer
 
     Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
-        Details_anzeigen(setAkive_AuswahlID())
+        Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
 
         Try
             VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath()
@@ -2411,56 +2016,12 @@ ELSE_ATILLA:
         End If
     End Sub
 
-    Private Sub OptionenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles OptionenToolStripMenuItem1.Click
-        gridAviso.ClearSelection()
-        'gridMyAviso.ClearSelection()
-        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 1
-        Dim f As New frmEintragOptionen
-        f.ShowDialog(Me)
-    End Sub
-
     Private Sub VorlagenUploadToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VorlagenUploadToolStripMenuItem.Click
         Dim vu As New VERAG_PROG_ALLGEMEIN.frmVorlagen
         vu.ShowDialog()
 
     End Sub
 
-    Private Sub gridAviso_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridAviso.CellContentClick
-        Try
-            If e.RowIndex > 0 Then
-
-                '   MsgBox(gridMyAviso.Columns(e.ColumnIndex).Name)
-                If AVISO_TYP = "SND" Then
-                    If True Then 'gridMyAviso.SelectedRows.Count = 1 Then
-                        Dim SendungsId = gridAviso.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value
-                        Dim AvisoID = gridAviso.Rows(e.RowIndex).Cells("AvisoID").Value
-                        If SendungsId > 0 And AvisoID > 0 Then
-
-                            Select Case gridAviso.Columns(e.ColumnIndex).Name
-
-                                Case "StatusVorgeschrieben"
-                                    Me.Cursor = Cursors.WaitCursor
-                                    If FUNC.setSendungVorgeschrieben(SendungsId, AvisoID) Then
-                                        avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
-                                    End If
-                                    Me.Cursor = Cursors.Default
-                                Case "StatusVorbereitetQS"
-                                    Me.Cursor = Cursors.WaitCursor
-                                    If FUNC.setSendungVorbereitetQS(SendungsId, AvisoID) Then
-                                        avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
-                                    End If
-
-                                    Me.Cursor = Cursors.Default
-                            End Select
-                        End If
-                    End If
-                End If
-            End If
-
-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
-    End Sub
 
     Private Sub BarcodeTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BarcodeTestToolStripMenuItem.Click
         If VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter.StartsWith("ADMIN") Then
@@ -2727,27 +2288,6 @@ ELSE_ATILLA:
     End Sub
 
 
-    Private Sub btnFertig_Click(sender As Object, e As EventArgs) Handles btnFertig.Click
-        VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-        avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-    End Sub
-
-
-    Private Sub pnlDetailsLinks_Paint(sender As Object, e As PaintEventArgs) Handles pnlDetailsLinks.Paint
-
-    End Sub
-
-    Private Sub Button5_Click(sender As Object, e As EventArgs)
-        frmGenerelleGestellungen.ShowDialog()
-    End Sub
-
-
-    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
-        MsgBox("Noch nicht verfügbar")
-        Exit Sub
-        Dim frmKundenFremdeSpeditionen As New frmKundenFremdeSpeditionen
-        frmKundenFremdeSpeditionen.ShowDialog()
-    End Sub
 
 
     Private Sub ToolStripMenuItem7_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem7.Click
@@ -2827,15 +2367,6 @@ ELSE_ATILLA:
 
 
 
-    Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
-        Dim frmTV As New frmTv
-        frmTV.avisoID = VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID
-        frmTV.ShowDialog()
-        avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-        'If gridMyAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridMyAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
-        If gridAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
-    End Sub
-
     Public Sub showHideDetails()
         If sd <> SplitContainer1.SplitterDistance Or SplitContainer1.Panel2.Size.Width = 15 Then
             SplitContainer1.SplitterDistance = sd
@@ -2847,7 +2378,7 @@ ELSE_ATILLA:
             'SHOW FREIGBAE, etc
             Fullscreen = True
         End If
-        '    avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID)
+        '     SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID)
         SEARCH_AVISO.gridAviso_SpaltenFestlegen()
         '  tbcntrAvisoLKW.Width = Panel1.Width
     End Sub
@@ -2905,7 +2436,7 @@ ELSE_ATILLA:
 
 
 
-    Private Sub gridAviso_MouseMove(sender As Object, e As DataGridViewCellMouseEventArgs) Handles gridAviso.CellMouseMove  ', gridMyAviso.CellMouseMove
+    Private Sub gridAviso_MouseMove(sender As Object, e As DataGridViewCellMouseEventArgs)   ', gridMyAviso.CellMouseMove
         Exit Sub ' Klappt nicht richtig
         If e.RowIndex >= 0 And e.ColumnIndex >= 0 Then
             sender.Rows(e.RowIndex).DefaultCellStyle.BackColor = Color.SteelBlue
@@ -2918,7 +2449,7 @@ ELSE_ATILLA:
         End If
     End Sub
 
-    Private Sub gridAviso_CellMouseLeave(sender As Object, e As DataGridViewCellEventArgs) Handles gridAviso.CellMouseLeave  ', gridMyAviso.CellMouseLeave
+    Private Sub gridAviso_CellMouseLeave(sender As Object, e As DataGridViewCellEventArgs)   ', gridMyAviso.CellMouseLeave
         Exit Sub ' Klappt nicht richtig
         If e.RowIndex >= 0 And e.ColumnIndex >= 0 Then
             sender.Rows(e.RowIndex).DefaultCellStyle.BackColor = sender.Rows(e.RowIndex).DefaultCellStyle.SelectionForeColor
@@ -3564,7 +3095,7 @@ ELSE_ATILLA:
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnE_Aviso.Click, Label22.Click
+    Private Sub Button12_Click(sender As Object, e As EventArgs)
         Me.Cursor = Cursors.WaitCursor
         Dim f As New frm_eAVISO
         f.Show()
@@ -3864,24 +3395,6 @@ ELSE_ATILLA:
 
 
 
-    Private Sub gridAviso_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles gridAviso.CellPainting
-        If e.RowIndex <> -1 AndAlso gridAviso.Columns(e.ColumnIndex).Name = "Status" Then
-            If gridAviso.Rows(e.RowIndex).Cells("Transportmittelart").Value = "SPRINTER" Then
-                If (e.PaintParts And DataGridViewPaintParts.Background) <> DataGridViewPaintParts.None Then
-                    e.Graphics.DrawImage(My.Resources.sprinter_white, e.CellBounds)
-                    'e.CellStyle.BackColor = Color.White
-                End If
-
-
-                If Not e.Handled Then
-                    e.Handled = True
-                    e.PaintContent(e.CellBounds)
-                End If
-            End If
-        End If
-
-    End Sub
-
     Private Sub VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Click
         Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "VerfahrenshandbuchVERAGGmbHZollWO")
         DS.OPEN_SINGLE()
@@ -3976,13 +3489,6 @@ ELSE_ATILLA:
         Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Gueterlisten/gueterlisten_node.html")
     End Sub
 
-    Private Sub RoutenverwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RoutenverwaltungToolStripMenuItem.Click
-        gridAviso.ClearSelection()
-        'gridMyAviso.ClearSelection()
-        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 1
-        Dim f As New frmNCTSRouten()
-        f.ShowDialog(Me)
-    End Sub
 
     Private Sub DTBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DTBToolStripMenuItem.Click
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
@@ -4287,7 +3793,7 @@ ELSE_ATILLA:
         '    End Using
     End Function
 
-    Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click
+    Private Sub Button7_Click_1(sender As Object, e As EventArgs)
 
 
         Dim f As New frmSendungsdetailsNEU
@@ -4314,4 +3820,11 @@ ELSE_ATILLA:
         detailForm.Show()
     End Sub
 
+    Private Sub btnWichtigeStandort_Click(sender As Object, e As EventArgs) Handles btnWichtigeStandort.Click
+        Grid_aktiv = False
+        SWITCH_SEARCH("AVISO")
+
+        SEARCH_AVISO.RESET()
+        Grid_aktiv = True
+    End Sub
 End Class
diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb
index 9ad855a..6765dcb 100644
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -85,23 +85,29 @@ Public Class frmLogin
         lblVersion.ContextMenuStrip = ctxUpdate
         If Application.ProductVersion.StartsWith("0") Then lblVersion.Text += " BETA"
 
-         'STARTPARAMETER - DP
+        '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
 
+        ' Dim exename = IO.Path.GetFileName(Application.ExecutablePath)
         If PARAM = "" Then 'nur wenn keinee Startparameter gesetzt sind...
-
-            If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse
+            If Not File.Exists(Application.StartupPath & "\BACKUP.txt") Then
+                If AppDomain.CurrentDomain.BaseDirectory.ToString.StartsWith("\\") Then
+                    MsgBox("AVISO kann nur lokal gestartet werden." & vbNewLine & "Bei Fragen bitte an die EDV wenden.")
+                    Exit Sub
+                End If
+                If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse
             System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO_INSTALL\" OrElse
             System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO_INSTALL\" OrElse
             System.AppDomain.CurrentDomain.BaseDirectory.Contains("F:\") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\share") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\install") Then
-                MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical)
-                Application.Exit()
-                Me.Close()
-                Exit Sub
+                    MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical)
+                    Application.Exit()
+                    Me.Close()
+                    Exit Sub
+                End If
             End If
 
         End If
@@ -142,7 +148,7 @@ Public Class frmLogin
             Try
                 Dim WI = System.Security.Principal.WindowsIdentity.GetCurrent().Name
                 If WI.Contains("\") Then
-                    Dim Split() = WI.split("\")
+                    Dim Split() = WI.Split("\")
                     'Dim UsernameTMP = ADMIN.getUstName_ByAD(Split(0), Split(1))
                     Dim firmaTmp = ADMIN.getUstFirma_ByAD(Split(0), Split(1))
                     If firmaTmp = "" Then
@@ -165,7 +171,7 @@ Public Class frmLogin
         ' Me.Visible = False
         ' Me.Hide()
 
-       
+
         If PARAM = "DIENSTPLAN" Then
             Me.ShowInTaskbar = False
             VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
@@ -561,10 +567,7 @@ Public Class frmLogin
         ' UPDATEUpdater
 
         'todo prüfung nicht aus nw-laufwerk starten (start wit \\)
-        If AppDomain.CurrentDomain.BaseDirectory.ToString.StartsWith("\\") Then
-            MsgBox("AVISO kann nur lokal gestartet werden." & vbNewLine & "Bei Fragen bitte an die EDV wenden.")
-            Exit Sub
-        End If
+
 
         If cProgramFunctions.updateUpdater() Then
             MsgBox("Der Aviso-Updater wurde aktualisiert. Es muss ein Update durchgeführt werden.")
diff --git a/Aviso/frmSndVorgeschriebenSetzen.vb b/Aviso/frmSndVorgeschriebenSetzen.vb
index 6958876..b8dc878 100644
--- a/Aviso/frmSndVorgeschriebenSetzen.vb
+++ b/Aviso/frmSndVorgeschriebenSetzen.vb
@@ -97,7 +97,7 @@
             'Offene EUST/ZOLL aus Zkteing ermitteln
             EUST = CDbl(SQL.getValueTxtBySql("SELECT isnull(SUM (Betrag),0)
                                           FROM tblSendungen INNER JOIN [tblSendAbrechnung]  on tblSnd_SendungID=sndabr_sendId
-                                          INNER JOIN [FMZOLL\SQLFMZOLL].VERAG.dbo.[Zkteing] ON (cast(FilialenNr as varchar(4)) + '/' + cast(AbfertigungsNr as varchar(8)))  LIKE ([Bezugsnummer]  + '%')
+                                          INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.[Zkteing] ON (cast(FilialenNr as varchar(4)) + '/' + cast(AbfertigungsNr as varchar(8)))  LIKE ([Bezugsnummer]  + '%')
                                           WHERE sndabr_abrArt IN ('EUST','ZOLL') 
                                           AND ( 
 	                                          (tblSnd_AvisiererKdNr='" & KdNr & "' and sndabr_beteiligter='AVISIERER') OR 
diff --git a/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb b/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
index b8327d5..6945d52 100644
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.Designer.vb
@@ -23,13 +23,18 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlHauptfenster_Suche_AVISO))
         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()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label22 = New System.Windows.Forms.Label()
+        Me.Button7 = New System.Windows.Forms.Button()
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnE_Aviso = New System.Windows.Forms.Button()
+        Me.btnNeu = New System.Windows.Forms.Button()
         Me.pblSNDOptions = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.btnColor = New System.Windows.Forms.Button()
@@ -59,6 +64,7 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblGrenze = New System.Windows.Forms.Label()
         Me.pnlTime = New System.Windows.Forms.Panel()
+        Me.lblDauer = New System.Windows.Forms.Label()
         Me.Label10 = New System.Windows.Forms.Label()
         Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.Label21 = New System.Windows.Forms.Label()
@@ -116,7 +122,7 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.lblDauer = New System.Windows.Forms.Label()
+        Me.lblHinweis = New System.Windows.Forms.Label()
         Me.Panel1.SuspendLayout()
         Me.pblSNDOptions.SuspendLayout()
         Me.tbcntrAvisoSND.SuspendLayout()
@@ -130,7 +136,11 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.Label22)
+        Me.Panel1.Controls.Add(Me.Button7)
         Me.Panel1.Controls.Add(Me.MyComboBox1)
+        Me.Panel1.Controls.Add(Me.btnE_Aviso)
+        Me.Panel1.Controls.Add(Me.btnNeu)
         Me.Panel1.Controls.Add(Me.pblSNDOptions)
         Me.Panel1.Controls.Add(Me.btnHeute)
         Me.Panel1.Controls.Add(Me.btnGestern)
@@ -165,6 +175,36 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.Panel1.Size = New System.Drawing.Size(1156, 225)
         Me.Panel1.TabIndex = 3
         '
+        'Label22
+        '
+        Me.Label22.BackColor = System.Drawing.Color.Red
+        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label22.ForeColor = System.Drawing.Color.White
+        Me.Label22.Location = New System.Drawing.Point(246, 160)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(28, 19)
+        Me.Label22.TabIndex = 32
+        Me.Label22.Text = "99"
+        Me.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.Label22.Visible = False
+        '
+        'Button7
+        '
+        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.Button7.ForeColor = System.Drawing.Color.Black
+        Me.Button7.Image = CType(resources.GetObject("Button7.Image"), System.Drawing.Image)
+        Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button7.Location = New System.Drawing.Point(211, 188)
+        Me.Button7.MaximumSize = New System.Drawing.Size(121, 35)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(121, 35)
+        Me.Button7.TabIndex = 32
+        Me.Button7.Text = "Sendung"
+        Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button7.UseVisualStyleBackColor = True
+        Me.Button7.Visible = False
+        '
         'MyComboBox1
         '
         Me.MyComboBox1._allowedValuesFreiText = Nothing
@@ -181,6 +221,40 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.MyComboBox1.Size = New System.Drawing.Size(98, 21)
         Me.MyComboBox1.TabIndex = 7
         '
+        'btnE_Aviso
+        '
+        Me.btnE_Aviso.BackColor = System.Drawing.Color.White
+        Me.btnE_Aviso.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnE_Aviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnE_Aviso.ForeColor = System.Drawing.Color.Black
+        Me.btnE_Aviso.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnE_Aviso.Location = New System.Drawing.Point(162, 151)
+        Me.btnE_Aviso.MaximumSize = New System.Drawing.Size(121, 34)
+        Me.btnE_Aviso.Name = "btnE_Aviso"
+        Me.btnE_Aviso.Size = New System.Drawing.Size(121, 34)
+        Me.btnE_Aviso.TabIndex = 31
+        Me.btnE_Aviso.Text = "eAVISO"
+        Me.btnE_Aviso.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnE_Aviso.UseVisualStyleBackColor = False
+        Me.btnE_Aviso.Visible = False
+        '
+        'btnNeu
+        '
+        Me.btnNeu.BackColor = System.Drawing.Color.White
+        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeu.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnNeu.ForeColor = System.Drawing.Color.Black
+        Me.btnNeu.Image = CType(resources.GetObject("btnNeu.Image"), System.Drawing.Image)
+        Me.btnNeu.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnNeu.Location = New System.Drawing.Point(3, 151)
+        Me.btnNeu.MaximumSize = New System.Drawing.Size(121, 34)
+        Me.btnNeu.Name = "btnNeu"
+        Me.btnNeu.Size = New System.Drawing.Size(121, 34)
+        Me.btnNeu.TabIndex = 30
+        Me.btnNeu.Text = "    LKW"
+        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnNeu.UseVisualStyleBackColor = False
+        '
         'pblSNDOptions
         '
         Me.pblSNDOptions.Controls.Add(Me.cbx_My_Brexit)
@@ -376,7 +450,7 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.tbcntrAvisoSND.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.tbcntrAvisoSND.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.tbcntrAvisoSND.ItemSize = New System.Drawing.Size(60, 30)
-        Me.tbcntrAvisoSND.Location = New System.Drawing.Point(157, 166)
+        Me.tbcntrAvisoSND.Location = New System.Drawing.Point(13, 134)
         Me.tbcntrAvisoSND.Name = "tbcntrAvisoSND"
         Me.tbcntrAvisoSND.Padding = New System.Drawing.Point(12, 3)
         Me.tbcntrAvisoSND.SelectedIndex = 0
@@ -532,6 +606,7 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         '
         Me.pnlTime.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.pnlTime.Controls.Add(Me.lblHinweis)
         Me.pnlTime.Controls.Add(Me.lblDauer)
         Me.pnlTime.Controls.Add(Me.Label10)
         Me.pnlTime.Controls.Add(Me.txtBestimmungszollstelle)
@@ -544,6 +619,18 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.pnlTime.Size = New System.Drawing.Size(683, 57)
         Me.pnlTime.TabIndex = 12
         '
+        'lblDauer
+        '
+        Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblDauer.BackColor = System.Drawing.Color.Transparent
+        Me.lblDauer.ForeColor = System.Drawing.Color.White
+        Me.lblDauer.Location = New System.Drawing.Point(523, 18)
+        Me.lblDauer.Name = "lblDauer"
+        Me.lblDauer.Size = New System.Drawing.Size(155, 17)
+        Me.lblDauer.TabIndex = 27
+        Me.lblDauer.Text = "1111123 ms"
+        Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
         'Label10
         '
         Me.Label10.AutoSize = True
@@ -608,9 +695,10 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         '
         'lblEintraege
         '
+        Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblEintraege.BackColor = System.Drawing.Color.Transparent
         Me.lblEintraege.ForeColor = System.Drawing.Color.White
-        Me.lblEintraege.Location = New System.Drawing.Point(394, 6)
+        Me.lblEintraege.Location = New System.Drawing.Point(509, 6)
         Me.lblEintraege.Name = "lblEintraege"
         Me.lblEintraege.Size = New System.Drawing.Size(169, 15)
         Me.lblEintraege.TabIndex = 14
@@ -1220,16 +1308,17 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
         Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22)
         Me.ToolStripMenuItem21.Text = "GELB"
         '
-        'lblDauer
+        'lblHinweis
         '
-        Me.lblDauer.BackColor = System.Drawing.Color.Transparent
-        Me.lblDauer.ForeColor = System.Drawing.Color.White
-        Me.lblDauer.Location = New System.Drawing.Point(408, 18)
-        Me.lblDauer.Name = "lblDauer"
-        Me.lblDauer.Size = New System.Drawing.Size(155, 17)
-        Me.lblDauer.TabIndex = 27
-        Me.lblDauer.Text = "1111123 ms"
-        Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lblHinweis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblHinweis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblHinweis.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.lblHinweis.Location = New System.Drawing.Point(549, 37)
+        Me.lblHinweis.Name = "lblHinweis"
+        Me.lblHinweis.Size = New System.Drawing.Size(129, 16)
+        Me.lblHinweis.TabIndex = 38
+        Me.lblHinweis.Text = "Hinweis eingetragen"
+        Me.lblHinweis.Visible = False
         '
         'usrCntlHauptfenster_Suche_AVISO
         '
@@ -1344,4 +1433,9 @@ Partial Class usrCntlHauptfenster_Suche_AVISO
     Friend WithEvents ToolStripMenuItem20 As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem
     Friend WithEvents lblDauer As Label
+    Friend WithEvents btnE_Aviso As Button
+    Friend WithEvents btnNeu As Button
+    Friend WithEvents Button7 As Button
+    Friend WithEvents Label22 As Label
+    Friend WithEvents lblHinweis As Label
 End Class
diff --git a/Aviso/usrCntlHauptfenster_Suche_AVISO.resx b/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
index 79dc3bd..cb054e5 100644
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.resx
@@ -117,6 +117,23 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
+        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
+        zULyAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
+        BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
+        zULyAAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="TimerAkte.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
diff --git a/Aviso/usrCntlHauptfenster_Suche_AVISO.vb b/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
index c8a8fa7..0f240d9 100644
--- a/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
+++ b/Aviso/usrCntlHauptfenster_Suche_AVISO.vb
@@ -50,7 +50,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         cboImEx.changeItem("")
 
 
-
+        If gridAviso.RowCount > 0 Then
+            gridAviso.Rows(0).Selected = True
+        End If
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
             cboMy_Grenzstelle.Items.Clear()
@@ -149,6 +151,11 @@ Public Class usrCntlHauptfenster_Suche_AVISO
 
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
+            btnE_Aviso.Visible = True
+            Label22.Visible = True
+            initEAviso()
+        End If
 
         tbcntrAvisoLKW.Width = Panel1.Width
 
@@ -981,12 +988,13 @@ Public Class usrCntlHauptfenster_Suche_AVISO
             End If
             PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
         End If
-        If chkFarben Then PARENT_FRMHAUPTFENSTER.GridZeichnenAviso()
+        If chkFarben Then GridZeichnenAviso()
         Label8.Visible = False
         lblDauer.Text = "" & hDifferenz.ToString & " ms"
 
         lblEintraege.Text = gridAviso.RowCount & " Einträge" & If(gridAviso.RowCount = 2000, " (begrenzt)", "")
 
+        initEAviso()
 
         'lblDauer.Text = "Dauer Anzeige aufbauen: " & hDifferenz.ToString & " ms"
     End Sub
@@ -1093,7 +1101,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         initDat()
         Aviso_anzeigen("")
 
-        PARENT_FRMHAUPTFENSTER.setAkive_AuswahlID() 'Lädt die aktuelle ID
+        setAkive_AuswahlID() 'Lädt die aktuelle ID
         If gridAviso.SelectedRows.Count > 0 Then
             PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, False)
         Else
@@ -1454,4 +1462,442 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         Return addDays
     End Function
 
+    Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
+        Try
+
+            Me.Cursor = Cursors.WaitCursor
+            gridAviso.ClearSelection()
+            'gridMyAviso.ClearSelection()
+            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+            Dim f As New frmEintragAviso
+
+            If sender Is ToolStripMenuItem17 Then
+                f.FIRMA_TMP = "ATILLA"
+            End If
+
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
+            '  f.frmHilf = Me
+            If Not f.IsDisposed And f IsNot Nothing And Not frmGrayOut.IsDisposed And frmGrayOut IsNot Nothing Then
+                f.ShowDialog(frmGrayOut)
+            End If
+            frmGrayOut.Close()
+            PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick() 'Aviso_anzeigen("")
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnE_Aviso.Click, Label22.Click
+        Me.Cursor = Cursors.WaitCursor
+        Dim f As New frm_eAVISO
+        f.Show()
+        Me.Cursor = Cursors.Default
+    End Sub
+
+
+    Sub initEAviso()
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
+            If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '??
+            Label22.Text = VERAGSQL.getValueTxtBySql("SELECT count(*) FROM [tblNCTS_TR] where ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ'", "FMZOLL") '"XX"
+            If Label22.Text = "0" Then Label22.Text = ""
+            Label22.Visible = Label22.Text <> ""
+            Label22.BringToFront()
+        End If
+    End Sub
+
+    Private Sub usrCntlHauptfenster_Suche_AVISO_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
+        If (e.KeyCode) = Keys.Add AndAlso e.Control Then
+            btnNeu.PerformClick()
+        End If
+
+    End Sub
+
+    Function setAkive_AuswahlID() As Integer
+        If gridAviso.SelectedRows.Count > 0 Then
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridAviso.Rows(gridAviso.SelectedRows(0).Index).Cells("AvisoID").Value)
+        Else
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = -1
+        End If
+
+        'If gridMyAviso.SelectedRows.Count > 0 Then
+        '    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridMyAviso.Rows(gridMyAviso.SelectedRows(0).Index).Cells("AvisoID").Value)
+        '    If Not cbx_My_LKW.Checked Then
+        '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = CInt(gridMyAviso.Rows(gridMyAviso.SelectedRows(0).Index).Cells("tblSnd_SendungID").Value)
+        '    Else
+        '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
+
+        '    End If
+        'Else
+        '    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
+        'End If
+
+        Return VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID
+    End Function
+
+    Public Sub GridZeichnenAviso()
+        'hier wird der Grid speziell designed
+        If gridAviso.RowCount = 0 Then Exit Sub
+        'Falls Kunde auf inaktiv steht, dann wird Zeile ausgegraut angezeigt
+        For Each dr As DataGridViewRow In gridAviso.Rows
+            Select Case VarToInt(dr.Cells("Status").Value)
+                Case 0  'erfasst
+                    dr.DefaultCellStyle.SelectionBackColor = Color.FromArgb(230, 0, 0)
+                    dr.DefaultCellStyle.ForeColor = Color.FromArgb(230, 0, 0)
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+                Case 1  'freigegeben
+                    dr.DefaultCellStyle.SelectionBackColor = Color.Green
+                    dr.DefaultCellStyle.ForeColor = Color.Green
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+                Case 2  'LKW nicht eingetroffen
+                    dr.DefaultCellStyle.SelectionBackColor = Color.Gray
+                    dr.DefaultCellStyle.ForeColor = Color.Gray
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+                Case 3  'Ankunft
+                    dr.DefaultCellStyle.SelectionBackColor = Color.Blue
+                    dr.DefaultCellStyle.ForeColor = Color.Blue
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+                Case 4  'Vorbereitet
+                    dr.DefaultCellStyle.SelectionBackColor = Color.Brown
+                    dr.DefaultCellStyle.ForeColor = Color.Brown
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+                Case 5  'Vorbereitet
+                    dr.DefaultCellStyle.SelectionBackColor = Color.Purple
+                    dr.DefaultCellStyle.ForeColor = Color.Purple
+                    dr.DefaultCellStyle.SelectionForeColor = Color.White
+            End Select
+            dr.Cells("Status").Style.BackColor = dr.DefaultCellStyle.ForeColor
+            dr.Cells("Status").Style.SelectionForeColor = dr.DefaultCellStyle.ForeColor
+            dr.Cells("LKW_Nr").Style.BackColor = lkwbackcolor
+            'dr.Cells("LKW_Nr").Style.SelectionBackColor = lkwbackcolorSel
+            ' dr.Cells("LKW_Nr").Style.SelectionForeColor = Color.Black
+        Next
+
+
+    End Sub
+
+    Public Sub lblHinweiseVisible()
+        ' If gridMyAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridMyAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
+        If gridAviso.SelectedRows.Count > 0 Then lblHinweis.Visible = (gridAviso.SelectedRows(0).Cells("AvisoTVHinweis").Value.ToString <> "")
+    End Sub
+
+
+
+    Public Sub avisoAktualisierenAktiveIdBehalten(tmpid As Integer, Optional aktWithoutCheckTime As Boolean = False, Optional Aviso_anzeigenBool As Boolean = True)
+
+        PARENT_FRMHAUPTFENSTER.pic.Visible = False
+        Try
+
+
+            If Not Grid_aktiv Then Exit Sub
+            Details_aktiv = False
+
+
+
+            If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)
+
+
+            If AVISO_TYP = "LKW" Then
+                gridAviso.ClearSelection()
+                For Each r As DataGridViewRow In gridAviso.Rows
+                    If CInt(r.Cells("AvisoId").Value) = tmpid Then
+                        ' gridMyAviso.ClearSelection()
+                        gridAviso.CurrentCell = r.Cells("Status")
+                        r.Selected = True : Exit For
+                    End If
+                Next
+            Else
+                gridAviso.ClearSelection()
+                If gridAviso.Rows.Count > 0 Then
+                    For Each r As DataGridViewRow In gridAviso.Rows
+                        If CInt(r.Cells("tblSnd_SendungID").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID Then
+                            gridAviso.CurrentCell = r.Cells("Status")
+                            r.Selected = True : Exit For
+                        End If
+                    Next
+                End If
+            End If
+
+
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpid
+            Details_aktiv = True
+
+            If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls.Count > 0 Then
+
+                Dim usrcntlAvisoID = -1
+                Dim usrcntlAktiv As DateTime
+                If Not PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).GetType = GetType(System.Windows.Forms.Label) Then
+                    If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).Name = "usrcntlAktDetailsATILLANeu" Then
+                        usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).AvisoID
+                        usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).aktiv
+                    Else
+                        usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).AvisoID
+                        usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).aktiv
+                    End If
+
+                    If aktWithoutCheckTime Or usrcntlAvisoID <> tmpid Then
+                        PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                    Else
+                        If DateDiff(DateInterval.Second, usrcntlAktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
+                            PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                        End If
+                    End If
+                End If
+
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
+        End Try
+    End Sub
+
+
+
+    Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridAviso.CellMouseClick
+
+        If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
+        'If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
+        'gridMyAviso.ClearSelection() 'WARUM?
+        '   If sender Is gridAviso Then gridMyAviso.ClearSelection() : UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.ClearSelection()
+        '  If sender Is gridMyAviso Then gridAviso.ClearSelection() : UsrCntlBenachrichtigungen2.gridAvisoBenachrichtigungen.ClearSelection()
+        ' MsgBox(Grid_aktiv)
+        DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
+
+        Dim tmpId = CInt(sender.Rows(e.RowIndex).Cells("AvisoId").Value)
+
+        If AVISO_TYP = "SND" Then
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = CInt(gridAviso.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value)
+        Else
+
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
+        End If
+
+
+        If e.Button = MouseButtons.Right Then
+            If True Then
+                'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
+                '    If sender Is gridAviso Then
+                '        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
+                '        sender.CurrentCell = sender.Rows(e.RowIndex).Cells(e.ColumnIndex)
+                '        conMenuAviso.Show(Cursor.Position)
+                '    End If
+                'Else
+                setAkive_AuswahlID()
+                avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
+                Dim hStatus = AvisoDAL.LesenAviso(tmpId, "").Status
+                If hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Then
+                    'MsgBox("Ein Vermerk kann nur erfasst werden, wenn der Status des Aviso auf 'Erfasst', 'Vorbereitet', 'Vorgeschrieben' oder 'Ankunft' steht.", vbInformation)
+                    PARENT_FRMHAUPTFENSTER.lblErrVermerk.Width = 300
+                    PARENT_FRMHAUPTFENSTER.lblErrVermerk.Visible = True
+                    '  PARENT_FRMHAUPTFENSTER.hideErr.Enabled = True
+                    Exit Sub
+                End If
+
+                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                Dim sv As New frmAddAktenvermerkShort(tmpId)
+                sv.Location = Me.PointToClient(Cursor.Position)
+                ' sv.ShowDialog()
+                sv.ShowDialog(frmGrayOut)
+                frmGrayOut.Close()
+
+            End If
+        ElseIf e.Button = MouseButtons.Left Then
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
+            avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
+        End If
+    End Sub
+
+    Private Sub gridAviso_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridAviso.CellContentClick
+        Try
+            If e.RowIndex > 0 Then
+
+                '   MsgBox(gridMyAviso.Columns(e.ColumnIndex).Name)
+                If AVISO_TYP = "SND" Then
+                    If True Then 'gridMyAviso.SelectedRows.Count = 1 Then
+                        Dim SendungsId = gridAviso.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value
+                        Dim AvisoID = gridAviso.Rows(e.RowIndex).Cells("AvisoID").Value
+                        If SendungsId > 0 And AvisoID > 0 Then
+
+                            Select Case gridAviso.Columns(e.ColumnIndex).Name
+
+                                Case "StatusVorgeschrieben"
+                                    Me.Cursor = Cursors.WaitCursor
+                                    If FUNC.setSendungVorgeschrieben(SendungsId, AvisoID) Then
+                                        avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
+                                    End If
+                                    Me.Cursor = Cursors.Default
+                                Case "StatusVorbereitetQS"
+                                    Me.Cursor = Cursors.WaitCursor
+                                    If FUNC.setSendungVorbereitetQS(SendungsId, AvisoID) Then
+                                        avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
+                                    End If
+
+                                    Me.Cursor = Cursors.Default
+                            End Select
+                        End If
+                    End If
+                End If
+            End If
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+
+
+    Private Sub gridAviso_ColumnHeaderMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridAviso.ColumnHeaderMouseClick
+        GridZeichnenAviso()
+    End Sub
+
+    Private Sub gridAviso_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles gridAviso.CellPainting
+        If e.RowIndex <> -1 AndAlso gridAviso.Columns(e.ColumnIndex).Name = "Status" Then
+            If gridAviso.Rows(e.RowIndex).Cells("Transportmittelart").Value = "SPRINTER" Then
+                If (e.PaintParts And DataGridViewPaintParts.Background) <> DataGridViewPaintParts.None Then
+                    e.Graphics.DrawImage(My.Resources.sprinter_white, e.CellBounds)
+                    'e.CellStyle.BackColor = Color.White
+                End If
+
+
+                If Not e.Handled Then
+                    e.Handled = True
+                    e.PaintContent(e.CellBounds)
+                End If
+            End If
+        End If
+
+    End Sub
+
+
+    Private Sub gridAviso_CellFormatting(sender As Object, e As System.Windows.Forms.DataGridViewCellFormattingEventArgs) Handles gridAviso.CellFormatting
+        'Anzahl Minuten als verständlichen Text anzeigen
+
+        If AVISO_TYP = "LKW" Then
+            Select Case gridAviso.Columns(e.ColumnIndex).Name
+                Case "Status"  'Status
+                    Select Case VarToInt(e.Value)
+                        Case 0 : e.Value = "Erfasst"
+                        Case 1 : e.Value = "Freigegeben"
+                        Case 2 : e.Value = "LKW n.e."
+                        Case 3 : e.Value = "Ankunft"
+                        Case 4 : e.Value = "Vorbereitet"
+                        Case 5 : e.Value = "Vorgeschrieben"
+                        Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien"
+                        Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex"
+                        Case Else : e.Value = "unbekannt"
+                    End Select
+
+                Case "AvisoEingang" 'Aviso-Eingang
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Datum" 'Aviso-Eingang
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Erfasst" 'Aviso-Eingang
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Vorbereitet" 'Vorbereitet
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Vorgeschrieben" 'Vorgeschrieben
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Ankunft" 'Ankunft
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Freigabe" 'Abfahrt
+                    If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                Case "Dauer" 'Dauer
+
+                    If VarToInt(e.Value) > 120 Then
+                        gridAviso.Rows(e.RowIndex).Cells("Dauer").Style.ForeColor = Color.Red
+                    End If
+                    If VarToInt(e.Value) = 0 Then
+                        e.Value = ""
+                    Else
+                        e.Value = Minuten_auf_Text(VarToLng(e.Value))
+                    End If
+                Case "VoraussichtlichesEintreffen"
+                    '  "Der Operator = ist für Typ DBNull und Typ Date nicht definiert."
+
+                    If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then
+                        'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red
+                        gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
+                    End If
+            End Select
+
+        Else
+            Try
+
+
+                If gridAviso Is Nothing Then Exit Sub
+                If gridAviso.Columns Is Nothing Then Exit Sub
+                If gridAviso.ColumnCount = 0 Then Exit Sub
+
+
+                'Anzahl Minuten als verständlichen Text anzeigen
+                Select Case gridAviso.Columns(e.ColumnIndex).Name
+                    Case "Status"  'Status
+
+                        'Dim vb As Boolean = gridAviso.Rows(e.RowIndex).Cells("statVorb").Value
+                        'Select Case VarToInt(e.Value)
+                        '    Case 0 : e.Value = IIf(vb, "Erfasst (in VB)", "Erfasst") : gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.FromArgb(60, 60, 60)
+                        '    Case 1 : e.Value = IIf(vb, "Freigegeben (in VB)", "Freigegeben")
+                        '    Case 2 : e.Value = IIf(vb, "LKW n.e. (in VB)", "LKW n.e.")
+                        '    Case 3 : e.Value = IIf(vb, "Ankunft (in VB)", "Ankunft") : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                        '    Case 4 : e.Value = IIf(vb, "Vorber. (in VB)", "Vorbereitet")
+                        '    Case 5 : e.Value = IIf(vb, "Vorg. (in VB)", "Vorgeschrieben")
+                        '        '     Case 99 : e.Value = "in Vorbereitung" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                        '        'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Brown
+                        '        ' gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                        '    Case Else : e.Value = "unbekannt"
+                        'End Select
+
+                        Select Case VarToInt(e.Value)
+                            Case 0 : e.Value = "Erfasst" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.FromArgb(60, 60, 60)
+                            Case 1 : e.Value = "Freigegeben"
+                            Case 2 : e.Value = "LKW n.e."
+                            Case 3 : e.Value = "Ankunft" : gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                            Case 4 : e.Value = "Vorbereitet"
+                            Case 5 : e.Value = "Vorgeschrieben"
+                            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien"
+                            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex"
+                                '     Case 99 : e.Value = "in Vorbereitung" : gridAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                                'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Brown
+                                ' gridAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) 'New Font(gridAviso.DefaultCellStyle.Font, 8.0F)
+                            Case Else : e.Value = "unbekannt"
+                        End Select
+
+                    ' If gridAviso.Rows(e.RowIndex).Cells("statVorb").Value = "1" Then
+                    'e.Value &= " (VB)"
+                    ' End If
+
+                    Case "AvisoEingang" 'Aviso-Eingang
+                        If VarToDate(e.Value) = LeerDatum Then e.Value = ""
+
+                    Case "Ankunft" 'Ankunft
+                        If VarToDate(e.Value) = LeerDatum Then
+                            e.Value = ""
+                        Else
+                            '  If DateDiff(DateInterval.Minute, CDate(VarToDate(e.Value)), Now) > 120 Then
+                            ' 'gridAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Red
+                            ' gridAviso.Rows(e.RowIndex).Cells("Dauer").Style.ForeColor = Color.Red
+                            '     gridAviso.Rows(e.RowIndex).Cells("Ankunft").Style.ForeColor = Color.Red
+                            ' End If
+                        End If
+                End Select
+
+
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            End Try
+        End If
+
+
+
+    End Sub
+
+
 End Class