diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb
index 504785dd..050eb9ec 100644
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -6,6 +6,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Imports s2industries.ZUGFeRD
 Imports System.IO
 Imports GrapeCity.ActiveReports.Core.Rendering.Tools
+Imports System.Windows.Converters
 
 Public Class cFakturierung
 
@@ -1798,7 +1799,7 @@ Public Class cFakturierung
 
             End If
             '-----------------------------
-
+            desc.ActualDeliveryDate = (RECHNUNG.Abfertigungsdatum)
 
             Dim steuerProzent As Double = SQL.DLookup(" isnull([Steuersatz %],0)", "[Steuertabelle] ", "[Steuerschlüssel]='" & checkNull(RECHNUNG.Steuerschlüssel) & "'", "FMZOLL", 0)
             Dim steuerProzenFaktor As Double = 0
@@ -1859,73 +1860,78 @@ Public Class cFakturierung
             'End If
 
             Dim isReverseCharge = isReverseChargeSumme(FIRMA, RECHNUNG)
+            If isReverseCharge Then
+                Select Case RECHNUNG.RechnungSprache
+                    Case "EN" : desc.AddNote("The VAT liability is transferred to the recipient of the service (reverse charge system).", SubjectCodes.AAI)
+                    Case Else : desc.AddNote("Die Umsatzsteuerschuld geht auf den Leistungsempfänger über (Reverse Charge Verfahren).", SubjectCodes.AAI)
+                End Select
+            End If
+
 
             If RECHNUNG.SteuerfreierGesamtbetrag > 0 Then
-                desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z)
-            End If
+                    desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z)
+                End If
 
-            If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then
-                desc.AddApplicableTradeTax(Convert.ToDecimal(taxBasisAmount - RECHNUNG.SteuerfreierGesamtbetrag), Convert.ToDecimal(steuerProzenFaktor), Convert.ToDecimal(taxTotalAmount), TaxTypes.VAT, IIf(isReverseCharge, TaxCategoryCodes.AE, TaxCategoryCodes.S))
-            End If
+                If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then
+                    desc.AddApplicableTradeTax(Convert.ToDecimal(taxBasisAmount - RECHNUNG.SteuerfreierGesamtbetrag), Convert.ToDecimal(steuerProzenFaktor), Convert.ToDecimal(taxTotalAmount), TaxTypes.VAT, IIf(isReverseCharge, TaxCategoryCodes.AE, TaxCategoryCodes.S))
+                End If
 
-            Select Case FIRMA.Firma_ID
-                Case 21, 22, 23 '"UNISPED"
-                    If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
-                    If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
+                Select Case FIRMA.Firma_ID
+                    Case 21, 22, 23 '"UNISPED"
+                        If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
+                        If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
 
 
-                Case 26 'VERAG-UNISPED"
-                    If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
-                    If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
+                    Case 26 'VERAG-UNISPED"
+                        If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
+                        If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
 
-                Case 24 'AMBAR"
-                    If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
-                    If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
-                    desc.AddCreditorFinancialAccount("TR90 0006 2001 6040 0009 0804 66", "TGBATRISXXX",,, "Garanti Bank Türkei – Euro Konto")
+                    Case 24 'AMBAR"
+                        If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
+                        If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
+                        desc.AddCreditorFinancialAccount("TR90 0006 2001 6040 0009 0804 66", "TGBATRISXXX",,, "Garanti Bank Türkei – Euro Konto")
 
-
-
-                Case 20 '"IMEX"
-                    If RECHNUNG.RechnungsLandKz = "TR" Then
-                        desc.AddCreditorFinancialAccount("TR84 0006 2001 6040 0009 0987 13", "",,, "Garanti Bank")
-                    Else
-                        If hasVK(RECHNUNG) Then
-                            desc.AddCreditorFinancialAccount("AT35 4480 0365 7822 0002", "VBOEATWWOOE",,, "Volksbank Oberösterreich AG")
+                    Case 20 '"IMEX"
+                        If RECHNUNG.RechnungsLandKz = "TR" Then
+                            desc.AddCreditorFinancialAccount("TR84 0006 2001 6040 0009 0987 13", "",,, "Garanti Bank")
                         Else
