Merge

2024-11-04 13:52:18 +01:00
parent 6793b30c23 044348dcd6
commit 77efe69f69
15 changed files with 424 additions and 133 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -1679,6 +1679,7 @@
    <None Include="Resources\memories3.png" />
    <None Include="Resources\memories4.png" />
    <None Include="Resources\memories5.png" />
+    <None Include="Resources\reminder.png" />
    <Content Include="Resources\WLAN\RunNHide.exe">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -189,6 +189,8 @@ Public Class usrCntlBenachrichtigungen
                    If r.Cells("ab_BenachrichtigungCode").Value = "6" Then
                        r.Cells("ab_Art").Value = "VK"
                    End If
+
+
                Next

                '.Width = gridAviso.Width - gridVermerke.Width
@@ -205,6 +207,26 @@ Public Class usrCntlBenachrichtigungen

    End Sub

+    Private Sub gridAvisoBenachrichtigungen_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles gridAvisoBenachrichtigungen.CellPainting
+        If e.RowIndex <> -1 AndAlso gridAvisoBenachrichtigungen.Columns(e.ColumnIndex).Name = "ab_Art" Then
+            If gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Beschreibung").Value.ToString.Contains("AAS:") Then
+                If (e.PaintParts And DataGridViewPaintParts.Background) <> DataGridViewPaintParts.None Then
+                    e.Graphics.DrawImage(My.Resources.reminder, e.CellBounds)
+                    'e.CellStyle.BackColor = Color.White
+                    gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Art").Value = ""
+                    gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Art").Style.BackColor = Color.Gray
+                End If
+
+
+                If Not e.Handled Then
+                    e.Handled = True
+                    e.PaintContent(e.CellBounds)
+                End If
+            End If
+        End If
+
+    End Sub
+
    Private Sub usrCntlBenachrichtigungen_Load(sender As Object, e As EventArgs) Handles Me.Load

        'MyComboBox2.Items.Clear()
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -165,7 +165,7 @@ Public Class SendungOptions

        Dim imgQR As Image = Nothing
        If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then
-            imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
+            imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/upload?avisoid=" & AVISO.AvisoID & "&sendungsid=" & SENDUNG.tblSnd_SendungID)
            'imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&SendungId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SENDUNG.tblSnd_SendungID))
        End If
        If barcode IsNot Nothing Then VALUES.imgQR = imgQR
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1338,6 +1338,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property reminder() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("reminder", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -691,4 +691,7 @@
  <data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="reminder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\reminder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/Aviso/Resources/reminder.png
+++ b/Aviso/Resources/reminder.png
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -239,6 +239,7 @@ Partial Class frmHauptfenster
        Me.Label6 = New System.Windows.Forms.Label()
        Me.txtSuche = New System.Windows.Forms.TextBox()
        Me.Top = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
        Me.lblUsrname = New System.Windows.Forms.Label()
        Me.lblFimaAviso = New System.Windows.Forms.Label()
        Me.Button11 = New System.Windows.Forms.Button()
@@ -276,21 +277,23 @@ Partial Class frmHauptfenster
        Me.lblSuche = New System.Windows.Forms.Label()
        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
        Me.pnlLinks = New System.Windows.Forms.Panel()
-        Me.Label20 = New System.Windows.Forms.Label()
-        Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
-        Me.pic = New System.Windows.Forms.PictureBox()
        Me.Panel2 = New System.Windows.Forms.Panel()
        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.Button7 = New System.Windows.Forms.Button()
        Me.Label22 = New System.Windows.Forms.Label()
        Me.Button12 = 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.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)
@@ -326,6 +329,10 @@ Partial Class frmHauptfenster
        Me.splitMain = New System.Windows.Forms.SplitContainer()
        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.tbSndAlle = New System.Windows.Forms.TabPage()
+        Me.tbSndOffen = New System.Windows.Forms.TabPage()
+        Me.tbSndFreigegeben = New System.Windows.Forms.TabPage()
        Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.cboImEx = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -398,8 +405,10 @@ Partial Class frmHauptfenster
        Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
+        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.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -409,11 +418,11 @@ Partial Class frmHauptfenster
        Me.SplitContainer2.Panel2.SuspendLayout()
        Me.SplitContainer2.SuspendLayout()
        Me.pnlLinks.SuspendLayout()
-        CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel2.SuspendLayout()
        Me.pnlLinksOben.SuspendLayout()
        Me.cntxtAtilla.SuspendLayout()
+        CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer3.Panel1.SuspendLayout()
        Me.SplitContainer3.Panel2.SuspendLayout()
@@ -433,6 +442,7 @@ Partial Class frmHauptfenster
        Me.splitMain.SuspendLayout()
        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
+        Me.TabControl1.SuspendLayout()
        Me.pnlTime.SuspendLayout()
        Me.pnlSearch.SuspendLayout()
        Me.pnlOptionen.SuspendLayout()
@@ -441,6 +451,7 @@ Partial Class frmHauptfenster
        Me.Panel3.SuspendLayout()
        Me.Panel4.SuspendLayout()
        Me.cntVerag.SuspendLayout()
+        Me.pnlLeft.SuspendLayout()
        Me.SuspendLayout()
        '
        'mnuInfo
