Aviso_Trips; NewLayout HF

.editorconfig

@@ -0,0 +1,7 @@
+[*.vb]
+
+# BC42104: Die Variable wurde verwendet, bevor ihr ein Wert zugewiesen wurde.
+dotnet_diagnostic.BC42104.severity = suggestion
+
+# Default severity for all analyzer diagnostics
+dotnet_analyzer_diagnostic.severity = suggestion

Aviso.sln

@@ -33,6 +33,11 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MDM_Worker_lib", "..\..\ADMIN\ADMIN\MDM_Worker\MDM_Worker_lib.vbproj", "{2E4DBC09-E57B-4AC5-8554-6117D71F993B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -476,7 +476,7 @@ Public Class frmATEZ_EZA
         'End Select 
         FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)
         txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY)
-        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY)
+        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "EZA")
 
         Label4.Text = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "-").ToString
 

Aviso/AktenErfassung/frmEintragAviso.vb

@@ -11,7 +11,7 @@ Public Class frmEintragAviso
     Dim ATILLA_NEUERAKTENDECKEL = True
     Dim Firmen As New cFirmenDAL
     Dim AvisoDAL As New cAvisoDAL
-    Dim myAviso As New cAviso
+    Public myAviso As New cAviso
     Dim AVISOFUNC As New AvisoStatusFunctions
     Dim ADMIN As New cADMIN
     Dim hÄnderung As Boolean = False
@@ -34,6 +34,7 @@ Public Class frmEintragAviso
 
     Dim INFO As String = ""
 
+    Public getFromAVISO_Trip As cAviso = Nothing
 
     Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
@@ -351,6 +352,60 @@ Public Class frmEintragAviso
             If FIRMA_TMP = "AMBAR" Then
                 cboGrenzstelle.changeItem("AMB")
             End If
+
+
+
+            If getFromAVISO_Trip IsNot Nothing Then
+                myAviso.AvisoTripId = getFromAVISO_Trip.AvisoTripId ' --> Trip gespeichert!
+
+                myAviso.Frächter = getFromAVISO_Trip.Frächter
+                myAviso.Frächter_KdNr = getFromAVISO_Trip.Frächter_KdNr
+                myAviso.Auftraggeber = getFromAVISO_Trip.Auftraggeber
+                myAviso.Auftraggeber_KdNr = getFromAVISO_Trip.Auftraggeber_KdNr
+
+                myAviso.Zugmaschine = getFromAVISO_Trip.Zugmaschine
+                myAviso.LKW_Nr = getFromAVISO_Trip.LKW_Nr
+                myAviso.LKW_Nationalitaet = getFromAVISO_Trip.LKW_Nationalitaet
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                myAviso.AvisoEingang = getFromAVISO_Trip.AvisoEingang
+                myAviso.FahrerHandy = getFromAVISO_Trip.FahrerHandy
+                myAviso.KdAuftragsNr_Avisierer = getFromAVISO_Trip.KdAuftragsNr_Avisierer
+                myAviso.Telefonisch = getFromAVISO_Trip.Telefonisch
+                myAviso.Transportmittelart = getFromAVISO_Trip.Transportmittelart
+
+                '---------ANZEIGE----------------------------------
+                If myAviso.Frächter_KdNr > 0 Then
+                    kdFrächter.KdNr = myAviso.Frächter_KdNr
+                Else
+                    kdFrächter.Text = myAviso.Frächter
+                End If
+
+                If myAviso.Auftraggeber_KdNr > 0 Then
+                    kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr
+                Else
+                    kdAvisierer.Text = myAviso.Auftraggeber
+                End If
+
+
+                txtLKW_Nr.Text = myAviso.LKW_Nr
+                sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet)
+                txtFahrerHandy.Text = If(myAviso.FahrerHandy, "")
+                txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "")
+
+
+                optAvisoEingang.Checked = True  'bei Änderung kann kein Eingang ohne Aviso erfolgen...
+
+                If myAviso.Telefonisch = "Telefon" Then
+                    optTelefonisch.Checked = True
+                ElseIf myAviso.Telefonisch = "Schriftl." Then
+                    optSchriftlich.Checked = True
+                Else
+                    optUnbekannt.Checked = True
+                End If
+                cboTransportmittelart.changeItem(myAviso.Transportmittelart)
+            End If
+
         Else
             If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
                 Me.Close()
@@ -755,6 +810,8 @@ Public Class frmEintragAviso
                 Dim ListOfLKWNr = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkLKWNr(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
 
 
+                If getFromAVISO_Trip Is Nothing Then 'wenn Trip -> Prüfung überspringen 
+
 
                     For Each LKWNr In ListOfLKWNr
                         Dim temp_avisoID As Integer = -1
@@ -809,6 +866,7 @@ Public Class frmEintragAviso
                         End If
 
                     Next
+                End If
 
             End If
 

Aviso/Aviso.vbproj

@@ -1873,6 +1873,8 @@
     <None Include="Resources\ambar_boarder_new.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Resources\AVISO_DCS.png" />
+    <None Include="Resources\aktualisieren-40.png" />
     <Content Include="Resources\FO.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.4.5")>
+<Assembly: AssemblyVersion("4.2.5.0")>
-<Assembly: AssemblyFileVersion("4.2.4.5")>
+<Assembly: AssemblyFileVersion("4.2.5.0")>

Aviso/My Project/Resources.Designer.vb