-                            If hasEUSTZOLL(RECHNUNG.RechnungsNr) Then
-                                desc.AddCreditorFinancialAccount("AT62 4480 0365 7822 0001", "VBOEATWWOOE", )
+                            If hasVK(RECHNUNG) Then
+                                desc.AddCreditorFinancialAccount("AT35 4480 0365 7822 0002", "VBOEATWWOOE",,, "Volksbank Oberösterreich AG")
                             Else
-                                desc.AddCreditorFinancialAccount("TR84 0006 2001 6040 0009 0987 13", "VBOEATWWOOE", ,, "Volksbank Oberösterreich AG")
+                                If hasEUSTZOLL(RECHNUNG.RechnungsNr) Then
+                                    desc.AddCreditorFinancialAccount("AT62 4480 0365 7822 0001", "VBOEATWWOOE", )
+                                Else
+                                    desc.AddCreditorFinancialAccount("TR84 0006 2001 6040 0009 0987 13", "VBOEATWWOOE", ,, "Volksbank Oberösterreich AG")
+                                End If
                             End If
                         End If
-                    End If
 
 
-                Case 19
-                    If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
+                    Case 19
+                        If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
 
-                Case Else 'VERAG,ATILLA
-                    If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
-                    If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
+                    Case Else 'VERAG,ATILLA
+                        If FIRMA.Firma_IBAN1 IsNot Nothing AndAlso FIRMA.Firma_BIC1 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung1 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN1 IsNot Nothing, FIRMA.Firma_IBAN1.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC1 IsNot Nothing, FIRMA.Firma_BIC1.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung1 IsNot Nothing, FIRMA.Firma_Bankverbindung1, ""))
+                        If FIRMA.Firma_IBAN2 IsNot Nothing AndAlso FIRMA.Firma_BIC2 IsNot Nothing AndAlso FIRMA.Firma_Bankverbindung2 IsNot Nothing Then desc.AddCreditorFinancialAccount(IIf(FIRMA.Firma_IBAN2 IsNot Nothing, FIRMA.Firma_IBAN2.ToString.Replace("IBAN: ", ""), ""), IIf(FIRMA.Firma_BIC2 IsNot Nothing, FIRMA.Firma_BIC2.ToString.Replace("BIC: ", ""), ""),,, IIf(FIRMA.Firma_Bankverbindung2 IsNot Nothing, FIRMA.Firma_Bankverbindung2, ""))
 
-            End Select
+                End Select
 
 
-            Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice_" & RECHNUNG.RechnungsNr, ".xml", True, False)
-            Dim stream As FileStream = New FileStream(tmpPathZugpferd, FileMode.Create, FileAccess.Write)
-            desc.Save(stream, ZUGFeRDVersion.Version20, Profile.Comfort)
+                Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice_" & RECHNUNG.RechnungsNr, ".xml", True, False)
+                Dim stream As FileStream = New FileStream(tmpPathZugpferd, FileMode.Create, FileAccess.Write)
+                desc.Save(stream, ZUGFeRDVersion.Version20, Profile.Comfort)
 
-            stream.Flush()
-            stream.Close()
-            Return tmpPathZugpferd
+                stream.Flush()
+                stream.Close()
+                Return tmpPathZugpferd
 
-        ElseIf Not einzelrechnung AndAlso SR_DT IsNot Nothing Then
+            ElseIf Not einzelrechnung AndAlso SR_DT IsNot Nothing Then
 
-            '---------------------------------------------------------------------------------
-            '--------------------------------SAMMELRECHNUNG-----------------------------------
-            '---------------------------------------------------------------------------------
+                '---------------------------------------------------------------------------------
+                '--------------------------------SAMMELRECHNUNG-----------------------------------
+                '---------------------------------------------------------------------------------
 
-            Dim ROW As DataRow = SR_DT.Rows(0)
+                Dim ROW As DataRow = SR_DT.Rows(0)
             Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(ROW("Firma_ID"))
 
             Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