@@ -539,7 +550,7 @@ Partial Class frmHauptfenster
        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(1372, 25)
+        Me.MenuStrip1.Size = New System.Drawing.Size(1202, 25)
        Me.MenuStrip1.TabIndex = 3
        Me.MenuStrip1.Text = "MenuStrip1"
        '
@@ -1735,7 +1746,7 @@ Partial Class frmHauptfenster
        Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0)
        Me.pnlDetailsRechts.Name = "pnlDetailsRechts"
-        Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 598)
+        Me.pnlDetailsRechts.Size = New System.Drawing.Size(266, 598)
        Me.pnlDetailsRechts.TabIndex = 0
        '
        'lblMitarbeiter
@@ -1745,7 +1756,7 @@ Partial Class frmHauptfenster
        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, -38)
+        Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -63)
        Me.lblMitarbeiter.Name = "lblMitarbeiter"
        Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13)
        Me.lblMitarbeiter.TabIndex = 1
@@ -1800,6 +1811,16 @@ Partial Class frmHauptfenster
        Me.Top.Size = New System.Drawing.Size(1372, 52)
        Me.Top.TabIndex = 6
        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(1028, 7)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 87
+        Me.Button1.Text = "Button1"
+        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button1.Visible = False
+        '
        'lblUsrname
        '
        Me.lblUsrname.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2079,7 +2100,7 @@ Partial Class frmHauptfenster
        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(0, 195)
+        Me.lblDauer.Location = New System.Drawing.Point(2, 283)
        Me.lblDauer.Name = "lblDauer"
        Me.lblDauer.Size = New System.Drawing.Size(155, 17)
        Me.lblDauer.TabIndex = 2
@@ -2282,68 +2303,30 @@ Partial Class frmHauptfenster
        '
        Me.SplitContainer2.Panel1.BackColor = System.Drawing.SystemColors.Control
        Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinks)
-        Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinksOben)
        Me.SplitContainer2.Panel1MinSize = 164
        '
        'SplitContainer2.Panel2
        '
        Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3)
-        Me.SplitContainer2.Size = New System.Drawing.Size(815, 300)
+        Me.SplitContainer2.Size = New System.Drawing.Size(720, 300)
        Me.SplitContainer2.SplitterDistance = 164
        Me.SplitContainer2.SplitterWidth = 1
        Me.SplitContainer2.TabIndex = 0
        '
        'pnlLinks
        '
+        Me.pnlLinks.Controls.Add(Me.Panel2)
        Me.pnlLinks.Controls.Add(Me.Label20)
+        Me.pnlLinks.Controls.Add(Me.pnlLinksOben)
+        Me.pnlLinks.Controls.Add(Me.lblDauer)
        Me.pnlLinks.Controls.Add(Me.picAVISOMessenger)
        Me.pnlLinks.Controls.Add(Me.pic)
-        Me.pnlLinks.Controls.Add(Me.lblDauer)
-        Me.pnlLinks.Controls.Add(Me.Panel2)
        Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlLinks.Location = New System.Drawing.Point(0, 86)
+        Me.pnlLinks.Location = New System.Drawing.Point(0, 0)
        Me.pnlLinks.Name = "pnlLinks"
-        Me.pnlLinks.Size = New System.Drawing.Size(164, 214)
+        Me.pnlLinks.Size = New System.Drawing.Size(164, 300)
        Me.pnlLinks.TabIndex = 0
        '
-        '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(49, 167)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(28, 19)
-        Me.Label20.TabIndex = 9
-        Me.Label20.Text = "99"
-        Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.Label20.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(1, 119)
-        Me.picAVISOMessenger.Name = "picAVISOMessenger"
-        Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55)
-        Me.picAVISOMessenger.TabIndex = 7
-        Me.picAVISOMessenger.TabStop = False
-        Me.picAVISOMessenger.Visible = False
-        '
-        'pic
-        '
-        Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect
-        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.pic.Location = New System.Drawing.Point(69, 124)
-        Me.pic.Name = "pic"
-        Me.pic.Size = New System.Drawing.Size(59, 50)
-        Me.pic.TabIndex = 5
-        Me.pic.TabStop = False
-        Me.pic.Visible = False
-        '
        'Panel2
        '
        Me.Panel2.Controls.Add(Me.btnZertifikate)
@@ -2353,7 +2336,7 @@ Partial Class frmHauptfenster
        Me.Panel2.Controls.Add(Me.btnZollwebseiten)
        Me.Panel2.Controls.Add(Me.lblHinweis)
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel2.Location = New System.Drawing.Point(0, 0)
+        Me.Panel2.Location = New System.Drawing.Point(0, 91)
        Me.Panel2.Name = "Panel2"
        Me.Panel2.Size = New System.Drawing.Size(164, 111)
        Me.Panel2.TabIndex = 10
@@ -2409,23 +2392,55 @@ Partial Class frmHauptfenster
        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(51, 255)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(28, 19)
+        Me.Label20.TabIndex = 9
+        Me.Label20.Text = "99"
+        Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.Label20.Visible = False
+        '
        'pnlLinksOben
        '
