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

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -615,6 +615,7 @@ Public Class SQL
                 Case "WEB" : conn = GetNewOpenConnectionWEB()
                 Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()
                 Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT()
+                Case "SCANCANON" : conn = GetNewOpenConnectionSCANCANON()
 
 
                 Case "AVISO_ATILLA"

VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb

@@ -11,6 +11,8 @@ Public Class cKundenVertraege
     Property kv_datenarchivId As Object = Nothing
     Property kv_gueltig As Boolean = True
 
+    Public hasEntry As Boolean = False
+
 
     Dim SQL As New SQL
 
@@ -22,6 +24,13 @@ Public Class cKundenVertraege
         LOAD()
     End Sub
 
+    Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
+        Me.kv_KundenNr = kv_KundenNr
+        Me.kv_erhalten_Datum = kv_erhalten_Datum
+        Me.kv_vertragArtId = kv_vertragArtId
+        LOAD(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
+    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("kv_Id", kv_Id, , True, True))
@@ -85,7 +94,36 @@ Public Class cKundenVertraege
                             End If
 
                         Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
 
+    Public Sub LOAD(KundenNr, erhaltenAm, vertragArtId)
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("Select * FROM tblKundenVertraege WHERE kv_KundenNr=@KundenNr AND kv_erhalten_Datum=@erhaltenAm AND kv_vertragArtId=@vertragArtId ", conn)
+                    cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
+                    cmd.Parameters.AddWithValue("@erhaltenAm", erhaltenAm)
+                    cmd.Parameters.AddWithValue("@vertragArtId", vertragArtId)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
                     End If
                     dr.Close()
                 End Using

VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb

@@ -498,9 +498,9 @@ Class TrdInvoice_FUNCTIONS
 
                         Dim Buchungstext As String = ROW("RK_Buchungstext")
 
-                        If Buchungstext <> "" AndAlso Buchungstext.Contains("Zahlungen vom") Then
-                            Buchungstext = Buchungstext.Replace("Zahlungen vom", "Zinsen")
-                            Buchungstext &= " / nicht verzinsen"
+                        If Buchungstext <> "" AndAlso Buchungstext.Contains("Zahlungen von") Then
+                            Buchungstext = Buchungstext.Replace("Zahlungen von", "Zinsen")
+                            ' Buchungstext &= " / nicht verzinsen"
                         End If
 
                         If TRD_INVOICE.SAVE Then