@@ -1994,14 +2000,18 @@ Public Class cFakturierung
             'End If
             If rpt IsNot Nothing Then
                 If rpt.txtVermerk.Text IsNot Nothing AndAlso rpt.txtVermerk.Text <> "" Then desc.AddNote(rpt.txtVermerk.Text.ToString, SubjectCodes.AAI)
+                If rpt.txtInfo.Text IsNot Nothing AndAlso rpt.txtInfo.Text <> "" Then desc.AddNote(rpt.txtInfo.Text.ToString, SubjectCodes.AAI)
             ElseIf rptAnl IsNot Nothing Then
                 If rptAnl.txtInfo.Text IsNot Nothing AndAlso rptAnl.txtInfo.Text <> "" Then desc.AddNote(rptAnl.txtInfo.Text.ToString, SubjectCodes.AAI)
             End If
 
-
-
             desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK)
 
+            If ROW("Abfertigungsdatum") IsNot DBNull.Value AndAlso ROW("Abfertigungsdatum") <> "" Then
+                desc.ActualDeliveryDate = (CDate(ROW("Abfertigungsdatum")))
+            End If
+
+
             desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, RechnungsOrt, RechnungsOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), ""))
             desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller))
 
diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb
index a4caf9fa..a15d2cd6 100644
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports com.sun.xml.internal.bind.v2.model.core
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -317,7 +318,21 @@ Public Class usrCntlUSTV
 
 
     Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        cProgramFunctions.genExcelFromDGV_NEW(dgvUSTV, True)
+
+
+        Dim dtNew As New DataTable
+        dtNew = TryCast(dgvUSTV.DataSource, DataTable)
+
+        If dtNew.Rows.Count > 0 Then
+
+            For Each col As DataColumn In dtNew.Columns
+                col.ColumnName = col.ColumnName.Replace("UStVAn_", "")
+            Next
+
+            cProgramFunctions.genExcelFromDT_NEW(dtNew, {"J1:N" & (dtNew.Rows.Count + 1)},,,,, True)
+        End If
+
+
     End Sub
 
     Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click
diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb
index 8a364f21..dd85bc32 100644
--- a/SDL/seriendruck/usrCntlFakturierung.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.vb
@@ -1438,4 +1438,8 @@ Public Class usrcntlFakturierung
 
     End Sub
 
+    Private Sub btnRechnugnsdaten_Click(sender As Object, e As EventArgs) Handles btnRechnugnsdaten.Click
+        Dim f As New SDL.frmRechnungenSuche
+        f.Show(Me)
+    End Sub
 End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
index bfd5dea4..964c5d17 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
@@ -28,6 +28,7 @@ Partial Class frmMitarbeitersuche
         Me.Button4 = New System.Windows.Forms.Button()
         Me.btnClose = New System.Windows.Forms.Button()
         Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+        Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button3 = New System.Windows.Forms.Button()
@@ -82,7 +83,7 @@ Partial Class frmMitarbeitersuche
         Me.lblFirma = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.pnlSrch.SuspendLayout()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlMain.SuspendLayout()
@@ -155,6 +156,32 @@ Partial Class frmMitarbeitersuche
         Me.PictureBox2.TabIndex = 18
         Me.PictureBox2.TabStop = False
         '
+        'sbMitarbeiter
+        '
+        Me.sbMitarbeiter._allowFreitext = False
+        Me.sbMitarbeiter._AllowSetValue = False
+        Me.sbMitarbeiter._allowSpaceAsSplitter = True
+        Me.sbMitarbeiter._autoSizeGross = False
+        Me.sbMitarbeiter._hideIfListEmpty = True
+        Me.sbMitarbeiter._value = Nothing
+        Me.sbMitarbeiter.conn_art = "FMZOLL"
+        Me.sbMitarbeiter.dgvpos = "LEFT"
+        Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
+        Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
+        Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
+        Me.sbMitarbeiter.key_visible = False
+        Me.sbMitarbeiter.KEYPARAM = Nothing
+        Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
+        Me.sbMitarbeiter.Name = "sbMitarbeiter"
+        Me.sbMitarbeiter.searchActive = True
+        Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
+        Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
+        Me.sbMitarbeiter.SQL_SELECT = Nothing
+        Me.sbMitarbeiter.SQL_WHERE = Nothing
+        Me.sbMitarbeiter.SQL_WhereParamList = Nothing
+        Me.sbMitarbeiter.TabIndex = 0
+        Me.sbMitarbeiter.usrcntl = Nothing
+        '
         'pnlMain
         '
         Me.pnlMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