@@ -169,6 +169,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property aktualisieren_40() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("aktualisieren_40", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -378,6 +388,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property AVISO_DCS() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("AVISO_DCS", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

Aviso/My Project/Resources.resx

@@ -724,4 +724,10 @@
   <data name="ambar_boarder_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="aktualisieren_40" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\aktualisieren-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AVISO_DCS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AVISO_DCS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Aviso/frmHauptfenster.vb

@@ -1213,7 +1213,7 @@ ELSE_ATILLA:
                     End If
                 End If
             End If
-
+            Dim hSQLFirma = ""
             hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[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 " &
@@ -5260,7 +5260,7 @@ ELSE_ATILLA:
 
         Dim f As New frmSendungsdetailsNEU
 
-        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
+        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(-1, f.SENDUNG_LIST.Count + 1, , Nothing, 0, 0) 'Neue Sendung erstellen
         NEW_SND.SAVE(False) 'Insert neue Sendung
         f.SENDUNG_LIST.Add(NEW_SND)
 

Aviso/frmHauptfensterNew.Designer.vb

@@ -270,14 +270,20 @@ Partial Class frmHauptfensterNew
         Me.splitMain = New System.Windows.Forms.SplitContainer()
         Me.pnlMain = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Panel8 = New System.Windows.Forms.Panel()
         Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Button7 = New System.Windows.Forms.Button()
+        Me.Panel6 = New System.Windows.Forms.Panel()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
+        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.btnKasse_User = New System.Windows.Forms.Button()
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
+        Me.Panel9 = New System.Windows.Forms.Panel()
         Me.btnSmall = New System.Windows.Forms.Button()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
@@ -328,7 +334,12 @@ Partial Class frmHauptfensterNew
         Me.splitMain.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.FlowLayoutPanel1.SuspendLayout()
+        Me.Panel6.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.FlowLayoutPanel2.SuspendLayout()
+        Me.MyFlowLayoutPanel1.SuspendLayout()
         Me.pnlOptionen.SuspendLayout()
+        Me.Panel9.SuspendLayout()
         Me.cntxt.SuspendLayout()
         Me.Panel3.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -1669,19 +1680,21 @@ Partial Class frmHauptfensterNew
         'btnMAVerzeichnis
         '
         Me.btnMAVerzeichnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnMAVerzeichnis.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnMAVerzeichnis.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnMAVerzeichnis.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMAVerzeichnis.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnMAVerzeichnis.ForeColor = System.Drawing.Color.Black
         Me.btnMAVerzeichnis.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s
         Me.btnMAVerzeichnis.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnMAVerzeichnis.Location = New System.Drawing.Point(367, 65)
+        Me.btnMAVerzeichnis.Location = New System.Drawing.Point(3, 3)
         Me.btnMAVerzeichnis.Name = "btnMAVerzeichnis"
-        Me.btnMAVerzeichnis.Size = New System.Drawing.Size(102, 39)
+        Me.btnMAVerzeichnis.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnMAVerzeichnis.Size = New System.Drawing.Size(150, 50)
         Me.btnMAVerzeichnis.TabIndex = 13
         Me.btnMAVerzeichnis.TabStop = False
         Me.btnMAVerzeichnis.Text = "Mitarbeiter Verzeichnis"
         Me.btnMAVerzeichnis.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMAVerzeichnis.UseVisualStyleBackColor = True
+        Me.btnMAVerzeichnis.UseVisualStyleBackColor = False
         Me.btnMAVerzeichnis.Visible = False
         '
         'btnMitarbeiterKonto
@@ -1705,19 +1718,21 @@ Partial Class frmHauptfensterNew
         'btnKontakt
         '
         Me.btnKontakt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnKontakt.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnKontakt.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnKontakt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnKontakt.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnKontakt.ForeColor = System.Drawing.Color.Black
         Me.btnKontakt.Image = Global.AVISO.My.Resources.Resources.Telefonliste_small
         Me.btnKontakt.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKontakt.Location = New System.Drawing.Point(581, 65)
+        Me.btnKontakt.Location = New System.Drawing.Point(471, 3)
         Me.btnKontakt.Name = "btnKontakt"
-        Me.btnKontakt.Size = New System.Drawing.Size(119, 39)
+        Me.btnKontakt.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnKontakt.Size = New System.Drawing.Size(150, 50)
         Me.btnKontakt.TabIndex = 12
         Me.btnKontakt.TabStop = False
         Me.btnKontakt.Text = "Kontakte/Tel"
         Me.btnKontakt.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnKontakt.UseVisualStyleBackColor = True
+        Me.btnKontakt.UseVisualStyleBackColor = False
         '
         'Button2
         '
@@ -1738,19 +1753,21 @@ Partial Class frmHauptfensterNew
         '
         'Button5
         '
+        Me.Button5.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.Button5.Cursor = System.Windows.Forms.Cursors.Default
-        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button5.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.Button5.ForeColor = System.Drawing.Color.Black
         Me.Button5.Image = Global.AVISO.My.Resources.Resources.parkplatz
         Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button5.Location = New System.Drawing.Point(820, 65)
+        Me.Button5.Location = New System.Drawing.Point(315, 3)
         Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(116, 39)
+        Me.Button5.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.Button5.Size = New System.Drawing.Size(150, 50)
         Me.Button5.TabIndex = 8
         Me.Button5.TabStop = False
         Me.Button5.Text = "Parkticket"
         Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button5.UseVisualStyleBackColor = True
+        Me.Button5.UseVisualStyleBackColor = False
         Me.Button5.Visible = False
         '
         'lblGrenzstelle
@@ -1780,88 +1797,95 @@ Partial Class frmHauptfensterNew
         '
         'btnFakturierung
         '
+        Me.btnFakturierung.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnFakturierung.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnFakturierung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnFakturierung.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnFakturierung.ForeColor = System.Drawing.Color.Black
         Me.btnFakturierung.Image = CType(resources.GetObject("btnFakturierung.Image"), System.Drawing.Image)
         Me.btnFakturierung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFakturierung.Location = New System.Drawing.Point(820, 16)
+        Me.btnFakturierung.Location = New System.Drawing.Point(159, 3)
         Me.btnFakturierung.Name = "btnFakturierung"
-        Me.btnFakturierung.Size = New System.Drawing.Size(116, 39)
+        Me.btnFakturierung.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnFakturierung.Size = New System.Drawing.Size(150, 50)
         Me.btnFakturierung.TabIndex = 11
         Me.btnFakturierung.TabStop = False
         Me.btnFakturierung.Text = "Fakturierung"
         Me.btnFakturierung.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnFakturierung.UseVisualStyleBackColor = True
+        Me.btnFakturierung.UseVisualStyleBackColor = False
         Me.btnFakturierung.Visible = False
         '
         'btnDienstplan
         '
         Me.btnDienstplan.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDienstplan.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnDienstplan.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnDienstplan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDienstplan.Font = New System.Drawing.Font("Segoe UI", 10.0!)
-        Me.btnDienstplan.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnDienstplan.ForeColor = System.Drawing.Color.Black
         Me.btnDienstplan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnDienstplan.Location = New System.Drawing.Point(475, 65)
+        Me.btnDienstplan.Location = New System.Drawing.Point(159, 3)
-        Me.btnDienstplan.Margin = New System.Windows.Forms.Padding(0)
         Me.btnDienstplan.Name = "btnDienstplan"
-        Me.btnDienstplan.Size = New System.Drawing.Size(103, 39)
+        Me.btnDienstplan.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnDienstplan.Size = New System.Drawing.Size(150, 50)
         Me.btnDienstplan.TabIndex = 10
         Me.btnDienstplan.Text = "Dienstplan"
         Me.btnDienstplan.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnDienstplan.UseVisualStyleBackColor = True
+        Me.btnDienstplan.UseVisualStyleBackColor = False
         '
         'btnRg
         '
+        Me.btnRg.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnRg.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnRg.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRg.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnRg.ForeColor = System.Drawing.Color.Black
         Me.btnRg.Image = CType(resources.GetObject("btnRg.Image"), System.Drawing.Image)
         Me.btnRg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRg.Location = New System.Drawing.Point(713, 16)
+        Me.btnRg.Location = New System.Drawing.Point(315, 3)
         Me.btnRg.Name = "btnRg"
-        Me.btnRg.Size = New System.Drawing.Size(101, 39)
+        Me.btnRg.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnRg.Size = New System.Drawing.Size(150, 50)
         Me.btnRg.TabIndex = 9
         Me.btnRg.TabStop = False
         Me.btnRg.Text = "Rechnungs-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "daten"
         Me.btnRg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRg.UseVisualStyleBackColor = True
+        Me.btnRg.UseVisualStyleBackColor = False
         Me.btnRg.Visible = False
         '
         'btnKassenbuch
         '
+        Me.btnKassenbuch.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnKassenbuch.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnKassenbuch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnKassenbuch.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnKassenbuch.ForeColor = System.Drawing.Color.Black
         Me.btnKassenbuch.Image = Global.AVISO.My.Resources.Resources.kasse_sw_small
         Me.btnKassenbuch.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKassenbuch.Location = New System.Drawing.Point(595, 16)
+        Me.btnKassenbuch.Location = New System.Drawing.Point(471, 3)
         Me.btnKassenbuch.Name = "btnKassenbuch"
-        Me.btnKassenbuch.Size = New System.Drawing.Size(112, 39)
+        Me.btnKassenbuch.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnKassenbuch.Size = New System.Drawing.Size(150, 50)
         Me.btnKassenbuch.TabIndex = 8
         Me.btnKassenbuch.TabStop = False
         Me.btnKassenbuch.Text = "Kassenbuch"
         Me.btnKassenbuch.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnKassenbuch.UseVisualStyleBackColor = True
+        Me.btnKassenbuch.UseVisualStyleBackColor = False
         Me.btnKassenbuch.Visible = False
         '
         'btnRefresh
         '
+        Me.btnRefresh.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnRefresh.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRefresh.FlatAppearance.BorderSize = 3
-        Me.btnRefresh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnRefresh.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnRefresh.ForeColor = System.Drawing.Color.Black
-        Me.btnRefresh.Image = Global.AVISO.My.Resources.Resources.refresh
+        Me.btnRefresh.Image = Global.AVISO.My.Resources.Resources.aktualisieren_40
-        Me.btnRefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRefresh.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnRefresh.Location = New System.Drawing.Point(774, 120)
+        Me.btnRefresh.Location = New System.Drawing.Point(11, 8)
         Me.btnRefresh.Margin = New System.Windows.Forms.Padding(0)
         Me.btnRefresh.Name = "btnRefresh"
-        Me.btnRefresh.Size = New System.Drawing.Size(135, 39)
+        Me.btnRefresh.Size = New System.Drawing.Size(135, 72)
         Me.btnRefresh.TabIndex = 1
         Me.btnRefresh.Text = "Aktualisieren"
-        Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.btnRefresh.UseVisualStyleBackColor = True
+        Me.btnRefresh.UseVisualStyleBackColor = False
         '
         'Button3
         '
@@ -1875,35 +1899,39 @@ Partial Class frmHauptfensterNew
         '
         'btnKunden
         '
+        Me.btnKunden.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnKunden.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnKunden.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnKunden.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnKunden.ForeColor = System.Drawing.Color.Black
         Me.btnKunden.Image = CType(resources.GetObject("btnKunden.Image"), System.Drawing.Image)
         Me.btnKunden.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnKunden.Location = New System.Drawing.Point(367, 16)
+        Me.btnKunden.Location = New System.Drawing.Point(3, 3)
         Me.btnKunden.Name = "btnKunden"
-        Me.btnKunden.Size = New System.Drawing.Size(102, 39)
+        Me.btnKunden.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnKunden.Size = New System.Drawing.Size(150, 50)
         Me.btnKunden.TabIndex = 2
         Me.btnKunden.TabStop = False
         Me.btnKunden.Text = "Kunden"
         Me.btnKunden.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnKunden.UseVisualStyleBackColor = True
+        Me.btnKunden.UseVisualStyleBackColor = False
         '
         'btnSpedBuch
         '
+        Me.btnSpedBuch.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
         Me.btnSpedBuch.Cursor = System.Windows.Forms.Cursors.Default
-        Me.btnSpedBuch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSpedBuch.Font = New System.Drawing.Font("Segoe UI", 10.0!)
         Me.btnSpedBuch.ForeColor = System.Drawing.Color.Black
         Me.btnSpedBuch.Image = Global.AVISO.My.Resources.Resources.spedbuch1
         Me.btnSpedBuch.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnSpedBuch.Location = New System.Drawing.Point(475, 16)
+        Me.btnSpedBuch.Location = New System.Drawing.Point(3, 59)
         Me.btnSpedBuch.Name = "btnSpedBuch"
-        Me.btnSpedBuch.Size = New System.Drawing.Size(114, 39)
+        Me.btnSpedBuch.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
+        Me.btnSpedBuch.Size = New System.Drawing.Size(150, 50)
         Me.btnSpedBuch.TabIndex = 3
         Me.btnSpedBuch.TabStop = False
         Me.btnSpedBuch.Text = "Sped.Buch"
         Me.btnSpedBuch.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSpedBuch.UseVisualStyleBackColor = True
+        Me.btnSpedBuch.UseVisualStyleBackColor = False
         '
         'lblDauer
         '
@@ -1951,32 +1979,34 @@ Partial Class frmHauptfensterNew
         '
         'btnUmrechnungskurse
         '
-        Me.btnUmrechnungskurse.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnUmrechnungskurse.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.btnUmrechnungskurse.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnUmrechnungskurse.ForeColor = System.Drawing.Color.Black
         Me.btnUmrechnungskurse.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnUmrechnungskurse.Location = New System.Drawing.Point(5, 19)
         Me.btnUmrechnungskurse.Name = "btnUmrechnungskurse"
-        Me.btnUmrechnungskurse.Size = New System.Drawing.Size(121, 30)
+        Me.btnUmrechnungskurse.Size = New System.Drawing.Size(121, 40)
         Me.btnUmrechnungskurse.TabIndex = 2
         Me.btnUmrechnungskurse.TabStop = False
         Me.btnUmrechnungskurse.Text = "Umrechnungskurse"
         Me.btnUmrechnungskurse.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnUmrechnungskurse.UseVisualStyleBackColor = True
+        Me.btnUmrechnungskurse.UseVisualStyleBackColor = False
         '
         'btnZollwebseiten
         '
-        Me.btnZollwebseiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnZollwebseiten.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.btnZollwebseiten.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnZollwebseiten.ForeColor = System.Drawing.Color.Black
         Me.btnZollwebseiten.Image = CType(resources.GetObject("btnZollwebseiten.Image"), System.Drawing.Image)
         Me.btnZollwebseiten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnZollwebseiten.Location = New System.Drawing.Point(5, 50)
+        Me.btnZollwebseiten.Location = New System.Drawing.Point(5, 62)
         Me.btnZollwebseiten.Name = "btnZollwebseiten"
-        Me.btnZollwebseiten.Size = New System.Drawing.Size(121, 30)
+        Me.btnZollwebseiten.Size = New System.Drawing.Size(121, 40)
         Me.btnZollwebseiten.TabIndex = 0
         Me.btnZollwebseiten.TabStop = False
         Me.btnZollwebseiten.Text = "Zoll-Webseiten"
         Me.btnZollwebseiten.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnZollwebseiten.UseVisualStyleBackColor = True
+        Me.btnZollwebseiten.UseVisualStyleBackColor = False
         '
         'Timer1
         '
@@ -2006,34 +2036,36 @@ Partial Class frmHauptfensterNew
         Me.Panel2.Controls.Add(Me.lblErrVermerk)
         Me.Panel2.Controls.Add(Me.btnUmrechnungskurse)
         Me.Panel2.Controls.Add(Me.btnZollwebseiten)
-        Me.Panel2.Location = New System.Drawing.Point(2, 3)
+        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Left
+        Me.Panel2.Location = New System.Drawing.Point(0, 5)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(243, 129)
+        Me.Panel2.Size = New System.Drawing.Size(181, 152)
         Me.Panel2.TabIndex = 10
         '
         'btnZertifikate
         '
-        Me.btnZertifikate.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnZertifikate.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.btnZertifikate.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnZertifikate.ForeColor = System.Drawing.Color.Black
         Me.btnZertifikate.Image = CType(resources.GetObject("btnZertifikate.Image"), System.Drawing.Image)
         Me.btnZertifikate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnZertifikate.Location = New System.Drawing.Point(5, 81)
+        Me.btnZertifikate.Location = New System.Drawing.Point(5, 107)
         Me.btnZertifikate.Name = "btnZertifikate"
-        Me.btnZertifikate.Size = New System.Drawing.Size(121, 30)
+        Me.btnZertifikate.Size = New System.Drawing.Size(121, 40)
         Me.btnZertifikate.TabIndex = 5
         Me.btnZertifikate.TabStop = False
         Me.btnZertifikate.Text = "Zertifikate"
         Me.btnZertifikate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnZertifikate.UseVisualStyleBackColor = True
+        Me.btnZertifikate.UseVisualStyleBackColor = False
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label7.ForeColor = System.Drawing.Color.Black
         Me.Label7.Location = New System.Drawing.Point(2, 5)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(41, 13)
+        Me.Label7.Size = New System.Drawing.Size(37, 13)
         Me.Label7.TabIndex = 3
         Me.Label7.Text = "Links:"
         '
@@ -2043,9 +2075,9 @@ Partial Class frmHauptfensterNew
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblErrVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
         Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red
-        Me.lblErrVermerk.Location = New System.Drawing.Point(12, 176)
+        Me.lblErrVermerk.Location = New System.Drawing.Point(12, 134)
         Me.lblErrVermerk.Name = "lblErrVermerk"
-        Me.lblErrVermerk.Size = New System.Drawing.Size(216, 27)
+        Me.lblErrVermerk.Size = New System.Drawing.Size(154, 27)
         Me.lblErrVermerk.TabIndex = 1
         Me.lblErrVermerk.Text = "Bei diesem Status kann kein Vermerk erfasst werden!"
         Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2125,7 +2157,7 @@ Partial Class frmHauptfensterNew
         Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnlAktOption.Location = New System.Drawing.Point(0, 0)
         Me.pnlAktOption.Name = "pnlAktOption"
-        Me.pnlAktOption.Size = New System.Drawing.Size(977, 5)
+        Me.pnlAktOption.Size = New System.Drawing.Size(821, 5)
         Me.pnlAktOption.TabIndex = 1
         '
         'Button8
@@ -2216,19 +2248,12 @@ Partial Class frmHauptfensterNew
         'splitMain.Panel2
         '
         Me.splitMain.Panel2.BackColor = System.Drawing.Color.White
+        Me.splitMain.Panel2.Controls.Add(Me.FlowLayoutPanel2)
+        Me.splitMain.Panel2.Controls.Add(Me.MyFlowLayoutPanel1)
         Me.splitMain.Panel2.Controls.Add(Me.Panel2)
         Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption)
         Me.splitMain.Panel2.Controls.Add(Me.pnlOptionen)
-        Me.splitMain.Panel2.Controls.Add(Me.btnKunden)
+        Me.splitMain.Panel2.Controls.Add(Me.Panel9)
-        Me.splitMain.Panel2.Controls.Add(Me.btnSpedBuch)
-        Me.splitMain.Panel2.Controls.Add(Me.btnMAVerzeichnis)
-        Me.splitMain.Panel2.Controls.Add(Me.btnKassenbuch)
-        Me.splitMain.Panel2.Controls.Add(Me.btnRg)
-        Me.splitMain.Panel2.Controls.Add(Me.btnKontakt)
-        Me.splitMain.Panel2.Controls.Add(Me.btnRefresh)
-        Me.splitMain.Panel2.Controls.Add(Me.btnFakturierung)
-        Me.splitMain.Panel2.Controls.Add(Me.Button5)
-        Me.splitMain.Panel2.Controls.Add(Me.btnDienstplan)
         Me.splitMain.Size = New System.Drawing.Size(977, 737)
         Me.splitMain.SplitterDistance = 576
         Me.splitMain.TabIndex = 0
@@ -2236,39 +2261,52 @@ Partial Class frmHauptfensterNew
         'pnlMain
         '
         Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlMain.Location = New System.Drawing.Point(0, 54)
+        Me.pnlMain.Location = New System.Drawing.Point(0, 66)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(977, 522)
+        Me.pnlMain.Size = New System.Drawing.Size(977, 510)
         Me.pnlMain.TabIndex = 8
         '
         '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.Panel8)
         Me.Panel1.Controls.Add(Me.FlowLayoutPanel1)
+        Me.Panel1.Controls.Add(Me.Panel6)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(977, 54)
+        Me.Panel1.Size = New System.Drawing.Size(977, 66)
         Me.Panel1.TabIndex = 2
         '
+        'Panel8
+        '
+        Me.Panel8.BackColor = System.Drawing.Color.White
+        Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.Panel8.Location = New System.Drawing.Point(0, 56)
+        Me.Panel8.Name = "Panel8"
+        Me.Panel8.Size = New System.Drawing.Size(749, 10)
+        Me.Panel8.TabIndex = 10
+        '
         'FlowLayoutPanel1
         '
-        Me.FlowLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(44, Byte), Integer), CType(CType(108, Byte), Integer))
+        Me.FlowLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(100, Byte), Integer))
         Me.FlowLayoutPanel1.Controls.Add(Me.btnWichtigeStandort)
         Me.FlowLayoutPanel1.Controls.Add(Me.Button4)
         Me.FlowLayoutPanel1.Controls.Add(Me.Button7)
         Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+        Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(3, 3, 3, 0)
         Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
