neu

2020-12-13 21:30:05 +01:00
parent 65ee38135e
commit 56fe11bc97
26 changed files with 3960 additions and 248 deletions
--- a/AVISO_CHECKIN/usrCntlSearch.vb
+++ b/AVISO_CHECKIN/usrCntlSearch.vb
@@ -61,4 +61,6 @@
        txt.Focus()
        MAIN.TRANSLATE(Me)
    End Sub
+
+
 End Class
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -441,6 +441,12 @@
    <Compile Include="frmAnkunftAendern.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmAnkunftSetzen.Designer.vb">
+      <DependentUpon>frmAnkunftSetzen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAnkunftSetzen.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmAvisoSettings.Designer.vb">
      <DependentUpon>frmAvisoSettings.vb</DependentUpon>
    </Compile>
@@ -633,6 +639,12 @@
    <Compile Include="frmNotify.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmSecretAviso.Designer.vb">
+      <DependentUpon>frmSecretAviso.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSecretAviso.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmSendungsdetailsAbrechnung.Designer.vb">
      <DependentUpon>frmSendungsdetailsAbrechnung.vb</DependentUpon>
    </Compile>
@@ -874,6 +886,9 @@
    <EmbeddedResource Include="frmAnkunftAendern.resx">
      <DependentUpon>frmAnkunftAendern.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmAnkunftSetzen.resx">
+      <DependentUpon>frmAnkunftSetzen.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmAvisoSettings.resx">
      <DependentUpon>frmAvisoSettings.vb</DependentUpon>
    </EmbeddedResource>
@@ -970,6 +985,9 @@
    <EmbeddedResource Include="frmNotify.resx">
      <DependentUpon>frmNotify.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmSecretAviso.resx">
+      <DependentUpon>frmSecretAviso.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmSendungsdetailsAbrechnung.resx">
      <DependentUpon>frmSendungsdetailsAbrechnung.vb</DependentUpon>
    </EmbeddedResource>
@@ -1147,6 +1165,8 @@
  <ItemGroup>
    <Content Include="aviso.ico" />
    <Content Include="My Project\aktAlt.jpg" />
+    <None Include="Resources\unisped_aeo_DE.jpg" />
+    <None Include="Resources\Unisped_DE_logo.jpg" />
    <None Include="Resources\weiterleiten_small.png" />
    <None Include="Resources\weiterleiten1.png" />
    <None Include="Resources\weiterleiten.png" />
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.5.7.8")>
-<Assembly: AssemblyFileVersion("3.5.7.8")>
+<Assembly: AssemblyVersion("3.5.8.7")>
+<Assembly: AssemblyFileVersion("3.5.8.7")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -599,6 +599,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property gghtf5fgh5454fghhgf() As String
+            Get
+                Return ResourceManager.GetString("gghtf5fgh5454fghhgf", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1359,6 +1368,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property unisped_aeo_DE() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("unisped_aeo_DE", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Unisped_DE_logo() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Unisped_DE_logo", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1429,7 +1458,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 3.5.7.8 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.5.8.7 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -536,7 +536,7 @@
    <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>3.5.7.8</value>
+    <value>3.5.8.7</value>
  </data>
  <data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -586,4 +586,13 @@
  <data name="fragezeichen1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fragezeichen1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="unisped_aeo_DE" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\unisped_aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Unisped_DE_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Unisped_DE_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="gghtf5fgh5454fghhgf" xml:space="preserve">
+    <value />
+  </data>
 </root>
--- a/Aviso/Resources/Unisped_DE_logo.jpg
+++ b/Aviso/Resources/Unisped_DE_logo.jpg
--- a/Aviso/Resources/unisped_aeo_DE.jpg
+++ b/Aviso/Resources/unisped_aeo_DE.jpg
--- a/Aviso/eAviso/frm_eAVISO.vb
+++ b/Aviso/eAviso/frm_eAVISO.vb
@@ -93,7 +93,7 @@
            Dim AvisoDAL = New VERAG_PROG_ALLGEMEIN.cAvisoDAL

            Dim AVISO As New VERAG_PROG_ALLGEMEIN.cAviso
-            Dim PREPAPER As New cNCTSPartnerWorker.cNCTS_TR(r.Cells("ncts_Id").Value)
+            Dim PREPAPER As New VERAG_PROG_ALLGEMEIN.cNCTS_TR(r.Cells("ncts_Id").Value)

            AVISO.LKW_Nr = PREPAPER.ncts_Befoerderungsmittel_KennzeichenAbgang
            AVISO.LKW_Nationalitaet = PREPAPER.ncts_Befoerderungsmittel_StaatszugehoerigkeitGrenzueberschreitendCode 'TransportArrivalCountryCode
--- a/Aviso/frmAnkunftSetzen.Designer.vb
+++ b/Aviso/frmAnkunftSetzen.Designer.vb
@@ -0,0 +1,218 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmAnkunftSetzen
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAnkunftSetzen))
+        Me.pnl = New System.Windows.Forms.Panel()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.lblAvisierer = New System.Windows.Forms.Label()
+        Me.lblFraechter = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.txtFahrerHandy = New System.Windows.Forms.TextBox()
+        Me.pic = New System.Windows.Forms.PictureBox()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.pnl.SuspendLayout()
+        Me.Panel1.SuspendLayout()
+        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'pnl
+        '
+        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.Panel1)
+        Me.pnl.Controls.Add(Me.lblAvisierer)
+        Me.pnl.Controls.Add(Me.lblFraechter)
+        Me.pnl.Controls.Add(Me.Label4)
+        Me.pnl.Controls.Add(Me.Label5)
+        Me.pnl.Controls.Add(Me.txtFahrerHandy)
+        Me.pnl.Controls.Add(Me.pic)
+        Me.pnl.Controls.Add(Me.Label16)
+        Me.pnl.Controls.Add(Me.btn)
+        Me.pnl.Controls.Add(Me.Label3)
+        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(494, 353)
+        Me.pnl.TabIndex = 0
+        '
+        '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.Button1)
+        Me.Panel1.Controls.Add(Me.Label6)
+        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(492, 41)
+        Me.Panel1.TabIndex = 53
+        '
+        'Button1
+        '
+        Me.Button1.BackColor = System.Drawing.Color.Red
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.Button1.ForeColor = System.Drawing.Color.White
+        Me.Button1.Location = New System.Drawing.Point(408, -1)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(85, 33)
+        Me.Button1.TabIndex = 1
+        Me.Button1.Text = "x"
+        Me.Button1.UseVisualStyleBackColor = False
+        '
+        'Label6
+        '
+        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.Label6.ForeColor = System.Drawing.Color.White
+        Me.Label6.Location = New System.Drawing.Point(13, 6)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(467, 26)
+        Me.Label6.TabIndex = 51
+        Me.Label6.Text = "Ankunft setzen"
+        Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lblAvisierer
+        '
+        Me.lblAvisierer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.lblAvisierer.Location = New System.Drawing.Point(12, 177)
+        Me.lblAvisierer.Name = "lblAvisierer"
+        Me.lblAvisierer.Size = New System.Drawing.Size(469, 26)
+        Me.lblAvisierer.TabIndex = 51
+        Me.lblAvisierer.Text = "Frächter"
+        '
+        'lblFraechter
+        '
+        Me.lblFraechter.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.lblFraechter.Location = New System.Drawing.Point(14, 138)
+        Me.lblFraechter.Name = "lblFraechter"
+        Me.lblFraechter.Size = New System.Drawing.Size(467, 26)
+        Me.lblFraechter.TabIndex = 50
+        Me.lblFraechter.Text = "Frächter"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(11, 125)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(46, 13)
+        Me.Label4.TabIndex = 48
+        Me.Label4.Text = "Frächter"
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(11, 164)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(47, 13)
+        Me.Label5.TabIndex = 49
+        Me.Label5.Text = "Avisierer"
+        '
+        'txtFahrerHandy
+        '
+        Me.txtFahrerHandy.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.txtFahrerHandy.Location = New System.Drawing.Point(29, 222)
+        Me.txtFahrerHandy.MaxLength = 30
+        Me.txtFahrerHandy.Name = "txtFahrerHandy"
+        Me.txtFahrerHandy.Size = New System.Drawing.Size(452, 26)
+        Me.txtFahrerHandy.TabIndex = 47
+        '
+        'pic
+        '
+        Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.handy
+        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.pic.Location = New System.Drawing.Point(10, 222)
+        Me.pic.Name = "pic"
+        Me.pic.Size = New System.Drawing.Size(20, 20)
+        Me.pic.TabIndex = 45
+        Me.pic.TabStop = False
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = True
+        Me.Label16.Location = New System.Drawing.Point(11, 208)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(116, 13)
+        Me.Label16.TabIndex = 46
+        Me.Label16.Text = "Fahrer Handy-Nummer:"
+        '
+        'btn
+        '
+        Me.btn.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.btn.ForeColor = System.Drawing.Color.White
+        Me.btn.Location = New System.Drawing.Point(275, 276)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(206, 62)
+        Me.btn.TabIndex = 0
+        Me.btn.Text = "OK"
+        Me.btn.UseVisualStyleBackColor = False
+        '
+        'Label3
+        '
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Bold)
+        Me.Label3.Location = New System.Drawing.Point(6, 54)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(469, 57)
+        Me.Label3.TabIndex = 52
+        Me.Label3.Text = "LKW"
+        '
+        'frmAnkunftSetzen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(494, 353)
+        Me.Controls.Add(Me.pnl)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmAnkunftSetzen"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Ankunft setzen"
+        Me.pnl.ResumeLayout(False)
+        Me.pnl.PerformLayout()
+        Me.Panel1.ResumeLayout(False)
+        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents pnl As Panel
+    Friend WithEvents Button1 As Button
+    Friend WithEvents btn As Button
+    Friend WithEvents txtFahrerHandy As TextBox
+    Friend WithEvents pic As PictureBox
+    Friend WithEvents Label16 As Label
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Label6 As Label
+    Friend WithEvents lblAvisierer As Label
+    Friend WithEvents lblFraechter As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Label3 As Label
+End Class
--- a/Aviso/frmAnkunftSetzen.resx
+++ b/Aviso/frmAnkunftSetzen.resx
--- a/Aviso/frmAnkunftSetzen.vb
+++ b/Aviso/frmAnkunftSetzen.vb
@@ -0,0 +1,64 @@
+Public Class frmAnkunftSetzen
+
+    Public AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing
+    Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
+
+    Sub New(AvisoId As Integer)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        AVISO = AvisoDAL.LesenAviso(AvisoId, "")
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+    Sub New(ByRef Aviso As VERAG_PROG_ALLGEMEIN.cAviso)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        Me.AVISO = Aviso
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
+    Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint
+
+    End Sub
+
+    Private Sub frmAnkunftSetzen_Load(sender As Object, e As EventArgs) Handles Me.Load
+
+        btn.Focus()
+
+        If AVISO IsNot Nothing Then
+            lblFraechter.Text = AVISO.Frächter
+            lblAvisierer.Text = AVISO.Auftraggeber
+            txtFahrerHandy.Text = AVISO.FahrerHandy
+            If txtFahrerHandy.Text = "" Then txtFahrerHandy.Focus()
+        Else
+            Me.Close()
+        End If
+    End Sub
+
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+        AVISO.FahrerHandy = txtFahrerHandy.Text
+        'If AvisoDAL.SpeichernAviso(AVISO) Then
+        '    Me.DialogResult = DialogResult.OK
+        'Else
+        '    Me.DialogResult = DialogResult.None
+        'End If
+        Me.DialogResult = DialogResult.OK
+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Me.DialogResult = DialogResult.Cancel
+    End Sub
+
+    Private Sub frmAnkunftSetzen_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
+        If e.KeyCode = Keys.Return Then
+            btn.PerformClick()
+        End If
+    End Sub
+
+End Class
--- a/Aviso/frmAvisoWeiterleiten.vb
+++ b/Aviso/frmAvisoWeiterleiten.vb
@@ -232,6 +232,12 @@ Public Class frmAvisoWeiterleiten
        ElseIf sender Is btnUNIPED Then
            addBtn(flpFirma, "F", "UNISPED", "UNISPED", True)

