Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2025-04-24 14:13:36 +02:00
7 changed files with 210 additions and 110 deletions

View File

@@ -93,7 +93,7 @@ Public Class cMDMFunctionsAllgemein
End Try
End Function
Shared Function Update_UStVASummenNeuBerechnen() As Boolean
Shared Function Update_UStVASummenNeuBerechnen_USTVA(Optional UStVAn_ID As Integer = -1) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -103,19 +103,19 @@ Public Class cMDMFunctionsAllgemein
UStVAn_USteuerbetrag = COALESCE(
(SELECT SUM(UStVPo_USteuerbetrag)
FROM tblUStVPositionen
WHERE UStVAn_ID = tblUStVAntrag.UStVAn_ID), 0),
WHERE UStVAn_ID = " & IIf(UStVAn_ID > 0, UStVAn_ID, "tblUStVAntrag.UStVAn_ID") & "), 0),
UStVAn_Erstattungsbetrag = COALESCE(
(SELECT SUM(UStVEr_USteuerbetrag)
FROM tblUStVErstattung
WHERE UStVAn_ID = tblUStVAntrag.UStVAn_ID), 0),
WHERE UStVAn_ID = " & IIf(UStVAn_ID > 0, UStVAn_ID, "tblUStVAntrag.UStVAn_ID") & " ), 0),
UStVAn_USteuerbetragEUR = COALESCE(
(SELECT SUM(UStVPo_USteuerbetragEUR)
FROM tblUStVPositionen
WHERE UStVAn_ID = tblUStVAntrag.UStVAn_ID), 0),
WHERE UStVAn_ID = " & IIf(UStVAn_ID > 0, UStVAn_ID, "tblUStVAntrag.UStVAn_ID") & "), 0),
UStVAn_ErstattungsbetragEUR = COALESCE(
(SELECT SUM(UStVEr_USteuerbetragEUR)
FROM tblUStVErstattung
WHERE UStVAn_ID = tblUStVAntrag.UStVAn_ID), 0)"
WHERE UStVAn_ID = " & IIf(UStVAn_ID > 0, UStVAn_ID, "tblUStVAntrag.UStVAn_ID") & "), 0) " & IIf(UStVAn_ID > 0, "WHERE tblUStVAntrag.UStVAn_ID = " & UStVAn_ID, "")
Return SQL.doSQL(sqltext, "FMZOLL")