-        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(977, 55)
+        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(749, 65)
         Me.FlowLayoutPanel1.TabIndex = 6
         '
         'btnWichtigeStandort
         '
-        Me.btnWichtigeStandort.BackColor = System.Drawing.Color.White
+        Me.btnWichtigeStandort.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.btnWichtigeStandort.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnWichtigeStandort.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnWichtigeStandort.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(44, Byte), Integer), CType(CType(108, Byte), Integer))
-        Me.btnWichtigeStandort.Location = New System.Drawing.Point(3, 3)
+        Me.btnWichtigeStandort.Location = New System.Drawing.Point(3, 9)
+        Me.btnWichtigeStandort.Margin = New System.Windows.Forms.Padding(3, 9, 3, 0)
         Me.btnWichtigeStandort.Name = "btnWichtigeStandort"
         Me.btnWichtigeStandort.Size = New System.Drawing.Size(158, 47)
         Me.btnWichtigeStandort.TabIndex = 4
@@ -2280,9 +2318,13 @@ Partial Class frmHauptfensterNew
         '
         'Button4
         '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(80, Byte), Integer), CType(CType(150, Byte), Integer))
+        Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.Button4.FlatAppearance.BorderSize = 0
+        Me.Button4.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Button4.ForeColor = System.Drawing.Color.White
-        Me.Button4.Location = New System.Drawing.Point(167, 3)
+        Me.Button4.Location = New System.Drawing.Point(167, 9)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(3, 9, 3, 0)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(158, 47)
         Me.Button4.TabIndex = 5
@@ -2290,13 +2332,17 @@ Partial Class frmHauptfensterNew
         Me.Button4.Text = "SENDUNGEN"
         Me.ToolTip1.SetToolTip(Me.Button4, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" &
         "d sortiert nach Dauer")
-        Me.Button4.UseVisualStyleBackColor = True
+        Me.Button4.UseVisualStyleBackColor = False
         '
         'Button7
         '