+        Me.pnlLinksOben.Controls.Add(Me.Button7)
        Me.pnlLinksOben.Controls.Add(Me.Label22)
        Me.pnlLinksOben.Controls.Add(Me.Button12)
        Me.pnlLinksOben.Controls.Add(Me.btnNeu)
        Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0)
        Me.pnlLinksOben.Name = "pnlLinksOben"
-        Me.pnlLinksOben.Size = New System.Drawing.Size(164, 86)
+        Me.pnlLinksOben.Size = New System.Drawing.Size(164, 91)
        Me.pnlLinksOben.TabIndex = 1
        '
+        '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
+        '
        '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, 53)
+        Me.Label22.Location = New System.Drawing.Point(92, 89)
        Me.Label22.Name = "Label22"
        Me.Label22.Size = New System.Drawing.Size(28, 19)
        Me.Label22.TabIndex = 10
@@ -2439,7 +2454,7 @@ Partial Class frmHauptfenster
        Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Button12.ForeColor = System.Drawing.Color.Black
        Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button12.Location = New System.Drawing.Point(5, 44)
+        Me.Button12.Location = New System.Drawing.Point(5, 80)
        Me.Button12.MaximumSize = New System.Drawing.Size(121, 34)
        Me.Button12.Name = "Button12"
        Me.Button12.Size = New System.Drawing.Size(121, 34)
@@ -2462,7 +2477,7 @@ Partial Class frmHauptfenster
        Me.btnNeu.Name = "btnNeu"
        Me.btnNeu.Size = New System.Drawing.Size(121, 34)
        Me.btnNeu.TabIndex = 0
-        Me.btnNeu.Text = "    NEU"
+        Me.btnNeu.Text = "    LKW"
        Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnNeu.UseVisualStyleBackColor = True
        '
@@ -2479,6 +2494,30 @@ Partial Class frmHauptfenster
        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(110, 22)
        Me.ToolStripMenuItem17.Text = "ATILLA"
        '
+        '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(3, 207)
+        Me.picAVISOMessenger.Name = "picAVISOMessenger"
+        Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55)
+        Me.picAVISOMessenger.TabIndex = 7
+        Me.picAVISOMessenger.TabStop = False
+        Me.picAVISOMessenger.Visible = False
+        '
+        'pic
+        '
+        Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect
+        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.pic.Location = New System.Drawing.Point(71, 126)
+        Me.pic.Name = "pic"
+        Me.pic.Size = New System.Drawing.Size(59, 50)
+        Me.pic.TabIndex = 5
+        Me.pic.TabStop = False
+        Me.pic.Visible = False
+        '
        'SplitContainer3
        '
        Me.SplitContainer3.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2492,10 +2531,19 @@ Partial Class frmHauptfenster
        'SplitContainer3.Panel2
        '
        Me.SplitContainer3.Panel2.Controls.Add(Me.pnl)
-        Me.SplitContainer3.Size = New System.Drawing.Size(650, 300)
-        Me.SplitContainer3.SplitterDistance = 158
+        Me.SplitContainer3.Size = New System.Drawing.Size(555, 300)
+        Me.SplitContainer3.SplitterDistance = 134
        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(134, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
        'pnl
        '
        Me.pnl.Controls.Add(Me.Button10)
@@ -2504,7 +2552,7 @@ Partial Class frmHauptfenster
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(488, 300)
+        Me.pnl.Size = New System.Drawing.Size(417, 300)
        Me.pnl.TabIndex = 0
        '
        'Button10
@@ -2562,7 +2610,7 @@ Partial Class frmHauptfenster
        Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
        Me.gridMyAviso.RowHeadersVisible = False
        Me.gridMyAviso.RowHeadersWidth = 62
-        Me.gridMyAviso.Size = New System.Drawing.Size(488, 279)
+        Me.gridMyAviso.Size = New System.Drawing.Size(417, 279)
        Me.gridMyAviso.TabIndex = 0
        '
        'Panel6
@@ -2582,7 +2630,7 @@ Partial Class frmHauptfenster
        Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel6.Location = New System.Drawing.Point(0, 0)
        Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(488, 21)
+        Me.Panel6.Size = New System.Drawing.Size(417, 21)
        Me.Panel6.TabIndex = 1
        '
        'cbx_My_Brexit
@@ -2590,7 +2638,7 @@ Partial Class frmHauptfenster
        Me.cbx_My_Brexit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.cbx_My_Brexit.AutoSize = True
        Me.cbx_My_Brexit.ForeColor = System.Drawing.Color.White
-        Me.cbx_My_Brexit.Location = New System.Drawing.Point(-91, 3)
+        Me.cbx_My_Brexit.Location = New System.Drawing.Point(-162, 3)
        Me.cbx_My_Brexit.Name = "cbx_My_Brexit"
        Me.cbx_My_Brexit.Size = New System.Drawing.Size(65, 17)
        Me.cbx_My_Brexit.TabIndex = 28
@@ -2602,7 +2650,7 @@ Partial Class frmHauptfenster
        '
        Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnColor.BackColor = System.Drawing.Color.White
-        Me.btnColor.Location = New System.Drawing.Point(397, -1)
+        Me.btnColor.Location = New System.Drawing.Point(326, -1)
        Me.btnColor.Name = "btnColor"
        Me.btnColor.Size = New System.Drawing.Size(36, 23)
        Me.btnColor.TabIndex = 27
@@ -2632,7 +2680,7 @@ Partial Class frmHauptfenster
        Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.cboMy_Grenzstelle.FormattingEnabled = True
-        Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1)
+        Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(42, 1)
        Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle"
        Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21)
        Me.cboMy_Grenzstelle.TabIndex = 26