+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='UNISPED' order by team_id", "ADMIN")
+            If dt IsNot Nothing Then
+                For Each t In dt.Rows
+                    addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "IMEX")
+                Next
+            End If
        ElseIf sender Is btnFrontoffice Then
            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True)
        ElseIf sender Is btnVERIMEX Then
--- a/Aviso/frmEintragAviso.vb
+++ b/Aviso/frmEintragAviso.vb
@@ -621,7 +621,7 @@ Public Class frmEintragAviso

            If Neuanlage Then
                'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
-                Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", ""))
+                Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
                If hLKWCheck2 <> "" Then
                    Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
                                           "Aviso-Eintrag")
@@ -632,7 +632,7 @@ Public Class frmEintragAviso

                If hLKWCheck2 = "" Then
                    'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
-                    Dim hLKWCheck As String = AvisoDAL.Suche_LKW(txtLKW_Nr.Text.Trim.Replace(" ", ""))
+                    Dim hLKWCheck As String = AvisoDAL.Suche_LKW(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
                    If hLKWCheck <> "" Then
                        Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
                                               "Aviso-Eintrag")
@@ -720,7 +720,7 @@ Public Class frmEintragAviso

            'Werte zuweisen
            myAviso.Datum = dtpDatum.Value
-            myAviso.LKW_Nr = txtLKW_Nr.Text.Trim.Replace(" ", "")
+            myAviso.LKW_Nr = txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", "")
            myAviso.LKW_Nationalitaet = sbLkwNationalitaet._value
            myAviso.DakosyRef = SQL.isNullNothing(txtDyRef.Text.Trim)
            If datVoraussichtlichesEintreffen.Visible Then
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -51,6 +51,7 @@ Partial Class frmHauptfenster
        Me.ZeilenInFarbeEinausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.BerechtigungenNeuLadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.StandorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SecretAvisoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.KdNrZuordnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.OptionenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -93,6 +94,7 @@ Partial Class frmHauptfenster
        Me.NeueSMSSendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GesendeteSMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MRNBarcodedruckToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
@@ -289,7 +291,6 @@ Partial Class frmHauptfenster
        Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.MRNBarcodedruckToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.Top.SuspendLayout()
@@ -418,7 +419,7 @@ Partial Class frmHauptfenster
        'mnuProgramm
        '
        Me.mnuProgramm.BackColor = System.Drawing.Color.Transparent
-        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
+        Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem})
        Me.mnuProgramm.ForeColor = System.Drawing.Color.Black
        Me.mnuProgramm.Name = "mnuProgramm"
        Me.mnuProgramm.Size = New System.Drawing.Size(78, 20)
@@ -463,6 +464,12 @@ Partial Class frmHauptfenster
        Me.StandorteToolStripMenuItem.Text = "Standorte"
        Me.StandorteToolStripMenuItem.Visible = False
        '
+        'SecretAvisoToolStripMenuItem
+        '
+        Me.SecretAvisoToolStripMenuItem.Name = "SecretAvisoToolStripMenuItem"
+        Me.SecretAvisoToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
+        Me.SecretAvisoToolStripMenuItem.Text = "SecretAviso"
+        '
        '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})
@@ -725,6 +732,12 @@ Partial Class frmHauptfenster
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
+        'MRNBarcodedruckToolStripMenuItem
+        '
+        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
+        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
@@ -2353,10 +2366,10 @@ Partial Class frmHauptfenster
        Me.lklErweitereSuche.LinkColor = System.Drawing.Color.White
        Me.lklErweitereSuche.Location = New System.Drawing.Point(6, 54)
        Me.lklErweitereSuche.Name = "lklErweitereSuche"
-        Me.lklErweitereSuche.Size = New System.Drawing.Size(84, 13)
+        Me.lklErweitereSuche.Size = New System.Drawing.Size(87, 13)
        Me.lklErweitereSuche.TabIndex = 17
        Me.lklErweitereSuche.TabStop = True
-        Me.lklErweitereSuche.Text = "erweitere Suche"
+        Me.lklErweitereSuche.Text = "erweiterte Suche"
        '
        'Label16
        '
@@ -2864,12 +2877,6 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'MRNBarcodedruckToolStripMenuItem
-        '
-        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
-        '
        'frmHauptfenster
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3202,4 +3209,5 @@ Partial Class frmHauptfenster
    Friend WithEvents NEUToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents AMBToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents MRNBarcodedruckToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents SecretAvisoToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -110,13 +110,13 @@ Public Class frmHauptfenster
            '  If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung <> "QS" Then
            'cboGrenzstelle._value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
            '  End If
-
            MyComboBox1.changeItem(UStatus_AVEingang)

            tbcntrAviso.SelectedIndex = 0
            txtSuche.Text = ""
            txtSuche.Focus()
            Grid_aktiv = True
+            initDat()
            Aviso_anzeigen("")
        End If
        If (e.KeyCode) = Keys.Add AndAlso e.Control Then
@@ -834,7 +834,11 @@ Public Class frmHauptfenster
        gridAviso.RowTemplate.Height = rowHeight 'muss vor Bindung sein
        'gridAviso.DataSource = AvisoDAL.loadDataTableBySQL(hSQL)
        gridAviso.SET_SQL(hSQL, "AVISO")
-        gridAviso.LOAD()
+        Dim errOcc = False
+        gridAviso.LOAD(False, errOcc)
+        If errOcc Then
+            pic.Visible = True
+        End If
        '   AVISOBinding.setARITHABORTOn()
        'AVISOBinding.initBinding(hSQL, "Aviso")
        'gridAviso.DataSource = AVISOBinding.bindingSource
@@ -993,6 +997,17 @@ Public Class frmHauptfenster
                                       " FROM Aviso " &
                                       " WHERE   (  Status IN (0, 3, 4, 5)  OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
                                             sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) "
+                If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
+
+                sqlStr &= " ORDER BY case	 " &
+                                             " when [Status] =3 then 0 " &
+                                             " when [Status] =0 then 1 " &
+                                             " when [Status] =99 then 2 " &
+                                             " when [Status] =4 then 3 " &
+                                             " when [Status] =1 then 4 " &
+                                             " when [Status] =5 then 4 " &
+                                             " when [Status] =0 then 5 " &
+                                     " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            Else
                Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 "
                If cboMyAvisoAnzeige._value <> "" And cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
@@ -1000,7 +1015,7 @@ Public Class frmHauptfenster
                    inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
                End If

-                sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis  " &
+                sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis  " &
                                     " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " &
                                     " FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " &
                                     " WHERE   (  Status IN (0, 3, 4, 5)  OR ( Status = 1 AND [Abgeschlossen] = 0 ))  " &
