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

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -1220,7 +1220,7 @@ Public Class cAvisoDAL
         Return daten
     End Function
 
-    Public Function Suche_LKW(LKW_Nr As String) As String
+    Public Function Suche_LKW(ByRef LKW_Nr As String, ByRef Optional avisoID As Integer = 1) As String
         'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
 
 
@@ -1236,7 +1236,9 @@ Public Class cAvisoDAL
                     If CDate(VarToDate(dr.Item("Datum"))) > Now.AddDays(-4) Then
                         Suche_LKW = "Achtung: der LKW mit der Nr. " & LKW_Nr & " wurde bereits vor kurzem eingetragen - und zwar am " &
                              Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
+                        avisoID = CInt(dr.Item("AvisoID"))
                     End If
+
                 End If
                 dr.Close()
             End Using
@@ -1245,7 +1247,7 @@ Public Class cAvisoDAL
         Return Suche_LKW
     End Function
 
-    Public Function Suche_LKWStatus(LKW_Nr As String) As String
+    Public Function Suche_LKWStatus(ByRef LKW_Nr As String, Optional ByRef AVISOID As Integer = -1) As String
         'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
         Suche_LKWStatus = ""
 
@@ -1269,6 +1271,7 @@ Public Class cAvisoDAL
                     dr.Read()
                     Suche_LKWStatus = "Achtung: der LKW mit der Nr. " & LKW_Nr & " existiert bereits mit dem Status '" & cGlobal.getStatusText(VarToInt2(dr.Item("Status"))) & "', Eingetragen, am " &
                      Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
+                    AVISOID = CInt(dr.Item("AvisoID"))
                 End If
                 dr.Close()
             End Using

VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb

@@ -326,7 +326,7 @@ Public Class cMessenger
         Public Sub LOAD_ByLKW(chat_AvisoId As Integer, chat_SendungsId As Integer, chat_art As String, Optional topMax As String = "", Optional dateTmp As Object = Nothing)
             Try
                 Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
-                    Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
+                    Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=@chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
                         cmd.Parameters.AddWithValue("@chat_AvisoId", chat_AvisoId)
                         cmd.Parameters.AddWithValue("@chat_SendungsId", chat_SendungsId)
                         cmd.Parameters.AddWithValue("@chat_art", chat_art)

VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb

@@ -978,6 +978,7 @@ Public Class cStandardofferten
         Me.LeistungsBez = LeistungsBez
         LOAD()
     End Sub
+
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OffertenNr", OffertenNr))
@@ -1085,5 +1086,28 @@ Public Class cStandardofferten
         Return ""
     End Function
 
+    Public Shared Sub updateBezeichnung_MULTILINGUAL(Währungscode As String, LeistungsNr As Integer, LeistungsBez As String, LeistungsBez_EN As String, LeistungsBez_RO As String, LeistungsBez_TR As String)
+
+
+        If Währungscode <> "" AndAlso LeistungsNr > 0 And LeistungsBez <> "" Then
+
+            Dim UPDATESTRING As String = ""
+
+            If LeistungsBez_EN <> "" Then UPDATESTRING &= " [LeistungsBez_EN] = '" & LeistungsBez_EN & "',"
+            If LeistungsBez_TR <> "" Then UPDATESTRING &= " [LeistungsBez_TR] = '" & LeistungsBez_TR & "',"
+            If LeistungsBez_RO <> "" Then UPDATESTRING &= " [LeistungsBez_RO] = '" & LeistungsBez_RO & "',"
+
+            If UPDATESTRING <> "" Then
+
+                Dim SQL As New SQL
+
+                SQL.doSQL("UPDATE [Standardofferten] SET " & UPDATESTRING & " aktualisiert = getDate() WHERE Währungscode='" & Währungscode & "' AND LeistungsNr=" & LeistungsNr & " AND LeistungsBez='" & LeistungsBez & "'", "FMZOLL")
+
+            End If
+        End If
+
+
+    End Sub
+
 End Class
 

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -95,6 +95,7 @@ Public Class cSendungen
 
     Property tblSnd_ATB_Nr As Object = Nothing
     Property tblSnd_ATB_T1 As Object = Nothing
+    Property tblSnd_T1_Frist As Object = Nothing
 
     Property tblSnd_Vorpapier As Object = Nothing
     Property tblSnd_Vorpapier_Pos As Object = Nothing
@@ -489,7 +490,7 @@ Public Class cSendungen
                     Me.tblSnd_Firma = SQL.checkNullReturnValue(dr.Item("tblSnd_Firma"), Nothing)
                     Me.tblSnd_Cluster = SQL.checkNullReturnValue(dr.Item("tblSnd_Cluster"), Nothing)
                     Me.tblSnd_ATBFakturieren = SQL.checkNullReturnValue(dr.Item("tblSnd_ATBFakturieren"), Nothing)
-
+                    Me.tblSnd_T1_Frist = SQL.checkNullReturnValue(dr.Item("tblSnd_T1_Frist"), Nothing)
 
                 End If
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -16,7 +16,7 @@ Public Class cDatev_Interface
 
     'STAMMDATEN
     Shared Function getStammdaten(filialNr As Integer) As DataTable
-        Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen]"
+        Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen], isnull(Kunden.Zahlungsziel, 10) as ZahlungszielInTagen"
         sqlStr &= " FROM Adressen INNER JOIN Kunden ON Kundennr=AdressenNr  "
         sqlStr &= " LEFT JOIN tblKundenErweitert ON KundenNr=kde_KundenNr "
         sqlStr &= " LEFT JOIN [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz "
@@ -76,7 +76,10 @@ Public Class cDatev_Interface
         personenRow &= FormatStringDVO(row("Bankkonto")) & ";"
         personenRow &= emptyFormatedValue()
         personenRow &= FormatStringDVO(row("IBAN")) & ";"
-        personenRow &= emptyFormatedValue(197)
+        personenRow &= emptyFormatedValue(65)
+        personenRow &= FormatStringDVO(row("ZahlungszielInTagen")) & ";"
+        personenRow &= emptyFormatedValue(144)
+
 
         Return personenRow