-        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button7.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(80, Byte), Integer), CType(CType(150, Byte), Integer))
+        Me.Button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.Button7.FlatAppearance.BorderSize = 0
+        Me.Button7.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Button7.ForeColor = System.Drawing.Color.White
-        Me.Button7.Location = New System.Drawing.Point(331, 3)
+        Me.Button7.Location = New System.Drawing.Point(331, 9)
+        Me.Button7.Margin = New System.Windows.Forms.Padding(3, 9, 3, 0)
         Me.Button7.Name = "Button7"
         Me.Button7.Size = New System.Drawing.Size(158, 47)
         Me.Button7.TabIndex = 6
@@ -2304,7 +2350,56 @@ Partial Class frmHauptfensterNew
         Me.Button7.Text = "BACKOFFICE"
         Me.ToolTip1.SetToolTip(Me.Button7, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" &
         "d sortiert nach Dauer")
-        Me.Button7.UseVisualStyleBackColor = True
+        Me.Button7.UseVisualStyleBackColor = False
+        '
+        'Panel6
+        '
+        Me.Panel6.Controls.Add(Me.PictureBox1)
+        Me.Panel6.Dock = System.Windows.Forms.DockStyle.Right
+        Me.Panel6.Location = New System.Drawing.Point(749, 0)
+        Me.Panel6.Name = "Panel6"
+        Me.Panel6.Size = New System.Drawing.Size(228, 66)
+        Me.Panel6.TabIndex = 9
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackColor = System.Drawing.Color.White
+        Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.AVISO_DCS
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 0)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(228, 66)
+        Me.PictureBox1.TabIndex = 7
+        Me.PictureBox1.TabStop = False
+        '
+        'FlowLayoutPanel2
+        '
+        Me.FlowLayoutPanel2.AutoScroll = True
+        Me.FlowLayoutPanel2.Controls.Add(Me.btnMAVerzeichnis)
+        Me.FlowLayoutPanel2.Controls.Add(Me.btnDienstplan)
+        Me.FlowLayoutPanel2.Controls.Add(Me.Button5)
+        Me.FlowLayoutPanel2.Controls.Add(Me.btnKontakt)
+        Me.FlowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top
+        Me.FlowLayoutPanel2.Location = New System.Drawing.Point(181, 70)
+        Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+        Me.FlowLayoutPanel2.Size = New System.Drawing.Size(640, 65)
+        Me.FlowLayoutPanel2.TabIndex = 86
+        '
+        'MyFlowLayoutPanel1
+        '
+        Me.MyFlowLayoutPanel1.AutoScroll = True
+        Me.MyFlowLayoutPanel1.Controls.Add(Me.btnKunden)
+        Me.MyFlowLayoutPanel1.Controls.Add(Me.btnFakturierung)
+        Me.MyFlowLayoutPanel1.Controls.Add(Me.btnRg)
+        Me.MyFlowLayoutPanel1.Controls.Add(Me.btnKassenbuch)
+        Me.MyFlowLayoutPanel1.Controls.Add(Me.btnSpedBuch)
+        Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MyFlowLayoutPanel1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(181, 5)
+        Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
+        Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(640, 65)
+        Me.MyFlowLayoutPanel1.TabIndex = 85
         '
         'pnlOptionen
         '
@@ -2313,7 +2408,7 @@ Partial Class frmHauptfensterNew
         Me.pnlOptionen.Controls.Add(Me.btnKasse_User)
         Me.pnlOptionen.Controls.Add(Me.btnKasse_LG)
         Me.pnlOptionen.Controls.Add(Me.btnTV)
-        Me.pnlOptionen.Location = New System.Drawing.Point(595, 56)
+        Me.pnlOptionen.Location = New System.Drawing.Point(187, 142)
         Me.pnlOptionen.Name = "pnlOptionen"
         Me.pnlOptionen.Size = New System.Drawing.Size(116, 66)
         Me.pnlOptionen.TabIndex = 84
@@ -2363,6 +2458,15 @@ Partial Class frmHauptfensterNew
         Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnTV.UseVisualStyleBackColor = False
         '
+        'Panel9
+        '
+        Me.Panel9.Controls.Add(Me.btnRefresh)
+        Me.Panel9.Dock = System.Windows.Forms.DockStyle.Right
+        Me.Panel9.Location = New System.Drawing.Point(821, 0)
+        Me.Panel9.Name = "Panel9"
+        Me.Panel9.Size = New System.Drawing.Size(156, 157)
+        Me.Panel9.TabIndex = 88
+        '
         'btnSmall
         '
         Me.btnSmall.BackColor = System.Drawing.Color.White
@@ -2657,7 +2761,12 @@ Partial Class frmHauptfensterNew
         Me.splitMain.ResumeLayout(False)
         Me.Panel1.ResumeLayout(False)
         Me.FlowLayoutPanel1.ResumeLayout(False)
+        Me.Panel6.ResumeLayout(False)
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.FlowLayoutPanel2.ResumeLayout(False)
+        Me.MyFlowLayoutPanel1.ResumeLayout(False)
         Me.pnlOptionen.ResumeLayout(False)
+        Me.Panel9.ResumeLayout(False)
         Me.cntxt.ResumeLayout(False)
         Me.Panel3.ResumeLayout(False)
         Me.Panel3.PerformLayout()
@@ -2953,7 +3062,13 @@ Partial Class frmHauptfensterNew
     Friend WithEvents Panel1 As Panel
     Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents btnWichtigeStandort As Button
+    Friend WithEvents pnlMain As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents Panel6 As Panel
+    Friend WithEvents Panel8 As Panel
+    Friend WithEvents MyFlowLayoutPanel1 As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
+    Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
+    Friend WithEvents Panel9 As Panel
     Friend WithEvents Button4 As Button
     Friend WithEvents Button7 As Button
-    Friend WithEvents pnlMain As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
 End Class

Aviso/frmHauptfensterNew.resx

@@ -246,6 +246,9 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>560, 17</value>
+  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>659, 17</value>
   </metadata>

Aviso/frmHauptfensterNew.vb

@@ -20,8 +20,6 @@ Public Class frmHauptfensterNew
 
 
 
-    Public AVISO_TYP = "LKW"
-    Public aktiv = False
     Private AvisoDAL As New cAvisoDAL
     Private VermerkeDAL As New cVermerkeDAL
     Private Standorte As New cStandorteDAL
@@ -49,11 +47,13 @@ Public Class frmHauptfensterNew
     Public gridFont As New Font(Me.Font.FontFamily, 8)
     Dim cFormularManager As New VERAG_PROG_ALLGEMEIN.cFormularManager
     ' Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER
-    Dim sd = 0
+
-    Dim closeOK = False
-    Dim Fullscreen = False
-    Dim rowHeight = 20
     Dim chkFarben = True
+    Dim closeOK = False
+
+    Dim sd = 0
+
+    Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr
 
     Private VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -115,6 +115,7 @@ Public Class frmHauptfensterNew
                 pnlMain.Controls.Add(SEARCH_AVISO)
 
                 'SEARCH_AVISO.Dock = DockStyle.Fill
+                SEARCH_AVISO.PARENT_FRMHAUPTFENSTER = Me
                 SEARCH_AVISO.Visible = True
                 SEARCH_AVISO.BringToFront()
                 SEARCH_AVISO.Width = pnlMain.Width
@@ -125,17 +126,20 @@ Public Class frmHauptfensterNew
                 Application.DoEvents()
 
 
-                MsgBox(pnlMain.Width & " / " & pnlMain.Height)
-                MsgBox(SEARCH_AVISO.Width & " / " & SEARCH_AVISO.Height)
-        End Select
 
+                'MsgBox(pnlMain.Width & " / " & pnlMain.Height)
+                'MsgBox(SEARCH_AVISO.Width & " / " & SEARCH_AVISO.Height)
+        End Select
+        initsearch(SEARCH_AVISO_AKTIV, False) ': Aviso_anzeigen("")
     End Sub
 
     Sub initsearch(hSort As String, Optional showDetails As Boolean = True)
+        If SEARCH_AVISO IsNot Nothing Then
 
             Select Case SEARCH_AVISO_AKTIV
                 Case "AVISO" : SEARCH_AVISO.Aviso_anzeigen(hSort, showDetails) ': Aviso_anzeigen("") 
             End Select
+        End If
     End Sub
 
     Private Sub frmMain_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown
@@ -1442,34 +1446,37 @@ ELSE_ATILLA:
     End Sub
 
     Private Sub btnRefresh_Click(sender As System.Object, e As System.EventArgs) Handles btnRefresh.Click
+        If SEARCH_AVISO IsNot nohing Then
+
+
             SEARCH_AVISO.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, True)
             UsrCntlBenachrichtigungen2.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
-
+        End If
     End Sub
 
 
-    Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
+    'Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
-        Try
+    '    Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cF = Color.Black Then cF = Color.Gray
+    '        If cF = Color.Black Then cF = Color.Gray
-            DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
+    '        DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception
+    '    Catch ex As Exception
 
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
-    Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
+    'Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
-        Try
+    '    Try
-            Dim cF As Color = DirectCast(sender, Button).ForeColor
+    '        Dim cF As Color = DirectCast(sender, Button).ForeColor
-            Dim cB As Color = DirectCast(sender, Button).BackColor
+    '        Dim cB As Color = DirectCast(sender, Button).BackColor
-            If cB = Color.Gray Then cB = Color.Black
+    '        If cB = Color.Gray Then cB = Color.Black
-            DirectCast(sender, Button).ForeColor = cB
+    '        DirectCast(sender, Button).ForeColor = cB
-            DirectCast(sender, Button).BackColor = cF
+    '        DirectCast(sender, Button).BackColor = cF
-        Catch ex As Exception
+    '    Catch ex As Exception
 
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
 
 
 
