diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 4ac1127..068fe24 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -8200,14 +8200,14 @@ repeatRequest: VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL 'aktuell verwendet Verag360 kein Zugferd und Sammelrechnung 6 geht aktuell noch nicht - 29.04.2026 Start der neuen Funktion! Dim DateString = " CONVERT(DATE, GETDATE())" Dim top As String = "" If InvoicesUntilYesterday Then - top = " top(500) " + top = " top(250) " DateString = "CONVERT(DATE, DATEADD(DAY, -1, GETDATE()))" End If @@ -8254,25 +8254,29 @@ repeatRequest: Dim arguments = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_CMD") Dim errorCounter = 0 - Dim pathCounter = 0 + + Dim CounterRows = 0 For Each row In dt.Rows - Dim rkObj As Object = row("RK_ID") - Dim dsObj As Object = row("dsId") - If rkObj IsNot DBNull.Value AndAlso dsObj IsNot DBNull.Value Then - Dim rkId As Integer - Dim dsId As Integer + Dim rkObj As Object = row("RK_ID") + Dim dsObj As Object = row("dsId") + + If rkObj IsNot DBNull.Value AndAlso dsObj IsNot DBNull.Value Then + + Dim rkId As Integer + Dim dsId As Integer If Integer.TryParse(rkObj.ToString(), rkId) AndAlso Integer.TryParse(dsObj.ToString(), dsId) AndAlso dsId > 0 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsId) - Dim Path As String = DS.GET_TOP1_PATH() - If Path <> "" And System.IO.File.Exists(Path) Then - pathCounter += 1 + Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dsId) + + CounterRows += 1 + + If Path <> "" AndAlso System.IO.File.Exists(Path) Then Try @@ -8429,10 +8433,10 @@ repeatRequest: End If - Next + Next - If dt.Rows.Count > 0 Then + If dt.Rows.Count > 0 Then If Not sendNotificationEmails Then If Environment.MachineName = "H6CCWP3" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, True,,, True) @@ -8523,7 +8527,7 @@ repeatRequest: sumInvalid_Total = sumInvalid_VERAG + sumInvalid_ATILLA + sumInvalid_AMBAR + sumInvalid_360 + sumInvalid_CS + sumInvalid_IMEX + sumInvalid_US sumvalid_Total = sumvalid_VERAG + sumvalid_ATILLA + sumvalid_AMBAR + sumvalid_360 + sumvalid_CS + sumvalid_IMEX + sumvalid_US - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerALL, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ALL", createMailTextZugferd(sumTotal_Total, sumvalid_Total, sumInvalid_Total, "ALL", dt.Rows.Count & "/" & pathCounter), getAbsenderEmail(), True, False) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerALL, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ALL", createMailTextZugferd(sumTotal_Total, sumvalid_Total, sumInvalid_Total, "ALL", dt.Rows.Count & "/" & CounterRows), getAbsenderEmail(), True, False) End If End If @@ -8575,7 +8579,7 @@ repeatRequest: End Select - checkZugferd(sendNotificationEmails, False) + checkZugferd(sendNotificationEmails, True) End Sub Private Sub LinkLabel54_LinkClicked_2(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel54.LinkClicked