div. Änderungen ustva

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.5.7.1")>
-<Assembly: AssemblyFileVersion("1.5.7.1")>
+<Assembly: AssemblyVersion("1.5.7.2")>
+<Assembly: AssemblyFileVersion("1.5.7.2")>

SDL/USTV/usrCntlUSTV.vb

@@ -766,7 +766,7 @@ Public Class usrCntlUSTV
 
         'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!)
 
-        Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar 
+        Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz,cast(UStVPo_reDat as Date) as Rechnungsdatum, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar 
                         from tblUStVAntrag 
                         inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID
                         inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr
@@ -777,7 +777,7 @@ Public Class usrCntlUSTV
 
         'filepath = ""
         If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
-            filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, openExcel,,, True)
+            filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,, "falsch zugewiesene PDF-Rechnungen",, openExcel,,, True)
             Return True
         Else
             MsgBox("Keine Daten!")

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -813,6 +813,16 @@ Public Class usrcntlFremdrechnungen
             SET_SDL("MW")
 
         End If
+
+        Dim btcNotSet As Integer = 0
+        lblCountOrigRechnungen.Text = btcNotSet
+        countbtcNotSet = btcNotSet
+
+        Dim missingInvoices As Integer = 0
+        enableMissingPDFInvoicesButton(missingInvoices)
+        lblCountMissingPDFs.Text = missingInvoices
+        countMissingInvoices = missingInvoices
+
     End Sub
 
     Private Sub btnSDL_FREJUS_Click(sender As Object, e As EventArgs) Handles btnSDL_FREJUS.Click
@@ -828,6 +838,15 @@ Public Class usrcntlFremdrechnungen
 
         End If
 
+        Dim btcNotSet As Integer = 0
+        lblCountOrigRechnungen.Text = btcNotSet
+        countbtcNotSet = btcNotSet
+
+        Dim missingInvoices As Integer = 0
+        enableMissingPDFInvoicesButton(missingInvoices)
+        lblCountMissingPDFs.Text = missingInvoices
+        countMissingInvoices = missingInvoices
+
     End Sub
 
     Private Sub btnVERAGCardNew_Click(sender As Object, e As EventArgs) Handles btnVERAGCardNew.Click
@@ -841,6 +860,16 @@ Public Class usrcntlFremdrechnungen
             SET_SDL("VERAG")
 
         End If
+
+        Dim btcNotSet As Integer = 0
+        lblCountOrigRechnungen.Text = btcNotSet
+        countbtcNotSet = btcNotSet
+
+        Dim missingInvoices As Integer = 0
+        enableMissingPDFInvoicesButton(missingInvoices)
+        lblCountMissingPDFs.Text = missingInvoices
+        countMissingInvoices = missingInvoices
+
     End Sub
 
     Private Sub btnSDL_RMC_Click(sender As Object, e As EventArgs) Handles btnSDL_RMC.Click

VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb

@@ -72,12 +72,13 @@ Public Class cUTA
             Else
 
                 If getDetailsInDatatable Then
-                    Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM')"
+                    Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
                     dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
                     Return dt_missingInvoices.Rows.Count
                 Else
-                    Dim SQLstr = "Select count(*) FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM')"
-                    Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0)
+                    Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
+                    dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
+                    Return dt_missingInvoices.Rows.Count
 
                 End If