@@ -1817,8 +1824,9 @@ ELSE_ATILLA:
     WithEvents timerStart As New Timer
 
     Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
+        If SEARCH_AVISO IsNot Nothing Then
             Details_anzeigen(SEARCH_AVISO.setAkive_AuswahlID())
-
+        End If
         Try
             VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath()
         Catch ex As Exception
@@ -2389,6 +2397,8 @@ ELSE_ATILLA:
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX"
                 pnlOptionen.Visible = Not pnlOptionen.Visible
+
+                pnlOptionen.Location = Cursor.Position
             Case Else
                 Dim s As New SDL.frmSecureLoginKassenbuch
                 s.openKB = True
@@ -3791,7 +3801,7 @@ ELSE_ATILLA:
 
         Dim f As New frmSendungsdetailsNEU
 
-        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
+        Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(-1, f.SENDUNG_LIST.Count + 1,  , Nothing, 0, 0) 'Neue Sendung erstellen
         NEW_SND.SAVE(False) 'Insert neue Sendung
         f.SENDUNG_LIST.Add(NEW_SND)
 
@@ -3828,4 +3838,24 @@ ELSE_ATILLA:
         ' SEARCH_AVISO.RESET()
         Grid_aktiv = True
     End Sub
+
+    Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click
+
+
+        Me.Cursor = Cursors.WaitCursor
+        'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing
+        If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then
+            Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront()
+            Me.Cursor = Cursors.Default : Exit Sub
+        End If
+        '  Next
+        Try
+            Dim zoll As New SDL.frmKundenUebersichtZOLL
+            zoll.Show()
+            Me.Cursor = Cursors.Default
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
 End Class

Aviso/frmSendungsdetailsNEU.vb

@@ -2641,36 +2641,36 @@ Public Class frmSendungsdetailsNEU
     End Function
 
 
-    Sub initOfferteDGV()
+    'Sub initOfferteDGV()
-        Try
+    '    Try
-            SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
+    '        SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()
-            Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
+    '        Dim MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview ' nur für Fehlerveremindung -> kein Control in Form
-            With MyDatagridview1
+    '        With MyDatagridview1
-                .Columns.Clear()
+    '            .Columns.Clear()
-                Dim tmpKdnr = -1
+    '            Dim tmpKdnr = -1
-                For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
+    '            For Each a In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG
-                    If a.sndabr_abrArt = "ABFKOST" Then
+    '                If a.sndabr_abrArt = "ABFKOST" Then
-                        Select Case a.sndabr_beteiligter
+    '                    Select Case a.sndabr_beteiligter
-                            Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
+    '                        Case "EMPF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr
-                            Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
+    '                        Case "AVISIERER" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr'If(IsNumeric(AVISO.Auftraggeber_KdNr), IsNumeric(AVISO.Auftraggeber_KdNr), -1)
-                            Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
+    '                        Case "ABS" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr
-                            Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
+    '                        Case "AUFTR" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr
-                            Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
+    '                        Case "FRACHTF" : tmpKdnr = SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr 'If(IsNumeric(AVISO.Frächter_KdNr), IsNumeric(AVISO.Frächter_KdNr), -1)
-                        End Select
+    '                    End Select
-                    End If
+    '                End If
-                Next
+    '            Next
-                If cboAbfertigungsart._value <> "" Then
+    '            If cboAbfertigungsart._value <> "" Then
-                    If tmpKdnr > 0 Then
+    '                If tmpKdnr > 0 Then
-                        .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
+    '                    .DataSource = SQL.loadDgvBySql("select LeistungsNr,LeistungsBez,Preis FROM [Offertenpositionen] where KundenNr=" & tmpKdnr & " AND OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & cboAbfertigungsart._value & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL")
-                    End If
+    '                End If
-                End If
+    '            End If
-            End With
+    '        End With
 
-        Catch ex As Exception
+    '    Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+    '        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
+    '    End Try
 
-    End Sub
+    'End Sub
 
 
     Sub initDGVBelege()

Aviso/usrCntlHauptfenster_Suche_AVISO.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
@@ -126,7 +126,7 @@
         zULyAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="btnNeu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Button7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO

Aviso/usrCntlHauptfenster_Suche_AVISO.vb

@@ -7,13 +7,28 @@ Imports VERAG_PROG_ALLGEMEIN.cGlobal
 Public Class usrCntlHauptfenster_Suche_AVISO
 
 
+    Public AVISO_TYP = "LKW"
+    Public aktiv = False
     Dim cProgramFunctions As New cProgramFunctions
-    Dim PARENT_FRMHAUPTFENSTER As frmHauptfensterNew
+    Public PARENT_FRMHAUPTFENSTER As frmHauptfensterNew
-
+    Dim Grid_aktiv As Boolean = False
     Private AvisoDAL As New cAvisoDAL
     Private FUNC As New AvisoStatusFunctions
     Dim OptionenDAL As New VERAG_PROG_ALLGEMEIN.cOptionenDAL
 
+    Dim sd = 0
+    Dim closeOK = False
+    Dim Fullscreen = False
+    Dim rowHeight = 20
+    Dim chkFarben = True
+
+    Dim lkwbackcolor As Color = Color.FromArgb(220, 220, 220)
+    Dim lkwbackcolorSel As Color = Color.FromArgb(200, 200, 200)
+
+    Public gridFont As New Font(Me.Font.FontFamily, 8)
+
+    Private VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
+
 
     Public Sub RESET()
         cboGrenzstelle.SelectedIndex = 0
@@ -27,8 +42,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         Aviso_anzeigen("")
     End Sub
 
-    Private Sub usrCntlHauptfenster_Suche_AVISO_Load(sender As Object, e As EventArgs) Handles Me.Load
 
+    Private Sub usrCntlHauptfenster_Suche_AVISO_Load(sender As Object, e As EventArgs) Handles Me.Load
+        pnlSearch.Height = 145
         PARENT_FRMHAUPTFENSTER = PARENT_FRMHAUPTFENSTER
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -159,6 +175,8 @@ Public Class usrCntlHauptfenster_Suche_AVISO
             initEAviso()
         End If
 
+        SucheStandort = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim
+        If SucheStandort <> "" Then btnWichtigeStandort.Text = "Wichtig " & SucheStandort.Trim.ToUpper
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "ATILLA" ' Case "VERAG", "IMEX"
@@ -173,8 +191,8 @@ Public Class usrCntlHauptfenster_Suche_AVISO
 
                 Select Case zeilen
                     Case 0 : lblAkte.Visible = False
-                    Case 1 : lblAkte.Text = zeilen & " Akt vom Arbeitsplatz übernommen"
+                    Case 1 : lblAkte.Text = zeilen & " Akt vom " & vbNewLine & "Arbeitsplatz übernommen" : lblAkte.BringToFront()
-                    Case Else : lblAkte.Text = zeilen & " Akte vom Arbeitsplatz übernommen"
+                    Case Else : lblAkte.Text = zeilen & " Akte vom " & vbNewLine & "Arbeitsplatz übernommen" : lblAkte.BringToFront()
                 End Select
 
                 If Not (VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "SUB") Then
@@ -203,6 +221,10 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         tbcntrAvisoLKW.SelectedTab = tabAnkunft
 
         TimerAkte.Enabled = True
+
+        pnlSearch.Visible = False
+        'initPnlSearch()
+        '  Grid_aktiv = True
     End Sub
 
 
@@ -365,7 +387,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
             '-------------------------------------------------------------
 
 
-
+            Dim sqlStr = ""
 
             Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
@@ -727,13 +749,14 @@ Public Class usrCntlHauptfenster_Suche_AVISO
     Public Sub Aviso_anzeigen(hSort As String, Optional showDetails As Boolean = True)
         'Paint wieder reaktivieren
         locZeilen = -1
+
+
         If Not Grid_aktiv Then Exit Sub
         ' Grid_aktiv = False
         Dim hStart As Integer = My.Computer.Clock.TickCount
         Details_aktiv = False
         gridAviso.GetOrder()
 
-
         Dim datumseinschr = ""
         Dim top = "TOP 1000 "
 
@@ -892,7 +915,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
                     End If
                 End If
             End If
-
+            Dim hSQLFirma = ""
             hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[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 " &
@@ -1035,6 +1058,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
     '    initPnlSearch()
     'End Sub
     Sub initPnlSearch()
+        MsgBox("s")
         If pnlSearch.Visible Then
             pnlSearch.Visible = False
             Panel1.Height -= pnlSearch.Height
@@ -1080,7 +1104,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
     End Sub
 
 
-    Private Sub Button4_Click_1(sender As Object, e As EventArgs)
+    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
         If CheckBox1.Checked Then
             toggle_LKW_SND("LKW")
         Else
@@ -1141,7 +1165,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
 
     End Sub
 
-    Private Sub btnAlleAnzeigen_Click(sender As System.Object, e As System.EventArgs) Handles btnAlleAnzeigen.Click
+    Private Sub btnAlleAnzeigen_Click(sender As System.Object, e As System.EventArgs)
 
         If sender Is btnAlleAnzeigen Then
             'Auswahl wird zurückgesetzt, alle Einträge werden angezeigt
@@ -1289,6 +1313,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
         End If
 
         Grid_aktiv = True
+
         Aviso_anzeigen(hSort)
     End Sub
 
@@ -1502,9 +1527,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
             Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
             Dim f As New frmEintragAviso
 
-            If sender Is ToolStripMenuItem17 Then
+            'If sender Is ToolStripMenuItem17 Then
-                f.FIRMA_TMP = "ATILLA"
+            '    f.FIRMA_TMP = "ATILLA"
-            End If
+            'End If
 
             VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
             '  f.frmHilf = Me
@@ -1626,7 +1651,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
 
 
 
-            If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)
+            '  If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)
 
 
             If AVISO_TYP = "LKW" Then