@@ -1016,19 +1031,15 @@ Public Class frmHauptfenster
                    Case CheckState.Unchecked : sqlStr &= " AND tblSnd_Vorbereitet is null	 "
                        ' Case CheckState.Indeterminate : sqlStr &= " AND tblSnd_Vorbereitet is not null	 "
                End Select
+                If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"

+                sqlStr &= " ORDER BY case	 " &
+                                                 " when [Status] =3 then 0 " &
+                                                 " when [Status] =1 then 5 " &
+                                                 " else 1 " &
+                                         " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            End If
-            If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"

-            sqlStr &= " ORDER BY case	 " &
-                                             " when [Status] =3 then 0 " &
-                                             " when [Status] =0 then 1 " &
-                                             " when [Status] =99 then 2 " &
-                                             " when [Status] =4 then 3 " &
-                                             " when [Status] =1 then 4 " &
-                                             " when [Status] =5 then 4 " &
-                                             " when [Status] =0 then 5 " &
-                                     " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
            'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END  as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
            '                         " FROM Aviso " &
            '                         " WHERE   (  Status IN (0, 3, 4, 5)  OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
@@ -1056,8 +1067,11 @@ Public Class frmHauptfenster
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
            If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...

-            gridMyAviso.DataSource = VERAGSQL.loadDgvBySql_Param(sqlStr, "AVISO", 1500, list)
-
+            Dim errOcc = False
+            gridMyAviso.DataSource = VERAGSQL.loadDgvBySql_Param(sqlStr, "AVISO", 1500, list, False, errOcc)
+            If errOcc Then
+                pic.Visible = True
+            End If
            '  gridMyAviso.DataSource = VermerkeDAL.loadTableMyAviso(VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.MitarbeiterID)
            ' MsgBox(DateDiff(DateInterval.Minute, CDate(VarToDate("16.12.2013 11:02:08")), CDate(VarToDate("16.12.2013 12:02:08"))))
            ' MsgBox(gridMyAviso.RowCount)
@@ -1088,6 +1102,7 @@ Public Class frmHauptfenster
                .Columns("AvisoTVHinweis").Visible = False ' = 60
                .Columns("Dauer").Visible = False ' = 60

+         
                .Columns("Datum").Visible = False     'Mitarb. nicht anzeigen
                '.Columns("Datum").Width = 145 '115
                '.Columns("Datum").HeaderText = "Erfasst"