@@ -2642,7 +2690,7 @@ Partial Class frmHauptfenster
        Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblMySnd_Grenzstelle.AutoSize = True
        Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White
-        Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(45, 4)
+        Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-26, 4)
        Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle"
        Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(62, 13)
        Me.lblMySnd_Grenzstelle.TabIndex = 25
@@ -2653,7 +2701,7 @@ Partial Class frmHauptfenster
        Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.cbx_My_LKW.AutoSize = True
        Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White
-        Me.cbx_My_LKW.Location = New System.Drawing.Point(-11, 3)
+        Me.cbx_My_LKW.Location = New System.Drawing.Point(-82, 3)
        Me.cbx_My_LKW.Name = "cbx_My_LKW"
        Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17)
        Me.cbx_My_LKW.TabIndex = 24
@@ -2667,7 +2715,7 @@ Partial Class frmHauptfenster
        Me.cboMy_QS.Checked = True
        Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate
        Me.cboMy_QS.ForeColor = System.Drawing.Color.White
-        Me.cboMy_QS.Location = New System.Drawing.Point(445, 3)
+        Me.cboMy_QS.Location = New System.Drawing.Point(374, 3)
        Me.cboMy_QS.Name = "cboMy_QS"
        Me.cboMy_QS.Size = New System.Drawing.Size(15, 14)
        Me.cboMy_QS.TabIndex = 23
@@ -2681,7 +2729,7 @@ Partial Class frmHauptfenster
        Me.cboMy_VB.Checked = True
        Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate
        Me.cboMy_VB.ForeColor = System.Drawing.Color.White
-        Me.cboMy_VB.Location = New System.Drawing.Point(464, 3)
+        Me.cboMy_VB.Location = New System.Drawing.Point(393, 3)
        Me.cboMy_VB.Name = "cboMy_VB"
        Me.cboMy_VB.Size = New System.Drawing.Size(15, 14)
        Me.cboMy_VB.TabIndex = 22
@@ -2699,7 +2747,7 @@ Partial Class frmHauptfenster
        Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.cboMyAvisoAnzeige.FormattingEnabled = True
-        Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1)
+        Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(161, 1)
        Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige"
        Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21)
        Me.cboMyAvisoAnzeige.TabIndex = 21
@@ -2709,7 +2757,7 @@ Partial Class frmHauptfenster
        Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblMySND_Anzeige.AutoSize = True
        Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White
-        Me.lblMySND_Anzeige.Location = New System.Drawing.Point(183, 3)
+        Me.lblMySND_Anzeige.Location = New System.Drawing.Point(112, 3)
        Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige"
        Me.lblMySND_Anzeige.Size = New System.Drawing.Size(48, 13)
        Me.lblMySND_Anzeige.TabIndex = 20
@@ -2719,7 +2767,7 @@ Partial Class frmHauptfenster
        '
        Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblAkte.ForeColor = System.Drawing.Color.White
-        Me.lblAkte.Location = New System.Drawing.Point(761, 6)
+        Me.lblAkte.Location = New System.Drawing.Point(690, 6)
        Me.lblAkte.Name = "lblAkte"
        Me.lblAkte.Size = New System.Drawing.Size(207, 19)
        Me.lblAkte.TabIndex = 1
@@ -2807,7 +2855,7 @@ Partial Class frmHauptfenster
        Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlAktOption.Location = New System.Drawing.Point(0, 0)
        Me.pnlAktOption.Name = "pnlAktOption"
-        Me.pnlAktOption.Size = New System.Drawing.Size(815, 5)
+        Me.pnlAktOption.Size = New System.Drawing.Size(720, 5)
        Me.pnlAktOption.TabIndex = 1
        '
        'Button8
@@ -2817,7 +2865,7 @@ Partial Class frmHauptfenster
        Me.Button8.ForeColor = System.Drawing.Color.Black
        Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image)
        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button8.Location = New System.Drawing.Point(381, 214)
+        Me.Button8.Location = New System.Drawing.Point(286, 214)
        Me.Button8.Name = "Button8"
        Me.Button8.Size = New System.Drawing.Size(89, 34)
        Me.Button8.TabIndex = 3
@@ -2834,7 +2882,7 @@ Partial Class frmHauptfenster
        Me.btnFertig.ForeColor = System.Drawing.Color.Black
        Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image)
        Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFertig.Location = New System.Drawing.Point(485, 214)
+        Me.btnFertig.Location = New System.Drawing.Point(390, 214)
        Me.btnFertig.Name = "btnFertig"
        Me.btnFertig.Size = New System.Drawing.Size(102, 34)
        Me.btnFertig.TabIndex = 0
@@ -2853,7 +2901,7 @@ Partial Class frmHauptfenster
        Me.tabAlle.Padding = New System.Windows.Forms.Padding(3)
        Me.tabAlle.Size = New System.Drawing.Size(385, 0)
        Me.tabAlle.TabIndex = 0