@@ -1930,5 +1955,8 @@ Public Class usrCntlHauptfenster_Suche_AVISO
 
     End Sub
 
-
+    Private Sub btnDetailsuche_Click(sender As Object, e As EventArgs) Handles btnDetailsuche.Click
+        'pnlSearch.Visible = Not pnlSearch.Visible
+        initPnlSearch()
+    End Sub
 End Class

Aviso/usrcntlAktDetails.Designer.vb

@@ -164,11 +164,21 @@ Partial Class usrcntlAktDetails
         Me.txtLKW_Nr = New System.Windows.Forms.TextBox()
         Me.pnlStatus = New System.Windows.Forms.Panel()
         Me.lblStatus = New System.Windows.Forms.Label()
+        Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.flpnlAvisoTrips = New System.Windows.Forms.FlowLayoutPanel()
+        Me.lblAvisoTrip_Default = New System.Windows.Forms.Label()
+        Me.lblAvisoTrip_Add = New System.Windows.Forms.Label()
+        Me.Panel6 = New System.Windows.Forms.Panel()
+        Me.lblAvisoTrip_Next2 = New System.Windows.Forms.TextBox()
+        Me.lblAvisoTrip_Prev2 = New System.Windows.Forms.TextBox()
+        Me.lblAvisoTrip_Next1 = New System.Windows.Forms.Label()
+        Me.lblAvisoTrip_Prev1 = New System.Windows.Forms.Label()
         Me.conMenuVermerke = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.conVermerkEntgLöschen = New System.Windows.Forms.ToolStripMenuItem()
         Me.HervorhebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolUeberweisungsBeleg = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolVkReminder = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VermerkTextAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MitarbeiterAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.conVermerkLöschenNew = New System.Windows.Forms.ToolStripMenuItem()
         Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -188,7 +198,6 @@ Partial Class usrcntlAktDetails
         Me.btnÄndern = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.VermerkTextAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlDetailsRechts.SuspendLayout()
         Me.Panel3.SuspendLayout()
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -226,6 +235,8 @@ Partial Class usrcntlAktDetails
         Me.Panel12.SuspendLayout()
         Me.pnl.SuspendLayout()
         Me.pnlStatus.SuspendLayout()
+        Me.Panel5.SuspendLayout()
+        Me.flpnlAvisoTrips.SuspendLayout()
         Me.conMenuVermerke.SuspendLayout()
         Me.cntxtFormulare.SuspendLayout()
         Me.pnlOptionen.SuspendLayout()
@@ -240,6 +251,7 @@ Partial Class usrcntlAktDetails
         Me.pnlDetailsRechts.Controls.Add(Me.FlowLayoutPanel)
         Me.pnlDetailsRechts.Controls.Add(Me.lblInfoAviso)
         Me.pnlDetailsRechts.Controls.Add(Me.pnl)
+        Me.pnlDetailsRechts.Controls.Add(Me.Panel5)
         Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0)
         Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0)
@@ -253,9 +265,9 @@ Partial Class usrcntlAktDetails
         Me.Panel3.Controls.Add(Me.SplitContainer)
         Me.Panel3.Controls.Add(Me.Panel8)
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel3.Location = New System.Drawing.Point(0, 164)
+        Me.Panel3.Location = New System.Drawing.Point(0, 217)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(575, 591)
+        Me.Panel3.Size = New System.Drawing.Size(575, 538)
         Me.Panel3.TabIndex = 91
         '
         'SplitContainer
@@ -281,8 +293,8 @@ Partial Class usrcntlAktDetails
         Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop)
         Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk)
         Me.SplitContainer.Panel2.Controls.Add(Me.pnlMAInfo)
-        Me.SplitContainer.Size = New System.Drawing.Size(575, 471)
+        Me.SplitContainer.Size = New System.Drawing.Size(575, 418)
-        Me.SplitContainer.SplitterDistance = 206
+        Me.SplitContainer.SplitterDistance = 166
         Me.SplitContainer.TabIndex = 91
         '
         'pnlAlt
@@ -295,7 +307,7 @@ Partial Class usrcntlAktDetails
         Me.pnlAlt.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlAlt.Location = New System.Drawing.Point(0, 0)
         Me.pnlAlt.Name = "pnlAlt"
-        Me.pnlAlt.Size = New System.Drawing.Size(575, 206)
+        Me.pnlAlt.Size = New System.Drawing.Size(575, 166)
         Me.pnlAlt.TabIndex = 72
         Me.pnlAlt.Visible = False
         '
@@ -666,7 +678,7 @@ Partial Class usrcntlAktDetails
         Me.dgvSendungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvSendungen.ShowCellErrors = False
         Me.dgvSendungen.ShowRowErrors = False
-        Me.dgvSendungen.Size = New System.Drawing.Size(575, 206)
+        Me.dgvSendungen.Size = New System.Drawing.Size(575, 166)
         Me.dgvSendungen.TabIndex = 71
         Me.dgvSendungen.TabStop = False
         '
@@ -678,7 +690,7 @@ Partial Class usrcntlAktDetails
         Me.Panel7.Location = New System.Drawing.Point(4, 19)
         Me.Panel7.MaximumSize = New System.Drawing.Size(2, 250)
         Me.Panel7.Name = "Panel7"
-        Me.Panel7.Size = New System.Drawing.Size(1, 74)
+        Me.Panel7.Size = New System.Drawing.Size(1, 15)
         Me.Panel7.TabIndex = 15
         '
         'picArrowDown
@@ -687,7 +699,7 @@ Partial Class usrcntlAktDetails
         Me.picArrowDown.BackgroundImage = Global.AVISO.My.Resources.Resources.arrow_down_orange
         Me.picArrowDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.picArrowDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.picArrowDown.Location = New System.Drawing.Point(1, 197)
+        Me.picArrowDown.Location = New System.Drawing.Point(1, 160)
         Me.picArrowDown.Name = "picArrowDown"
         Me.picArrowDown.Size = New System.Drawing.Size(36, 50)
         Me.picArrowDown.TabIndex = 104
@@ -1077,7 +1089,7 @@ Partial Class usrcntlAktDetails
         Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.gridVermerke.ShowCellErrors = False
         Me.gridVermerke.ShowRowErrors = False
-        Me.gridVermerke.Size = New System.Drawing.Size(575, 175)
+        Me.gridVermerke.Size = New System.Drawing.Size(575, 162)
         Me.gridVermerke.TabIndex = 70
         Me.gridVermerke.TabStop = False
         '
@@ -1225,7 +1237,7 @@ Partial Class usrcntlAktDetails
         Me.pnlMAInfo.Controls.Add(Me.Button18)
         Me.pnlMAInfo.Controls.Add(Me.picAVISOMessengerSNDChat)
         Me.pnlMAInfo.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 205)
+        Me.pnlMAInfo.Location = New System.Drawing.Point(0, 192)
         Me.pnlMAInfo.Name = "pnlMAInfo"
         Me.pnlMAInfo.Size = New System.Drawing.Size(575, 56)
         Me.pnlMAInfo.TabIndex = 106
@@ -1806,7 +1818,7 @@ Partial Class usrcntlAktDetails
         Me.FlowLayoutPanel.Controls.Add(Me.Panel12)
         Me.FlowLayoutPanel.Controls.Add(Me.Panel2)
         Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top
-        Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 36)
+        Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 89)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
         Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 128)
         Me.FlowLayoutPanel.TabIndex = 13
@@ -2125,7 +2137,7 @@ Partial Class usrcntlAktDetails
         Me.pnl.Controls.Add(Me.txtLKW_Nr)
         Me.pnl.Controls.Add(Me.pnlStatus)
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
-        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Location = New System.Drawing.Point(0, 53)
         Me.pnl.Name = "pnl"
         Me.pnl.Size = New System.Drawing.Size(575, 36)
         Me.pnl.TabIndex = 91
@@ -2172,12 +2184,145 @@ Partial Class usrcntlAktDetails
         Me.lblStatus.Text = "-"
         Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