@@ -1154,6 +1169,10 @@ Public Class frmHauptfenster
                    .Columns("tblSnd_Empfaenger").HeaderText = "Empfaenger"
                    .Columns("tblSnd_Empfaenger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill

+                    .Columns("VoraussichtlichesEintreffen").Width = 55
+                    .Columns("VoraussichtlichesEintreffen").HeaderText = "Eintreffen"
+                    .Columns("VoraussichtlichesEintreffen").DefaultCellStyle.Format = "dd.MM."
+
                    '    .Columns("Vermerke_Anzahl").Width = 60
                    '   .Columns("Vermerke_Anzahl").HeaderText = "Vermerke"
                    '   .Columns("Vermerke_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -3554,6 +3573,11 @@ Public Class frmHauptfenster


    End Sub
+
+    Private Sub SecretAvisoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SecretAvisoToolStripMenuItem.Click
+        Dim frmSecretAviso As New frmSecretAviso
+        frmSecretAviso.Show(Me)
+    End Sub
 End Class

 Public Class AvisoStatusFunctions
@@ -3622,8 +3646,6 @@ Public Class AvisoStatusFunctions
            Return False
        End If

-
-
        'jetzt ausgewählten Datensatz einlesen
        Dim Aviso As New cAviso
        Aviso = AvisoDAL.LesenAviso(AvisoID, "")
@@ -3643,7 +3665,6 @@ Public Class AvisoStatusFunctions
        'Wenn Aviserer einem Team zugeordnet, aber noch nicht "vorgeschrieben", dann bekommt das Team eine Nachricht!
        ' If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Or Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst Then
        'Sendungsbasis
-        sendAnkunftBenachrichtigung(Aviso.AvisoID)
        '        End If

        If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen Then
@@ -3672,6 +3693,17 @@ Public Class AvisoStatusFunctions
            Aviso.Ankunft = getAnkunftDateNow()
        End If

+        'E-Mail
+        sendAnkunftBenachrichtigung(Aviso.AvisoID)
+
+
+
+
+        'Fahrer Handy-Nr.
+        Dim frmAnkunftSetzen As New frmAnkunftSetzen(Aviso)
+        If frmAnkunftSetzen.ShowDialog() = DialogResult.Cancel Then
+            Return -1  'Abbrechen 
+        End If
        'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
        '    If Aviso.Grenzstelle.Replace("???", "") <> "" Then
        '        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then Aviso.Grenzstelle = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
@@ -3692,6 +3724,9 @@ Public Class AvisoStatusFunctions
        Aviso.Änderungen = "auf ANKUNFT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen))
        Aviso.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
        Aviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
+
+
+
        Dim tmpid = AvisoDAL.SpeichernAviso(Aviso)
        AvisoDAL.addAenderung(tmpid, "auf ANKUNFT gesetzt", "auf ANKUNFT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))

@@ -3703,7 +3738,7 @@ Public Class AvisoStatusFunctions


        'Ticket Drucken, wenn parameter 
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Then
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("TICKET_ANKUNFT", "AVISO") Then
            Dim rpt As New rptQRAviso(Aviso)
            Dim printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
            If printer <> "" Then
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -14,7 +14,7 @@ Public Class frmLogin
    Private ADMIN As New cADMIN
    Public firma As String = "VERAG"

-
+    Dim SECRET = False
    Public Sub New()
        InitializeComponent()
        Icon = cMeineFunktionenAVISO.GetProgrammIcon
@@ -137,12 +137,14 @@ Public Class frmLogin
            Me.Hide()
            Me.WindowState = FormWindowState.Minimized
            Exit Sub
+        ElseIf PARAM = "SECRET" Then
+            SECRET = True
+
        End If

+        initstart(False)


-        initstart()
-


        Try
@@ -156,7 +158,7 @@ Public Class frmLogin
    End Sub


-    Sub initstart()
+    Sub initstart(Optional secret = False)
        picLogin.Size = New Size(picLogin.Width, 50)
        Select Case firma
            Case "VERAG"
@@ -330,6 +332,11 @@ Public Class frmLogin
        cGlobal.AngemeldeterUser = cGlobal.AktiverMitarbeiter.Mitarbeiter
        AnmeldungOK = True

+        'Secret Anmeldefenster
+        If SECRET Then
+            Dim frm As New frmSecretAviso
+            frm.Show()
+        End If
    End Sub

    Private Sub AdminLoginOK()
@@ -547,4 +554,6 @@ Public Class frmLogin
        initstart()
    End Sub

+
+
 End Class
--- a/Aviso/frmSecretAviso.Designer.vb
+++ b/Aviso/frmSecretAviso.Designer.vb
@@ -0,0 +1,137 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmSecretAviso
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSecretAviso))
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.btn = New System.Windows.Forms.Button()
+        Me.txt = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.pnlDetailsRechts = New System.Windows.Forms.Panel()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'MyDatagridview1
+        '
+        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
+        Me.MyDatagridview1.AllowUserToAddRows = False
+        Me.MyDatagridview1.AllowUserToDeleteRows = False
+        Me.MyDatagridview1.AllowUserToResizeColumns = False
+        Me.MyDatagridview1.AllowUserToResizeRows = False
+        Me.MyDatagridview1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.WhiteSmoke
+        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.MyDatagridview1.ColumnHeadersVisible = False
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle1
+        Me.MyDatagridview1.Location = New System.Drawing.Point(12, 154)
+        Me.MyDatagridview1.Name = "MyDatagridview1"
+        Me.MyDatagridview1.ReadOnly = True
+        Me.MyDatagridview1.RowHeadersVisible = False
+        Me.MyDatagridview1.RowTemplate.Height = 30
+        Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.MyDatagridview1.Size = New System.Drawing.Size(788, 594)
+        Me.MyDatagridview1.TabIndex = 11
+        '
+        'btn
+        '
+        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btn.BackgroundImage = CType(resources.GetObject("btn.BackgroundImage"), System.Drawing.Image)
+        Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Location = New System.Drawing.Point(725, 94)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(75, 53)
+        Me.btn.TabIndex = 10
+        Me.btn.UseVisualStyleBackColor = True
+        '
+        'txt
+        '
+        Me.txt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txt.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!)
+        Me.txt.Location = New System.Drawing.Point(12, 94)
+        Me.txt.Name = "txt"
+        Me.txt.Size = New System.Drawing.Size(707, 53)
+        Me.txt.TabIndex = 9
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!)
+        Me.Label1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(788, 82)
+        Me.Label1.TabIndex = 8
+        Me.Label1.Text = "Bitte geben Sie das Kennzeichen oder den Frächter ein und wählen Sie einen Eintra" &
+    "g aus:"
+        Me.Label1.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+        '
+        'pnlDetailsRechts
+        '
+        Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Right
+        Me.pnlDetailsRechts.Location = New System.Drawing.Point(806, 0)
+        Me.pnlDetailsRechts.Name = "pnlDetailsRechts"
+        Me.pnlDetailsRechts.Size = New System.Drawing.Size(640, 760)
+        Me.pnlDetailsRechts.TabIndex = 12
+        '
+        'frmSecretAviso
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1446, 760)
+        Me.Controls.Add(Me.pnlDetailsRechts)
+        Me.Controls.Add(Me.MyDatagridview1)
+        Me.Controls.Add(Me.btn)
+        Me.Controls.Add(Me.txt)
+        Me.Controls.Add(Me.Label1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmSecretAviso"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "frmSecretAviso"
+        Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents btn As Button
+    Friend WithEvents txt As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents pnlDetailsRechts As Panel
+End Class
--- a/Aviso/frmSecretAviso.resx
+++ b/Aviso/frmSecretAviso.resx
--- a/Aviso/frmSecretAviso.vb
+++ b/Aviso/frmSecretAviso.vb
@@ -0,0 +1,424 @@
+
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
+Public Class frmSecretAviso
+
+    Dim lkwbackcolor As Color = Color.FromArgb(220, 220, 220)
+
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
+    Dim Details_aktiv = False
+
+    Private Sub txt_TextChanged(sender As Object, e As EventArgs) Handles txt.TextChanged
+        If txt.Text = "" Then
+            MyDatagridview1.ClearSelection()
+        End If
+    End Sub
+
+
+    Private Sub txt_KeyDown(sender As Object, e As KeyEventArgs) Handles txt.KeyDown
+        If e.KeyCode = Keys.Return Then
+            initDGV()
+        End If
+    End Sub
+
+    Sub initDGV()
+        pnlDetailsRechts.Controls.Clear()
+
+        With MyDatagridview1
+            Dim search = txt.Text
+
+            Dim sqlstr = "SELECT TOP (20) AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' ELSE CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben,  Freigabe, Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen 
+                          FROM [Aviso]
+                          WHERE ((LKW_Nr LIKE '%" & search & "%') OR (Frächter LIKE '%" & search & "%') OR (Auftraggeber LIKE '%" & search & "%'))  AND Status NOT IN (1,2) AND Datum > DATEADD(MONTH,-1 ,GETDATE())
+                          order by DATUM DESC"
+
+            ' .SET_SQL(sqlstr, "AVISO")
+            '.LOAD()
+            .DataSource = SQL.loadDgvBySql(sqlstr, "AVISO")
+
+            If .RowCount = 0 Then
+                .Columns.Clear() : Exit Sub
+            End If
+
+            '.Columns("AvisoID").Visible = False
+            '.Columns("LKW").Width = 250
+            '.Columns("Frächter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            ''.loa.Columns("Avisierer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            '.Columns("Avisierer").Visible = False
+            gridAviso_SpaltenFestlegen()
+        End With
+
+    End Sub
+
+    Private Sub frmSecretAviso_Load(sender As Object, e As EventArgs) Handles Me.Load
+        txt.Focus()
+    End Sub
+
+    Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles MyDatagridview1.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?
+        MyDatagridview1.ClearSelection() ': UsrCntlBenachrichtigungen1.gridAvisoBenachrichtigungen.ClearSelection()
+        ' MsgBox(Grid_aktiv)
+        DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
+
+        Dim tmpId = CInt(sender.Rows(e.RowIndex).Cells("AvisoId").Value)
+
+
+        VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
+
+
+        If e.Button = MouseButtons.Right Then
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
+                VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
+                sender.CurrentCell = sender.Rows(e.RowIndex).Cells(e.ColumnIndex)
+                ' conMenuAviso.Show(Cursor.Position)
+
+            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
+            Details_anzeigen(setAkive_AuswahlID())
+           ' avisoAktualisierenAktiveIdBehalten(tmpId,  , False)
+        End If
+    End Sub
+
+    Public Sub avisoAktualisierenAktiveIdBehalten(tmpid As Integer, Optional aktWithoutCheckTime As Boolean = False, Optional Aviso_anzeigenBool As Boolean = True)
+
+
+        Try
+
+
+            'If Not Grid_aktiv Then Exit Sub
+            Details_aktiv = False
+
+            'initEAviso()
+
+            'If Aviso_anzeigenBool Then Aviso_anzeigen("", False) ': meineAviso_anzeigen()
+
+
+
+            ' If pnlDetailsRechts.Controls.Count > 0 Then
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                    Case "ATILLA"
+                        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
+                            Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu)
+                            If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
+                                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                            Else
+                                If DateDiff(DateInterval.Second, usrcntl.aktiv, 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
+                        Else
+                            Dim usrcntl As usrcntlAktDetailsATILLA = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLA)
+                            If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
+                                Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                            Else
+                                If DateDiff(DateInterval.Second, usrcntl.aktiv, 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
+                    Case Else
+                        Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails)
+                        If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
+                            Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                        Else
+                            usrcntl.changeCurrentSndId()
+                            If DateDiff(DateInterval.Second, usrcntl.aktiv, 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 Select
+
+            '     End If
+        Catch ex As Exception
+            '  pic.Visible = True
+
+        End Try
+    End Sub
+
+    Public Sub Details_anzeigen(ByVal id As Integer, Optional reloadIfSameId As Boolean = True) ', Optional opensendungsDetails As Boolean = False)
+        Me.Cursor = Cursors.AppStarting
+        ' If Not Details_aktiv Then Exit Sub
+
+        If id > 0 Then
+            pnlDetailsRechts.Visible = True
+
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+                Case "ATILLA"
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
+
+                        If pnlDetailsRechts.Controls.Count = 0 Then
+                            Dim usrCntl As New usrcntlAktDetailsATILLANeu(id)
+                            usrCntl.Dock = DockStyle.Fill
+                            pnlDetailsRechts.Controls.Add(usrCntl)
+                        Else
+                            DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).reload(id)
+                        End If
+                    Else
+                        If pnlDetailsRechts.Controls.Count = 0 Then
+                            Dim usrCntl As New usrcntlAktDetailsATILLA(id)
+                            usrCntl.Dock = DockStyle.Fill
+                            pnlDetailsRechts.Controls.Add(usrCntl)
+                        Else
+                            DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLA).reload(id)
+                        End If
+                    End If
+                Case Else
+                    If pnlDetailsRechts.Controls.Count = 0 Then
+                        Dim usrCntl As New usrcntlAktDetails(id)
+                        usrCntl.Dock = DockStyle.Fill
+                        pnlDetailsRechts.Controls.Add(usrCntl)
+                    Else
+                        If reloadIfSameId Then
+                            DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails).reload(id)
+                        Else
+                            If DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails).AvisoID <> id Then
+                                DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails).reload(id)
+                            End If
+                        End If
+                    End If
+            End Select
+
+
+        Else
+            pnlDetailsRechts.Visible = False
+        End If
+
+        Me.Cursor = Cursors.Default
+    End Sub
+
+
+    Function setAkive_AuswahlID() As Integer
+        If MyDatagridview1.SelectedRows.Count > 0 Then
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(MyDatagridview1.Rows(MyDatagridview1.SelectedRows(0).Index).Cells("AvisoID").Value)
+        Else
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = -1
+        End If
+
+        Return VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID
+    End Function
+    Private Sub gridAviso_SpaltenFestlegen()
+        If MyDatagridview1.RowCount = 0 Then Exit Sub
+        Dim bfont = New Font(MyDatagridview1.Font.FontFamily, MyDatagridview1.Font.Size, FontStyle.Bold)
+        With MyDatagridview1
+
+            .Columns("AvisoID").Visible = False     'AvisoID nicht anzeigen
+
+
+            .Columns("Datum").Visible = False     'Mitarb. nicht anzeigen
+            .Columns("Freigabe").Visible = False     'Mitarb. nicht anzeigen
+            .Columns("Handling").Visible = False     'Mitarb. nicht anzeigen
+            .Columns("Vorbereitet").Visible = False
+            .Columns("Vorgeschrieben").Visible = False
+
+
+            .Columns("TageBisEintreffen").Visible = False
+
+            .Columns("Status").Width = 25
+            .Columns("Status").HeaderText = "St."
+
+            .Columns("LetzterMitarbeiter").Width = 135
+            .Columns("LetzterMitarbeiter").HeaderText = "akt. Mitarb"
+
+
+            .Columns("VoraussichtlichesEintreffen").Width = 95
+            .Columns("VoraussichtlichesEintreffen").HeaderText = "Vorauss.Eintreffen"
+            .Columns("VoraussichtlichesEintreffen").DefaultCellStyle.Format = "dd.MM.yyyy"
+            '.Columns("VoraussichtlichesEintreffen").DefaultCellStyle.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
+
+
+            .Columns("AvisoEingang").Width = 95
+            .Columns("AvisoEingang").HeaderText = "Av.Eingang"
+            .Columns("AvisoEingang").DefaultCellStyle.Format = "dd.MM. HH:mm"
+
+            .Columns("Datum").Width = 95
+            .Columns("Datum").HeaderText = "Erfasst"
+            .Columns("Datum").DefaultCellStyle.Format = "dd.MM. HH:mm"
+            .Columns("Datum").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+
+            .Columns("Vorbereitet").Width = 100
+            .Columns("Vorbereitet").HeaderText = "Vorbereitet"
+            .Columns("Vorbereitet").DefaultCellStyle.Format = "dd.MM. HH:mm"
+
+
+            .Columns("Vorgeschrieben").Width = 100
+            .Columns("Vorgeschrieben").HeaderText = "Vorgeschrieben"
+            .Columns("Vorgeschrieben").DefaultCellStyle.Format = "dd.MM. HH:mm"
+
+
+            .Columns("Ankunft").Width = 100
+            .Columns("Ankunft").HeaderText = "Ankunft"
+            .Columns("Ankunft").DefaultCellStyle.Format = "dd.MM. HH:mm"
+
+
+            .Columns("Freigabe").Width = 100
+            .Columns("Freigabe").HeaderText = "Freigabe"
+            .Columns("Freigabe").DefaultCellStyle.Format = "dd.MM. HH:mm"
+
+            .Columns("Dauer").Width = 60
+            .Columns("Dauer").HeaderText = "Dauer"
+            .Columns("Dauer").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+            .Columns("Dauer").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+            '  If cGlobal.AktiverMitarbeiter.Abteilung = "quick-stop" Then
+            '.Columns(10).Visible = True
+            ' Else
+            ' .Columns(10).Visible = False
+            ' End If
+
+            .Columns("Grenzstelle").Width = 40
+            .Columns("Grenzstelle").HeaderText = "Grenz."
+            .Columns("Grenzstelle").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+            .Columns("Grenzstelle").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+
+
+            .Columns("LKW_Nr").Width = 150
+            '.Columns("LKW_Nr").MinimumWidth = 90
+            .Columns("LKW_Nr").HeaderText = "LKW-Nr"
+            '  .Columns("LKW_Nr").DefaultCellStyle.Font = New Font(.DefaultCellStyle.Font.FontFamily, .DefaultCellStyle.Font.Size, FontStyle.Bold)
+            '.Columns("LKW_Nr").DefaultCellStyle.BackColor = lkwbackcolor
+            '.Columns("LKW_Nr").DefaultCellStyle.SelectionBackColor = lkwbackcolor
+
+            .Columns("Auftraggeber").MinimumWidth = 150
+            .Columns("Auftraggeber").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("Auftraggeber").HeaderText = "Avisierer"
+
+            .Columns("Frächter").MinimumWidth = 150
+            .Columns("Frächter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("Frächter").HeaderText = "Frächter"
+
+            .Columns("Telefonisch").Visible = False     'Status Telefon nicht anzeigen
+            .Columns("AvisoTVHinweis").Visible = False     'Status Telefon nicht anzeigen
+
+            .Columns("LKW_fertig").Width = 35
+            .Columns("LKW_fertig").HeaderText = "OK"
+            .Columns("LKW_fertig").DefaultCellStyle.ForeColor = Color.White
+            .Columns("LKW_fertig").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+            .Columns("LKW_fertig").DefaultCellStyle.Font = bfont
+
+            .Columns("Info").Visible = False
+            .Columns("Info").MinimumWidth = 200
+            .Columns("Info").HeaderText = "Info (Einträge bis zum Status ERFASST)"
+            .Columns("Info").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+            .Columns("Handling").Width = 50
+            .Columns("Handling").HeaderText = "Handling"
+
+
+            '.Columns(12).Width = 700
+            '.Columns(12).HeaderText = "Änderungen"
+
+            initDauerLKWFertig()
+
+        End With
+    End Sub
+
+    Sub initDauerLKWFertig()
+        Try
+
+            'Dauer berechnen:
+            With MyDatagridview1
+
+                For Each r As DataGridViewRow In .Rows
+                    If r.Cells("Dauer").Value Is DBNull.Value Or r.Cells("Dauer").Value = 0 Then
+                        If CInt(r.Cells("Status").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then
+                            If Not IsDBNull(r.Cells("Ankunft").Value) AndAlso Not CDate(r.Cells("Ankunft").Value) = LeerDatum Then
+                                Dim dauerTmp = DateDiff(DateInterval.Minute, CDate(VarToDate(r.Cells("Ankunft").Value)), Now)
+                                If IsNumeric(dauerTmp) AndAlso dauerTmp > 0 Then
+                                    r.Cells("Dauer").Value = dauerTmp
+                                Else
+                                    r.Cells("Dauer").Value = "0"
+                                End If
+                            Else
+                                r.Cells("Dauer").Value = "0"
+                            End If
+                        End If
+                    End If
+                    If r.Cells("LKW_fertig").Value = "OK" Then
+                        r.Cells("LKW_fertig").Style.ForeColor = Color.White
+                        r.Cells("LKW_fertig").Style.BackColor = Color.FromArgb(0, 54, 128)
+                        'Else
+                        'r.Cells("LKW_fertig").Style.BackColor = Color.White
+                    End If
+                    If r.Cells("LKW_fertig").Value = "DE" Then
+                        r.Cells("LKW_fertig").Style.ForeColor = Color.White
+                        r.Cells("LKW_fertig").Style.BackColor = Color.Green
+                        'Else
+                        'r.Cells("LKW_fertig").Style.BackColor = Color.White
+                    End If
+
+                Next
+            End With
+            GridZeichnenAviso()
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+    End Sub
+
+
+    Private Sub GridZeichnenAviso()
+        'hier wird der Grid speziell designed
+        If MyDatagridview1.RowCount = 0 Then Exit Sub
+        'Falls Kunde auf inaktiv steht, dann wird Zeile ausgegraut angezeigt
+        For Each dr As DataGridViewRow In MyDatagridview1.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
+End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -217,6 +217,7 @@ Public Class frmSendungsdetailsNEU


    Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load
+        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
        Try

            Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
--- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
@@ -33,17 +33,17 @@ Partial Class usrcntlAktDetailsATILLANeu
        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetailsATILLANeu))
