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

2025-12-09 14:57:21 +01:00
parent 69489d9eaf c12cf5101d
commit dabff7e199
16 changed files with 573 additions and 267 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
@@ -577,7 +577,7 @@ Public Class cIDS
                                            tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis 
                                            AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr 
                                            AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ
-                                            AND tblIDSTransactionsNew.[VATAmount] <> 0 
+                                            AND tblIDSTransactionsNew.[VATAmount] <> 0 AND isnull(tblIDSTransactionsNew.charged,0) <> 0
                                            " & IIf(Archiv, " ", " AND isnull(UStVAn_ID,0) = 0 ") & "
                                        GROUP BY 
                                            tblIDSTransactionsNew.KdNrVERAG,