+        'Panel5
+        '
+        Me.Panel5.BackColor = System.Drawing.SystemColors.Highlight
+        Me.Panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel5.Controls.Add(Me.flpnlAvisoTrips)
+        Me.Panel5.Controls.Add(Me.Panel6)
+        Me.Panel5.Controls.Add(Me.lblAvisoTrip_Next2)
+        Me.Panel5.Controls.Add(Me.lblAvisoTrip_Prev2)
+        Me.Panel5.Controls.Add(Me.lblAvisoTrip_Next1)
+        Me.Panel5.Controls.Add(Me.lblAvisoTrip_Prev1)
+        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel5.Location = New System.Drawing.Point(0, 0)
+        Me.Panel5.Name = "Panel5"
+        Me.Panel5.Size = New System.Drawing.Size(575, 53)
+        Me.Panel5.TabIndex = 92
+        '
+        'flpnlAvisoTrips
+        '
+        Me.flpnlAvisoTrips.AutoScroll = True
+        Me.flpnlAvisoTrips.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(100, Byte), Integer))
+        Me.flpnlAvisoTrips.Controls.Add(Me.lblAvisoTrip_Default)
+        Me.flpnlAvisoTrips.Controls.Add(Me.lblAvisoTrip_Add)
+        Me.flpnlAvisoTrips.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.flpnlAvisoTrips.Location = New System.Drawing.Point(101, 0)
+        Me.flpnlAvisoTrips.Name = "flpnlAvisoTrips"
+        Me.flpnlAvisoTrips.Padding = New System.Windows.Forms.Padding(3)
+        Me.flpnlAvisoTrips.Size = New System.Drawing.Size(371, 48)
+        Me.flpnlAvisoTrips.TabIndex = 93
+        Me.flpnlAvisoTrips.Visible = False
+        '
+        'lblAvisoTrip_Default
+        '
+        Me.lblAvisoTrip_Default.BackColor = System.Drawing.SystemColors.HotTrack
+        Me.lblAvisoTrip_Default.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Default.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
+        Me.lblAvisoTrip_Default.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Default.Location = New System.Drawing.Point(6, 6)
+        Me.lblAvisoTrip_Default.Margin = New System.Windows.Forms.Padding(3)
+        Me.lblAvisoTrip_Default.Name = "lblAvisoTrip_Default"
+        Me.lblAvisoTrip_Default.Size = New System.Drawing.Size(90, 38)
+        Me.lblAvisoTrip_Default.TabIndex = 93
+        Me.lblAvisoTrip_Default.Text = "SUB"
+        Me.lblAvisoTrip_Default.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.lblAvisoTrip_Default.UseCompatibleTextRendering = True
+        Me.lblAvisoTrip_Default.Visible = False
+        '
+        'lblAvisoTrip_Add
+        '
+        Me.lblAvisoTrip_Add.BackColor = System.Drawing.SystemColors.HotTrack
+        Me.lblAvisoTrip_Add.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Add.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold)
+        Me.lblAvisoTrip_Add.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Add.Location = New System.Drawing.Point(102, 6)
+        Me.lblAvisoTrip_Add.Margin = New System.Windows.Forms.Padding(3)
+        Me.lblAvisoTrip_Add.Name = "lblAvisoTrip_Add"
+        Me.lblAvisoTrip_Add.Size = New System.Drawing.Size(43, 38)
+        Me.lblAvisoTrip_Add.TabIndex = 95
+        Me.lblAvisoTrip_Add.Text = "+"
+        Me.lblAvisoTrip_Add.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'Panel6
+        '
+        Me.Panel6.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.Panel6.Location = New System.Drawing.Point(101, 48)
+        Me.Panel6.Name = "Panel6"
+        Me.Panel6.Size = New System.Drawing.Size(371, 3)
+        Me.Panel6.TabIndex = 97
+        '
+        'lblAvisoTrip_Next2
+        '
+        Me.lblAvisoTrip_Next2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblAvisoTrip_Next2.BackColor = System.Drawing.SystemColors.Highlight
+        Me.lblAvisoTrip_Next2.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.lblAvisoTrip_Next2.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Next2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.lblAvisoTrip_Next2.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Next2.Location = New System.Drawing.Point(472, 38)
+        Me.lblAvisoTrip_Next2.MaxLength = 0
+        Me.lblAvisoTrip_Next2.Name = "lblAvisoTrip_Next2"
+        Me.lblAvisoTrip_Next2.ReadOnly = True
+        Me.lblAvisoTrip_Next2.Size = New System.Drawing.Size(102, 11)
+        Me.lblAvisoTrip_Next2.TabIndex = 94
+        Me.lblAvisoTrip_Next2.TabStop = False
+        Me.lblAvisoTrip_Next2.Text = "Next Trip"
+        Me.lblAvisoTrip_Next2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'lblAvisoTrip_Prev2
+        '
+        Me.lblAvisoTrip_Prev2.BackColor = System.Drawing.SystemColors.Highlight
+        Me.lblAvisoTrip_Prev2.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.lblAvisoTrip_Prev2.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Prev2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.lblAvisoTrip_Prev2.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Prev2.Location = New System.Drawing.Point(-1, 37)
+        Me.lblAvisoTrip_Prev2.MaxLength = 0
+        Me.lblAvisoTrip_Prev2.Name = "lblAvisoTrip_Prev2"
+        Me.lblAvisoTrip_Prev2.ReadOnly = True
+        Me.lblAvisoTrip_Prev2.Size = New System.Drawing.Size(102, 11)
+        Me.lblAvisoTrip_Prev2.TabIndex = 90
+        Me.lblAvisoTrip_Prev2.TabStop = False
+        Me.lblAvisoTrip_Prev2.Text = "Prev. Trip"
+        Me.lblAvisoTrip_Prev2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'lblAvisoTrip_Next1
+        '
+        Me.lblAvisoTrip_Next1.BackColor = System.Drawing.SystemColors.Highlight
+        Me.lblAvisoTrip_Next1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Next1.Dock = System.Windows.Forms.DockStyle.Right
+        Me.lblAvisoTrip_Next1.Font = New System.Drawing.Font("Microsoft Sans Serif", 13.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAvisoTrip_Next1.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Next1.Location = New System.Drawing.Point(472, 0)
+        Me.lblAvisoTrip_Next1.Margin = New System.Windows.Forms.Padding(0)
+        Me.lblAvisoTrip_Next1.Name = "lblAvisoTrip_Next1"
+        Me.lblAvisoTrip_Next1.Size = New System.Drawing.Size(101, 51)
+        Me.lblAvisoTrip_Next1.TabIndex = 92
+        Me.lblAvisoTrip_Next1.Text = ">>"
+        Me.lblAvisoTrip_Next1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'lblAvisoTrip_Prev1
+        '
+        Me.lblAvisoTrip_Prev1.BackColor = System.Drawing.SystemColors.Highlight
+        Me.lblAvisoTrip_Prev1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblAvisoTrip_Prev1.Dock = System.Windows.Forms.DockStyle.Left
+        Me.lblAvisoTrip_Prev1.Font = New System.Drawing.Font("Microsoft Sans Serif", 13.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAvisoTrip_Prev1.ForeColor = System.Drawing.Color.White
+        Me.lblAvisoTrip_Prev1.Location = New System.Drawing.Point(0, 0)
+        Me.lblAvisoTrip_Prev1.Margin = New System.Windows.Forms.Padding(0)
+        Me.lblAvisoTrip_Prev1.Name = "lblAvisoTrip_Prev1"
+        Me.lblAvisoTrip_Prev1.Size = New System.Drawing.Size(101, 51)
+        Me.lblAvisoTrip_Prev1.TabIndex = 91
+        Me.lblAvisoTrip_Prev1.Text = "<<"
+        Me.lblAvisoTrip_Prev1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
         'conMenuVermerke
         '
         Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.VermerkTextAnzeigenToolStripMenuItem, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew})
         Me.conMenuVermerke.Name = "conMenuVermerke"
-        Me.conMenuVermerke.Size = New System.Drawing.Size(252, 236)
+        Me.conMenuVermerke.Size = New System.Drawing.Size(252, 214)
         '
         'conVermerkEntgLöschen
         '
@@ -2208,6 +2353,12 @@ Partial Class usrcntlAktDetails
         Me.toolVkReminder.Text = "Reminder geschickt"
         Me.toolVkReminder.Visible = False
         '
+        'VermerkTextAnzeigenToolStripMenuItem
+        '
+        Me.VermerkTextAnzeigenToolStripMenuItem.Name = "VermerkTextAnzeigenToolStripMenuItem"
+        Me.VermerkTextAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
+        Me.VermerkTextAnzeigenToolStripMenuItem.Text = "Vermerk-Text anzeigen"
+        '
         'MitarbeiterAnzeigenToolStripMenuItem
         '
         Me.MitarbeiterAnzeigenToolStripMenuItem.Image = CType(resources.GetObject("MitarbeiterAnzeigenToolStripMenuItem.Image"), System.Drawing.Image)
@@ -2471,12 +2622,6 @@ Partial Class usrcntlAktDetails
         Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button10.UseVisualStyleBackColor = False
         '
-        'VermerkTextAnzeigenToolStripMenuItem
-        '
-        Me.VermerkTextAnzeigenToolStripMenuItem.Name = "VermerkTextAnzeigenToolStripMenuItem"
-        Me.VermerkTextAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
-        Me.VermerkTextAnzeigenToolStripMenuItem.Text = "Vermerk-Text anzeigen"
-        '
         'usrcntlAktDetails
         '
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2538,6 +2683,9 @@ Partial Class usrcntlAktDetails
         Me.pnl.ResumeLayout(False)
         Me.pnl.PerformLayout()
         Me.pnlStatus.ResumeLayout(False)
+        Me.Panel5.ResumeLayout(False)
+        Me.Panel5.PerformLayout()
+        Me.flpnlAvisoTrips.ResumeLayout(False)
         Me.conMenuVermerke.ResumeLayout(False)
         Me.cntxtFormulare.ResumeLayout(False)
         Me.pnlOptionen.ResumeLayout(False)
@@ -2700,4 +2848,13 @@ Partial Class usrcntlAktDetails
     Friend WithEvents Button11 As Button
     Friend WithEvents Button12 As Button
     Friend WithEvents VermerkTextAnzeigenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents Panel5 As Panel
+    Friend WithEvents lblAvisoTrip_Prev1 As Label
+    Friend WithEvents flpnlAvisoTrips As FlowLayoutPanel
+    Friend WithEvents lblAvisoTrip_Default As Label
+    Friend WithEvents lblAvisoTrip_Add As Label
+    Friend WithEvents lblAvisoTrip_Next1 As Label
+    Friend WithEvents lblAvisoTrip_Next2 As TextBox
+    Friend WithEvents lblAvisoTrip_Prev2 As TextBox
+    Friend WithEvents Panel6 As Panel
 End Class

Aviso/usrcntlAktDetails.vb

@@ -45,6 +45,7 @@ Public Class usrcntlAktDetails
     Dim AVISO As cAviso = Nothing
     Dim WithEvents timerSendRows As New Timer
     Dim isFailureShown As Boolean = False