-        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.pnlDetailsRechts = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
@@ -61,6 +61,8 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.pnlSendungenTop = New System.Windows.Forms.Panel()
        Me.btn = New System.Windows.Forms.Button()
        Me.Label1 = New System.Windows.Forms.Label()
+        Me.tbAnhaenge = New System.Windows.Forms.TabPage()
+        Me.dgvanhaenge = New System.Windows.Forms.DataGridView()
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.gridVermerke = New System.Windows.Forms.DataGridView()
        Me.pnlVermerkeTop = New System.Windows.Forms.Panel()
@@ -120,13 +122,12 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DispolisteTRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DispolisteENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cntxtZollantrag = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
        Me.NCTST2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.AESToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.tbAnhaenge = New System.Windows.Forms.TabPage()
-        Me.dgvanhaenge = New System.Windows.Forms.DataGridView()
+        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.SGSNCTSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cntxtZollantrag = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -142,6 +143,8 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.TabPage2.SuspendLayout()
        CType(Me.dgvSpeditionsbuch, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlSendungenTop.SuspendLayout()
+        Me.tbAnhaenge.SuspendLayout()
+        CType(Me.dgvanhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlVermerkeTop.SuspendLayout()
        Me.Panel8.SuspendLayout()
@@ -159,8 +162,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.conMenuVermerke.SuspendLayout()
        Me.cntxtFormulare.SuspendLayout()
        Me.cntxtZollantrag.SuspendLayout()
-        Me.tbAnhaenge.SuspendLayout()
-        CType(Me.dgvanhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnlDetailsRechts
@@ -455,6 +456,70 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Label1.TabIndex = 98
        Me.Label1.Text = "Speditionsbucheinträge:"
        '
+        'tbAnhaenge
+        '
+        Me.tbAnhaenge.Controls.Add(Me.dgvanhaenge)
+        Me.tbAnhaenge.Location = New System.Drawing.Point(4, 22)
+        Me.tbAnhaenge.Name = "tbAnhaenge"
+        Me.tbAnhaenge.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbAnhaenge.Size = New System.Drawing.Size(567, 117)
+        Me.tbAnhaenge.TabIndex = 3
+        Me.tbAnhaenge.Text = "Anhänge"
+        Me.tbAnhaenge.UseVisualStyleBackColor = True
+        '
+        'dgvanhaenge
+        '
+        Me.dgvanhaenge.AllowUserToAddRows = False
+        Me.dgvanhaenge.AllowUserToDeleteRows = False
+        Me.dgvanhaenge.AllowUserToResizeRows = False
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvanhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        Me.dgvanhaenge.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvanhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
+        Me.dgvanhaenge.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.dgvanhaenge.DefaultCellStyle = DataGridViewCellStyle13
+        Me.dgvanhaenge.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvanhaenge.Location = New System.Drawing.Point(3, 3)
+        Me.dgvanhaenge.MultiSelect = False
+        Me.dgvanhaenge.Name = "dgvanhaenge"
+        Me.dgvanhaenge.ReadOnly = True
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvanhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle14
+        Me.dgvanhaenge.RowHeadersVisible = False
+        Me.dgvanhaenge.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvanhaenge.RowsDefaultCellStyle = DataGridViewCellStyle15
+        Me.dgvanhaenge.RowTemplate.Height = 20
+        Me.dgvanhaenge.RowTemplate.ReadOnly = True
+        Me.dgvanhaenge.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvanhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvanhaenge.ShowCellErrors = False
+        Me.dgvanhaenge.ShowRowErrors = False
+        Me.dgvanhaenge.Size = New System.Drawing.Size(561, 111)
+        Me.dgvanhaenge.TabIndex = 102
+        Me.dgvanhaenge.TabStop = False
+        '
        'Panel7
        '
        Me.Panel7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -1274,99 +1339,42 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.DispolisteENToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
        Me.DispolisteENToolStripMenuItem.Text = "Dispoliste EN"
        '
-        'cntxtZollantrag
-        '
-        Me.cntxtZollantrag.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.cntxtZollantrag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator2, Me.NCTST2ToolStripMenuItem, Me.ToolStripSeparator1, Me.AESToolStripMenuItem})
-        Me.cntxtZollantrag.Name = "cntxtZollantrag"
-        Me.cntxtZollantrag.Size = New System.Drawing.Size(157, 60)
-        Me.cntxtZollantrag.Text = "Zollantrag"
-        '
        'ToolStripSeparator2
        '
        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(153, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
        '
        'NCTST2ToolStripMenuItem
        '
        Me.NCTST2ToolStripMenuItem.Name = "NCTST2ToolStripMenuItem"
-        Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.NCTST2ToolStripMenuItem.Text = "NCTS - Versand"
        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(153, 6)
-        '
        'AESToolStripMenuItem
        '
        Me.AESToolStripMenuItem.Name = "AESToolStripMenuItem"
-        Me.AESToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.AESToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.AESToolStripMenuItem.Text = "AES - Ausfuhr"
        '
-        'tbAnhaenge
+        'ToolStripSeparator1
        '
-        Me.tbAnhaenge.Controls.Add(Me.dgvanhaenge)
-        Me.tbAnhaenge.Location = New System.Drawing.Point(4, 22)
-        Me.tbAnhaenge.Name = "tbAnhaenge"
-        Me.tbAnhaenge.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAnhaenge.Size = New System.Drawing.Size(567, 117)
-        Me.tbAnhaenge.TabIndex = 3
-        Me.tbAnhaenge.Text = "Anhänge"
-        Me.tbAnhaenge.UseVisualStyleBackColor = True
+        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
        '
-        'dgvanhaenge
+        'SGSNCTSToolStripMenuItem
        '
-        Me.dgvanhaenge.AllowUserToAddRows = False
-        Me.dgvanhaenge.AllowUserToDeleteRows = False
-        Me.dgvanhaenge.AllowUserToResizeRows = False
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvanhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
-        Me.dgvanhaenge.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvanhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
-        Me.dgvanhaenge.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.dgvanhaenge.DefaultCellStyle = DataGridViewCellStyle13
-        Me.dgvanhaenge.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvanhaenge.Location = New System.Drawing.Point(3, 3)
-        Me.dgvanhaenge.MultiSelect = False
-        Me.dgvanhaenge.Name = "dgvanhaenge"
-        Me.dgvanhaenge.ReadOnly = True
-        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvanhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle14
-        Me.dgvanhaenge.RowHeadersVisible = False
-        Me.dgvanhaenge.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvanhaenge.RowsDefaultCellStyle = DataGridViewCellStyle15
-        Me.dgvanhaenge.RowTemplate.Height = 20
-        Me.dgvanhaenge.RowTemplate.ReadOnly = True
-        Me.dgvanhaenge.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvanhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvanhaenge.ShowCellErrors = False
-        Me.dgvanhaenge.ShowRowErrors = False
-        Me.dgvanhaenge.Size = New System.Drawing.Size(561, 111)
-        Me.dgvanhaenge.TabIndex = 102
-        Me.dgvanhaenge.TabStop = False
+        Me.SGSNCTSToolStripMenuItem.Name = "SGSNCTSToolStripMenuItem"
+        Me.SGSNCTSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.SGSNCTSToolStripMenuItem.Text = "SGS - NCTS"
+        Me.SGSNCTSToolStripMenuItem.Visible = False
+        '
+        'cntxtZollantrag
+        '
+        Me.cntxtZollantrag.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.cntxtZollantrag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator2, Me.NCTST2ToolStripMenuItem, Me.AESToolStripMenuItem, Me.ToolStripSeparator1, Me.SGSNCTSToolStripMenuItem})
+        Me.cntxtZollantrag.Name = "cntxtZollantrag"
+        Me.cntxtZollantrag.Size = New System.Drawing.Size(181, 104)
+        Me.cntxtZollantrag.Text = "Zollantrag"
        '
        'usrcntlAktDetailsATILLANeu
        '
