edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-01-19 14:24:44 +01:00
parent 02b6a3dcef b5f2fc96fb
commit 7d3ce50b9b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb
View File

@@ -186,8 +186,6 @@ Public Class cAufschubKonten
End If
Dim SaldoString As String =
" SELECT
SUM(Betrag) AS GesamtSicherheitsSaldo
@@ -198,7 +196,7 @@ Public Class cAufschubKonten
WHEN gs_art = 'CLOSE' THEN gs_sicherheitsbetrag
END AS Betrag
FROM tblGesamtsicherheit
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
UNION ALL
@@ -210,8 +208,8 @@ Public Class cAufschubKonten
FROM tblGesamtsicherheitsPositionen
WHERE gsp_gsnr IN (
SELECT gs_gsnr
FROM tblGesamtsicherheit
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )) x;"
From tblGesamtsicherheit
Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )" & StichtagSQLGesamtsicherheitsPositionen & " ) x;"
Dim dt As New DataTable
Dim mrn As Double = 0

4
VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb
View File

@@ -10,6 +10,7 @@ Public Class cKundenVertraege
Property kv_vertragArtId As Integer
Property kv_Info As Object = Nothing
Property kv_datenarchivId As Object = Nothing
Property kv_datenarchivId_mail As Object = Nothing
Property kv_gueltig As Boolean = True
Public hasEntry As Boolean = False
@@ -41,6 +42,7 @@ Public Class cKundenVertraege
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_vertragArtId", kv_vertragArtId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_Info", kv_Info))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId", kv_datenarchivId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId_mail", kv_datenarchivId_mail))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltig", kv_gueltig))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltigBis_Datum", kv_gueltigBis_Datum))
@@ -48,7 +50,7 @@ Public Class cKundenVertraege
End Function
Public Shared Function LOAD_LIST(KundenNr As Integer) As DataTable
Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_datenarchivId_mail],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
End Function
Public Shared Function LOAD_LISTOF(KundenNr As Integer) As List(Of cKundenVertraege)
Dim LIST As New List(Of cKundenVertraege)