-        Me.tabAlle.Text = "Alle"
+        Me.tabAlle.Text = "Alle LKW"
        '
        'tabErfasst
        '
@@ -2911,7 +2959,7 @@ Partial Class frmHauptfenster
        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(0, 77)
+        Me.SplitContainer1.Location = New System.Drawing.Point(379, 77)
        Me.SplitContainer1.Name = "SplitContainer1"
        '
        'SplitContainer1.Panel1
@@ -2923,9 +2971,8 @@ Partial Class frmHauptfenster
        '
        Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall)
        Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts)
-        Me.SplitContainer1.Panel2MinSize = 300
-        Me.SplitContainer1.Size = New System.Drawing.Size(1372, 600)
-        Me.SplitContainer1.SplitterDistance = 819
+        Me.SplitContainer1.Size = New System.Drawing.Size(993, 600)
+        Me.SplitContainer1.SplitterDistance = 724
        Me.SplitContainer1.SplitterWidth = 1
        Me.SplitContainer1.TabIndex = 7
        '
@@ -2938,7 +2985,7 @@ Partial Class frmHauptfenster
        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(817, 598)
+        Me.pnlDetailsLinks.Size = New System.Drawing.Size(722, 598)
        Me.pnlDetailsLinks.TabIndex = 0
        '
        'splitMain
@@ -2962,7 +3009,7 @@ Partial Class frmHauptfenster
        '
        Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2)
        Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption)
-        Me.splitMain.Size = New System.Drawing.Size(815, 596)
+        Me.splitMain.Size = New System.Drawing.Size(720, 596)
        Me.splitMain.SplitterDistance = 287
        Me.splitMain.TabIndex = 0
        '
@@ -3016,13 +3063,14 @@ Partial Class frmHauptfenster
        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(815, 39)
+        Me.gridAviso.Size = New System.Drawing.Size(720, 39)
        Me.gridAviso.TabIndex = 1
        Me.gridAviso.TabStop = False
        '
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.TabControl1)
        Me.Panel1.Controls.Add(Me.txtBestimmungszollstelle)
        Me.Panel1.Controls.Add(Me.Label10)
        Me.Panel1.Controls.Add(Me.cboImEx)
@@ -3050,9 +3098,58 @@ Partial Class frmHauptfenster
        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(815, 248)
+        Me.Panel1.Size = New System.Drawing.Size(720, 248)
        Me.Panel1.TabIndex = 2
        '
+        'TabControl1
+        '
+        Me.TabControl1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.TabControl1.Controls.Add(Me.tbSndAlle)
+        Me.TabControl1.Controls.Add(Me.tbSndOffen)
+        Me.TabControl1.Controls.Add(Me.tbSndFreigegeben)
+        Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.TabControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.TabControl1.ItemSize = New System.Drawing.Size(60, 30)
+        Me.TabControl1.Location = New System.Drawing.Point(492, 217)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.Padding = New System.Drawing.Point(12, 3)
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(393, 32)
+        Me.TabControl1.TabIndex = 27
+        Me.TabControl1.Visible = False
+        '
+        'tbSndAlle
+        '
+        Me.tbSndAlle.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.tbSndAlle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tbSndAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tbSndAlle.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndAlle.Name = "tbSndAlle"
+        Me.tbSndAlle.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbSndAlle.Size = New System.Drawing.Size(385, 0)
+        Me.tbSndAlle.TabIndex = 0
+        Me.tbSndAlle.Text = "Alle Sendungen"
+        '
+        'tbSndOffen
+        '
+        Me.tbSndOffen.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.tbSndOffen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tbSndOffen.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndOffen.Name = "tbSndOffen"
+        Me.tbSndOffen.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbSndOffen.Size = New System.Drawing.Size(385, 0)
+        Me.tbSndOffen.TabIndex = 1
+        Me.tbSndOffen.Text = "Offen"
+        '
+        'tbSndFreigegeben
+        '
+        Me.tbSndFreigegeben.Location = New System.Drawing.Point(4, 34)
+        Me.tbSndFreigegeben.Name = "tbSndFreigegeben"
+        Me.tbSndFreigegeben.Size = New System.Drawing.Size(385, 0)
+        Me.tbSndFreigegeben.TabIndex = 2
+        Me.tbSndFreigegeben.Text = "Freigegeben"
+        Me.tbSndFreigegeben.UseVisualStyleBackColor = True
+        '
        'txtBestimmungszollstelle
        '
        Me.txtBestimmungszollstelle._allowFreitext = False
@@ -3182,7 +3279,7 @@ Partial Class frmHauptfenster
        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(585, 56)
+        Me.lblEintraege.Location = New System.Drawing.Point(490, 56)
        Me.lblEintraege.Name = "lblEintraege"
        Me.lblEintraege.Size = New System.Drawing.Size(169, 15)
        Me.lblEintraege.TabIndex = 14
@@ -3230,7 +3327,7 @@ Partial Class frmHauptfenster
        Me.pnlTime.Controls.Add(Me.Label5)
        Me.pnlTime.Location = New System.Drawing.Point(446, 0)
        Me.pnlTime.Name = "pnlTime"
