diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 001b607d..30cfc734 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -155,7 +155,7 @@ Public Class cUIDPruefung Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 3000) As DataTable Dim dt As DataTable = Nothing - dt = get_zupruefendeKunden(MaxEintraege, datum) + dt = get_zupruefendeKunden(MaxEintraege, datum,, True) If dt IsNot Nothing Then If dt.Rows.Count = 0 Then Return Nothing @@ -299,7 +299,7 @@ Public Class cUIDPruefung Return dt End Function - Public Shared Function get_zupruefendeKunden(MaxEintraege As Integer, Optional datum As Object = Nothing, Optional Firma As String = "") As DataTable + Public Shared Function get_zupruefendeKunden(MaxEintraege As Integer, Optional datum As Object = Nothing, Optional Firma As String = "", Optional Validierungspruefung As Boolean = False) As DataTable Dim dt As DataTable = Nothing If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1) @@ -324,6 +324,15 @@ Public Class cUIDPruefung Top = " TOP " & MaxEintraege End If + If Validierungspruefung Then + where &= " AND UPPER(Adressen.UstIdKz) IN ( + 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', + 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' + )" + End If + + + dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE WHEN UPPER(Adressen.UstIdKz) IN ( 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',