+    Dim AVISO_TRIP_LIST As New List(Of cAvisoTripsItem)
 
     Dim painted As Boolean = False ' Damit gridVermerke Formattierung nicht dauernd anspringt..
 
@@ -74,6 +75,88 @@ Public Class usrcntlAktDetails
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
     End Sub
+    Public Sub initAvisoTrips(AvisoTripId As Integer)
+        AVISO_TRIP_LIST.Clear()
+
+
+        'Flowlayoutpanel leeren
+        For i As Integer = flpnlAvisoTrips.Controls.Count - 1 To 0 Step -1
+            Dim ctrl As Control = flpnlAvisoTrips.Controls(i)
+            If ctrl IsNot lblAvisoTrip_Default AndAlso ctrl IsNot lblAvisoTrip_Add Then
+                flpnlAvisoTrips.Controls.Remove(ctrl) : ctrl.Dispose()
+            End If
+        Next
+
+        If AvisoTripId > 0 Then
+            Dim AVISO_TRIP = New cAvisoTrips(AvisoTripId)
+            AVISO_TRIP_LIST = AVISO_TRIP.getAvisos()
+        End If
+
+        If AVISO_TRIP_LIST.Count = 0 Then
+            Dim item As New cAvisoTripsItem
+            item.AvisoId = AvisoID
+            item.Grenzstelle = cAvisoTrips.GetGrenzstelleText(AVISO.Grenzstelle, AVISO.Zollstelle)
+            AVISO_TRIP_LIST.Add(item)
+
+        End If
+
+        For Each AvisoTripItem In AVISO_TRIP_LIST
+
+            Dim lbl As New Label
+
+            '  Eigenschaften vom Default übernehmen
+            With lbl
+                .AutoSize = lblAvisoTrip_Default.AutoSize
+                .Width = lblAvisoTrip_Default.Width
+                .Height = lblAvisoTrip_Default.Height
+                .BackColor = lblAvisoTrip_Default.BackColor
+                .ForeColor = lblAvisoTrip_Default.ForeColor
+                .Font = lblAvisoTrip_Default.Font
+                .Margin = lblAvisoTrip_Default.Margin
+                .Padding = lblAvisoTrip_Default.Padding
+                .BorderStyle = lblAvisoTrip_Default.BorderStyle
+                .TextAlign = lblAvisoTrip_Default.TextAlign
+                .Cursor = lblAvisoTrip_Default.Cursor
+                .UseCompatibleTextRendering = lblAvisoTrip_Default.UseCompatibleTextRendering
+
+                '  Dein Inhalt
+                .Text = If(AvisoTripItem.Grenzstelle, "")
+
+                If If(AvisoTripItem.Grenzstelle, "").Length > 20 Then
+                    .Font = New Font(.Font.FontFamily, .Font.Size - 2, .Font.Style) ' Schriftgröße anpassen, wenn Text zu lang ist
+                End If
+
+                ' optional: Referenz speichern
+                .Tag = AvisoTripItem.AvisoId
+                If AvisoTripItem.AvisoId = AvisoID Then
+                    .BackColor = Color.DodgerBlue ' Aktuelles Aviso hervorheben
+                    .BorderStyle = BorderStyle.FixedSingle
+                End If
+            End With
+
+            '  Click-Event (optional aber sinnvoll)
+            AddHandler lbl.Click, AddressOf AvisoTrip_Click
+
+            flpnlAvisoTrips.Controls.Add(lbl)
+
+        Next
+        If flpnlAvisoTrips.Controls.Contains(lblAvisoTrip_Add) Then
+            flpnlAvisoTrips.Controls.Remove(lblAvisoTrip_Add)
+            flpnlAvisoTrips.Controls.Add(lblAvisoTrip_Add)
+        End If
+    End Sub
+    Private Sub AvisoTrip_Click(sender As Object, e As EventArgs)
+        Dim lbl As Label = CType(sender, Label)
+        'Dim item As cAvisoTrip = CType(lbl.Tag, cAvisoTrip)
+
+        If IsNumeric(lbl.Tag) Then
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = lbl.Tag
+            reload(lbl.Tag)
+        End If
+
+    End Sub
+
+
     Public Sub reload(id)
 
         loaded = False
@@ -85,6 +168,7 @@ Public Class usrcntlAktDetails
         Details_anzeigen()
 
 
+
         pnlDetailsRechts.Enabled = True
         pnlDetailsRechts.Cursor = Cursors.Default
 
@@ -196,6 +280,10 @@ Public Class usrcntlAktDetails
         cboFormulareRgAn.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", "AUFTR"))
         cboFormulareRgAn.changeItem("AVISIERER")
 
+        'AVISO_TRIPS
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_TRIPS") Then
+            flpnlAvisoTrips.Visible = True
+        End If
 
 
         Select Case If(AVISO.FIRMA <> "", AVISO.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
@@ -318,12 +406,14 @@ Public Class usrcntlAktDetails
 
     Private Sub Details_anzeigen()
         aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick)
-
+        AVISO_TRIP_LIST.Clear()
         If AvisoID <= 0 Then Exit Sub
         'Dim Aviso As New cAviso
         AVISO = AvisoDAL.LesenAviso(AvisoID, "")
         If AVISO Is Nothing Then Exit Sub
 
+        initAvisoTrips(AVISO.AvisoTripId)
+
         lblIMEX.Text = AVISO.ImEx
         lblIMEX.Visible = (AVISO.ImEx <> "")
 
@@ -3964,7 +4054,8 @@ Public Class usrcntlAktDetails
 
                                       End Sub)
 
-        t.Start({AvisoID, Printername})
+        ' t.Start({AvisoID, Printername})
+        t.Start({AvisoID})
         t.IsBackground = True
 
     End Sub
@@ -4013,5 +4104,110 @@ Public Class usrcntlAktDetails
             MsgBox(gridVermerke.SelectedRows(0).Cells("Hinweis_Vermerk").Value)
         End If
     End Sub
+
+    Private Sub Label9_Click(sender As Object, e As EventArgs) Handles lblAvisoTrip_Add.Click
+        Try
+
+            '--> PRüfen ob schon trip
+            If AVISO.AvisoTripId <= 0 Then
+                Dim AVISO_TRIP As New cAvisoTrips(-1)
+                AVISO_TRIP.LKW_Nr = AVISO.LKW_Nr
+                AVISO_TRIP.LKW_Nationalitaet = AVISO.LKW_Nationalitaet
+                AVISO_TRIP.Frächter = AVISO.Frächter
+                AVISO_TRIP.Frächter_KdNr = AVISO.Frächter_KdNr
+                AVISO_TRIP.Auftraggeber = AVISO.Auftraggeber
+                AVISO_TRIP.Auftraggeber_KdNr = AVISO.Auftraggeber_KdNr
+
+                AVISO_TRIP.SAVE()
+                AVISO.UPDATE_Trips(AVISO_TRIP.AvisoTripId)
+            End If
+
+            Me.Cursor = Cursors.WaitCursor
+            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+            Dim f As New frmEintragAviso
+            f.getFromAVISO_Trip = AVISO
+
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
+            '  f.frmHilf = Me
+            If Not f.IsDisposed And f IsNot Nothing And Not frmGrayOut.IsDisposed And frmGrayOut IsNot Nothing Then
+                If f.ShowDialog(frmGrayOut) = DialogResult.OK Then
+                    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = f.myAviso.AvisoID
+                    reload(f.myAviso.AvisoID)
+                Else
+                    VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = AVISO.AvisoID
+                End If
+
+            End If
+            frmGrayOut.Close()
+
+
+
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub lblAvisoTrip_Prev_Click(sender As Object, e As EventArgs) Handles lblAvisoTrip_Prev1.Click, lblAvisoTrip_Prev2.Click
+        Dim AvisoTmp = GetPrevAvisoId()
+        If AvisoTmp <> AvisoID Then
+            Me.Cursor = Cursors.WaitCursor
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = AvisoTmp
+            reload(AvisoTmp)
+            Me.Cursor = Cursors.Default
+        End If
+    End Sub
+    Private Sub lblAvisoTrip_Next_Click(sender As Object, e As EventArgs) Handles lblAvisoTrip_Next1.Click, lblAvisoTrip_Next2.Click
+        Dim AvisoTmp = GetNextAvisoId()
+        If AvisoTmp <> AvisoID Then
+            Me.Cursor = Cursors.WaitCursor
+            VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = AvisoTmp
+            reload(AvisoTmp)
+            Me.Cursor = Cursors.Default
+        End If
+    End Sub
+
+    Public Function GetNextAvisoId() As Integer
+        Try
+            If AVISO_TRIP_LIST Is Nothing OrElse AVISO_TRIP_LIST.Count = 0 Then Return AvisoID
+
+            For i As Integer = 0 To AVISO_TRIP_LIST.Count - 1
+                If AVISO_TRIP_LIST(i).AvisoId = AvisoID Then
+                    If i < AVISO_TRIP_LIST.Count - 1 Then
+                        Return AVISO_TRIP_LIST(i + 1).AvisoId
+                    Else
+                        Return AvisoID
+                    End If
+                End If
+            Next
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+        Return AvisoID
+    End Function
+    Public Function GetPrevAvisoId() As Integer
+        Try
+            If AVISO_TRIP_LIST Is Nothing OrElse AVISO_TRIP_LIST.Count = 0 Then Return AvisoID
+
+            For i As Integer = 0 To AVISO_TRIP_LIST.Count - 1
+                If AVISO_TRIP_LIST(i).AvisoId = AvisoID Then
+                    If i > 0 Then
+                        Return AVISO_TRIP_LIST(i - 1).AvisoId
+                    Else
+                        Return AvisoID
+                    End If
+                End If
+            Next
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+        Return AvisoID
+    End Function
 End Class