-        Me.pnlTime.Size = New System.Drawing.Size(437, 57)
+        Me.pnlTime.Size = New System.Drawing.Size(342, 57)
        Me.pnlTime.TabIndex = 12
        '
        'MyComboBox1
@@ -3738,8 +3835,8 @@ Partial Class frmHauptfenster
        '
        'Panel3
        '
-        Me.Panel3.Controls.Add(Me.Panel4)
        Me.Panel3.Controls.Add(Me.MenuStrip1)
+        Me.Panel3.Controls.Add(Me.Panel4)
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel3.Location = New System.Drawing.Point(0, 0)
        Me.Panel3.Name = "Panel3"
@@ -3786,24 +3883,43 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'Button1
+        'pnlLeft
        '
-        Me.Button1.Location = New System.Drawing.Point(1028, 7)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 87
-        Me.Button1.Text = "Button1"
-        Me.Button1.UseVisualStyleBackColor = True
-        Me.Button1.Visible = False
+        Me.pnlLeft.Controls.Add(Me.UsrCntlBenachrichtigungen2)
+        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, 77)
+        Me.pnlLeft.Name = "pnlLeft"
+        Me.pnlLeft.Size = New System.Drawing.Size(379, 600)
+        Me.pnlLeft.TabIndex = 88
+        Me.pnlLeft.Visible = False
        '
-        'UsrCntlBenachrichtigungen1
+        'UsrCntlBenachrichtigungen2
        '
-        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(158, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        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(379, 232)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
+        'Panel5
+        '
+        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.Panel5.Location = New System.Drawing.Point(0, 283)
+        Me.Panel5.Name = "Panel5"
+        Me.Panel5.Size = New System.Drawing.Size(379, 317)
+        Me.Panel5.TabIndex = 3
+        '
+        '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(379, 51)
+        Me.Panel7.TabIndex = 4
        '
        'frmHauptfenster
        '
@@ -3814,6 +3930,7 @@ Partial Class frmHauptfenster
        Me.Controls.Add(Me.Label9)
        Me.Controls.Add(Me.UsrCntlTestsystem1)
        Me.Controls.Add(Me.SplitContainer1)
+        Me.Controls.Add(Me.pnlLeft)
        Me.Controls.Add(Me.Top)
        Me.Controls.Add(Me.Panel3)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
@@ -3834,12 +3951,12 @@ Partial Class frmHauptfenster
        CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer2.ResumeLayout(False)
        Me.pnlLinks.ResumeLayout(False)
-        CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        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()
        Me.SplitContainer3.Panel1.ResumeLayout(False)
        Me.SplitContainer3.Panel2.ResumeLayout(False)
        CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -3863,6 +3980,7 @@ Partial Class frmHauptfenster
        CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
+        Me.TabControl1.ResumeLayout(False)
        Me.pnlTime.ResumeLayout(False)
        Me.pnlTime.PerformLayout()
        Me.pnlSearch.ResumeLayout(False)
@@ -3874,6 +3992,7 @@ Partial Class frmHauptfenster
        Me.Panel3.PerformLayout()
        Me.Panel4.ResumeLayout(False)
        Me.cntVerag.ResumeLayout(False)
+        Me.pnlLeft.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -4245,4 +4364,13 @@ Partial Class frmHauptfenster
    Friend WithEvents SpireLizenzPrüfenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents DEAmbarToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents Button1 As Button
+    Friend WithEvents pnlLeft As Panel
+    Friend WithEvents UsrCntlBenachrichtigungen2 As usrCntlBenachrichtigungen
+    Friend WithEvents Panel5 As Panel
+    Friend WithEvents Panel7 As Panel
+    Friend WithEvents Button7 As Button
+    Friend WithEvents TabControl1 As TabControl
+    Friend WithEvents tbSndAlle As TabPage
+    Friend WithEvents tbSndOffen As TabPage
+    Friend WithEvents tbSndFreigegeben As TabPage
 End Class
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -184,6 +184,14 @@
        3puAtTwzrR0dXuW8gXnGLeaSa2rIfBHWsJY1Kw5/z224h+LDxOuRG/Lqw+FV0xrZ36za8GJ7Dn3winGk
        hlhFP8ytdHEuO7yRe93zq1OtoTFeL82pa3iF96vjKNfQYYyxFUaS7APsTyl69HfqsQAAAABJRU5ErkJg
        gg==
+</value>
+  </data>
+  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABdSURBVEhL7c0xDsAgEANB/v+AfNcUyRWWVhEF0JyL
+        oUDW7ZB0FX6e9D7PMv2gvUmQUKjQ3iRIKFRob3oF6cB2CW7XK7gKD31obxIkFCq0NwkSChXam0bBm/Dz
+        HI0JXRTSkcElwuUAAAAASUVORK5CYII=
 </value>
  </data>
  <metadata name="cntxtAtilla.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -10,6 +10,8 @@ Imports System.Drawing.Drawing2D
 Imports SDL
 Imports Microsoft.Office.Interop
 Imports Spire.Pdf.Texts
+Imports System.Net
+Imports System.Text


 'Imports UID
@@ -164,6 +166,7 @@ Public Class frmHauptfenster

        VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL

+
        EnableDoubleBuffered(gridAviso)
        EnableDoubleBuffered(gridMyAviso)
        'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -2840,6 +2843,9 @@ Public Class frmHauptfenster


        tbcntrAviso.Width = Panel1.Width
+
+        TabControl1.Location = New Point(tbcntrAviso.Location.X + getTbControlWidth(tbcntrAviso) + 80, TabControl1.Location.Y)
+        TabControl1.SelectedIndex = -1
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)

        BürgschaftenExcelToolStripMenuItem.Visible = False