@@ -790,31 +817,10 @@ Partial Class frmMitarbeitersuche
         Me.Label3.Text = "Niederlassung:"
         Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
-        'sbMitarbeiter
+        'ContextMenuStrip1
         '
-        Me.sbMitarbeiter._allowFreitext = False
-        Me.sbMitarbeiter._AllowSetValue = False
-        Me.sbMitarbeiter._allowSpaceAsSplitter = True
-        Me.sbMitarbeiter._autoSizeGross = False
-        Me.sbMitarbeiter._hideIfListEmpty = True
-        Me.sbMitarbeiter._value = Nothing
-        Me.sbMitarbeiter.conn_art = "FMZOLL"
-        Me.sbMitarbeiter.dgvpos = "LEFT"
-        Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
-        Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
-        Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
-        Me.sbMitarbeiter.key_visible = False
-        Me.sbMitarbeiter.KEYPARAM = Nothing
-        Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
-        Me.sbMitarbeiter.Name = "sbMitarbeiter"
-        Me.sbMitarbeiter.searchActive = True
-        Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
-        Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
-        Me.sbMitarbeiter.SQL_SELECT = Nothing
-        Me.sbMitarbeiter.SQL_WHERE = Nothing
-        Me.sbMitarbeiter.SQL_WhereParamList = Nothing
-        Me.sbMitarbeiter.TabIndex = 0
-        Me.sbMitarbeiter.usrcntl = Nothing
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
         'frmMitarbeitersuche
         '
@@ -913,4 +919,5 @@ Partial Class frmMitarbeitersuche
     Friend WithEvents PictureBox5 As Windows.Forms.PictureBox
     Friend WithEvents btnAkten As Windows.Forms.Button
     Friend WithEvents Button3 As Windows.Forms.Button
+    Friend WithEvents ContextMenuStrip1 As Windows.Forms.ContextMenuStrip
 End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.resx b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.resx
index d584bd9e..c477c7b6 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.resx
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
index 37b72716..30ee1a4b 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -517,16 +517,43 @@ Public Class frmMitarbeitersuche
 
     Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
 
-        Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
-        Dim webAddress As String = Paramslist.GET_PARAMETER_VALUE("TIMAS-LOGIN")
 
-        If webAddress <> "" Then
-            Process.Start(webAddress)
-        Else
-            Process.Start("https://zeit.verag.ag/webterminal/") 'fallback
+
+        If Not ContextMenuStrip1.Items.ContainsKey("timas_old") Then
+            Dim plose = New ToolStripMenuItem() With {.Text = "TimasWEB", .Name = "timas_old", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            ContextMenuStrip1.Items.Add(plose)
+            AddHandler plose.Click, AddressOf mnuItemTimas_Clicked
+        End If
+
+        If Not ContextMenuStrip1.Items.ContainsKey("timas_new") Then
+            Dim plose = New ToolStripMenuItem() With {.Text = "Timas ÜBERSICHT", .Name = "timas_new", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            ContextMenuStrip1.Items.Add(plose)
+            AddHandler plose.Click, AddressOf mnuItemTimas_Clicked
+        End If
+
+        ContextMenuStrip1.Show(Cursor.Position)
+
+
+    End Sub
+
+    Private Sub mnuItemTimas_Clicked(sender As Object, e As EventArgs)
+
+        ContextMenuStrip1.Hide()
+        Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+        Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
+
+        If item IsNot Nothing Then
+            If item.Name = "timas_new" Then
+                Process.Start(Paramslist.GET_PARAMETER_VALUE(item.Name))
+            ElseIf item.Name = "timas_old" Then
+                Process.Start(Paramslist.GET_PARAMETER_VALUE(item.Name))
+            End If
 
         End If
 
+
+
     End Sub
 
     Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click