Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -2021,13 +2021,13 @@ Public Class cVermerkeDAL
     End Function
 
 
-    Shared Function insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "", Optional VorauskasseId As Object = Nothing, Optional addAuto As Boolean = False) As Integer
+    Shared Function insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "", Optional VorauskasseId As Object = Nothing, Optional addAuto As Boolean = False, Optional useMitarbeiterTxt As String = "") As Integer
         'Daten zuweisen und speichern
         Dim myVermerk As New cVermerk
         myVermerk.VermerkID = 0
         myVermerk.AvisoID = AvisoID
         myVermerk.Datum = Now
-        myVermerk.Mitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter & If(addAuto, " (AUTO)", "")
+        myVermerk.Mitarbeiter = If(vbDefaultButton1 <> "", useMitarbeiterTxt, cGlobal.AktiverMitarbeiter.Mitarbeiter) & If(addAuto, " (AUTO)", "")
         myVermerk.MitarbeiterId = cGlobal.AktiverMitarbeiter.MitarbeiterID
         myVermerk.Hinweis_Vermerk = Text
         myVermerk.VermerkCodeId = VermerkCodeId