@@ -2857,8 +2863,20 @@ Public Class frmHauptfenster
            End If
        End If

+
    End Sub

+    Private Function getTbControlWidth(tbcntr) As Integer
+        Dim totalWidth As Integer = 0
+
+        ' Durchlaufe alle TabPages und summiere die Breite der Tabs
+        For i As Integer = 0 To tbcntr.TabCount - 1
+            totalWidth += tbcntr.GetTabRect(i).Width
+        Next
+
+        Return totalWidth
+    End Function
+
    WithEvents timerStart As New Timer

    Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
@@ -4803,9 +4821,40 @@ Public Class frmHauptfenster
    End Sub

    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
-
-        saveLukowaPDFsFromTherefore()
+        Dim resp = GetDataFromSharePoint("https://dpdhl.sharepoint.com/sites/FRTTR-Verag", "TruckList", "al@verag.ag", "Muellerskuh1!")
+        MsgBox(resp)
+        'saveLukowaPDFsFromTherefore()
    End Sub
+
+
+
+    Public Function GetDataFromSharePoint(siteUrl As String, listName As String, username As String, password As String) As String
+        ' SharePoint-URL und Liste konfigurieren
+        Dim requestUrl As String = siteUrl & "/_api/web/lists/getbytitle('" & listName & "')/items"
+
+        ' Authentifizierung: Benutzername und Passwort als Basis64
+        Dim credentials As String = Convert.ToBase64String(Encoding.ASCII.GetBytes(username & ":" & password))
+
+        ' HTTP-Anfrage vorbereiten
+        Dim request As HttpWebRequest = CType(WebRequest.Create(requestUrl), HttpWebRequest)
+        request.Method = "GET"
+        request.Accept = "application/json;odata=verbose"
+        request.Headers("Authorization") = "Basic " & credentials
+
+        Try
+            ' Antwort von SharePoint erhalten
+            Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse)
+                Using reader As New StreamReader(response.GetResponseStream())
+                    Dim jsonResponse As String = reader.ReadToEnd()
+                    Return jsonResponse
+                End Using
+            End Using
+        Catch ex As WebException
+            ' Fehlerbehandlung
+            Return "Fehler: " & ex.Message
+        End Try
+    End Function
+
 End Class

 Public Class AvisoStatusFunctions
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -22,9 +22,9 @@ Public Class frmSendungsdetailsNEU
    Dim PROG As New cProgramFunctions
    Dim AVISO As New cAviso
    ' Dim GEAENDERT As Boolean = False
-    Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
+    Public SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)

-    Dim CURRENT_INDEX As Integer = -1
+    Public CURRENT_INDEX As Integer = -1
    Dim closeWithoutSave = False
    '  Public WithEvents bsSendungen As New cEasyBinding("AVISO") 'fürs Binding
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -1457,7 +1457,8 @@ Public Class frmSendungsdetailsNEU
            usrcntl_AUSFUHR.reset()
            usrcntl_FISKAL.reset()
            usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
-            usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+            'usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+            usrcntl_ATB = New usrCntlSND_ATBGestellung(AVISO, SENDUNG_LIST(CURRENT_INDEX))

            AddHandler usrcntl_ATA.HandlingWerte, Sub(colli, gewicht, anzahlSendungen)
                                                      txtColli.Text = colli
@@ -2351,23 +2352,33 @@ Public Class frmSendungsdetailsNEU

    Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsart.SelectedIndexChanged
        btnLeihgeld.Enabled = False
-        lblAnzahl.Visible = (cboAbfertigungsart._value = "23")
-        txtAnzahl.Visible = (cboAbfertigungsart._value = "23")
+        lblAnzahl.Visible = False
+        txtAnzahl.Visible = False
+
+        btnAufschub_Atr.Visible = True
+        btnAufschub_Empf.Visible = True
+        btnAufschub_VERAG.Visible = True
+
+        Select Case cboAbfertigungsart._value
+            Case "23", "67", "68"
+                lblAnzahl.Visible = True
+                txtAnzahl.Visible = True
+
+                btnAufschub_Atr.Visible = False
+                btnAufschub_Empf.Visible = False
+                btnAufschub_VERAG.Visible = False
+                SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = ""
+                txtDyRef.Visible = False
+                picDy.Visible = False
+                txtDyRef.Text = ""
+        End Select
        'grpAufschub.Visible = (cboAbfertigungsart._value <> "23")