@@ -1393,6 +1401,8 @@ Partial Class usrcntlAktDetailsATILLANeu
        CType(Me.dgvSpeditionsbuch, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlSendungenTop.ResumeLayout(False)
        Me.pnlSendungenTop.PerformLayout()
+        Me.tbAnhaenge.ResumeLayout(False)
+        CType(Me.dgvanhaenge, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlVermerkeTop.ResumeLayout(False)
        Me.pnlVermerkeTop.PerformLayout()
@@ -1420,8 +1430,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.conMenuVermerke.ResumeLayout(False)
        Me.cntxtFormulare.ResumeLayout(False)
        Me.cntxtZollantrag.ResumeLayout(False)
-        Me.tbAnhaenge.ResumeLayout(False)
-        CType(Me.dgvanhaenge, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -1497,11 +1505,6 @@ Partial Class usrcntlAktDetailsATILLANeu
    Friend WithEvents dgvZollAnmeldungen As System.Windows.Forms.DataGridView
    Friend WithEvents TextBox2 As System.Windows.Forms.TextBox
    Friend WithEvents TextBox1 As System.Windows.Forms.TextBox
-    Friend WithEvents cntxtZollantrag As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents NCTST2ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents AESToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents Panel4 As System.Windows.Forms.Panel
    Friend WithEvents Button7 As System.Windows.Forms.Button
    Friend WithEvents Label6 As System.Windows.Forms.Label
@@ -1509,4 +1512,10 @@ Partial Class usrcntlAktDetailsATILLANeu
    Friend WithEvents Button9 As Button
    Friend WithEvents tbAnhaenge As TabPage
    Friend WithEvents dgvanhaenge As DataGridView
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+    Friend WithEvents NCTST2ToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AESToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+    Friend WithEvents SGSNCTSToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents cntxtZollantrag As ContextMenuStrip
 End Class
--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -191,8 +191,11 @@ Public Class usrcntlAktDetailsATILLANeu
                    SND = SENDUNG_LIST(0)
                End If

+
+                Dim SYSTEM = "DAKOSY"
+
                '    Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, SENDUNG_LIST(0), Now.ToString("yy"))
-                Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, SND, Now.ToString("yy"))
+                Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, SND, Now.ToString("yy"), System)
                AddHandler f.FormClosed, Sub()
                                             initdgvZollAnmeldungen()
                                         End Sub
@@ -210,6 +213,10 @@ Public Class usrcntlAktDetailsATILLANeu


    Private Sub usrcntlAktDetails_Load(sender As Object, e As EventArgs) Handles Me.Load
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then
+            SGSNCTSToolStripMenuItem.Visible = True
+        End If
+

        timer.Interval = 100
        reload(AvisoID)
@@ -1227,14 +1234,14 @@ Public Class usrcntlAktDetailsATILLANeu
        cntxtZollantrag.Show(Cursor.Position)
    End Sub

-    Sub genZollantrag(ncts_Art)
+    Sub genZollantrag(ncts_Art, Optional ZOLL_SYSTEM = "DAKOSY")
        Try
            Me.Cursor = Cursors.WaitCursor

            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0)

-                Dim f As New SDL.frmZollanmeldung(ncts_Art, Nothing, AVISO, SND, Now.ToString("yy"))
+                Dim f As New SDL.frmZollanmeldung(ncts_Art, Nothing, AVISO, SND, Now.ToString("yy"), ZOLL_SYSTEM)
                AddHandler f.FormClosed, Sub()
                                             initdgvZollAnmeldungen()
                                         End Sub
@@ -1300,5 +1307,7 @@ Public Class usrcntlAktDetailsATILLANeu
        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.VerpflichtungserklärungFahrer, FraechterKdNr, {AvisoID}, True)
    End Sub

-
+    Private Sub SGSNCTSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SGSNCTSToolStripMenuItem.Click
+        genZollantrag("T2", "SGS")
+    End Sub
 End Class
--- a/AvisoTV/frmAnzeige.Designer.vb
+++ b/AvisoTV/frmAnzeige.Designer.vb
@@ -27,11 +27,6 @@ Partial Class frmAnzeige
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -45,14 +40,12 @@ Partial Class frmAnzeige
        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.gridAnkunft = New System.Windows.Forms.DataGridView()
-        Me.colFertig = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.colLKWNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.colAnkunft = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Dauer = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.letzterMitarbeiter = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnBuero = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnImEx = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.lblZeit = New System.Windows.Forms.Label()
        Me.lblZeile1 = New System.Windows.Forms.Label()
        Me.lblZeile2 = New System.Windows.Forms.Label()
@@ -104,6 +97,9 @@ Partial Class frmAnzeige
        Me.lblBigInfo2 = New System.Windows.Forms.Label()
        Me.lblBigInfo = New System.Windows.Forms.Label()
        Me.grpTestAnzeige = New System.Windows.Forms.Panel()
+        Me.txtBreite8 = New System.Windows.Forms.TextBox()
+        Me.txtSchrift8 = New System.Windows.Forms.TextBox()
+        Me.Label25 = New System.Windows.Forms.Label()
        Me.cbxGridLKWOK = New System.Windows.Forms.CheckBox()
        Me.Label24 = New System.Windows.Forms.Label()
        Me.txtBreiteGridLKWOK = New System.Windows.Forms.TextBox()
@@ -130,6 +126,14 @@ Partial Class frmAnzeige
        Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn9 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.colFertig = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.colLKWNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.colAnkunft = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Dauer = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.letzterMitarbeiter = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnBuero = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnImEx = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn()
        CType(Me.gridAnkunft, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picConnectionProblem, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -158,7 +162,7 @@ Partial Class frmAnzeige
        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.gridAnkunft.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
        Me.gridAnkunft.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.gridAnkunft.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFertig, Me.colLKWNr, Me.colAnkunft, Me.Dauer, Me.letzterMitarbeiter, Me.clmnBuero, Me.clmnImEx})