-        btnAufschub_Atr.Visible = (cboAbfertigungsart._value <> "23")
-        btnAufschub_Empf.Visible = (cboAbfertigungsart._value <> "23")
-        btnAufschub_VERAG.Visible = (cboAbfertigungsart._value <> "23")
+

        setContextMenuGVMSControl()

-        If cboAbfertigungsart._value = "23" Then
-            SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = ""
-
-            txtDyRef.Visible = False
-            picDy.Visible = False
-            txtDyRef.Text = ""
-        ElseIf cboAbfertigungsart._value = "9" Then
+        If cboAbfertigungsart._value = "9" Then
            btnLeihgeld.Enabled = True
        Else
            txtDyRef.Visible = (SENDUNG_LIST(CURRENT_INDEX).FilialenNr = "5601") 'UNISPED
--- a/Aviso/usrCntlSND_ATBGestellung.Designer.vb
+++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb
@@ -23,6 +23,8 @@ Partial Class usrCntlSND_ATBGestellung
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.pnlT1 = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox()
        Me.btnGesSicherheit = New System.Windows.Forms.Button()
        Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox()
        Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -37,6 +39,7 @@ Partial Class usrCntlSND_ATBGestellung
        'pnlT1
        '
        Me.pnlT1.Controls.Add(Me.btnGesSicherheit)
+        Me.pnlT1.Controls.Add(Me.Button1)
        Me.pnlT1.Controls.Add(Me.cbxATBFakturieren)
        Me.pnlT1.Controls.Add(Me.txtATBNr)
        Me.pnlT1.Controls.Add(Me.txtATBT1)
@@ -49,6 +52,30 @@ Partial Class usrCntlSND_ATBGestellung
        Me.pnlT1.Size = New System.Drawing.Size(549, 101)
        Me.pnlT1.TabIndex = 0
        '
+        'Button1
+        '
+        Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Location = New System.Drawing.Point(397, 56)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(149, 35)
+        Me.Button1.TabIndex = 25
+        Me.Button1.Text = "Ankunftsanzeige senden >>"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'cbxATBFakturieren
+        '
+        Me.cbxATBFakturieren.AutoSize = True
+        Me.cbxATBFakturieren.Checked = True
+        Me.cbxATBFakturieren.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxATBFakturieren.Location = New System.Drawing.Point(121, 80)
+        Me.cbxATBFakturieren.Name = "cbxATBFakturieren"
+        Me.cbxATBFakturieren.Size = New System.Drawing.Size(153, 17)
+        Me.cbxATBFakturieren.TabIndex = 24
+        Me.cbxATBFakturieren.Text = "ATB-Gestellung fakturieren"
+        Me.cbxATBFakturieren.ThreeState = True
+        Me.cbxATBFakturieren.UseVisualStyleBackColor = True
+        '
        'btnGesSicherheit
        '
        Me.btnGesSicherheit.Location = New System.Drawing.Point(417, 14)
@@ -174,11 +201,9 @@ Partial Class usrCntlSND_ATBGestellung
        '
        'usrCntlSND_ATBGestellung
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.pnlT1)
        Me.Name = "usrCntlSND_ATBGestellung"
-        Me.Size = New System.Drawing.Size(549, 94)
+        Me.Size = New System.Drawing.Size(553, 106)
        Me.pnlT1.ResumeLayout(False)
        Me.pnlT1.PerformLayout()
        Me.ResumeLayout(False)
@@ -193,4 +218,5 @@ Partial Class usrCntlSND_ATBGestellung
    Friend WithEvents txtATBNr As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents cbxATBFakturieren As CheckBox
    Friend WithEvents btnGesSicherheit As Button
+    Friend WithEvents Button1 As Button
 End Class
--- a/Aviso/usrCntlSND_ATBGestellung.vb
+++ b/Aviso/usrCntlSND_ATBGestellung.vb
@@ -1,4 +1,7 @@
-Imports VERAG_PROG_ALLGEMEIN
+Imports DAKOSY_Worker
+Imports SDL
+
+Imports VERAG_PROG_ALLGEMEIN


 Public Class usrCntlSND_ATBGestellung
@@ -8,17 +11,43 @@ Public Class usrCntlSND_ATBGestellung

    'Public NCTS_GA As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen

-    Sub New(SendungsId)
-        _SendungsId = SendungsId
+    Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing
+    Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
+
+    Sub New(AVISO, SND)


        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()

+        Me.AVISO = AVISO
+        Me.SND = SND
+
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.

    End Sub

+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        Me.Refresh()
+        Me.Cursor = Cursors.WaitCursor
+
+        Dim f As frmSendungsdetailsNEU = Me.FindForm
+        If f.SAVE_ME() Then
+            SND = f.SENDUNG_LIST(f.CURRENT_INDEX)
+
+            If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
+            If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub
+            Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"))
+            frMZA.Show()
+            AddHandler frMZA.FormClosed, Sub()
+                                             '     initdgvZollAnmeldungen()
+                                         End Sub
+        Else
+            MsgBox("Fehler beim Speichern. Ankunftsanzeige abgebrochen.")
+        End If
+        Me.Cursor = Cursors.Default
+
    Private Sub btnGesSicherheit_Click(sender As Object, e As EventArgs) Handles btnGesSicherheit.Click

        If txtATBT1.Text <> "" Then