+        Me.gridAnkunft.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFertig, Me.colLKWNr, Me.colAnkunft, Me.Dauer, Me.letzterMitarbeiter, Me.clmnBuero, Me.clmnImEx, Me.clmnArt})
        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -183,86 +187,6 @@ Partial Class frmAnzeige
        Me.gridAnkunft.TabIndex = 1
        Me.gridAnkunft.TabStop = False
        '
-        'colFertig
-        '
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black
-        Me.colFertig.DefaultCellStyle = DataGridViewCellStyle3
-        Me.colFertig.HeaderText = "KOMMEN/TAMAM"
-        Me.colFertig.Name = "colFertig"
-        Me.colFertig.ReadOnly = True
-        Me.colFertig.Width = 140
-        '
-        'colLKWNr
-        '
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.colLKWNr.DefaultCellStyle = DataGridViewCellStyle4
-        Me.colLKWNr.HeaderText = "LKW-KENNZ. /PLAKA"
-        Me.colLKWNr.Name = "colLKWNr"
-        Me.colLKWNr.ReadOnly = True
-        Me.colLKWNr.Width = 400
-        '
-        'colAnkunft
-        '
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black
-        Me.colAnkunft.DefaultCellStyle = DataGridViewCellStyle5
-        Me.colAnkunft.HeaderText = "ANKUNFT/GELIS"
-        Me.colAnkunft.Name = "colAnkunft"
-        Me.colAnkunft.ReadOnly = True
-        Me.colAnkunft.Width = 300
-        '
-        'Dauer
-        '
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black
-        Me.Dauer.DefaultCellStyle = DataGridViewCellStyle6
-        Me.Dauer.HeaderText = "DAUER/SÜRE"
-        Me.Dauer.Name = "Dauer"
-        Me.Dauer.ReadOnly = True
-        Me.Dauer.Width = 200
-        '
-        'letzterMitarbeiter
-        '
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.LightGreen
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black
-        Me.letzterMitarbeiter.DefaultCellStyle = DataGridViewCellStyle7
-        Me.letzterMitarbeiter.HeaderText = "BEARBEITER/GÖREVLI"
-        Me.letzterMitarbeiter.Name = "letzterMitarbeiter"
-        Me.letzterMitarbeiter.ReadOnly = True
-        Me.letzterMitarbeiter.Width = 500
-        '
-        'clmnBuero
-        '
-        Me.clmnBuero.HeaderText = "BÜRO/KAPI"
-        Me.clmnBuero.Name = "clmnBuero"
-        Me.clmnBuero.ReadOnly = True
-        Me.clmnBuero.Visible = False
-        '
-        'clmnImEx
-        '
-        Me.clmnImEx.HeaderText = "ART"
-        Me.clmnImEx.Name = "clmnImEx"
-        Me.clmnImEx.ReadOnly = True
-        Me.clmnImEx.Visible = False
-        '
        'lblZeit
        '
        Me.lblZeit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -828,6 +752,9 @@ Partial Class frmAnzeige
        Me.grpTestAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.grpTestAnzeige.BackColor = System.Drawing.Color.White
        Me.grpTestAnzeige.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.grpTestAnzeige.Controls.Add(Me.txtBreite8)
+        Me.grpTestAnzeige.Controls.Add(Me.txtSchrift8)
+        Me.grpTestAnzeige.Controls.Add(Me.Label25)
        Me.grpTestAnzeige.Controls.Add(Me.cbxGridLKWOK)
        Me.grpTestAnzeige.Controls.Add(Me.Label24)
        Me.grpTestAnzeige.Controls.Add(Me.txtBreiteGridLKWOK)
@@ -878,13 +805,41 @@ Partial Class frmAnzeige
        Me.grpTestAnzeige.Controls.Add(Me.txtSchrift5)
        Me.grpTestAnzeige.Controls.Add(Me.txtBreite4)
        Me.grpTestAnzeige.Controls.Add(Me.pnl)
-        Me.grpTestAnzeige.Location = New System.Drawing.Point(424, 203)
-        Me.grpTestAnzeige.MaximumSize = New System.Drawing.Size(700, 312)
+        Me.grpTestAnzeige.Location = New System.Drawing.Point(424, 185)
+        Me.grpTestAnzeige.MaximumSize = New System.Drawing.Size(700, 330)
        Me.grpTestAnzeige.Name = "grpTestAnzeige"
-        Me.grpTestAnzeige.Size = New System.Drawing.Size(700, 312)
+        Me.grpTestAnzeige.Size = New System.Drawing.Size(700, 330)
        Me.grpTestAnzeige.TabIndex = 35
        Me.grpTestAnzeige.Visible = False
        '
+        'txtBreite8
+        '
+        Me.txtBreite8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtBreite8.Location = New System.Drawing.Point(441, 302)
+        Me.txtBreite8.MaxLength = 40
+        Me.txtBreite8.Name = "txtBreite8"
+        Me.txtBreite8.Size = New System.Drawing.Size(62, 20)
+        Me.txtBreite8.TabIndex = 102
+        '
+        'txtSchrift8
+        '
+        Me.txtSchrift8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSchrift8.Location = New System.Drawing.Point(362, 302)
+        Me.txtSchrift8.MaxLength = 40
+        Me.txtSchrift8.Name = "txtSchrift8"
+        Me.txtSchrift8.Size = New System.Drawing.Size(62, 20)
+        Me.txtSchrift8.TabIndex = 101
+        '
+        'Label25
+        '
+        Me.Label25.AutoSize = True
+        Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label25.Location = New System.Drawing.Point(237, 305)
+        Me.Label25.Name = "Label25"
+        Me.Label25.Size = New System.Drawing.Size(64, 13)
+        Me.Label25.TabIndex = 103
+        Me.Label25.Text = "Anmelde-Art"
+        '
        'cbxGridLKWOK
        '
        Me.cbxGridLKWOK.AutoSize = True
@@ -1203,6 +1158,93 @@ Partial Class frmAnzeige
        Me.DataGridViewTextBoxColumn9.Name = "DataGridViewTextBoxColumn9"
        Me.DataGridViewTextBoxColumn9.Visible = False
        '
+        'colFertig
+        '
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black
+        Me.colFertig.DefaultCellStyle = DataGridViewCellStyle3
+        Me.colFertig.HeaderText = "KOMMEN/TAMAM"
+        Me.colFertig.Name = "colFertig"
+        Me.colFertig.ReadOnly = True
+        Me.colFertig.Width = 140
+        '
+        'colLKWNr
+        '
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.colLKWNr.DefaultCellStyle = DataGridViewCellStyle4
+        Me.colLKWNr.HeaderText = "LKW-KENNZ. /PLAKA"
+        Me.colLKWNr.Name = "colLKWNr"
+        Me.colLKWNr.ReadOnly = True
+        Me.colLKWNr.Width = 400
+        '
+        'colAnkunft
+        '
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black
+        Me.colAnkunft.DefaultCellStyle = DataGridViewCellStyle5
+        Me.colAnkunft.HeaderText = "ANKUNFT/GELIS"
+        Me.colAnkunft.Name = "colAnkunft"
+        Me.colAnkunft.ReadOnly = True
+        Me.colAnkunft.Width = 300
+        '
+        'Dauer
+        '
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black
+        Me.Dauer.DefaultCellStyle = DataGridViewCellStyle6
+        Me.Dauer.HeaderText = "DAUER/SÜRE"
+        Me.Dauer.Name = "Dauer"
+        Me.Dauer.ReadOnly = True
+        Me.Dauer.Width = 200
+        '
+        'letzterMitarbeiter
+        '
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.LightGreen
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black
+        Me.letzterMitarbeiter.DefaultCellStyle = DataGridViewCellStyle7
+        Me.letzterMitarbeiter.HeaderText = "BEARBEITER/GÖREVLI"
+        Me.letzterMitarbeiter.Name = "letzterMitarbeiter"
+        Me.letzterMitarbeiter.ReadOnly = True
+        Me.letzterMitarbeiter.Width = 500
+        '
+        'clmnBuero
+        '
+        Me.clmnBuero.HeaderText = "BÜRO/KAPI"
+        Me.clmnBuero.Name = "clmnBuero"
+        Me.clmnBuero.ReadOnly = True
+        Me.clmnBuero.Visible = False
+        '
+        'clmnImEx
+        '
+        Me.clmnImEx.HeaderText = "ART"
+        Me.clmnImEx.Name = "clmnImEx"
+        Me.clmnImEx.ReadOnly = True
+        Me.clmnImEx.Visible = False
+        '
+        'clmnArt
+        '
+        Me.clmnArt.HeaderText = ""
+        Me.clmnArt.Name = "clmnArt"
+        Me.clmnArt.ReadOnly = True
+        Me.clmnArt.Width = 30
+        '
        'frmAnzeige
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1291,13 +1333,6 @@ Partial Class frmAnzeige
    Friend WithEvents Label17 As System.Windows.Forms.Label
    Friend WithEvents pnl As System.Windows.Forms.Panel
    Friend WithEvents Button2 As System.Windows.Forms.Button
-    Friend WithEvents colFertig As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents colLKWNr As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents colAnkunft As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents Dauer As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents letzterMitarbeiter As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents clmnBuero As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents clmnImEx As System.Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents txtBreite7 As System.Windows.Forms.TextBox
    Friend WithEvents txtSchrift7 As System.Windows.Forms.TextBox
    Friend WithEvents Label18 As System.Windows.Forms.Label
@@ -1318,4 +1353,15 @@ Partial Class frmAnzeige
    Friend WithEvents DataGridViewTextBoxColumn9 As DataGridViewTextBoxColumn
    Friend WithEvents lblBigInfo As Label
    Friend WithEvents lblBigInfo2 As Label
+    Friend WithEvents txtBreite8 As TextBox
+    Friend WithEvents txtSchrift8 As TextBox
+    Friend WithEvents Label25 As Label
+    Friend WithEvents colFertig As DataGridViewTextBoxColumn
+    Friend WithEvents colLKWNr As DataGridViewTextBoxColumn
+    Friend WithEvents colAnkunft As DataGridViewTextBoxColumn
+    Friend WithEvents Dauer As DataGridViewTextBoxColumn
+    Friend WithEvents letzterMitarbeiter As DataGridViewTextBoxColumn
+    Friend WithEvents clmnBuero As DataGridViewTextBoxColumn
+    Friend WithEvents clmnImEx As DataGridViewTextBoxColumn
+    Friend WithEvents clmnArt As DataGridViewTextBoxColumn
 End Class
--- a/AvisoTV/frmAnzeige.resx
+++ b/AvisoTV/frmAnzeige.resx
@@ -138,6 +138,9 @@
  <metadata name="clmnImEx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="clmnArt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
--- a/AvisoTV/frmAnzeige.vb
+++ b/AvisoTV/frmAnzeige.vb
@@ -41,6 +41,7 @@ Public Class frmAnzeige
    Private Font5 As New Font(FontFamily.GenericSansSerif, 30, FontStyle.Bold)
    Private Font6 As New Font(FontFamily.GenericSansSerif, 30, FontStyle.Bold)
    Private Font7 As New Font(FontFamily.GenericSansSerif, 30, FontStyle.Bold)
+    Private Font8 As New Font(FontFamily.GenericSansSerif, 30, FontStyle.Bold)


    Private Font_LkwOK_LKWNr As New Font(FontFamily.GenericSansSerif, 30, FontStyle.Bold)
@@ -220,7 +221,7 @@ Public Class frmAnzeige
        End If

        where = " WHERE "
-        Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx  FROM Aviso "
+        Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx, ZOLLDigitalEingereicht  FROM Aviso "
        where &= " Status IN( " & stat_tmp & ") "
        If CLUSTER <> "" Then
            where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') "
@@ -308,6 +309,7 @@ Public Class frmAnzeige
                            Dim Dauer As String = Minuten_auf_Text(hDauer)
                            Dim hMitarbeiter As String = VarToStr(dr.Item("LetzterMitarbeiter"))
                            Dim ImEx As String = VarToStr(dr.Item("ImEx"))
+                            Dim ZOLLDigitalEingereicht As String = If(CBool(dr.Item("ZOLLDigitalEingereicht")), "D", "")

                            If StandortATILLA Or Standort = "IMEX" Or Standort = "FRONTOFFICE" Then
                                'bei Mitarbeiter nur User aus letzter Bearbeiter rausfiltern
@@ -335,16 +337,17 @@ Public Class frmAnzeige

                            If anz <= Max_Zeilen Then

+
                                If StandortATILLA Then
                                    Dim hBuero As String = VarToStr(dr.Item("buero"))
-                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, hBuero)
+                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, hBuero, "", ZOLLDigitalEingereicht)
                                ElseIf Standort = "WAI" Then
                                    If ImEx = "IMPORT" Then ImEx = "IM"
                                    If ImEx = "EXPORT" Then ImEx = "EX"
                                    ' MsgBox(ImEx)
-                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, "", ImEx)
+                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, "", ImEx, ZOLLDigitalEingereicht)
                                Else
-                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter)
+                                    gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, "", "", ZOLLDigitalEingereicht)
                                End If

                                If ImEx <> "" Then
@@ -354,6 +357,12 @@ Public Class frmAnzeige
                                    If ImEx = "EX" Then r.Cells("clmnImEx").Style.BackColor = Color.Blue
                                End If

+                                If CBool(dr.Item("ZOLLDigitalEingereicht")) Then
+                                    Dim r As DataGridViewRow = gridAnkunft.Rows(gridAnkunft.RowCount - 1)
+                                    '   r.Cells("clmnArt").Style.BackColor = Color.DarkGreen
+                                    r.Cells("clmnArt").Style.ForeColor = Color.DarkGreen
+                                End If
+
                                If VarToStr(dr.Item("AvisoTVHinweis")) <> "" Then
                                    Dim r As DataGridViewRow = gridAnkunft.Rows(gridAnkunft.RowCount - 1)
                                    r.Cells(0).Style.ForeColor = Color.Red
@@ -687,6 +696,7 @@ Public Class frmAnzeige
        If txtSchrift5.Text <> "" Then Font5 = New Font(FontFamily.GenericSansSerif, VarToInt(txtSchrift5.Text), FontStyle.Bold)
        If txtSchrift6.Text <> "" Then Font6 = New Font(FontFamily.GenericSansSerif, VarToInt(txtSchrift6.Text), FontStyle.Bold)
        If txtSchrift7.Text <> "" Then Font7 = New Font(FontFamily.GenericSansSerif, VarToInt(txtSchrift7.Text), FontStyle.Bold)
+        If txtSchrift8.Text <> "" Then Font8 = New Font(FontFamily.GenericSansSerif, VarToInt(txtSchrift8.Text), FontStyle.Bold)

        gridAnkunft.Columns(0).DefaultCellStyle.Font = Font1
        gridAnkunft.Columns(1).DefaultCellStyle.Font = Font2
@@ -711,6 +721,14 @@ Public Class frmAnzeige
            gridAnkunft.Columns("clmnImEx").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
        End If

+        gridAnkunft.Columns("clmnArt").Width = CInt(IIf(IsNumeric(txtBreite8.Text), txtBreite8.Text, 50))
+        gridAnkunft.Columns("clmnArt").DefaultCellStyle.Font = Font8
+        gridAnkunft.Columns("clmnArt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        If CInt(IIf(IsNumeric(txtBreite8.Text), txtBreite8.Text, 0)) = 0 Then
+            gridAnkunft.Columns("clmnArt").Visible = False
+        Else
+            gridAnkunft.Columns("clmnArt").Visible = True
+        End If

        If txtBreite1.Text <> "" Then gridAnkunft.Columns(0).Width = CInt(txtBreite1.Text)
        If txtBreite2.Text <> "" Then gridAnkunft.Columns(1).Width = CInt(txtBreite2.Text)
@@ -793,6 +811,7 @@ Public Class frmAnzeige
        If txtSchrift5.Text <> "" Then setProperty("txtSchrift5", txtSchrift5.Text)
        If txtSchrift6.Text <> "" Then setProperty("txtSchrift6", txtSchrift6.Text)
        If txtSchrift7.Text <> "" Then setProperty("txtSchrift7", txtSchrift7.Text)
+        If txtSchrift8.Text <> "" Then setProperty("txtSchrift8", txtSchrift8.Text)
        If txtBreite1.Text <> "" Then setProperty("txtBreite1", txtBreite1.Text)
        If txtBreite2.Text <> "" Then setProperty("txtBreite2", txtBreite2.Text)
        If txtBreite3.Text <> "" Then setProperty("txtBreite3", txtBreite3.Text)
@@ -800,6 +819,7 @@ Public Class frmAnzeige
        If txtBreite5.Text <> "" Then setProperty("txtBreite5", txtBreite5.Text)
        If txtBreite6.Text <> "" Then setProperty("txtBreite6", txtBreite6.Text)
        If txtBreite7.Text <> "" Then setProperty("txtBreite7", txtBreite7.Text)
+        If txtBreite8.Text <> "" Then setProperty("txtBreite8", txtBreite8.Text)

        If txtSekunden.Text <> "" Then setProperty("txtSekunden", txtSekunden.Text)

@@ -848,8 +868,8 @@ Public Class frmAnzeige
    End Sub

    Private Sub txtBreite1_KeyUp(sender As Object, e As KeyEventArgs) Handles txtSchrift1_MESS.KeyUp, txtSekunden.KeyUp,
-        txtSchrift1.KeyUp, txtSchrift2.KeyUp, txtSchrift3.KeyUp, txtSchrift4.KeyUp, txtSchrift5.KeyUp, txtSchrift6.KeyUp, txtSchrift7.KeyUp,
-        txtBreite1.KeyUp, txtBreite2.KeyUp, txtBreite3.KeyUp, txtBreite4.KeyUp, txtBreite5.KeyUp, txtBreite6.KeyUp, txtBreite7.KeyUp,
+        txtSchrift1.KeyUp, txtSchrift2.KeyUp, txtSchrift3.KeyUp, txtSchrift4.KeyUp, txtSchrift5.KeyUp, txtSchrift6.KeyUp, txtSchrift7.KeyUp, txtSchrift8.KeyUp,
+        txtBreite1.KeyUp, txtBreite2.KeyUp, txtBreite3.KeyUp, txtBreite4.KeyUp, txtBreite5.KeyUp, txtBreite6.KeyUp, txtBreite7.KeyUp, txtBreite8.KeyUp,
        txtLkwOK_BildBreite.KeyUp, txtLkwOK_LKWNrSchrift.KeyUp, txtBreiteGridLKWOK.KeyUp

        If e.KeyCode = Keys.Return Then
--- a/Diverses/sgs.png
+++ b/Diverses/sgs.png